diff --git a/package-lock.json b/package-lock.json
index 5a5574e1f4..456acaa94d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "binaryen": "110.0.0-nightly.20221105",
+        "binaryen": "111.0.0-nightly.20230111",
         "long": "^5.2.0"
       },
       "bin": {
@@ -398,9 +398,9 @@
       "dev": true
     },
     "node_modules/binaryen": {
-      "version": "110.0.0-nightly.20221105",
-      "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-110.0.0-nightly.20221105.tgz",
-      "integrity": "sha512-OBESOc51q3SwgG8Uv8nMzGnSq7LJpSB/Fu8B3AjlZg6YtCEwRnlDWlnwNB6mdql+VdexfKmNcsrs4K7MYidmdQ==",
+      "version": "111.0.0-nightly.20230111",
+      "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-111.0.0-nightly.20230111.tgz",
+      "integrity": "sha512-CUEED/yMHoGeGnOZhQJW5+Luf5z/F58PHK5lw2feh5fbbqauodgnxyYkc2oxSjYwHHRCmFmaYyeQH4zlhRbebg==",
       "bin": {
         "wasm-opt": "bin/wasm-opt",
         "wasm2js": "bin/wasm2js"
@@ -2117,9 +2117,9 @@
       "dev": true
     },
     "binaryen": {
-      "version": "110.0.0-nightly.20221105",
-      "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-110.0.0-nightly.20221105.tgz",
-      "integrity": "sha512-OBESOc51q3SwgG8Uv8nMzGnSq7LJpSB/Fu8B3AjlZg6YtCEwRnlDWlnwNB6mdql+VdexfKmNcsrs4K7MYidmdQ=="
+      "version": "111.0.0-nightly.20230111",
+      "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-111.0.0-nightly.20230111.tgz",
+      "integrity": "sha512-CUEED/yMHoGeGnOZhQJW5+Luf5z/F58PHK5lw2feh5fbbqauodgnxyYkc2oxSjYwHHRCmFmaYyeQH4zlhRbebg=="
     },
     "brace-expansion": {
       "version": "1.1.11",
diff --git a/package.json b/package.json
index 4a946b465f..b6fb390069 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   },
   "engineStrict": true,
   "dependencies": {
-    "binaryen": "110.0.0-nightly.20221105",
+    "binaryen": "111.0.0-nightly.20230111",
     "long": "^5.2.0"
   },
   "devDependencies": {
diff --git a/src/builtins.ts b/src/builtins.ts
index 8846825427..6f19d168fd 100644
--- a/src/builtins.ts
+++ b/src/builtins.ts
@@ -61,7 +61,6 @@ import {
   SIMDTernaryOp,
   SIMDLoadOp,
   SIMDLoadStoreLaneOp,
-  RefIsOp,
   TypeRef,
   ExpressionRef,
   ExpressionId,
@@ -3470,13 +3469,13 @@ function builtin_assert(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.Externref:
       case TypeKind.Anyref:
       case TypeKind.Eqref:
-      case TypeKind.Dataref:
+      case TypeKind.Structref:
       case TypeKind.Arrayref:
       case TypeKind.I31ref:
       case TypeKind.Stringref:
       case TypeKind.StringviewWTF8:
       case TypeKind.StringviewWTF16:
-      case TypeKind.StringviewIter: return module.if(module.ref_is(RefIsOp.Null, arg0), abort);
+      case TypeKind.StringviewIter: return module.if(module.ref_is_null(arg0), abort);
     }
   } else {
     compiler.currentType = type.nonNullableType;
@@ -3551,7 +3550,7 @@ function builtin_assert(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.Externref:
       case TypeKind.Anyref:
       case TypeKind.Eqref:
-      case TypeKind.Dataref:
+      case TypeKind.Structref:
       case TypeKind.Arrayref:
       case TypeKind.I31ref:
       case TypeKind.Stringref:
@@ -3560,7 +3559,7 @@ function builtin_assert(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.StringviewIter: {
         let temp = flow.getTempLocal(type);
         let ret = module.if(
-          module.ref_is(RefIsOp.Null,
+          module.ref_is_null(
             module.local_tee(temp.index, arg0, false) // ref
           ),
           abort,
diff --git a/src/common.ts b/src/common.ts
index 1866bd3f77..8e03684d05 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -130,9 +130,9 @@ export namespace CommonNames {
   export const externref = "externref";
   export const anyref = "anyref";
   export const eqref = "eqref";
-  export const i31ref = "i31ref";
-  export const dataref = "dataref";
+  export const structref = "structref";
   export const arrayref = "arrayref";
+  export const i31ref = "i31ref";
   export const stringref = "stringref";
   export const stringview_wtf8 = "stringview_wtf8";
   export const stringview_wtf16 = "stringview_wtf16";
@@ -211,9 +211,9 @@ export namespace CommonNames {
   export const Externref = "Externref";
   export const Anyref = "Anyref";
   export const Eqref = "Eqref";
-  export const I31ref = "I31ref";
-  export const Dataref = "Dataref";
+  export const Structref = "Structref";
   export const Arrayref = "Arrayref";
+  export const I31ref = "I31ref";
   export const String = "String";
   export const RegExp = "RegExp";
   export const Object = "Object";
diff --git a/src/compiler.ts b/src/compiler.ts
index 6dded2c241..b25dff9a76 100644
--- a/src/compiler.ts
+++ b/src/compiler.ts
@@ -4838,9 +4838,9 @@ export class Compiler extends DiagnosticEmitter {
         );
       }
       case TypeKind.Eqref:
-      case TypeKind.I31ref:
-      case TypeKind.Dataref:
-      case TypeKind.Arrayref: return module.ref_eq(leftExpr, rightExpr);
+      case TypeKind.Structref:
+      case TypeKind.Arrayref:
+      case TypeKind.I31ref: return module.ref_eq(leftExpr, rightExpr);
       case TypeKind.Stringref: return module.string_eq(leftExpr, rightExpr);
       case TypeKind.StringviewWTF8:
       case TypeKind.StringviewWTF16:
@@ -4888,9 +4888,9 @@ export class Compiler extends DiagnosticEmitter {
         );
       }
       case TypeKind.Eqref:
-      case TypeKind.I31ref:
-      case TypeKind.Dataref:
-      case TypeKind.Arrayref: {
+      case TypeKind.Structref:
+      case TypeKind.Arrayref:
+      case TypeKind.I31ref: {
         return module.unary(UnaryOp.EqzI32,
           module.ref_eq(leftExpr, rightExpr)
         );
@@ -9861,7 +9861,7 @@ export class Compiler extends DiagnosticEmitter {
       case TypeKind.Externref:
       case TypeKind.Anyref:
       case TypeKind.Eqref:
-      case TypeKind.Dataref:
+      case TypeKind.Structref:
       case TypeKind.Arrayref:
       case TypeKind.Stringref:
       case TypeKind.StringviewWTF8:
@@ -10020,8 +10020,9 @@ export class Compiler extends DiagnosticEmitter {
       case TypeKind.Externref:
       case TypeKind.Anyref:
       case TypeKind.Eqref:
+      case TypeKind.Structref:
+      case TypeKind.Arrayref:
       case TypeKind.I31ref:
-      case TypeKind.Dataref:
       case TypeKind.Stringref:
       case TypeKind.StringviewWTF8:
       case TypeKind.StringviewWTF16:
diff --git a/src/glue/binaryen.d.ts b/src/glue/binaryen.d.ts
index 101d4b226f..871037397d 100644
--- a/src/glue/binaryen.d.ts
+++ b/src/glue/binaryen.d.ts
@@ -54,9 +54,9 @@ export declare function _BinaryenTypeFuncref(): TypeRef;
 export declare function _BinaryenTypeExternref(): TypeRef;
 export declare function _BinaryenTypeAnyref(): TypeRef;
 export declare function _BinaryenTypeEqref(): TypeRef;
-export declare function _BinaryenTypeI31ref(): TypeRef;
-export declare function _BinaryenTypeDataref(): TypeRef;
+export declare function _BinaryenTypeStructref(): TypeRef;
 export declare function _BinaryenTypeArrayref(): TypeRef;
+export declare function _BinaryenTypeI31ref(): TypeRef;
 export declare function _BinaryenTypeStringref(): TypeRef;
 export declare function _BinaryenTypeStringviewWTF8(): TypeRef;
 export declare function _BinaryenTypeStringviewWTF16(): TypeRef;
@@ -70,7 +70,7 @@ export declare function _BinaryenHeapTypeExt(): HeapTypeRef;
 export declare function _BinaryenHeapTypeAny(): HeapTypeRef;
 export declare function _BinaryenHeapTypeEq(): HeapTypeRef;
 export declare function _BinaryenHeapTypeI31(): HeapTypeRef;
-export declare function _BinaryenHeapTypeData(): HeapTypeRef;
+export declare function _BinaryenHeapTypeStruct(): HeapTypeRef;
 export declare function _BinaryenHeapTypeArray(): HeapTypeRef;
 export declare function _BinaryenHeapTypeString(): HeapTypeRef;
 export declare function _BinaryenHeapTypeStringviewWTF8(): HeapTypeRef;
@@ -448,11 +448,9 @@ export declare function _BinaryenMemoryFillSetSize(expr: ExpressionRef, sizeExpr
 
 export declare function _BinaryenRefNull(module: ModuleRef, type: TypeRef): ExpressionRef;
 
-export declare function _BinaryenRefIs(module: ModuleRef, op: Op, valueExpr: ExpressionRef): ExpressionRef;
-export declare function _BinaryenRefIsGetOp(expr: ExpressionRef): Op;
-export declare function _BinaryenRefIsSetOp(expr: ExpressionRef, op: Op): void;
-export declare function _BinaryenRefIsGetValue(expr: ExpressionRef): ExpressionRef;
-export declare function _BinaryenRefIsSetValue(expr: ExpressionRef, valueExpr: ExpressionRef): void;
+export declare function _BinaryenRefIsNull(module: ModuleRef, valueExpr: ExpressionRef): ExpressionRef;
+export declare function _BinaryenRefIsNullGetValue(expr: ExpressionRef): ExpressionRef;
+export declare function _BinaryenRefIsNullSetValue(expr: ExpressionRef, valueExpr: ExpressionRef): void;
 
 export declare function _BinaryenRefAs(module: ModuleRef, op: Op, valueExpr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenRefAsGetOp(expr: ExpressionRef): Op;
@@ -570,27 +568,25 @@ export declare function _BinaryenCallRefSetTarget(expr: ExpressionRef, targetExp
 export declare function _BinaryenCallRefIsReturn(expr: ExpressionRef): bool;
 export declare function _BinaryenCallRefSetReturn(expr: ExpressionRef, isReturn: bool): void;
 
-export declare function _BinaryenRefTest(module: ModuleRef, refExpr: ExpressionRef, intendedType: HeapTypeRef): ExpressionRef;
+export declare function _BinaryenRefTest(module: ModuleRef, refExpr: ExpressionRef, castType: HeapTypeRef): ExpressionRef;
 export declare function _BinaryenRefTestGetRef(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenRefTestSetRef(expr: ExpressionRef, refExpr: ExpressionRef): void;
-export declare function _BinaryenRefTestGetIntendedType(expr: ExpressionRef): HeapTypeRef;
-export declare function _BinaryenRefTestSetIntendedType(expr: ExpressionRef, intendedType: HeapTypeRef): void;
+export declare function _BinaryenRefTestGetCastType(expr: ExpressionRef): HeapTypeRef;
+export declare function _BinaryenRefTestSetCastType(expr: ExpressionRef, castType: HeapTypeRef): void;
 
 export declare function _BinaryenRefCast(module: ModuleRef, refExpr: ExpressionRef, intendedType: HeapTypeRef): ExpressionRef;
 export declare function _BinaryenRefCastGetRef(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenRefCastSetRef(expr: ExpressionRef, refExpr: ExpressionRef): void;
-export declare function _BinaryenRefCastGetIntendedType(expr: ExpressionRef): HeapTypeRef;
-export declare function _BinaryenRefCastSetIntendedType(expr: ExpressionRef, intendedType: HeapTypeRef): void;
 
-export declare function _BinaryenBrOn(module: ModuleRef, op: Op, name: StringRef, ref: ExpressionRef, intendedType: HeapTypeRef): ExpressionRef;
+export declare function _BinaryenBrOn(module: ModuleRef, op: Op, name: StringRef, ref: ExpressionRef, castType: HeapTypeRef): ExpressionRef;
 export declare function _BinaryenBrOnGetOp(expr: ExpressionRef): Op;
 export declare function _BinaryenBrOnSetOp(expr: ExpressionRef, op: Op): void;
 export declare function _BinaryenBrOnGetName(expr: ExpressionRef): StringRef;
 export declare function _BinaryenBrOnSetName(expr: ExpressionRef, nameStr: StringRef): void;
 export declare function _BinaryenBrOnGetRef(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenBrOnSetRef(expr: ExpressionRef, refExpr: ExpressionRef): void;
-export declare function _BinaryenBrOnGetIntendedType(expr: ExpressionRef): HeapTypeRef;
-export declare function _BinaryenBrOnSetIntendedType(expr: ExpressionRef, intendedType: HeapTypeRef): void;
+export declare function _BinaryenBrOnGetCastType(expr: ExpressionRef): HeapTypeRef;
+export declare function _BinaryenBrOnSetCastType(expr: ExpressionRef, castType: HeapTypeRef): void;
 
 export declare function _BinaryenStructNew(module: ModuleRef, operands: ArrayRef<ExpressionRef>, numOperands: Index, type: HeapTypeRef): ExpressionRef;
 export declare function _BinaryenStructNewGetNumOperands(expr: ExpressionRef): Index;
@@ -622,6 +618,8 @@ export declare function _BinaryenArrayNewSetInit(expr: ExpressionRef, initExpr:
 export declare function _BinaryenArrayNewGetSize(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenArrayNewSetSize(expr: ExpressionRef, sizeExpr: ExpressionRef): void;
 
+// TODO: BinaryenArrayNewSeg
+
 export declare function _BinaryenArrayInit(module: ModuleRef, type: HeapTypeRef, values: ArrayRef<ExpressionRef>, numValues: Index): ExpressionRef;
 export declare function _BinaryenArrayInitGetNumValues(expr: ExpressionRef): Index;
 export declare function _BinaryenArrayInitGetValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
diff --git a/src/glue/binaryen.js b/src/glue/binaryen.js
index fd90050d35..caa0521836 100644
--- a/src/glue/binaryen.js
+++ b/src/glue/binaryen.js
@@ -18,7 +18,7 @@ export const {
   _BinaryenTypeAnyref,
   _BinaryenTypeEqref,
   _BinaryenTypeI31ref,
-  _BinaryenTypeDataref,
+  _BinaryenTypeStructref,
   _BinaryenTypeArrayref,
   _BinaryenTypeStringref,
   _BinaryenTypeStringviewWTF8,
@@ -33,7 +33,7 @@ export const {
   _BinaryenHeapTypeAny,
   _BinaryenHeapTypeEq,
   _BinaryenHeapTypeI31,
-  _BinaryenHeapTypeData,
+  _BinaryenHeapTypeStruct,
   _BinaryenHeapTypeArray,
   _BinaryenHeapTypeString,
   _BinaryenHeapTypeStringviewWTF8,
@@ -406,11 +406,9 @@ export const {
 
   _BinaryenRefNull,
 
-  _BinaryenRefIs,
-  _BinaryenRefIsGetOp,
-  _BinaryenRefIsSetOp,
-  _BinaryenRefIsGetValue,
-  _BinaryenRefIsSetValue,
+  _BinaryenRefIsNull,
+  _BinaryenRefIsNullGetValue,
+  _BinaryenRefIsNullSetValue,
 
   _BinaryenRefAs,
   _BinaryenRefAsGetOp,
@@ -531,14 +529,12 @@ export const {
   _BinaryenRefTest,
   _BinaryenRefTestGetRef,
   _BinaryenRefTestSetRef,
-  _BinaryenRefTestGetIntendedType,
-  _BinaryenRefTestSetIntendedType,
+  _BinaryenRefTestGetCastType,
+  _BinaryenRefTestSetCastType,
 
   _BinaryenRefCast,
   _BinaryenRefCastGetRef,
   _BinaryenRefCastSetRef,
-  _BinaryenRefCastGetIntendedType,
-  _BinaryenRefCastSetIntendedType,
 
   _BinaryenBrOn,
   _BinaryenBrOnGetOp,
@@ -547,8 +543,8 @@ export const {
   _BinaryenBrOnSetName,
   _BinaryenBrOnGetRef,
   _BinaryenBrOnSetRef,
-  _BinaryenBrOnGetIntendedType,
-  _BinaryenBrOnSetIntendedType,
+  _BinaryenBrOnGetCastType,
+  _BinaryenBrOnSetCastType,
 
   _BinaryenStructNew,
   _BinaryenStructNewGetNumOperands,
diff --git a/src/module.ts b/src/module.ts
index cad042b46b..8683e7046b 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -74,9 +74,9 @@ export namespace TypeRef {
   export const Externref = binaryen._BinaryenTypeExternref();
   export const Anyref = binaryen._BinaryenTypeAnyref();
   export const Eqref = binaryen._BinaryenTypeEqref();
-  export const I31ref = binaryen._BinaryenTypeI31ref();
-  export const Dataref = binaryen._BinaryenTypeDataref();
+  export const Structref = binaryen._BinaryenTypeStructref();
   export const Arrayref = binaryen._BinaryenTypeArrayref();
+  export const I31ref = binaryen._BinaryenTypeI31ref();
   export const Stringref = binaryen._BinaryenTypeStringref();
   export const StringviewWTF8 = binaryen._BinaryenTypeStringviewWTF8();
   export const StringviewWTF16 = binaryen._BinaryenTypeStringviewWTF16();
@@ -107,7 +107,7 @@ export namespace HeapTypeRef {
   export const Any: HeapTypeRef = 2 /* _BinaryenHeapTypeAny */;
   export const Eq: HeapTypeRef = 3 /* _BinaryenHeapTypeEq */;
   export const I31: HeapTypeRef = 4 /* _BinaryenHeapTypeI31 */;
-  export const Data: HeapTypeRef = 5 /* _BinaryenHeapTypeData */;
+  export const Struct: HeapTypeRef = 5 /* _BinaryenHeapTypeStruct */;
   export const Array: HeapTypeRef = 6 /* _BinaryenHeapTypeArray */;
   export const String: HeapTypeRef = 7 /* _BinaryenHeapTypeString */;
   export const StringviewWTF8: HeapTypeRef = 8 /* _BinaryenHeapTypeStringviewWTF8 */;
@@ -145,18 +145,18 @@ export namespace HeapTypeRef {
       case HeapTypeRef.Func: return -1;
       case HeapTypeRef.Any: return a;
       case HeapTypeRef.Eq: {
-        return b == HeapTypeRef.I31 || b == HeapTypeRef.Data || b == HeapTypeRef.Array
+        return b == HeapTypeRef.I31 || b == HeapTypeRef.Struct || b == HeapTypeRef.Array
           ? HeapTypeRef.Eq
           : HeapTypeRef.Any;
       }
       case HeapTypeRef.I31: {
-        return b == HeapTypeRef.Data || b == HeapTypeRef.Array
+        return b == HeapTypeRef.Struct || b == HeapTypeRef.Array
           ? HeapTypeRef.Eq
           : HeapTypeRef.Any;
       }
-      case HeapTypeRef.Data: {
+      case HeapTypeRef.Struct: {
         return b == HeapTypeRef.Array
-          ? HeapTypeRef.Data
+          ? HeapTypeRef.Eq
           : HeapTypeRef.Any;
       }
       case HeapTypeRef.Array:
@@ -205,9 +205,8 @@ export namespace TypeBuilderErrorReason {
 /** Type system constants. */
 export type TypeSystem = binaryen.TypeSystem;
 export namespace TypeSystem {
-  export const Equirecursive: TypeSystem = 0 /* _BinaryenTypeSystemEquirecursive */;
+  export const Isorecursive: TypeSystem = 0 /* _BinaryenTypeSystemIsorecursive */;
   export const Nominal: TypeSystem = 1 /* _BinaryenTypeSystemNominal */;
-  export const Isorecursive: TypeSystem = 2 /* _BinaryenTypeSystemIsorecursive */;
 }
 
 /** Binaryen feature constants. */
@@ -276,7 +275,7 @@ export const enum ExpressionId {
   MemoryFill = 39 /* _BinaryenMemoryFillId */,
   Pop = 40 /* _BinaryenPopId */,
   RefNull = 41 /* _BinaryenRefNullId */,
-  RefIs = 42 /* _BinaryenRefIsId */,
+  RefIsNull = 42 /* _BinaryenRefIsNullId */,
   RefFunc = 43 /* _BinaryenRefFuncId */,
   RefEq = 44 /* _BinaryenRefEqId */,
   TableGet = 45 /* _BinaryenTableGetId */,
@@ -298,25 +297,26 @@ export const enum ExpressionId {
   StructGet = 61 /* _BinaryenStructGetId */,
   StructSet = 62 /* _BinaryenStructSetId */,
   ArrayNew = 63 /* _BinaryenArrayNewId */,
-  ArrayInit = 64 /* _BinaryenArrayInitId */,
-  ArrayGet = 65 /* _BinaryenArrayGetId */,
-  ArraySet = 66 /* _BinaryenArraySetId */,
-  ArrayLen = 67 /* _BinaryenArrayLenId */,
-  ArrayCopy = 68 /* _BinaryenArrayCopyId */,
-  RefAs = 69 /* _BinaryenRefAsId */,
-  StringNew = 70 /* _BinaryenStringNewId */,
-  StringConst = 71 /* _BinaryenStringConstId */,
-  StringMeasure = 72 /* _BinaryenStringMeasureId */,
-  StringEncode = 73 /* _BinaryenStringEncodeId */,
-  StringConcat = 74 /* _BinaryenStringConcatId */,
-  StringEq = 75 /* _BinaryenStringEqId */,
-  StringAs = 76 /* _BinaryenStringAsId */,
-  StringWTF8Advance = 77 /* _BinaryenStringWTF8AdvanceId */,
-  StringWTF16Get = 78 /* _BinaryenStringWTF16GetId */,
-  StringIterNext = 79 /* _BinaryenStringIterNextId */,
-  StringIterMove = 80 /* _BinaryenStringIterMoveId */,
-  StringSliceWTF = 81 /* _BinaryenStringSliceWTFId */,
-  StringSliceIter = 82 /* _BinaryenStringSliceIterId */
+  ArrayNewSeg = 64 /* TODO_BinaryenArraySegId */,
+  ArrayInit = 65 /* _BinaryenArrayInitId */,
+  ArrayGet = 66 /* _BinaryenArrayGetId */,
+  ArraySet = 67 /* _BinaryenArraySetId */,
+  ArrayLen = 68 /* _BinaryenArrayLenId */,
+  ArrayCopy = 69 /* _BinaryenArrayCopyId */,
+  RefAs = 70 /* _BinaryenRefAsId */,
+  StringNew = 71 /* _BinaryenStringNewId */,
+  StringConst = 72 /* _BinaryenStringConstId */,
+  StringMeasure = 73 /* _BinaryenStringMeasureId */,
+  StringEncode = 74 /* _BinaryenStringEncodeId */,
+  StringConcat = 75 /* _BinaryenStringConcatId */,
+  StringEq = 76 /* _BinaryenStringEqId */,
+  StringAs = 77 /* _BinaryenStringAsId */,
+  StringWTF8Advance = 78 /* _BinaryenStringWTF8AdvanceId */,
+  StringWTF16Get = 79 /* _BinaryenStringWTF16GetId */,
+  StringIterNext = 80 /* _BinaryenStringIterNextId */,
+  StringIterMove = 81 /* _BinaryenStringIterMoveId */,
+  StringSliceWTF = 82 /* _BinaryenStringSliceWTFId */,
+  StringSliceIter = 83 /* _BinaryenStringSliceIterId */
 }
 
 /** Binaryen external kind constants. */
@@ -1192,32 +1192,14 @@ export const enum SIMDTernaryOp {
   Bitselect = 0 /* _BinaryenBitselectVec128 */
 }
 
-/** Binaryen RefIs operation constants. */
-export const enum RefIsOp {
-  /** ref.is_null */
-  Null = 0 /* _BinaryenRefIsNull */,
-  /** ref.is_func */
-  Func = 1 /* _BinaryenRefIsFunc */,
-  /** ref.is_data */
-  Data = 2 /* _BinaryenRefIsData */,
-  /** ref.is_i31 */
-  I31 = 3 /* _BinaryenRefIsI31 */
-}
-
 /** Binaryen RefAs operation constants. */
 export const enum RefAsOp {
   /** ref.as_non_null */
   NonNull = 0 /* _BinaryenRefAsNonNull */,
-  /** ref.as_func */
-  Func = 1 /* _BinaryenRefAsFunc */,
-  /** ref.as_data */
-  Data = 2 /* _BinaryenRefAsData */,
-  /** ref.as_i31 */
-  I31 = 3 /* _BinaryenRefAsI31 */,
   /** extern.internalize */
-  ExternInternalize = 4 /* _BinaryenRefAsExternInternalize */,
+  ExternInternalize = 1 /* _BinaryenRefAsExternInternalize */,
   /** extern.externalize */
-  ExternExternalize = 5 /* _BinaryenRefAsExternExternalize */
+  ExternExternalize = 2 /* _BinaryenRefAsExternExternalize */
 }
 
 /** Binaryen BrOn operation constants. */
@@ -1229,19 +1211,7 @@ export const enum BrOnOp {
   /** br_on_cast */
   Cast = 2 /* _BinaryenBrOnCast */,
   /** br_on_cast_fail */
-  CastFail = 3 /* _BinaryenBrOnCastFail */,
-  /** br_on_func */
-  Func = 4 /* _BinaryenBrOnFunc */,
-  /** br_on_non_func */
-  NonFunc = 5 /* _BinaryenBrOnNonFunc */,
-  /** br_on_data */
-  Data = 6 /* _BinaryenBrOnData */,
-  /** br_on_non_data */
-  NonData = 7 /* _BinaryenBrOnNonData */,
-  /** br_on_i31 */
-  I31 = 8 /* _BinaryenBrOnI31 */,
-  /** br_on_non_i32 */
-  NonI31 = 9 /* _BinaryenBrOnNonI31 */
+  CastFail = 3 /* _BinaryenBrOnCastFail */
 }
 
 /** Binaryen StringNew operation constants. */
@@ -2057,21 +2027,10 @@ export class Module {
 
   // reference types / gc
 
-  ref_is(
-    op: RefIsOp,
-    expr: ExpressionRef
-  ): ExpressionRef {
-    return binaryen._BinaryenRefIs(this.ref, op, expr);
-  }
-
   ref_is_null(
     expr: ExpressionRef
   ): ExpressionRef {
-    if (isNullableType(getExpressionType(expr))) {
-      return binaryen._BinaryenRefIs(this.ref, RefIsOp.Null, expr);
-    } else {
-      return this.i32(0); // false literal
-    }
+    return binaryen._BinaryenRefIsNull(this.ref, expr);
   }
 
   ref_as(
@@ -3775,15 +3734,15 @@ function tryEnsureBasicType(type: Type): TypeRef {
     case TypeKind.Eqref: {
       return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Eq, type.is(TypeFlags.Nullable));
     }
-    case TypeKind.I31ref: {
-      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.I31, type.is(TypeFlags.Nullable));
-    }
-    case TypeKind.Dataref: {
-      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Data, type.is(TypeFlags.Nullable));
+    case TypeKind.Structref: {
+      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Struct, type.is(TypeFlags.Nullable));
     }
     case TypeKind.Arrayref: {
       return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Array, type.is(TypeFlags.Nullable));
     }
+    case TypeKind.I31ref: {
+      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.I31, type.is(TypeFlags.Nullable));
+    }
     case TypeKind.Stringref: {
       return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.String, type.is(TypeFlags.Nullable));
     }
diff --git a/src/passes/pass.ts b/src/passes/pass.ts
index 06fb88f17e..8272fbd967 100644
--- a/src/passes/pass.ts
+++ b/src/passes/pass.ts
@@ -80,7 +80,7 @@ import {
   _BinaryenMemoryFillGetDest,
   _BinaryenMemoryFillGetValue,
   _BinaryenMemoryFillGetSize,
-  _BinaryenRefIsGetValue,
+  _BinaryenRefIsNullGetValue,
   _BinaryenRefAsGetValue,
   _BinaryenTryGetBody,
   _BinaryenTryGetNumCatchBodies,
@@ -148,7 +148,7 @@ import {
   _BinaryenMemoryFillSetDest,
   _BinaryenMemoryFillSetValue,
   _BinaryenMemoryFillSetSize,
-  _BinaryenRefIsSetValue,
+  _BinaryenRefIsNullSetValue,
   _BinaryenTrySetBody,
   _BinaryenTrySetCatchBodyAt,
   _BinaryenThrowSetOperandAt,
@@ -480,7 +480,7 @@ export abstract class Visitor {
     // unimp
   }
 
-  visitRefIs(expr: ExpressionRef): void {
+  visitRefIsNull(expr: ExpressionRef): void {
     // unimp
   }
 
@@ -973,11 +973,11 @@ export abstract class Visitor {
         this.visitRefNull(expr);
         break;
       }
-      case ExpressionId.RefIs: {
+      case ExpressionId.RefIsNull: {
         this.stack.push(expr);
-        this.visit(_BinaryenRefIsGetValue(expr));
+        this.visit(_BinaryenRefIsNullGetValue(expr));
         assert(this.stack.pop() == expr);
-        this.visitRefIs(expr);
+        this.visitRefIsNull(expr);
         break;
       }
       case ExpressionId.RefFunc: {
@@ -1811,10 +1811,10 @@ export function replaceChild(
     case ExpressionId.RefNull: {
       break;
     }
-    case ExpressionId.RefIs: {
-      let value = _BinaryenRefIsGetValue(parent);
+    case ExpressionId.RefIsNull: {
+      let value = _BinaryenRefIsNullGetValue(parent);
       if (value == search) {
-        _BinaryenRefIsSetValue(parent, replacement);
+        _BinaryenRefIsNullSetValue(parent, replacement);
         return value;
       }
       break;
diff --git a/src/program.ts b/src/program.ts
index 456191a07d..b91dd47a98 100644
--- a/src/program.ts
+++ b/src/program.ts
@@ -1018,9 +1018,9 @@ export class Program extends DiagnosticEmitter {
     this.registerNativeType(CommonNames.externref, Type.externref);
     this.registerNativeType(CommonNames.anyref, Type.anyref);
     this.registerNativeType(CommonNames.eqref, Type.eqref);
-    this.registerNativeType(CommonNames.i31ref, Type.i31ref);
-    this.registerNativeType(CommonNames.dataref, Type.dataref);
+    this.registerNativeType(CommonNames.structref, Type.structref);
     this.registerNativeType(CommonNames.arrayref, Type.arrayref);
+    this.registerNativeType(CommonNames.i31ref, Type.i31ref);
     this.registerNativeType(CommonNames.stringref, Type.stringref);
     this.registerNativeType(CommonNames.stringview_wtf8, Type.stringview_wtf8);
     this.registerNativeType(CommonNames.stringview_wtf16, Type.stringview_wtf16);
@@ -1293,9 +1293,9 @@ export class Program extends DiagnosticEmitter {
       if (options.hasFeature(Feature.GC)) {
         this.registerWrapperClass(Type.anyref, CommonNames.Anyref);
         this.registerWrapperClass(Type.eqref, CommonNames.Eqref);
-        this.registerWrapperClass(Type.i31ref, CommonNames.I31ref);
-        this.registerWrapperClass(Type.dataref, CommonNames.Dataref);
+        this.registerWrapperClass(Type.structref, CommonNames.Structref);
         this.registerWrapperClass(Type.arrayref, CommonNames.Arrayref);
+        this.registerWrapperClass(Type.i31ref, CommonNames.I31ref);
       }
     }
 
@@ -1964,9 +1964,9 @@ export class Program extends DiagnosticEmitter {
         return this.checkFeatureEnabled(Feature.ReferenceTypes, reportNode);
       case TypeKind.Anyref:
       case TypeKind.Eqref:
-      case TypeKind.I31ref:
-      case TypeKind.Dataref:
-      case TypeKind.Arrayref: {
+      case TypeKind.Structref:
+      case TypeKind.Arrayref:
+      case TypeKind.I31ref: {
         return this.checkFeatureEnabled(Feature.ReferenceTypes, reportNode)
             && this.checkFeatureEnabled(Feature.GC, reportNode);
       }
diff --git a/src/types.ts b/src/types.ts
index acdf170ce8..cf97538bf6 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -75,12 +75,12 @@ export const enum TypeKind {
   Anyref,
   /** Equatable reference. */
   Eqref,
-  /** 31-bit integer reference. */
-  I31ref,
-  /** Data reference. */
-  Dataref,
+  /** Struct reference. */
+  Structref,
   /** Array reference. */
   Arrayref,
+  /** 31-bit integer reference. */
+  I31ref,
   /** String reference. */
   Stringref,
   /** WTF8 string view. */
@@ -620,9 +620,9 @@ export class Type {
       case TypeKind.Externref: return CommonNames.externref;
       case TypeKind.Anyref: return CommonNames.anyref;
       case TypeKind.Eqref: return CommonNames.eqref;
-      case TypeKind.I31ref: return CommonNames.i31ref;
-      case TypeKind.Dataref: return CommonNames.dataref;
+      case TypeKind.Structref: return CommonNames.structref;
       case TypeKind.Arrayref: return CommonNames.arrayref;
+      case TypeKind.I31ref: return CommonNames.i31ref;
       case TypeKind.Stringref: return CommonNames.stringref;
       case TypeKind.StringviewWTF8: return CommonNames.stringview_wtf8;
       case TypeKind.StringviewWTF16: return CommonNames.stringview_wtf16;
@@ -663,15 +663,15 @@ export class Type {
       case TypeKind.Eqref: {
         return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Eq, this.is(TypeFlags.Nullable));
       }
-      case TypeKind.I31ref: {
-        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.I31, this.is(TypeFlags.Nullable));
-      }
-      case TypeKind.Dataref: {
-        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Data, this.is(TypeFlags.Nullable));
+      case TypeKind.Structref: {
+        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Struct, this.is(TypeFlags.Nullable));
       }
       case TypeKind.Arrayref: {
         return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Array, this.is(TypeFlags.Nullable));
       }
+      case TypeKind.I31ref: {
+        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.I31, this.is(TypeFlags.Nullable));
+      }
       case TypeKind.Stringref: {
         return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.String, this.is(TypeFlags.Nullable));
       }
@@ -846,22 +846,22 @@ export class Type {
     TypeFlags.Reference, 0
   );
 
-  /** 31-bit integer reference. */
-  static readonly i31ref: Type = new Type(TypeKind.I31ref,
+  /** Struct reference. */
+  static readonly structref: Type = new Type(TypeKind.Structref,
     TypeFlags.External   |
     TypeFlags.Nullable   |
     TypeFlags.Reference, 0
   );
 
-  /** Data reference. */
-  static readonly dataref: Type = new Type(TypeKind.Dataref,
+  /** Array reference. */
+  static readonly arrayref: Type = new Type(TypeKind.Arrayref,
     TypeFlags.External   |
     TypeFlags.Nullable   |
     TypeFlags.Reference, 0
   );
 
-  /** Array reference. */
-  static readonly arrayref: Type = new Type(TypeKind.Arrayref,
+  /** 31-bit integer reference. */
+  static readonly i31ref: Type = new Type(TypeKind.I31ref,
     TypeFlags.External   |
     TypeFlags.Nullable   |
     TypeFlags.Reference, 0
diff --git a/std/assembly/index.d.ts b/std/assembly/index.d.ts
index 352d00b0ac..2945fe460a 100644
--- a/std/assembly/index.d.ts
+++ b/std/assembly/index.d.ts
@@ -43,12 +43,12 @@ declare type externref = object | null;
 declare type anyref = object | null;
 /** Equatable reference. */
 declare type eqref = object | null;
-/** 31-bit integer reference. */
-declare type i31ref = object | null;
-/** Data reference. */
-declare type dataref = object | null;
+/** Struct reference. */
+declare type structref = object | null;
 /** Array reference. */
 declare type arrayref = object | null;
+/** 31-bit integer reference. */
+declare type i31ref = object | null;
 /** String reference. */
 declare type stringref = object | null;
 /** WTF-8 string view. */
diff --git a/std/assembly/reference.ts b/std/assembly/reference.ts
index 65e7291147..1c7b85cb13 100644
--- a/std/assembly/reference.ts
+++ b/std/assembly/reference.ts
@@ -23,7 +23,7 @@ export abstract class I31ref extends Ref {
 }
 
 @final @unmanaged
-export abstract class Dataref extends Ref {
+export abstract class Structref extends Ref {
 }
 
 @final @unmanaged
diff --git a/tests/compiler/NonNullable.debug.wat b/tests/compiler/NonNullable.debug.wat
index b703901bc0..9c5fd0e2ab 100644
--- a/tests/compiler/NonNullable.debug.wat
+++ b/tests/compiler/NonNullable.debug.wat
@@ -1,10 +1,10 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -25,11 +25,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -38,7 +38,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -142,10 +142,10 @@
   i32.const 0
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:NonNullable
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -158,7 +158,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -254,7 +254,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__ne (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__ne (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -286,7 +286,7 @@
   local.get $2
   return
  )
- (func $NonNullable/assertNonNull<~lib/string/String> (type $i32_=>_none) (param $t i32)
+ (func $NonNullable/assertNonNull<~lib/string/String> (param $t i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -321,7 +321,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $NonNullable/safetyCheck<~lib/string/String|null> (type $i32_=>_none) (param $t i32)
+ (func $NonNullable/safetyCheck<~lib/string/String|null> (param $t i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -353,7 +353,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:NonNullable (type $none_=>_none)
+ (func $start:NonNullable
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/NonNullable.release.wat b/tests/compiler/NonNullable.release.wat
index 3ae8a7f85a..551a123dfc 100644
--- a/tests/compiler/NonNullable.release.wat
+++ b/tests/compiler/NonNullable.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34156))
  (memory $0 1)
@@ -20,7 +20,7 @@
  (data (i32.const 1272) "\02\00\00\00^\00\00\00U\00n\00e\00x\00p\00e\00c\00t\00e\00d\00 \00\'\00n\00u\00l\00l\00\'\00 \00(\00n\00o\00t\00 \00a\00s\00s\00i\00g\00n\00e\00d\00 \00o\00r\00 \00f\00a\00i\00l\00e\00d\00 \00c\00a\00s\00t\00)")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -144,7 +144,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -304,7 +304,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__ne (type $none_=>_i32) (result i32)
+ (func $~lib/string/String.__ne (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -342,7 +342,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $NonNullable/assertNonNull<~lib/string/String> (type $none_=>_none)
+ (func $NonNullable/assertNonNull<~lib/string/String>
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/ReturnType.debug.wat b/tests/compiler/ReturnType.debug.wat
index 6ad1f25cad..06b792f458 100644
--- a/tests/compiler/ReturnType.debug.wat
+++ b/tests/compiler/ReturnType.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:ReturnType (type $none_=>_none)
+ (func $start:ReturnType
   i32.const 1
   drop
   i32.const 1
@@ -30,7 +30,7 @@
   i32.eq
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:ReturnType
  )
 )
diff --git a/tests/compiler/abi.debug.wat b/tests/compiler/abi.debug.wat
index 5b5f53c0ee..1563de6f82 100644
--- a/tests/compiler/abi.debug.wat
+++ b/tests/compiler/abi.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $abi/condition (mut i32) (i32.const 0))
  (global $abi/y (mut i32) (i32.const 0))
@@ -17,11 +17,11 @@
  (export "exportedInternal" (func $abi/exportedInternal))
  (export "memory" (memory $0))
  (start $~start)
- (func $abi/internal (type $none_=>_i32) (result i32)
+ (func $abi/internal (result i32)
   i32.const 128
   return
  )
- (func $start:abi (type $none_=>_none)
+ (func $start:abi
   (local $x i32)
   (local $x|1 i32)
   (local $x|2 i32)
@@ -173,21 +173,21 @@
    unreachable
   end
  )
- (func $abi/exported (type $none_=>_i32) (result i32)
+ (func $abi/exported (result i32)
   i32.const 128
   i32.extend8_s
   return
  )
- (func $abi/exportedExported (type $none_=>_i32) (result i32)
+ (func $abi/exportedExported (result i32)
   call $abi/exported
   return
  )
- (func $abi/exportedInternal (type $none_=>_i32) (result i32)
+ (func $abi/exportedInternal (result i32)
   call $abi/internal
   i32.extend8_s
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:abi
  )
 )
diff --git a/tests/compiler/abi.release.wat b/tests/compiler/abi.release.wat
index 867d26b5da..135f503138 100644
--- a/tests/compiler/abi.release.wat
+++ b/tests/compiler/abi.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
  (memory $0 1)
  (data (i32.const 1036) "\1c")
  (data (i32.const 1048) "\02\00\00\00\0c\00\00\00a\00b\00i\00.\00t\00s")
@@ -7,7 +7,7 @@
  (export "exportedExported" (func $abi/exported))
  (export "exportedInternal" (func $abi/exported))
  (export "memory" (memory $0))
- (func $abi/exported (type $none_=>_i32) (result i32)
+ (func $abi/exported (result i32)
   i32.const -128
  )
 )
diff --git a/tests/compiler/asc-constants.debug.wat b/tests/compiler/asc-constants.debug.wat
index cf20547ea6..ad4dcfbe27 100644
--- a/tests/compiler/asc-constants.debug.wat
+++ b/tests/compiler/asc-constants.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/native/ASC_TARGET i32 (i32.const 1))
  (global $~lib/native/ASC_RUNTIME i32 (i32.const 2))
  (global $~lib/native/ASC_NO_ASSERT i32 (i32.const 0))
@@ -29,7 +29,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:asc-constants (type $none_=>_none)
+ (func $start:asc-constants
   i32.const 1
   drop
   i32.const 2
@@ -79,7 +79,7 @@
   i32.const 1
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:asc-constants
  )
 )
diff --git a/tests/compiler/assert-nonnull.debug.wat b/tests/compiler/assert-nonnull.debug.wat
index 7df6b2a764..e1201ee25e 100644
--- a/tests/compiler/assert-nonnull.debug.wat
+++ b/tests/compiler/assert-nonnull.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -33,31 +33,31 @@
  (export "testRet" (func $export:assert-nonnull/testRet))
  (export "testObjFn" (func $export:assert-nonnull/testObjFn))
  (export "testObjRet" (func $export:assert-nonnull/testObjRet))
- (func $assert-nonnull/Foo#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $assert-nonnull/Foo#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<assert-nonnull/Foo>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<assert-nonnull/Foo>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<assert-nonnull/Foo|null>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo|null>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<assert-nonnull/Foo|null>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo|null>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $assert-nonnull/Foo#get:baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $assert-nonnull/Foo#get:baz (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -70,7 +70,7 @@
    unreachable
   end
  )
- (func $assert-nonnull/testObj (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testObj (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -110,7 +110,7 @@
   local.get $2
   return
  )
- (func $assert-nonnull/testProp (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testProp (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -150,7 +150,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<assert-nonnull/Foo>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -217,7 +217,7 @@
   local.get $3
   return
  )
- (func $assert-nonnull/testArr (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testArr (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -258,7 +258,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<assert-nonnull/Foo|null>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo|null>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -315,7 +315,7 @@
   local.get $3
   return
  )
- (func $assert-nonnull/testElem (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testElem (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -356,7 +356,7 @@
   local.get $2
   return
  )
- (func $assert-nonnull/testAll (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testAll (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -434,7 +434,7 @@
   local.get $4
   return
  )
- (func $assert-nonnull/testAll2 (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testAll2 (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -512,7 +512,7 @@
   local.get $4
   return
  )
- (func $assert-nonnull/testObjFn (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testObjFn (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -556,7 +556,7 @@
   local.get $2
   return
  )
- (func $assert-nonnull/testObjRet (type $i32_=>_i32) (param $foo i32) (result i32)
+ (func $assert-nonnull/testObjRet (param $foo i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -618,7 +618,7 @@
   local.get $3
   return
  )
- (func $assert-nonnull/testVar (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $assert-nonnull/testVar (param $n i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -652,7 +652,7 @@
   local.get $2
   return
  )
- (func $assert-nonnull/testFn (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $assert-nonnull/testFn (param $fn i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -690,7 +690,7 @@
   local.get $2
   return
  )
- (func $assert-nonnull/testFn2 (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $assert-nonnull/testFn2 (param $fn i32) (result i32)
   (local $1 i32)
   (local $fn2 i32)
   (local $3 i32)
@@ -733,7 +733,7 @@
   local.get $3
   return
  )
- (func $assert-nonnull/testRet (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $assert-nonnull/testRet (param $fn i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -786,7 +786,7 @@
   local.get $3
   return
  )
- (func $export:assert-nonnull/testVar (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testVar (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -805,7 +805,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testObj (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObj (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -824,7 +824,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testProp (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testProp (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -843,7 +843,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testArr (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testArr (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -862,7 +862,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testElem (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testElem (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -881,7 +881,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testAll (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testAll (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -900,7 +900,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testAll2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testAll2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -919,7 +919,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testFn (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testFn (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -938,7 +938,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testFn2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testFn2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -957,7 +957,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testRet (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testRet (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -976,7 +976,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testObjFn (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObjFn (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -995,7 +995,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:assert-nonnull/testObjRet (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObjRet (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/assert-nonnull.release.wat b/tests/compiler/assert-nonnull.release.wat
index 02f150ca77..aa6d7b2325 100644
--- a/tests/compiler/assert-nonnull.release.wat
+++ b/tests/compiler/assert-nonnull.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34236))
  (memory $0 1)
@@ -16,6 +16,7 @@
  (data (i32.const 1340) "|")
  (data (i32.const 1352) "\02\00\00\00^\00\00\00E\00l\00e\00m\00e\00n\00t\00 \00t\00y\00p\00e\00 \00m\00u\00s\00t\00 \00b\00e\00 \00n\00u\00l\00l\00a\00b\00l\00e\00 \00i\00f\00 \00a\00r\00r\00a\00y\00 \00i\00s\00 \00h\00o\00l\00e\00y")
  (table $0 1 1 funcref)
+ (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "testVar" (func $export:assert-nonnull/testVar))
  (export "testObj" (func $export:assert-nonnull/testObj))
@@ -29,7 +30,7 @@
  (export "testRet" (func $export:assert-nonnull/testRet))
  (export "testObjFn" (func $export:assert-nonnull/testObjFn))
  (export "testObjRet" (func $export:assert-nonnull/testObjRet))
- (func $~lib/array/Array<assert-nonnull/Foo|null>#__get (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo|null>#__get (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -80,7 +81,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:assert-nonnull/testVar (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testVar (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -138,7 +139,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testObj (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObj (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -203,7 +204,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testProp (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testProp (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -266,7 +267,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testArr (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testArr (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -378,7 +379,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testElem (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testElem (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -441,7 +442,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testAll (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testAll (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -523,7 +524,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testAll2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testAll2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -605,7 +606,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testFn (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testFn (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -658,7 +659,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testFn2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testFn2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -714,7 +715,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testRet (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testRet (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -768,7 +769,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testObjFn (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObjFn (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -826,7 +827,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:assert-nonnull/testObjRet (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:assert-nonnull/testObjRet (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/assert.debug.wat b/tests/compiler/assert.debug.wat
index 2de0315c08..c8d990d211 100644
--- a/tests/compiler/assert.debug.wat
+++ b/tests/compiler/assert.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:assert (type $none_=>_none)
+ (func $start:assert
   i32.const 1
   drop
   i32.const 1
@@ -33,7 +33,7 @@
   i32.eqz
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:assert
  )
 )
diff --git a/tests/compiler/bigint-integration.debug.wat b/tests/compiler/bigint-integration.debug.wat
index cd703989cd..ff9646e8f9 100644
--- a/tests/compiler/bigint-integration.debug.wat
+++ b/tests/compiler/bigint-integration.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_i64 (func (result i64)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "bigint-integration" "externalValue" (global $bigint-integration/externalValue i64))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "bigint-integration" "getExternalValue" (func $bigint-integration/getExternalValue (result i64)))
@@ -18,7 +18,7 @@
  (export "getInternalValue" (func $bigint-integration/getInternalValue))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $start:bigint-integration (type $none_=>_none)
+ (func $start:bigint-integration
   global.get $bigint-integration/externalValue
   i64.const 9007199254740991
   i64.eq
@@ -44,11 +44,11 @@
    unreachable
   end
  )
- (func $bigint-integration/getInternalValue (type $none_=>_i64) (result i64)
+ (func $bigint-integration/getInternalValue (result i64)
   global.get $bigint-integration/internalValue
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
diff --git a/tests/compiler/bigint-integration.release.wat b/tests/compiler/bigint-integration.release.wat
index 36616dfa4c..6845ac33b8 100644
--- a/tests/compiler/bigint-integration.release.wat
+++ b/tests/compiler/bigint-integration.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_i64 (func (result i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "bigint-integration" "externalValue" (global $bigint-integration/externalValue i64))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "bigint-integration" "getExternalValue" (func $bigint-integration/getExternalValue (result i64)))
@@ -14,10 +14,10 @@
  (export "getInternalValue" (func $bigint-integration/getInternalValue))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $bigint-integration/getInternalValue (type $none_=>_i64) (result i64)
+ (func $bigint-integration/getInternalValue (result i64)
   i64.const 9007199254740991
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
diff --git a/tests/compiler/binary.debug.wat b/tests/compiler/binary.debug.wat
index bd7c7e1b46..1842ceb161 100644
--- a/tests/compiler/binary.debug.wat
+++ b/tests/compiler/binary.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $binary/b (mut i32) (i32.const 0))
  (global $binary/i (mut i32) (i32.const 0))
  (global $~lib/native/ASC_SHRINK_LEVEL i32 (i32.const 0))
@@ -22,7 +22,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $x i32) (param $e i32) (result i32)
+ (func $~lib/math/ipow32 (param $x i32) (param $e i32) (result i32)
   (local $out i32)
   (local $log i32)
   (local $4 i32)
@@ -240,7 +240,7 @@
   local.get $out
   return
  )
- (func $~lib/math/NativeMath.pow (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.pow (param $x f64) (param $y f64) (result f64)
   (local $x|2 f64)
   (local $y|3 f64)
   (local $sign_bias i32)
@@ -1284,7 +1284,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.mod (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ex i32)
@@ -1533,7 +1533,7 @@
   f32.reinterpret_i32
   return
  )
- (func $~lib/math/NativeMathf.pow (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (param $x f32) (param $y f32) (result f32)
   (local $x|2 f32)
   (local $y|3 f32)
   (local $signBias i32)
@@ -2197,7 +2197,7 @@
   end
   return
  )
- (func $~lib/math/NativeMath.mod (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.mod (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ex i64)
@@ -2452,7 +2452,7 @@
   f64.reinterpret_i64
   return
  )
- (func $start:binary (type $none_=>_none)
+ (func $start:binary
   global.get $binary/i
   i32.const 1
   i32.lt_s
@@ -3057,7 +3057,7 @@
   call $~lib/math/NativeMath.pow
   global.set $binary/F
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:binary
  )
 )
diff --git a/tests/compiler/binary.release.wat b/tests/compiler/binary.release.wat
index a65232b239..de6ce38841 100644
--- a/tests/compiler/binary.release.wat
+++ b/tests/compiler/binary.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $binary/i (mut i32) (i32.const 0))
  (global $binary/I (mut i64) (i64.const 0))
  (global $binary/f (mut f32) (f32.const 0))
@@ -139,7 +139,7 @@
  (data (i32.const 7430) "\f0?t\85\15\d3\b0\d9\ef?\0f\89\f9lX\b5\ef?Q[\12\d0\01\93\ef?{Q}<\b8r\ef?\aa\b9h1\87T\ef?8bunz8\ef?\e1\de\1f\f5\9d\1e\ef?\15\b71\n\fe\06\ef?\cb\a9:7\a7\f1\ee?\"4\12L\a6\de\ee?-\89a`\08\ce\ee?\'*6\d5\da\bf\ee?\82O\9dV+\b4\ee?)TH\dd\07\ab\ee?\85U:\b0~\a4\ee?\cd;\7ff\9e\a0\ee?t_\ec\e8u\9f\ee?\87\01\ebs\14\a1\ee?\13\ceL\99\89\a5\ee?\db\a0*B\e5\ac\ee?\e5\c5\cd\b07\b7\ee?\90\f0\a3\82\91\c4\ee?]%>\b2\03\d5\ee?\ad\d3Z\99\9f\e8\ee?G^\fb\f2v\ff\ee?\9cR\85\dd\9b\19\ef?i\90\ef\dc 7\ef?\87\a4\fb\dc\18X\ef?_\9b{3\97|\ef?\da\90\a4\a2\af\a4\ef?@En[v\d0\ef?")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 f32)
   (local $1 f64)
   global.get $binary/i
diff --git a/tests/compiler/bindings/esm.debug.wat b/tests/compiler/bindings/esm.debug.wat
index 87b0ce6c5b..e8044e808a 100644
--- a/tests/compiler/bindings/esm.debug.wat
+++ b/tests/compiler/bindings/esm.debug.wat
@@ -1,22 +1,22 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $none_=>_i64 (func (result i64)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "globalThis" (global $bindings/esm/immutableGlobal externref))
  (import "env" "globalThis.globalThis" (global $bindings/esm/immutableGlobalNested externref))
@@ -121,51 +121,51 @@
  (export "objectFunction" (func $export:bindings/esm/objectFunction))
  (export "internrefFunction" (func $export:bindings/esm/internrefFunction))
  (export "functionFunction" (func $export:bindings/esm/functionFunction))
- (func $start:bindings/esm~anonymous|0 (type $none_=>_none)
+ (func $start:bindings/esm~anonymous|0
   nop
  )
- (func $bindings/esm/plainFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/plainFunction (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $bindings/esm/plainFunction64 (type $i64_i64_=>_i64) (param $a i64) (param $b i64) (result i64)
+ (func $bindings/esm/plainFunction64 (param $a i64) (param $b i64) (result i64)
   local.get $a
   local.get $b
   i64.add
   return
  )
- (func $bindings/esm/getMaxUnsigned32 (type $none_=>_i32) (result i32)
+ (func $bindings/esm/getMaxUnsigned32 (result i32)
   global.get $~lib/builtins/u32.MAX_VALUE
   return
  )
- (func $bindings/esm/getMaxUnsigned64 (type $none_=>_i64) (result i64)
+ (func $bindings/esm/getMaxUnsigned64 (result i64)
   global.get $~lib/builtins/u64.MAX_VALUE
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -175,11 +175,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -188,14 +188,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -237,7 +237,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -249,11 +249,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -263,7 +263,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -319,15 +319,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -353,7 +353,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -373,7 +373,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -393,7 +393,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -429,7 +429,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -455,7 +455,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -476,11 +476,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -491,39 +491,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -759,7 +759,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1123,7 +1123,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1288,7 +1288,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1433,7 +1433,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1471,7 +1471,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1484,7 +1484,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1501,7 +1501,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1526,7 +1526,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1706,7 +1706,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1764,7 +1764,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1785,7 +1785,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1801,7 +1801,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2009,7 +2009,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2099,7 +2099,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2208,7 +2208,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2272,7 +2272,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2285,17 +2285,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2348,7 +2348,7 @@
   local.get $ptr
   return
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2357,7 +2357,7 @@
   i32.shr_u
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2425,7 +2425,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2434,25 +2434,25 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/staticarray/StaticArray<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2461,7 +2461,7 @@
   i32.shr_u
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -2472,15 +2472,15 @@
   i32.const 0
   drop
  )
- (func $bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $bindings/esm/staticarrayU16 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $bindings/esm/staticarrayI64 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $bindings/esm/staticarrayI64 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2489,38 +2489,38 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2566,7 +2566,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<~lib/string/String>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<~lib/string/String>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2575,95 +2575,95 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<~lib/string/String>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<~lib/string/String>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<~lib/string/String>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<~lib/string/String>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/string/String>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $bindings/esm/PlainObject#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $bindings/esm/PlainObject#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store8 $0
  )
- (func $bindings/esm/PlainObject#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $bindings/esm/PlainObject#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store16 $0 offset=2
  )
- (func $bindings/esm/PlainObject#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $bindings/esm/PlainObject#set:c (param $this i32) (param $c i32)
   local.get $this
   local.get $c
   i32.store $0 offset=4
  )
- (func $bindings/esm/PlainObject#set:d (type $i32_i64_=>_none) (param $this i32) (param $d i64)
+ (func $bindings/esm/PlainObject#set:d (param $this i32) (param $d i64)
   local.get $this
   local.get $d
   i64.store $0 offset=8
  )
- (func $bindings/esm/PlainObject#set:e (type $i32_i32_=>_none) (param $this i32) (param $e i32)
+ (func $bindings/esm/PlainObject#set:e (param $this i32) (param $e i32)
   local.get $this
   local.get $e
   i32.store8 $0 offset=16
  )
- (func $bindings/esm/PlainObject#set:f (type $i32_i32_=>_none) (param $this i32) (param $f i32)
+ (func $bindings/esm/PlainObject#set:f (param $this i32) (param $f i32)
   local.get $this
   local.get $f
   i32.store16 $0 offset=18
  )
- (func $bindings/esm/PlainObject#set:g (type $i32_i32_=>_none) (param $this i32) (param $g i32)
+ (func $bindings/esm/PlainObject#set:g (param $this i32) (param $g i32)
   local.get $this
   local.get $g
   i32.store $0 offset=20
  )
- (func $bindings/esm/PlainObject#set:h (type $i32_i64_=>_none) (param $this i32) (param $h i64)
+ (func $bindings/esm/PlainObject#set:h (param $this i32) (param $h i64)
   local.get $this
   local.get $h
   i64.store $0 offset=24
  )
- (func $bindings/esm/PlainObject#set:i (type $i32_i32_=>_none) (param $this i32) (param $i i32)
+ (func $bindings/esm/PlainObject#set:i (param $this i32) (param $i i32)
   local.get $this
   local.get $i
   i32.store $0 offset=32
  )
- (func $bindings/esm/PlainObject#set:j (type $i32_i32_=>_none) (param $this i32) (param $j i32)
+ (func $bindings/esm/PlainObject#set:j (param $this i32) (param $j i32)
   local.get $this
   local.get $j
   i32.store $0 offset=36
  )
- (func $bindings/esm/PlainObject#set:k (type $i32_i32_=>_none) (param $this i32) (param $k i32)
+ (func $bindings/esm/PlainObject#set:k (param $this i32) (param $k i32)
   local.get $this
   local.get $k
   i32.store8 $0 offset=40
  )
- (func $bindings/esm/PlainObject#set:l (type $i32_f32_=>_none) (param $this i32) (param $l f32)
+ (func $bindings/esm/PlainObject#set:l (param $this i32) (param $l f32)
   local.get $this
   local.get $l
   f32.store $0 offset=44
  )
- (func $bindings/esm/PlainObject#set:m (type $i32_f64_=>_none) (param $this i32) (param $m f64)
+ (func $bindings/esm/PlainObject#set:m (param $this i32) (param $m f64)
   local.get $this
   local.get $m
   f64.store $0 offset=48
  )
- (func $bindings/esm/PlainObject#set:n (type $i32_i32_=>_none) (param $this i32) (param $n i32)
+ (func $bindings/esm/PlainObject#set:n (param $this i32) (param $n i32)
   local.get $this
   local.get $n
   i32.store $0 offset=56
@@ -2672,7 +2672,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#set:o (type $i32_i32_=>_none) (param $this i32) (param $o i32)
+ (func $bindings/esm/PlainObject#set:o (param $this i32) (param $o i32)
   local.get $this
   local.get $o
   i32.store $0 offset=60
@@ -2681,7 +2681,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#set:p (type $i32_i32_=>_none) (param $this i32) (param $p i32)
+ (func $bindings/esm/PlainObject#set:p (param $this i32) (param $p i32)
   local.get $this
   local.get $p
   i32.store $0 offset=64
@@ -2690,28 +2690,28 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#get:a (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0
  )
- (func $bindings/esm/PlainObject#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#get:b (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=2
  )
- (func $bindings/esm/newInternref (type $none_=>_i32) (result i32)
+ (func $bindings/esm/newInternref (result i32)
   i32.const 0
   call $bindings/esm/NonPlainObject#constructor
   return
  )
- (func $bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/internrefFunction (param $a i32) (param $b i32) (result i32)
   local.get $a
   return
  )
- (func $bindings/esm/functionFunction (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $bindings/esm/functionFunction (param $fn i32) (result i32)
   local.get $fn
   return
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $ptr i32) (result i32)
   (local $obj i32)
   local.get $ptr
   if
@@ -2741,7 +2741,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/itcms/__unpin (param $ptr i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -2779,7 +2779,7 @@
    call $~lib/rt/itcms/Object#linkTo
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2825,7 +2825,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $bindings/esm/stringGlobal
   local.tee $1
@@ -2860,7 +2860,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2874,14 +2874,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2889,26 +2889,26 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/typedarray/Int16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2916,11 +2916,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2928,7 +2928,7 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $bindings/esm/PlainObject~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $bindings/esm/PlainObject~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2958,12 +2958,12 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $bindings/esm/NonPlainObject
     block $~lib/typedarray/Uint8Array
@@ -3048,11 +3048,11 @@
   end
   unreachable
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -3078,7 +3078,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3091,7 +3091,7 @@
    unreachable
   end
  )
- (func $start:bindings/esm (type $none_=>_none)
+ (func $start:bindings/esm
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3135,7 +3135,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/bufferFunction (param $a i32) (param $b i32) (result i32)
   (local $aByteLength i32)
   (local $bByteLength i32)
   (local $out i32)
@@ -3191,7 +3191,7 @@
   local.get $5
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -3267,7 +3267,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3298,7 +3298,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunction (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3329,7 +3329,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunctionOptional (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunctionOptional (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3360,7 +3360,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunctionOptional@varargs (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3408,7 +3408,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3519,7 +3519,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Uint64Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3559,7 +3559,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3586,7 +3586,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Float32Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float32Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3613,7 +3613,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int16Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3662,7 +3662,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3709,7 +3709,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -3759,7 +3759,7 @@
   local.get $3
   return
  )
- (func $bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/typedarrayFunction (param $a i32) (param $b i32) (result i32)
   (local $out i32)
   (local $i i32)
   (local $i|4 i32)
@@ -3886,7 +3886,7 @@
   local.get $5
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3932,7 +3932,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3973,7 +3973,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/staticarrayFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -4098,7 +4098,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -4236,7 +4236,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4261,7 +4261,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4313,7 +4313,7 @@
   local.get $3
   return
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -4432,7 +4432,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4501,7 +4501,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/arrayFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -4626,7 +4626,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<~lib/string/String>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -4764,7 +4764,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4789,7 +4789,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4856,7 +4856,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4929,7 +4929,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/arrayOfStringsFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -5064,7 +5064,7 @@
   local.get $5
   return
  )
- (func $bindings/esm/PlainObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5230,7 +5230,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/objectFunction (param $a i32) (param $b i32) (result i32)
   (local $ref i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5302,7 +5302,7 @@
   local.get $3
   return
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5326,7 +5326,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5352,7 +5352,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -5422,7 +5422,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5463,7 +5463,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $outSize i32)
   (local $out i32)
   (local $4 i32)
@@ -5511,7 +5511,7 @@
   local.get $4
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5539,7 +5539,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $bindings/esm/NonPlainObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/NonPlainObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5567,7 +5567,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/bufferFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5590,7 +5590,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5613,7 +5613,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunctionOptional@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5636,7 +5636,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5659,7 +5659,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/staticarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5682,7 +5682,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayU16 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5701,7 +5701,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/staticarrayI64 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayI64 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5720,7 +5720,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5743,7 +5743,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5766,7 +5766,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/objectFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5789,7 +5789,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/internrefFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5812,7 +5812,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/functionFunction (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/functionFunction (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/bindings/esm.release.wat b/tests/compiler/bindings/esm.release.wat
index af67b5b76f..e0cda31112 100644
--- a/tests/compiler/bindings/esm.release.wat
+++ b/tests/compiler/bindings/esm.release.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $none_=>_i64 (func (result i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "console.log" (func $~lib/bindings/dom/console.log (param i32)))
@@ -120,23 +120,23 @@
  (export "objectFunction" (func $export:bindings/esm/objectFunction))
  (export "internrefFunction" (func $export:bindings/esm/internrefFunction))
  (export "functionFunction" (func $export:bindings/esm/staticarrayU16))
- (func $bindings/esm/plainFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/plainFunction (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $bindings/esm/plainFunction64 (type $i64_i64_=>_i64) (param $0 i64) (param $1 i64) (result i64)
+ (func $bindings/esm/plainFunction64 (param $0 i64) (param $1 i64) (result i64)
   local.get $0
   local.get $1
   i64.add
  )
- (func $bindings/esm/getMaxUnsigned32 (type $none_=>_i32) (result i32)
+ (func $bindings/esm/getMaxUnsigned32 (result i32)
   i32.const -1
  )
- (func $bindings/esm/getMaxUnsigned64 (type $none_=>_i64) (result i64)
+ (func $bindings/esm/getMaxUnsigned64 (result i64)
   i64.const -1
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1056
@@ -197,7 +197,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#unlink (param $0 i32)
   (local $1 i32)
   local.get $0
   i32.load $0 offset=4
@@ -248,7 +248,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -332,7 +332,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -485,7 +485,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -731,7 +731,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -843,7 +843,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -922,7 +922,7 @@
   i32.const 35056
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1189,7 +1189,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1315,7 +1315,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1621,7 +1621,7 @@
   memory.fill $0
   local.get $1
  )
- (func $bindings/esm/newInternref (type $none_=>_i32) (result i32)
+ (func $bindings/esm/newInternref (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1654,7 +1654,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1705,7 +1705,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/__unpin (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1764,7 +1764,7 @@
    i32.store $0 offset=8
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   global.get $~lib/rt/itcms/state
   i32.const 0
   i32.gt_s
@@ -1799,7 +1799,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1984,11 +1984,11 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~started
   if
@@ -2073,7 +2073,7 @@
   i32.const 1648
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2199,7 +2199,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2234,7 +2234,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2269,7 +2269,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2324,7 +2324,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -2662,7 +2662,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2715,7 +2715,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2771,7 +2771,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2804,7 +2804,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2858,7 +2858,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2994,7 +2994,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3064,7 +3064,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3297,7 +3297,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3363,7 +3363,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3439,7 +3439,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3682,7 +3682,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/bufferFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3797,7 +3797,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3831,7 +3831,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunctionOptional@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3909,7 +3909,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3943,7 +3943,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/staticarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4144,7 +4144,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayU16 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4171,7 +4171,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4205,7 +4205,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4239,7 +4239,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/objectFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4491,7 +4491,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/internrefFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4521,7 +4521,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -4540,7 +4540,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/bindings/noExportRuntime.debug.wat b/tests/compiler/bindings/noExportRuntime.debug.wat
index b27be59ab5..9adeee587f 100644
--- a/tests/compiler/bindings/noExportRuntime.debug.wat
+++ b/tests/compiler/bindings/noExportRuntime.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $bindings/noExportRuntime/isBasic (mut i32) (i32.const 0))
  (global $bindings/noExportRuntime/isString i32 (i32.const 32))
@@ -70,17 +70,17 @@
  (export "_start" (func $~start))
  (export "takesNonPlainObject" (func $export:bindings/noExportRuntime/takesNonPlainObject))
  (export "takesFunction" (func $export:bindings/noExportRuntime/takesFunction))
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -90,11 +90,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -103,14 +103,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -152,7 +152,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -164,11 +164,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -178,7 +178,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -234,15 +234,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -268,7 +268,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -288,7 +288,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -308,7 +308,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -344,7 +344,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -370,7 +370,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -391,11 +391,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -406,39 +406,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -674,7 +674,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1038,7 +1038,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1203,7 +1203,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1348,7 +1348,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1386,7 +1386,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1399,7 +1399,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1416,7 +1416,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1441,7 +1441,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1621,7 +1621,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1679,7 +1679,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1700,7 +1700,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1716,7 +1716,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1924,7 +1924,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2014,7 +2014,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2123,7 +2123,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2187,7 +2187,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2200,17 +2200,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2263,7 +2263,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2331,7 +2331,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2340,17 +2340,17 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $start:bindings/noExportRuntime (type $none_=>_none)
+ (func $start:bindings/noExportRuntime
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2381,37 +2381,37 @@
   call $~lib/typedarray/Int32Array#constructor
   global.set $bindings/noExportRuntime/isTypedArray
  )
- (func $bindings/noExportRuntime/takesReturnsBasic (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $bindings/noExportRuntime/takesReturnsBasic (param $a i32) (result i32)
   global.get $bindings/noExportRuntime/isBasic
   return
  )
- (func $bindings/noExportRuntime/returnsString (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsString (result i32)
   global.get $bindings/noExportRuntime/isString
   return
  )
- (func $bindings/noExportRuntime/returnsBuffer (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsBuffer (result i32)
   global.get $bindings/noExportRuntime/isBuffer
   return
  )
- (func $bindings/noExportRuntime/returnsTypedArray (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsTypedArray (result i32)
   global.get $bindings/noExportRuntime/isTypedArray
   return
  )
- (func $bindings/noExportRuntime/returnsArrayOfBasic (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsArrayOfBasic (result i32)
   global.get $bindings/noExportRuntime/isArrayOfBasic
   return
  )
- (func $bindings/noExportRuntime/returnsArrayOfArray (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsArrayOfArray (result i32)
   global.get $bindings/noExportRuntime/isArrayOfArray
   return
  )
- (func $bindings/noExportRuntime/takesNonPlainObject (type $i32_=>_none) (param $obj i32)
+ (func $bindings/noExportRuntime/takesNonPlainObject (param $obj i32)
   nop
  )
- (func $bindings/noExportRuntime/takesFunction (type $i32_=>_none) (param $fn i32)
+ (func $bindings/noExportRuntime/takesFunction (param $fn i32)
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $bindings/noExportRuntime/isString
   local.tee $1
@@ -2458,7 +2458,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2472,19 +2472,19 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/typedarray/Int32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2492,19 +2492,19 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2512,7 +2512,7 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<i32>>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $bindings/noExportRuntime/NonPlainObject
     block $~lib/array/Array<~lib/array/Array<i32>>
@@ -2558,7 +2558,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2567,7 +2567,7 @@
   global.set $~started
   call $start:bindings/noExportRuntime
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2580,7 +2580,7 @@
    unreachable
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2691,7 +2691,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2731,7 +2731,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2757,7 +2757,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -2827,7 +2827,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2868,7 +2868,7 @@
   local.get $3
   return
  )
- (func $export:bindings/noExportRuntime/takesNonPlainObject (type $i32_=>_none) (param $0 i32)
+ (func $export:bindings/noExportRuntime/takesNonPlainObject (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2884,7 +2884,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:bindings/noExportRuntime/takesFunction (type $i32_=>_none) (param $0 i32)
+ (func $export:bindings/noExportRuntime/takesFunction (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/bindings/noExportRuntime.release.wat b/tests/compiler/bindings/noExportRuntime.release.wat
index 2a82a185fb..ebca3237e2 100644
--- a/tests/compiler/bindings/noExportRuntime.release.wat
+++ b/tests/compiler/bindings/noExportRuntime.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $bindings/noExportRuntime/isBasic (mut i32) (i32.const 0))
  (global $bindings/noExportRuntime/isString i32 (i32.const 1056))
@@ -68,7 +68,7 @@
  (export "_start" (func $~start))
  (export "takesNonPlainObject" (func $export:bindings/noExportRuntime/takesNonPlainObject))
  (export "takesFunction" (func $export:bindings/noExportRuntime/takesNonPlainObject))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1056
@@ -133,7 +133,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -265,7 +265,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -418,7 +418,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -664,7 +664,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -776,7 +776,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -855,7 +855,7 @@
   i32.const 34560
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1122,7 +1122,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1248,7 +1248,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1554,7 +1554,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1609,25 +1609,25 @@
    end
   end
  )
- (func $bindings/noExportRuntime/takesReturnsBasic (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $bindings/noExportRuntime/takesReturnsBasic (param $0 i32) (result i32)
   global.get $bindings/noExportRuntime/isBasic
  )
- (func $bindings/noExportRuntime/returnsString (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsString (result i32)
   i32.const 1056
  )
- (func $bindings/noExportRuntime/returnsBuffer (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsBuffer (result i32)
   global.get $bindings/noExportRuntime/isBuffer
  )
- (func $bindings/noExportRuntime/returnsTypedArray (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsTypedArray (result i32)
   global.get $bindings/noExportRuntime/isTypedArray
  )
- (func $bindings/noExportRuntime/returnsArrayOfBasic (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsArrayOfBasic (result i32)
   i32.const 1632
  )
- (func $bindings/noExportRuntime/returnsArrayOfArray (type $none_=>_i32) (result i32)
+ (func $bindings/noExportRuntime/returnsArrayOfArray (result i32)
   i32.const 1712
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1750,7 +1750,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1933,7 +1933,7 @@
    unreachable
   end
  )
- (func $export:bindings/noExportRuntime/takesNonPlainObject (type $i32_=>_none) (param $0 i32)
+ (func $export:bindings/noExportRuntime/takesNonPlainObject (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1959,7 +1959,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/bindings/raw.debug.wat b/tests/compiler/bindings/raw.debug.wat
index 7285dc2175..5d27d45e00 100644
--- a/tests/compiler/bindings/raw.debug.wat
+++ b/tests/compiler/bindings/raw.debug.wat
@@ -1,22 +1,22 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $none_=>_i64 (func (result i64)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "globalThis" (global $bindings/esm/immutableGlobal externref))
  (import "env" "globalThis.globalThis" (global $bindings/esm/immutableGlobalNested externref))
@@ -121,54 +121,54 @@
  (export "objectFunction" (func $export:bindings/esm/objectFunction))
  (export "internrefFunction" (func $export:bindings/esm/internrefFunction))
  (export "functionFunction" (func $export:bindings/esm/functionFunction))
- (func $start:bindings/esm~anonymous|0 (type $none_=>_none)
+ (func $start:bindings/esm~anonymous|0
   nop
  )
- (func $start:bindings/raw (type $none_=>_none)
+ (func $start:bindings/raw
   call $start:bindings/esm
  )
- (func $bindings/esm/plainFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/plainFunction (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $bindings/esm/plainFunction64 (type $i64_i64_=>_i64) (param $a i64) (param $b i64) (result i64)
+ (func $bindings/esm/plainFunction64 (param $a i64) (param $b i64) (result i64)
   local.get $a
   local.get $b
   i64.add
   return
  )
- (func $bindings/esm/getMaxUnsigned32 (type $none_=>_i32) (result i32)
+ (func $bindings/esm/getMaxUnsigned32 (result i32)
   global.get $~lib/builtins/u32.MAX_VALUE
   return
  )
- (func $bindings/esm/getMaxUnsigned64 (type $none_=>_i64) (result i64)
+ (func $bindings/esm/getMaxUnsigned64 (result i64)
   global.get $~lib/builtins/u64.MAX_VALUE
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -178,11 +178,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -191,14 +191,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -240,7 +240,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -252,11 +252,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -266,7 +266,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -322,15 +322,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -356,7 +356,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -376,7 +376,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -396,7 +396,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -432,7 +432,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -458,7 +458,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -479,11 +479,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -494,39 +494,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -762,7 +762,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1126,7 +1126,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1291,7 +1291,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1436,7 +1436,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1474,7 +1474,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1487,7 +1487,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1504,7 +1504,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1529,7 +1529,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1709,7 +1709,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1767,7 +1767,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1788,7 +1788,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1804,7 +1804,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2012,7 +2012,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2102,7 +2102,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2211,7 +2211,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2275,7 +2275,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2288,17 +2288,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2351,7 +2351,7 @@
   local.get $ptr
   return
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2360,7 +2360,7 @@
   i32.shr_u
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2428,7 +2428,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2437,25 +2437,25 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/staticarray/StaticArray<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2464,7 +2464,7 @@
   i32.shr_u
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -2475,15 +2475,15 @@
   i32.const 0
   drop
  )
- (func $bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $bindings/esm/staticarrayU16 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $bindings/esm/staticarrayI64 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $bindings/esm/staticarrayI64 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2492,38 +2492,38 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2569,7 +2569,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<~lib/string/String>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<~lib/string/String>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2578,95 +2578,95 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<~lib/string/String>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<~lib/string/String>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<~lib/string/String>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<~lib/string/String>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/string/String>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $bindings/esm/PlainObject#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $bindings/esm/PlainObject#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store8 $0
  )
- (func $bindings/esm/PlainObject#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $bindings/esm/PlainObject#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store16 $0 offset=2
  )
- (func $bindings/esm/PlainObject#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $bindings/esm/PlainObject#set:c (param $this i32) (param $c i32)
   local.get $this
   local.get $c
   i32.store $0 offset=4
  )
- (func $bindings/esm/PlainObject#set:d (type $i32_i64_=>_none) (param $this i32) (param $d i64)
+ (func $bindings/esm/PlainObject#set:d (param $this i32) (param $d i64)
   local.get $this
   local.get $d
   i64.store $0 offset=8
  )
- (func $bindings/esm/PlainObject#set:e (type $i32_i32_=>_none) (param $this i32) (param $e i32)
+ (func $bindings/esm/PlainObject#set:e (param $this i32) (param $e i32)
   local.get $this
   local.get $e
   i32.store8 $0 offset=16
  )
- (func $bindings/esm/PlainObject#set:f (type $i32_i32_=>_none) (param $this i32) (param $f i32)
+ (func $bindings/esm/PlainObject#set:f (param $this i32) (param $f i32)
   local.get $this
   local.get $f
   i32.store16 $0 offset=18
  )
- (func $bindings/esm/PlainObject#set:g (type $i32_i32_=>_none) (param $this i32) (param $g i32)
+ (func $bindings/esm/PlainObject#set:g (param $this i32) (param $g i32)
   local.get $this
   local.get $g
   i32.store $0 offset=20
  )
- (func $bindings/esm/PlainObject#set:h (type $i32_i64_=>_none) (param $this i32) (param $h i64)
+ (func $bindings/esm/PlainObject#set:h (param $this i32) (param $h i64)
   local.get $this
   local.get $h
   i64.store $0 offset=24
  )
- (func $bindings/esm/PlainObject#set:i (type $i32_i32_=>_none) (param $this i32) (param $i i32)
+ (func $bindings/esm/PlainObject#set:i (param $this i32) (param $i i32)
   local.get $this
   local.get $i
   i32.store $0 offset=32
  )
- (func $bindings/esm/PlainObject#set:j (type $i32_i32_=>_none) (param $this i32) (param $j i32)
+ (func $bindings/esm/PlainObject#set:j (param $this i32) (param $j i32)
   local.get $this
   local.get $j
   i32.store $0 offset=36
  )
- (func $bindings/esm/PlainObject#set:k (type $i32_i32_=>_none) (param $this i32) (param $k i32)
+ (func $bindings/esm/PlainObject#set:k (param $this i32) (param $k i32)
   local.get $this
   local.get $k
   i32.store8 $0 offset=40
  )
- (func $bindings/esm/PlainObject#set:l (type $i32_f32_=>_none) (param $this i32) (param $l f32)
+ (func $bindings/esm/PlainObject#set:l (param $this i32) (param $l f32)
   local.get $this
   local.get $l
   f32.store $0 offset=44
  )
- (func $bindings/esm/PlainObject#set:m (type $i32_f64_=>_none) (param $this i32) (param $m f64)
+ (func $bindings/esm/PlainObject#set:m (param $this i32) (param $m f64)
   local.get $this
   local.get $m
   f64.store $0 offset=48
  )
- (func $bindings/esm/PlainObject#set:n (type $i32_i32_=>_none) (param $this i32) (param $n i32)
+ (func $bindings/esm/PlainObject#set:n (param $this i32) (param $n i32)
   local.get $this
   local.get $n
   i32.store $0 offset=56
@@ -2675,7 +2675,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#set:o (type $i32_i32_=>_none) (param $this i32) (param $o i32)
+ (func $bindings/esm/PlainObject#set:o (param $this i32) (param $o i32)
   local.get $this
   local.get $o
   i32.store $0 offset=60
@@ -2684,7 +2684,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#set:p (type $i32_i32_=>_none) (param $this i32) (param $p i32)
+ (func $bindings/esm/PlainObject#set:p (param $this i32) (param $p i32)
   local.get $this
   local.get $p
   i32.store $0 offset=64
@@ -2693,28 +2693,28 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $bindings/esm/PlainObject#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#get:a (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0
  )
- (func $bindings/esm/PlainObject#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#get:b (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=2
  )
- (func $bindings/esm/newInternref (type $none_=>_i32) (result i32)
+ (func $bindings/esm/newInternref (result i32)
   i32.const 0
   call $bindings/esm/NonPlainObject#constructor
   return
  )
- (func $bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/internrefFunction (param $a i32) (param $b i32) (result i32)
   local.get $a
   return
  )
- (func $bindings/esm/functionFunction (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $bindings/esm/functionFunction (param $fn i32) (result i32)
   local.get $fn
   return
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $ptr i32) (result i32)
   (local $obj i32)
   local.get $ptr
   if
@@ -2744,7 +2744,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/itcms/__unpin (param $ptr i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -2782,7 +2782,7 @@
    call $~lib/rt/itcms/Object#linkTo
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2828,7 +2828,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 528
   local.get $0
@@ -2863,7 +2863,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2877,14 +2877,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2892,26 +2892,26 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/typedarray/Int16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2919,11 +2919,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2931,7 +2931,7 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $bindings/esm/PlainObject~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $bindings/esm/PlainObject~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2961,12 +2961,12 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $bindings/esm/NonPlainObject
     block $~lib/typedarray/Uint8Array
@@ -3051,11 +3051,11 @@
   end
   unreachable
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -3081,7 +3081,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3094,7 +3094,7 @@
    unreachable
   end
  )
- (func $start:bindings/esm (type $none_=>_none)
+ (func $start:bindings/esm
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3138,7 +3138,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/bufferFunction (param $a i32) (param $b i32) (result i32)
   (local $aByteLength i32)
   (local $bByteLength i32)
   (local $out i32)
@@ -3194,7 +3194,7 @@
   local.get $5
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -3270,7 +3270,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3301,7 +3301,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunction (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3332,7 +3332,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunctionOptional (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunctionOptional (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3363,7 +3363,7 @@
   local.get $2
   return
  )
- (func $bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/stringFunctionOptional@varargs (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3411,7 +3411,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3522,7 +3522,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Uint64Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3562,7 +3562,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3589,7 +3589,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Float32Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float32Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3616,7 +3616,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int16Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3665,7 +3665,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3712,7 +3712,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -3762,7 +3762,7 @@
   local.get $3
   return
  )
- (func $bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/typedarrayFunction (param $a i32) (param $b i32) (result i32)
   (local $out i32)
   (local $i i32)
   (local $i|4 i32)
@@ -3889,7 +3889,7 @@
   local.get $5
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3935,7 +3935,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3976,7 +3976,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/staticarrayFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -4101,7 +4101,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -4239,7 +4239,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4264,7 +4264,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4316,7 +4316,7 @@
   local.get $3
   return
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -4435,7 +4435,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4504,7 +4504,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/arrayFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -4629,7 +4629,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<~lib/string/String>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -4767,7 +4767,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4792,7 +4792,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4859,7 +4859,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4932,7 +4932,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/arrayOfStringsFunction (param $a i32) (param $b i32) (result i32)
   (local $c i32)
   (local $i i32)
   (local $i|4 i32)
@@ -5067,7 +5067,7 @@
   local.get $5
   return
  )
- (func $bindings/esm/PlainObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/PlainObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5233,7 +5233,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $bindings/esm/objectFunction (param $a i32) (param $b i32) (result i32)
   (local $ref i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5305,7 +5305,7 @@
   local.get $3
   return
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5329,7 +5329,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5355,7 +5355,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -5425,7 +5425,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5466,7 +5466,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $outSize i32)
   (local $out i32)
   (local $4 i32)
@@ -5514,7 +5514,7 @@
   local.get $4
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5542,7 +5542,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $bindings/esm/NonPlainObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $bindings/esm/NonPlainObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5570,7 +5570,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/bufferFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5593,7 +5593,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5616,7 +5616,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunctionOptional@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5639,7 +5639,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5662,7 +5662,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/staticarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5685,7 +5685,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayU16 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5704,7 +5704,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/staticarrayI64 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayI64 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5723,7 +5723,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5746,7 +5746,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5769,7 +5769,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/objectFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5792,7 +5792,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/internrefFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5815,7 +5815,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $export:bindings/esm/functionFunction (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/functionFunction (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/bindings/raw.release.wat b/tests/compiler/bindings/raw.release.wat
index a3650c06af..e90f245b4d 100644
--- a/tests/compiler/bindings/raw.release.wat
+++ b/tests/compiler/bindings/raw.release.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $none_=>_i64 (func (result i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "console.log" (func $~lib/bindings/dom/console.log (param i32)))
@@ -120,23 +120,23 @@
  (export "objectFunction" (func $export:bindings/esm/objectFunction))
  (export "internrefFunction" (func $export:bindings/esm/internrefFunction))
  (export "functionFunction" (func $export:bindings/esm/staticarrayU16))
- (func $bindings/esm/plainFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/plainFunction (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $bindings/esm/plainFunction64 (type $i64_i64_=>_i64) (param $0 i64) (param $1 i64) (result i64)
+ (func $bindings/esm/plainFunction64 (param $0 i64) (param $1 i64) (result i64)
   local.get $0
   local.get $1
   i64.add
  )
- (func $bindings/esm/getMaxUnsigned32 (type $none_=>_i32) (result i32)
+ (func $bindings/esm/getMaxUnsigned32 (result i32)
   i32.const -1
  )
- (func $bindings/esm/getMaxUnsigned64 (type $none_=>_i64) (result i64)
+ (func $bindings/esm/getMaxUnsigned64 (result i64)
   i64.const -1
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1552
@@ -197,7 +197,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#unlink (param $0 i32)
   (local $1 i32)
   local.get $0
   i32.load $0 offset=4
@@ -248,7 +248,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -332,7 +332,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -485,7 +485,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -731,7 +731,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -843,7 +843,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -922,7 +922,7 @@
   i32.const 35056
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1189,7 +1189,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1315,7 +1315,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1621,7 +1621,7 @@
   memory.fill $0
   local.get $1
  )
- (func $bindings/esm/newInternref (type $none_=>_i32) (result i32)
+ (func $bindings/esm/newInternref (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1654,7 +1654,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1705,7 +1705,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/__unpin (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1764,7 +1764,7 @@
    i32.store $0 offset=8
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   global.get $~lib/rt/itcms/state
   i32.const 0
   i32.gt_s
@@ -1799,7 +1799,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1984,11 +1984,11 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~started
   if
@@ -2073,7 +2073,7 @@
   i32.const 1648
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2199,7 +2199,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2234,7 +2234,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2269,7 +2269,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2324,7 +2324,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -2662,7 +2662,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2715,7 +2715,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2771,7 +2771,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2804,7 +2804,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2858,7 +2858,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2994,7 +2994,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3064,7 +3064,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3297,7 +3297,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3363,7 +3363,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3439,7 +3439,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3682,7 +3682,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/bufferFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/bufferFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3797,7 +3797,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/stringFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3831,7 +3831,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/stringFunctionOptional@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/stringFunctionOptional@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3909,7 +3909,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/typedarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/typedarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3943,7 +3943,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/staticarrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/staticarrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4144,7 +4144,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/staticarrayU16 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:bindings/esm/staticarrayU16 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4171,7 +4171,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/arrayFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4205,7 +4205,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/arrayOfStringsFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/arrayOfStringsFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4239,7 +4239,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $export:bindings/esm/objectFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/objectFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4491,7 +4491,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:bindings/esm/internrefFunction (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export:bindings/esm/internrefFunction (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4521,7 +4521,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -4540,7 +4540,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/bool.debug.wat b/tests/compiler/bool.debug.wat
index 6ca73f7daf..ec638fed30 100644
--- a/tests/compiler/bool.debug.wat
+++ b/tests/compiler/bool.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $bool/i (mut i32) (i32.const 2))
  (global $bool/I (mut i64) (i64.const 2))
@@ -50,7 +50,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:bool (type $none_=>_none)
+ (func $start:bool
   global.get $bool/i
   i32.const 0
   i32.ne
@@ -760,7 +760,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:bool
  )
 )
diff --git a/tests/compiler/builtins.debug.wat b/tests/compiler/builtins.debug.wat
index 8f07aaf1c3..f94d90e35e 100644
--- a/tests/compiler/builtins.debug.wat
+++ b/tests/compiler/builtins.debug.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (global $builtins/b (mut i32) (i32.const 0))
@@ -93,26 +93,26 @@
  (export "test" (func $builtins/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:builtins~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:builtins~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:index (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:index (param $this i32) (result i32)
   local.get $this
   i32.load $0
   return
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:name (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:name (param $this i32) (result i32)
   i32.const 32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -121,7 +121,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -225,15 +225,15 @@
   i32.const 0
   return
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:length (param $this i32) (result i32)
   i32.const 2
   return
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#toString (param $this i32) (result i32)
   i32.const 176
   return
  )
- (func $~lib/atomics/Atomics.isLockFree (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/atomics/Atomics.isLockFree (param $size i32) (result i32)
   local.get $size
   i32.const 1
   i32.eq
@@ -253,13 +253,13 @@
   end
   return
  )
- (func $start:builtins~anonymous|1 (type $none_=>_none)
+ (func $start:builtins~anonymous|1
   nop
  )
- (func $start:builtins~anonymous|2 (type $i32_i32_i32_i32_=>_none) (param $a i32) (param $b i32) (param $c i32) (param $d i32)
+ (func $start:builtins~anonymous|2 (param $a i32) (param $b i32) (param $c i32) (param $d i32)
   nop
  )
- (func $builtins/max3 (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $builtins/max3 (param $a i32) (param $b i32) (param $c i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -281,7 +281,7 @@
   select
   return
  )
- (func $builtins/min3 (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $builtins/min3 (param $a i32) (param $b i32) (param $c i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -303,7 +303,7 @@
   select
   return
  )
- (func $builtins/rotl3 (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $builtins/rotl3 (param $a i32) (param $b i32) (param $c i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -342,7 +342,7 @@
   i32.extend8_s
   return
  )
- (func $builtins/rotr3 (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $builtins/rotr3 (param $a i32) (param $b i32) (param $c i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -381,13 +381,13 @@
   i32.extend8_s
   return
  )
- (func $builtins/test (type $none_=>_none)
+ (func $builtins/test
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:builtins
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -400,7 +400,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -496,7 +496,7 @@
   local.get $3
   return
  )
- (func $start:builtins (type $none_=>_none)
+ (func $start:builtins
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
diff --git a/tests/compiler/builtins.release.wat b/tests/compiler/builtins.release.wat
index c07b49aa1a..39c985ad93 100644
--- a/tests/compiler/builtins.release.wat
+++ b/tests/compiler/builtins.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (global $builtins/i (mut i32) (i32.const 0))
@@ -70,21 +70,21 @@
  (export "test" (func $start:builtins~anonymous|1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:builtins~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:builtins~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $start:builtins~anonymous|1 (type $none_=>_none)
+ (func $start:builtins~anonymous|1
   nop
  )
- (func $start:builtins~anonymous|2 (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $start:builtins~anonymous|2 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:builtins
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -244,7 +244,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:builtins (type $none_=>_none)
+ (func $start:builtins
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
diff --git a/tests/compiler/call-inferred.debug.wat b/tests/compiler/call-inferred.debug.wat
index 28a2dc2120..bf0cb30608 100644
--- a/tests/compiler/call-inferred.debug.wat
+++ b/tests/compiler/call-inferred.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $f32_=>_f32 (func_subtype (param f32) (result f32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
+ (type $f32_=>_f32 (func (param f32) (result f32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 76))
@@ -15,23 +15,23 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $call-inferred/foo<i32> (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $call-inferred/foo<i32> (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $call-inferred/foo<f64> (type $f64_=>_f64) (param $a f64) (result f64)
+ (func $call-inferred/foo<f64> (param $a f64) (result f64)
   local.get $a
   return
  )
- (func $call-inferred/foo<f32> (type $f32_=>_f32) (param $a f32) (result f32)
+ (func $call-inferred/foo<f32> (param $a f32) (result f32)
   local.get $a
   return
  )
- (func $call-inferred/bar<f32> (type $f32_=>_f32) (param $a f32) (result f32)
+ (func $call-inferred/bar<f32> (param $a f32) (result f32)
   local.get $a
   return
  )
- (func $call-inferred/bar<f32>@varargs (type $f32_=>_f32) (param $a f32) (result f32)
+ (func $call-inferred/bar<f32>@varargs (param $a f32) (result f32)
   block $1of1
    block $0of1
     block $outOfRange
@@ -46,7 +46,7 @@
   local.get $a
   call $call-inferred/bar<f32>
  )
- (func $start:call-inferred (type $none_=>_none)
+ (func $start:call-inferred
   i32.const 42
   call $call-inferred/foo<i32>
   i32.const 42
@@ -102,7 +102,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:call-inferred
  )
 )
diff --git a/tests/compiler/call-optional.debug.wat b/tests/compiler/call-optional.debug.wat
index 2fb1ba0ebc..ef22746728 100644
--- a/tests/compiler/call-optional.debug.wat
+++ b/tests/compiler/call-optional.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (global $call-optional/optIndirect (mut i32) (i32.const 96))
@@ -15,7 +15,7 @@
  (elem $0 (i32.const 1) $call-optional/opt@varargs)
  (export "memory" (memory $0))
  (start $~start)
- (func $call-optional/opt (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $call-optional/opt (param $a i32) (param $b i32) (param $c i32) (result i32)
   local.get $a
   local.get $b
   i32.add
@@ -23,7 +23,7 @@
   i32.add
   return
  )
- (func $call-optional/opt@varargs (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $c i32) (result i32)
+ (func $call-optional/opt@varargs (param $a i32) (param $b i32) (param $c i32) (result i32)
   block $2of2
    block $1of2
     block $0of2
@@ -46,7 +46,7 @@
   local.get $c
   call $call-optional/opt
  )
- (func $start:call-optional (type $none_=>_none)
+ (func $start:call-optional
   i32.const 3
   i32.const 0
   i32.const 1
@@ -154,7 +154,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:call-optional
  )
 )
diff --git a/tests/compiler/call-optional.release.wat b/tests/compiler/call-optional.release.wat
index 89a9e84276..6bf7fe7099 100644
--- a/tests/compiler/call-optional.release.wat
+++ b/tests/compiler/call-optional.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (memory $0 1)
@@ -13,7 +13,7 @@
  (elem $0 (i32.const 1) $call-optional/opt@varargs)
  (export "memory" (memory $0))
  (start $~start)
- (func $call-optional/opt@varargs (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $call-optional/opt@varargs (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   block $2of2
    block $1of2
     block $0of2
@@ -37,7 +37,7 @@
   local.get $2
   i32.add
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 1
   global.set $~argumentsLength
   i32.const 2
diff --git a/tests/compiler/call-super.debug.wat b/tests/compiler/call-super.debug.wat
index 77b9e6a5d2..3e8d088385 100644
--- a/tests/compiler/call-super.debug.wat
+++ b/tests/compiler/call-super.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,21 +42,21 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $call-super/A#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/A#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -66,11 +66,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -79,14 +79,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -128,7 +128,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -140,11 +140,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -154,7 +154,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -210,15 +210,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -244,7 +244,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -264,7 +264,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -284,7 +284,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -320,7 +320,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -346,7 +346,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -367,11 +367,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -382,39 +382,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -650,7 +650,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1014,7 +1014,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1179,7 +1179,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1324,7 +1324,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1362,7 +1362,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1375,7 +1375,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1392,7 +1392,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1417,7 +1417,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1597,7 +1597,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1655,7 +1655,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1676,7 +1676,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1692,7 +1692,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1900,7 +1900,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1990,7 +1990,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2099,7 +2099,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2163,7 +2163,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2176,17 +2176,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2239,93 +2239,93 @@
   local.get $ptr
   return
  )
- (func $call-super/A#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $call-super/A#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $call-super/B#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/B#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $call-super/B#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $call-super/B#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $call-super/C#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $call-super/C#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $call-super/C#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/C#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $call-super/D#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/D#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $call-super/D#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $call-super/D#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $call-super/E#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/E#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $call-super/E#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $call-super/E#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $call-super/F#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $call-super/F#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $call-super/F#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/F#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $call-super/G#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $call-super/G#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $call-super/H#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $call-super/H#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $call-super/G#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/G#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $call-super/H#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/H#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $call-super/I#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $call-super/I#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $call-super/J#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $call-super/J#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $call-super/I#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/I#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $call-super/J#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/J#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:call-super (type $none_=>_none)
+ (func $start:call-super
   memory.size $0
   i32.const 16
   i32.shl
@@ -2349,7 +2349,7 @@
   call $call-super/test4
   call $call-super/test5
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 272
   local.get $0
@@ -2358,7 +2358,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2372,10 +2372,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $call-super/I
     block $call-super/J
@@ -2430,10 +2430,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:call-super
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2446,7 +2446,7 @@
    unreachable
   end
  )
- (func $call-super/A#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/A#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2500,7 +2500,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/B#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/B#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2582,7 +2582,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/test1 (type $none_=>_none)
+ (func $call-super/test1
   (local $b i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2639,7 +2639,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $call-super/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2685,7 +2685,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/D#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/D#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2767,7 +2767,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/test2 (type $none_=>_none)
+ (func $call-super/test2
   (local $d i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2824,7 +2824,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $call-super/E#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/E#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2878,7 +2878,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/F#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/F#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2924,7 +2924,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/test3 (type $none_=>_none)
+ (func $call-super/test3
   (local $f i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2981,7 +2981,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $call-super/G#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/G#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3027,7 +3027,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/H#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/H#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3073,7 +3073,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/test4 (type $none_=>_none)
+ (func $call-super/test4
   (local $h i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3130,7 +3130,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $call-super/I#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/I#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3166,7 +3166,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/J#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $call-super/J#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3212,7 +3212,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $call-super/test5 (type $none_=>_none)
+ (func $call-super/test5
   (local $h i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3269,7 +3269,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/call-super.release.wat b/tests/compiler/call-super.release.wat
index a3a6d24b09..70e831b1b5 100644
--- a/tests/compiler/call-super.release.wat
+++ b/tests/compiler/call-super.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -35,7 +35,7 @@
  (data (i32.const 1488) "\0e\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1296
@@ -80,7 +80,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -212,7 +212,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -365,7 +365,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -611,7 +611,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -723,7 +723,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -802,7 +802,7 @@
   i32.const 34320
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1069,7 +1069,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1195,7 +1195,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1501,7 +1501,7 @@
   memory.fill $0
   local.get $1
  )
- (func $start:call-super (type $none_=>_none)
+ (func $start:call-super
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2234,7 +2234,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $call-super/I
     block $call-super/J
@@ -2293,10 +2293,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:call-super
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2331,7 +2331,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/cast.debug.wat b/tests/compiler/cast.debug.wat
index 32187a40de..14d039d108 100644
--- a/tests/compiler/cast.debug.wat
+++ b/tests/compiler/cast.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i64_=>_i64 (func_subtype (param i64) (result i64) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -12,21 +12,21 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $cast/test<i8,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i8,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i8,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend8_s
@@ -34,7 +34,7 @@
   local.get $y
   return
  )
- (func $cast/test<i8,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend8_s
@@ -42,7 +42,7 @@
   local.get $y
   return
  )
- (func $cast/test<i8,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend8_s
@@ -50,7 +50,7 @@
   local.get $y
   return
  )
- (func $cast/test<i8,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend8_s
@@ -58,7 +58,7 @@
   local.get $y
   return
  )
- (func $cast/test<i8,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i8,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.extend8_s
@@ -67,7 +67,7 @@
   local.get $y
   return
  )
- (func $cast/test<i8,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i8,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.extend8_s
@@ -76,28 +76,28 @@
   local.get $y
   return
  )
- (func $cast/test<i8,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i8,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u8,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u8,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u8,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 255
@@ -106,7 +106,7 @@
   local.get $y
   return
  )
- (func $cast/test<u8,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 255
@@ -115,7 +115,7 @@
   local.get $y
   return
  )
- (func $cast/test<u8,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 255
@@ -124,7 +124,7 @@
   local.get $y
   return
  )
- (func $cast/test<u8,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 255
@@ -133,7 +133,7 @@
   local.get $y
   return
  )
- (func $cast/test<u8,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u8,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 255
@@ -143,7 +143,7 @@
   local.get $y
   return
  )
- (func $cast/test<u8,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u8,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 255
@@ -153,42 +153,42 @@
   local.get $y
   return
  )
- (func $cast/test<u8,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u8,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i16,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i16,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i16,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i16,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i16,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend16_s
@@ -196,7 +196,7 @@
   local.get $y
   return
  )
- (func $cast/test<i16,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.extend16_s
@@ -204,7 +204,7 @@
   local.get $y
   return
  )
- (func $cast/test<i16,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i16,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.extend16_s
@@ -213,7 +213,7 @@
   local.get $y
   return
  )
- (func $cast/test<i16,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i16,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.extend16_s
@@ -222,42 +222,42 @@
   local.get $y
   return
  )
- (func $cast/test<i16,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i16,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u16,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u16,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u16,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u16,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u16,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 65535
@@ -266,7 +266,7 @@
   local.get $y
   return
  )
- (func $cast/test<u16,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 65535
@@ -275,7 +275,7 @@
   local.get $y
   return
  )
- (func $cast/test<u16,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u16,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 65535
@@ -285,7 +285,7 @@
   local.get $y
   return
  )
- (func $cast/test<u16,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u16,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 65535
@@ -295,56 +295,56 @@
   local.get $y
   return
  )
- (func $cast/test<u16,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u16,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i32,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i32,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i64.extend_i32_s
@@ -352,7 +352,7 @@
   local.get $y
   return
  )
- (func $cast/test<i32,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<i32,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i64.extend_i32_s
@@ -360,56 +360,56 @@
   local.get $y
   return
  )
- (func $cast/test<i32,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<i32,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u32,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u32,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i64.extend_i32_u
@@ -417,7 +417,7 @@
   local.get $y
   return
  )
- (func $cast/test<u32,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<u32,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i64.extend_i32_u
@@ -425,14 +425,14 @@
   local.get $y
   return
  )
- (func $cast/test<u32,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<u32,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i64,i8> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,i8> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -440,7 +440,7 @@
   local.get $y
   return
  )
- (func $cast/test<i64,u8> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,u8> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -448,7 +448,7 @@
   local.get $y
   return
  )
- (func $cast/test<i64,i16> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,i16> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -456,7 +456,7 @@
   local.get $y
   return
  )
- (func $cast/test<i64,u16> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,u16> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -464,7 +464,7 @@
   local.get $y
   return
  )
- (func $cast/test<i64,i32> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,i32> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -472,7 +472,7 @@
   local.get $y
   return
  )
- (func $cast/test<i64,u32> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,u32> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -480,21 +480,21 @@
   local.get $y
   return
  )
- (func $cast/test<i64,i64> (type $i64_=>_i64) (param $x i64) (result i64)
+ (func $cast/test<i64,i64> (param $x i64) (result i64)
   (local $y i64)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i64,u64> (type $i64_=>_i64) (param $x i64) (result i64)
+ (func $cast/test<i64,u64> (param $x i64) (result i64)
   (local $y i64)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<i64,bool> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<i64,bool> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i64.const 0
@@ -503,7 +503,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,i8> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,i8> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -511,7 +511,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,u8> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,u8> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -519,7 +519,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,i16> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,i16> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -527,7 +527,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,u16> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,u16> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -535,7 +535,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,i32> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,i32> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -543,7 +543,7 @@
   local.get $y
   return
  )
- (func $cast/test<u64,u32> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,u32> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i32.wrap_i64
@@ -551,21 +551,21 @@
   local.get $y
   return
  )
- (func $cast/test<u64,i64> (type $i64_=>_i64) (param $x i64) (result i64)
+ (func $cast/test<u64,i64> (param $x i64) (result i64)
   (local $y i64)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u64,u64> (type $i64_=>_i64) (param $x i64) (result i64)
+ (func $cast/test<u64,u64> (param $x i64) (result i64)
   (local $y i64)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $cast/test<u64,bool> (type $i64_=>_i32) (param $x i64) (result i32)
+ (func $cast/test<u64,bool> (param $x i64) (result i32)
   (local $y i32)
   local.get $x
   i64.const 0
@@ -574,7 +574,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,i8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,i8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -583,7 +583,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,u8> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,u8> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -592,7 +592,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,i16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,i16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -601,7 +601,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,u16> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,u16> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -610,7 +610,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,i32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,i32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -619,7 +619,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,u32> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,u32> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   i32.const 0
@@ -628,7 +628,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,i64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<bool,i64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 0
@@ -638,7 +638,7 @@
   local.get $y
   return
  )
- (func $cast/test<bool,u64> (type $i32_=>_i64) (param $x i32) (result i64)
+ (func $cast/test<bool,u64> (param $x i32) (result i64)
   (local $y i64)
   local.get $x
   i32.const 0
@@ -648,14 +648,14 @@
   local.get $y
   return
  )
- (func $cast/test<bool,bool> (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $cast/test<bool,bool> (param $x i32) (result i32)
   (local $y i32)
   local.get $x
   local.set $y
   local.get $y
   return
  )
- (func $start:cast (type $none_=>_none)
+ (func $start:cast
   i32.const 0
   call $cast/test<i8,i8>
   drop
@@ -900,7 +900,7 @@
   call $cast/test<bool,bool>
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:cast
  )
 )
diff --git a/tests/compiler/class-extends.debug.wat b/tests/compiler/class-extends.debug.wat
index 93685fcc81..d8d713d111 100644
--- a/tests/compiler/class-extends.debug.wat
+++ b/tests/compiler/class-extends.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
@@ -13,25 +13,25 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "test" (func $export:class-extends/test))
- (func $class-extends/A#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-extends/A#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class-extends/B#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-extends/B#get:b (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=4
  )
- (func $class-extends/A#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $class-extends/A#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $class-extends/B#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $class-extends/B#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store16 $0 offset=4
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -44,7 +44,7 @@
    unreachable
   end
  )
- (func $class-extends/test (type $i32_=>_none) (param $b i32)
+ (func $class-extends/test (param $b i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91,7 +91,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:class-extends/test (type $i32_=>_none) (param $0 i32)
+ (func $export:class-extends/test (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/class-extends.release.wat b/tests/compiler/class-extends.release.wat
index 3c655ba03e..7f47ffaa17 100644
--- a/tests/compiler/class-extends.release.wat
+++ b/tests/compiler/class-extends.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33792))
  (memory $0 0)
  (export "memory" (memory $0))
  (export "test" (func $export:class-extends/test))
- (func $export:class-extends/test (type $i32_=>_none) (param $0 i32)
+ (func $export:class-extends/test (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class-implements.debug.wat b/tests/compiler/class-implements.debug.wat
index fe8d6bc874..0023be05b2 100644
--- a/tests/compiler/class-implements.debug.wat
+++ b/tests/compiler/class-implements.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -49,17 +49,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -69,11 +69,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -82,14 +82,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -131,7 +131,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -143,11 +143,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -157,7 +157,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -213,15 +213,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -247,7 +247,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -267,7 +267,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -287,7 +287,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -323,7 +323,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -349,7 +349,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -370,11 +370,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -385,39 +385,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -653,7 +653,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1017,7 +1017,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1182,7 +1182,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1327,7 +1327,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1365,7 +1365,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1378,7 +1378,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1395,7 +1395,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1420,7 +1420,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1600,7 +1600,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1658,7 +1658,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1679,7 +1679,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1695,7 +1695,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1903,7 +1903,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1993,7 +1993,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2102,7 +2102,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2166,7 +2166,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2179,17 +2179,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2242,86 +2242,86 @@
   local.get $ptr
   return
  )
- (func $class-implements/A#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A#foo (param $this i32) (result i32)
   i32.const 1
   return
  )
- (func $class-implements/C#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/C#foo (param $this i32) (result i32)
   i32.const 2
   return
  )
- (func $class-implements/D#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/D#foo (param $this i32) (result i32)
   i32.const 3
   return
  )
- (func $class-implements/F#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/F#foo (param $this i32) (result i32)
   i32.const 4
   return
  )
- (func $class-implements/I#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/I#foo (param $this i32) (result i32)
   unreachable
  )
- (func $class-implements/A2#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/A2#set:foo (param $this i32) (param $foo i32)
   local.get $this
   local.get $foo
   i32.store $0
  )
- (func $class-implements/A2#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A2#get:foo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class-implements/I2#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/I2#get:foo (param $this i32) (result i32)
   unreachable
  )
- (func $class-implements/I2#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/I2#set:foo (param $this i32) (param $foo i32)
   unreachable
  )
- (func $class-implements/A3#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/A3#set:foo (param $this i32) (param $foo i32)
   local.get $this
   local.get $foo
   i32.store $0
  )
- (func $class-implements/A3#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A3#get:foo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class-implements/A4#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/A4#set:foo (param $this i32) (param $foo i32)
   local.get $this
   local.get $foo
   i32.store $0
  )
- (func $class-implements/A4#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A4#get:foo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class-implements/B2#set:_foo (type $i32_i32_=>_none) (param $this i32) (param $_foo i32)
+ (func $class-implements/B2#set:_foo (param $this i32) (param $_foo i32)
   local.get $this
   local.get $_foo
   i32.store $0
  )
- (func $class-implements/B2#get:_foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B2#get:_foo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class-implements/B3#set:_foo2 (type $i32_i32_=>_none) (param $this i32) (param $_foo2 i32)
+ (func $class-implements/B3#set:_foo2 (param $this i32) (param $_foo2 i32)
   local.get $this
   local.get $_foo2
   i32.store $0 offset=4
  )
- (func $class-implements/B3#get:_foo2 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B3#get:_foo2 (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $class-implements/B4#set:_foo2 (type $i32_i32_=>_none) (param $this i32) (param $_foo2 i32)
+ (func $class-implements/B4#set:_foo2 (param $this i32) (param $_foo2 i32)
   local.get $this
   local.get $_foo2
   i32.store $0 offset=4
  )
- (func $class-implements/B4#get:_foo2 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B4#get:_foo2 (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $class-implements/D#foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/D#foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case0
@@ -2343,7 +2343,7 @@
   local.get $0
   call $class-implements/D#foo
  )
- (func $class-implements/I#foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/I#foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case3
@@ -2395,7 +2395,7 @@
   end
   unreachable
  )
- (func $class-implements/I2#get:foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/I2#get:foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case5
@@ -2461,7 +2461,7 @@
   end
   unreachable
  )
- (func $class-implements/I2#set:foo@override (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-implements/I2#set:foo@override (param $0 i32) (param $1 i32)
   (local $2 i32)
   block $default
    block $case5
@@ -2533,7 +2533,7 @@
   end
   unreachable
  )
- (func $class-implements/B2#get:foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/B2#get:foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case1
@@ -2564,7 +2564,7 @@
   local.get $0
   call $class-implements/B2#get:foo
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $class-implements/a
   local.tee $1
@@ -2622,7 +2622,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2636,10 +2636,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $class-implements/B4
     block $class-implements/B3
@@ -2709,10 +2709,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:class-implements
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2725,7 +2725,7 @@
    unreachable
   end
  )
- (func $class-implements/A#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2763,7 +2763,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/B#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2801,7 +2801,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2839,7 +2839,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/D#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/D#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2877,7 +2877,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/E#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/E#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2915,7 +2915,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/F#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/F#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2953,7 +2953,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/A2#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A2#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2999,7 +2999,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/A3#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A3#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3045,7 +3045,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/A4#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/A4#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3091,7 +3091,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/B2#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B2#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3137,7 +3137,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/B2#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B2#get:foo (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3162,7 +3162,7 @@
   local.get $1
   return
  )
- (func $class-implements/B3#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B3#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3208,7 +3208,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/B3#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B3#get:foo (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3233,7 +3233,7 @@
   local.get $1
   return
  )
- (func $class-implements/B4#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B4#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3279,7 +3279,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-implements/B4#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-implements/B4#get:foo (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3304,7 +3304,7 @@
   local.get $1
   return
  )
- (func $start:class-implements (type $none_=>_none)
+ (func $start:class-implements
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -4000,7 +4000,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-implements/B3#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/B3#set:foo (param $this i32) (param $foo i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4023,7 +4023,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-implements/B4#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/B4#set:foo (param $this i32) (param $foo i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4046,7 +4046,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-implements/B2#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class-implements/B2#set:foo (param $this i32) (param $foo i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4069,7 +4069,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class-implements.release.wat b/tests/compiler/class-implements.release.wat
index bd4bfdea86..e9b7a25e59 100644
--- a/tests/compiler/class-implements.release.wat
+++ b/tests/compiler/class-implements.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,7 +42,7 @@
  (data (i32.const 1504) "\13\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $class-implements/a
@@ -129,7 +129,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -261,7 +261,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -414,7 +414,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -660,7 +660,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -772,7 +772,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -851,7 +851,7 @@
   i32.const 34352
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1118,7 +1118,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1244,7 +1244,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1550,7 +1550,7 @@
   memory.fill $0
   local.get $1
  )
- (func $class-implements/I2#get:foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/I2#get:foo@override (param $0 i32) (result i32)
   block $default
    block $case5
     block $case4
@@ -1592,7 +1592,7 @@
   end
   unreachable
  )
- (func $class-implements/I2#set:foo@override (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-implements/I2#set:foo@override (param $0 i32) (param $1 i32)
   (local $2 i32)
   block $folding-inner0
    block $default
@@ -1654,7 +1654,7 @@
   local.get $1
   i32.store $0
  )
- (func $class-implements/B2#get:foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/B2#get:foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case1
@@ -1683,7 +1683,7 @@
   local.get $0
   call $class-implements/B2#get:foo
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $class-implements/B4
     block $class-implements/B3
@@ -1757,10 +1757,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:class-implements
  )
- (func $class-implements/D#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/D#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1805,7 +1805,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-implements/F#constructor (type $none_=>_i32) (result i32)
+ (func $class-implements/F#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1848,7 +1848,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-implements/A2#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/A2#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1899,7 +1899,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-implements/B2#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/B2#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1950,7 +1950,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-implements/B2#get:foo (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/B2#get:foo (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1983,7 +1983,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-implements/B3#get:foo (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-implements/B3#get:foo (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2016,7 +2016,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:class-implements (type $none_=>_none)
+ (func $start:class-implements
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2923,7 +2923,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $class-implements/B3#set:foo (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-implements/B3#set:foo (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2955,7 +2955,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2990,7 +2990,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/class-overloading-cast.debug.wat b/tests/compiler/class-overloading-cast.debug.wat
index 795387a3ac..8e2784ba42 100644
--- a/tests/compiler/class-overloading-cast.debug.wat
+++ b/tests/compiler/class-overloading-cast.debug.wat
@@ -1,16 +1,16 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -55,17 +55,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -75,11 +75,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -88,14 +88,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -137,7 +137,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -149,11 +149,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -163,7 +163,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -219,15 +219,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -253,7 +253,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -273,7 +273,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -293,7 +293,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -329,7 +329,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -355,7 +355,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -376,11 +376,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -391,39 +391,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -659,7 +659,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1023,7 +1023,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1188,7 +1188,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1333,7 +1333,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1371,7 +1371,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1384,7 +1384,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1401,7 +1401,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1426,7 +1426,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1606,7 +1606,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1664,7 +1664,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1685,7 +1685,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1701,7 +1701,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1909,7 +1909,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1999,7 +1999,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2108,7 +2108,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2172,7 +2172,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2185,17 +2185,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2248,15 +2248,15 @@
   local.get $ptr
   return
  )
- (func $class-overloading-cast/A<i32>#foo (type $i32_i32_=>_i32) (param $this i32) (param $a i32) (result i32)
+ (func $class-overloading-cast/A<i32>#foo (param $this i32) (param $a i32) (result i32)
   i32.const 432
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2265,7 +2265,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2369,31 +2369,31 @@
   i32.const 0
   return
  )
- (func $class-overloading-cast/B<i32,~lib/string/String>#foo (type $i32_i32_=>_i32) (param $this i32) (param $a i32) (result i32)
+ (func $class-overloading-cast/B<i32,~lib/string/String>#foo (param $this i32) (param $a i32) (result i32)
   i32.const 464
   return
  )
- (func $class-overloading-cast/A<f64>#foo (type $i32_f64_=>_i32) (param $this i32) (param $a f64) (result i32)
+ (func $class-overloading-cast/A<f64>#foo (param $this i32) (param $a f64) (result i32)
   i32.const 432
   return
  )
- (func $class-overloading-cast/A<~lib/string/String>#foo (type $i32_i32_=>_i32) (param $this i32) (param $a i32) (result i32)
+ (func $class-overloading-cast/A<~lib/string/String>#foo (param $this i32) (param $a i32) (result i32)
   i32.const 432
   return
  )
- (func $class-overloading-cast/D#bar (type $i32_f32_=>_i32) (param $this i32) (param $a f32) (result i32)
+ (func $class-overloading-cast/D#bar (param $this i32) (param $a f32) (result i32)
   i32.const 608
   return
  )
- (func $class-overloading-cast/B<i32,f64>#foo (type $i32_i32_=>_i32) (param $this i32) (param $a i32) (result i32)
+ (func $class-overloading-cast/B<i32,f64>#foo (param $this i32) (param $a i32) (result i32)
   i32.const 464
   return
  )
- (func $class-overloading-cast/B<f64,~lib/string/String>#foo (type $i32_f64_=>_i32) (param $this i32) (param $a f64) (result i32)
+ (func $class-overloading-cast/B<f64,~lib/string/String>#foo (param $this i32) (param $a f64) (result i32)
   i32.const 464
   return
  )
- (func $class-overloading-cast/A<i32>#foo@override (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $class-overloading-cast/A<i32>#foo@override (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   block $default
    block $case1
@@ -2427,7 +2427,7 @@
   local.get $1
   call $class-overloading-cast/A<i32>#foo
  )
- (func $class-overloading-cast/A<f64>#foo@override (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $class-overloading-cast/A<f64>#foo@override (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   block $default
    block $case0
@@ -2451,7 +2451,7 @@
   local.get $1
   call $class-overloading-cast/A<f64>#foo
  )
- (func $class-overloading-cast/A<~lib/string/String>#foo@override (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $class-overloading-cast/A<~lib/string/String>#foo@override (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $0
   i32.const 8
@@ -2462,7 +2462,7 @@
   local.get $1
   call $class-overloading-cast/A<~lib/string/String>#foo
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $class-overloading-cast/v
   local.tee $1
@@ -2499,7 +2499,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2513,10 +2513,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $class-overloading-cast/A<f32>
     block $class-overloading-cast/B<f32,f64>
@@ -2571,7 +2571,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2580,7 +2580,7 @@
   global.set $~started
   call $start:class-overloading-cast
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2593,7 +2593,7 @@
    unreachable
   end
  )
- (func $class-overloading-cast/A<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/A<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2631,7 +2631,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/B<i32,f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/B<i32,f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2669,7 +2669,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/B<i32,~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/B<i32,~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2707,7 +2707,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/A<f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/A<f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2745,7 +2745,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/B<f64,~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/B<f64,~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2783,7 +2783,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2879,7 +2879,7 @@
   local.get $3
   return
  )
- (func $class-overloading-cast/A<~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/A<~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2917,7 +2917,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2955,7 +2955,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/A<f32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/A<f32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2993,7 +2993,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/B<f32,f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/B<f32,f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3031,7 +3031,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading-cast/D#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading-cast/D#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3069,7 +3069,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:class-overloading-cast (type $none_=>_none)
+ (func $start:class-overloading-cast
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -3301,7 +3301,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class-overloading-cast.release.wat b/tests/compiler/class-overloading-cast.release.wat
index 91b9b072fd..5468b55dfd 100644
--- a/tests/compiler/class-overloading-cast.release.wat
+++ b/tests/compiler/class-overloading-cast.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -48,7 +48,7 @@
  (data (i32.const 1648) "\0e\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $class-overloading-cast/v
@@ -117,7 +117,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -249,7 +249,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -402,7 +402,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -648,7 +648,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -760,7 +760,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -839,7 +839,7 @@
   i32.const 34480
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1106,7 +1106,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1163,7 +1163,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1396,7 +1396,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $class-overloading-cast/A<f32>
     block $class-overloading-cast/B<f32,f64>
@@ -1455,7 +1455,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -1464,7 +1464,7 @@
   global.set $~started
   call $start:class-overloading-cast
  )
- (func $class-overloading-cast/A<i32>#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading-cast/A<i32>#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1508,7 +1508,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1668,7 +1668,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:class-overloading-cast (type $none_=>_none)
+ (func $start:class-overloading-cast
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2203,7 +2203,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2237,7 +2237,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/class-overloading.debug.wat b/tests/compiler/class-overloading.debug.wat
index b22b79c88a..10dc49de00 100644
--- a/tests/compiler/class-overloading.debug.wat
+++ b/tests/compiler/class-overloading.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $class-overloading/which (mut i32) (i32.const 32))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -59,17 +59,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -79,11 +79,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -92,14 +92,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -141,7 +141,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -153,11 +153,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -167,7 +167,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -223,15 +223,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -257,7 +257,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -277,7 +277,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -297,7 +297,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -333,7 +333,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -359,7 +359,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -380,11 +380,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -395,39 +395,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -663,7 +663,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1027,7 +1027,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1192,7 +1192,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1337,7 +1337,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1375,7 +1375,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1388,7 +1388,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1405,7 +1405,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1430,7 +1430,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1610,7 +1610,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1668,7 +1668,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1689,7 +1689,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1705,7 +1705,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1913,7 +1913,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2003,7 +2003,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2112,7 +2112,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2176,7 +2176,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2189,17 +2189,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2252,15 +2252,15 @@
   local.get $ptr
   return
  )
- (func $class-overloading/A#a<i32> (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $class-overloading/A#a<i32> (param $this i32) (param $a i32)
   i32.const 464
   global.set $class-overloading/which
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2269,7 +2269,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2373,42 +2373,42 @@
   i32.const 0
   return
  )
- (func $class-overloading/A#b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $class-overloading/A#b (param $this i32) (param $b i32)
   i32.const 464
   global.set $class-overloading/which
  )
- (func $class-overloading/A#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A#get:c (param $this i32) (result i32)
   i32.const 464
   global.set $class-overloading/which
   i32.const 0
   return
  )
- (func $class-overloading/A#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $class-overloading/A#set:c (param $this i32) (param $c i32)
   i32.const 464
   global.set $class-overloading/which
  )
- (func $class-overloading/B#a<i32> (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $class-overloading/B#a<i32> (param $this i32) (param $a i32)
   i32.const 496
   global.set $class-overloading/which
  )
- (func $class-overloading/C#b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $class-overloading/C#b (param $this i32) (param $b i32)
   i32.const 592
   global.set $class-overloading/which
  )
- (func $class-overloading/C#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/C#get:c (param $this i32) (result i32)
   i32.const 592
   global.set $class-overloading/which
   i32.const 0
   return
  )
- (func $class-overloading/C#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $class-overloading/C#set:c (param $this i32) (param $c i32)
   i32.const 592
   global.set $class-overloading/which
  )
- (func $class-overloading/IA#foo (type $i32_=>_none) (param $this i32)
+ (func $class-overloading/IA#foo (param $this i32)
   unreachable
  )
- (func $class-overloading/A2#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A2#foo (param $this i32) (result i32)
   i32.const 720
   i32.const 528
   i32.const 198
@@ -2416,47 +2416,47 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $class-overloading/F#a<i32> (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $class-overloading/F#a<i32> (param $this i32) (param $a i32)
   i32.const 624
   global.set $class-overloading/which
  )
- (func $class-overloading/B#b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $class-overloading/B#b (param $this i32) (param $b i32)
   i32.const 496
   global.set $class-overloading/which
  )
- (func $class-overloading/F#b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $class-overloading/F#b (param $this i32) (param $b i32)
   i32.const 624
   global.set $class-overloading/which
  )
- (func $class-overloading/B#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B#get:c (param $this i32) (result i32)
   i32.const 496
   global.set $class-overloading/which
   i32.const 0
   return
  )
- (func $class-overloading/F#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/F#get:c (param $this i32) (result i32)
   i32.const 624
   global.set $class-overloading/which
   i32.const 0
   return
  )
- (func $class-overloading/B#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $class-overloading/B#set:c (param $this i32) (param $c i32)
   i32.const 496
   global.set $class-overloading/which
  )
- (func $class-overloading/F#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $class-overloading/F#set:c (param $this i32) (param $c i32)
   i32.const 624
   global.set $class-overloading/which
  )
- (func $class-overloading/CA#foo (type $i32_=>_none) (param $this i32)
+ (func $class-overloading/CA#foo (param $this i32)
   i32.const 656
   global.set $class-overloading/which
  )
- (func $class-overloading/CC#foo (type $i32_=>_none) (param $this i32)
+ (func $class-overloading/CC#foo (param $this i32)
   i32.const 688
   global.set $class-overloading/which
  )
- (func $class-overloading/A1#baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A1#baz (param $this i32) (result i32)
   i32.const 720
   i32.const 528
   i32.const 186
@@ -2464,11 +2464,11 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $class-overloading/B1#baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B1#baz (param $this i32) (result i32)
   i32.const 3
   return
  )
- (func $class-overloading/A#a<i32>@override (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-overloading/A#a<i32>@override (param $0 i32) (param $1 i32)
   (local $2 i32)
   block $default
    block $case2
@@ -2520,7 +2520,7 @@
   local.get $1
   call $class-overloading/A#a<i32>
  )
- (func $class-overloading/A#b@override (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-overloading/A#b@override (param $0 i32) (param $1 i32)
   (local $2 i32)
   block $default
    block $case2
@@ -2572,7 +2572,7 @@
   local.get $1
   call $class-overloading/A#b
  )
- (func $class-overloading/A#get:c@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/A#get:c@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case2
@@ -2620,7 +2620,7 @@
   local.get $0
   call $class-overloading/A#get:c
  )
- (func $class-overloading/A#set:c@override (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class-overloading/A#set:c@override (param $0 i32) (param $1 i32)
   (local $2 i32)
   block $default
    block $case2
@@ -2672,7 +2672,7 @@
   local.get $1
   call $class-overloading/A#set:c
  )
- (func $class-overloading/IA#foo@override (type $i32_=>_none) (param $0 i32)
+ (func $class-overloading/IA#foo@override (param $0 i32)
   (local $1 i32)
   block $default
    block $case1
@@ -2702,7 +2702,7 @@
   end
   unreachable
  )
- (func $class-overloading/A2#foo@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/A2#foo@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case0
@@ -2724,7 +2724,7 @@
   local.get $0
   call $class-overloading/A2#foo
  )
- (func $class-overloading/A1#baz@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/A1#baz@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case0
@@ -2746,7 +2746,7 @@
   local.get $0
   call $class-overloading/A1#baz
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $class-overloading/which
   local.tee $1
@@ -2797,7 +2797,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2811,10 +2811,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $class-overloading/A1
     block $class-overloading/B1
@@ -2881,7 +2881,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2890,7 +2890,7 @@
   global.set $~started
   call $start:class-overloading
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2903,7 +2903,7 @@
    unreachable
   end
  )
- (func $class-overloading/A#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2941,7 +2941,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/B#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2979,7 +2979,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3075,7 +3075,7 @@
   local.get $3
   return
  )
- (func $class-overloading/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3113,7 +3113,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/C#a<i32> (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $class-overloading/C#a<i32> (param $this i32) (param $a i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3160,7 +3160,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-overloading/D#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/D#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3198,7 +3198,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/E#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/E#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3236,7 +3236,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/F#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/F#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3274,7 +3274,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/CA#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/CA#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3312,7 +3312,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/CC#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/CC#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3350,7 +3350,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/A2#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A2#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3388,7 +3388,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/B2#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B2#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3426,7 +3426,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:class-overloading (type $none_=>_none)
+ (func $start:class-overloading
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4194,7 +4194,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-overloading/A1#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A1#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4232,7 +4232,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/B1#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B1#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4270,7 +4270,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $class-overloading/A1#bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/A1#bar (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4295,7 +4295,7 @@
   local.get $1
   return
  )
- (func $class-overloading/B2#foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class-overloading/B2#foo (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4321,7 +4321,7 @@
   local.get $1
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class-overloading.release.wat b/tests/compiler/class-overloading.release.wat
index 0fdcd3a8e8..4716b7f5c1 100644
--- a/tests/compiler/class-overloading.release.wat
+++ b/tests/compiler/class-overloading.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $class-overloading/which (mut i32) (i32.const 1056))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -58,7 +58,7 @@
  (data (i32.const 1792) "\12\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $class-overloading/which
@@ -139,7 +139,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -271,7 +271,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -424,7 +424,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -670,7 +670,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -782,7 +782,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -861,7 +861,7 @@
   i32.const 34640
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1128,7 +1128,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1185,7 +1185,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1418,7 +1418,7 @@
   memory.fill $0
   local.get $0
  )
- (func $class-overloading/A#a<i32>@override (type $i32_=>_none) (param $0 i32)
+ (func $class-overloading/A#a<i32>@override (param $0 i32)
   block $default
    block $case2
     block $case1
@@ -1446,7 +1446,7 @@
   i32.const 1488
   global.set $class-overloading/which
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $class-overloading/A1
     block $class-overloading/B1
@@ -1517,7 +1517,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -1526,7 +1526,7 @@
   global.set $~started
   call $start:class-overloading
  )
- (func $class-overloading/B#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/B#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1604,7 +1604,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1764,7 +1764,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $class-overloading/C#a<i32> (type $i32_=>_none) (param $0 i32)
+ (func $class-overloading/C#a<i32> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1815,7 +1815,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $class-overloading/D#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/D#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1859,7 +1859,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $class-overloading/E#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $class-overloading/E#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1903,7 +1903,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:class-overloading (type $none_=>_none)
+ (func $start:class-overloading
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3257,7 +3257,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3291,7 +3291,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/class-static-function.debug.wat b/tests/compiler/class-static-function.debug.wat
index 07adf2db2e..5b4e7c6bdb 100644
--- a/tests/compiler/class-static-function.debug.wat
+++ b/tests/compiler/class-static-function.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 124))
@@ -15,11 +15,11 @@
  (elem $0 (i32.const 1) $class-static-function/Example.staticFunc)
  (export "memory" (memory $0))
  (start $~start)
- (func $class-static-function/Example.staticFunc (type $none_=>_i32) (result i32)
+ (func $class-static-function/Example.staticFunc (result i32)
   i32.const 42
   return
  )
- (func $class-static-function/call (type $i32_=>_i32) (param $func i32) (result i32)
+ (func $class-static-function/call (param $func i32) (result i32)
   i32.const 0
   global.set $~argumentsLength
   local.get $func
@@ -27,10 +27,10 @@
   call_indirect $0 (type $none_=>_i32)
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:class-static-function
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -43,7 +43,7 @@
    unreachable
   end
  )
- (func $start:class-static-function (type $none_=>_none)
+ (func $start:class-static-function
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class-static-function.release.wat b/tests/compiler/class-static-function.release.wat
index 3ff8e28632..0c79d9603a 100644
--- a/tests/compiler/class-static-function.release.wat
+++ b/tests/compiler/class-static-function.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33916))
  (memory $0 1)
@@ -13,10 +13,10 @@
  (elem $0 (i32.const 1) $class-static-function/Example.staticFunc)
  (export "memory" (memory $0))
  (start $~start)
- (func $class-static-function/Example.staticFunc (type $none_=>_i32) (result i32)
+ (func $class-static-function/Example.staticFunc (result i32)
   i32.const 42
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class.debug.wat b/tests/compiler/class.debug.wat
index 723846b61e..7e410bab1a 100644
--- a/tests/compiler/class.debug.wat
+++ b/tests/compiler/class.debug.wat
@@ -1,15 +1,15 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $i32_f32_f32_=>_f32 (func_subtype (param i32 f32 f32) (result f32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $i32_f32_f32_=>_f32 (func (param i32 f32 f32) (result f32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $class/Animal.ONE (mut i32) (i32.const 1))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -49,7 +49,7 @@
  (export "memory" (memory $0))
  (export "test" (func $export:class/test))
  (start $~start)
- (func $class/Animal.add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $class/Animal.add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
@@ -57,7 +57,7 @@
   i32.add
   return
  )
- (func $class/Animal.sub<f32> (type $f32_f32_=>_f32) (param $a f32) (param $b f32) (result f32)
+ (func $class/Animal.sub<f32> (param $a f32) (param $b f32) (result f32)
   local.get $a
   local.get $b
   f32.sub
@@ -66,7 +66,7 @@
   f32.add
   return
  )
- (func $start:class (type $none_=>_none)
+ (func $start:class
   i32.const 4
   i32.const 4
   i32.eq
@@ -82,7 +82,7 @@
   call $class/Animal.sub<f32>
   drop
  )
- (func $class/Animal<f64>#instanceAdd (type $i32_i32_i32_=>_i32) (param $this i32) (param $a i32) (param $b i32) (result i32)
+ (func $class/Animal<f64>#instanceAdd (param $this i32) (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
@@ -90,7 +90,7 @@
   i32.add
   return
  )
- (func $class/Animal<f64>#instanceSub<f32> (type $i32_f32_f32_=>_f32) (param $this i32) (param $a f32) (param $b f32) (result f32)
+ (func $class/Animal<f64>#instanceSub<f32> (param $this i32) (param $a f32) (param $b f32) (result f32)
   local.get $a
   local.get $b
   f32.sub
@@ -99,44 +99,44 @@
   f32.add
   return
  )
- (func $class/Animal<f64>#get:one (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class/Animal<f64>#get:one (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $class/Animal<f64>#get:two (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class/Animal<f64>#get:two (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=4
  )
- (func $class/Animal<f64>#get:three (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class/Animal<f64>#get:three (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0 offset=6
  )
- (func $class/Animal<f64>#set:one (type $i32_i32_=>_none) (param $this i32) (param $one i32)
+ (func $class/Animal<f64>#set:one (param $this i32) (param $one i32)
   local.get $this
   local.get $one
   i32.store $0
  )
- (func $class/Animal<f64>#set:two (type $i32_i32_=>_none) (param $this i32) (param $two i32)
+ (func $class/Animal<f64>#set:two (param $this i32) (param $two i32)
   local.get $this
   local.get $two
   i32.store16 $0 offset=4
  )
- (func $class/Animal<f64>#set:three (type $i32_i32_=>_none) (param $this i32) (param $three i32)
+ (func $class/Animal<f64>#set:three (param $this i32) (param $three i32)
   local.get $this
   local.get $three
   i32.store8 $0 offset=6
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -146,11 +146,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -159,14 +159,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -208,7 +208,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -220,11 +220,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -234,7 +234,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -290,15 +290,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -324,7 +324,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -344,7 +344,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -364,7 +364,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -400,7 +400,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -426,7 +426,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -447,11 +447,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -462,39 +462,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -730,7 +730,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1094,7 +1094,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1259,7 +1259,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1404,7 +1404,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1442,7 +1442,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1455,7 +1455,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1472,7 +1472,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1497,7 +1497,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1677,7 +1677,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1735,7 +1735,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1756,7 +1756,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1772,7 +1772,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1980,7 +1980,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2070,7 +2070,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2179,7 +2179,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2243,7 +2243,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2256,17 +2256,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2319,7 +2319,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2387,7 +2387,7 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2396,22 +2396,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $class/GenericInitializer<i32>#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $class/GenericInitializer<i32>#set:foo (param $this i32) (param $foo i32)
   local.get $this
   local.get $foo
   i32.store $0
@@ -2420,12 +2420,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $class/testGenericInitializer (type $none_=>_none)
+ (func $class/testGenericInitializer
   i32.const 0
   call $class/GenericInitializer<i32>#constructor
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2437,7 +2437,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2451,10 +2451,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $class/GenericInitializer<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $class/GenericInitializer<i32>~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2468,11 +2468,11 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2480,7 +2480,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $class/GenericInitializer<i32>
@@ -2520,7 +2520,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:class
   memory.size $0
   i32.const 16
@@ -2540,7 +2540,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2553,7 +2553,7 @@
    unreachable
   end
  )
- (func $class/test (type $i32_=>_i32) (param $animal i32) (result i32)
+ (func $class/test (param $animal i32) (result i32)
   (local $ptr i32)
   (local $cls i32)
   (local $3 i32)
@@ -2656,7 +2656,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -2794,7 +2794,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $class/GenericInitializer<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $class/GenericInitializer<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2850,7 +2850,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2876,7 +2876,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2904,7 +2904,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:class/test (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:class/test (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/class.release.wat b/tests/compiler/class.release.wat
index 1e583ace69..0018b38d96 100644
--- a/tests/compiler/class.release.wat
+++ b/tests/compiler/class.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -39,7 +39,7 @@
  (export "memory" (memory $0))
  (export "test" (func $export:class/test))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -86,7 +86,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -218,7 +218,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -371,7 +371,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -617,7 +617,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -729,7 +729,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -808,7 +808,7 @@
   i32.const 34336
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1075,7 +1075,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1201,7 +1201,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1507,7 +1507,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1562,7 +1562,7 @@
    end
   end
  )
- (func $class/testGenericInitializer (type $none_=>_none)
+ (func $class/testGenericInitializer
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1724,7 +1724,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1792,7 +1792,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1826,7 +1826,7 @@
   i32.const 1344
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $export:class/test (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:class/test (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1916,7 +1916,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/comma.debug.wat b/tests/compiler/comma.debug.wat
index b1b42f6ebb..87ec2d15d4 100644
--- a/tests/compiler/comma.debug.wat
+++ b/tests/compiler/comma.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $comma/a (mut i32) (i32.const 0))
  (global $comma/b (mut i32) (i32.const 0))
@@ -13,7 +13,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:comma (type $none_=>_none)
+ (func $start:comma
   (local $0 i32)
   (local $c i32)
   global.get $comma/a
@@ -183,7 +183,7 @@
   i32.const 3
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:comma
  )
 )
diff --git a/tests/compiler/comma.release.wat b/tests/compiler/comma.release.wat
index 781242ac86..d33a8fd703 100644
--- a/tests/compiler/comma.release.wat
+++ b/tests/compiler/comma.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $comma/a (mut i32) (i32.const 0))
  (global $comma/b (mut i32) (i32.const 0))
@@ -9,7 +9,7 @@
  (data (i32.const 1048) "\02\00\00\00\10\00\00\00c\00o\00m\00m\00a\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $comma/a
diff --git a/tests/compiler/const-folding.debug.wat b/tests/compiler/const-folding.debug.wat
index 38e6e185cd..4e34c1e61c 100644
--- a/tests/compiler/const-folding.debug.wat
+++ b/tests/compiler/const-folding.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i64_=>_i64 (func_subtype (param i64) (result i64) func))
+ (type $none_=>_none (func))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
  (global $const-folding/w (mut i32) (i32.const 0))
  (global $const-folding/x (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 8))
@@ -13,7 +13,7 @@
  (export "test" (func $const-folding/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:const-folding (type $none_=>_none)
+ (func $start:const-folding
   i32.const 42
   i32.const 1
   i32.shr_s
@@ -29,7 +29,7 @@
   global.get $const-folding/w
   global.set $const-folding/x
  )
- (func $const-folding/test (type $i64_=>_i64) (param $value i64) (result i64)
+ (func $const-folding/test (param $value i64) (result i64)
   (local $mod1 i64)
   (local $mod2 i64)
   (local $rlo i64)
@@ -67,7 +67,7 @@
   i64.add
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:const-folding
  )
 )
diff --git a/tests/compiler/const-folding.release.wat b/tests/compiler/const-folding.release.wat
index af980b82c7..a296656855 100644
--- a/tests/compiler/const-folding.release.wat
+++ b/tests/compiler/const-folding.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $i64_=>_i64 (func_subtype (param i64) (result i64) func))
- (type $none_=>_none (func_subtype func))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
+ (type $none_=>_none (func))
  (global $const-folding/x (mut i32) (i32.const 0))
  (memory $0 0)
  (export "x" (global $const-folding/x))
  (export "test" (func $const-folding/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $const-folding/test (type $i64_=>_i64) (param $0 i64) (result i64)
+ (func $const-folding/test (param $0 i64) (result i64)
   local.get $0
   i64.const 1
   i64.shl
@@ -16,7 +16,7 @@
   i64.shr_u
   i64.add
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 30
   global.set $const-folding/x
  )
diff --git a/tests/compiler/constructor.debug.wat b/tests/compiler/constructor.debug.wat
index 259875a024..6cd1d477ac 100644
--- a/tests/compiler/constructor.debug.wat
+++ b/tests/compiler/constructor.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -54,17 +54,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -74,11 +74,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -87,14 +87,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -136,7 +136,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -148,11 +148,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -162,7 +162,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -218,15 +218,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -252,7 +252,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -272,7 +272,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -292,7 +292,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -328,7 +328,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -354,7 +354,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -375,11 +375,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -390,39 +390,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -658,7 +658,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1022,7 +1022,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1187,7 +1187,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1332,7 +1332,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1370,7 +1370,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1383,7 +1383,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1400,7 +1400,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1425,7 +1425,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1605,7 +1605,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1663,7 +1663,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1684,7 +1684,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1700,7 +1700,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1908,7 +1908,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1998,7 +1998,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2107,7 +2107,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2171,7 +2171,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2184,17 +2184,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2247,63 +2247,63 @@
   local.get $ptr
   return
  )
- (func $constructor/EmptyCtorWithFieldInit#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/EmptyCtorWithFieldInit#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $constructor/EmptyCtorWithFieldNoInit#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/EmptyCtorWithFieldNoInit#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $constructor/EmptyCtorWithFieldAccess#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/EmptyCtorWithFieldAccess#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $constructor/JustFieldInit#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/JustFieldInit#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $constructor/JustFieldNoInit#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/JustFieldNoInit#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $constructor/CtorReturns#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorReturns#constructor (param $this i32) (result i32)
   i32.const 0
   return
  )
- (func $constructor/CtorFieldInitOrder#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorFieldInitOrder#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $constructor/CtorFieldInitOrder#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorFieldInitOrder#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $constructor/CtorFieldInitOrder#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorFieldInitOrder#get:c (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $constructor/CtorFieldInitOrder#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $constructor/CtorFieldInitOrder#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0 offset=4
  )
- (func $constructor/CtorFieldInitOrder#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $constructor/CtorFieldInitOrder#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=8
  )
- (func $constructor/CtorFieldInitOrder#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $constructor/CtorFieldInitOrder#set:c (param $this i32) (param $c i32)
   local.get $this
   local.get $c
   i32.store $0
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $constructor/emptyCtor
   local.tee $1
@@ -2389,7 +2389,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2403,10 +2403,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $constructor/CtorFieldInitOrder
     block $constructor/CtorConditionallyReturnsThis
@@ -2464,10 +2464,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:constructor
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2480,7 +2480,7 @@
    unreachable
   end
  )
- (func $constructor/EmptyCtorWithFieldInit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/EmptyCtorWithFieldInit#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2516,7 +2516,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/EmptyCtorWithFieldNoInit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/EmptyCtorWithFieldNoInit#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2552,7 +2552,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/EmptyCtorWithFieldAccess#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/EmptyCtorWithFieldAccess#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2596,7 +2596,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/None#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/None#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2634,7 +2634,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/JustFieldInit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/JustFieldInit#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2680,7 +2680,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/JustFieldNoInit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/JustFieldNoInit#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2726,7 +2726,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/CtorFieldInitOrder#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $a i32) (param $b i32) (result i32)
+ (func $constructor/CtorFieldInitOrder#constructor (param $this i32) (param $a i32) (param $b i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2873,7 +2873,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $start:constructor (type $none_=>_none)
+ (func $start:constructor
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2994,7 +2994,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $constructor/EmptyCtor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/EmptyCtor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3022,7 +3022,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3050,7 +3050,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/CtorConditionallyReturns#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorConditionallyReturns#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3089,7 +3089,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $constructor/CtorConditionallyReturnsThis#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $constructor/CtorConditionallyReturnsThis#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/constructor.release.wat b/tests/compiler/constructor.release.wat
index 7c38aa6351..d3bf57fe8f 100644
--- a/tests/compiler/constructor.release.wat
+++ b/tests/compiler/constructor.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,7 +44,7 @@
  (data (i32.const 1488) "\0f\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $constructor/emptyCtor
@@ -143,7 +143,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -275,7 +275,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -428,7 +428,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -674,7 +674,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -786,7 +786,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -865,7 +865,7 @@
   i32.const 34320
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1132,7 +1132,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1258,7 +1258,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1564,7 +1564,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $constructor/CtorFieldInitOrder
     block $constructor/CtorConditionallyReturnsThis
@@ -1626,7 +1626,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2118,7 +2118,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2153,7 +2153,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/continue.debug.wat b/tests/compiler/continue.debug.wat
index f9b74ce81d..a94f69a260 100644
--- a/tests/compiler/continue.debug.wat
+++ b/tests/compiler/continue.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_=>_none (func (param i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "testInherit" (func $continue/testInherit))
  (export "memory" (memory $0))
- (func $continue/testInherit (type $i32_=>_none) (param $b i32)
+ (func $continue/testInherit (param $b i32)
   (local $i i32)
   i32.const 0
   local.set $i
diff --git a/tests/compiler/continue.release.wat b/tests/compiler/continue.release.wat
index 51b9efcb30..a1ca0b86db 100644
--- a/tests/compiler/continue.release.wat
+++ b/tests/compiler/continue.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_=>_none (func (param i32)))
  (memory $0 0)
  (export "testInherit" (func $continue/testInherit))
  (export "memory" (memory $0))
- (func $continue/testInherit (type $i32_=>_none) (param $0 i32)
+ (func $continue/testInherit (param $0 i32)
   (local $1 i32)
   loop $for-loop|0
    local.get $1
diff --git a/tests/compiler/converge.debug.wat b/tests/compiler/converge.debug.wat
index f895509658..ed5204cecf 100644
--- a/tests/compiler/converge.debug.wat
+++ b/tests/compiler/converge.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "test" (func $converge/test))
  (export "memory" (memory $0))
- (func $converge/test (type $none_=>_none)
+ (func $converge/test
   nop
  )
 )
diff --git a/tests/compiler/converge.release.wat b/tests/compiler/converge.release.wat
index 60ade6867e..a79d9a2846 100644
--- a/tests/compiler/converge.release.wat
+++ b/tests/compiler/converge.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "test" (func $converge/test))
  (export "memory" (memory $0))
- (func $converge/test (type $none_=>_none)
+ (func $converge/test
   nop
  )
 )
diff --git a/tests/compiler/declare.debug.wat b/tests/compiler/declare.debug.wat
index 5506d4c13f..eed58d3d8b 100644
--- a/tests/compiler/declare.debug.wat
+++ b/tests/compiler/declare.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "declare" "externalConstant" (global $declare/externalConstant i32))
  (import "declare" "my.externalConstant" (global $declare/my.externalConstant i32))
  (import "declare" "externalFunction" (func $declare/externalFunction))
@@ -15,7 +15,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:declare (type $none_=>_none)
+ (func $start:declare
   call $declare/externalFunction
   global.get $declare/externalConstant
   i32.const 1
@@ -43,7 +43,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:declare
  )
 )
diff --git a/tests/compiler/declare.release.wat b/tests/compiler/declare.release.wat
index 48f2fccadc..bf9a075a34 100644
--- a/tests/compiler/declare.release.wat
+++ b/tests/compiler/declare.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "declare" "externalConstant" (global $declare/externalConstant i32))
  (import "declare" "my.externalConstant" (global $declare/my.externalConstant i32))
  (import "declare" "externalFunction" (func $declare/externalFunction))
@@ -11,7 +11,7 @@
  (data (i32.const 1048) "\02\00\00\00\14\00\00\00d\00e\00c\00l\00a\00r\00e\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   call $declare/externalFunction
   global.get $declare/externalConstant
   i32.const 1
diff --git a/tests/compiler/do.debug.wat b/tests/compiler/do.debug.wat
index 0ec71a93f3..7aeb17156a 100644
--- a/tests/compiler/do.debug.wat
+++ b/tests/compiler/do.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $do/ran (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -43,7 +43,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $do/testSimple (type $none_=>_none)
+ (func $do/testSimple
   (local $n i32)
   (local $m i32)
   i32.const 10
@@ -89,7 +89,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testEmpty (type $none_=>_none)
+ (func $do/testEmpty
   (local $n i32)
   (local $1 i32)
   i32.const 10
@@ -119,7 +119,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testNested (type $none_=>_none)
+ (func $do/testNested
   (local $n i32)
   (local $m i32)
   (local $o i32)
@@ -216,7 +216,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testAlwaysTrue (type $none_=>_none)
+ (func $do/testAlwaysTrue
   (local $i i32)
   i32.const 0
   local.set $i
@@ -250,7 +250,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testAlwaysTrueNeverBreaks (type $none_=>_i32) (result i32)
+ (func $do/testAlwaysTrueNeverBreaks (result i32)
   (local $i i32)
   i32.const 0
   local.set $i
@@ -270,7 +270,7 @@
   end
   unreachable
  )
- (func $do/testAlwaysFalse (type $none_=>_none)
+ (func $do/testAlwaysFalse
   (local $i i32)
   i32.const 0
   local.set $i
@@ -297,7 +297,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testAlwaysBreaks (type $none_=>_none)
+ (func $do/testAlwaysBreaks
   (local $i i32)
   i32.const 0
   local.set $i
@@ -326,7 +326,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testAlwaysReturns (type $none_=>_none)
+ (func $do/testAlwaysReturns
   (local $i i32)
   i32.const 0
   local.set $i
@@ -341,7 +341,7 @@
   end
   unreachable
  )
- (func $do/testContinue (type $none_=>_none)
+ (func $do/testContinue
   (local $i i32)
   i32.const 0
   local.set $i
@@ -378,7 +378,7 @@
   i32.const 1
   global.set $do/ran
  )
- (func $do/testNestedContinue (type $none_=>_none)
+ (func $do/testNestedContinue
   (local $i i32)
   (local $j i32)
   i32.const 0
@@ -450,17 +450,17 @@
   i32.const 1
   global.set $do/ran
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -470,11 +470,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -483,14 +483,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -532,7 +532,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -544,11 +544,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -558,7 +558,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -614,15 +614,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -648,7 +648,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -668,7 +668,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -688,7 +688,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -724,7 +724,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -750,7 +750,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -771,11 +771,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -786,39 +786,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1054,7 +1054,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1418,7 +1418,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1583,7 +1583,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1728,7 +1728,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1766,7 +1766,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1779,7 +1779,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1796,7 +1796,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1821,7 +1821,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -2001,7 +2001,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2059,7 +2059,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2080,7 +2080,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2096,7 +2096,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2304,7 +2304,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2394,7 +2394,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2503,7 +2503,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2567,7 +2567,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2580,17 +2580,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2643,7 +2643,7 @@
   local.get $ptr
   return
  )
- (func $do/testRef (type $none_=>_none)
+ (func $do/testRef
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2711,12 +2711,12 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $do/getRef (type $none_=>_i32) (result i32)
+ (func $do/getRef (result i32)
   i32.const 0
   call $do/Ref#constructor
   return
  )
- (func $do/testRefAutorelease (type $none_=>_none)
+ (func $do/testRefAutorelease
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2781,7 +2781,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2827,7 +2827,7 @@
   i32.const 0
   drop
  )
- (func $start:do (type $none_=>_none)
+ (func $start:do
   i32.const 0
   global.set $do/ran
   call $do/testSimple
@@ -3002,7 +3002,7 @@
   end
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 256
   local.get $0
@@ -3011,7 +3011,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3025,10 +3025,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $do/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -3056,10 +3056,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:do
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3072,7 +3072,7 @@
    unreachable
   end
  )
- (func $do/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $do/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3110,7 +3110,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/do.release.wat b/tests/compiler/do.release.wat
index 61e63b992d..706b973d75 100644
--- a/tests/compiler/do.release.wat
+++ b/tests/compiler/do.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -34,7 +34,7 @@
  (data (i32.const 1472) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1280
@@ -79,7 +79,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -211,7 +211,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -364,7 +364,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -610,7 +610,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -722,7 +722,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -801,7 +801,7 @@
   i32.const 34272
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1068,7 +1068,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1125,7 +1125,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1358,7 +1358,7 @@
   memory.fill $0
   local.get $0
  )
- (func $start:do (type $none_=>_none)
+ (func $start:do
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1808,7 +1808,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $do/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -1840,10 +1840,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:do
  )
- (func $do/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $do/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1909,7 +1909,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/duplicate-fields.debug.wat b/tests/compiler/duplicate-fields.debug.wat
index 2edf21fdfd..011e5b12d3 100644
--- a/tests/compiler/duplicate-fields.debug.wat
+++ b/tests/compiler/duplicate-fields.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,22 +44,22 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $duplicate-fields/A#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $duplicate-fields/A#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -69,11 +69,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -82,14 +82,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -131,7 +131,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -143,11 +143,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -157,7 +157,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -213,15 +213,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -247,7 +247,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -267,7 +267,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -287,7 +287,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -323,7 +323,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -349,7 +349,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -370,11 +370,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -385,39 +385,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -653,7 +653,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1017,7 +1017,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1182,7 +1182,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1327,7 +1327,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1365,7 +1365,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1378,7 +1378,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1395,7 +1395,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1420,7 +1420,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1600,7 +1600,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1658,7 +1658,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1679,7 +1679,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1695,7 +1695,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1903,7 +1903,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1993,7 +1993,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2102,7 +2102,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2166,7 +2166,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2179,17 +2179,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2242,16 +2242,16 @@
   local.get $ptr
   return
  )
- (func $duplicate-fields/B#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $duplicate-fields/B#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
  )
- (func $duplicate-fields/B#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $duplicate-fields/B#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2319,7 +2319,7 @@
    end
   end
  )
- (func $duplicate-fields/A2#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $duplicate-fields/A2#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
@@ -2328,7 +2328,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $duplicate-fields/B2#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $duplicate-fields/B2#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
@@ -2337,40 +2337,40 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $duplicate-fields/Foo#set:foo (type $i32_i32_=>_none) (param $this i32) (param $foo i32)
+ (func $duplicate-fields/Foo#set:foo (param $this i32) (param $foo i32)
   local.get $this
   local.get $foo
   i32.store $0
  )
- (func $duplicate-fields/B2#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $duplicate-fields/B2#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $duplicate-fields/Foo#get:foo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $duplicate-fields/Foo#get:foo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $duplicate-fields/A3#set:prot (type $i32_i32_=>_none) (param $this i32) (param $prot i32)
+ (func $duplicate-fields/A3#set:prot (param $this i32) (param $prot i32)
   local.get $this
   local.get $prot
   i32.store $0
  )
- (func $duplicate-fields/A3#set:pub (type $i32_i32_=>_none) (param $this i32) (param $pub i32)
+ (func $duplicate-fields/A3#set:pub (param $this i32) (param $pub i32)
   local.get $this
   local.get $pub
   i32.store $0 offset=4
  )
- (func $duplicate-fields/B3#set:prot (type $i32_i32_=>_none) (param $this i32) (param $prot i32)
+ (func $duplicate-fields/B3#set:prot (param $this i32) (param $prot i32)
   local.get $this
   local.get $prot
   i32.store $0
  )
- (func $duplicate-fields/B3#set:pub (type $i32_i32_=>_none) (param $this i32) (param $pub i32)
+ (func $duplicate-fields/B3#set:pub (param $this i32) (param $pub i32)
   local.get $this
   local.get $pub
   i32.store $0 offset=4
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $duplicate-fields/foo
   local.tee $1
@@ -2393,7 +2393,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2407,10 +2407,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $duplicate-fields/A2~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $duplicate-fields/A2~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2424,7 +2424,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $duplicate-fields/B2~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $duplicate-fields/B2~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2438,7 +2438,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $duplicate-fields/A3
     block $duplicate-fields/B3
@@ -2490,10 +2490,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:duplicate-fields
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2506,7 +2506,7 @@
    unreachable
   end
  )
- (func $duplicate-fields/A#constructor (type $i32_i32_=>_i32) (param $this i32) (param $bar i32) (result i32)
+ (func $duplicate-fields/A#constructor (param $this i32) (param $bar i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2550,7 +2550,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $duplicate-fields/B#constructor (type $i32_i32_=>_i32) (param $this i32) (param $bar i32) (result i32)
+ (func $duplicate-fields/B#constructor (param $this i32) (param $bar i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2605,7 +2605,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $duplicate-fields/A2#constructor (type $i32_i32_=>_i32) (param $this i32) (param $bar i32) (result i32)
+ (func $duplicate-fields/A2#constructor (param $this i32) (param $bar i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2657,7 +2657,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $duplicate-fields/B2#constructor (type $i32_i32_=>_i32) (param $this i32) (param $bar i32) (result i32)
+ (func $duplicate-fields/B2#constructor (param $this i32) (param $bar i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2725,7 +2725,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $duplicate-fields/Foo#constructor (type $i32_i32_=>_i32) (param $this i32) (param $foo i32) (result i32)
+ (func $duplicate-fields/Foo#constructor (param $this i32) (param $foo i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2769,7 +2769,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $duplicate-fields/A3#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $duplicate-fields/A3#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2823,7 +2823,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $duplicate-fields/B3#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $duplicate-fields/B3#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2877,7 +2877,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:duplicate-fields (type $none_=>_none)
+ (func $start:duplicate-fields
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2985,7 +2985,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/duplicate-fields.release.wat b/tests/compiler/duplicate-fields.release.wat
index bdd05d67ec..036f800214 100644
--- a/tests/compiler/duplicate-fields.release.wat
+++ b/tests/compiler/duplicate-fields.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -36,7 +36,7 @@
  (data (i32.const 1504) "\0b\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00\00\00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $duplicate-fields/foo
@@ -93,7 +93,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -225,7 +225,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -378,7 +378,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -624,7 +624,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -736,7 +736,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -815,7 +815,7 @@
   i32.const 34320
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1082,7 +1082,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1208,7 +1208,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1514,7 +1514,7 @@
   memory.fill $0
   local.get $1
  )
- (func $duplicate-fields/A2#set:bar (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $duplicate-fields/A2#set:bar (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1569,7 +1569,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1623,7 +1623,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2049,7 +2049,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/empty-exportruntime.debug.wat b/tests/compiler/empty-exportruntime.debug.wat
index 15f4832cef..25aa3ed731 100644
--- a/tests/compiler/empty-exportruntime.debug.wat
+++ b/tests/compiler/empty-exportruntime.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -48,17 +48,17 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -68,11 +68,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -81,14 +81,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -130,7 +130,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -142,11 +142,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -156,7 +156,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -212,15 +212,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -246,7 +246,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -266,7 +266,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -286,7 +286,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -322,7 +322,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -348,7 +348,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -369,11 +369,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -384,39 +384,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -652,7 +652,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1016,7 +1016,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1181,7 +1181,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1326,7 +1326,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1364,7 +1364,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1377,7 +1377,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1394,7 +1394,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1419,7 +1419,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1599,7 +1599,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1657,7 +1657,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1678,7 +1678,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1694,7 +1694,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1902,7 +1902,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1992,7 +1992,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2101,7 +2101,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2165,7 +2165,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2178,17 +2178,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2241,7 +2241,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $ptr i32) (result i32)
   (local $obj i32)
   local.get $ptr
   if
@@ -2271,7 +2271,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/itcms/__unpin (param $ptr i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -2309,7 +2309,7 @@
    call $~lib/rt/itcms/Object#linkTo
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2355,7 +2355,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2370,7 +2370,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2384,10 +2384,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2412,7 +2412,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
diff --git a/tests/compiler/empty-exportruntime.release.wat b/tests/compiler/empty-exportruntime.release.wat
index 5ebb10c709..70d90691f3 100644
--- a/tests/compiler/empty-exportruntime.release.wat
+++ b/tests/compiler/empty-exportruntime.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,7 +42,7 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -91,7 +91,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#unlink (param $0 i32)
   (local $1 i32)
   local.get $0
   i32.load $0 offset=4
@@ -142,7 +142,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -226,7 +226,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -379,7 +379,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -625,7 +625,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -737,7 +737,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -816,7 +816,7 @@
   i32.const 34368
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1083,7 +1083,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1209,7 +1209,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1515,7 +1515,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1566,7 +1566,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/__unpin (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1625,7 +1625,7 @@
    i32.store $0 offset=8
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   global.get $~lib/rt/itcms/state
   i32.const 0
   i32.gt_s
@@ -1660,7 +1660,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1689,7 +1689,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1723,7 +1723,7 @@
   i32.const 1344
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/empty-new.debug.wat b/tests/compiler/empty-new.debug.wat
index 3235e5becc..f9d53606aa 100644
--- a/tests/compiler/empty-new.debug.wat
+++ b/tests/compiler/empty-new.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -41,17 +41,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -61,11 +61,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -74,14 +74,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -123,7 +123,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -135,11 +135,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -149,7 +149,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -205,15 +205,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -239,7 +239,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -259,7 +259,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -279,7 +279,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -315,7 +315,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -341,7 +341,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -362,11 +362,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -377,39 +377,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -645,7 +645,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1009,7 +1009,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1174,7 +1174,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1319,7 +1319,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1357,7 +1357,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1370,7 +1370,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1387,7 +1387,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1412,7 +1412,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1592,7 +1592,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1650,7 +1650,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1671,7 +1671,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1687,7 +1687,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1895,7 +1895,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1985,7 +1985,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2094,7 +2094,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2158,7 +2158,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2171,17 +2171,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2234,7 +2234,7 @@
   local.get $ptr
   return
  )
- (func $start:empty-new (type $none_=>_none)
+ (func $start:empty-new
   memory.size $0
   i32.const 16
   i32.shl
@@ -2257,7 +2257,7 @@
   call $~lib/rt/itcms/__new
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2266,7 +2266,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2280,10 +2280,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2308,7 +2308,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:empty-new
  )
 )
diff --git a/tests/compiler/empty-new.release.wat b/tests/compiler/empty-new.release.wat
index 9f2a508fda..5e298862ac 100644
--- a/tests/compiler/empty-new.release.wat
+++ b/tests/compiler/empty-new.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -31,7 +31,7 @@
  (data (i32.const 1440) "\04\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -76,7 +76,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -208,7 +208,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -361,7 +361,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -607,7 +607,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -719,7 +719,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -798,7 +798,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1065,7 +1065,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1122,7 +1122,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_none)
+ (func $~lib/rt/itcms/__new
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1353,7 +1353,7 @@
   i32.const 0
   memory.fill $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1382,7 +1382,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1417,7 +1417,7 @@
   global.set $~lib/rt/itcms/fromSpace
   call $~lib/rt/itcms/__new
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/enum.debug.wat b/tests/compiler/enum.debug.wat
index e8e66897a6..c558bf38d0 100644
--- a/tests/compiler/enum.debug.wat
+++ b/tests/compiler/enum.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
  (global $enum/Implicit.ZERO i32 (i32.const 0))
  (global $enum/Implicit.ONE i32 (i32.const 1))
  (global $enum/Implicit.TWO i32 (i32.const 2))
@@ -68,11 +68,11 @@
  (export "SelfReferenceConst.ONE" (global $enum/SelfReferenceConst.ONE))
  (export "memory" (memory $0))
  (start $~start)
- (func $enum/getZero (type $none_=>_i32) (result i32)
+ (func $enum/getZero (result i32)
   i32.const 0
   return
  )
- (func $start:enum (type $none_=>_none)
+ (func $start:enum
   call $enum/getZero
   global.set $enum/NonConstant.ZERO
   call $enum/getZero
@@ -84,7 +84,7 @@
   global.get $enum/NonConstant.ONE
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:enum
  )
 )
diff --git a/tests/compiler/export-default.debug.wat b/tests/compiler/export-default.debug.wat
index 68d70d91c9..8e89c44e60 100644
--- a/tests/compiler/export-default.debug.wat
+++ b/tests/compiler/export-default.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -9,7 +9,7 @@
  (export "theDefault" (func $export-default/theDefault))
  (export "default" (func $export-default/theDefault))
  (export "memory" (memory $0))
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
 )
diff --git a/tests/compiler/export-default.release.wat b/tests/compiler/export-default.release.wat
index 62b996a9c1..3d4b1febf3 100644
--- a/tests/compiler/export-default.release.wat
+++ b/tests/compiler/export-default.release.wat
@@ -1,10 +1,10 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "theDefault" (func $export-default/theDefault))
  (export "default" (func $export-default/theDefault))
  (export "memory" (memory $0))
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
 )
diff --git a/tests/compiler/export.debug.wat b/tests/compiler/export.debug.wat
index bc2db64d3b..8280225fa8 100644
--- a/tests/compiler/export.debug.wat
+++ b/tests/compiler/export.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
@@ -16,19 +16,19 @@
  (export "b" (global $export/b))
  (export "renamed_c" (global $export/c))
  (export "memory" (memory $0))
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/sub (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
diff --git a/tests/compiler/export.release.wat b/tests/compiler/export.release.wat
index a692c261f6..a785e0e68b 100644
--- a/tests/compiler/export.release.wat
+++ b/tests/compiler/export.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
@@ -11,17 +11,17 @@
  (export "b" (global $export/b))
  (export "renamed_c" (global $export/c))
  (export "memory" (memory $0))
- (func $export/add (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.mul
diff --git a/tests/compiler/exportimport-table.debug.wat b/tests/compiler/exportimport-table.debug.wat
index b9cc6cc220..ef2b7d21f4 100644
--- a/tests/compiler/exportimport-table.debug.wat
+++ b/tests/compiler/exportimport-table.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (import "env" "table" (table $0 2 funcref))
  (global $exportimport-table/f (mut i32) (i32.const 32))
  (global $~lib/memory/__data_end i32 (i32.const 44))
@@ -11,14 +11,14 @@
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $~start)
- (func $start:exportimport-table~anonymous|0 (type $none_=>_none)
+ (func $start:exportimport-table~anonymous|0
   nop
  )
- (func $start:exportimport-table (type $none_=>_none)
+ (func $start:exportimport-table
   global.get $exportimport-table/f
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:exportimport-table
  )
 )
diff --git a/tests/compiler/exportimport-table.release.wat b/tests/compiler/exportimport-table.release.wat
index 0f188bba59..561ef27673 100644
--- a/tests/compiler/exportimport-table.release.wat
+++ b/tests/compiler/exportimport-table.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (import "env" "table" (table $0 2 funcref))
  (memory $0 1)
  (data (i32.const 1036) "\1c")
@@ -7,7 +7,7 @@
  (elem $0 (i32.const 1) $start:exportimport-table~anonymous|0)
  (export "memory" (memory $0))
  (export "table" (table $0))
- (func $start:exportimport-table~anonymous|0 (type $none_=>_none)
+ (func $start:exportimport-table~anonymous|0
   nop
  )
 )
diff --git a/tests/compiler/exports-lazy.debug.wat b/tests/compiler/exports-lazy.debug.wat
index 6a554f5d04..6658233494 100644
--- a/tests/compiler/exports-lazy.debug.wat
+++ b/tests/compiler/exports-lazy.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $exports-lazy/lazyGlobalUsed i32 (i32.const 64))
  (global $exports-lazy/lazyGlobalUnused i32 (i32.const 144))
  (global $~lib/memory/__data_end i32 (i32.const 172))
@@ -16,20 +16,20 @@
  (export "lazyGlobalUsed" (global $exports-lazy/lazyGlobalUsed))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:exports-lazy (type $none_=>_none)
+ (func $start:exports-lazy
   (local $0 i32)
   (local $1 i32)
   global.get $exports-lazy/lazyGlobalUsed
   drop
   call $exports-lazy/lazyFuncUsed
  )
- (func $exports-lazy/lazyFuncUsed (type $none_=>_none)
+ (func $exports-lazy/lazyFuncUsed
   nop
  )
- (func $exports-lazy/lazyFuncUnused (type $none_=>_none)
+ (func $exports-lazy/lazyFuncUnused
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:exports-lazy
  )
 )
diff --git a/tests/compiler/exports.debug.wat b/tests/compiler/exports.debug.wat
index f5fc82cb23..73c27b1893 100644
--- a/tests/compiler/exports.debug.wat
+++ b/tests/compiler/exports.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
  (global $exports/Animal.CAT i32 (i32.const 0))
  (global $exports/Animal.DOG i32 (i32.const 1))
  (global $exports/animals.Animal.CAT i32 (i32.const 0))
@@ -25,19 +25,19 @@
  (export "renamed_mul" (func $export/mul))
  (export "memory" (memory $0))
  (export "__setArgumentsLength" (func $~setArgumentsLength))
- (func $exports/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $exports/subOpt (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/subOpt (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
   return
  )
- (func $exports/subOpt@varargs (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/subOpt@varargs (param $a i32) (param $b i32) (result i32)
   block $1of1
    block $0of1
     block $outOfRange
@@ -55,13 +55,13 @@
   local.get $b
   call $exports/subOpt
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
   return
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
diff --git a/tests/compiler/exports.release.wat b/tests/compiler/exports.release.wat
index f89eefd59f..992ce0cde5 100644
--- a/tests/compiler/exports.release.wat
+++ b/tests/compiler/exports.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
  (global $exports/Animal.CAT i32 (i32.const 0))
  (global $exports/Animal.DOG i32 (i32.const 1))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -12,12 +12,12 @@
  (export "renamed_mul" (func $export/mul))
  (export "memory" (memory $0))
  (export "__setArgumentsLength" (func $~setArgumentsLength))
- (func $exports/add (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $exports/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $exports/subOpt@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $exports/subOpt@varargs (param $0 i32) (param $1 i32) (result i32)
   block $1of1
    block $0of1
     block $outOfRange
@@ -35,12 +35,12 @@
   local.get $1
   i32.sub
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.mul
  )
- (func $~setArgumentsLength (type $i32_=>_none) (param $0 i32)
+ (func $~setArgumentsLength (param $0 i32)
   local.get $0
   global.set $~argumentsLength
  )
diff --git a/tests/compiler/exportstar-rereexport.debug.wat b/tests/compiler/exportstar-rereexport.debug.wat
index 8e46cfa481..4faa4152c2 100644
--- a/tests/compiler/exportstar-rereexport.debug.wat
+++ b/tests/compiler/exportstar-rereexport.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -58,40 +58,40 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
   return
  )
- (func $exports/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $exports/Car#set:doors (type $i32_i32_=>_none) (param $this i32) (param $doors i32)
+ (func $exports/Car#set:doors (param $this i32) (param $doors i32)
   local.get $this
   local.get $doors
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -101,11 +101,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -114,14 +114,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -163,7 +163,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -175,11 +175,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -189,7 +189,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -245,15 +245,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -279,7 +279,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -299,7 +299,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -319,7 +319,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -355,7 +355,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -381,7 +381,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -402,11 +402,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -417,39 +417,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -685,7 +685,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1049,7 +1049,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1214,7 +1214,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1359,7 +1359,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1397,7 +1397,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1410,7 +1410,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1427,7 +1427,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1452,7 +1452,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1632,7 +1632,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1690,7 +1690,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1711,7 +1711,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1727,7 +1727,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1935,7 +1935,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2025,7 +2025,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2134,7 +2134,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2198,7 +2198,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2211,17 +2211,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2274,17 +2274,17 @@
   local.get $ptr
   return
  )
- (func $exports/Car#get:doors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:doors (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $start:exportstar-rereexport (type $none_=>_none)
+ (func $start:exportstar-rereexport
   call $start:rereexport
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 272
   local.get $0
@@ -2314,7 +2314,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2328,10 +2328,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -2359,10 +2359,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:exportstar-rereexport
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2375,7 +2375,7 @@
    unreachable
   end
  )
- (func $exports/Car#constructor (type $i32_i32_=>_i32) (param $this i32) (param $doors i32) (result i32)
+ (func $exports/Car#constructor (param $this i32) (param $doors i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2419,7 +2419,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $exports/Car#get:numDoors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:numDoors (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2444,7 +2444,7 @@
   local.get $1
   return
  )
- (func $start:reexport (type $none_=>_none)
+ (func $start:reexport
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2534,7 +2534,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:rereexport (type $none_=>_none)
+ (func $start:rereexport
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/exportstar-rereexport.release.wat b/tests/compiler/exportstar-rereexport.release.wat
index ac8441d3a1..194cf0e9e1 100644
--- a/tests/compiler/exportstar-rereexport.release.wat
+++ b/tests/compiler/exportstar-rereexport.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -47,7 +47,7 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1296
@@ -110,7 +110,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -242,7 +242,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -395,7 +395,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -641,7 +641,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -753,7 +753,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -832,7 +832,7 @@
   i32.const 34336
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1099,7 +1099,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1156,7 +1156,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1388,10 +1388,10 @@
   i32.store $0 align=1
   local.get $0
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -1423,7 +1423,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   block $__inlined_func$start:exportstar-rereexport
    global.get $~lib/memory/__stack_pointer
@@ -1554,7 +1554,7 @@
    unreachable
   end
  )
- (func $exports/Car#constructor (type $none_=>_i32) (result i32)
+ (func $exports/Car#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1599,7 +1599,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $exports/Car#get:numDoors (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $exports/Car#get:numDoors (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1632,7 +1632,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/exportstar.debug.wat b/tests/compiler/exportstar.debug.wat
index bc2db64d3b..8280225fa8 100644
--- a/tests/compiler/exportstar.debug.wat
+++ b/tests/compiler/exportstar.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
@@ -16,19 +16,19 @@
  (export "b" (global $export/b))
  (export "renamed_c" (global $export/c))
  (export "memory" (memory $0))
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/sub (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
diff --git a/tests/compiler/exportstar.release.wat b/tests/compiler/exportstar.release.wat
index a692c261f6..a785e0e68b 100644
--- a/tests/compiler/exportstar.release.wat
+++ b/tests/compiler/exportstar.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
@@ -11,17 +11,17 @@
  (export "b" (global $export/b))
  (export "renamed_c" (global $export/c))
  (export "memory" (memory $0))
- (func $export/add (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.mul
diff --git a/tests/compiler/extends-baseaggregate.debug.wat b/tests/compiler/extends-baseaggregate.debug.wat
index 7d66bf71aa..47277e92da 100644
--- a/tests/compiler/extends-baseaggregate.debug.wat
+++ b/tests/compiler/extends-baseaggregate.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $extends-baseaggregate/poolB i32 (i32.const 64))
  (global $extends-baseaggregate/poolA i32 (i32.const 144))
@@ -51,17 +51,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -71,11 +71,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -84,14 +84,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -133,7 +133,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -145,11 +145,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -159,7 +159,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -215,15 +215,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -249,7 +249,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -269,7 +269,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -289,7 +289,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -325,7 +325,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -351,7 +351,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -372,11 +372,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -387,39 +387,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -655,7 +655,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1019,7 +1019,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1184,7 +1184,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1329,7 +1329,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1367,7 +1367,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1380,7 +1380,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1397,7 +1397,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1422,7 +1422,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1602,7 +1602,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1660,7 +1660,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1681,7 +1681,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1697,7 +1697,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1905,7 +1905,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1995,7 +1995,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2104,7 +2104,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2168,7 +2168,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2181,17 +2181,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2244,17 +2244,17 @@
   local.get $ptr
   return
  )
- (func $extends-baseaggregate/A1#set:padding0 (type $i32_f64_=>_none) (param $this i32) (param $padding0 f64)
+ (func $extends-baseaggregate/A1#set:padding0 (param $this i32) (param $padding0 f64)
   local.get $this
   local.get $padding0
   f64.store $0
  )
- (func $extends-baseaggregate/A1#set:padding1 (type $i32_f64_=>_none) (param $this i32) (param $padding1 f64)
+ (func $extends-baseaggregate/A1#set:padding1 (param $this i32) (param $padding1 f64)
   local.get $this
   local.get $padding1
   f64.store $0 offset=8
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2322,7 +2322,7 @@
    end
   end
  )
- (func $extends-baseaggregate/A1#set:c1 (type $i32_i32_=>_none) (param $this i32) (param $c1 i32)
+ (func $extends-baseaggregate/A1#set:c1 (param $this i32) (param $c1 i32)
   local.get $this
   local.get $c1
   i32.store $0 offset=16
@@ -2331,23 +2331,23 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2393,16 +2393,16 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $extends-baseaggregate/poolB
   local.tee $1
@@ -2428,7 +2428,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2442,10 +2442,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $extends-baseaggregate/B1~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-baseaggregate/B1~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2459,7 +2459,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $extends-baseaggregate/A1~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-baseaggregate/A1~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2473,7 +2473,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $extends-baseaggregate/C1~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-baseaggregate/C1~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2487,24 +2487,24 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $extends-baseaggregate/A2~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-baseaggregate/A2~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $extends-baseaggregate/A1~visit
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2512,11 +2512,11 @@
   local.get $1
   call $~lib/array/Array<extends-baseaggregate/B1>#__visit
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2524,7 +2524,7 @@
   local.get $1
   call $~lib/array/Array<extends-baseaggregate/A2>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<extends-baseaggregate/A2>
     block $~lib/array/Array<extends-baseaggregate/B1>
@@ -2585,10 +2585,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:extends-baseaggregate
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2601,7 +2601,7 @@
    unreachable
   end
  )
- (func $extends-baseaggregate/A1#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $extends-baseaggregate/A1#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2663,7 +2663,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $extends-baseaggregate/A2#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $extends-baseaggregate/A2#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2701,7 +2701,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -2820,7 +2820,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#push (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#push (param $this i32) (param $value i32) (result i32)
   (local $oldLen i32)
   (local $len i32)
   (local $4 i32)
@@ -2885,7 +2885,7 @@
   local.get $4
   return
  )
- (func $start:extends-baseaggregate (type $none_=>_none)
+ (func $start:extends-baseaggregate
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2936,7 +2936,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3006,7 +3006,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<extends-baseaggregate/A2>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<extends-baseaggregate/A2>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3076,7 +3076,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/extends-baseaggregate.release.wat b/tests/compiler/extends-baseaggregate.release.wat
index 1e8b9fe433..df7393d0c5 100644
--- a/tests/compiler/extends-baseaggregate.release.wat
+++ b/tests/compiler/extends-baseaggregate.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -45,7 +45,7 @@
  (data (i32.const 1732) "\02A\00\00\02A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1088
@@ -96,7 +96,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -228,7 +228,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -381,7 +381,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -627,7 +627,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -739,7 +739,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -818,7 +818,7 @@
   i32.const 34512
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1085,7 +1085,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1211,7 +1211,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1517,7 +1517,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<extends-baseaggregate/B1>~visit (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1590,7 +1590,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $folding-inner1
    block $folding-inner0
     block $invalid
@@ -1638,7 +1638,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1987,7 +1987,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -2006,7 +2006,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
diff --git a/tests/compiler/extends-recursive.debug.wat b/tests/compiler/extends-recursive.debug.wat
index c583f5d69d..cf33e5b1e1 100644
--- a/tests/compiler/extends-recursive.debug.wat
+++ b/tests/compiler/extends-recursive.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -41,17 +41,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -61,11 +61,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -74,14 +74,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -123,7 +123,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -135,11 +135,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -149,7 +149,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -205,15 +205,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -239,7 +239,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -259,7 +259,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -279,7 +279,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -315,7 +315,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -341,7 +341,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -362,11 +362,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -377,39 +377,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -645,7 +645,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1009,7 +1009,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1174,7 +1174,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1319,7 +1319,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1357,7 +1357,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1370,7 +1370,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1387,7 +1387,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1412,7 +1412,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1592,7 +1592,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1650,7 +1650,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1671,7 +1671,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1687,7 +1687,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1895,7 +1895,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1985,7 +1985,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2094,7 +2094,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2158,7 +2158,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2171,17 +2171,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2234,7 +2234,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2302,7 +2302,7 @@
    end
   end
  )
- (func $extends-recursive/Parent#set:child (type $i32_i32_=>_none) (param $this i32) (param $child i32)
+ (func $extends-recursive/Parent#set:child (param $this i32) (param $child i32)
   local.get $this
   local.get $child
   i32.store $0
@@ -2311,7 +2311,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $start:extends-recursive (type $none_=>_none)
+ (func $start:extends-recursive
   memory.size $0
   i32.const 16
   i32.shl
@@ -2333,7 +2333,7 @@
   call $extends-recursive/Child#constructor
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2342,7 +2342,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2356,15 +2356,15 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $extends-recursive/Child~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-recursive/Child~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $extends-recursive/Parent~visit
  )
- (func $extends-recursive/Parent~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $extends-recursive/Parent~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2378,7 +2378,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $extends-recursive/Parent
     block $extends-recursive/Child
@@ -2415,10 +2415,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:extends-recursive
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2431,7 +2431,7 @@
    unreachable
   end
  )
- (func $extends-recursive/Parent#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $extends-recursive/Parent#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2477,7 +2477,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $extends-recursive/Child#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $extends-recursive/Child#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2515,7 +2515,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/extends-recursive.release.wat b/tests/compiler/extends-recursive.release.wat
index 79a0ffdb5e..22cf7dfea4 100644
--- a/tests/compiler/extends-recursive.release.wat
+++ b/tests/compiler/extends-recursive.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -32,7 +32,7 @@
  (data (i32.const 1440) "\06\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -77,7 +77,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -209,7 +209,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -362,7 +362,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -608,7 +608,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -720,7 +720,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -799,7 +799,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1066,7 +1066,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1192,7 +1192,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1498,7 +1498,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $folding-inner0
    block $invalid
     block $~lib/string/String
@@ -1526,7 +1526,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1666,7 +1666,7 @@
    unreachable
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/external.debug.wat b/tests/compiler/external.debug.wat
index 91699a9b88..828dfb20ae 100644
--- a/tests/compiler/external.debug.wat
+++ b/tests/compiler/external.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (import "foo" "var" (global $external/var_ i32))
  (import "external" "foo" (func $external/foo))
  (import "external" "bar" (func $external/two))
diff --git a/tests/compiler/external.release.wat b/tests/compiler/external.release.wat
index e2f6c6e74f..4ce1f3c834 100644
--- a/tests/compiler/external.release.wat
+++ b/tests/compiler/external.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (import "foo" "var" (global $external/var_ i32))
  (import "external" "foo" (func $external/foo))
  (import "external" "bar" (func $external/two))
diff --git a/tests/compiler/features/gc.debug.wat b/tests/compiler/features/gc.debug.wat
index 3ba6dc9936..2c70df1018 100644
--- a/tests/compiler/features/gc.debug.wat
+++ b/tests/compiler/features/gc.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $features/gc/globalFunc funcref (ref.null nofunc))
  (global $features/gc/globalExtern externref (ref.null noextern))
  (global $features/gc/globalAny anyref (ref.null none))
  (global $features/gc/globalEq eqref (ref.null none))
  (global $features/gc/globalI31 i31ref (ref.null none))
- (global $features/gc/globalData dataref (ref.null none))
+ (global $features/gc/globalStruct structref (ref.null none))
  (global $features/gc/globalArray arrayref (ref.null none))
  (global $~lib/memory/__data_end i32 (i32.const 60))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
@@ -22,7 +22,7 @@
  (export "globalAny" (global $features/gc/globalAny))
  (export "globalEq" (global $features/gc/globalEq))
  (export "globalI31" (global $features/gc/globalI31))
- (export "globalData" (global $features/gc/globalData))
+ (export "globalStruct" (global $features/gc/globalStruct))
  (export "globalArray" (global $features/gc/globalArray))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
diff --git a/tests/compiler/features/gc.release.wat b/tests/compiler/features/gc.release.wat
index fed3c65cd9..67e9ca9bde 100644
--- a/tests/compiler/features/gc.release.wat
+++ b/tests/compiler/features/gc.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $features/gc/globalFunc funcref (ref.null nofunc))
  (global $features/gc/globalExtern externref (ref.null noextern))
  (global $features/gc/globalAny anyref (ref.null none))
  (global $features/gc/globalEq eqref (ref.null none))
  (global $features/gc/globalI31 i31ref (ref.null none))
- (global $features/gc/globalData dataref (ref.null none))
+ (global $features/gc/globalStruct structref (ref.null none))
  (global $features/gc/globalArray arrayref (ref.null none))
  (memory $0 1)
  (data (i32.const 1036) ",")
@@ -15,7 +15,7 @@
  (export "globalAny" (global $features/gc/globalAny))
  (export "globalEq" (global $features/gc/globalEq))
  (export "globalI31" (global $features/gc/globalI31))
- (export "globalData" (global $features/gc/globalData))
+ (export "globalStruct" (global $features/gc/globalStruct))
  (export "globalArray" (global $features/gc/globalArray))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
diff --git a/tests/compiler/features/gc.ts b/tests/compiler/features/gc.ts
index 56501d37f8..496e13d321 100644
--- a/tests/compiler/features/gc.ts
+++ b/tests/compiler/features/gc.ts
@@ -14,5 +14,5 @@ export const globalExtern: externref = null;
 export const globalAny: anyref = null;
 export const globalEq: eqref = null;
 export const globalI31: i31ref = null;
-export const globalData: dataref = null;
+export const globalStruct: structref = null;
 export const globalArray: arrayref = null;
diff --git a/tests/compiler/features/reference-types.debug.wat b/tests/compiler/features/reference-types.debug.wat
index ab1230432a..2f379046b2 100644
--- a/tests/compiler/features/reference-types.debug.wat
+++ b/tests/compiler/features/reference-types.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_externref (func_subtype (result externref) func))
- (type $externref_=>_externref (func_subtype (param externref) (result externref) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_externref (func (result externref)))
+ (type $externref_=>_externref (func (param externref) (result externref)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "reference-types" "somethingReal" (func $features/reference-types/somethingReal (result externref)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "reference-types" "somethingNull" (func $features/reference-types/somethingNull (result externref)))
@@ -35,7 +35,7 @@
  (export "nonNullReal" (global $features/reference-types/nonNullReal))
  (export "memory" (memory $0))
  (start $~start)
- (func $features/reference-types/testLocal<funcref> (type $none_=>_none)
+ (func $features/reference-types/testLocal<funcref>
   (local $local funcref)
   (local $localInit funcref)
   ref.null nofunc
@@ -84,7 +84,7 @@
    unreachable
   end
  )
- (func $features/reference-types/testLocal<externref> (type $none_=>_none)
+ (func $features/reference-types/testLocal<externref>
   (local $local externref)
   (local $localInit externref)
   ref.null noextern
@@ -133,10 +133,10 @@
    unreachable
   end
  )
- (func $features/reference-types/someFunc (type $none_=>_none)
+ (func $features/reference-types/someFunc
   nop
  )
- (func $start:features/reference-types (type $none_=>_none)
+ (func $start:features/reference-types
   (local $funcLocal funcref)
   (local $1 funcref)
   (local $2 externref)
@@ -353,7 +353,7 @@
   end
   global.set $features/reference-types/nonNullReal
  )
- (func $features/reference-types/internal (type $externref_=>_externref) (param $a externref) (result externref)
+ (func $features/reference-types/internal (param $a externref) (result externref)
   (local $b externref)
   (local $c externref)
   (local $d externref)
@@ -369,7 +369,7 @@
   local.get $d
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:features/reference-types
  )
 )
diff --git a/tests/compiler/features/reference-types.release.wat b/tests/compiler/features/reference-types.release.wat
index fafc2b8ea2..4cb09191e6 100644
--- a/tests/compiler/features/reference-types.release.wat
+++ b/tests/compiler/features/reference-types.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_externref (func_subtype (result externref) func))
- (type $none_=>_none (func_subtype func))
- (type $externref_=>_externref (func_subtype (param externref) (result externref) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_externref (func (result externref)))
+ (type $none_=>_none (func))
+ (type $externref_=>_externref (func (param externref) (result externref)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "reference-types" "somethingReal" (func $features/reference-types/somethingReal (result externref)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "reference-types" "somethingNull" (func $features/reference-types/somethingNull (result externref)))
@@ -28,16 +28,16 @@
  (export "nonNullReal" (global $features/reference-types/nonNullReal))
  (export "memory" (memory $0))
  (start $~start)
- (func $features/reference-types/someFunc (type $none_=>_none)
-  unreachable
+ (func $features/reference-types/someFunc
+  nop
  )
- (func $features/reference-types/internal (type $externref_=>_externref) (param $0 externref) (result externref)
+ (func $features/reference-types/internal (param $0 externref) (result externref)
   local.get $0
   call $features/reference-types/external
   call $features/reference-types/external
   call $features/reference-types/external
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 externref)
   call $features/reference-types/somethingReal
   ref.is_null
diff --git a/tests/compiler/features/threads.debug.wat b/tests/compiler/features/threads.debug.wat
index 4da1ae1693..17d896b01f 100644
--- a/tests/compiler/features/threads.debug.wat
+++ b/tests/compiler/features/threads.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/native/ASC_FEATURE_THREADS i32 (i32.const 1))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
@@ -9,7 +9,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $features/threads/testAtomic (type $none_=>_none)
+ (func $features/threads/testAtomic
   i32.const 0
   i32.atomic.load8_u $0
   drop
@@ -291,7 +291,7 @@
   i64.atomic.rmw.cmpxchg $0 offset=8
   drop
  )
- (func $features/threads/testAtomicAsm (type $none_=>_none)
+ (func $features/threads/testAtomicAsm
   i32.const 0
   i32.atomic.load8_u $0
   drop
@@ -538,13 +538,13 @@
   i64.atomic.rmw.cmpxchg $0
   drop
  )
- (func $start:features/threads (type $none_=>_none)
+ (func $start:features/threads
   i32.const 1
   drop
   call $features/threads/testAtomic
   call $features/threads/testAtomicAsm
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:features/threads
  )
 )
diff --git a/tests/compiler/features/threads.release.wat b/tests/compiler/features/threads.release.wat
index 26a1acf719..bfc37be431 100644
--- a/tests/compiler/features/threads.release.wat
+++ b/tests/compiler/features/threads.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 (shared 1 10))
  (export "memory" (memory $0))
  (start $~start)
- (func $features/threads/testAtomic (type $none_=>_none)
+ (func $features/threads/testAtomic
   i32.const 0
   i32.atomic.load8_u $0
   drop
@@ -285,7 +285,7 @@
   i64.atomic.rmw.cmpxchg $0 offset=8
   drop
  )
- (func $features/threads/testAtomicAsm (type $none_=>_none)
+ (func $features/threads/testAtomicAsm
   i32.const 0
   i32.atomic.load8_u $0
   drop
@@ -532,7 +532,7 @@
   i64.atomic.rmw.cmpxchg $0
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $features/threads/testAtomic
   call $features/threads/testAtomicAsm
  )
diff --git a/tests/compiler/field-initialization.debug.wat b/tests/compiler/field-initialization.debug.wat
index 69433f2fa5..1ae15dff38 100644
--- a/tests/compiler/field-initialization.debug.wat
+++ b/tests/compiler/field-initialization.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -52,17 +52,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -72,11 +72,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -85,14 +85,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -134,7 +134,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -146,11 +146,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -160,7 +160,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -216,15 +216,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -250,7 +250,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -270,7 +270,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -290,7 +290,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -326,7 +326,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -352,7 +352,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -373,11 +373,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -388,39 +388,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -656,7 +656,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1020,7 +1020,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1185,7 +1185,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1330,7 +1330,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1368,7 +1368,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1381,7 +1381,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1398,7 +1398,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1423,7 +1423,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1603,7 +1603,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1661,7 +1661,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1682,7 +1682,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1698,7 +1698,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1906,7 +1906,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1996,7 +1996,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2105,7 +2105,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2169,7 +2169,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2182,17 +2182,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2245,25 +2245,25 @@
   local.get $ptr
   return
  )
- (func $field-initialization/Value_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Value_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/Value_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Value#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Value#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/Value#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2331,7 +2331,7 @@
    end
   end
  )
- (func $field-initialization/Ref_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2340,11 +2340,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Nullable_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Nullable_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2353,11 +2353,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Nullable_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Nullable#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Nullable#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2366,38 +2366,38 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Nullable#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Value_Ctor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Value_Ctor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/Value_Ctor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Ctor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Value_Init_Ctor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Value_Init_Ctor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/Value_Init_Ctor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Init_Ctor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Value_Ctor_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Value_Ctor_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/Value_Ctor_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Ctor_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Ref_Init_Ctor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_Init_Ctor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2406,11 +2406,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_Init_Ctor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Init_Ctor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Ref_Ctor_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_Ctor_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2419,11 +2419,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_Ctor_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Ctor_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Ref_Ctor_Param#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_Ctor_Param#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2432,11 +2432,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_Ctor_Param#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Ctor_Param#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Nullable_Ctor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Nullable_Ctor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2445,11 +2445,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Nullable_Ctor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Ctor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Nullable_Init_Ctor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Nullable_Init_Ctor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2458,11 +2458,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Nullable_Init_Ctor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Init_Ctor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Nullable_Ctor_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Nullable_Ctor_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2471,11 +2471,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Nullable_Ctor_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Ctor_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Inherit_Base#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Inherit_Base#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2484,16 +2484,16 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Inherit_Base#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Inherit_Base#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/SomeObject#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/SomeObject#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $field-initialization/SomeObject#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $field-initialization/SomeObject#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
@@ -2502,19 +2502,19 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/SomeObject#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/SomeObject#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/SomeObject#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/SomeObject#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2523,7 +2523,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2627,7 +2627,7 @@
   i32.const 0
   return
  )
- (func $field-initialization/SomeOtherObject#set:c (type $i32_i32_=>_none) (param $this i32) (param $c i32)
+ (func $field-initialization/SomeOtherObject#set:c (param $this i32) (param $c i32)
   local.get $this
   local.get $c
   i32.store $0 offset=8
@@ -2636,11 +2636,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/SomeOtherObject#get:c (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/SomeOtherObject#get:c (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $field-initialization/Flow_Balanced#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Flow_Balanced#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2649,11 +2649,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Flow_Balanced#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Flow_Balanced#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Ref_Init_InlineCtor#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_Init_InlineCtor#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2662,11 +2662,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_Init_InlineCtor#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Init_InlineCtor#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $field-initialization/Ref_InlineCtor_Init#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field-initialization/Ref_InlineCtor_Init#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2675,11 +2675,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field-initialization/Ref_InlineCtor_Init#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_InlineCtor_Init#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2691,7 +2691,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2705,10 +2705,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $field-initialization/Ref_Init~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_Init~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2722,7 +2722,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Nullable_Init~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Nullable_Init~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2736,7 +2736,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Nullable~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Nullable~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2750,7 +2750,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Ref_Init_Ctor~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_Init_Ctor~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2764,7 +2764,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Ref_Ctor_Init~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_Ctor_Init~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2778,7 +2778,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Ref_Ctor_Param~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_Ctor_Param~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2792,7 +2792,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Nullable_Ctor~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Nullable_Ctor~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2806,7 +2806,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Nullable_Init_Ctor~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Nullable_Init_Ctor~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2820,7 +2820,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Nullable_Ctor_Init~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Nullable_Ctor_Init~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2834,12 +2834,12 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Inherit~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Inherit~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $field-initialization/Inherit_Base~visit
  )
- (func $field-initialization/Inherit_Base~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Inherit_Base~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2853,12 +2853,12 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Inherit_Ctor~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Inherit_Ctor~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $field-initialization/Inherit_Base~visit
  )
- (func $field-initialization/SomeObject~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/SomeObject~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2872,7 +2872,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/SomeOtherObject~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/SomeOtherObject~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2886,7 +2886,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Flow_Balanced~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Flow_Balanced~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2900,7 +2900,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Ref_Init_InlineCtor~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_Init_InlineCtor~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2914,7 +2914,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $field-initialization/Ref_InlineCtor_Init~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field-initialization/Ref_InlineCtor_Init~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2928,7 +2928,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $field-initialization/Ref_InlineCtor_Init
     block $field-initialization/Ref_Init_InlineCtor
@@ -3070,10 +3070,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:field-initialization
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3086,7 +3086,7 @@
    unreachable
   end
  )
- (func $field-initialization/Value_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3132,7 +3132,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Value#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3178,7 +3178,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Ref_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3234,7 +3234,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Nullable_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3290,7 +3290,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Nullable#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3336,7 +3336,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Value_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3372,7 +3372,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Value_Init_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Init_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3408,7 +3408,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Value_Ctor_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Value_Ctor_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3452,7 +3452,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Ref_Init_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Init_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3498,7 +3498,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Ref_Ctor_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Ref_Ctor_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3552,7 +3552,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Ref_Ctor_Param#constructor (type $i32_i32_=>_i32) (param $this i32) (param $a i32) (result i32)
+ (func $field-initialization/Ref_Ctor_Param#constructor (param $this i32) (param $a i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3596,7 +3596,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $field-initialization/Nullable_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3632,7 +3632,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Nullable_Init_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Init_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3678,7 +3678,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Nullable_Ctor_Init#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Nullable_Ctor_Init#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3732,7 +3732,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Inherit_Base#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Inherit_Base#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3788,7 +3788,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Inherit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Inherit#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3826,7 +3826,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Inherit_Ctor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/Inherit_Ctor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3864,7 +3864,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/SomeObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/SomeObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3918,7 +3918,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4014,7 +4014,7 @@
   local.get $3
   return
  )
- (func $field-initialization/SomeOtherObject#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field-initialization/SomeOtherObject#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4060,7 +4060,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $field-initialization/Flow_Balanced#constructor (type $i32_i32_=>_i32) (param $this i32) (param $cond i32) (result i32)
+ (func $field-initialization/Flow_Balanced#constructor (param $this i32) (param $cond i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4133,7 +4133,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $start:field-initialization (type $none_=>_none)
+ (func $start:field-initialization
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5188,7 +5188,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5216,7 +5216,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/field-initialization.release.wat b/tests/compiler/field-initialization.release.wat
index 522b6894e1..7900b0fb37 100644
--- a/tests/compiler/field-initialization.release.wat
+++ b/tests/compiler/field-initialization.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -50,7 +50,7 @@
  (data (i32.const 1832) " \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -97,7 +97,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -229,7 +229,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -382,7 +382,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -628,7 +628,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -740,7 +740,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -819,7 +819,7 @@
   i32.const 34672
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1086,7 +1086,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1212,7 +1212,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1518,7 +1518,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner1
    block $folding-inner0
@@ -1599,10 +1599,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:field-initialization
  )
- (func $field-initialization/Inherit_Base#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $field-initialization/Inherit_Base#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -1668,7 +1668,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $field-initialization/SomeObject#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $field-initialization/SomeObject#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1725,7 +1725,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1885,7 +1885,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $field-initialization/SomeOtherObject#constructor (type $none_=>_i32) (result i32)
+ (func $field-initialization/SomeOtherObject#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1934,7 +1934,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:field-initialization (type $none_=>_none)
+ (func $start:field-initialization
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3480,7 +3480,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3515,7 +3515,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3548,7 +3548,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -3567,7 +3567,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   local.get $0
   i32.eqz
   if
diff --git a/tests/compiler/field.debug.wat b/tests/compiler/field.debug.wat
index 13995e5b4f..c78c314916 100644
--- a/tests/compiler/field.debug.wat
+++ b/tests/compiler/field.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -43,17 +43,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -63,11 +63,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -76,14 +76,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -125,7 +125,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -137,11 +137,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -151,7 +151,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -207,15 +207,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -241,7 +241,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -261,7 +261,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -281,7 +281,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -317,7 +317,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -343,7 +343,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -364,11 +364,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -379,39 +379,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -647,7 +647,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1011,7 +1011,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1176,7 +1176,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1321,7 +1321,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1359,7 +1359,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1372,7 +1372,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1389,7 +1389,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1414,7 +1414,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1594,7 +1594,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1652,7 +1652,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1673,7 +1673,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1689,7 +1689,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1897,7 +1897,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1987,7 +1987,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2096,7 +2096,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2160,7 +2160,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2173,17 +2173,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2236,7 +2236,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2252,7 +2252,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2320,7 +2320,7 @@
    end
   end
  )
- (func $field/NoStaticConflict#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $field/NoStaticConflict#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
@@ -2329,10 +2329,10 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $field/NoStaticConflict.a (type $i32_=>_none) (param $v i32)
+ (func $field/NoStaticConflict.a (param $v i32)
   nop
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2378,7 +2378,7 @@
   i32.const 0
   drop
  )
- (func $start:field (type $none_=>_none)
+ (func $start:field
   memory.size $0
   i32.const 16
   i32.shl
@@ -2399,7 +2399,7 @@
   call $field/testNoStaticConflict
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2408,7 +2408,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2422,10 +2422,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $field/NoStaticConflict~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $field/NoStaticConflict~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2439,19 +2439,19 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2459,11 +2459,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2471,7 +2471,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $~lib/array/Array<~lib/string/String>
@@ -2514,10 +2514,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:field
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2530,7 +2530,7 @@
    unreachable
   end
  )
- (func $field/NoStaticConflict#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $field/NoStaticConflict#constructor (param $this i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2590,7 +2590,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $field/testNoStaticConflict (type $none_=>_none)
+ (func $field/testNoStaticConflict
   (local $inst i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2618,7 +2618,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -2688,7 +2688,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2714,7 +2714,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2742,7 +2742,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
diff --git a/tests/compiler/field.release.wat b/tests/compiler/field.release.wat
index 75f16eafbb..ba44f6ffdb 100644
--- a/tests/compiler/field.release.wat
+++ b/tests/compiler/field.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -35,7 +35,7 @@
  (data (i32.const 1496) "\02A\00\00\02\t")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -80,7 +80,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -212,7 +212,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -365,7 +365,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -611,7 +611,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -723,7 +723,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -802,7 +802,7 @@
   i32.const 34272
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1069,7 +1069,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1195,7 +1195,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1501,7 +1501,7 @@
   memory.fill $0
   local.get $1
  )
- (func $start:field (type $none_=>_none)
+ (func $start:field
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1806,7 +1806,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1926,10 +1926,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:field
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/for.debug.wat b/tests/compiler/for.debug.wat
index 4ae7bf09e4..d0dfeb7f33 100644
--- a/tests/compiler/for.debug.wat
+++ b/tests/compiler/for.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $for/ran (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -43,7 +43,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $for/testInitExpression (type $none_=>_none)
+ (func $for/testInitExpression
   (local $i i32)
   i32.const 0
   local.set $i
@@ -74,7 +74,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testInitStatement (type $none_=>_none)
+ (func $for/testInitStatement
   (local $j i32)
   i32.const 0
   local.set $j
@@ -105,7 +105,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testEmpty (type $none_=>_none)
+ (func $for/testEmpty
   (local $i i32)
   i32.const 10
   local.set $i
@@ -137,7 +137,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testConditionOmitted (type $none_=>_none)
+ (func $for/testConditionOmitted
   (local $i i32)
   i32.const 0
   local.set $i
@@ -174,7 +174,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAllOmitted (type $none_=>_none)
+ (func $for/testAllOmitted
   (local $i i32)
   i32.const 10
   local.set $i
@@ -210,7 +210,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAlwaysTrue (type $none_=>_none)
+ (func $for/testAlwaysTrue
   (local $i i32)
   i32.const 0
   local.set $i
@@ -246,13 +246,13 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAlwaysFalse (type $none_=>_none)
+ (func $for/testAlwaysFalse
   i32.const 0
   drop
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAlwaysContinues (type $none_=>_none)
+ (func $for/testAlwaysContinues
   (local $k i32)
   i32.const 0
   local.set $k
@@ -286,7 +286,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAlwaysBreaks (type $none_=>_none)
+ (func $for/testAlwaysBreaks
   (local $k i32)
   i32.const 0
   local.set $k
@@ -313,7 +313,7 @@
   i32.const 1
   global.set $for/ran
  )
- (func $for/testAlwaysReturns (type $none_=>_none)
+ (func $for/testAlwaysReturns
   (local $k i32)
   i32.const 0
   local.set $k
@@ -336,7 +336,7 @@
    unreachable
   end
  )
- (func $for/testNestedContinue (type $none_=>_none)
+ (func $for/testNestedContinue
   (local $i i32)
   (local $j i32)
   (local $k i32)
@@ -431,17 +431,17 @@
   i32.const 1
   global.set $for/ran
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -451,11 +451,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -464,14 +464,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -513,7 +513,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -525,11 +525,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -539,7 +539,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -595,15 +595,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -629,7 +629,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -649,7 +649,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -669,7 +669,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -705,7 +705,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -731,7 +731,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -752,11 +752,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -767,39 +767,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1035,7 +1035,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1399,7 +1399,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1564,7 +1564,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1709,7 +1709,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1747,7 +1747,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1760,7 +1760,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1777,7 +1777,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1802,7 +1802,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1982,7 +1982,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2040,7 +2040,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2061,7 +2061,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2077,7 +2077,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2285,7 +2285,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2375,7 +2375,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2484,7 +2484,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2548,7 +2548,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2561,17 +2561,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2624,7 +2624,7 @@
   local.get $ptr
   return
  )
- (func $for/testRef (type $none_=>_none)
+ (func $for/testRef
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2694,12 +2694,12 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $for/getRef (type $none_=>_i32) (result i32)
+ (func $for/getRef (result i32)
   i32.const 0
   call $for/Ref#constructor
   return
  )
- (func $for/testRefAutorelease (type $none_=>_none)
+ (func $for/testRefAutorelease
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2774,7 +2774,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2820,7 +2820,7 @@
   i32.const 0
   drop
  )
- (func $start:for (type $none_=>_none)
+ (func $start:for
   i32.const 0
   global.set $for/ran
   call $for/testInitExpression
@@ -3009,7 +3009,7 @@
   end
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 256
   local.get $0
@@ -3018,7 +3018,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3032,10 +3032,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $for/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -3063,10 +3063,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:for
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3079,7 +3079,7 @@
    unreachable
   end
  )
- (func $for/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $for/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3117,7 +3117,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/for.release.wat b/tests/compiler/for.release.wat
index efeeff9d14..851bd7bbe1 100644
--- a/tests/compiler/for.release.wat
+++ b/tests/compiler/for.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -34,7 +34,7 @@
  (data (i32.const 1472) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1280
@@ -79,7 +79,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -211,7 +211,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -364,7 +364,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -610,7 +610,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -722,7 +722,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -801,7 +801,7 @@
   i32.const 34272
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1068,7 +1068,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1125,7 +1125,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1358,7 +1358,7 @@
   memory.fill $0
   local.get $0
  )
- (func $start:for (type $none_=>_none)
+ (func $start:for
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1804,7 +1804,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $for/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -1836,10 +1836,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:for
  )
- (func $for/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $for/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1905,7 +1905,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/function-call.debug.wat b/tests/compiler/function-call.debug.wat
index 9555c44780..767b8ac545 100644
--- a/tests/compiler/function-call.debug.wat
+++ b/tests/compiler/function-call.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $function-call/fnVoid (mut i32) (i32.const 32))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -57,39 +57,39 @@
  (elem $0 (i32.const 1) $start:function-call~anonymous|0 $start:function-call~anonymous|1 $start:function-call~anonymous|2 $start:function-call~anonymous|3 $start:function-call~fn2|4 $function-call/Foo#fnVoid $function-call/Foo#fnThis $function-call/Foo#fnRet)
  (export "memory" (memory $0))
  (start $~start)
- (func $start:function-call~anonymous|0 (type $none_=>_none)
+ (func $start:function-call~anonymous|0
   nop
  )
- (func $start:function-call~anonymous|1 (type $none_=>_none)
+ (func $start:function-call~anonymous|1
   nop
  )
- (func $start:function-call~anonymous|2 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:function-call~anonymous|2 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $start:function-call~anonymous|3 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:function-call~anonymous|3 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $start:function-call~fn2|4 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $start:function-call~fn2|4 (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -99,11 +99,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -112,14 +112,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -161,7 +161,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -173,11 +173,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -187,7 +187,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -243,15 +243,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -277,7 +277,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -297,7 +297,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -317,7 +317,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -353,7 +353,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -379,7 +379,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -400,11 +400,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -415,39 +415,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -683,7 +683,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1047,7 +1047,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1212,7 +1212,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1357,7 +1357,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1395,7 +1395,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1408,7 +1408,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1425,7 +1425,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1450,7 +1450,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1630,7 +1630,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1688,7 +1688,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1709,7 +1709,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1725,7 +1725,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1933,7 +1933,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2023,7 +2023,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2132,7 +2132,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2196,7 +2196,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2209,17 +2209,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2272,20 +2272,20 @@
   local.get $ptr
   return
  )
- (func $function-call/Foo#fnVoid (type $i32_=>_none) (param $this i32)
+ (func $function-call/Foo#fnVoid (param $this i32)
   nop
  )
- (func $function-call/Foo#fnThis (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $function-call/Foo#fnThis (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $function-call/Foo#fnRet (type $i32_i32_i32_=>_i32) (param $this i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-call/Foo#fnRet (param $this i32) (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $function-call/foo
   local.tee $1
@@ -2301,7 +2301,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2315,14 +2315,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2330,11 +2330,11 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2342,11 +2342,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28this:i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28this:i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28this:i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28this:i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2354,11 +2354,11 @@
   local.get $1
   call $~lib/function/Function<%28this:i32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28this:function-call/Foo%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28this:function-call/Foo%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2366,11 +2366,11 @@
   local.get $1
   call $~lib/function/Function<%28this:function-call/Foo%29=>void>#__visit
  )
- (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2378,7 +2378,7 @@
   local.get $1
   call $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>
     block $~lib/function/Function<%28this:function-call/Foo%29=>void>
@@ -2436,10 +2436,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:function-call
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2452,7 +2452,7 @@
    unreachable
   end
  )
- (func $function-call/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $function-call/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2490,7 +2490,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:function-call (type $none_=>_none)
+ (func $start:function-call
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2640,7 +2640,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2664,7 +2664,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2688,7 +2688,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28this:i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28this:i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2712,7 +2712,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28this:function-call/Foo%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2736,7 +2736,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28this:function-call/Foo%2Ci32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2760,7 +2760,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/function-call.release.wat b/tests/compiler/function-call.release.wat
index f13c552eba..5b0f85c5d6 100644
--- a/tests/compiler/function-call.release.wat
+++ b/tests/compiler/function-call.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -56,18 +56,18 @@
  (elem $0 (i32.const 1) $start:function-call~anonymous|0 $start:function-call~anonymous|0 $start:function-call~anonymous|2 $start:function-call~anonymous|2 $start:function-call~fn2|4 $function-call/Foo#fnVoid $start:function-call~fn2|4 $function-call/Foo#fnRet)
  (export "memory" (memory $0))
  (start $~start)
- (func $start:function-call~anonymous|0 (type $none_=>_none)
+ (func $start:function-call~anonymous|0
   nop
  )
- (func $start:function-call~anonymous|2 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:function-call~anonymous|2 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $start:function-call~fn2|4 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:function-call~fn2|4 (param $0 i32) (result i32)
   i32.const 1
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $function-call/foo
@@ -118,7 +118,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -250,7 +250,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -403,7 +403,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -649,7 +649,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -761,7 +761,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -840,7 +840,7 @@
   i32.const 34576
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1107,7 +1107,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1164,7 +1164,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1397,13 +1397,13 @@
   memory.fill $0
   local.get $0
  )
- (func $function-call/Foo#fnVoid (type $i32_=>_none) (param $0 i32)
+ (func $function-call/Foo#fnVoid (param $0 i32)
   nop
  )
- (func $function-call/Foo#fnRet (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $function-call/Foo#fnRet (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   i32.const 3
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1471,7 +1471,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1659,7 +1659,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/function-expression.debug.wat b/tests/compiler/function-expression.debug.wat
index ac16fcdb3a..9e4772b1de 100644
--- a/tests/compiler/function-expression.debug.wat
+++ b/tests/compiler/function-expression.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $function-expression/f1 (mut i32) (i32.const 32))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -68,26 +68,26 @@
  (export "semanticallyAnonymous" (func $function-expression/semanticallyAnonymous))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:function-expression~anonymous|0 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $start:function-expression~anonymous|0 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $start:function-expression~anonymous|1 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $start:function-expression~anonymous|1 (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $start:function-expression~someName|2 (type $none_=>_none)
+ (func $start:function-expression~someName|2
   nop
  )
- (func $start:function-expression~anonymous|3 (type $none_=>_i32) (result i32)
+ (func $start:function-expression~anonymous|3 (result i32)
   i32.const 1
  )
- (func $start:function-expression~anonymous|4 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:function-expression~anonymous|4 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
  )
- (func $function-expression/testOmitted (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $function-expression/testOmitted (param $fn i32) (result i32)
   i32.const 1
   i32.const 2
   i32.const 2
@@ -97,39 +97,39 @@
   call_indirect $0 (type $i32_i32_=>_i32)
   return
  )
- (func $start:function-expression~anonymous|5 (type $i32_i32_=>_i32) (param $a i32) (param $$1 i32) (result i32)
+ (func $start:function-expression~anonymous|5 (param $a i32) (param $$1 i32) (result i32)
   local.get $a
  )
- (func $start:function-expression~anonymous|6 (type $i32_i32_=>_i32) (param $$0 i32) (param $$1 i32) (result i32)
+ (func $start:function-expression~anonymous|6 (param $$0 i32) (param $$1 i32) (result i32)
   i32.const 42
  )
- (func $function-expression/testOmittedReturn1~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-expression/testOmittedReturn1~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
  )
- (func $function-expression/testOmittedReturn1 (type $none_=>_i32) (result i32)
+ (func $function-expression/testOmittedReturn1 (result i32)
   i32.const 320
   return
  )
- (func $function-expression/testOmittedReturn2~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $$1 i32) (result i32)
+ (func $function-expression/testOmittedReturn2~anonymous|0 (param $a i32) (param $$1 i32) (result i32)
   local.get $a
  )
- (func $function-expression/testOmittedReturn2 (type $none_=>_i32) (result i32)
+ (func $function-expression/testOmittedReturn2 (result i32)
   i32.const 352
   return
  )
- (func $function-expression/testOmittedReturn3~anonymous|0 (type $i32_i32_=>_i32) (param $$0 i32) (param $$1 i32) (result i32)
+ (func $function-expression/testOmittedReturn3~anonymous|0 (param $$0 i32) (param $$1 i32) (result i32)
   i32.const 42
  )
- (func $function-expression/testOmittedReturn3 (type $none_=>_i32) (result i32)
+ (func $function-expression/testOmittedReturn3 (result i32)
   i32.const 384
   return
  )
- (func $function-expression/testNullable~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $function-expression/testNullable~anonymous|0 (result i32)
   i32.const 1
  )
- (func $function-expression/testNullable (type $i32_=>_i32) (param $b i32) (result i32)
+ (func $function-expression/testNullable (param $b i32) (result i32)
   local.get $b
   if
    i32.const 416
@@ -140,13 +140,13 @@
   end
   unreachable
  )
- (func $start:function-expression~anonymous|7~anonymous|0 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $start:function-expression~anonymous|7~anonymous|0 (param $x i32) (result i32)
   i32.const 24
   local.get $x
   i32.add
   return
  )
- (func $function-expression/testGlobal (type $none_=>_none)
+ (func $function-expression/testGlobal
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -186,13 +186,13 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $function-expression/testLocal~anonymous|0~anonymous|0 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $function-expression/testLocal~anonymous|0~anonymous|0 (param $x i32) (result i32)
   i32.const 24
   local.get $x
   i32.add
   return
  )
- (func $function-expression/testLocal (type $none_=>_none)
+ (func $function-expression/testLocal
   (local $localFunc i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -237,17 +237,17 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -257,11 +257,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -270,14 +270,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -319,7 +319,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -331,11 +331,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -345,7 +345,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -401,15 +401,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -435,7 +435,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -455,7 +455,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -475,7 +475,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -511,7 +511,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -537,7 +537,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -558,11 +558,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -573,39 +573,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -841,7 +841,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1205,7 +1205,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1370,7 +1370,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1515,7 +1515,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1553,7 +1553,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1566,7 +1566,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1583,7 +1583,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1608,7 +1608,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1788,7 +1788,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1846,7 +1846,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1867,7 +1867,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1883,7 +1883,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2091,7 +2091,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2181,7 +2181,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2290,7 +2290,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2354,7 +2354,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2367,17 +2367,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2430,7 +2430,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2498,7 +2498,7 @@
    end
   end
  )
- (func $function-expression/FieldClass#set:fieldFunc (type $i32_i32_=>_none) (param $this i32) (param $fieldFunc i32)
+ (func $function-expression/FieldClass#set:fieldFunc (param $this i32) (param $fieldFunc i32)
   local.get $this
   local.get $fieldFunc
   i32.store $0
@@ -2507,25 +2507,25 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $function-expression/testField~anonymous|0~anonymous|0 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $function-expression/testField~anonymous|0~anonymous|0 (param $x i32) (result i32)
   i32.const 24
   local.get $x
   i32.add
   return
  )
- (func $function-expression/FieldClass#get:fieldFunc (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $function-expression/FieldClass#get:fieldFunc (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $function-expression/semanticallyAnonymous~fnDecl (type $i32_=>_i32) (param $val i32) (result i32)
+ (func $function-expression/semanticallyAnonymous~fnDecl (param $val i32) (result i32)
   local.get $val
   return
  )
- (func $function-expression/semanticallyAnonymous~fnDecl|0 (type $i32_=>_i32) (param $val i32) (result i32)
+ (func $function-expression/semanticallyAnonymous~fnDecl|0 (param $val i32) (result i32)
   local.get $val
   return
  )
- (func $function-expression/semanticallyAnonymous (type $none_=>_none)
+ (func $function-expression/semanticallyAnonymous
   (local $fnDecl i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2558,7 +2558,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 768
   local.get $0
@@ -2567,7 +2567,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2581,14 +2581,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2596,11 +2596,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2608,11 +2608,11 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/function/Function<%28%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2620,11 +2620,11 @@
   local.get $1
   call $~lib/function/Function<%28%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2632,11 +2632,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28%29=>%28i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>%28i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>%28i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>%28i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2644,7 +2644,7 @@
   local.get $1
   call $~lib/function/Function<%28%29=>%28i32%29=>i32>#__visit
  )
- (func $function-expression/FieldClass~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $function-expression/FieldClass~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2658,7 +2658,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $function-expression/FieldClass
     block $~lib/function/Function<%28%29=>%28i32%29=>i32>
@@ -2719,10 +2719,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:function-expression
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2735,7 +2735,7 @@
    unreachable
   end
  )
- (func $function-expression/FieldClass#constructor (type $i32_i32_=>_i32) (param $this i32) (param $fieldFunc i32) (result i32)
+ (func $function-expression/FieldClass#constructor (param $this i32) (param $fieldFunc i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2779,7 +2779,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $function-expression/testField (type $none_=>_none)
+ (func $function-expression/testField
   (local $fieldInst i32)
   (local $1 i32)
   (local $2 i32)
@@ -2841,7 +2841,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:function-expression (type $none_=>_none)
+ (func $start:function-expression
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3053,7 +3053,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3077,7 +3077,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3101,7 +3101,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3125,7 +3125,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3149,7 +3149,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>%28i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>%28i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3173,7 +3173,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:function-expression~anonymous|7 (type $none_=>_i32) (result i32)
+ (func $start:function-expression~anonymous|7 (result i32)
   (local $myFunc i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3197,7 +3197,7 @@
   local.get $1
   return
  )
- (func $function-expression/testLocal~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $function-expression/testLocal~anonymous|0 (result i32)
   (local $myFunc i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3221,7 +3221,7 @@
   local.get $1
   return
  )
- (func $function-expression/testField~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $function-expression/testField~anonymous|0 (result i32)
   (local $myFunc i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/function-expression.release.wat b/tests/compiler/function-expression.release.wat
index c72450425f..d6f33c3c79 100644
--- a/tests/compiler/function-expression.release.wat
+++ b/tests/compiler/function-expression.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -76,30 +76,30 @@
  (export "semanticallyAnonymous" (func $function-expression/semanticallyAnonymous))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:function-expression~anonymous|0 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:function-expression~anonymous|0 (param $0 i32) (result i32)
   local.get $0
  )
- (func $start:function-expression~someName|2 (type $none_=>_none)
+ (func $start:function-expression~someName|2
   nop
  )
- (func $start:function-expression~anonymous|3 (type $none_=>_i32) (result i32)
+ (func $start:function-expression~anonymous|3 (result i32)
   i32.const 1
  )
- (func $start:function-expression~anonymous|4 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:function-expression~anonymous|4 (param $0 i32) (param $1 i32) (result i32)
   i32.const 3
  )
- (func $start:function-expression~anonymous|5 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:function-expression~anonymous|5 (param $0 i32) (param $1 i32) (result i32)
   i32.const 1
  )
- (func $start:function-expression~anonymous|6 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:function-expression~anonymous|6 (param $0 i32) (param $1 i32) (result i32)
   i32.const 42
  )
- (func $start:function-expression~anonymous|7~anonymous|0 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:function-expression~anonymous|7~anonymous|0 (param $0 i32) (result i32)
   local.get $0
   i32.const 24
   i32.add
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1792
@@ -144,7 +144,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -276,7 +276,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -429,7 +429,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -675,7 +675,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -787,7 +787,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -866,7 +866,7 @@
   i32.const 34928
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1133,7 +1133,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1190,7 +1190,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1422,7 +1422,7 @@
   i32.store $0 align=1
   local.get $0
  )
- (func $function-expression/semanticallyAnonymous (type $none_=>_none)
+ (func $function-expression/semanticallyAnonymous
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1451,7 +1451,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner1
    block $folding-inner0
@@ -1516,10 +1516,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:function-expression
  )
- (func $start:function-expression (type $none_=>_none)
+ (func $start:function-expression
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1925,7 +1925,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $start:function-expression~anonymous|7 (type $none_=>_i32) (result i32)
+ (func $start:function-expression~anonymous|7 (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1955,7 +1955,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1472
  )
- (func $function-expression/testLocal~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $function-expression/testLocal~anonymous|0 (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1985,7 +1985,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1536
  )
- (func $function-expression/testField~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $function-expression/testField~anonymous|0 (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2015,7 +2015,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 2000
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/function-inline-regressions.debug.wat b/tests/compiler/function-inline-regressions.debug.wat
index ae9a49bce0..d8e8863181 100644
--- a/tests/compiler/function-inline-regressions.debug.wat
+++ b/tests/compiler/function-inline-regressions.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (global $function-inline-regressions/struct i32 (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
@@ -14,13 +14,13 @@
  (export "baz" (func $function-inline-regressions/baz))
  (export "foo" (func $function-inline-regressions/foo))
  (export "memory" (memory $0))
- (func $function-inline-regressions/baz (type $i32_=>_none) (param $v i32)
+ (func $function-inline-regressions/baz (param $v i32)
   local.get $v
   if
    unreachable
   end
  )
- (func $function-inline-regressions/loadX (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-inline-regressions/loadX (param $a i32) (param $b i32) (result i32)
   i32.const 2
   local.get $a
   i32.mul
@@ -29,27 +29,27 @@
   i32.load $0
   return
  )
- (func $function-inline-regressions/loadZ (type $none_=>_i32) (result i32)
+ (func $function-inline-regressions/loadZ (result i32)
   i32.const 16
   i32.load $0
   return
  )
- (func $function-inline-regressions/Struct#set:v0 (type $i32_i32_=>_none) (param $this i32) (param $v0 i32)
+ (func $function-inline-regressions/Struct#set:v0 (param $this i32) (param $v0 i32)
   local.get $this
   local.get $v0
   i32.store $0
  )
- (func $function-inline-regressions/Struct#set:v1 (type $i32_i32_=>_none) (param $this i32) (param $v1 i32)
+ (func $function-inline-regressions/Struct#set:v1 (param $this i32) (param $v1 i32)
   local.get $this
   local.get $v1
   i32.store $0 offset=4
  )
- (func $function-inline-regressions/Struct#set:v2 (type $i32_i32_=>_none) (param $this i32) (param $v2 i32)
+ (func $function-inline-regressions/Struct#set:v2 (param $this i32) (param $v2 i32)
   local.get $this
   local.get $v2
   i32.store $0 offset=8
  )
- (func $function-inline-regressions/foo (type $i32_i32_i32_=>_i32) (param $v0 i32) (param $v1 i32) (param $v2 i32) (result i32)
+ (func $function-inline-regressions/foo (param $v0 i32) (param $v1 i32) (param $v2 i32) (result i32)
   (local $x i32)
   (local $y i32)
   (local $z i32)
diff --git a/tests/compiler/function-inline-regressions.release.wat b/tests/compiler/function-inline-regressions.release.wat
index 68cd4b7555..677c473797 100644
--- a/tests/compiler/function-inline-regressions.release.wat
+++ b/tests/compiler/function-inline-regressions.release.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (memory $0 0)
  (export "baz" (func $function-inline-regressions/baz))
  (export "foo" (func $function-inline-regressions/foo))
  (export "memory" (memory $0))
- (func $function-inline-regressions/baz (type $i32_=>_none) (param $0 i32)
+ (func $function-inline-regressions/baz (param $0 i32)
   local.get $0
   if
    unreachable
   end
  )
- (func $function-inline-regressions/foo (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $function-inline-regressions/foo (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   local.get $0
   i32.const 1
diff --git a/tests/compiler/function-types.debug.wat b/tests/compiler/function-types.debug.wat
index 2d10b594af..b4a07cb3f9 100644
--- a/tests/compiler/function-types.debug.wat
+++ b/tests/compiler/function-types.debug.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -23,37 +23,37 @@
  (elem $0 (i32.const 1) $function-types/makeAdder<i32>~anonymous|0 $function-types/makeAdder<i64>~anonymous|0 $function-types/makeAdder<f64>~anonymous|0 $function-types/addI32)
  (export "memory" (memory $0))
  (start $~start)
- (func $function-types/makeAdder<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-types/makeAdder<i32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $function-types/makeAdder<i32> (type $none_=>_i32) (result i32)
+ (func $function-types/makeAdder<i32> (result i32)
   i32.const 32
   return
  )
- (func $function-types/makeAdder<i64>~anonymous|0 (type $i64_i64_=>_i64) (param $a i64) (param $b i64) (result i64)
+ (func $function-types/makeAdder<i64>~anonymous|0 (param $a i64) (param $b i64) (result i64)
   local.get $a
   local.get $b
   i64.add
   return
  )
- (func $function-types/makeAdder<i64> (type $none_=>_i32) (result i32)
+ (func $function-types/makeAdder<i64> (result i32)
   i32.const 128
   return
  )
- (func $function-types/makeAdder<f64>~anonymous|0 (type $f64_f64_=>_f64) (param $a f64) (param $b f64) (result f64)
+ (func $function-types/makeAdder<f64>~anonymous|0 (param $a f64) (param $b f64) (result f64)
   local.get $a
   local.get $b
   f64.add
   return
  )
- (func $function-types/makeAdder<f64> (type $none_=>_i32) (result i32)
+ (func $function-types/makeAdder<f64> (result i32)
   i32.const 160
   return
  )
- (func $function-types/doAddWithFn<i32> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $fn i32) (result i32)
+ (func $function-types/doAddWithFn<i32> (param $a i32) (param $b i32) (param $fn i32) (result i32)
   local.get $a
   local.get $b
   i32.const 2
@@ -63,7 +63,7 @@
   call_indirect $0 (type $i32_i32_=>_i32)
   return
  )
- (func $function-types/doAdd<i32> (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-types/doAdd<i32> (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.const 2
@@ -73,13 +73,13 @@
   call_indirect $0 (type $i32_i32_=>_i32)
   return
  )
- (func $function-types/addI32 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $function-types/addI32 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $function-types/makeAndAdd<i32> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $adder i32) (result i32)
+ (func $function-types/makeAndAdd<i32> (param $a i32) (param $b i32) (param $adder i32) (result i32)
   local.get $a
   local.get $b
   i32.const 2
@@ -89,10 +89,10 @@
   call_indirect $0 (type $i32_i32_=>_i32)
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:function-types
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -105,7 +105,7 @@
    unreachable
   end
  )
- (func $function-types/makeAndAdd<i32>@varargs (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $adder i32) (result i32)
+ (func $function-types/makeAndAdd<i32>@varargs (param $a i32) (param $b i32) (param $adder i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -146,7 +146,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $start:function-types (type $none_=>_none)
+ (func $start:function-types
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/function-types.release.wat b/tests/compiler/function-types.release.wat
index 7105515b1a..896541fa7a 100644
--- a/tests/compiler/function-types.release.wat
+++ b/tests/compiler/function-types.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -23,18 +23,18 @@
  (elem $0 (i32.const 1) $function-types/makeAdder<i32>~anonymous|0 $function-types/makeAdder<i64>~anonymous|0 $function-types/makeAdder<f64>~anonymous|0 $function-types/makeAdder<i32>~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $function-types/makeAdder<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $function-types/makeAdder<i32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $function-types/makeAdder<i64>~anonymous|0 (type $i64_i64_=>_i64) (param $0 i64) (param $1 i64) (result i64)
+ (func $function-types/makeAdder<i64>~anonymous|0 (param $0 i64) (param $1 i64) (result i64)
   i64.const 30
  )
- (func $function-types/makeAdder<f64>~anonymous|0 (type $f64_f64_=>_f64) (param $0 f64) (param $1 f64) (result f64)
+ (func $function-types/makeAdder<f64>~anonymous|0 (param $0 f64) (param $1 f64) (result f64)
   f64.const 4
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/getter-call.debug.wat b/tests/compiler/getter-call.debug.wat
index b9c4a448b3..85f306f981 100644
--- a/tests/compiler/getter-call.debug.wat
+++ b/tests/compiler/getter-call.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,17 +44,17 @@
  (export "test" (func $getter-call/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -64,11 +64,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -77,14 +77,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -126,7 +126,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -138,11 +138,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -152,7 +152,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -208,15 +208,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -242,7 +242,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -262,7 +262,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -282,7 +282,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -318,7 +318,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -344,7 +344,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -365,11 +365,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -380,39 +380,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -648,7 +648,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1012,7 +1012,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1177,7 +1177,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1322,7 +1322,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1360,7 +1360,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1373,7 +1373,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1390,7 +1390,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1415,7 +1415,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1595,7 +1595,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1653,7 +1653,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1674,7 +1674,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1690,7 +1690,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1898,7 +1898,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1988,7 +1988,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2097,7 +2097,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2161,7 +2161,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2174,17 +2174,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2237,14 +2237,14 @@
   local.get $ptr
   return
  )
- (func $getter-call/C#get:x~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $getter-call/C#get:x~anonymous|0 (result i32)
   i32.const 42
  )
- (func $getter-call/C#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $getter-call/C#get:x (param $this i32) (result i32)
   i32.const 432
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2253,7 +2253,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2267,14 +2267,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2282,7 +2282,7 @@
   local.get $1
   call $~lib/function/Function<%28%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28%29=>i32>
     block $getter-call/C
@@ -2316,7 +2316,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -2335,7 +2335,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2348,7 +2348,7 @@
    unreachable
   end
  )
- (func $getter-call/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $getter-call/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2386,7 +2386,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $getter-call/test (type $none_=>_i32) (result i32)
+ (func $getter-call/test (result i32)
   (local $c i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2421,7 +2421,7 @@
   local.get $1
   return
  )
- (func $~lib/function/Function<%28%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2445,7 +2445,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/getter-call.release.wat b/tests/compiler/getter-call.release.wat
index aff2cddbc8..776f67aa5c 100644
--- a/tests/compiler/getter-call.release.wat
+++ b/tests/compiler/getter-call.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -37,7 +37,7 @@
  (export "test" (func $getter-call/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -82,7 +82,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -214,7 +214,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -367,7 +367,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -613,7 +613,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -725,7 +725,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -804,7 +804,7 @@
   i32.const 34272
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1071,7 +1071,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1128,7 +1128,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1361,10 +1361,10 @@
   memory.fill $0
   local.get $0
  )
- (func $getter-call/C#get:x~anonymous|0 (type $none_=>_i32) (result i32)
+ (func $getter-call/C#get:x~anonymous|0 (result i32)
   i32.const 42
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $~lib/function/Function<%28%29=>i32>
@@ -1433,7 +1433,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1467,7 +1467,7 @@
   i32.const 1344
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $getter-call/test (type $none_=>_i32) (result i32)
+ (func $getter-call/test (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1560,7 +1560,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/getter-setter.debug.wat b/tests/compiler/getter-setter.debug.wat
index 3a9abf5ef1..47bb3b4712 100644
--- a/tests/compiler/getter-setter.debug.wat
+++ b/tests/compiler/getter-setter.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $getter-setter/Foo._bar (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 76))
@@ -14,15 +14,15 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $getter-setter/Foo.get:bar (type $none_=>_i32) (result i32)
+ (func $getter-setter/Foo.get:bar (result i32)
   global.get $getter-setter/Foo._bar
   return
  )
- (func $getter-setter/Foo.set:bar (type $i32_=>_none) (param $bar i32)
+ (func $getter-setter/Foo.set:bar (param $bar i32)
   local.get $bar
   global.set $getter-setter/Foo._bar
  )
- (func $start:getter-setter (type $none_=>_none)
+ (func $start:getter-setter
   call $getter-setter/Foo.get:bar
   i32.const 0
   i32.eq
@@ -64,7 +64,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:getter-setter
  )
 )
diff --git a/tests/compiler/getter-setter.release.wat b/tests/compiler/getter-setter.release.wat
index d9968a1a31..1295dd28d7 100644
--- a/tests/compiler/getter-setter.release.wat
+++ b/tests/compiler/getter-setter.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $getter-setter/Foo._bar (mut i32) (i32.const 0))
  (memory $0 1)
@@ -8,7 +8,7 @@
  (data (i32.const 1048) "\02\00\00\00 \00\00\00g\00e\00t\00t\00e\00r\00-\00s\00e\00t\00t\00e\00r\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $getter-setter/Foo._bar
   if
    i32.const 0
diff --git a/tests/compiler/heap.debug.wat b/tests/compiler/heap.debug.wat
index 0410204606..f5ff3ed2d9 100644
--- a/tests/compiler/heap.debug.wat
+++ b/tests/compiler/heap.debug.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
  (global $~lib/native/ASC_LOW_MEMORY_LIMIT i32 (i32.const 0))
@@ -21,43 +21,43 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -293,7 +293,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -657,7 +657,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -822,7 +822,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -967,7 +967,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -988,7 +988,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1004,7 +1004,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1212,7 +1212,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1302,7 +1302,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -1411,7 +1411,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -1475,7 +1475,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -1488,12 +1488,12 @@
   i32.add
   return
  )
- (func $~lib/memory/heap.alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/memory/heap.alloc (param $size i32) (result i32)
   local.get $size
   call $~lib/rt/tlsf/__alloc
   return
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1531,7 +1531,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1544,7 +1544,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/moveBlock (type $i32_i32_i32_=>_i32) (param $root i32) (param $block i32) (param $newSize i32) (result i32)
+ (func $~lib/rt/tlsf/moveBlock (param $root i32) (param $block i32) (param $newSize i32) (result i32)
   (local $newBlock i32)
   local.get $root
   local.get $newSize
@@ -1576,7 +1576,7 @@
   local.get $newBlock
   return
  )
- (func $~lib/rt/tlsf/reallocateBlock (type $i32_i32_i32_=>_i32) (param $root i32) (param $block i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/reallocateBlock (param $root i32) (param $block i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $blockInfo i32)
   (local $blockSize i32)
@@ -1672,7 +1672,7 @@
   call $~lib/rt/tlsf/moveBlock
   return
  )
- (func $~lib/rt/tlsf/__realloc (type $i32_i32_=>_i32) (param $ptr i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__realloc (param $ptr i32) (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -1698,13 +1698,13 @@
   i32.add
   return
  )
- (func $~lib/memory/heap.realloc (type $i32_i32_=>_i32) (param $ptr i32) (param $size i32) (result i32)
+ (func $~lib/memory/heap.realloc (param $ptr i32) (param $size i32) (result i32)
   local.get $ptr
   local.get $size
   call $~lib/rt/tlsf/__realloc
   return
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1721,11 +1721,11 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/memory/heap.free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/memory/heap.free (param $ptr i32)
   local.get $ptr
   call $~lib/rt/tlsf/__free
  )
- (func $start:heap (type $none_=>_none)
+ (func $start:heap
   i32.const 16
   call $~lib/memory/heap.alloc
   global.set $heap/ptr
@@ -1736,7 +1736,7 @@
   global.get $heap/ptr
   call $~lib/memory/heap.free
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:heap
  )
 )
diff --git a/tests/compiler/heap.release.wat b/tests/compiler/heap.release.wat
index 3c14f43b6c..81ede8e691 100644
--- a/tests/compiler/heap.release.wat
+++ b/tests/compiler/heap.release.wat
@@ -1,10 +1,10 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
  (global $heap/ptr (mut i32) (i32.const 0))
@@ -15,7 +15,7 @@
  (data (i32.const 1112) "\02\00\00\00(\00\00\00A\00l\00l\00o\00c\00a\00t\00i\00o\00n\00 \00t\00o\00o\00 \00l\00a\00r\00g\00e")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -168,7 +168,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -414,7 +414,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -526,7 +526,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -605,7 +605,7 @@
   i32.const 33936
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $0 i32) (result i32)
   local.get $0
   i32.const 1073741820
   i32.gt_u
@@ -630,7 +630,7 @@
   i32.le_u
   select
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -756,7 +756,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -828,7 +828,7 @@
    i32.store $0
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -935,7 +935,7 @@
   call $~lib/rt/tlsf/prepareBlock
   local.get $1
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $0 i32) (result i32)
   (local $1 i32)
   local.get $0
   i32.const 4
@@ -965,7 +965,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/tlsf/moveBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/moveBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $0
   i32.const 32
@@ -997,7 +997,7 @@
   end
   local.get $2
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
diff --git a/tests/compiler/if.debug.wat b/tests/compiler/if.debug.wat
index 5f6f476898..2863dd29ac 100644
--- a/tests/compiler/if.debug.wat
+++ b/tests/compiler/if.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 76))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32844))
@@ -17,7 +17,7 @@
  (export "ifAlwaysReturns" (func $if/ifAlwaysReturns))
  (export "memory" (memory $0))
  (start $~start)
- (func $if/ifThenElse (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $if/ifThenElse (param $n i32) (result i32)
   local.get $n
   if
    i32.const 1
@@ -28,7 +28,7 @@
   end
   unreachable
  )
- (func $if/ifThen (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $if/ifThen (param $n i32) (result i32)
   local.get $n
   if
    i32.const 1
@@ -37,7 +37,7 @@
   i32.const 0
   return
  )
- (func $if/ifThenElseBlock (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $if/ifThenElseBlock (param $n i32) (result i32)
   local.get $n
   if
    i32.const 1
@@ -48,7 +48,7 @@
   end
   unreachable
  )
- (func $start:if (type $none_=>_none)
+ (func $start:if
   i32.const 0
   call $if/ifThenElse
   i32.const 0
@@ -128,7 +128,7 @@
    unreachable
   end
  )
- (func $if/ifAlwaysReturns (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $if/ifAlwaysReturns (param $n i32) (result i32)
   local.get $n
   if
    i32.const 1
@@ -143,7 +143,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:if
  )
 )
diff --git a/tests/compiler/if.release.wat b/tests/compiler/if.release.wat
index 78fcfea262..5e88059002 100644
--- a/tests/compiler/if.release.wat
+++ b/tests/compiler/if.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 1036) "\1c")
@@ -12,12 +12,12 @@
  (export "ifThenElseBlock" (func $if/ifThenElse))
  (export "ifAlwaysReturns" (func $if/ifAlwaysReturns))
  (export "memory" (memory $0))
- (func $if/ifThenElse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $if/ifThenElse (param $0 i32) (result i32)
   local.get $0
   i32.const 0
   i32.ne
  )
- (func $if/ifThen (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $if/ifThen (param $0 i32) (result i32)
   local.get $0
   if
    i32.const 1
@@ -25,7 +25,7 @@
   end
   i32.const 0
  )
- (func $if/ifAlwaysReturns (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $if/ifAlwaysReturns (param $0 i32) (result i32)
   local.get $0
   i32.eqz
   if
diff --git a/tests/compiler/import-memory.debug.wat b/tests/compiler/import-memory.debug.wat
index b37e28661f..f9c631a204 100644
--- a/tests/compiler/import-memory.debug.wat
+++ b/tests/compiler/import-memory.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "memory" (memory $0 1))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 76))
@@ -11,7 +11,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:import-memory (type $none_=>_none)
+ (func $start:import-memory
   memory.size $0
   i32.const 0
   i32.ne
@@ -25,7 +25,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:import-memory
  )
 )
diff --git a/tests/compiler/import-memory.release.wat b/tests/compiler/import-memory.release.wat
index 7a82ceb2ef..4282ac5254 100644
--- a/tests/compiler/import-memory.release.wat
+++ b/tests/compiler/import-memory.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "memory" (memory $0 1))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (data (i32.const 1036) "<\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00 \00\00\00i\00m\00p\00o\00r\00t\00-\00m\00e\00m\00o\00r\00y\00.\00t\00s\00\00\00\00\00\00\00\00\00\00\00\00\00")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.eqz
   if
diff --git a/tests/compiler/import.debug.wat b/tests/compiler/import.debug.wat
index b3743a0ee5..7126d98f5c 100644
--- a/tests/compiler/import.debug.wat
+++ b/tests/compiler/import.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
@@ -12,31 +12,31 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/sub (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
   return
  )
- (func $export/ns.two (type $none_=>_none)
+ (func $export/ns.two
   nop
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $start:import (type $none_=>_none)
+ (func $start:import
   global.get $export/a
   global.get $export/b
   call $export/add
@@ -66,7 +66,7 @@
   call $export/ns.two
   call $export-default/theDefault
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:import
  )
 )
diff --git a/tests/compiler/indexof-valueof.debug.wat b/tests/compiler/indexof-valueof.debug.wat
index d44a944e8c..ef5bb5c1c2 100644
--- a/tests/compiler/indexof-valueof.debug.wat
+++ b/tests/compiler/indexof-valueof.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:indexof-valueof (type $none_=>_none)
+ (func $start:indexof-valueof
   i32.const 1
   drop
   i32.const 1
@@ -113,7 +113,7 @@
   i32.const 1
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:indexof-valueof
  )
 )
diff --git a/tests/compiler/infer-array.debug.wat b/tests/compiler/infer-array.debug.wat
index 4788db3bee..2fb7162a3f 100644
--- a/tests/compiler/infer-array.debug.wat
+++ b/tests/compiler/infer-array.debug.wat
@@ -1,16 +1,16 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -62,17 +62,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -82,11 +82,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -95,14 +95,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -144,7 +144,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -156,11 +156,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -170,7 +170,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -226,15 +226,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -260,7 +260,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -280,7 +280,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -300,7 +300,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -336,7 +336,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -362,7 +362,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -383,11 +383,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -398,39 +398,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -666,7 +666,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1030,7 +1030,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1195,7 +1195,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1340,7 +1340,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1378,7 +1378,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1391,7 +1391,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1408,7 +1408,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1433,7 +1433,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1613,7 +1613,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1671,7 +1671,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1692,7 +1692,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1708,7 +1708,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1916,7 +1916,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2006,7 +2006,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2115,7 +2115,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2179,7 +2179,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2192,17 +2192,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2255,7 +2255,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2271,7 +2271,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2339,55 +2339,55 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<infer-array/Ref|null>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2433,45 +2433,45 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<infer-array/Ref|null>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<infer-array/Ref|null>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<usize>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<usize>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<usize>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<usize>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 256
   local.get $0
@@ -2486,7 +2486,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2500,14 +2500,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2515,11 +2515,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2527,11 +2527,11 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/array/Array<u32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2539,11 +2539,11 @@
   local.get $1
   call $~lib/array/Array<u32>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2551,11 +2551,11 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/array/Array<infer-array/Ref|null>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<infer-array/Ref|null>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<infer-array/Ref|null>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2563,11 +2563,11 @@
   local.get $1
   call $~lib/array/Array<infer-array/Ref|null>#__visit
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String|null>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String|null>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2575,11 +2575,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String|null>#__visit
  )
- (func $~lib/array/Array<usize>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<usize>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<usize>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<usize>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2587,11 +2587,11 @@
   local.get $1
   call $~lib/array/Array<usize>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2599,7 +2599,7 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<i32>>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<~lib/array/Array<i32>>
     block $~lib/array/Array<usize>
@@ -2675,10 +2675,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:infer-array
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2691,7 +2691,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2743,7 +2743,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $this i32) (param $index i32) (result f64)
   (local $value f64)
   (local $3 i32)
   (local $4 f64)
@@ -2796,7 +2796,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2848,7 +2848,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $this i32) (param $index i32) (result f32)
   (local $value f32)
   (local $3 i32)
   (local $4 f32)
@@ -2901,7 +2901,7 @@
   local.get $4
   return
  )
- (func $infer-array/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $infer-array/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2939,7 +2939,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -3058,7 +3058,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<infer-array/Ref|null>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3131,7 +3131,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<infer-array/Ref|null>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3188,7 +3188,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/string/String|null>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3245,7 +3245,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<usize>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<usize>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3297,7 +3297,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3370,7 +3370,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3437,7 +3437,7 @@
   local.get $3
   return
  )
- (func $start:infer-array (type $none_=>_none)
+ (func $start:infer-array
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -4151,7 +4151,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4177,7 +4177,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4203,7 +4203,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4229,7 +4229,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4255,7 +4255,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<infer-array/Ref|null>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4325,7 +4325,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String|null>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String|null>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4395,7 +4395,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<usize>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<usize>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4421,7 +4421,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4491,7 +4491,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -4544,7 +4544,7 @@
   local.get $7
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/infer-array.release.wat b/tests/compiler/infer-array.release.wat
index 4936943c49..7c009e0413 100644
--- a/tests/compiler/infer-array.release.wat
+++ b/tests/compiler/infer-array.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -69,7 +69,7 @@
  (data (i32.const 2160) "\r\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\02\t\00\00\02\1a\00\00\02\01\00\00\02\19\00\00 \00\00\00\02a\00\00\02a\00\00\02\01\00\00\02A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1280
@@ -118,7 +118,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -250,7 +250,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -403,7 +403,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -649,7 +649,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -761,7 +761,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -840,7 +840,7 @@
   i32.const 34992
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1107,7 +1107,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1233,7 +1233,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1539,7 +1539,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1675,10 +1675,10 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:infer-array
  )
- (func $~lib/array/Array<i32>#__get (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1726,7 +1726,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__get (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<f64>#__get (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1774,7 +1774,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1828,7 +1828,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>#__get (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1881,7 +1881,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $infer-array/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $infer-array/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1949,7 +1949,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<infer-array/Ref|null>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2154,7 +2154,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<infer-array/Ref|null>#__get (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<infer-array/Ref|null>#__get (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2208,7 +2208,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:infer-array (type $none_=>_none)
+ (func $start:infer-array
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2667,7 +2667,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2734,7 +2734,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -2753,7 +2753,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/infer-generic.debug.wat b/tests/compiler/infer-generic.debug.wat
index c38e8830f1..aabb685dd3 100644
--- a/tests/compiler/infer-generic.debug.wat
+++ b/tests/compiler/infer-generic.debug.wat
@@ -1,16 +1,16 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_f32_i32_i32_=>_i32 (func_subtype (param i32 f32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $f32_=>_f32 (func_subtype (param f32) (result f32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_f32_i32_i32_=>_i32 (func (param i32 f32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $f32_=>_f32 (func (param f32) (result f32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $infer-generic/arr i32 (i32.const 128))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
@@ -56,13 +56,13 @@
  (export "test5" (func $export:infer-generic/test5))
  (export "inferAssert" (func $export:infer-generic/inferAssert))
  (start $~start)
- (func $infer-generic/inferCompatible<f64> (type $f64_f64_=>_i32) (param $a f64) (param $b f64) (result i32)
+ (func $infer-generic/inferCompatible<f64> (param $a f64) (param $b f64) (result i32)
   local.get $a
   local.get $b
   f64.eq
   return
  )
- (func $start:infer-generic~anonymous|0 (type $i32_f32_i32_i32_=>_i32) (param $acc i32) (param $cur f32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:infer-generic~anonymous|0 (param $acc i32) (param $cur f32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   if (result i32)
    local.get $cur
@@ -72,34 +72,34 @@
    i32.const 0
   end
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $infer-generic/inferDefault<i32> (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $infer-generic/inferDefault<i32> (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $infer-generic/Ref#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $infer-generic/Ref#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -109,11 +109,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -122,14 +122,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -171,7 +171,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -183,11 +183,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -197,7 +197,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -253,15 +253,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -287,7 +287,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -307,7 +307,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -327,7 +327,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -363,7 +363,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -389,7 +389,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -410,11 +410,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -425,39 +425,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -693,7 +693,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1057,7 +1057,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1222,7 +1222,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1367,7 +1367,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1405,7 +1405,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1418,7 +1418,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1435,7 +1435,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1460,7 +1460,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1640,7 +1640,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1698,7 +1698,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1719,7 +1719,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1735,7 +1735,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1943,7 +1943,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2033,7 +2033,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2142,7 +2142,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2206,7 +2206,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2219,17 +2219,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2282,40 +2282,40 @@
   local.get $ptr
   return
  )
- (func $infer-generic/inferDefault<infer-generic/Ref> (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $infer-generic/inferDefault<infer-generic/Ref> (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $infer-generic/inferPlain<f32> (type $f32_=>_f32) (param $arr f32) (result f32)
+ (func $infer-generic/inferPlain<f32> (param $arr f32) (result f32)
   local.get $arr
   return
  )
- (func $infer-generic/test1 (type $f32_=>_f32) (param $arr f32) (result f32)
+ (func $infer-generic/test1 (param $arr f32) (result f32)
   local.get $arr
   call $infer-generic/inferPlain<f32>
   return
  )
- (func $infer-generic/inferEncapsulatedClass<f32> (type $i32_=>_i32) (param $arr i32) (result i32)
+ (func $infer-generic/inferEncapsulatedClass<f32> (param $arr i32) (result i32)
   local.get $arr
   return
  )
- (func $infer-generic/inferEncapsulatedFunctionNull<f64> (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/inferEncapsulatedFunctionNull<f64> (param $fn i32) (result i32)
   local.get $fn
   return
  )
- (func $infer-generic/inferEncapsulatedFunction<f32,f64> (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/inferEncapsulatedFunction<f32,f64> (param $fn i32) (result i32)
   local.get $fn
   return
  )
- (func $infer-generic/inferEncapsulatedFunctionMixed<f32,f64> (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/inferEncapsulatedFunctionMixed<f32,f64> (param $fn i32) (result i32)
   local.get $fn
   return
  )
- (func $infer-generic/Ref#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $infer-generic/Ref#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $infer-generic/arr
   local.tee $1
@@ -2331,7 +2331,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2345,14 +2345,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2360,11 +2360,11 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2372,11 +2372,11 @@
   local.get $1
   call $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28%29=>f64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>f64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2384,11 +2384,11 @@
   local.get $1
   call $~lib/function/Function<%28%29=>f64>#__visit
  )
- (func $~lib/function/Function<%28f32%29=>f64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%29=>f64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%29=>f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%29=>f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2396,11 +2396,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%29=>f64>#__visit
  )
- (func $~lib/function/Function<%28f32%2Ci32%29=>f64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Ci32%29=>f64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Ci32%29=>f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Ci32%29=>f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2408,7 +2408,7 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Ci32%29=>f64>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28f32%2Ci32%29=>f64>
     block $~lib/function/Function<%28f32%29=>f64>
@@ -2466,10 +2466,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:infer-generic
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2482,7 +2482,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<f32>#reduce<bool> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/array/Array<f32>#reduce<bool> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $len i32)
@@ -2572,7 +2572,7 @@
   local.get $8
   return
  )
- (func $infer-generic/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $infer-generic/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2618,7 +2618,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:infer-generic (type $none_=>_none)
+ (func $start:infer-generic
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2727,7 +2727,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $infer-generic/test2 (type $i32_=>_i32) (param $arr i32) (result i32)
+ (func $infer-generic/test2 (param $arr i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2752,7 +2752,7 @@
   local.get $1
   return
  )
- (func $infer-generic/test3 (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/test3 (param $fn i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2777,7 +2777,7 @@
   local.get $1
   return
  )
- (func $infer-generic/test4 (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/test4 (param $fn i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2802,7 +2802,7 @@
   local.get $1
   return
  )
- (func $infer-generic/test5 (type $i32_=>_i32) (param $fn i32) (result i32)
+ (func $infer-generic/test5 (param $fn i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2827,7 +2827,7 @@
   local.get $1
   return
  )
- (func $infer-generic/inferAssert (type $i32_=>_none) (param $v i32)
+ (func $infer-generic/inferAssert (param $v i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2866,7 +2866,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2892,7 +2892,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28bool%2Cf32%2Ci32%2C~lib/array/Array<f32>%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2916,7 +2916,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2940,7 +2940,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%29=>f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%29=>f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2964,7 +2964,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Ci32%29=>f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Ci32%29=>f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2988,7 +2988,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3016,7 +3016,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:infer-generic/test2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:infer-generic/test2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3035,7 +3035,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:infer-generic/test3 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:infer-generic/test3 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3054,7 +3054,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:infer-generic/test4 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:infer-generic/test4 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3073,7 +3073,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:infer-generic/test5 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:infer-generic/test5 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3092,7 +3092,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:infer-generic/inferAssert (type $i32_=>_none) (param $0 i32)
+ (func $export:infer-generic/inferAssert (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/infer-generic.release.wat b/tests/compiler/infer-generic.release.wat
index 24f9361e90..f7d1bf088d 100644
--- a/tests/compiler/infer-generic.release.wat
+++ b/tests/compiler/infer-generic.release.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_f32_i32_i32_=>_i32 (func_subtype (param i32 f32 i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f32_=>_f32 (func_subtype (param f32) (result f32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_f32_i32_i32_=>_i32 (func (param i32 f32 i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f32_=>_f32 (func (param f32) (result f32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -51,7 +51,7 @@
  (export "test5" (func $export:infer-generic/test2))
  (export "inferAssert" (func $export:infer-generic/inferAssert))
  (start $~start)
- (func $start:infer-generic~anonymous|0 (type $i32_f32_i32_i32_=>_i32) (param $0 i32) (param $1 f32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:infer-generic~anonymous|0 (param $0 i32) (param $1 f32) (param $2 i32) (param $3 i32) (result i32)
   local.get $1
   f32.const 0
   f32.ne
@@ -59,7 +59,7 @@
   local.get $0
   select
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1152
@@ -106,7 +106,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -238,7 +238,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -391,7 +391,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -637,7 +637,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -749,7 +749,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -828,7 +828,7 @@
   i32.const 34432
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1095,7 +1095,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1221,7 +1221,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1527,10 +1527,10 @@
   memory.fill $0
   local.get $1
  )
- (func $infer-generic/test1 (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $infer-generic/test1 (param $0 f32) (result f32)
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner1
    block $folding-inner0
@@ -1629,7 +1629,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 f32)
@@ -1846,7 +1846,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:infer-generic/test2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:infer-generic/test2 (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1894,7 +1894,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:infer-generic/inferAssert (type $i32_=>_none) (param $0 i32)
+ (func $export:infer-generic/inferAssert (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1958,7 +1958,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/infer-type.debug.wat b/tests/compiler/infer-type.debug.wat
index 05e5a0ddc5..a4230bf671 100644
--- a/tests/compiler/infer-type.debug.wat
+++ b/tests/compiler/infer-type.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
- (type $none_=>_f32 (func_subtype (result f32) func))
- (type $none_=>_f64 (func_subtype (result f64) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_i64 (func (result i64)))
+ (type $none_=>_f32 (func (result f32)))
+ (type $none_=>_f64 (func (result f64)))
  (global $infer-type/i i32 (i32.const 10))
  (global $infer-type/I i64 (i64.const 4294967296))
  (global $infer-type/F f64 (f64.const 1.5))
@@ -21,7 +21,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $infer-type/locals (type $none_=>_none)
+ (func $infer-type/locals
   (local $li i32)
   (local $lI i64)
   (local $lF f64)
@@ -41,23 +41,23 @@
   global.get $infer-type/F
   local.set $aF
  )
- (func $infer-type/reti (type $none_=>_i32) (result i32)
+ (func $infer-type/reti (result i32)
   i32.const 0
   return
  )
- (func $infer-type/retI (type $none_=>_i64) (result i64)
+ (func $infer-type/retI (result i64)
   i64.const 0
   return
  )
- (func $infer-type/retf (type $none_=>_f32) (result f32)
+ (func $infer-type/retf (result f32)
   f32.const 0
   return
  )
- (func $infer-type/refF (type $none_=>_f64) (result f64)
+ (func $infer-type/refF (result f64)
   f64.const 0
   return
  )
- (func $start:infer-type (type $none_=>_none)
+ (func $start:infer-type
   (local $a i32)
   (local $b i32)
   global.get $infer-type/i
@@ -105,7 +105,7 @@
   i32.const 1
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:infer-type
  )
 )
diff --git a/tests/compiler/infer-type.release.wat b/tests/compiler/infer-type.release.wat
index 263a92688b..4a4b656673 100644
--- a/tests/compiler/infer-type.release.wat
+++ b/tests/compiler/infer-type.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   loop $for-loop|0
    local.get $0
diff --git a/tests/compiler/inlining-blocklocals.debug.wat b/tests/compiler/inlining-blocklocals.debug.wat
index 8ee1e4b914..e750bbc2a7 100644
--- a/tests/compiler/inlining-blocklocals.debug.wat
+++ b/tests/compiler/inlining-blocklocals.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $inlining-blocklocals/b (mut i32) (i32.const 2))
  (global $inlining-blocklocals/theCall_a (mut i32) (i32.const 0))
@@ -15,7 +15,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $inlining-blocklocals/test (type $none_=>_none)
+ (func $inlining-blocklocals/test
   (local $a i32)
   (local $1 i32)
   (local $2 i32)
@@ -98,10 +98,10 @@
    unreachable
   end
  )
- (func $start:inlining-blocklocals (type $none_=>_none)
+ (func $start:inlining-blocklocals
   call $inlining-blocklocals/test
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:inlining-blocklocals
  )
 )
diff --git a/tests/compiler/inlining-blocklocals.release.wat b/tests/compiler/inlining-blocklocals.release.wat
index d374f35350..e45984ce2d 100644
--- a/tests/compiler/inlining-blocklocals.release.wat
+++ b/tests/compiler/inlining-blocklocals.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $inlining-blocklocals/b (mut i32) (i32.const 2))
  (global $inlining-blocklocals/theCall_b (mut i32) (i32.const 0))
@@ -10,7 +10,7 @@
  (data (i32.const 1048) "\02\00\00\00.\00\00\00i\00n\00l\00i\00n\00i\00n\00g\00-\00b\00l\00o\00c\00k\00l\00o\00c\00a\00l\00s\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $inlining-blocklocals/b
   local.tee $0
diff --git a/tests/compiler/inlining-recursive.debug.wat b/tests/compiler/inlining-recursive.debug.wat
index c8e790b6fc..922af3ad6b 100644
--- a/tests/compiler/inlining-recursive.debug.wat
+++ b/tests/compiler/inlining-recursive.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -10,13 +10,13 @@
  (export "bar" (func $inlining-recursive/bar))
  (export "baz" (func $inlining-recursive/baz))
  (export "memory" (memory $0))
- (func $inlining-recursive/foo (type $none_=>_none)
+ (func $inlining-recursive/foo
   call $inlining-recursive/foo
  )
- (func $inlining-recursive/baz (type $none_=>_none)
+ (func $inlining-recursive/baz
   call $inlining-recursive/bar
  )
- (func $inlining-recursive/bar (type $none_=>_none)
+ (func $inlining-recursive/bar
   call $inlining-recursive/baz
  )
 )
diff --git a/tests/compiler/inlining-recursive.release.wat b/tests/compiler/inlining-recursive.release.wat
index d0dcac9410..358725a3e0 100644
--- a/tests/compiler/inlining-recursive.release.wat
+++ b/tests/compiler/inlining-recursive.release.wat
@@ -1,14 +1,14 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "foo" (func $inlining-recursive/foo))
  (export "bar" (func $inlining-recursive/baz))
  (export "baz" (func $inlining-recursive/baz))
  (export "memory" (memory $0))
- (func $inlining-recursive/foo (type $none_=>_none)
+ (func $inlining-recursive/foo
   call $inlining-recursive/foo
  )
- (func $inlining-recursive/baz (type $none_=>_none)
+ (func $inlining-recursive/baz
   call $inlining-recursive/baz
  )
 )
diff --git a/tests/compiler/inlining.debug.wat b/tests/compiler/inlining.debug.wat
index 473d45ed7c..7cb332b182 100644
--- a/tests/compiler/inlining.debug.wat
+++ b/tests/compiler/inlining.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $inlining/constantGlobal i32 (i32.const 1))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -46,16 +46,16 @@
  (export "test" (func $inlining/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $inlining/test (type $none_=>_i32) (result i32)
+ (func $inlining/test (result i32)
   global.get $inlining/constantGlobal
   i32.const 2
   i32.add
   return
  )
- (func $inlining/func_fe~anonymous|0 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $inlining/func_fe~anonymous|0 (param $a i32) (result i32)
   local.get $a
  )
- (func $inlining/test_funcs (type $none_=>_none)
+ (func $inlining/test_funcs
   (local $a f32)
   (local $b f64)
   (local $a|2 i32)
@@ -304,22 +304,22 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $inlining/Baz#set:b (type $i32_i32_=>_none) (param $this i32) (param $b i32)
+ (func $inlining/Baz#set:b (param $this i32) (param $b i32)
   local.get $this
   local.get $b
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -329,11 +329,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -342,14 +342,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -391,7 +391,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -403,11 +403,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -417,7 +417,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -473,15 +473,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -507,7 +507,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -527,7 +527,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -547,7 +547,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -583,7 +583,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -609,7 +609,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -630,11 +630,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -645,39 +645,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -913,7 +913,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1277,7 +1277,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1442,7 +1442,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1587,7 +1587,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1625,7 +1625,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1638,7 +1638,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1655,7 +1655,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1680,7 +1680,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1860,7 +1860,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1918,7 +1918,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1939,7 +1939,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1955,7 +1955,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2163,7 +2163,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2253,7 +2253,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2362,7 +2362,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2426,7 +2426,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2439,17 +2439,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2502,38 +2502,38 @@
   local.get $ptr
   return
  )
- (func $inlining/Baz#set:a (type $i32_i32_=>_none) (param $this i32) (param $a i32)
+ (func $inlining/Baz#set:a (param $this i32) (param $a i32)
   local.get $this
   local.get $a
   i32.store $0
  )
- (func $inlining/Bar#set:e (type $i32_i32_=>_none) (param $this i32) (param $e i32)
+ (func $inlining/Bar#set:e (param $this i32) (param $e i32)
   local.get $this
   local.get $e
   i32.store $0 offset=12
  )
- (func $inlining/Bar#set:d (type $i32_i32_=>_none) (param $this i32) (param $d i32)
+ (func $inlining/Bar#set:d (param $this i32) (param $d i32)
   local.get $this
   local.get $d
   i32.store $0 offset=8
  )
- (func $inlining/Baz#get:a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $inlining/Baz#get:a (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $inlining/Baz#get:b (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $inlining/Baz#get:b (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $inlining/Bar#get:d (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $inlining/Bar#get:d (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $inlining/Bar#get:e (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $inlining/Bar#get:e (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $start:inlining (type $none_=>_none)
+ (func $start:inlining
   call $inlining/test
   i32.const 3
   i32.eq
@@ -2566,7 +2566,7 @@
   global.set $~lib/rt/itcms/fromSpace
   call $inlining/test_ctor
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 304
   local.get $0
@@ -2575,7 +2575,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2589,14 +2589,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2604,7 +2604,7 @@
   local.get $1
   call $~lib/function/Function<%28i32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $inlining/Baz
     block $inlining/Bar
@@ -2644,10 +2644,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:inlining
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2660,7 +2660,7 @@
    unreachable
   end
  )
- (func $inlining/test_ctor (type $none_=>_none)
+ (func $inlining/test_ctor
   (local $this i32)
   (local $f i32)
   (local $this|2 i32)
@@ -2841,7 +2841,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/inlining.release.wat b/tests/compiler/inlining.release.wat
index 3345f33ebc..6dcd272edf 100644
--- a/tests/compiler/inlining.release.wat
+++ b/tests/compiler/inlining.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -41,13 +41,13 @@
  (export "test" (func $inlining/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $inlining/test (type $none_=>_i32) (result i32)
+ (func $inlining/test (result i32)
   i32.const 3
  )
- (func $inlining/func_fe~anonymous|0 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $inlining/func_fe~anonymous|0 (param $0 i32) (result i32)
   i32.const 2
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1328
@@ -92,7 +92,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -224,7 +224,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -377,7 +377,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -623,7 +623,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -735,7 +735,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -814,7 +814,7 @@
   i32.const 34336
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1081,7 +1081,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1207,7 +1207,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1513,7 +1513,7 @@
   memory.fill $0
   local.get $1
  )
- (func $start:inlining (type $none_=>_none)
+ (func $start:inlining
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1730,7 +1730,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $inlining/Baz
@@ -1805,10 +1805,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:inlining
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/instanceof.debug.wat b/tests/compiler/instanceof.debug.wat
index f66685cbe0..4e1b256d72 100644
--- a/tests/compiler/instanceof.debug.wat
+++ b/tests/compiler/instanceof.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -65,17 +65,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -85,11 +85,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -98,14 +98,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -147,7 +147,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -159,11 +159,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -173,7 +173,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -229,15 +229,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -263,7 +263,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -283,7 +283,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -303,7 +303,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -339,7 +339,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -365,7 +365,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -386,11 +386,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -401,39 +401,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -669,7 +669,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1033,7 +1033,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1198,7 +1198,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1343,7 +1343,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1381,7 +1381,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1394,7 +1394,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1411,7 +1411,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1436,7 +1436,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1616,7 +1616,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1674,7 +1674,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1695,7 +1695,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1711,7 +1711,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1919,7 +1919,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2009,7 +2009,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2118,7 +2118,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2182,7 +2182,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2195,17 +2195,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2258,71 +2258,71 @@
   local.get $ptr
   return
  )
- (func $instanceof/isI32<i32> (type $i32_=>_i32) (param $v i32) (result i32)
+ (func $instanceof/isI32<i32> (param $v i32) (result i32)
   i32.const 1
   drop
   i32.const 1
   return
  )
- (func $instanceof/isI32<f64> (type $f64_=>_i32) (param $v f64) (result i32)
+ (func $instanceof/isI32<f64> (param $v f64) (result i32)
   i32.const 0
   drop
   i32.const 0
   return
  )
- (func $instanceof/isI32<u32> (type $i32_=>_i32) (param $v i32) (result i32)
+ (func $instanceof/isI32<u32> (param $v i32) (result i32)
   i32.const 0
   drop
   i32.const 0
   return
  )
- (func $instanceof/isI32<u16> (type $i32_=>_i32) (param $v i32) (result i32)
+ (func $instanceof/isI32<u16> (param $v i32) (result i32)
   i32.const 0
   drop
   i32.const 0
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/W,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/W,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/X,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/X,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/IA,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/IA,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/IB,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/IB,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/IC,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/IC,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/ID,~lib/object/Object> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/ID,~lib/object/Object> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/W> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2367,7 +2367,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/X> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2412,7 +2412,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2457,7 +2457,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2502,7 +2502,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IA> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IA> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2547,7 +2547,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IB> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IB> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2592,7 +2592,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2637,7 +2637,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2682,53 +2682,53 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticTrue<instanceof/W,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/W,instanceof/W> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/W,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/W,instanceof/X> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/W,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/W,instanceof/Y> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/W,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/W,instanceof/Z> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/X,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/X,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/Y,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/Y,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/Z,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/Z,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/X,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/X,instanceof/X> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2772,7 +2772,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2816,7 +2816,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2861,7 +2861,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2906,17 +2906,17 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/X> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/Y> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertDynamicFalse<instanceof/Y,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/Y,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -2960,7 +2960,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/Y,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/Y,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3005,22 +3005,22 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/X> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/Y> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/Z> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertDynamicFalse<instanceof/IA,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/IA,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3064,7 +3064,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/IB,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/IB,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3108,7 +3108,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/IA,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/IA,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3152,7 +3152,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/IB,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/IB,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3196,19 +3196,19 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticFalse<instanceof/IA,instanceof/IE> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/IA,instanceof/IE> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/IB,instanceof/IE> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/IB,instanceof/IE> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3253,7 +3253,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3298,7 +3298,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3343,7 +3343,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3388,17 +3388,17 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticTrue<instanceof/X,instanceof/IA> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/X,instanceof/IA> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/X,instanceof/IB> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/X,instanceof/IB> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3442,7 +3442,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3486,13 +3486,13 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticFalse<instanceof/X,instanceof/IE> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/X,instanceof/IE> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/ID> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3537,7 +3537,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/X,instanceof/IC> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3582,83 +3582,83 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IA> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IA> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IB> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IB> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/ID> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Y,instanceof/IC> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/Y,instanceof/IE> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/Y,instanceof/IE> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IA> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IA> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IB> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IB> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/ID> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/ID> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IC> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticTrue<instanceof/Z,instanceof/IC> (param $value i32)
   i32.const 1
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/Z,instanceof/IE> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/Z,instanceof/IE> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/IA,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/IA,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/IB,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/IB,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/IC,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/IC,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertStaticFalse<instanceof/ID,instanceof/W> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertStaticFalse<instanceof/ID,instanceof/W> (param $value i32)
   i32.const 0
   i32.eqz
   drop
   return
  )
- (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/X> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3703,7 +3703,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/X> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/X> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3748,7 +3748,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3793,7 +3793,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3838,7 +3838,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IC,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IC,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3883,7 +3883,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/ID,instanceof/Y> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/ID,instanceof/Y> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3928,7 +3928,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IA,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -3973,7 +3973,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IB,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -4018,7 +4018,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/IC,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/IC,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -4063,7 +4063,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<instanceof/ID,instanceof/Z> (type $i32_=>_none) (param $value i32)
+ (func $instanceof/assertDynamicTrue<instanceof/ID,instanceof/Z> (param $value i32)
   (local $1 i32)
   (local $check i32)
   global.get $~lib/memory/__stack_pointer
@@ -4108,7 +4108,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~instanceof|instanceof/B (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/B (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4125,7 +4125,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/Child<f32> (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/Child<f32> (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4142,7 +4142,7 @@
   end
   i32.const 1
  )
- (func $~anyinstanceof|instanceof/Child (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~anyinstanceof|instanceof/Child (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4163,7 +4163,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/Cat (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/Cat (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4184,7 +4184,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/BlackCat (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/BlackCat (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4201,7 +4201,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/W (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/W (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4218,7 +4218,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/X (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/X (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4243,7 +4243,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/Y (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/Y (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4264,7 +4264,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/Z (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/Z (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4281,7 +4281,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/IA (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/IA (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4306,7 +4306,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/IB (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/IB (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4331,7 +4331,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/IC (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/IC (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4352,7 +4352,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|instanceof/ID (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|instanceof/ID (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -4373,7 +4373,7 @@
   end
   i32.const 1
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $instanceof/a
   local.tee $1
@@ -4508,7 +4508,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4522,10 +4522,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $instanceof/IE
     block $instanceof/Z
@@ -4607,10 +4607,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:instanceof
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -4623,7 +4623,7 @@
    unreachable
   end
  )
- (func $instanceof/A#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/A#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4661,7 +4661,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/B#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/B#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4699,7 +4699,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Parent<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Parent<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4737,7 +4737,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Child<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Child<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4775,7 +4775,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Parent<f32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Parent<f32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4813,7 +4813,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Child<f32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Child<f32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4851,7 +4851,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Animal#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Animal#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4889,7 +4889,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Cat#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Cat#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4927,7 +4927,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/BlackCat#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/BlackCat#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4965,7 +4965,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/W#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/W#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5003,7 +5003,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/X#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/X#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5041,7 +5041,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Y#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Y#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5079,7 +5079,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $instanceof/Z#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $instanceof/Z#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5117,7 +5117,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:instanceof (type $none_=>_none)
+ (func $start:instanceof
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -6884,7 +6884,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/instanceof.release.wat b/tests/compiler/instanceof.release.wat
index e8b8e780a6..1b4a7ec7f5 100644
--- a/tests/compiler/instanceof.release.wat
+++ b/tests/compiler/instanceof.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -49,7 +49,7 @@
  (data (i32.const 1488) "\17\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $instanceof/a
@@ -184,7 +184,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -316,7 +316,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -469,7 +469,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -715,7 +715,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -827,7 +827,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -906,7 +906,7 @@
   i32.const 34352
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1173,7 +1173,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1230,7 +1230,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1463,7 +1463,7 @@
   memory.fill $0
   local.get $0
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/X> (type $i32_=>_none) (param $0 i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/X> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1522,7 +1522,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Y> (type $i32_=>_none) (param $0 i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Y> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1584,7 +1584,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Z> (type $i32_=>_none) (param $0 i32)
+ (func $instanceof/assertDynamicTrue<~lib/object/Object,instanceof/Z> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1633,7 +1633,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Y> (type $i32_=>_none) (param $0 i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Y> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1694,7 +1694,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Z> (type $i32_=>_none) (param $0 i32)
+ (func $instanceof/assertDynamicFalse<instanceof/X,instanceof/Z> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1742,7 +1742,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $instanceof/IE
     block $instanceof/Z
@@ -1828,10 +1828,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:instanceof
  )
- (func $instanceof/A#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $instanceof/A#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1875,7 +1875,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $instanceof/Animal#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $instanceof/Animal#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1919,7 +1919,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $instanceof/Cat#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $instanceof/Cat#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1963,7 +1963,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $instanceof/BlackCat#constructor (type $none_=>_i32) (result i32)
+ (func $instanceof/BlackCat#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2005,7 +2005,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $instanceof/X#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $instanceof/X#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2049,7 +2049,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $instanceof/Y#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $instanceof/Y#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2093,7 +2093,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:instanceof (type $none_=>_none)
+ (func $start:instanceof
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3527,7 +3527,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3561,7 +3561,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/issues/1095.debug.wat b/tests/compiler/issues/1095.debug.wat
index d22d435e1f..be80f96fb5 100644
--- a/tests/compiler/issues/1095.debug.wat
+++ b/tests/compiler/issues/1095.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,17 +44,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -64,11 +64,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -77,14 +77,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -126,7 +126,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -138,11 +138,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -152,7 +152,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -208,15 +208,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -242,7 +242,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -262,7 +262,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -282,7 +282,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -318,7 +318,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -344,7 +344,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -365,11 +365,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -380,39 +380,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -648,7 +648,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1012,7 +1012,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1177,7 +1177,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1322,7 +1322,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1360,7 +1360,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1373,7 +1373,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1390,7 +1390,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1415,7 +1415,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1595,7 +1595,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1653,7 +1653,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1674,7 +1674,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1690,7 +1690,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1898,7 +1898,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1988,7 +1988,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2097,7 +2097,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2161,7 +2161,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2174,17 +2174,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2237,7 +2237,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2305,7 +2305,7 @@
    end
   end
  )
- (func $issues/1095/Foo#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $issues/1095/Foo#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
@@ -2314,11 +2314,11 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $issues/1095/Foo#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1095/Foo#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2327,7 +2327,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2341,10 +2341,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $issues/1095/Foo~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $issues/1095/Foo~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2358,7 +2358,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $issues/1095/Foo
     block $~lib/arraybuffer/ArrayBufferView
@@ -2389,10 +2389,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/1095
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2405,7 +2405,7 @@
    unreachable
   end
  )
- (func $issues/1095/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1095/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2459,7 +2459,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $issues/1095/test (type $i32_=>_none) (param $foo i32)
+ (func $issues/1095/test (param $foo i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2511,7 +2511,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:issues/1095 (type $none_=>_none)
+ (func $start:issues/1095
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2551,7 +2551,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/issues/1095.release.wat b/tests/compiler/issues/1095.release.wat
index 9e860cdc4b..4e3382d3f4 100644
--- a/tests/compiler/issues/1095.release.wat
+++ b/tests/compiler/issues/1095.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -38,7 +38,7 @@
  (data (i32.const 1648) "\05\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -83,7 +83,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -215,7 +215,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -368,7 +368,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -614,7 +614,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -726,7 +726,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -805,7 +805,7 @@
   i32.const 34448
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1072,7 +1072,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1198,7 +1198,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1504,7 +1504,7 @@
   memory.fill $0
   local.get $1
  )
- (func $issues/1095/Foo#set:bar (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $issues/1095/Foo#set:bar (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1559,7 +1559,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $folding-inner0
    block $invalid
     block $~lib/string/String
@@ -1587,7 +1587,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1763,7 +1763,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/issues/1225.debug.wat b/tests/compiler/issues/1225.debug.wat
index 220ba993d2..d0698b8794 100644
--- a/tests/compiler/issues/1225.debug.wat
+++ b/tests/compiler/issues/1225.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -45,31 +45,31 @@
  (export "viaThis" (func $issues/1225/viaThis))
  (export "memory" (memory $0))
  (start $~start)
- (func $issues/1225/X#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1225/X#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $issues/1225/X#set:viaThis (type $i32_i32_=>_none) (param $this i32) (param $viaThis i32)
+ (func $issues/1225/X#set:viaThis (param $this i32) (param $viaThis i32)
   local.get $this
   local.get $viaThis
   i32.store $0 offset=4
  )
- (func $issues/1225/X#set:normal (type $i32_i32_=>_none) (param $this i32) (param $normal i32)
+ (func $issues/1225/X#set:normal (param $this i32) (param $normal i32)
   local.get $this
   local.get $normal
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -79,11 +79,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -92,14 +92,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -141,7 +141,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -153,11 +153,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -167,7 +167,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -223,15 +223,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -257,7 +257,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -277,7 +277,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -297,7 +297,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -333,7 +333,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -359,7 +359,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -380,11 +380,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -395,39 +395,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -663,7 +663,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1027,7 +1027,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1192,7 +1192,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1337,7 +1337,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1375,7 +1375,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1388,7 +1388,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1405,7 +1405,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1430,7 +1430,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1610,7 +1610,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1668,7 +1668,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1689,7 +1689,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1705,7 +1705,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1913,7 +1913,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2003,7 +2003,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2112,7 +2112,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2176,7 +2176,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2189,17 +2189,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2252,20 +2252,20 @@
   local.get $ptr
   return
  )
- (func $issues/1225/X#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $issues/1225/X#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0 offset=8
  )
- (func $issues/1225/X#get:normal (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1225/X#get:normal (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $issues/1225/X#get:viaThis (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1225/X#get:viaThis (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2311,7 +2311,7 @@
   i32.const 0
   drop
  )
- (func $start:issues/1225 (type $none_=>_none)
+ (func $start:issues/1225
   memory.size $0
   i32.const 16
   i32.shl
@@ -2361,7 +2361,7 @@
   global.set $issues/1225/x
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $issues/1225/x
   local.tee $1
@@ -2377,7 +2377,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2391,10 +2391,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $issues/1225/X
     block $~lib/arraybuffer/ArrayBufferView
@@ -2422,10 +2422,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/1225
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2438,7 +2438,7 @@
    unreachable
   end
  )
- (func $issues/1225/X#constructor (type $i32_i32_=>_i32) (param $this i32) (param $x i32) (result i32)
+ (func $issues/1225/X#constructor (param $this i32) (param $x i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2515,7 +2515,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $issues/1225/normal (type $none_=>_i32) (result i32)
+ (func $issues/1225/normal (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2540,7 +2540,7 @@
   local.get $0
   return
  )
- (func $issues/1225/viaThis (type $none_=>_i32) (result i32)
+ (func $issues/1225/viaThis (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/issues/1225.release.wat b/tests/compiler/issues/1225.release.wat
index bf9035828b..6710c4ed66 100644
--- a/tests/compiler/issues/1225.release.wat
+++ b/tests/compiler/issues/1225.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -37,7 +37,7 @@
  (export "viaThis" (func $issues/1225/viaThis))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $issues/1225/x
@@ -88,7 +88,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -220,7 +220,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -373,7 +373,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -619,7 +619,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -731,7 +731,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -810,7 +810,7 @@
   i32.const 34288
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1077,7 +1077,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1134,7 +1134,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1367,7 +1367,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $issues/1225/X
     block $~lib/arraybuffer/ArrayBufferView
@@ -1399,7 +1399,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1559,7 +1559,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $issues/1225/normal (type $none_=>_i32) (result i32)
+ (func $issues/1225/normal (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1594,7 +1594,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $issues/1225/viaThis (type $none_=>_i32) (result i32)
+ (func $issues/1225/viaThis (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1629,7 +1629,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/issues/1699.debug.wat b/tests/compiler/issues/1699.debug.wat
index da7a725c0e..b829f3a6a3 100644
--- a/tests/compiler/issues/1699.debug.wat
+++ b/tests/compiler/issues/1699.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -46,17 +46,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -66,11 +66,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -79,14 +79,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -128,7 +128,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -140,11 +140,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -154,7 +154,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -210,15 +210,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -244,7 +244,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -264,7 +264,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -284,7 +284,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -320,7 +320,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -346,7 +346,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -367,11 +367,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -382,39 +382,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -650,7 +650,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1014,7 +1014,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1179,7 +1179,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1324,7 +1324,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1362,7 +1362,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1375,7 +1375,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1392,7 +1392,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1417,7 +1417,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1597,7 +1597,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1655,7 +1655,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1676,7 +1676,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1692,7 +1692,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1900,7 +1900,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1990,7 +1990,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2099,7 +2099,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2163,7 +2163,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2176,17 +2176,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2239,7 +2239,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2307,7 +2307,7 @@
    end
   end
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2316,43 +2316,43 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $issues/1699/MultiAssignmentTest#set:test (type $i32_i32_=>_none) (param $this i32) (param $test i32)
+ (func $issues/1699/MultiAssignmentTest#set:test (param $this i32) (param $test i32)
   local.get $this
   local.get $test
   i32.store $0
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2398,11 +2398,11 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:issues/1699 (type $none_=>_none)
+ (func $start:issues/1699
   memory.size $0
   i32.const 16
   i32.shl
@@ -2422,7 +2422,7 @@
   global.set $~lib/rt/itcms/fromSpace
   call $issues/1699/test
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 320
   local.get $0
@@ -2437,7 +2437,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2451,14 +2451,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2466,7 +2466,7 @@
   local.get $1
   call $~lib/array/Array<issues/1699/MultiAssignmentTest>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<issues/1699/MultiAssignmentTest>
     block $issues/1699/MultiAssignmentTest
@@ -2500,10 +2500,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/1699
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2516,7 +2516,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -2654,7 +2654,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $issues/1699/MultiAssignmentTest#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/1699/MultiAssignmentTest#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2700,7 +2700,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -2819,7 +2819,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2892,7 +2892,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2959,7 +2959,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2984,7 +2984,7 @@
   local.get $1
   return
  )
- (func $issues/1699/test (type $none_=>_none)
+ (func $issues/1699/test
   (local $testinstances i32)
   (local $1 i32)
   (local $2 i32)
@@ -3148,7 +3148,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3218,7 +3218,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/issues/1699.release.wat b/tests/compiler/issues/1699.release.wat
index 01d3e5d427..d7ae3f434b 100644
--- a/tests/compiler/issues/1699.release.wat
+++ b/tests/compiler/issues/1699.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -40,7 +40,7 @@
  (data (i32.const 1712) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00\02A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1344
@@ -89,7 +89,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -221,7 +221,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -374,7 +374,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -620,7 +620,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -732,7 +732,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -811,7 +811,7 @@
   i32.const 34512
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1078,7 +1078,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1204,7 +1204,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1510,7 +1510,7 @@
   memory.fill $0
   local.get $1
  )
- (func $start:issues/1699 (type $none_=>_none)
+ (func $start:issues/1699
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1805,7 +1805,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1911,10 +1911,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/1699
  )
- (func $issues/1699/MultiAssignmentTest#constructor (type $none_=>_i32) (result i32)
+ (func $issues/1699/MultiAssignmentTest#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1988,7 +1988,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2193,7 +2193,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<issues/1699/MultiAssignmentTest>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2259,7 +2259,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -2278,7 +2278,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/issues/1714.debug.wat b/tests/compiler/issues/1714.debug.wat
index d006c98d68..513b23ad8e 100644
--- a/tests/compiler/issues/1714.debug.wat
+++ b/tests/compiler/issues/1714.debug.wat
@@ -1,10 +1,10 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -20,35 +20,35 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $issues/1714/a_i64_i32<i64,i32> (type $none_=>_i32) (result i32)
+ (func $issues/1714/a_i64_i32<i64,i32> (result i32)
   i32.const 8
   i32.const 4
   i32.eq
   return
  )
- (func $issues/1714/foo<i32,i64> (type $none_=>_i32) (result i32)
+ (func $issues/1714/foo<i32,i64> (result i32)
   call $issues/1714/a_i64_i32<i64,i32>
   i32.const 1
   i32.eq
   return
  )
- (func $issues/1714/bar<i32,f64> (type $none_=>_i32) (result i32)
+ (func $issues/1714/bar<i32,f64> (result i32)
   i32.const 0
   drop
   i32.const 80
   return
  )
- (func $issues/1714/bar<f64,i32> (type $none_=>_i32) (result i32)
+ (func $issues/1714/bar<f64,i32> (result i32)
   i32.const 1
   drop
   call $issues/1714/bar<i32,f64>
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -57,7 +57,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -161,10 +161,10 @@
   i32.const 0
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/1714
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -177,7 +177,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -273,7 +273,7 @@
   local.get $3
   return
  )
- (func $start:issues/1714 (type $none_=>_none)
+ (func $start:issues/1714
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
diff --git a/tests/compiler/issues/1714.release.wat b/tests/compiler/issues/1714.release.wat
index 6e5ba11c8b..e19fd8ecd3 100644
--- a/tests/compiler/issues/1714.release.wat
+++ b/tests/compiler/issues/1714.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33884))
  (memory $0 1)
@@ -10,7 +10,7 @@
  (data (i32.const 1096) "\02\00\00\00\06\00\00\00i\003\002")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
diff --git a/tests/compiler/issues/2166.debug.wat b/tests/compiler/issues/2166.debug.wat
index 98b2ab7339..160b90a427 100644
--- a/tests/compiler/issues/2166.debug.wat
+++ b/tests/compiler/issues/2166.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -48,17 +48,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -68,11 +68,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -81,14 +81,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -130,7 +130,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -142,11 +142,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -156,7 +156,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -212,15 +212,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -246,7 +246,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -266,7 +266,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -286,7 +286,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -322,7 +322,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -348,7 +348,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -369,11 +369,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -384,39 +384,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -652,7 +652,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1016,7 +1016,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1181,7 +1181,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1326,7 +1326,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1364,7 +1364,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1377,7 +1377,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1394,7 +1394,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1419,7 +1419,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1599,7 +1599,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1657,7 +1657,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1678,7 +1678,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1694,7 +1694,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1902,7 +1902,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1992,7 +1992,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2101,7 +2101,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2165,7 +2165,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2178,17 +2178,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2241,11 +2241,11 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2254,7 +2254,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2358,7 +2358,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2367,7 +2367,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2381,10 +2381,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $issues/2166/Test2166Ref2<i32>
     block $issues/2166/Test2166Ref1<~lib/string/String>
@@ -2415,10 +2415,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:issues/2166
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2431,7 +2431,7 @@
    unreachable
   end
  )
- (func $issues/2166/Test2166Ref1<~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/2166/Test2166Ref1<~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2469,7 +2469,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2565,7 +2565,7 @@
   local.get $3
   return
  )
- (func $issues/2166/Test2166Ref1<~lib/string/String>#fn<i32> (type $i32_i32_i32_=>_none) (param $this i32) (param $a1 i32) (param $a2 i32)
+ (func $issues/2166/Test2166Ref1<~lib/string/String>#fn<i32> (param $this i32) (param $a1 i32) (param $a2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2624,7 +2624,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $issues/2166/testfunc2166<i64> (type $none_=>_none)
+ (func $issues/2166/testfunc2166<i64>
   (local $a i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2662,7 +2662,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $issues/2166/Test2166Ref2<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/2166/Test2166Ref2<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2715,7 +2715,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $issues/2166/Test2166Ref2<i32>#bar<~lib/string/String> (type $i32_i32_=>_none) (param $this i32) (param $i i32)
+ (func $issues/2166/Test2166Ref2<i32>#bar<~lib/string/String> (param $this i32) (param $i i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2752,7 +2752,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:issues/2166 (type $none_=>_none)
+ (func $start:issues/2166
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2799,7 +2799,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/issues/2166.release.wat b/tests/compiler/issues/2166.release.wat
index 5af4dbcf6a..3574442304 100644
--- a/tests/compiler/issues/2166.release.wat
+++ b/tests/compiler/issues/2166.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -43,7 +43,7 @@
  (data (i32.const 1632) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -88,7 +88,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -220,7 +220,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -373,7 +373,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -619,7 +619,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -731,7 +731,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -810,7 +810,7 @@
   i32.const 34432
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1077,7 +1077,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1134,7 +1134,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1367,7 +1367,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $issues/2166/Test2166Ref2<i32>
     block $issues/2166/Test2166Ref1<~lib/string/String>
@@ -1402,7 +1402,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1680,7 +1680,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1840,7 +1840,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/issues/2322/index.debug.wat b/tests/compiler/issues/2322/index.debug.wat
index 157f19862c..5b6377505e 100644
--- a/tests/compiler/issues/2322/index.debug.wat
+++ b/tests/compiler/issues/2322/index.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,17 +42,17 @@
  (export "test" (func $issues/2322/index/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -62,11 +62,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -75,14 +75,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -124,7 +124,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -136,11 +136,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -150,7 +150,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -206,15 +206,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -240,7 +240,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -260,7 +260,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -280,7 +280,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -316,7 +316,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -342,7 +342,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -363,11 +363,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -378,39 +378,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -646,7 +646,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1010,7 +1010,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1175,7 +1175,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1320,7 +1320,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1358,7 +1358,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1371,7 +1371,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1388,7 +1388,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1413,7 +1413,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1593,7 +1593,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1651,7 +1651,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1672,7 +1672,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1688,7 +1688,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1896,7 +1896,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1986,7 +1986,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2095,7 +2095,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2159,7 +2159,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2172,17 +2172,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2235,15 +2235,15 @@
   local.get $ptr
   return
  )
- (func $issues/2322/lib/Wrapper<i32>#set:v (type $i32_i32_=>_none) (param $this i32) (param $v i32)
+ (func $issues/2322/lib/Wrapper<i32>#set:v (param $this i32) (param $v i32)
   local.get $this
   local.get $v
   i32.store $0
  )
- (func $issues/2322/lib/test<i32> (type $i32_=>_none) (param $t i32)
+ (func $issues/2322/lib/test<i32> (param $t i32)
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2252,7 +2252,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2266,10 +2266,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $issues/2322/lib/Wrapper<i32>
     block $~lib/arraybuffer/ArrayBufferView
@@ -2297,7 +2297,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -2316,7 +2316,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2329,7 +2329,7 @@
    unreachable
   end
  )
- (func $issues/2322/lib/Wrapper<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $issues/2322/lib/Wrapper<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2375,7 +2375,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $issues/2322/index/test (type $none_=>_none)
+ (func $issues/2322/index/test
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2398,7 +2398,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/issues/2322/index.release.wat b/tests/compiler/issues/2322/index.release.wat
index cf1bec8ba7..07d9bbf746 100644
--- a/tests/compiler/issues/2322/index.release.wat
+++ b/tests/compiler/issues/2322/index.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -33,7 +33,7 @@
  (export "test" (func $issues/2322/index/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -78,7 +78,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -210,7 +210,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -363,7 +363,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -609,7 +609,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -721,7 +721,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -800,7 +800,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1067,7 +1067,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1193,7 +1193,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1499,7 +1499,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $issues/2322/lib/Wrapper<i32>
     block $~lib/arraybuffer/ArrayBufferView
@@ -1531,7 +1531,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1565,7 +1565,7 @@
   i32.const 1344
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $issues/2322/index/test (type $none_=>_none)
+ (func $issues/2322/index/test
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1657,7 +1657,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/limits.debug.wat b/tests/compiler/limits.debug.wat
index 703c39b54c..b819f6aa76 100644
--- a/tests/compiler/limits.debug.wat
+++ b/tests/compiler/limits.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/builtins/i8.MIN_VALUE i32 (i32.const -128))
  (global $~lib/builtins/i8.MAX_VALUE i32 (i32.const 127))
  (global $~lib/builtins/i16.MIN_VALUE i32 (i32.const -32768))
@@ -34,7 +34,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:limits (type $none_=>_none)
+ (func $start:limits
   global.get $~lib/builtins/i8.MIN_VALUE
   drop
   global.get $~lib/builtins/i8.MAX_VALUE
@@ -88,7 +88,7 @@
   global.get $~lib/builtins/f64.MAX_SAFE_INTEGER
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:limits
  )
 )
diff --git a/tests/compiler/literals.debug.wat b/tests/compiler/literals.debug.wat
index a37230ce45..6326e5284c 100644
--- a/tests/compiler/literals.debug.wat
+++ b/tests/compiler/literals.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:literals (type $none_=>_none)
+ (func $start:literals
   i32.const 0
   drop
   i32.const 1
@@ -116,7 +116,7 @@
   f64.const -0
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:literals
  )
 )
diff --git a/tests/compiler/localinit.debug.wat b/tests/compiler/localinit.debug.wat
index 1c1137bad5..696a2303c3 100644
--- a/tests/compiler/localinit.debug.wat
+++ b/tests/compiler/localinit.debug.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
  (memory $0 0)
  (table $0 1 1 funcref)
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $localinit/initInIf (type $none_=>_none)
+ (func $localinit/initInIf
   (local $a i32)
   i32.const 1
   local.tee $a
@@ -18,7 +18,7 @@
   local.get $a
   drop
  )
- (func $localinit/initInIfElse (type $none_=>_none)
+ (func $localinit/initInIfElse
   (local $a i32)
   i32.const 1
   local.tee $a
@@ -30,7 +30,7 @@
   local.get $a
   drop
  )
- (func $localinit/initInIfAnd (type $i32_=>_none) (param $cond i32)
+ (func $localinit/initInIfAnd (param $cond i32)
   (local $a i32)
   (local $b i32)
   local.get $cond
@@ -53,7 +53,7 @@
    drop
   end
  )
- (func $localinit/initInIfOr (type $i32_=>_none) (param $cond i32)
+ (func $localinit/initInIfOr (param $cond i32)
   (local $a i32)
   (local $b i32)
   local.get $cond
@@ -77,7 +77,7 @@
   local.get $b
   drop
  )
- (func $localinit/initInDo (type $i32_=>_none) (param $cond i32)
+ (func $localinit/initInDo (param $cond i32)
   (local $a i32)
   loop $do-loop|0
    i32.const 1
@@ -88,7 +88,7 @@
   local.get $a
   drop
  )
- (func $localinit/initInWhile (type $none_=>_none)
+ (func $localinit/initInWhile
   (local $a i32)
   block $while-break|0
    loop $while-continue|0
@@ -104,7 +104,7 @@
   local.get $a
   drop
  )
- (func $localinit/initInWhileAnd (type $i32_=>_none) (param $cond i32)
+ (func $localinit/initInWhileAnd (param $cond i32)
   (local $a i32)
   loop $while-continue|0
    local.get $cond
@@ -121,7 +121,7 @@
    end
   end
  )
- (func $localinit/initInWhileOr (type $i32_=>_none) (param $cond i32)
+ (func $localinit/initInWhileOr (param $cond i32)
   (local $a i32)
   (local $b i32)
   loop $while-continue|0
@@ -147,7 +147,7 @@
   local.get $b
   drop
  )
- (func $start:localinit (type $none_=>_none)
+ (func $start:localinit
   call $localinit/initInIf
   call $localinit/initInIfElse
   i32.const 1
@@ -162,7 +162,7 @@
   i32.const 1
   call $localinit/initInWhileOr
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:localinit
  )
 )
diff --git a/tests/compiler/logical.debug.wat b/tests/compiler/logical.debug.wat
index 9c2b40df28..9aac698684 100644
--- a/tests/compiler/logical.debug.wat
+++ b/tests/compiler/logical.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $logical/i (mut i32) (i32.const 0))
  (global $logical/I (mut i64) (i64.const 0))
@@ -49,7 +49,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $logical/testShortcutAnd (type $i64_i32_=>_i32) (param $a i64) (param $b i32) (result i32)
+ (func $logical/testShortcutAnd (param $a i64) (param $b i32) (result i32)
   local.get $a
   i64.const 0
   i64.ne
@@ -60,7 +60,7 @@
   end
   return
  )
- (func $logical/testShortcutOr (type $i64_i32_=>_i32) (param $a i64) (param $b i32) (result i32)
+ (func $logical/testShortcutOr (param $a i64) (param $b i32) (result i32)
   local.get $a
   i64.const 0
   i64.ne
@@ -71,17 +71,17 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -91,11 +91,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -104,14 +104,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -153,7 +153,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -165,11 +165,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -179,7 +179,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -235,15 +235,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -269,7 +269,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -289,7 +289,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -309,7 +309,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -345,7 +345,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -371,7 +371,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -392,11 +392,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -407,39 +407,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -675,7 +675,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1039,7 +1039,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1204,7 +1204,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1349,7 +1349,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1387,7 +1387,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1400,7 +1400,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1417,7 +1417,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1442,7 +1442,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1622,7 +1622,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1680,7 +1680,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1701,7 +1701,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1717,7 +1717,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1925,7 +1925,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2015,7 +2015,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2124,7 +2124,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2188,7 +2188,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2201,17 +2201,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2264,7 +2264,7 @@
   local.get $ptr
   return
  )
- (func $logical/testContextualBoolAnd (type $i32_i32_=>_i32) (param $someObj i32) (param $someInt i32) (result i32)
+ (func $logical/testContextualBoolAnd (param $someObj i32) (param $someInt i32) (result i32)
   local.get $someObj
   if (result i32)
    local.get $someInt
@@ -2273,7 +2273,7 @@
   end
   return
  )
- (func $logical/testContextualBoolOr (type $i32_i32_=>_i32) (param $someObj i32) (param $someInt i32) (result i32)
+ (func $logical/testContextualBoolOr (param $someObj i32) (param $someInt i32) (result i32)
   local.get $someObj
   if (result i32)
    i32.const 1
@@ -2282,7 +2282,7 @@
   end
   return
  )
- (func $logical/commonOr (type $i32_=>_i32) (param $b i32) (result i32)
+ (func $logical/commonOr (param $b i32) (result i32)
   local.get $b
   if (result i32)
    local.get $b
@@ -2291,7 +2291,7 @@
   end
   return
  )
- (func $logical/commonAnd (type $i32_=>_i32) (param $b i32) (result i32)
+ (func $logical/commonAnd (param $b i32) (result i32)
   local.get $b
   if (result i32)
    global.get $logical/c
@@ -2300,7 +2300,7 @@
   end
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $logical/b
   local.tee $1
@@ -2323,7 +2323,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2337,10 +2337,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $logical/C
     block $logical/A
@@ -2377,10 +2377,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:logical
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2393,7 +2393,7 @@
    unreachable
   end
  )
- (func $logical/Obj#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $logical/Obj#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2431,7 +2431,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $logical/A#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $logical/A#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2469,7 +2469,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $logical/B#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $logical/B#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2507,7 +2507,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $logical/C#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $logical/C#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2545,7 +2545,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:logical (type $none_=>_none)
+ (func $start:logical
   (local $0 f32)
   (local $1 f32)
   (local $2 f64)
@@ -3163,7 +3163,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/logical.release.wat b/tests/compiler/logical.release.wat
index 704df6e73f..d9637c4f0e 100644
--- a/tests/compiler/logical.release.wat
+++ b/tests/compiler/logical.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -36,7 +36,7 @@
  (data (i32.const 1488) "\08\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $logical/b
@@ -93,7 +93,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -225,7 +225,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -378,7 +378,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -624,7 +624,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -736,7 +736,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -815,7 +815,7 @@
   i32.const 34304
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1082,7 +1082,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1139,7 +1139,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1372,7 +1372,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $logical/C
     block $logical/A
@@ -1413,7 +1413,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   block $__inlined_func$start:logical
@@ -1606,7 +1606,7 @@
    unreachable
   end
  )
- (func $logical/Obj#constructor (type $none_=>_i32) (result i32)
+ (func $logical/Obj#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1648,7 +1648,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $logical/A#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $logical/A#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1692,7 +1692,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -1726,7 +1726,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/loop-flow.debug.wat b/tests/compiler/loop-flow.debug.wat
index e5aa933eaf..acb6443720 100644
--- a/tests/compiler/loop-flow.debug.wat
+++ b/tests/compiler/loop-flow.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 92))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32860))
@@ -25,7 +25,7 @@
  (export "doAny" (func $loop-flow/doAny))
  (export "memory" (memory $0))
  (start $~start)
- (func $loop-flow/whileReturn (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileReturn (result i32)
   loop $while-continue|0
    i32.const 1
    if
@@ -35,7 +35,7 @@
   end
   unreachable
  )
- (func $loop-flow/whileAny (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $loop-flow/whileAny (param $a i32) (result i32)
   loop $while-continue|0
    i32.const 1
    if
@@ -66,7 +66,7 @@
   end
   unreachable
  )
- (func $loop-flow/forReturn (type $none_=>_i32) (result i32)
+ (func $loop-flow/forReturn (result i32)
   i32.const 1
   if
    i32.const 1
@@ -74,7 +74,7 @@
   end
   unreachable
  )
- (func $loop-flow/forAny (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $loop-flow/forAny (param $a i32) (result i32)
   loop $for-loop|0
    i32.const 1
    if
@@ -108,14 +108,14 @@
   end
   unreachable
  )
- (func $loop-flow/doReturn (type $none_=>_i32) (result i32)
+ (func $loop-flow/doReturn (result i32)
   loop $do-loop|0
    i32.const 1
    return
   end
   unreachable
  )
- (func $loop-flow/doAny (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $loop-flow/doAny (param $a i32) (result i32)
   loop $do-loop|0
    block $do-continue|0
     local.get $a
@@ -147,7 +147,7 @@
   end
   unreachable
  )
- (func $start:loop-flow (type $none_=>_none)
+ (func $start:loop-flow
   call $loop-flow/whileReturn
   i32.const 1
   i32.eq
@@ -224,7 +224,7 @@
    unreachable
   end
  )
- (func $loop-flow/whileThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileThrow (result i32)
   loop $while-continue|0
    i32.const 1
    if
@@ -238,7 +238,7 @@
   end
   unreachable
  )
- (func $loop-flow/whileContinue (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileContinue (result i32)
   loop $while-continue|0
    i32.const 1
    if
@@ -247,7 +247,7 @@
   end
   unreachable
  )
- (func $loop-flow/forThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/forThrow (result i32)
   i32.const 1
   if
    i32.const 80
@@ -259,7 +259,7 @@
   end
   unreachable
  )
- (func $loop-flow/forContinue (type $none_=>_i32) (result i32)
+ (func $loop-flow/forContinue (result i32)
   loop $for-loop|0
    i32.const 1
    if
@@ -271,7 +271,7 @@
   end
   unreachable
  )
- (func $loop-flow/doThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/doThrow (result i32)
   loop $do-loop|0
    i32.const 80
    i32.const 32
@@ -282,7 +282,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:loop-flow
  )
 )
diff --git a/tests/compiler/loop-flow.release.wat b/tests/compiler/loop-flow.release.wat
index e778c24583..39a59dc27f 100644
--- a/tests/compiler/loop-flow.release.wat
+++ b/tests/compiler/loop-flow.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 1036) ",")
@@ -22,10 +22,10 @@
  (export "doAny" (func $loop-flow/doAny))
  (export "memory" (memory $0))
  (start $~start)
- (func $loop-flow/whileReturn (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileReturn (result i32)
   i32.const 1
  )
- (func $loop-flow/whileAny (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $loop-flow/whileAny (param $0 i32) (result i32)
   loop $while-continue|0
    local.get $0
    i32.const 1
@@ -49,7 +49,7 @@
   end
   i32.const 1
  )
- (func $loop-flow/forAny (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $loop-flow/forAny (param $0 i32) (result i32)
   loop $for-loop|0
    local.get $0
    i32.const 1
@@ -71,7 +71,7 @@
   end
   i32.const 1
  )
- (func $loop-flow/doAny (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $loop-flow/doAny (param $0 i32) (result i32)
   loop $do-loop|0 (result i32)
    local.get $0
    i32.const 1
@@ -94,7 +94,7 @@
    end
   end
  )
- (func $loop-flow/whileThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileThrow (result i32)
   i32.const 1104
   i32.const 1056
   i32.const 11
@@ -102,13 +102,13 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $loop-flow/whileContinue (type $none_=>_i32) (result i32)
+ (func $loop-flow/whileContinue (result i32)
   loop $while-continue|0
    br $while-continue|0
   end
   unreachable
  )
- (func $loop-flow/forThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/forThrow (result i32)
   i32.const 1104
   i32.const 1056
   i32.const 41
@@ -116,7 +116,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $loop-flow/doThrow (type $none_=>_i32) (result i32)
+ (func $loop-flow/doThrow (result i32)
   i32.const 1104
   i32.const 1056
   i32.const 71
@@ -124,7 +124,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 1
   call $loop-flow/whileAny
   drop
diff --git a/tests/compiler/loop-wrap.debug.wat b/tests/compiler/loop-wrap.debug.wat
index c89fa3466f..6c3a031d0a 100644
--- a/tests/compiler/loop-wrap.debug.wat
+++ b/tests/compiler/loop-wrap.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -11,7 +11,7 @@
  (export "testFirstWrapped" (func $loop-wrap/testFirstWrapped))
  (export "testSubsequentWrapped" (func $loop-wrap/testSubsequentWrapped))
  (export "memory" (memory $0))
- (func $loop-wrap/testAlwaysWrapped (type $none_=>_none)
+ (func $loop-wrap/testAlwaysWrapped
   (local $i i32)
   i32.const 0
   local.set $i
@@ -33,7 +33,7 @@
    end
   end
  )
- (func $loop-wrap/testFirstWrapped (type $none_=>_none)
+ (func $loop-wrap/testFirstWrapped
   (local $i i32)
   i32.const 0
   local.set $i
@@ -57,7 +57,7 @@
    end
   end
  )
- (func $loop-wrap/testSubsequentWrapped (type $i32_=>_none) (param $a i32)
+ (func $loop-wrap/testSubsequentWrapped (param $a i32)
   (local $i i32)
   local.get $a
   local.set $i
diff --git a/tests/compiler/loop-wrap.release.wat b/tests/compiler/loop-wrap.release.wat
index e9a9f1b40e..e85fe6c485 100644
--- a/tests/compiler/loop-wrap.release.wat
+++ b/tests/compiler/loop-wrap.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
  (memory $0 0)
  (export "testAlwaysWrapped" (func $loop-wrap/testAlwaysWrapped))
  (export "testFirstWrapped" (func $loop-wrap/testFirstWrapped))
  (export "testSubsequentWrapped" (func $loop-wrap/testSubsequentWrapped))
  (export "memory" (memory $0))
- (func $loop-wrap/testAlwaysWrapped (type $none_=>_none)
+ (func $loop-wrap/testAlwaysWrapped
   (local $0 i32)
   loop $do-loop|0
    local.get $0
@@ -23,7 +23,7 @@
    end
   end
  )
- (func $loop-wrap/testFirstWrapped (type $none_=>_none)
+ (func $loop-wrap/testFirstWrapped
   (local $0 i32)
   loop $do-loop|1
    local.get $0
@@ -42,7 +42,7 @@
    end
   end
  )
- (func $loop-wrap/testSubsequentWrapped (type $i32_=>_none) (param $0 i32)
+ (func $loop-wrap/testSubsequentWrapped (param $0 i32)
   loop $do-loop|0
    local.get $0
    i32.const 255
diff --git a/tests/compiler/managed-cast.debug.wat b/tests/compiler/managed-cast.debug.wat
index e1f204969c..47e07645a7 100644
--- a/tests/compiler/managed-cast.debug.wat
+++ b/tests/compiler/managed-cast.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,17 +44,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -64,11 +64,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -77,14 +77,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -126,7 +126,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -138,11 +138,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -152,7 +152,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -208,15 +208,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -242,7 +242,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -262,7 +262,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -282,7 +282,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -318,7 +318,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -344,7 +344,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -365,11 +365,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -380,39 +380,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -648,7 +648,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1012,7 +1012,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1177,7 +1177,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1322,7 +1322,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1360,7 +1360,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1373,7 +1373,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1390,7 +1390,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1415,7 +1415,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1595,7 +1595,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1653,7 +1653,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1674,7 +1674,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1690,7 +1690,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1898,7 +1898,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1988,7 +1988,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2097,7 +2097,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2161,7 +2161,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2174,17 +2174,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2237,13 +2237,13 @@
   local.get $ptr
   return
  )
- (func $managed-cast/Animal#tame (type $i32_=>_none) (param $this i32)
+ (func $managed-cast/Animal#tame (param $this i32)
   nop
  )
- (func $managed-cast/Cat#meow (type $i32_=>_none) (param $this i32)
+ (func $managed-cast/Cat#meow (param $this i32)
   nop
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2289,7 +2289,7 @@
   i32.const 0
   drop
  )
- (func $~instanceof|managed-cast/Cat (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|managed-cast/Cat (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -2306,7 +2306,7 @@
   end
   i32.const 1
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2315,7 +2315,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2329,10 +2329,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $managed-cast/Animal
     block $managed-cast/Cat
@@ -2363,10 +2363,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:managed-cast
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2379,7 +2379,7 @@
    unreachable
   end
  )
- (func $managed-cast/Animal#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $managed-cast/Animal#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2417,7 +2417,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $managed-cast/Cat#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $managed-cast/Cat#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2455,7 +2455,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $managed-cast/testUpcast (type $i32_=>_none) (param $cat i32)
+ (func $managed-cast/testUpcast (param $cat i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2477,7 +2477,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testUpcastFromNullable (type $i32_=>_none) (param $cat i32)
+ (func $managed-cast/testUpcastFromNullable (param $cat i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2514,7 +2514,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testUpcastToNullable (type $i32_=>_none) (param $cat i32)
+ (func $managed-cast/testUpcastToNullable (param $cat i32)
   (local $maybeAnimal i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2544,7 +2544,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testUpcastFromToNullable (type $i32_=>_none) (param $cat i32)
+ (func $managed-cast/testUpcastFromToNullable (param $cat i32)
   (local $maybeAnimal i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2574,7 +2574,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testDowncast (type $i32_=>_none) (param $animal i32)
+ (func $managed-cast/testDowncast (param $animal i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2612,7 +2612,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testDowncastFromNullable (type $i32_=>_none) (param $animal i32)
+ (func $managed-cast/testDowncastFromNullable (param $animal i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2668,7 +2668,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testDowncastToNullable (type $i32_=>_none) (param $animal i32)
+ (func $managed-cast/testDowncastToNullable (param $animal i32)
   (local $1 i32)
   (local $maybeCat i32)
   (local $3 i32)
@@ -2717,7 +2717,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $managed-cast/testDowncastFromToNullable (type $i32_=>_none) (param $animal i32)
+ (func $managed-cast/testDowncastFromToNullable (param $animal i32)
   (local $1 i32)
   (local $maybeCat i32)
   (local $3 i32)
@@ -2772,7 +2772,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:managed-cast (type $none_=>_none)
+ (func $start:managed-cast
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2871,7 +2871,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/managed-cast.release.wat b/tests/compiler/managed-cast.release.wat
index 1d6395db23..738dbb16bb 100644
--- a/tests/compiler/managed-cast.release.wat
+++ b/tests/compiler/managed-cast.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -38,7 +38,7 @@
  (data (i32.const 1696) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -83,7 +83,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -215,7 +215,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -368,7 +368,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -614,7 +614,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -726,7 +726,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -805,7 +805,7 @@
   i32.const 34496
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1072,7 +1072,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1129,7 +1129,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1362,7 +1362,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $managed-cast/Animal
     block $managed-cast/Cat
@@ -1397,7 +1397,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1795,7 +1795,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $managed-cast/Cat#constructor (type $none_=>_i32) (result i32)
+ (func $managed-cast/Cat#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1893,7 +1893,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $managed-cast/testUpcastToNullable (type $i32_=>_none) (param $0 i32)
+ (func $managed-cast/testUpcastToNullable (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1928,7 +1928,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/many-locals.debug.wat b/tests/compiler/many-locals.debug.wat
index d7a44bfb9c..c5cb424338 100644
--- a/tests/compiler/many-locals.debug.wat
+++ b/tests/compiler/many-locals.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 60))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
@@ -14,7 +14,7 @@
  (export "testI8" (func $many-locals/testI8))
  (export "memory" (memory $0))
  (start $~start)
- (func $many-locals/testI32 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $many-locals/testI32 (param $a i32) (result i32)
   (local $a00 i32)
   (local $a01 i32)
   (local $a02 i32)
@@ -402,7 +402,7 @@
   local.get $a7F
   return
  )
- (func $many-locals/testI8 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $many-locals/testI8 (param $a i32) (result i32)
   (local $a00 i32)
   (local $a01 i32)
   (local $a02 i32)
@@ -791,7 +791,7 @@
   i32.extend8_s
   return
  )
- (func $start:many-locals (type $none_=>_none)
+ (func $start:many-locals
   i32.const 42
   call $many-locals/testI32
   i32.const 42
@@ -819,7 +819,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:many-locals
  )
 )
diff --git a/tests/compiler/many-locals.release.wat b/tests/compiler/many-locals.release.wat
index 07f0c36f40..82e02eccf8 100644
--- a/tests/compiler/many-locals.release.wat
+++ b/tests/compiler/many-locals.release.wat
@@ -1,15 +1,15 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 1)
  (data (i32.const 1036) ",")
  (data (i32.const 1048) "\02\00\00\00\1c\00\00\00m\00a\00n\00y\00-\00l\00o\00c\00a\00l\00s\00.\00t\00s")
  (export "testI32" (func $many-locals/testI32))
  (export "testI8" (func $many-locals/testI8))
  (export "memory" (memory $0))
- (func $many-locals/testI32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $many-locals/testI32 (param $0 i32) (result i32)
   local.get $0
  )
- (func $many-locals/testI8 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $many-locals/testI8 (param $0 i32) (result i32)
   local.get $0
   i32.extend8_s
  )
diff --git a/tests/compiler/memcpy.debug.wat b/tests/compiler/memcpy.debug.wat
index 6391a363e0..c29e5acf92 100644
--- a/tests/compiler/memcpy.debug.wat
+++ b/tests/compiler/memcpy.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memcpy/base i32 (i32.const 8))
  (global $memcpy/dest (mut i32) (i32.const 0))
@@ -15,7 +15,7 @@
  (export "memcpy" (func $memcpy/memcpy))
  (export "memory" (memory $0))
  (start $~start)
- (func $memcpy/memcpy (type $i32_i32_i32_=>_i32) (param $dest i32) (param $src i32) (param $n i32) (result i32)
+ (func $memcpy/memcpy (param $dest i32) (param $src i32) (param $n i32) (result i32)
   (local $ret i32)
   (local $w i32)
   (local $x i32)
@@ -1112,7 +1112,7 @@
   local.get $ret
   return
  )
- (func $start:memcpy (type $none_=>_none)
+ (func $start:memcpy
   global.get $memcpy/base
   i64.const 1229782938247303441
   i64.store $0
@@ -1332,7 +1332,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memcpy
  )
 )
diff --git a/tests/compiler/memcpy.release.wat b/tests/compiler/memcpy.release.wat
index a317f8b5c5..1c4a88796a 100644
--- a/tests/compiler/memcpy.release.wat
+++ b/tests/compiler/memcpy.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memcpy/dest (mut i32) (i32.const 0))
  (memory $0 1)
@@ -10,7 +10,7 @@
  (export "memcpy" (func $memcpy/memcpy))
  (export "memory" (memory $0))
  (start $~start)
- (func $memcpy/memcpy (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $memcpy/memcpy (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -697,7 +697,7 @@
   end
   local.get $5
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 8
   i64.const 1229782938247303441
   i64.store $0
diff --git a/tests/compiler/memmove.debug.wat b/tests/compiler/memmove.debug.wat
index 1ba594c44b..cb89131c44 100644
--- a/tests/compiler/memmove.debug.wat
+++ b/tests/compiler/memmove.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memmove/base i32 (i32.const 8))
  (global $memmove/dest (mut i32) (i32.const 0))
@@ -14,7 +14,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $memmove/memmove (type $i32_i32_i32_=>_i32) (param $dest i32) (param $src i32) (param $n i32) (result i32)
+ (func $memmove/memmove (param $dest i32) (param $src i32) (param $n i32) (result i32)
   (local $ret i32)
   (local $4 i32)
   (local $5 i32)
@@ -200,7 +200,7 @@
   local.get $ret
   return
  )
- (func $start:memmove (type $none_=>_none)
+ (func $start:memmove
   global.get $memmove/base
   i64.const 1229782938247303441
   i64.store $0
@@ -420,7 +420,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memmove
  )
 )
diff --git a/tests/compiler/memmove.release.wat b/tests/compiler/memmove.release.wat
index 2caf9c5831..dabab294a2 100644
--- a/tests/compiler/memmove.release.wat
+++ b/tests/compiler/memmove.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memmove/dest (mut i32) (i32.const 0))
  (memory $0 1)
@@ -9,7 +9,7 @@
  (data (i32.const 1048) "\02\00\00\00\14\00\00\00m\00e\00m\00m\00o\00v\00e\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $memmove/memmove (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $memmove/memmove (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -191,7 +191,7 @@
   end
   local.get $5
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 8
   i64.const 1229782938247303441
   i64.store $0
diff --git a/tests/compiler/memory.debug.wat b/tests/compiler/memory.debug.wat
index c36330b530..55928f8f80 100644
--- a/tests/compiler/memory.debug.wat
+++ b/tests/compiler/memory.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memory/ptr (mut i32) (i32.const 80))
  (global $~lib/memory/__data_end i32 (i32.const 212))
@@ -37,7 +37,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $memory/test (type $none_=>_i32) (result i32)
+ (func $memory/test (result i32)
   (local $value i32)
   i32.const 16
   i32.load $0
@@ -50,27 +50,27 @@
   local.get $value
   return
  )
- (func $memory/testGeneric<v128> (type $none_=>_i32) (result i32)
+ (func $memory/testGeneric<v128> (result i32)
   i32.const 144
   return
  )
- (func $memory/testGeneric<i64> (type $none_=>_i32) (result i32)
+ (func $memory/testGeneric<i64> (result i32)
   i32.const 152
   return
  )
- (func $memory/testGeneric<i32> (type $none_=>_i32) (result i32)
+ (func $memory/testGeneric<i32> (result i32)
   i32.const 156
   return
  )
- (func $memory/testGeneric<i16> (type $none_=>_i32) (result i32)
+ (func $memory/testGeneric<i16> (result i32)
   i32.const 158
   return
  )
- (func $memory/testGeneric<i8> (type $none_=>_i32) (result i32)
+ (func $memory/testGeneric<i8> (result i32)
   i32.const 159
   return
  )
- (func $start:memory (type $none_=>_none)
+ (func $start:memory
   call $memory/test
   i32.const 0
   i32.eq
@@ -476,7 +476,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memory
  )
 )
diff --git a/tests/compiler/memory.release.wat b/tests/compiler/memory.release.wat
index c0ea18ba5e..b7b5040455 100644
--- a/tests/compiler/memory.release.wat
+++ b/tests/compiler/memory.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memory/ptr (mut i32) (i32.const 1088))
  (memory $0 1)
@@ -16,7 +16,7 @@
  (data (i32.const 1216) "\01")
  (export "memory" (memory $0))
  (start $~start)
- (func $start:memory (type $none_=>_none)
+ (func $start:memory
   (local $0 i32)
   i32.const 1024
   i32.const 1024
@@ -267,7 +267,7 @@
   i32.const 1215
   global.set $memory/ptr
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memory
  )
 )
diff --git a/tests/compiler/memorybase.debug.wat b/tests/compiler/memorybase.debug.wat
index bf706875cc..93acb9eed9 100644
--- a/tests/compiler/memorybase.debug.wat
+++ b/tests/compiler/memorybase.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $memorybase/staticData i32 (i32.const 1024))
  (global $~lib/native/ASC_MEMORY_BASE i32 (i32.const 1024))
  (global $~lib/memory/__data_end i32 (i32.const 1028))
@@ -11,7 +11,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:memorybase (type $none_=>_none)
+ (func $start:memorybase
   i32.const 1024
   i32.const 1024
   i32.eq
@@ -21,7 +21,7 @@
   i32.eq
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memorybase
  )
 )
diff --git a/tests/compiler/memset.debug.wat b/tests/compiler/memset.debug.wat
index 7277b5d2da..9c7d5f27f6 100644
--- a/tests/compiler/memset.debug.wat
+++ b/tests/compiler/memset.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memset/dest (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 60))
@@ -13,7 +13,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $memset/memset (type $i32_i32_i32_=>_i32) (param $dest i32) (param $c i32) (param $n i32) (result i32)
+ (func $memset/memset (param $dest i32) (param $c i32) (param $n i32) (result i32)
   (local $ret i32)
   (local $k i32)
   (local $c32 i32)
@@ -274,7 +274,7 @@
   local.get $ret
   return
  )
- (func $start:memset (type $none_=>_none)
+ (func $start:memset
   global.get $~lib/memory/__heap_base
   global.set $memset/dest
   global.get $memset/dest
@@ -376,7 +376,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:memset
  )
 )
diff --git a/tests/compiler/memset.release.wat b/tests/compiler/memset.release.wat
index c4e23a6ca1..2169635dae 100644
--- a/tests/compiler/memset.release.wat
+++ b/tests/compiler/memset.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $memset/dest (mut i32) (i32.const 0))
  (memory $0 1)
@@ -9,7 +9,7 @@
  (data (i32.const 1048) "\02\00\00\00\12\00\00\00m\00e\00m\00s\00e\00t\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $memset/memset (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $memset/memset (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i64)
   (local $4 i32)
   block $folding-inner0
@@ -208,7 +208,7 @@
    end
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 33852
   global.set $memset/dest
   i32.const 33852
diff --git a/tests/compiler/merge.debug.wat b/tests/compiler/merge.debug.wat
index d2a9b5e271..66e02d5fc6 100644
--- a/tests/compiler/merge.debug.wat
+++ b/tests/compiler/merge.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $merge/globalType i32 (i32.const 2))
  (global $merge/globalType_test (mut i32) (i32.const 0))
  (global $merge/typeGlobal i32 (i32.const 3))
@@ -18,55 +18,55 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $merge/namespaceType.test (type $none_=>_none)
+ (func $merge/namespaceType.test
   nop
  )
- (func $merge/typeNamespace.test (type $none_=>_none)
+ (func $merge/typeNamespace.test
   nop
  )
- (func $merge/functionType (type $none_=>_none)
+ (func $merge/functionType
   nop
  )
- (func $merge/typeFunction (type $none_=>_none)
+ (func $merge/typeFunction
   nop
  )
- (func $merge/classNamespace.test1 (type $none_=>_none)
+ (func $merge/classNamespace.test1
   nop
  )
- (func $merge/classNamespace.test2 (type $none_=>_none)
+ (func $merge/classNamespace.test2
   nop
  )
- (func $merge/namespaceClass.test1 (type $none_=>_none)
+ (func $merge/namespaceClass.test1
   nop
  )
- (func $merge/namespaceClass.test2 (type $none_=>_none)
+ (func $merge/namespaceClass.test2
   nop
  )
- (func $merge/functionNamespace (type $none_=>_none)
+ (func $merge/functionNamespace
   nop
  )
- (func $merge/functionNamespace.test (type $none_=>_none)
+ (func $merge/functionNamespace.test
   nop
  )
- (func $merge/namespaceFunction.test (type $none_=>_none)
+ (func $merge/namespaceFunction.test
   nop
  )
- (func $merge/namespaceFunction (type $none_=>_none)
+ (func $merge/namespaceFunction
   nop
  )
- (func $merge/enumNamespace.test (type $none_=>_none)
+ (func $merge/enumNamespace.test
   nop
  )
- (func $merge/namespaceEnum.test (type $none_=>_none)
+ (func $merge/namespaceEnum.test
   nop
  )
- (func $merge/namespaceNamespace.test1 (type $none_=>_none)
+ (func $merge/namespaceNamespace.test1
   nop
  )
- (func $merge/namespaceNamespace.test2 (type $none_=>_none)
+ (func $merge/namespaceNamespace.test2
   nop
  )
- (func $start:merge (type $none_=>_none)
+ (func $start:merge
   global.get $merge/globalType
   drop
   global.get $merge/typeGlobal
@@ -92,7 +92,7 @@
   call $merge/namespaceNamespace.test1
   call $merge/namespaceNamespace.test2
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:merge
  )
 )
diff --git a/tests/compiler/mutable-globals.debug.wat b/tests/compiler/mutable-globals.debug.wat
index 1498441d0e..c132e0f781 100644
--- a/tests/compiler/mutable-globals.debug.wat
+++ b/tests/compiler/mutable-globals.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "mutable-globals" "external" (global $mutable-globals/external (mut i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $mutable-globals/internal (mut i32) (i32.const 124))
@@ -16,7 +16,7 @@
  (export "internal" (global $mutable-globals/internal))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $start:mutable-globals (type $none_=>_none)
+ (func $start:mutable-globals
   global.get $mutable-globals/external
   i32.const 123
   i32.eq
@@ -74,7 +74,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
diff --git a/tests/compiler/mutable-globals.release.wat b/tests/compiler/mutable-globals.release.wat
index d0063f01da..c3d1fcb695 100644
--- a/tests/compiler/mutable-globals.release.wat
+++ b/tests/compiler/mutable-globals.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "mutable-globals" "external" (global $mutable-globals/external (mut i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $mutable-globals/internal (mut i32) (i32.const 124))
@@ -12,7 +12,7 @@
  (export "internal" (global $mutable-globals/internal))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
diff --git a/tests/compiler/named-export-default.debug.wat b/tests/compiler/named-export-default.debug.wat
index a8e8046165..617b06c55d 100644
--- a/tests/compiler/named-export-default.debug.wat
+++ b/tests/compiler/named-export-default.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "default" (func $named-export-default/get3))
  (export "memory" (memory $0))
- (func $named-export-default/get3 (type $none_=>_i32) (result i32)
+ (func $named-export-default/get3 (result i32)
   i32.const 3
   return
  )
diff --git a/tests/compiler/named-export-default.release.wat b/tests/compiler/named-export-default.release.wat
index 5e8332e6a3..0babf0c7dd 100644
--- a/tests/compiler/named-export-default.release.wat
+++ b/tests/compiler/named-export-default.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
  (export "default" (func $named-export-default/get3))
  (export "memory" (memory $0))
- (func $named-export-default/get3 (type $none_=>_i32) (result i32)
+ (func $named-export-default/get3 (result i32)
   i32.const 3
  )
 )
diff --git a/tests/compiler/named-import-default.debug.wat b/tests/compiler/named-import-default.debug.wat
index ff44e8bf48..7eff3a0f07 100644
--- a/tests/compiler/named-import-default.debug.wat
+++ b/tests/compiler/named-import-default.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,11 +8,11 @@
  (elem $0 (i32.const 1))
  (export "getValue" (func $named-import-default/getValue))
  (export "memory" (memory $0))
- (func $named-export-default/get3 (type $none_=>_i32) (result i32)
+ (func $named-export-default/get3 (result i32)
   i32.const 3
   return
  )
- (func $named-import-default/getValue (type $none_=>_i32) (result i32)
+ (func $named-import-default/getValue (result i32)
   call $named-export-default/get3
   return
  )
diff --git a/tests/compiler/named-import-default.release.wat b/tests/compiler/named-import-default.release.wat
index 406663a935..ad71b71467 100644
--- a/tests/compiler/named-import-default.release.wat
+++ b/tests/compiler/named-import-default.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
  (memory $0 0)
  (export "getValue" (func $named-import-default/getValue))
  (export "memory" (memory $0))
- (func $named-import-default/getValue (type $none_=>_i32) (result i32)
+ (func $named-import-default/getValue (result i32)
   i32.const 3
  )
 )
diff --git a/tests/compiler/namespace.debug.wat b/tests/compiler/namespace.debug.wat
index 33508a9876..bba809b5b7 100644
--- a/tests/compiler/namespace.debug.wat
+++ b/tests/compiler/namespace.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
  (global $namespace/Outer.outerVar (mut i32) (i32.const 1))
  (global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
  (global $namespace/Outer.Inner.anotherVar (mut i32) (i32.const 0))
@@ -15,15 +15,15 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $namespace/Outer.Inner.aFunc (type $none_=>_i32) (result i32)
+ (func $namespace/Outer.Inner.aFunc (result i32)
   global.get $namespace/Outer.Inner.aVar
   return
  )
- (func $namespace/Joined.anotherFunc (type $none_=>_i32) (result i32)
+ (func $namespace/Joined.anotherFunc (result i32)
   i32.const 3
   return
  )
- (func $start:namespace (type $none_=>_none)
+ (func $start:namespace
   global.get $namespace/Outer.Inner.aVar
   global.set $namespace/Outer.Inner.anotherVar
   global.get $namespace/Outer.outerVar
@@ -39,7 +39,7 @@
   call $namespace/Joined.anotherFunc
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:namespace
  )
 )
diff --git a/tests/compiler/new.debug.wat b/tests/compiler/new.debug.wat
index 992422320c..92d050d2b1 100644
--- a/tests/compiler/new.debug.wat
+++ b/tests/compiler/new.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $new/ref (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -47,17 +47,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -67,11 +67,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -80,14 +80,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -129,7 +129,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -141,11 +141,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -155,7 +155,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -211,15 +211,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -245,7 +245,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -265,7 +265,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -285,7 +285,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -321,7 +321,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -347,7 +347,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -368,11 +368,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -383,39 +383,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -651,7 +651,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1015,7 +1015,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1180,7 +1180,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1325,7 +1325,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1363,7 +1363,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1376,7 +1376,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1393,7 +1393,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1418,7 +1418,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1598,7 +1598,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1656,7 +1656,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1677,7 +1677,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1693,7 +1693,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1901,7 +1901,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1991,7 +1991,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2100,7 +2100,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2164,7 +2164,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2177,17 +2177,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2240,19 +2240,19 @@
   local.get $ptr
   return
  )
- (func $new/Ref#get:ref (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/Ref#get:ref (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $new/Gen<i32>#get:gen (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/Gen<i32>#get:gen (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $new/ns.Ref#get:ref (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/ns.Ref#get:ref (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $new/ref
   local.tee $1
@@ -2303,7 +2303,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2317,10 +2317,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $new/GenExt
     block $new/ns.Ref
@@ -2357,10 +2357,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:new
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2373,7 +2373,7 @@
    unreachable
   end
  )
- (func $new/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2411,7 +2411,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $new/Gen<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/Gen<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2449,7 +2449,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $new/ns.Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/ns.Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2487,7 +2487,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $new/GenExt#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $new/GenExt#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2525,7 +2525,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:new (type $none_=>_none)
+ (func $start:new
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2611,7 +2611,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/new.release.wat b/tests/compiler/new.release.wat
index 44b65e620d..94d2c8c2da 100644
--- a/tests/compiler/new.release.wat
+++ b/tests/compiler/new.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $new/ref (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -38,7 +38,7 @@
  (data (i32.const 1440) "\08\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $new/ref
@@ -119,7 +119,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -251,7 +251,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -404,7 +404,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -650,7 +650,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -762,7 +762,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -841,7 +841,7 @@
   i32.const 34256
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1108,7 +1108,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1165,7 +1165,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1398,7 +1398,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $new/GenExt
     block $new/ns.Ref
@@ -1439,7 +1439,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1538,7 +1538,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $new/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $new/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1580,7 +1580,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $new/Gen<i32>#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $new/Gen<i32>#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1624,7 +1624,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $new/ns.Ref#constructor (type $none_=>_i32) (result i32)
+ (func $new/ns.Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1666,7 +1666,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $new/GenExt#constructor (type $none_=>_i32) (result i32)
+ (func $new/GenExt#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1708,7 +1708,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -1742,7 +1742,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/nontrapping-f2i.debug.wat b/tests/compiler/nontrapping-f2i.debug.wat
index 0d73af6a6f..1794e39e9f 100644
--- a/tests/compiler/nontrapping-f2i.debug.wat
+++ b/tests/compiler/nontrapping-f2i.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/builtins/f32.MAX_VALUE f32 (f32.const 3402823466385288598117041e14))
  (global $~lib/builtins/i32.MAX_VALUE i32 (i32.const 2147483647))
  (global $~lib/builtins/i32.MIN_VALUE i32 (i32.const -2147483648))
@@ -21,7 +21,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $start:nontrapping-f2i (type $none_=>_none)
+ (func $start:nontrapping-f2i
   global.get $~lib/builtins/f32.MAX_VALUE
   i32.trunc_sat_f32_s
   global.get $~lib/builtins/i32.MAX_VALUE
@@ -151,7 +151,7 @@
   i64.eq
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
diff --git a/tests/compiler/nontrapping-f2i.release.wat b/tests/compiler/nontrapping-f2i.release.wat
index 9f12e47335..75a2479112 100644
--- a/tests/compiler/nontrapping-f2i.release.wat
+++ b/tests/compiler/nontrapping-f2i.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~start (type $none_=>_none)
+ (func $~start
   nop
  )
 )
diff --git a/tests/compiler/object-literal.debug.wat b/tests/compiler/object-literal.debug.wat
index 57541e5d88..7f008f0ca7 100644
--- a/tests/compiler/object-literal.debug.wat
+++ b/tests/compiler/object-literal.debug.wat
@@ -1,20 +1,20 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_=>_f32 (func_subtype (param i32) (result f32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/white (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/iter (mut i32) (i32.const 0))
@@ -56,27 +56,27 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $object-literal/Managed#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $object-literal/Managed#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -85,17 +85,17 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -105,7 +105,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -161,7 +161,7 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -171,15 +171,15 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -205,7 +205,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -225,7 +225,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -245,7 +245,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -281,7 +281,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -349,7 +349,7 @@
    end
   end
  )
- (func $object-literal/Managed#set:baz (type $i32_i32_=>_none) (param $this i32) (param $baz i32)
+ (func $object-literal/Managed#set:baz (param $this i32) (param $baz i32)
   local.get $this
   local.get $baz
   i32.store $0 offset=4
@@ -358,7 +358,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -400,7 +400,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -412,7 +412,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -438,7 +438,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -459,11 +459,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -474,39 +474,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -742,7 +742,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1106,7 +1106,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1271,7 +1271,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1416,7 +1416,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1454,7 +1454,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1467,7 +1467,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1484,7 +1484,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1509,7 +1509,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1689,7 +1689,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1747,7 +1747,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1768,7 +1768,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1784,7 +1784,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1992,7 +1992,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2082,7 +2082,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2191,7 +2191,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2255,7 +2255,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2268,17 +2268,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2331,19 +2331,19 @@
   local.get $ptr
   return
  )
- (func $object-literal/Managed#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Managed#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $object-literal/Managed#get:baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Managed#get:baz (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2352,7 +2352,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2456,17 +2456,17 @@
   i32.const 0
   return
  )
- (func $object-literal/Unmanaged#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $object-literal/Unmanaged#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
  )
- (func $object-literal/Unmanaged#set:baz (type $i32_i32_=>_none) (param $this i32) (param $baz i32)
+ (func $object-literal/Unmanaged#set:baz (param $this i32) (param $baz i32)
   local.get $this
   local.get $baz
   i32.store $0 offset=4
  )
- (func $object-literal/Unmanaged#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Unmanaged#constructor (param $this i32) (result i32)
   local.get $this
   i32.eqz
   if
@@ -2482,146 +2482,146 @@
   call $object-literal/Unmanaged#set:baz
   local.get $this
  )
- (func $object-literal/Unmanaged#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Unmanaged#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $object-literal/Unmanaged#get:baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Unmanaged#get:baz (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $object-literal/OmittedTypes#set:int32 (type $i32_i32_=>_none) (param $this i32) (param $int32 i32)
+ (func $object-literal/OmittedTypes#set:int32 (param $this i32) (param $int32 i32)
   local.get $this
   local.get $int32
   i32.store $0
  )
- (func $object-literal/OmittedTypes#set:uint32 (type $i32_i32_=>_none) (param $this i32) (param $uint32 i32)
+ (func $object-literal/OmittedTypes#set:uint32 (param $this i32) (param $uint32 i32)
   local.get $this
   local.get $uint32
   i32.store $0 offset=4
  )
- (func $object-literal/OmittedTypes#set:int64 (type $i32_i64_=>_none) (param $this i32) (param $int64 i64)
+ (func $object-literal/OmittedTypes#set:int64 (param $this i32) (param $int64 i64)
   local.get $this
   local.get $int64
   i64.store $0 offset=8
  )
- (func $object-literal/OmittedTypes#set:uint64 (type $i32_i64_=>_none) (param $this i32) (param $uint64 i64)
+ (func $object-literal/OmittedTypes#set:uint64 (param $this i32) (param $uint64 i64)
   local.get $this
   local.get $uint64
   i64.store $0 offset=16
  )
- (func $object-literal/OmittedTypes#set:float32 (type $i32_f32_=>_none) (param $this i32) (param $float32 f32)
+ (func $object-literal/OmittedTypes#set:float32 (param $this i32) (param $float32 f32)
   local.get $this
   local.get $float32
   f32.store $0 offset=24
  )
- (func $object-literal/OmittedTypes#set:float64 (type $i32_f64_=>_none) (param $this i32) (param $float64 f64)
+ (func $object-literal/OmittedTypes#set:float64 (param $this i32) (param $float64 f64)
   local.get $this
   local.get $float64
   f64.store $0 offset=32
  )
- (func $object-literal/OmittedTypes#set:int8 (type $i32_i32_=>_none) (param $this i32) (param $int8 i32)
+ (func $object-literal/OmittedTypes#set:int8 (param $this i32) (param $int8 i32)
   local.get $this
   local.get $int8
   i32.store8 $0 offset=40
  )
- (func $object-literal/OmittedTypes#set:uint8 (type $i32_i32_=>_none) (param $this i32) (param $uint8 i32)
+ (func $object-literal/OmittedTypes#set:uint8 (param $this i32) (param $uint8 i32)
   local.get $this
   local.get $uint8
   i32.store8 $0 offset=41
  )
- (func $object-literal/OmittedTypes#set:int16 (type $i32_i32_=>_none) (param $this i32) (param $int16 i32)
+ (func $object-literal/OmittedTypes#set:int16 (param $this i32) (param $int16 i32)
   local.get $this
   local.get $int16
   i32.store16 $0 offset=42
  )
- (func $object-literal/OmittedTypes#set:uint16 (type $i32_i32_=>_none) (param $this i32) (param $uint16 i32)
+ (func $object-literal/OmittedTypes#set:uint16 (param $this i32) (param $uint16 i32)
   local.get $this
   local.get $uint16
   i32.store16 $0 offset=44
  )
- (func $object-literal/OmittedTypes#set:intsize (type $i32_i32_=>_none) (param $this i32) (param $intsize i32)
+ (func $object-literal/OmittedTypes#set:intsize (param $this i32) (param $intsize i32)
   local.get $this
   local.get $intsize
   i32.store $0 offset=48
  )
- (func $object-literal/OmittedTypes#set:uintsize (type $i32_i32_=>_none) (param $this i32) (param $uintsize i32)
+ (func $object-literal/OmittedTypes#set:uintsize (param $this i32) (param $uintsize i32)
   local.get $this
   local.get $uintsize
   i32.store $0 offset=52
  )
- (func $object-literal/OmittedTypes#set:alias (type $i32_f64_=>_none) (param $this i32) (param $alias f64)
+ (func $object-literal/OmittedTypes#set:alias (param $this i32) (param $alias f64)
   local.get $this
   local.get $alias
   f64.store $0 offset=56
  )
- (func $object-literal/OmittedTypes#set:isTrue (type $i32_i32_=>_none) (param $this i32) (param $isTrue i32)
+ (func $object-literal/OmittedTypes#set:isTrue (param $this i32) (param $isTrue i32)
   local.get $this
   local.get $isTrue
   i32.store8 $0 offset=64
  )
- (func $object-literal/OmittedTypes#get:int32 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:int32 (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $object-literal/OmittedTypes#get:uint32 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:uint32 (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $object-literal/OmittedTypes#get:int64 (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $object-literal/OmittedTypes#get:int64 (param $this i32) (result i64)
   local.get $this
   i64.load $0 offset=8
  )
- (func $object-literal/OmittedTypes#get:uint64 (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $object-literal/OmittedTypes#get:uint64 (param $this i32) (result i64)
   local.get $this
   i64.load $0 offset=16
  )
- (func $object-literal/OmittedTypes#get:float32 (type $i32_=>_f32) (param $this i32) (result f32)
+ (func $object-literal/OmittedTypes#get:float32 (param $this i32) (result f32)
   local.get $this
   f32.load $0 offset=24
  )
- (func $object-literal/OmittedTypes#get:float64 (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $object-literal/OmittedTypes#get:float64 (param $this i32) (result f64)
   local.get $this
   f64.load $0 offset=32
  )
- (func $object-literal/OmittedTypes#get:int8 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:int8 (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0 offset=40
  )
- (func $object-literal/OmittedTypes#get:uint8 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:uint8 (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0 offset=41
  )
- (func $object-literal/OmittedTypes#get:int16 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:int16 (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=42
  )
- (func $object-literal/OmittedTypes#get:uint16 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:uint16 (param $this i32) (result i32)
   local.get $this
   i32.load16_u $0 offset=44
  )
- (func $object-literal/OmittedTypes#get:intsize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:intsize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=48
  )
- (func $object-literal/OmittedTypes#get:uintsize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:uintsize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=52
  )
- (func $object-literal/OmittedTypes#get:alias (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $object-literal/OmittedTypes#get:alias (param $this i32) (result f64)
   local.get $this
   f64.load $0 offset=56
  )
- (func $object-literal/OmittedTypes#get:isTrue (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#get:isTrue (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0 offset=64
  )
- (func $object-literal/MixedOmitted#set:simpleType (type $i32_i32_=>_none) (param $this i32) (param $simpleType i32)
+ (func $object-literal/MixedOmitted#set:simpleType (param $this i32) (param $simpleType i32)
   local.get $this
   local.get $simpleType
   i32.store $0
  )
- (func $object-literal/MixedOmitted#set:complexType (type $i32_i32_=>_none) (param $this i32) (param $complexType i32)
+ (func $object-literal/MixedOmitted#set:complexType (param $this i32) (param $complexType i32)
   local.get $this
   local.get $complexType
   i32.store $0 offset=4
@@ -2630,24 +2630,24 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/MixedOmitted#set:anotherSimpleType (type $i32_f64_=>_none) (param $this i32) (param $anotherSimpleType f64)
+ (func $object-literal/MixedOmitted#set:anotherSimpleType (param $this i32) (param $anotherSimpleType f64)
   local.get $this
   local.get $anotherSimpleType
   f64.store $0 offset=8
  )
- (func $object-literal/MixedOmitted#get:simpleType (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/MixedOmitted#get:simpleType (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $object-literal/MixedOmitted#get:complexType (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/MixedOmitted#get:complexType (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $object-literal/MixedOmitted#get:anotherSimpleType (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $object-literal/MixedOmitted#get:anotherSimpleType (param $this i32) (result f64)
   local.get $this
   f64.load $0 offset=8
  )
- (func $object-literal/OmittedFoo#set:bar (type $i32_i32_=>_none) (param $this i32) (param $bar i32)
+ (func $object-literal/OmittedFoo#set:bar (param $this i32) (param $bar i32)
   local.get $this
   local.get $bar
   i32.store $0
@@ -2656,7 +2656,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:baz (type $i32_i32_=>_none) (param $this i32) (param $baz i32)
+ (func $object-literal/OmittedFoo#set:baz (param $this i32) (param $baz i32)
   local.get $this
   local.get $baz
   i32.store $0 offset=4
@@ -2665,7 +2665,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:quux (type $i32_i32_=>_none) (param $this i32) (param $quux i32)
+ (func $object-literal/OmittedFoo#set:quux (param $this i32) (param $quux i32)
   local.get $this
   local.get $quux
   i32.store $0 offset=8
@@ -2674,7 +2674,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:quuz (type $i32_i32_=>_none) (param $this i32) (param $quuz i32)
+ (func $object-literal/OmittedFoo#set:quuz (param $this i32) (param $quuz i32)
   local.get $this
   local.get $quuz
   i32.store $0 offset=12
@@ -2683,7 +2683,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:corge (type $i32_i32_=>_none) (param $this i32) (param $corge i32)
+ (func $object-literal/OmittedFoo#set:corge (param $this i32) (param $corge i32)
   local.get $this
   local.get $corge
   i32.store $0 offset=16
@@ -2692,7 +2692,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:grault (type $i32_i32_=>_none) (param $this i32) (param $grault i32)
+ (func $object-literal/OmittedFoo#set:grault (param $this i32) (param $grault i32)
   local.get $this
   local.get $grault
   i32.store $0 offset=20
@@ -2701,7 +2701,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:garply (type $i32_i32_=>_none) (param $this i32) (param $garply i32)
+ (func $object-literal/OmittedFoo#set:garply (param $this i32) (param $garply i32)
   local.get $this
   local.get $garply
   i32.store $0 offset=24
@@ -2710,7 +2710,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:waldo (type $i32_i32_=>_none) (param $this i32) (param $waldo i32)
+ (func $object-literal/OmittedFoo#set:waldo (param $this i32) (param $waldo i32)
   local.get $this
   local.get $waldo
   i32.store $0 offset=28
@@ -2719,57 +2719,57 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $object-literal/OmittedFoo#set:fred (type $i32_i32_=>_none) (param $this i32) (param $fred i32)
+ (func $object-literal/OmittedFoo#set:fred (param $this i32) (param $fred i32)
   local.get $this
   local.get $fred
   i32.store $0 offset=32
  )
- (func $object-literal/OmittedFoo#set:qux (type $i32_i32_=>_none) (param $this i32) (param $qux i32)
+ (func $object-literal/OmittedFoo#set:qux (param $this i32) (param $qux i32)
   local.get $this
   local.get $qux
   i32.store $0 offset=36
  )
- (func $object-literal/OmittedFoo#get:bar (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:bar (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $object-literal/OmittedFoo#get:baz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:baz (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $object-literal/OmittedFoo#get:quux (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:quux (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $object-literal/OmittedFoo#get:quuz (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:quuz (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $object-literal/OmittedFoo#get:corge (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:corge (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $object-literal/OmittedFoo#get:grault (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:grault (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $object-literal/OmittedFoo#get:garply (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:garply (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=24
  )
- (func $object-literal/OmittedFoo#get:waldo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:waldo (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=28
  )
- (func $object-literal/OmittedFoo#get:fred (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:fred (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=32
  )
- (func $object-literal/OmittedFoo#get:qux (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#get:qux (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=36
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2815,7 +2815,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 176
   local.get $0
@@ -2824,7 +2824,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2838,10 +2838,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $object-literal/Managed~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $object-literal/Managed~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2855,7 +2855,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $object-literal/MixedOmitted~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $object-literal/MixedOmitted~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2869,7 +2869,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $object-literal/OmittedFoo~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $object-literal/OmittedFoo~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2939,7 +2939,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $object-literal/OmittedFoo
     block $object-literal/MixedOmitted
@@ -2985,10 +2985,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:object-literal
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3001,7 +3001,7 @@
    unreachable
   end
  )
- (func $object-literal/Managed#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/Managed#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3055,7 +3055,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3151,7 +3151,7 @@
   local.get $3
   return
  )
- (func $object-literal/testManaged (type $i32_=>_none) (param $managed i32)
+ (func $object-literal/testManaged (param $managed i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3215,7 +3215,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -3364,7 +3364,7 @@
   local.get $22
   return
  )
- (func $object-literal/testUnmanaged (type $i32_=>_none) (param $unmanaged i32)
+ (func $object-literal/testUnmanaged (param $unmanaged i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3417,7 +3417,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $object-literal/OmittedTypes#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedTypes#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3567,7 +3567,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $object-literal/testOmittedTypes (type $i32_=>_none) (param $omitted i32)
+ (func $object-literal/testOmittedTypes (param $omitted i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3842,7 +3842,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $object-literal/MixedOmitted#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/MixedOmitted#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3904,7 +3904,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $object-literal/testMixedOmitted (type $i32_=>_none) (param $omitted i32)
+ (func $object-literal/testMixedOmitted (param $omitted i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3986,7 +3986,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $object-literal/OmittedFoo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $object-literal/OmittedFoo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4117,7 +4117,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $object-literal/testOmittedFoo (type $i32_=>_none) (param $foo i32)
+ (func $object-literal/testOmittedFoo (param $foo i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4365,7 +4365,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:object-literal (type $none_=>_none)
+ (func $start:object-literal
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -4586,7 +4586,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/object-literal.release.wat b/tests/compiler/object-literal.release.wat
index aa53bd54a9..ebe0ddf788 100644
--- a/tests/compiler/object-literal.release.wat
+++ b/tests/compiler/object-literal.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/white (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/iter (mut i32) (i32.const 0))
@@ -48,7 +48,7 @@
  (data (i32.const 1736) " ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -180,7 +180,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1200
@@ -225,7 +225,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -378,7 +378,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -624,7 +624,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -736,7 +736,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -815,7 +815,7 @@
   i32.const 34528
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tlsf/__free (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -867,7 +867,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1088,7 +1088,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1214,7 +1214,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1407,7 +1407,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -1523,7 +1523,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1624,10 +1624,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:object-literal
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1787,7 +1787,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $object-literal/testOmittedTypes (type $i32_=>_none) (param $0 i32)
+ (func $object-literal/testOmittedTypes (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2005,7 +2005,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $object-literal/testOmittedFoo (type $i32_=>_none) (param $0 i32)
+ (func $object-literal/testOmittedFoo (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2236,7 +2236,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:object-literal (type $none_=>_none)
+ (func $start:object-literal
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3090,7 +3090,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3125,7 +3125,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   local.get $0
   i32.eqz
   if
@@ -3174,7 +3174,7 @@
    end
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/optional-typeparameters.debug.wat b/tests/compiler/optional-typeparameters.debug.wat
index f374bf5d36..6c16287a0a 100644
--- a/tests/compiler/optional-typeparameters.debug.wat
+++ b/tests/compiler/optional-typeparameters.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_f64_f64_=>_f64 (func_subtype (param i32 f64 f64) (result f64) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_f64_f64_=>_f64 (func (param i32 f64 f64) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -46,25 +46,25 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $optional-typeparameters/testConcrete<i32,i32> (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $optional-typeparameters/testConcrete<i32,i32> (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $optional-typeparameters/testDerived<i32,i32> (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $optional-typeparameters/testDerived<i32,i32> (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -74,11 +74,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -87,14 +87,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -136,7 +136,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -148,11 +148,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -162,7 +162,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -218,15 +218,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -252,7 +252,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -272,7 +272,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -292,7 +292,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -328,7 +328,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -354,7 +354,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -375,11 +375,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -390,39 +390,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -658,7 +658,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1022,7 +1022,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1187,7 +1187,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1332,7 +1332,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1370,7 +1370,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1383,7 +1383,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1400,7 +1400,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1425,7 +1425,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1605,7 +1605,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1663,7 +1663,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1684,7 +1684,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1700,7 +1700,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1908,7 +1908,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1998,7 +1998,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2107,7 +2107,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2171,7 +2171,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2184,17 +2184,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2247,25 +2247,25 @@
   local.get $ptr
   return
  )
- (func $optional-typeparameters/TestConcrete<i32,i32>#test<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $a i32) (param $b i32) (result i32)
+ (func $optional-typeparameters/TestConcrete<i32,i32>#test<i32> (param $this i32) (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $optional-typeparameters/TestDerived<f64,f64>#test<f64> (type $i32_f64_f64_=>_f64) (param $this i32) (param $a f64) (param $b f64) (result f64)
+ (func $optional-typeparameters/TestDerived<f64,f64>#test<f64> (param $this i32) (param $a f64) (param $b f64) (result f64)
   local.get $a
   local.get $b
   f64.add
   return
  )
- (func $optional-typeparameters/TestMethodDerived<~lib/string/String>#test<~lib/array/Array<~lib/string/String>> (type $i32_=>_none) (param $this i32)
+ (func $optional-typeparameters/TestMethodDerived<~lib/string/String>#test<~lib/array/Array<~lib/string/String>> (param $this i32)
   i32.const 7
   i32.const 7
   i32.eq
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $optional-typeparameters/tConcrete
   local.tee $1
@@ -2302,7 +2302,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2316,22 +2316,22 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2339,7 +2339,7 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $optional-typeparameters/TestMethodDerived2<f64>
     block $~lib/array/Array<~lib/string/String>
@@ -2382,10 +2382,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:optional-typeparameters
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2398,7 +2398,7 @@
    unreachable
   end
  )
- (func $optional-typeparameters/TestConcrete<i32,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $optional-typeparameters/TestConcrete<i32,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2436,7 +2436,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $optional-typeparameters/TestDerived<f64,f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $optional-typeparameters/TestDerived<f64,f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2474,7 +2474,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $optional-typeparameters/TestMethodDerived<~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $optional-typeparameters/TestMethodDerived<~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2512,7 +2512,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $optional-typeparameters/TestMethodDerived2<f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $optional-typeparameters/TestMethodDerived2<f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2550,7 +2550,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $optional-typeparameters/TestMethodDerived2<f64>#foo (type $i32_i32_=>_none) (param $this i32) (param $v i32)
+ (func $optional-typeparameters/TestMethodDerived2<f64>#foo (param $this i32) (param $v i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2572,7 +2572,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:optional-typeparameters (type $none_=>_none)
+ (func $start:optional-typeparameters
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2662,7 +2662,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -2732,7 +2732,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/optional-typeparameters.release.wat b/tests/compiler/optional-typeparameters.release.wat
index a33c52952b..502821f9fc 100644
--- a/tests/compiler/optional-typeparameters.release.wat
+++ b/tests/compiler/optional-typeparameters.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -36,7 +36,7 @@
  (data (i32.const 1440) "\t\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00\02A\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $optional-typeparameters/tConcrete
@@ -105,7 +105,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -237,7 +237,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -390,7 +390,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -636,7 +636,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -748,7 +748,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -827,7 +827,7 @@
   i32.const 34256
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1094,7 +1094,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1151,7 +1151,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1384,7 +1384,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1499,7 +1499,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1723,7 +1723,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -1757,7 +1757,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/overflow.debug.wat b/tests/compiler/overflow.debug.wat
index 5835150caf..8de3a4e1c4 100644
--- a/tests/compiler/overflow.debug.wat
+++ b/tests/compiler/overflow.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 60))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
@@ -11,7 +11,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:overflow (type $none_=>_none)
+ (func $start:overflow
   (local $val i32)
   (local $ctx i32)
   (local $2 i32)
@@ -779,7 +779,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:overflow
  )
 )
diff --git a/tests/compiler/packages.debug.wat b/tests/compiler/packages.debug.wat
index 232b3ea1e8..13aa0a1377 100644
--- a/tests/compiler/packages.debug.wat
+++ b/tests/compiler/packages.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/a/index/a i32 (i32.const 1))
  (global $~lib/c/index/c i32 (i32.const 3))
  (global $~lib/b/index/b i32 (i32.const 2))
@@ -14,7 +14,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:~lib/c/index (type $none_=>_none)
+ (func $start:~lib/c/index
   global.get $~lib/a/index/a
   i32.const 1
   i32.eq
@@ -24,7 +24,7 @@
   i32.eq
   drop
  )
- (func $start:~lib/a/index (type $none_=>_none)
+ (func $start:~lib/a/index
   call $start:~lib/c/index
   global.get $~lib/c/index/c
   i32.const 3
@@ -35,7 +35,7 @@
   i32.eq
   drop
  )
- (func $start:~lib/_/index (type $none_=>_none)
+ (func $start:~lib/_/index
   call $start:~lib/a/index
   global.get $~lib/a/index/a
   i32.const 1
@@ -78,10 +78,10 @@
   i32.eq
   drop
  )
- (func $start:packages (type $none_=>_none)
+ (func $start:packages
   call $start:~lib/_/index
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:packages
  )
 )
diff --git a/tests/compiler/portable-conversions.debug.wat b/tests/compiler/portable-conversions.debug.wat
index 992103fa87..f915f5c822 100644
--- a/tests/compiler/portable-conversions.debug.wat
+++ b/tests/compiler/portable-conversions.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $portable-conversions/i (mut i32) (i32.const 1))
  (global $portable-conversions/I (mut i64) (i64.const 1))
@@ -15,7 +15,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:portable-conversions (type $none_=>_none)
+ (func $start:portable-conversions
   global.get $portable-conversions/i
   i32.extend8_s
   i32.eqz
@@ -623,7 +623,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:portable-conversions
  )
 )
diff --git a/tests/compiler/possibly-null.debug.wat b/tests/compiler/possibly-null.debug.wat
index 7e4cf7235d..0c96d004c9 100644
--- a/tests/compiler/possibly-null.debug.wat
+++ b/tests/compiler/possibly-null.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
@@ -30,14 +30,14 @@
  (export "testLogicalOrMulti" (func $export:possibly-null/testLogicalOrMulti))
  (export "testAssign" (func $export:possibly-null/testAssign))
  (export "testNeverNull" (func $export:possibly-null/testNeverNull))
- (func $possibly-null/testTrue (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testTrue (param $a i32)
   local.get $a
   if
    i32.const 0
    drop
   end
  )
- (func $possibly-null/testFalseElse (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testFalseElse (param $a i32)
   local.get $a
   i32.eqz
   if
@@ -47,7 +47,7 @@
    drop
   end
  )
- (func $possibly-null/testFalseContinuation (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testFalseContinuation (param $a i32)
   local.get $a
   i32.eqz
   if
@@ -56,7 +56,7 @@
   i32.const 0
   drop
  )
- (func $possibly-null/testNeNull (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testNeNull (param $a i32)
   local.get $a
   i32.const 0
   i32.ne
@@ -65,7 +65,7 @@
    drop
   end
  )
- (func $possibly-null/testEqNullElse (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testEqNullElse (param $a i32)
   local.get $a
   i32.const 0
   i32.eq
@@ -76,7 +76,7 @@
    drop
   end
  )
- (func $possibly-null/testEqNullContinuation (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testEqNullContinuation (param $a i32)
   local.get $a
   i32.const 0
   i32.eq
@@ -86,7 +86,7 @@
   i32.const 0
   drop
  )
- (func $possibly-null/testNotEqNull (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testNotEqNull (param $a i32)
   local.get $a
   i32.const 0
   i32.eq
@@ -96,7 +96,7 @@
    drop
   end
  )
- (func $possibly-null/testNotNeNullElse (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testNotNeNullElse (param $a i32)
   local.get $a
   i32.const 0
   i32.ne
@@ -108,7 +108,7 @@
    drop
   end
  )
- (func $possibly-null/testNotNeNullContinuation (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testNotNeNullContinuation (param $a i32)
   local.get $a
   i32.const 0
   i32.ne
@@ -119,7 +119,7 @@
   i32.const 0
   drop
  )
- (func $possibly-null/testWhile (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testWhile (param $a i32)
   loop $while-continue|0
    local.get $a
    if
@@ -134,7 +134,7 @@
    end
   end
  )
- (func $possibly-null/testWhile2 (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $possibly-null/testWhile2 (param $a i32) (param $b i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -163,7 +163,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $possibly-null/testWhile3 (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $possibly-null/testWhile3 (param $a i32) (param $b i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -194,11 +194,11 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $possibly-null/requireNonNull (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $possibly-null/requireNonNull (param $a i32) (result i32)
   local.get $a
   return
  )
- (func $possibly-null/testLogicalAndMulti (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $possibly-null/testLogicalAndMulti (param $a i32) (param $b i32)
   local.get $a
   if (result i32)
    local.get $b
@@ -219,7 +219,7 @@
    drop
   end
  )
- (func $possibly-null/testLogicalOrMulti (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $possibly-null/testLogicalOrMulti (param $a i32) (param $b i32)
   local.get $a
   i32.eqz
   if (result i32)
@@ -242,7 +242,7 @@
    drop
   end
  )
- (func $possibly-null/testAssign (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $possibly-null/testAssign (param $a i32) (param $b i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -262,14 +262,14 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $possibly-null/testNeverNull (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testNeverNull (param $a i32)
   local.get $a
   if
    local.get $a
    drop
   end
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -282,7 +282,7 @@
    unreachable
   end
  )
- (func $possibly-null/testLogicalAnd (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testLogicalAnd (param $a i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -310,7 +310,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $possibly-null/testLogicalOr (type $i32_=>_none) (param $a i32)
+ (func $possibly-null/testLogicalOr (param $a i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -341,7 +341,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testTrue (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testTrue (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -357,7 +357,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testFalseElse (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testFalseElse (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -373,7 +373,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testFalseContinuation (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testFalseContinuation (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -389,7 +389,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testNeNull (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testNeNull (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -405,7 +405,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testEqNullElse (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testEqNullElse (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -421,7 +421,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testEqNullContinuation (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testEqNullContinuation (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -437,7 +437,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testNotEqNull (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testNotEqNull (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -453,7 +453,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testNotNeNullElse (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testNotNeNullElse (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -469,7 +469,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testNotNeNullContinuation (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testNotNeNullContinuation (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -485,7 +485,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testWhile (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testWhile (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -501,7 +501,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testWhile2 (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testWhile2 (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
   i32.sub
@@ -521,7 +521,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testWhile3 (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testWhile3 (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
   i32.sub
@@ -541,7 +541,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testLogicalAnd (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testLogicalAnd (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -557,7 +557,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testLogicalOr (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testLogicalOr (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -573,7 +573,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testLogicalAndMulti (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testLogicalAndMulti (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
   i32.sub
@@ -593,7 +593,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testLogicalOrMulti (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testLogicalOrMulti (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
   i32.sub
@@ -613,7 +613,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testAssign (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testAssign (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
   i32.sub
@@ -633,7 +633,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testNeverNull (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testNeverNull (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/possibly-null.release.wat b/tests/compiler/possibly-null.release.wat
index 68a3499407..7b0afe7dd0 100644
--- a/tests/compiler/possibly-null.release.wat
+++ b/tests/compiler/possibly-null.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33792))
  (memory $0 0)
@@ -24,7 +24,7 @@
  (export "testLogicalOrMulti" (func $export:possibly-null/testLogicalAndMulti))
  (export "testAssign" (func $export:possibly-null/testAssign))
  (export "testNeverNull" (func $export:possibly-null/testTrue))
- (func $export:possibly-null/testTrue (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testTrue (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -50,7 +50,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testWhile (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testWhile (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -82,7 +82,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testWhile2 (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testWhile2 (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -138,7 +138,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:possibly-null/testWhile3 (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testWhile3 (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -198,7 +198,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:possibly-null/testLogicalAnd (type $i32_=>_none) (param $0 i32)
+ (func $export:possibly-null/testLogicalAnd (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -247,7 +247,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:possibly-null/testLogicalAndMulti (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testLogicalAndMulti (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -276,7 +276,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:possibly-null/testAssign (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:possibly-null/testAssign (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
diff --git a/tests/compiler/recursive.debug.wat b/tests/compiler/recursive.debug.wat
index d9811176f0..5dfb12cd7c 100644
--- a/tests/compiler/recursive.debug.wat
+++ b/tests/compiler/recursive.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "fib" (func $recursive/fib))
  (export "memory" (memory $0))
- (func $recursive/fib (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $recursive/fib (param $n i32) (result i32)
   local.get $n
   i32.const 1
   i32.le_s
diff --git a/tests/compiler/recursive.release.wat b/tests/compiler/recursive.release.wat
index 4806cad4d3..c6bee48f39 100644
--- a/tests/compiler/recursive.release.wat
+++ b/tests/compiler/recursive.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 0)
  (export "fib" (func $recursive/fib))
  (export "memory" (memory $0))
- (func $recursive/fib (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $recursive/fib (param $0 i32) (result i32)
   local.get $0
   i32.const 1
   i32.le_s
diff --git a/tests/compiler/reexport.debug.wat b/tests/compiler/reexport.debug.wat
index a52fe12f4d..42866d82fb 100644
--- a/tests/compiler/reexport.debug.wat
+++ b/tests/compiler/reexport.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -65,40 +65,40 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
   return
  )
- (func $exports/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $exports/Car#set:doors (type $i32_i32_=>_none) (param $this i32) (param $doors i32)
+ (func $exports/Car#set:doors (param $this i32) (param $doors i32)
   local.get $this
   local.get $doors
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -108,11 +108,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -121,14 +121,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -170,7 +170,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -182,11 +182,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -196,7 +196,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -252,15 +252,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -286,7 +286,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -306,7 +306,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -326,7 +326,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -362,7 +362,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -388,7 +388,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -409,11 +409,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -424,39 +424,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -692,7 +692,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1056,7 +1056,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1221,7 +1221,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1366,7 +1366,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1404,7 +1404,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1417,7 +1417,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1434,7 +1434,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1459,7 +1459,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1639,7 +1639,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1697,7 +1697,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1718,7 +1718,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1734,7 +1734,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1942,7 +1942,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2032,7 +2032,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2141,7 +2141,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2205,7 +2205,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2218,17 +2218,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2281,20 +2281,20 @@
   local.get $ptr
   return
  )
- (func $exports/Car#get:doors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:doors (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/sub (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
   return
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $reexport/car
   local.tee $1
@@ -2310,7 +2310,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2324,10 +2324,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -2355,10 +2355,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:reexport
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2371,7 +2371,7 @@
    unreachable
   end
  )
- (func $exports/Car#constructor (type $i32_i32_=>_i32) (param $this i32) (param $doors i32) (result i32)
+ (func $exports/Car#constructor (param $this i32) (param $doors i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2415,7 +2415,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $exports/Car#get:numDoors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:numDoors (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2440,7 +2440,7 @@
   local.get $1
   return
  )
- (func $start:reexport (type $none_=>_none)
+ (func $start:reexport
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/reexport.release.wat b/tests/compiler/reexport.release.wat
index 25b704a641..e32fe5590c 100644
--- a/tests/compiler/reexport.release.wat
+++ b/tests/compiler/reexport.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -51,17 +51,17 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $export/add (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/add (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/mul (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.mul
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $reexport/car
@@ -112,7 +112,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -244,7 +244,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -397,7 +397,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -643,7 +643,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -755,7 +755,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -834,7 +834,7 @@
   i32.const 34288
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1101,7 +1101,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1158,7 +1158,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1390,15 +1390,15 @@
   i32.store $0 align=1
   local.get $0
  )
- (func $export/sub (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $export/sub (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -1430,7 +1430,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1563,7 +1563,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/rereexport.debug.wat b/tests/compiler/rereexport.debug.wat
index c159b7ab25..11c58c7744 100644
--- a/tests/compiler/rereexport.debug.wat
+++ b/tests/compiler/rereexport.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -58,40 +58,40 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $export/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $export/mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $export/mul (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.mul
   return
  )
- (func $exports/add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $exports/add (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.add
   return
  )
- (func $exports/Car#set:doors (type $i32_i32_=>_none) (param $this i32) (param $doors i32)
+ (func $exports/Car#set:doors (param $this i32) (param $doors i32)
   local.get $this
   local.get $doors
   i32.store $0
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -101,11 +101,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -114,14 +114,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -163,7 +163,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -175,11 +175,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -189,7 +189,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -245,15 +245,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -279,7 +279,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -299,7 +299,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -319,7 +319,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -355,7 +355,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -381,7 +381,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -402,11 +402,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -417,39 +417,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -685,7 +685,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1049,7 +1049,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1214,7 +1214,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1359,7 +1359,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1397,7 +1397,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1410,7 +1410,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1427,7 +1427,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1452,7 +1452,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1632,7 +1632,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1690,7 +1690,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1711,7 +1711,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1727,7 +1727,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1935,7 +1935,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2025,7 +2025,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2134,7 +2134,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2198,7 +2198,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2211,17 +2211,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2274,14 +2274,14 @@
   local.get $ptr
   return
  )
- (func $exports/Car#get:doors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:doors (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $rereexport/car
   local.tee $1
@@ -2311,7 +2311,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2325,10 +2325,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -2356,10 +2356,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:rereexport
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2372,7 +2372,7 @@
    unreachable
   end
  )
- (func $exports/Car#constructor (type $i32_i32_=>_i32) (param $this i32) (param $doors i32) (result i32)
+ (func $exports/Car#constructor (param $this i32) (param $doors i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2416,7 +2416,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $exports/Car#get:numDoors (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $exports/Car#get:numDoors (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2441,7 +2441,7 @@
   local.get $1
   return
  )
- (func $start:reexport (type $none_=>_none)
+ (func $start:reexport
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2531,7 +2531,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:rereexport (type $none_=>_none)
+ (func $start:rereexport
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/rereexport.release.wat b/tests/compiler/rereexport.release.wat
index 925023d7fb..3fc2a62103 100644
--- a/tests/compiler/rereexport.release.wat
+++ b/tests/compiler/rereexport.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
@@ -47,7 +47,7 @@
  (export "renamed_default" (func $export-default/theDefault))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $rereexport/car
@@ -110,7 +110,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -242,7 +242,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -395,7 +395,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -641,7 +641,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -753,7 +753,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -832,7 +832,7 @@
   i32.const 34336
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1099,7 +1099,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1156,7 +1156,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1388,10 +1388,10 @@
   i32.store $0 align=1
   local.get $0
  )
- (func $export-default/theDefault (type $none_=>_none)
+ (func $export-default/theDefault
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $exports/Car
     block $~lib/arraybuffer/ArrayBufferView
@@ -1423,7 +1423,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1552,7 +1552,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $exports/Car#constructor (type $none_=>_i32) (result i32)
+ (func $exports/Car#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1597,7 +1597,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $exports/Car#get:numDoors (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $exports/Car#get:numDoors (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1630,7 +1630,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-access.debug.wat b/tests/compiler/resolve-access.debug.wat
index 98f594c02a..1a33e66a2b 100644
--- a/tests/compiler/resolve-access.debug.wat
+++ b/tests/compiler/resolve-access.debug.wat
@@ -1,21 +1,21 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -62,17 +62,17 @@
  (export "propertyAccess" (func $resolve-access/propertyAccess))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -82,11 +82,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -95,14 +95,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -144,7 +144,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -156,11 +156,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -170,7 +170,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -226,15 +226,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -260,7 +260,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -280,7 +280,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -300,7 +300,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -336,7 +336,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -362,7 +362,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -383,11 +383,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -398,39 +398,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -666,7 +666,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1030,7 +1030,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1195,7 +1195,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1340,7 +1340,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1378,7 +1378,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1391,7 +1391,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1408,7 +1408,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1433,7 +1433,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1613,7 +1613,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1671,7 +1671,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1692,7 +1692,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1708,7 +1708,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1916,7 +1916,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2006,7 +2006,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2115,7 +2115,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2179,7 +2179,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2192,17 +2192,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2255,7 +2255,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2271,7 +2271,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2339,15 +2339,15 @@
    end
   end
  )
- (func $~lib/array/Array<u64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -2402,7 +2402,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2542,7 +2542,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/decimalCount64High (type $i64_=>_i32) (param $value i64) (result i32)
+ (func $~lib/util/number/decimalCount64High (param $value i64) (result i32)
   local.get $value
   i64.const 1000000000000000
   i64.lt_u
@@ -2601,7 +2601,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $buffer i32) (param $num i64) (param $offset i32)
   (local $t i64)
   (local $r i32)
   (local $b i32)
@@ -2721,7 +2721,7 @@
   local.get $offset
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2768,7 +2768,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2845,7 +2845,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2936,28 +2936,28 @@
    end
   end
  )
- (func $~lib/number/U64#toString (type $i64_i32_=>_i32) (param $this i64) (param $radix i32) (result i32)
+ (func $~lib/number/U64#toString (param $this i64) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/utoa64
   return
  )
- (func $resolve-access/Container#set:foo (type $i32_i64_=>_none) (param $this i32) (param $foo i64)
+ (func $resolve-access/Container#set:foo (param $this i32) (param $foo i64)
   local.get $this
   local.get $foo
   i64.store $0
  )
- (func $resolve-access/Container#get:foo (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $resolve-access/Container#get:foo (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/number/U32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/U32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/utoa32
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 256
   local.get $0
@@ -2972,7 +2972,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2986,14 +2986,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<u64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3001,11 +3001,11 @@
   local.get $1
   call $~lib/array/Array<u64>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3013,7 +3013,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $resolve-access/Container
     block $~lib/array/Array<i32>
@@ -3053,7 +3053,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -3072,7 +3072,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3085,7 +3085,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<u64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<u64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -3138,7 +3138,7 @@
   local.get $4
   return
  )
- (func $resolve-access/arrayAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/arrayAccess (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $arr i32)
@@ -3177,7 +3177,7 @@
   local.get $3
   return
  )
- (func $resolve-access/Container#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-access/Container#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3223,7 +3223,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $resolve-access/fieldAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/fieldAccess (result i32)
   (local $container i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3264,7 +3264,7 @@
   local.get $1
   return
  )
- (func $resolve-access/Container#toU32 (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-access/Container#toU32 (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3290,7 +3290,7 @@
   local.get $1
   return
  )
- (func $resolve-access/propertyAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/propertyAccess (result i32)
   (local $container i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3331,7 +3331,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3357,7 +3357,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3383,7 +3383,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -3436,7 +3436,7 @@
   local.get $7
   return
  )
- (func $~lib/util/number/utoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa64 (param $value i64) (param $radix i32) (result i32)
   (local $out i32)
   (local $val32 i32)
   (local $decimals i32)
@@ -3623,7 +3623,7 @@
   local.get $17
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3651,7 +3651,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $value i32) (param $radix i32) (result i32)
   (local $out i32)
   (local $decimals i32)
   (local $buffer i32)
diff --git a/tests/compiler/resolve-access.release.wat b/tests/compiler/resolve-access.release.wat
index 8fb0b98343..6b173c9647 100644
--- a/tests/compiler/resolve-access.release.wat
+++ b/tests/compiler/resolve-access.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -51,7 +51,7 @@
  (export "propertyAccess" (func $resolve-access/propertyAccess))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1280
@@ -100,7 +100,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -232,7 +232,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -385,7 +385,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -631,7 +631,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -743,7 +743,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -822,7 +822,7 @@
   i32.const 36096
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1089,7 +1089,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1215,7 +1215,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1521,7 +1521,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -1625,7 +1625,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/number/U64#toString (type $i64_=>_i32) (param $0 i64) (result i32)
+ (func $~lib/number/U64#toString (param $0 i64) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1875,7 +1875,7 @@
   end
   local.get $2
  )
- (func $~lib/array/Array<u64>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1911,7 +1911,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $resolve-access/Container
     block $~lib/array/Array<i32>
@@ -1953,7 +1953,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1987,7 +1987,7 @@
   i32.const 1376
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $resolve-access/arrayAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/arrayAccess (result i32)
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -2159,7 +2159,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $resolve-access/Container#constructor (type $none_=>_i32) (result i32)
+ (func $resolve-access/Container#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2233,7 +2233,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $resolve-access/fieldAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/fieldAccess (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2277,7 +2277,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $resolve-access/propertyAccess (type $none_=>_i32) (result i32)
+ (func $resolve-access/propertyAccess (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2430,7 +2430,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-binary.debug.wat b/tests/compiler/resolve-binary.debug.wat
index 2d81bd2acd..8f7185e7a3 100644
--- a/tests/compiler/resolve-binary.debug.wat
+++ b/tests/compiler/resolve-binary.debug.wat
@@ -1,22 +1,22 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $f64_i32_=>_i32 (func_subtype (param f64 i32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $f64_i32_=>_i32 (func (param f64 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -101,7 +101,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/number/Bool#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/Bool#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   if (result i32)
    i32.const 32
@@ -110,11 +110,11 @@
   end
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -123,7 +123,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -227,7 +227,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -282,17 +282,17 @@
   end
   unreachable
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -302,11 +302,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -315,14 +315,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -364,7 +364,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -376,11 +376,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -390,7 +390,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -446,15 +446,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -480,7 +480,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -500,7 +500,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -520,7 +520,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -556,7 +556,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -582,7 +582,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -603,11 +603,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -618,39 +618,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -886,7 +886,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1250,7 +1250,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1415,7 +1415,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1560,7 +1560,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1598,7 +1598,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1611,7 +1611,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1628,7 +1628,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1653,7 +1653,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1833,7 +1833,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1891,7 +1891,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1912,7 +1912,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1928,7 +1928,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2136,7 +2136,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2226,7 +2226,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2335,7 +2335,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2399,7 +2399,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2412,17 +2412,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2475,7 +2475,7 @@
   local.get $ptr
   return
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2615,7 +2615,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2662,7 +2662,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2739,7 +2739,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2830,13 +2830,13 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/math/NativeMath.pow (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.pow (param $x f64) (param $y f64) (result f64)
   (local $x|2 f64)
   (local $y|3 f64)
   (local $sign_bias i32)
@@ -3880,7 +3880,7 @@
   end
   return
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -4381,7 +4381,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -4719,7 +4719,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -5196,12 +5196,12 @@
   i32.add
   return
  )
- (func $~lib/number/F64#toString (type $f64_i32_=>_i32) (param $this f64) (param $radix i32) (result i32)
+ (func $~lib/number/F64#toString (param $this f64) (param $radix i32) (result i32)
   local.get $this
   call $~lib/util/number/dtoa
   return
  )
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $x i32) (param $e i32) (result i32)
+ (func $~lib/math/ipow32 (param $x i32) (param $e i32) (result i32)
   (local $out i32)
   (local $log i32)
   (local $4 i32)
@@ -5419,83 +5419,83 @@
   local.get $out
   return
  )
- (func $resolve-binary/Foo#lt (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#lt (param $this i32) (param $other i32) (result i32)
   i32.const 9824
   return
  )
- (func $~lib/string/String#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#toString (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-binary/Foo#gt (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#gt (param $this i32) (param $other i32) (result i32)
   i32.const 9856
   return
  )
- (func $resolve-binary/Foo#le (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#le (param $this i32) (param $other i32) (result i32)
   i32.const 9888
   return
  )
- (func $resolve-binary/Foo#ge (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#ge (param $this i32) (param $other i32) (result i32)
   i32.const 9920
   return
  )
- (func $resolve-binary/Foo#eq (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#eq (param $this i32) (param $other i32) (result i32)
   i32.const 9952
   return
  )
- (func $resolve-binary/Foo#ne (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#ne (param $this i32) (param $other i32) (result i32)
   i32.const 9984
   return
  )
- (func $resolve-binary/Foo#add (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#add (param $this i32) (param $other i32) (result i32)
   i32.const 10016
   return
  )
- (func $resolve-binary/Foo.sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $resolve-binary/Foo.sub (param $a i32) (param $b i32) (result i32)
   i32.const 10048
   return
  )
- (func $resolve-binary/Foo#mul (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#mul (param $this i32) (param $other i32) (result i32)
   i32.const 10080
   return
  )
- (func $resolve-binary/Foo#div (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#div (param $this i32) (param $other i32) (result i32)
   i32.const 10112
   return
  )
- (func $resolve-binary/Foo#rem (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#rem (param $this i32) (param $other i32) (result i32)
   i32.const 10144
   return
  )
- (func $resolve-binary/Foo#pow (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Foo#pow (param $this i32) (param $other i32) (result i32)
   i32.const 10176
   return
  )
- (func $resolve-binary/Bar#add (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Bar#add (param $this i32) (param $other i32) (result i32)
   local.get $other
   return
  )
- (func $resolve-binary/Bar#self (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-binary/Bar#self (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-binary/Baz#add (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Baz#add (param $this i32) (param $other i32) (result i32)
   local.get $other
   return
  )
- (func $resolve-binary/Baz#sub (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $resolve-binary/Baz#sub (param $this i32) (param $other i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-binary/Baz.mul (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $resolve-binary/Baz.mul (param $left i32) (param $right i32) (result i32)
   local.get $right
   return
  )
- (func $resolve-binary/Baz.div (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $resolve-binary/Baz.div (param $left i32) (param $right i32) (result i32)
   local.get $left
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $resolve-binary/foo
   local.tee $1
@@ -5538,7 +5538,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -5552,10 +5552,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $resolve-binary/Baz
     block $resolve-binary/Bar
@@ -5589,10 +5589,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-binary
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -5605,7 +5605,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5701,7 +5701,7 @@
   local.get $3
   return
  )
- (func $resolve-binary/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-binary/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5739,7 +5739,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $resolve-binary/Bar#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-binary/Bar#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5777,7 +5777,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $resolve-binary/Baz#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-binary/Baz#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5815,7 +5815,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:resolve-binary (type $none_=>_none)
+ (func $start:resolve-binary
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 20
@@ -7462,7 +7462,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -7644,7 +7644,7 @@
   local.get $14
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
@@ -7728,7 +7728,7 @@
   local.get $3
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-binary.release.wat b/tests/compiler/resolve-binary.release.wat
index 764328f857..7de49362c6 100644
--- a/tests/compiler/resolve-binary.release.wat
+++ b/tests/compiler/resolve-binary.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_i64_i32_i64_=>_i32 (func_subtype (param i64 i64 i32 i64) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_i64_i32_i64_=>_i32 (func (param i64 i64 i32 i64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $resolve-binary/a (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -236,7 +236,7 @@
  (data (i32.const 11216) "\07\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $resolve-binary/foo
@@ -309,7 +309,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -441,7 +441,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -594,7 +594,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -840,7 +840,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -952,7 +952,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1031,7 +1031,7 @@
   i32.const 44016
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1298,7 +1298,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1424,7 +1424,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1730,7 +1730,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -1834,7 +1834,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1954,7 +1954,7 @@
   end
   local.get $0
  )
- (func $~lib/util/number/genDigits (type $i64_i64_i32_i64_=>_i32) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -2379,7 +2379,7 @@
   i32.store16 $0
   local.get $4
  )
- (func $~lib/util/number/prettify (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2700,7 +2700,7 @@
    end
   end
  )
- (func $~lib/number/F64#toString (type $none_=>_i32) (result i32)
+ (func $~lib/number/F64#toString (result i32)
   (local $0 i64)
   (local $1 i32)
   (local $2 i32)
@@ -2848,7 +2848,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $resolve-binary/Baz
     block $resolve-binary/Bar
@@ -2886,10 +2886,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-binary
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3049,7 +3049,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $resolve-binary/Bar#constructor (type $none_=>_i32) (result i32)
+ (func $resolve-binary/Bar#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3092,7 +3092,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:resolve-binary (type $none_=>_none)
+ (func $start:resolve-binary
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4459,7 +4459,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4494,7 +4494,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-elementaccess.debug.wat b/tests/compiler/resolve-elementaccess.debug.wat
index 90dd2937ad..ed87499ad4 100644
--- a/tests/compiler/resolve-elementaccess.debug.wat
+++ b/tests/compiler/resolve-elementaccess.debug.wat
@@ -1,23 +1,23 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $f32_i32_=>_i32 (func_subtype (param f32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $f32_i32_=>_i32 (func (param f32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -85,17 +85,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -105,11 +105,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -118,14 +118,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -167,7 +167,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -179,11 +179,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -193,7 +193,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -249,15 +249,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -283,7 +283,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -303,7 +303,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -323,7 +323,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -359,7 +359,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -385,7 +385,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -406,11 +406,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -421,39 +421,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -689,7 +689,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1053,7 +1053,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1218,7 +1218,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1363,7 +1363,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1401,7 +1401,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1414,7 +1414,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1431,7 +1431,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1456,7 +1456,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1636,7 +1636,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1694,7 +1694,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1715,7 +1715,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1731,7 +1731,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1939,7 +1939,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2029,7 +2029,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2138,7 +2138,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2202,7 +2202,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2215,17 +2215,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2278,7 +2278,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2346,7 +2346,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2355,25 +2355,25 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -2428,7 +2428,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -2929,7 +2929,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -3069,7 +3069,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -3407,7 +3407,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -3884,17 +3884,17 @@
   i32.add
   return
  )
- (func $~lib/number/F32#toString (type $f32_i32_=>_i32) (param $this f32) (param $radix i32) (result i32)
+ (func $~lib/number/F32#toString (param $this f32) (param $radix i32) (result i32)
   local.get $this
   f64.promote_f32
   call $~lib/util/number/dtoa
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -3903,7 +3903,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -4007,7 +4007,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -4054,7 +4054,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -4131,7 +4131,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -4222,7 +4222,7 @@
    end
   end
  )
- (func $~lib/number/U8#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/U8#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   i32.const 255
   i32.and
@@ -4230,7 +4230,7 @@
   call $~lib/util/number/utoa32
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $resolve-elementaccess/arr
   local.tee $1
@@ -4262,7 +4262,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4276,25 +4276,25 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/typedarray/Float32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $resolve-elementaccess/Buffer~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $resolve-elementaccess/Buffer~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/typedarray/Uint8Array~visit
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/typedarray/Uint8Array
     block $resolve-elementaccess/Buffer
@@ -4337,10 +4337,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-elementaccess
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -4353,7 +4353,7 @@
    unreachable
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4464,7 +4464,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Float32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4504,7 +4504,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float32Array#__set (type $i32_i32_f32_=>_none) (param $this i32) (param $index i32) (param $value f32)
+ (func $~lib/typedarray/Float32Array#__set (param $this i32) (param $index i32) (param $value f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4551,7 +4551,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -4601,7 +4601,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4697,7 +4697,7 @@
   local.get $3
   return
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4737,7 +4737,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $resolve-elementaccess/Buffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $resolve-elementaccess/Buffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4776,7 +4776,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4819,7 +4819,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4864,7 +4864,7 @@
   local.get $2
   return
  )
- (func $start:resolve-elementaccess (type $none_=>_none)
+ (func $start:resolve-elementaccess
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5251,7 +5251,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
@@ -5335,7 +5335,7 @@
   local.get $3
   return
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $value i32) (param $radix i32) (result i32)
   (local $out i32)
   (local $decimals i32)
   (local $buffer i32)
diff --git a/tests/compiler/resolve-elementaccess.release.wat b/tests/compiler/resolve-elementaccess.release.wat
index abe55c60e2..3831b34214 100644
--- a/tests/compiler/resolve-elementaccess.release.wat
+++ b/tests/compiler/resolve-elementaccess.release.wat
@@ -1,18 +1,18 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i64_i64_i32_i64_i32_=>_i32 (func_subtype (param i64 i64 i32 i64 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $f32_=>_i32 (func_subtype (param f32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i64_i64_i32_i64_i32_=>_i32 (func (param i64 i64 i32 i64 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $f32_=>_i32 (func (param f32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -89,7 +89,7 @@
  (data (i32.const 4800) "\07\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\01\19\00\00A\00\00\00A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $resolve-elementaccess/arr
@@ -152,7 +152,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -284,7 +284,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -437,7 +437,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -683,7 +683,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -795,7 +795,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -874,7 +874,7 @@
   i32.const 37600
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1141,7 +1141,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1267,7 +1267,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1573,7 +1573,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1628,7 +1628,7 @@
    end
   end
  )
- (func $~lib/util/number/genDigits (type $i64_i64_i32_i64_i32_=>_i32) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i64)
@@ -2052,7 +2052,7 @@
   i32.store16 $0
   local.get $4
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -2156,7 +2156,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   local.get $2
@@ -2484,7 +2484,7 @@
    end
   end
  )
- (func $~lib/util/number/dtoa_core (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $0 f64) (result i32)
   (local $1 i64)
   (local $2 i32)
   (local $3 i64)
@@ -2762,7 +2762,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/number/F32#toString (type $f32_=>_i32) (param $0 f32) (result i32)
+ (func $~lib/number/F32#toString (param $0 f32) (result i32)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -2852,7 +2852,7 @@
   end
   local.get $2
  )
- (func $~lib/number/U8#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/U8#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2917,7 +2917,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $folding-inner0
    block $invalid
     block $~lib/string/String
@@ -2945,10 +2945,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-elementaccess
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -3049,7 +3049,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#__set (type $i32_i32_f32_=>_none) (param $0 i32) (param $1 i32) (param $2 f32)
+ (func $~lib/typedarray/Float32Array#__set (param $0 i32) (param $1 i32) (param $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3104,7 +3104,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $0 i32) (param $1 i32) (result f32)
   (local $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3161,7 +3161,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3321,7 +3321,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3372,7 +3372,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3424,7 +3424,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:resolve-elementaccess (type $none_=>_none)
+ (func $start:resolve-elementaccess
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3883,7 +3883,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-function-expression.debug.wat b/tests/compiler/resolve-function-expression.debug.wat
index 0c11056606..8ca583c174 100644
--- a/tests/compiler/resolve-function-expression.debug.wat
+++ b/tests/compiler/resolve-function-expression.debug.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -58,23 +58,23 @@
  (elem $0 (i32.const 1) $start:resolve-function-expression~anonymous|0 $start:resolve-function-expression~anonymous|1 $start:resolve-function-expression~anonymous|2)
  (export "memory" (memory $0))
  (start $~start)
- (func $start:resolve-function-expression~anonymous|0 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|0 (param $a i32) (result i32)
   local.get $a
   i32.const 40
   i32.add
  )
- (func $start:resolve-function-expression~anonymous|1 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|1 (param $a i32) (result i32)
   local.get $a
   i32.const 41
   i32.add
   return
  )
- (func $start:resolve-function-expression~anonymous|2 (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|2 (param $a i32) (result i32)
   local.get $a
   i32.const 42
   i32.add
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -129,17 +129,17 @@
   end
   unreachable
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -149,11 +149,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -162,14 +162,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -211,7 +211,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -223,11 +223,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -237,7 +237,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -293,15 +293,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -327,7 +327,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -347,7 +347,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -367,7 +367,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -403,7 +403,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -429,7 +429,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -450,11 +450,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -465,39 +465,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -733,7 +733,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1097,7 +1097,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1262,7 +1262,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1407,7 +1407,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1445,7 +1445,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1458,7 +1458,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1475,7 +1475,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1500,7 +1500,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1680,7 +1680,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1738,7 +1738,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1759,7 +1759,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1775,7 +1775,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1983,7 +1983,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2073,7 +2073,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2182,7 +2182,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2246,7 +2246,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2259,17 +2259,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2322,7 +2322,7 @@
   local.get $ptr
   return
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2462,7 +2462,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2509,7 +2509,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2586,7 +2586,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2677,17 +2677,17 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2696,7 +2696,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2800,7 +2800,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 624
   local.get $0
@@ -2815,7 +2815,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2829,14 +2829,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2844,7 +2844,7 @@
   local.get $1
   call $~lib/function/Function<%28i32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28i32%29=>i32>
     block $~lib/arraybuffer/ArrayBufferView
@@ -2875,10 +2875,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-function-expression
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2891,7 +2891,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2987,7 +2987,7 @@
   local.get $3
   return
  )
- (func $start:resolve-function-expression (type $none_=>_none)
+ (func $start:resolve-function-expression
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3082,7 +3082,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3106,7 +3106,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
diff --git a/tests/compiler/resolve-function-expression.release.wat b/tests/compiler/resolve-function-expression.release.wat
index b10851b4bd..73b99b393f 100644
--- a/tests/compiler/resolve-function-expression.release.wat
+++ b/tests/compiler/resolve-function-expression.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -56,22 +56,22 @@
  (elem $0 (i32.const 1) $start:resolve-function-expression~anonymous|0 $start:resolve-function-expression~anonymous|1 $start:resolve-function-expression~anonymous|2)
  (export "memory" (memory $0))
  (start $~start)
- (func $start:resolve-function-expression~anonymous|0 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|0 (param $0 i32) (result i32)
   local.get $0
   i32.const 40
   i32.add
  )
- (func $start:resolve-function-expression~anonymous|1 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|1 (param $0 i32) (result i32)
   local.get $0
   i32.const 41
   i32.add
  )
- (func $start:resolve-function-expression~anonymous|2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:resolve-function-expression~anonymous|2 (param $0 i32) (result i32)
   local.get $0
   i32.const 42
   i32.add
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1648
@@ -120,7 +120,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -252,7 +252,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -405,7 +405,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -651,7 +651,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -763,7 +763,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -842,7 +842,7 @@
   i32.const 36224
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1109,7 +1109,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1235,7 +1235,7 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1758,7 +1758,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $~lib/function/Function<%28i32%29=>i32>
@@ -1824,7 +1824,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2078,7 +2078,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-localortype.debug.wat b/tests/compiler/resolve-localortype.debug.wat
index 35b1a65462..b2017caf22 100644
--- a/tests/compiler/resolve-localortype.debug.wat
+++ b/tests/compiler/resolve-localortype.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
@@ -11,11 +11,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "test" (func $export:resolve-localortype/test))
- (func $resolve-localortype/foo<~lib/string/String> (type $i32_=>_i32) (param $s i32) (result i32)
+ (func $resolve-localortype/foo<~lib/string/String> (param $s i32) (result i32)
   local.get $s
   return
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -28,7 +28,7 @@
    unreachable
   end
  )
- (func $resolve-localortype/test (type $i32_=>_i32) (param $string i32) (result i32)
+ (func $resolve-localortype/test (param $string i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -53,7 +53,7 @@
   local.get $1
   return
  )
- (func $export:resolve-localortype/test (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:resolve-localortype/test (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-localortype.release.wat b/tests/compiler/resolve-localortype.release.wat
index 0d990973b5..64f8e21612 100644
--- a/tests/compiler/resolve-localortype.release.wat
+++ b/tests/compiler/resolve-localortype.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33792))
  (memory $0 0)
  (export "memory" (memory $0))
  (export "test" (func $export:resolve-localortype/test))
- (func $export:resolve-localortype/test (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:resolve-localortype/test (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-nested.debug.wat b/tests/compiler/resolve-nested.debug.wat
index c1792fcfb2..2e918e766f 100644
--- a/tests/compiler/resolve-nested.debug.wat
+++ b/tests/compiler/resolve-nested.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $resolve-nested/Outer.Inner.a (mut i32) (i32.const 0))
  (global $resolve-nested/Outer.Inner.b (mut i32) (i32.const 0))
@@ -25,10 +25,10 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "outer" (func $export:resolve-nested/outer))
- (func $resolve-nested/outer (type $i32_i32_i32_=>_none) (param $a i32) (param $b i32) (param $c i32)
+ (func $resolve-nested/outer (param $a i32) (param $b i32) (param $c i32)
   nop
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -41,7 +41,7 @@
    unreachable
   end
  )
- (func $export:resolve-nested/outer (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $export:resolve-nested/outer (param $0 i32) (param $1 i32) (param $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
   i32.sub
diff --git a/tests/compiler/resolve-nested.release.wat b/tests/compiler/resolve-nested.release.wat
index c03a22ed55..4c633e5c55 100644
--- a/tests/compiler/resolve-nested.release.wat
+++ b/tests/compiler/resolve-nested.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33792))
  (memory $0 0)
  (export "memory" (memory $0))
  (export "outer" (func $export:resolve-nested/outer))
- (func $export:resolve-nested/outer (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $export:resolve-nested/outer (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
diff --git a/tests/compiler/resolve-new.debug.wat b/tests/compiler/resolve-new.debug.wat
index 1c4bbd0c24..1716a8099d 100644
--- a/tests/compiler/resolve-new.debug.wat
+++ b/tests/compiler/resolve-new.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,17 +42,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -62,11 +62,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -75,14 +75,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -124,7 +124,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -136,11 +136,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -150,7 +150,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -206,15 +206,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -240,7 +240,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -260,7 +260,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -280,7 +280,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -316,7 +316,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -342,7 +342,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -363,11 +363,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -378,39 +378,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -646,7 +646,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1010,7 +1010,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1175,7 +1175,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1320,7 +1320,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1358,7 +1358,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1371,7 +1371,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1388,7 +1388,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1413,7 +1413,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1593,7 +1593,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1651,7 +1651,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1672,7 +1672,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1688,7 +1688,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1896,7 +1896,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1986,7 +1986,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2095,7 +2095,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2159,7 +2159,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2172,17 +2172,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2235,10 +2235,10 @@
   local.get $ptr
   return
  )
- (func $resolve-new/Foo#bar (type $i32_=>_none) (param $this i32)
+ (func $resolve-new/Foo#bar (param $this i32)
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $resolve-new/foo
   local.tee $1
@@ -2254,7 +2254,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2268,10 +2268,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $resolve-new/Foo
     block $~lib/arraybuffer/ArrayBufferView
@@ -2299,10 +2299,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-new
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2315,7 +2315,7 @@
    unreachable
   end
  )
- (func $resolve-new/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-new/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2353,7 +2353,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:resolve-new (type $none_=>_none)
+ (func $start:resolve-new
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2396,7 +2396,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-new.release.wat b/tests/compiler/resolve-new.release.wat
index ce80ef931a..cb6dc791af 100644
--- a/tests/compiler/resolve-new.release.wat
+++ b/tests/compiler/resolve-new.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -33,7 +33,7 @@
  (data (i32.const 1440) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $resolve-new/foo
@@ -84,7 +84,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -216,7 +216,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -369,7 +369,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -615,7 +615,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -727,7 +727,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -806,7 +806,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1073,7 +1073,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1130,7 +1130,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1363,7 +1363,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $resolve-new/Foo
     block $~lib/arraybuffer/ArrayBufferView
@@ -1395,7 +1395,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1459,7 +1459,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $resolve-new/Foo#constructor (type $none_=>_i32) (result i32)
+ (func $resolve-new/Foo#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1525,7 +1525,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-propertyaccess.debug.wat b/tests/compiler/resolve-propertyaccess.debug.wat
index 5f39924789..08683b9901 100644
--- a/tests/compiler/resolve-propertyaccess.debug.wat
+++ b/tests/compiler/resolve-propertyaccess.debug.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $resolve-propertyaccess/Namespace.member i32 (i32.const 1))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -74,7 +74,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -129,17 +129,17 @@
   end
   unreachable
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -149,11 +149,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -162,14 +162,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -211,7 +211,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -223,11 +223,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -237,7 +237,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -293,15 +293,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -327,7 +327,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -347,7 +347,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -367,7 +367,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -403,7 +403,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -429,7 +429,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -450,11 +450,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -465,39 +465,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -733,7 +733,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1097,7 +1097,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1262,7 +1262,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1407,7 +1407,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1445,7 +1445,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1458,7 +1458,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1475,7 +1475,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1500,7 +1500,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1680,7 +1680,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1738,7 +1738,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1759,7 +1759,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1775,7 +1775,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1983,7 +1983,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2073,7 +2073,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2182,7 +2182,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2246,7 +2246,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2259,17 +2259,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2322,7 +2322,7 @@
   local.get $ptr
   return
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2462,7 +2462,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2509,7 +2509,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2586,7 +2586,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2677,17 +2677,17 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2696,7 +2696,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2800,24 +2800,24 @@
   i32.const 0
   return
  )
- (func $resolve-propertyaccess/Class.get:staticProperty (type $none_=>_i32) (result i32)
+ (func $resolve-propertyaccess/Class.get:staticProperty (result i32)
   i32.const 7
   return
  )
- (func $resolve-propertyaccess/Class#set:instanceField (type $i32_i32_=>_none) (param $this i32) (param $instanceField i32)
+ (func $resolve-propertyaccess/Class#set:instanceField (param $this i32) (param $instanceField i32)
   local.get $this
   local.get $instanceField
   i32.store $0
  )
- (func $resolve-propertyaccess/Class#get:instanceField (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-propertyaccess/Class#get:instanceField (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $resolve-propertyaccess/Class#get:instanceProperty (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-propertyaccess/Class#get:instanceProperty (param $this i32) (result i32)
   i32.const 8
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 448
   local.get $0
@@ -2832,7 +2832,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2846,10 +2846,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $resolve-propertyaccess/Class
     block $~lib/arraybuffer/ArrayBufferView
@@ -2877,10 +2877,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-propertyaccess
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2893,7 +2893,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2989,7 +2989,7 @@
   local.get $3
   return
  )
- (func $resolve-propertyaccess/Class#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-propertyaccess/Class#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3035,7 +3035,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:resolve-propertyaccess (type $none_=>_none)
+ (func $start:resolve-propertyaccess
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3376,7 +3376,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -3558,7 +3558,7 @@
   local.get $14
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-propertyaccess.release.wat b/tests/compiler/resolve-propertyaccess.release.wat
index 6e1d89947d..f1dfc9aa82 100644
--- a/tests/compiler/resolve-propertyaccess.release.wat
+++ b/tests/compiler/resolve-propertyaccess.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -70,7 +70,7 @@
  (data (i32.const 3680) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1472
@@ -119,7 +119,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -251,7 +251,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -404,7 +404,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -650,7 +650,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -762,7 +762,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -841,7 +841,7 @@
   i32.const 36480
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1108,7 +1108,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1234,7 +1234,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1540,7 +1540,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1761,7 +1761,7 @@
   end
   local.get $2
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $resolve-propertyaccess/Class
     block $~lib/arraybuffer/ArrayBufferView
@@ -1793,10 +1793,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-propertyaccess
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1956,7 +1956,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:resolve-propertyaccess (type $none_=>_none)
+ (func $start:resolve-propertyaccess
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2353,7 +2353,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-ternary.debug.wat b/tests/compiler/resolve-ternary.debug.wat
index ac8e2f16a9..32cfedeafd 100644
--- a/tests/compiler/resolve-ternary.debug.wat
+++ b/tests/compiler/resolve-ternary.debug.wat
@@ -1,21 +1,21 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $f64_i32_=>_i32 (func_subtype (param f64 i32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $f64_i32_=>_i32 (func (param f64 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $resolve-ternary/b (mut i32) (i32.const 1))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -81,7 +81,7 @@
  (elem $0 (i32.const 1) $start:resolve-ternary~anonymous|0 $start:resolve-ternary~anonymous|1 $resolve-ternary/g1 $resolve-ternary/g2)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -136,17 +136,17 @@
   end
   unreachable
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -156,11 +156,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -169,14 +169,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -218,7 +218,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -230,11 +230,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -244,7 +244,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -300,15 +300,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -334,7 +334,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -354,7 +354,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -374,7 +374,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -410,7 +410,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -436,7 +436,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -457,11 +457,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -472,39 +472,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -740,7 +740,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1104,7 +1104,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1269,7 +1269,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1414,7 +1414,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1452,7 +1452,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1465,7 +1465,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1482,7 +1482,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1507,7 +1507,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1687,7 +1687,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1745,7 +1745,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1766,7 +1766,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1782,7 +1782,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1990,7 +1990,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2080,7 +2080,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2189,7 +2189,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2253,7 +2253,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2266,17 +2266,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2329,7 +2329,7 @@
   local.get $ptr
   return
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2469,7 +2469,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2516,7 +2516,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2593,7 +2593,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2684,17 +2684,17 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2703,7 +2703,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2807,7 +2807,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -3308,7 +3308,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -3646,7 +3646,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -4123,34 +4123,34 @@
   i32.add
   return
  )
- (func $~lib/number/F64#toString (type $f64_i32_=>_i32) (param $this f64) (param $radix i32) (result i32)
+ (func $~lib/number/F64#toString (param $this f64) (param $radix i32) (result i32)
   local.get $this
   call $~lib/util/number/dtoa
   return
  )
- (func $start:resolve-ternary~anonymous|0 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $start:resolve-ternary~anonymous|0 (param $x i32) (result i32)
   local.get $x
   i32.const 1
   i32.add
  )
- (func $start:resolve-ternary~anonymous|1 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $start:resolve-ternary~anonymous|1 (param $x i32) (result i32)
   local.get $x
   i32.const 2
   i32.add
  )
- (func $resolve-ternary/g1 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $resolve-ternary/g1 (param $x i32) (result i32)
   local.get $x
   i32.const 3
   i32.add
   return
  )
- (func $resolve-ternary/g2 (type $i32_=>_i32) (param $x i32) (result i32)
+ (func $resolve-ternary/g2 (param $x i32) (result i32)
   local.get $x
   i32.const 4
   i32.add
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 448
   local.get $0
@@ -4165,7 +4165,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4179,14 +4179,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28i32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4194,7 +4194,7 @@
   local.get $1
   call $~lib/function/Function<%28i32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28i32%29=>i32>
     block $~lib/arraybuffer/ArrayBufferView
@@ -4225,10 +4225,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-ternary
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -4241,7 +4241,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4337,7 +4337,7 @@
   local.get $3
   return
  )
- (func $start:resolve-ternary (type $none_=>_none)
+ (func $start:resolve-ternary
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4493,7 +4493,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4517,7 +4517,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -4699,7 +4699,7 @@
   local.get $14
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
diff --git a/tests/compiler/resolve-ternary.release.wat b/tests/compiler/resolve-ternary.release.wat
index 0d20a81e7d..58eecd5448 100644
--- a/tests/compiler/resolve-ternary.release.wat
+++ b/tests/compiler/resolve-ternary.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i64_i64_i32_i64_=>_i32 (func_subtype (param i64 i64 i32 i64) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i64_i64_i32_i64_=>_i32 (func (param i64 i64 i32 i64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -75,7 +75,7 @@
  (elem $0 (i32.const 1) $start:resolve-ternary~anonymous|0 $start:resolve-ternary~anonymous|1 $resolve-ternary/g1 $resolve-ternary/g2)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1472
@@ -124,7 +124,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -256,7 +256,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -409,7 +409,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -655,7 +655,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -767,7 +767,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -846,7 +846,7 @@
   i32.const 37408
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1113,7 +1113,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1239,7 +1239,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1545,7 +1545,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -1649,7 +1649,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/genDigits (type $i64_i64_i32_i64_=>_i32) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -2071,7 +2071,7 @@
   i32.store16 $0
   local.get $4
  )
- (func $~lib/util/number/prettify (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2392,19 +2392,19 @@
    end
   end
  )
- (func $start:resolve-ternary~anonymous|0 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:resolve-ternary~anonymous|0 (param $0 i32) (result i32)
   i32.const 2
  )
- (func $start:resolve-ternary~anonymous|1 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $start:resolve-ternary~anonymous|1 (param $0 i32) (result i32)
   i32.const 3
  )
- (func $resolve-ternary/g1 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $resolve-ternary/g1 (param $0 i32) (result i32)
   i32.const 4
  )
- (func $resolve-ternary/g2 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $resolve-ternary/g2 (param $0 i32) (result i32)
   i32.const 5
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $~lib/function/Function<%28i32%29=>i32>
@@ -2470,7 +2470,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i64)
   (local $2 f64)
@@ -2770,7 +2770,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2930,7 +2930,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/resolve-unary.debug.wat b/tests/compiler/resolve-unary.debug.wat
index 9d67c8f7ac..9ab4cafcff 100644
--- a/tests/compiler/resolve-unary.debug.wat
+++ b/tests/compiler/resolve-unary.debug.wat
@@ -1,17 +1,17 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -74,7 +74,7 @@
  (elem $0 (i32.const 1) $start:resolve-unary~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -129,17 +129,17 @@
   end
   unreachable
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -149,11 +149,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -162,14 +162,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -211,7 +211,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -223,11 +223,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -237,7 +237,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -293,15 +293,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -327,7 +327,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -347,7 +347,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -367,7 +367,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -403,7 +403,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -429,7 +429,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -450,11 +450,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -465,39 +465,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -733,7 +733,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1097,7 +1097,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1262,7 +1262,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1407,7 +1407,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1445,7 +1445,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1458,7 +1458,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1475,7 +1475,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1500,7 +1500,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1680,7 +1680,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1738,7 +1738,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1759,7 +1759,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1775,7 +1775,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1983,7 +1983,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2073,7 +2073,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2182,7 +2182,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2246,7 +2246,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2259,17 +2259,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2322,7 +2322,7 @@
   local.get $ptr
   return
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2462,7 +2462,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2509,7 +2509,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2586,7 +2586,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2677,17 +2677,17 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2696,7 +2696,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2800,7 +2800,7 @@
   i32.const 0
   return
  )
- (func $~lib/number/Bool#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/Bool#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   if (result i32)
    i32.const 2368
@@ -2809,69 +2809,69 @@
   end
   return
  )
- (func $resolve-unary/Foo#plus (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#plus (param $this i32) (result i32)
   i32.const 2464
   return
  )
- (func $~lib/string/String#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#toString (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Foo#minus (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#minus (param $this i32) (result i32)
   i32.const 2496
   return
  )
- (func $resolve-unary/Foo#prefix_inc (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#prefix_inc (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Foo#self (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#self (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Foo#prefix_dec (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#prefix_dec (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Foo#not (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#not (param $this i32) (result i32)
   i32.const 2528
   return
  )
- (func $resolve-unary/Foo#bitwise_not (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#bitwise_not (param $this i32) (result i32)
   i32.const 2560
   return
  )
- (func $resolve-unary/Foo#postfix_inc (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#postfix_inc (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Foo#postfix_dec (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#postfix_dec (param $this i32) (result i32)
   local.get $this
   return
  )
- (func $resolve-unary/Bar.prefix_inc (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $resolve-unary/Bar.prefix_inc (param $a i32) (result i32)
   i32.const 2592
   return
  )
- (func $resolve-unary/Bar.prefix_dec (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $resolve-unary/Bar.prefix_dec (param $a i32) (result i32)
   i32.const 2624
   return
  )
- (func $resolve-unary/Bar.postfix_inc (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $resolve-unary/Bar.postfix_inc (param $a i32) (result i32)
   i32.const 2656
   return
  )
- (func $resolve-unary/Bar.postfix_dec (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $resolve-unary/Bar.postfix_dec (param $a i32) (result i32)
   i32.const 2688
   return
  )
- (func $start:resolve-unary~anonymous|0 (type $none_=>_none)
+ (func $start:resolve-unary~anonymous|0
   nop
  )
- (func $resolve-unary/generic<~lib/string/String> (type $i32_=>_none) (param $v i32)
+ (func $resolve-unary/generic<~lib/string/String> (param $v i32)
   nop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $resolve-unary/foo
   local.tee $1
@@ -2900,7 +2900,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2914,14 +2914,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2929,7 +2929,7 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28%29=>void>
     block $resolve-unary/Bar
@@ -2966,10 +2966,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-unary
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2982,7 +2982,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3078,7 +3078,7 @@
   local.get $3
   return
  )
- (func $resolve-unary/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3116,7 +3116,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $resolve-unary/Bar#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $resolve-unary/Bar#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3154,7 +3154,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:resolve-unary (type $none_=>_none)
+ (func $start:resolve-unary
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3845,7 +3845,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3869,7 +3869,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -4051,7 +4051,7 @@
   local.get $14
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/resolve-unary.release.wat b/tests/compiler/resolve-unary.release.wat
index c69b5a31db..e7bc793ac4 100644
--- a/tests/compiler/resolve-unary.release.wat
+++ b/tests/compiler/resolve-unary.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -84,7 +84,7 @@
  (data (i32.const 3840) "\07\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $resolve-unary/foo
@@ -145,7 +145,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -277,7 +277,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -430,7 +430,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -676,7 +676,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -788,7 +788,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -867,7 +867,7 @@
   i32.const 36640
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1134,7 +1134,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1260,7 +1260,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1566,7 +1566,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1787,7 +1787,7 @@
   end
   local.get $2
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $~lib/function/Function<%28%29=>void>
@@ -1859,10 +1859,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:resolve-unary
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2022,7 +2022,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:resolve-unary (type $none_=>_none)
+ (func $start:resolve-unary
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2676,7 +2676,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/object/Object#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2711,7 +2711,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/retain-i32.debug.wat b/tests/compiler/retain-i32.debug.wat
index cfff4754ed..0c43a37d4b 100644
--- a/tests/compiler/retain-i32.debug.wat
+++ b/tests/compiler/retain-i32.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/builtins/i8.MAX_VALUE i32 (i32.const 127))
  (global $~lib/builtins/i8.MIN_VALUE i32 (i32.const -128))
@@ -24,7 +24,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $retain-i32/test (type $i32_i32_=>_none) (param $a i32) (param $b i32)
+ (func $retain-i32/test (param $a i32) (param $b i32)
   local.get $a
   local.get $b
   i32.add
@@ -300,7 +300,7 @@
    unreachable
   end
  )
- (func $retain-i32/testLocalRetain (type $none_=>_none)
+ (func $retain-i32/testLocalRetain
   (local $ri i32)
   i32.const 0
   i32.load8_s $0
@@ -308,7 +308,7 @@
   i32.const 1
   drop
  )
- (func $start:retain-i32 (type $none_=>_none)
+ (func $start:retain-i32
   (local $i i32)
   i32.const 0
   global.get $~lib/builtins/i8.MAX_VALUE
@@ -747,7 +747,7 @@
   drop
   call $retain-i32/testLocalRetain
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:retain-i32
  )
 )
diff --git a/tests/compiler/retain-i32.release.wat b/tests/compiler/retain-i32.release.wat
index 4773b3e833..7d2098cc81 100644
--- a/tests/compiler/retain-i32.release.wat
+++ b/tests/compiler/retain-i32.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 1)
  (data (i32.const 1036) ",")
  (data (i32.const 1048) "\02\00\00\00\1a\00\00\00r\00e\00t\00a\00i\00n\00-\00i\003\002\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   i32.const -128
   local.set $0
diff --git a/tests/compiler/return-unreachable.debug.wat b/tests/compiler/return-unreachable.debug.wat
index 12824776ba..54877803da 100644
--- a/tests/compiler/return-unreachable.debug.wat
+++ b/tests/compiler/return-unreachable.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -45,17 +45,17 @@
  (export "test" (func $return-unreachable/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -65,11 +65,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -78,14 +78,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -127,7 +127,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -139,11 +139,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -153,7 +153,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -209,15 +209,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -243,7 +243,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -263,7 +263,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -283,7 +283,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -319,7 +319,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -345,7 +345,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -366,11 +366,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -381,39 +381,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -649,7 +649,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1013,7 +1013,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1178,7 +1178,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1323,7 +1323,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1361,7 +1361,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1374,7 +1374,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1391,7 +1391,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1416,7 +1416,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1596,7 +1596,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1654,7 +1654,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1675,7 +1675,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1691,7 +1691,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1899,7 +1899,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1989,7 +1989,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2098,7 +2098,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2162,7 +2162,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2175,17 +2175,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2238,7 +2238,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2306,7 +2306,7 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2315,22 +2315,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $return-unreachable/test (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $return-unreachable/test (param $a i32) (result i32)
   (local $str i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2348,7 +2348,7 @@
   i32.store $0
   unreachable
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 320
   local.get $0
@@ -2360,7 +2360,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2374,14 +2374,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2389,7 +2389,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $~lib/arraybuffer/ArrayBufferView
@@ -2420,7 +2420,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -2439,7 +2439,7 @@
   call $~lib/rt/itcms/initLazy
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2452,7 +2452,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -2590,7 +2590,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/return-unreachable.release.wat b/tests/compiler/return-unreachable.release.wat
index d12246b722..23a8e2606c 100644
--- a/tests/compiler/return-unreachable.release.wat
+++ b/tests/compiler/return-unreachable.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -38,7 +38,7 @@
  (export "test" (func $return-unreachable/test))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1344
@@ -85,7 +85,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -217,7 +217,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -370,7 +370,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -616,7 +616,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -728,7 +728,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -807,7 +807,7 @@
   i32.const 34336
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1074,7 +1074,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1200,7 +1200,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1506,7 +1506,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1561,7 +1561,7 @@
    end
   end
  )
- (func $return-unreachable/test (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $return-unreachable/test (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1671,7 +1671,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
@@ -1737,7 +1737,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1771,7 +1771,7 @@
   i32.const 1440
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/return.debug.wat b/tests/compiler/return.debug.wat
index 96d2dbeb78..ee825776f7 100644
--- a/tests/compiler/return.debug.wat
+++ b/tests/compiler/return.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~argumentsLength (mut i32) (i32.const 0))
  (global $~lib/memory/__data_end i32 (i32.const 44))
@@ -16,13 +16,13 @@
  (export "memory" (memory $0))
  (export "testVoidReturnFunction" (func $export:return/testVoidReturnFunction))
  (start $~start)
- (func $return/nop (type $none_=>_none)
+ (func $return/nop
   nop
  )
- (func $start:return~anonymous|0 (type $none_=>_none)
+ (func $start:return~anonymous|0
   call $return/nop
  )
- (func $return/testVoidReturnFunction (type $i32_i32_=>_none) (param $cond i32) (param $fn i32)
+ (func $return/testVoidReturnFunction (param $cond i32) (param $fn i32)
   local.get $cond
   if
    i32.const 0
@@ -39,7 +39,7 @@
   call_indirect $0 (type $none_=>_none)
   return
  )
- (func $return/testVoidReturn (type $i32_=>_none) (param $cond i32)
+ (func $return/testVoidReturn (param $cond i32)
   local.get $cond
   if
    call $return/nop
@@ -48,10 +48,10 @@
   call $return/nop
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:return
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -64,7 +64,7 @@
    unreachable
   end
  )
- (func $start:return (type $none_=>_none)
+ (func $start:return
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -87,7 +87,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:return/testVoidReturnFunction (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:return/testVoidReturnFunction (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/return.release.wat b/tests/compiler/return.release.wat
index 69f6ad57c6..28b75bfb2e 100644
--- a/tests/compiler/return.release.wat
+++ b/tests/compiler/return.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33836))
  (memory $0 1)
@@ -14,13 +14,13 @@
  (export "memory" (memory $0))
  (export "testVoidReturnFunction" (func $export:return/testVoidReturnFunction))
  (start $~start)
- (func $start:return~anonymous|0 (type $none_=>_none)
+ (func $start:return~anonymous|0
   nop
  )
- (func $return/testVoidReturn (type $i32_=>_none) (param $0 i32)
+ (func $return/testVoidReturn (param $0 i32)
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -52,7 +52,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:return/testVoidReturnFunction (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:return/testVoidReturnFunction (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/rt/finalize.debug.wat b/tests/compiler/rt/finalize.debug.wat
index a4d3df545a..760ffd333b 100644
--- a/tests/compiler/rt/finalize.debug.wat
+++ b/tests/compiler/rt/finalize.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $rt/finalize/expect (mut i32) (i32.const 0))
  (global $rt/finalize/ran (mut i32) (i32.const 0))
@@ -45,17 +45,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -65,11 +65,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -78,14 +78,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -127,7 +127,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -139,11 +139,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -153,7 +153,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -209,15 +209,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -243,7 +243,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -263,7 +263,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -283,7 +283,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -319,7 +319,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -345,7 +345,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -366,11 +366,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -381,7 +381,7 @@
   i32.add
   return
  )
- (func $rt/finalize/__finalize (type $i32_=>_none) (param $ptr i32)
+ (func $rt/finalize/__finalize (param $ptr i32)
   local.get $ptr
   global.get $rt/finalize/expect
   i32.eq
@@ -397,39 +397,39 @@
   i32.const 1
   global.set $rt/finalize/ran
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -665,7 +665,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1029,7 +1029,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1194,7 +1194,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1339,7 +1339,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1377,7 +1377,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1390,7 +1390,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1407,7 +1407,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1436,7 +1436,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1616,7 +1616,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1674,7 +1674,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1695,7 +1695,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1711,7 +1711,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1919,7 +1919,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2009,7 +2009,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2118,7 +2118,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2182,7 +2182,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2195,17 +2195,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2258,7 +2258,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2304,7 +2304,7 @@
   i32.const 0
   drop
  )
- (func $start:rt/finalize (type $none_=>_none)
+ (func $start:rt/finalize
   memory.size $0
   i32.const 16
   i32.shl
@@ -2337,7 +2337,7 @@
    unreachable
   end
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2346,7 +2346,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2360,10 +2360,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $rt/finalize/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -2391,7 +2391,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2400,7 +2400,7 @@
   global.set $~started
   call $start:rt/finalize
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2413,7 +2413,7 @@
    unreachable
   end
  )
- (func $rt/finalize/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $rt/finalize/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2451,7 +2451,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/rt/finalize.release.wat b/tests/compiler/rt/finalize.release.wat
index 2273a30809..cccbbe02a6 100644
--- a/tests/compiler/rt/finalize.release.wat
+++ b/tests/compiler/rt/finalize.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $rt/finalize/expect (mut i32) (i32.const 0))
  (global $rt/finalize/ran (mut i32) (i32.const 0))
@@ -37,7 +37,7 @@
  (data (i32.const 1488) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -82,7 +82,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -214,7 +214,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -367,7 +367,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -613,7 +613,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -725,7 +725,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -804,7 +804,7 @@
   i32.const 34288
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1086,7 +1086,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1143,7 +1143,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1376,7 +1376,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $rt/finalize/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -1408,7 +1408,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~started
@@ -1558,7 +1558,7 @@
    unreachable
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/rt/flags.debug.wat b/tests/compiler/rt/flags.debug.wat
index e1235d9ec9..55d3dcc921 100644
--- a/tests/compiler/rt/flags.debug.wat
+++ b/tests/compiler/rt/flags.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -22,11 +22,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -52,7 +52,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $rt/flags/test<~lib/typedarray/Int8Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Int8Array> (param $flags i32)
   i32.const 4
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -67,7 +67,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Uint8Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Uint8Array> (param $flags i32)
   i32.const 5
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -82,7 +82,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Uint8ClampedArray> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Uint8ClampedArray> (param $flags i32)
   i32.const 6
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -97,7 +97,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Int16Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Int16Array> (param $flags i32)
   i32.const 7
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -112,7 +112,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Uint16Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Uint16Array> (param $flags i32)
   i32.const 8
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -127,7 +127,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Int32Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Int32Array> (param $flags i32)
   i32.const 9
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -142,7 +142,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Uint32Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Uint32Array> (param $flags i32)
   i32.const 10
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -157,7 +157,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Int64Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Int64Array> (param $flags i32)
   i32.const 11
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -172,7 +172,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Uint64Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Uint64Array> (param $flags i32)
   i32.const 12
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -187,7 +187,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Float32Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Float32Array> (param $flags i32)
   i32.const 13
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -202,7 +202,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/typedarray/Float64Array> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/typedarray/Float64Array> (param $flags i32)
   i32.const 14
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -217,7 +217,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<i8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<i8>> (param $flags i32)
   i32.const 15
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -232,7 +232,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<u8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<u8>> (param $flags i32)
   i32.const 16
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -247,7 +247,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<i16>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<i16>> (param $flags i32)
   i32.const 17
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -262,7 +262,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<u16>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<u16>> (param $flags i32)
   i32.const 18
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -277,7 +277,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<i32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<i32>> (param $flags i32)
   i32.const 19
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -292,7 +292,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<u32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<u32>> (param $flags i32)
   i32.const 20
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -307,7 +307,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<i64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<i64>> (param $flags i32)
   i32.const 21
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -322,7 +322,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<u64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<u64>> (param $flags i32)
   i32.const 22
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -337,7 +337,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<f32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<f32>> (param $flags i32)
   i32.const 23
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -352,7 +352,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<f64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<f64>> (param $flags i32)
   i32.const 24
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -367,7 +367,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<v128>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<v128>> (param $flags i32)
   i32.const 25
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -382,7 +382,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<rt/flags/Ref>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<rt/flags/Ref>> (param $flags i32)
   i32.const 27
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -397,7 +397,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/array/Array<rt/flags/Ref|null>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/array/Array<rt/flags/Ref|null>> (param $flags i32)
   i32.const 28
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -412,7 +412,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<i8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<i8>> (param $flags i32)
   i32.const 29
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -427,7 +427,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<u8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<u8>> (param $flags i32)
   i32.const 30
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -442,7 +442,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<i16>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<i16>> (param $flags i32)
   i32.const 31
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -457,7 +457,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<u16>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<u16>> (param $flags i32)
   i32.const 32
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -472,7 +472,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<i32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<i32>> (param $flags i32)
   i32.const 33
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -487,7 +487,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<u32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<u32>> (param $flags i32)
   i32.const 34
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -502,7 +502,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<i64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<i64>> (param $flags i32)
   i32.const 35
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -517,7 +517,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<u64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<u64>> (param $flags i32)
   i32.const 36
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -532,7 +532,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<f32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<f32>> (param $flags i32)
   i32.const 37
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -547,7 +547,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<f64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<f64>> (param $flags i32)
   i32.const 38
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -562,7 +562,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<v128>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<v128>> (param $flags i32)
   i32.const 39
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -577,7 +577,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<rt/flags/Ref>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<rt/flags/Ref>> (param $flags i32)
   i32.const 40
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -592,7 +592,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/set/Set<rt/flags/Ref|null>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/set/Set<rt/flags/Ref|null>> (param $flags i32)
   i32.const 41
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -607,7 +607,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<v128,i8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<v128,i8>> (param $flags i32)
   i32.const 42
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -622,7 +622,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i64,i16>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i64,i16>> (param $flags i32)
   i32.const 43
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -637,7 +637,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i32,i32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i32,i32>> (param $flags i32)
   i32.const 44
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -652,7 +652,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i16,i64>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i16,i64>> (param $flags i32)
   i32.const 45
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -667,7 +667,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i8,v128>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i8,v128>> (param $flags i32)
   i32.const 46
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -682,7 +682,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<rt/flags/Ref,i8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<rt/flags/Ref,i8>> (param $flags i32)
   i32.const 47
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -697,7 +697,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<rt/flags/Ref|null,i8>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<rt/flags/Ref|null,i8>> (param $flags i32)
   i32.const 48
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -712,7 +712,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i8,rt/flags/Ref>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i8,rt/flags/Ref>> (param $flags i32)
   i32.const 49
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -727,7 +727,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<i8,rt/flags/Ref|null>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<i8,rt/flags/Ref|null>> (param $flags i32)
   i32.const 50
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -742,7 +742,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<rt/flags/Ref|null,rt/flags/Ref|null>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<rt/flags/Ref|null,rt/flags/Ref|null>> (param $flags i32)
   i32.const 51
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -757,7 +757,7 @@
    unreachable
   end
  )
- (func $rt/flags/test<~lib/map/Map<f32,i32>> (type $i32_=>_none) (param $flags i32)
+ (func $rt/flags/test<~lib/map/Map<f32,i32>> (param $flags i32)
   i32.const 52
   call $~lib/rt/__typeinfo
   local.get $flags
@@ -772,7 +772,7 @@
    unreachable
   end
  )
- (func $start:rt/flags (type $none_=>_none)
+ (func $start:rt/flags
   i32.const 1
   i32.const 64
   i32.or
@@ -1098,7 +1098,7 @@
   i32.or
   call $rt/flags/test<~lib/map/Map<f32,i32>>
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:rt/flags
  )
 )
diff --git a/tests/compiler/rt/flags.release.wat b/tests/compiler/rt/flags.release.wat
index 3023c87f49..04a1f84e56 100644
--- a/tests/compiler/rt/flags.release.wat
+++ b/tests/compiler/rt/flags.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 1036) "<")
@@ -13,7 +13,7 @@
  (data (i32.const 1200) "5\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00A\08\00\00A\00\00\00A\00\00\00\81\08\00\00\81\00\00\00\01\t\00\00\01\01\00\00\01\n\00\00\01\02\00\00\01\19\00\00\01\1a\00\00B\08\00\00B\00\00\00\82\08\00\00\82\00\00\00\02\t\00\00\02\01\00\00\02\n\00\00\02\02\00\00\02\19\00\00\02\1a\00\00\02\04\00\00 \00\00\00\02A\00\00\02a\00\00H\08\00\00H\00\00\00\88\08\00\00\88\00\00\00\08\t\00\00\08\01\00\00\08\n\00\00\08\02\00\00\08\19\00\00\08\1a\00\00\08\04\00\00\08A\00\00\08a\00\00P\08\08\00\90\08\14\00\10\t\12\00\10\n\11\00\10\84\10\00P\08\82\00P\08\c2\00\10\c1\10\00\10\e1\10\00\10a\c2\00\10\t2")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $0 i32) (result i32)
   local.get $0
   i32.const 1200
   i32.load $0
@@ -33,7 +33,7 @@
   i32.add
   i32.load $0
  )
- (func $start:rt/flags (type $none_=>_none)
+ (func $start:rt/flags
   block $folding-inner0
    i32.const 4
    call $~lib/rt/__typeinfo
@@ -284,7 +284,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:rt/flags
  )
 )
diff --git a/tests/compiler/rt/ids.debug.wat b/tests/compiler/rt/ids.debug.wat
index 428e573f04..6ee554366f 100644
--- a/tests/compiler/rt/ids.debug.wat
+++ b/tests/compiler/rt/ids.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
  (global $~lib/shared/runtime/Runtime.Incremental i32 (i32.const 2))
@@ -11,7 +11,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:rt/ids (type $none_=>_none)
+ (func $start:rt/ids
   i32.const 0
   i32.const 0
   i32.eq
@@ -29,7 +29,7 @@
   i32.eq
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:rt/ids
  )
 )
diff --git a/tests/compiler/rt/runtime-incremental-export.debug.wat b/tests/compiler/rt/runtime-incremental-export.debug.wat
index 15f4832cef..25aa3ed731 100644
--- a/tests/compiler/rt/runtime-incremental-export.debug.wat
+++ b/tests/compiler/rt/runtime-incremental-export.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -48,17 +48,17 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -68,11 +68,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -81,14 +81,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -130,7 +130,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -142,11 +142,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -156,7 +156,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -212,15 +212,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -246,7 +246,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -266,7 +266,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -286,7 +286,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -322,7 +322,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -348,7 +348,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -369,11 +369,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -384,39 +384,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -652,7 +652,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1016,7 +1016,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1181,7 +1181,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1326,7 +1326,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1364,7 +1364,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1377,7 +1377,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1394,7 +1394,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1419,7 +1419,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1599,7 +1599,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1657,7 +1657,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1678,7 +1678,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1694,7 +1694,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1902,7 +1902,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1992,7 +1992,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2101,7 +2101,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2165,7 +2165,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2178,17 +2178,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2241,7 +2241,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $ptr i32) (result i32)
   (local $obj i32)
   local.get $ptr
   if
@@ -2271,7 +2271,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/itcms/__unpin (param $ptr i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -2309,7 +2309,7 @@
    call $~lib/rt/itcms/Object#linkTo
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2355,7 +2355,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -2370,7 +2370,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2384,10 +2384,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2412,7 +2412,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
diff --git a/tests/compiler/rt/runtime-incremental-export.release.wat b/tests/compiler/rt/runtime-incremental-export.release.wat
index 5ebb10c709..70d90691f3 100644
--- a/tests/compiler/rt/runtime-incremental-export.release.wat
+++ b/tests/compiler/rt/runtime-incremental-export.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -42,7 +42,7 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -91,7 +91,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#unlink (param $0 i32)
   (local $1 i32)
   local.get $0
   i32.load $0 offset=4
@@ -142,7 +142,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -226,7 +226,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -379,7 +379,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -625,7 +625,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -737,7 +737,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -816,7 +816,7 @@
   i32.const 34368
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1083,7 +1083,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1209,7 +1209,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1515,7 +1515,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/itcms/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__pin (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1566,7 +1566,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/itcms/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/__unpin (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1625,7 +1625,7 @@
    i32.store $0 offset=8
   end
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   global.get $~lib/rt/itcms/state
   i32.const 0
   i32.gt_s
@@ -1660,7 +1660,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1689,7 +1689,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1723,7 +1723,7 @@
   i32.const 1344
   global.set $~lib/rt/itcms/fromSpace
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/rt/runtime-minimal-export.debug.wat b/tests/compiler/rt/runtime-minimal-export.debug.wat
index cc3634f593..228a822953 100644
--- a/tests/compiler/rt/runtime-minimal-export.debug.wat
+++ b/tests/compiler/rt/runtime-minimal-export.debug.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
  (global $~lib/native/ASC_LOW_MEMORY_LIMIT i32 (i32.const 0))
@@ -36,43 +36,43 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -308,7 +308,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -672,7 +672,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -837,7 +837,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -982,7 +982,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1003,7 +1003,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1019,7 +1019,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1227,7 +1227,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1317,7 +1317,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -1426,7 +1426,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -1490,7 +1490,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -1503,27 +1503,27 @@
   i32.add
   return
  )
- (func $~lib/rt/tcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/tcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/tcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/tcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/tcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/tcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/tcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/tcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/tcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/tcms/Object#set:nextWithColor
@@ -1533,15 +1533,15 @@
   local.get $space
   return
  )
- (func $~lib/rt/tcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/tcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -1551,7 +1551,7 @@
   i32.or
   call $~lib/rt/tcms/Object#set:nextWithColor
  )
- (func $~lib/rt/tcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/tcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/tcms/Object#get:prev
@@ -1571,7 +1571,7 @@
   local.get $this
   call $~lib/rt/tcms/Object#set:prev
  )
- (func $~lib/rt/tcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -1582,7 +1582,7 @@
   i32.add
   return
  )
- (func $~lib/rt/tcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/tcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   local.get $size
   i32.const 1073741804
@@ -1622,14 +1622,14 @@
   i32.add
   return
  )
- (func $~lib/rt/tcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/tcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/tcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/tcms/Object#get:nextWithColor
   i32.const 3
@@ -1638,7 +1638,7 @@
   i32.and
   return
  )
- (func $~lib/rt/tcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/tcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -1694,7 +1694,7 @@
   local.get $next
   call $~lib/rt/tcms/Object#set:next
  )
- (func $~lib/rt/tcms/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tcms/__pin (param $ptr i32) (result i32)
   (local $obj i32)
   local.get $ptr
   if
@@ -1724,7 +1724,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/tcms/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tcms/__unpin (param $ptr i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -1754,7 +1754,7 @@
   global.get $~lib/rt/tcms/white
   call $~lib/rt/tcms/Object#linkTo
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1792,7 +1792,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1805,7 +1805,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1822,7 +1822,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/tcms/__collect (type $none_=>_none)
+ (func $~lib/rt/tcms/__collect
   (local $pn i32)
   (local $iter i32)
   (local $black i32)
@@ -1981,7 +1981,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/tcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -2008,7 +2008,7 @@
    call $~lib/rt/tcms/Object#linkTo
   end
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 32
   local.get $0
@@ -2020,7 +2020,7 @@
   local.get $0
   call $~lib/rt/tcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2034,10 +2034,10 @@
    call $~lib/rt/tcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2062,7 +2062,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 208
   call $~lib/rt/tcms/initLazy
   global.set $~lib/rt/tcms/fromSpace
diff --git a/tests/compiler/rt/runtime-minimal-export.release.wat b/tests/compiler/rt/runtime-minimal-export.release.wat
index 6e0a7de3ea..f6717c4ce9 100644
--- a/tests/compiler/rt/runtime-minimal-export.release.wat
+++ b/tests/compiler/rt/runtime-minimal-export.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/tlsf/ROOT (mut i32) (i32.const 0))
  (global $~lib/rt/tcms/fromSpace (mut i32) (i32.const 0))
@@ -33,7 +33,7 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -186,7 +186,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -432,7 +432,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -544,7 +544,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -623,7 +623,7 @@
   i32.const 1488
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -749,7 +749,7 @@
    end
   end
  )
- (func $~lib/rt/tcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1005,7 +1005,7 @@
   i32.const 20
   i32.add
  )
- (func $~lib/rt/tcms/Object#unlink (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tcms/Object#unlink (param $0 i32)
   (local $1 i32)
   local.get $0
   i32.load $0 offset=4
@@ -1056,7 +1056,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tcms/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tcms/__pin (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1107,7 +1107,7 @@
   end
   local.get $0
  )
- (func $~lib/rt/tcms/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tcms/__unpin (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1158,7 +1158,7 @@
   local.get $1
   i32.store $0 offset=8
  )
- (func $~lib/rt/tcms/__collect (type $none_=>_none)
+ (func $~lib/rt/tcms/__collect
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1368,7 +1368,7 @@
   local.get $3
   global.set $~lib/rt/tcms/white
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   block $invalid
@@ -1434,7 +1434,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 1236
   i32.const 1232
   i32.store $0
@@ -1460,7 +1460,7 @@
   i32.const 1424
   global.set $~lib/rt/tcms/toSpace
  )
- (func $byn-split-outlined-A$~lib/rt/tcms/__visit_0 (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/tcms/__visit_0 (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/rt/tcms/white
diff --git a/tests/compiler/rt/runtime-stub-export.debug.wat b/tests/compiler/rt/runtime-stub-export.debug.wat
index 679de591d2..0d06091a4b 100644
--- a/tests/compiler/rt/runtime-stub-export.debug.wat
+++ b/tests/compiler/rt/runtime-stub-export.debug.wat
@@ -1,10 +1,10 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
@@ -23,7 +23,7 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/stub/maybeGrowMemory (type $i32_=>_none) (param $newOffset i32)
+ (func $~lib/rt/stub/maybeGrowMemory (param $newOffset i32)
   (local $pagesBefore i32)
   (local $maxOffset i32)
   (local $pagesNeeded i32)
@@ -84,12 +84,12 @@
   local.get $newOffset
   global.set $~lib/rt/stub/offset
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/stub/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/stub/__alloc (param $size i32) (result i32)
   (local $block i32)
   (local $ptr i32)
   (local $size|3 i32)
@@ -138,27 +138,27 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/common/OBJECT#set:gcInfo (type $i32_i32_=>_none) (param $this i32) (param $gcInfo i32)
+ (func $~lib/rt/common/OBJECT#set:gcInfo (param $this i32) (param $gcInfo i32)
   local.get $this
   local.get $gcInfo
   i32.store $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#set:gcInfo2 (type $i32_i32_=>_none) (param $this i32) (param $gcInfo2 i32)
+ (func $~lib/rt/common/OBJECT#set:gcInfo2 (param $this i32) (param $gcInfo2 i32)
   local.get $this
   local.get $gcInfo2
   i32.store $0 offset=8
  )
- (func $~lib/rt/common/OBJECT#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/common/OBJECT#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/common/OBJECT#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/common/OBJECT#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/stub/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/stub/__new (param $size i32) (param $id i32) (result i32)
   (local $ptr i32)
   (local $object i32)
   local.get $size
@@ -198,17 +198,17 @@
   i32.add
   return
  )
- (func $~lib/rt/stub/__pin (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/stub/__pin (param $ptr i32) (result i32)
   local.get $ptr
   return
  )
- (func $~lib/rt/stub/__unpin (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/stub/__unpin (param $ptr i32)
   nop
  )
- (func $~lib/rt/stub/__collect (type $none_=>_none)
+ (func $~lib/rt/stub/__collect
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~lib/memory/__heap_base
   i32.const 4
   i32.add
diff --git a/tests/compiler/rt/runtime-stub-export.release.wat b/tests/compiler/rt/runtime-stub-export.release.wat
index 8ce14339e6..5422ff5ea2 100644
--- a/tests/compiler/rt/runtime-stub-export.release.wat
+++ b/tests/compiler/rt/runtime-stub-export.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
  (global $~lib/rt/__rtti_base i32 (i32.const 1168))
@@ -20,7 +20,7 @@
  (export "__rtti_base" (global $~lib/rt/__rtti_base))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/stub/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/stub/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -130,16 +130,16 @@
   i32.const 16
   i32.add
  )
- (func $~lib/rt/stub/__pin (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/stub/__pin (param $0 i32) (result i32)
   local.get $0
  )
- (func $~lib/rt/stub/__unpin (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/stub/__unpin (param $0 i32)
   nop
  )
- (func $~lib/rt/stub/__collect (type $none_=>_none)
+ (func $~lib/rt/stub/__collect
   nop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   i32.const 1196
   global.set $~lib/rt/stub/offset
  )
diff --git a/tests/compiler/scoped.debug.wat b/tests/compiler/scoped.debug.wat
index 7b5f0c7627..18cde11496 100644
--- a/tests/compiler/scoped.debug.wat
+++ b/tests/compiler/scoped.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
  (global $scoped/aGlobal (mut i32) (i32.const 1))
  (global $scoped/aConstant i32 (i32.const 3))
  (global $scoped/aStartFunctionLocal (mut i32) (i32.const 2))
@@ -12,7 +12,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $scoped/fn (type $i32_=>_none) (param $c i32)
+ (func $scoped/fn (param $c i32)
   (local $a i32)
   (local $b i32)
   i32.const 0
@@ -20,7 +20,7 @@
   local.get $c
   local.set $b
  )
- (func $start:scoped (type $none_=>_none)
+ (func $start:scoped
   (local $anotherStartFunctionLocal i32)
   (local $aGlobal i32)
   (local $aConstant i64)
@@ -63,7 +63,7 @@
   i32.const 42
   call $scoped/fn
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:scoped
  )
 )
diff --git a/tests/compiler/scoped.release.wat b/tests/compiler/scoped.release.wat
index 3847e37904..23e6ec1719 100644
--- a/tests/compiler/scoped.release.wat
+++ b/tests/compiler/scoped.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   loop $for-loop|0
diff --git a/tests/compiler/simd.debug.wat b/tests/compiler/simd.debug.wat
index 86cf214ce8..f8a950898b 100644
--- a/tests/compiler/simd.debug.wat
+++ b/tests/compiler/simd.debug.wat
@@ -1,27 +1,27 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32) (result v128) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_v128 (func_subtype (result v128) func))
- (type $v128_=>_v128 (func_subtype (param v128) (result v128) func))
- (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result v128) func))
- (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32 i32 i32 i32 i32) (result v128) func))
- (type $i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32) (result v128) func))
- (type $i64_=>_v128 (func_subtype (param i64) (result v128) func))
- (type $i64_i64_=>_v128 (func_subtype (param i64 i64) (result v128) func))
- (type $f32_f32_f32_=>_v128 (func_subtype (param f32 f32 f32) (result v128) func))
- (type $f32_f32_f32_f32_=>_v128 (func_subtype (param f32 f32 f32 f32) (result v128) func))
- (type $f64_=>_v128 (func_subtype (param f64) (result v128) func))
- (type $f64_f64_=>_v128 (func_subtype (param f64 f64) (result v128) func))
- (type $i32_i32_=>_v128 (func_subtype (param i32 i32) (result v128) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_v128 (func (param i32 i32 i32) (result v128)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_v128 (func (result v128)))
+ (type $v128_=>_v128 (func (param v128) (result v128)))
+ (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result v128)))
+ (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32 i32 i32 i32 i32) (result v128)))
+ (type $i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32) (result v128)))
+ (type $i64_=>_v128 (func (param i64) (result v128)))
+ (type $i64_i64_=>_v128 (func (param i64 i64) (result v128)))
+ (type $f32_f32_f32_=>_v128 (func (param f32 f32 f32) (result v128)))
+ (type $f32_f32_f32_f32_=>_v128 (func (param f32 f32 f32 f32) (result v128)))
+ (type $f64_=>_v128 (func (param f64) (result v128)))
+ (type $f64_f64_=>_v128 (func (param f64 f64) (result v128)))
+ (type $i32_i32_=>_v128 (func (param i32 i32) (result v128)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -80,17 +80,17 @@
  (export "vec" (global $simd/vec))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -100,11 +100,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -113,14 +113,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -162,7 +162,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -174,11 +174,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -188,7 +188,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -244,15 +244,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -278,7 +278,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -298,7 +298,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -318,7 +318,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -354,7 +354,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -380,7 +380,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -401,11 +401,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -416,39 +416,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -684,7 +684,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1048,7 +1048,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1213,7 +1213,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1358,7 +1358,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1396,7 +1396,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1409,7 +1409,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1426,7 +1426,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1451,7 +1451,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1631,7 +1631,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1689,7 +1689,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1710,7 +1710,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1726,7 +1726,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1934,7 +1934,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2024,7 +2024,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2133,7 +2133,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2197,7 +2197,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2210,17 +2210,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2273,7 +2273,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2289,7 +2289,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2357,15 +2357,15 @@
    end
   end
  )
- (func $~lib/array/Array<v128>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<v128>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<v128>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<v128>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $simd/test_v128 (type $none_=>_none)
+ (func $simd/test_v128
   (local $ptr i32)
   (local $ptr|1 i32)
   (local $ptr|2 i32)
@@ -2963,7 +2963,7 @@
   i32.eq
   drop
  )
- (func $simd/test_i8x16 (type $none_=>_none)
+ (func $simd/test_i8x16
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -3583,7 +3583,7 @@
   i32.eq
   drop
  )
- (func $simd/test_i16x8 (type $none_=>_none)
+ (func $simd/test_i16x8
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -4340,7 +4340,7 @@
   i32.eq
   drop
  )
- (func $simd/test_i32x4 (type $none_=>_none)
+ (func $simd/test_i32x4
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -5003,7 +5003,7 @@
   i32.eq
   drop
  )
- (func $simd/test_i64x2 (type $none_=>_none)
+ (func $simd/test_i64x2
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -5614,7 +5614,7 @@
   i32.eq
   drop
  )
- (func $simd/test_f32x4 (type $none_=>_none)
+ (func $simd/test_f32x4
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -6095,7 +6095,7 @@
   i32.ne
   drop
  )
- (func $simd/test_f64x2 (type $none_=>_none)
+ (func $simd/test_f64x2
   (local $a v128)
   (local $b v128)
   (local $c v128)
@@ -6562,20 +6562,20 @@
   i32.ne
   drop
  )
- (func $simd/test_const (type $none_=>_v128) (result v128)
+ (func $simd/test_const (result v128)
   (local $one v128)
   v128.const i32x4 0x00000001 0x00000001 0x00000001 0x00000001
   local.set $one
   local.get $one
   return
  )
- (func $simd/reexport (type $v128_=>_v128) (param $a v128) (result v128)
+ (func $simd/reexport (param $a v128) (result v128)
   local.get $a
   local.get $a
   i32x4.mul
   return
  )
- (func $simd/test_vars_i8x16_partial (type $i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (result v128)
+ (func $simd/test_vars_i8x16_partial (param $a i32) (param $b i32) (param $c i32) (result v128)
   v128.const i32x4 0x03000100 0x07000504 0x0b0a0908 0x000e0d0c
   local.get $a
   i8x16.replace_lane 2
@@ -6585,7 +6585,7 @@
   i8x16.replace_lane 15
   return
  )
- (func $simd/test_vars_i8x16_full (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (param $d i32) (param $e i32) (param $f i32) (param $g i32) (param $h i32) (param $i i32) (param $k i32) (param $l i32) (param $m i32) (param $n i32) (param $o i32) (param $p i32) (param $q i32) (result v128)
+ (func $simd/test_vars_i8x16_full (param $a i32) (param $b i32) (param $c i32) (param $d i32) (param $e i32) (param $f i32) (param $g i32) (param $h i32) (param $i i32) (param $k i32) (param $l i32) (param $m i32) (param $n i32) (param $o i32) (param $p i32) (param $q i32) (result v128)
   local.get $a
   i8x16.splat
   local.get $b
@@ -6620,7 +6620,7 @@
   i8x16.replace_lane 15
   return
  )
- (func $simd/test_vars_i16x8_partial (type $i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (result v128)
+ (func $simd/test_vars_i16x8_partial (param $a i32) (param $b i32) (param $c i32) (result v128)
   v128.const i32x4 0x00010000 0x00030000 0x00050000 0x00000006
   local.get $a
   i16x8.replace_lane 2
@@ -6630,7 +6630,7 @@
   i16x8.replace_lane 7
   return
  )
- (func $simd/test_vars_i16x8_full (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (param $d i32) (param $e i32) (param $f i32) (param $g i32) (param $h i32) (result v128)
+ (func $simd/test_vars_i16x8_full (param $a i32) (param $b i32) (param $c i32) (param $d i32) (param $e i32) (param $f i32) (param $g i32) (param $h i32) (result v128)
   local.get $a
   i16x8.splat
   local.get $b
@@ -6649,7 +6649,7 @@
   i16x8.replace_lane 7
   return
  )
- (func $simd/test_vars_i32x4_partial (type $i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (result v128)
+ (func $simd/test_vars_i32x4_partial (param $a i32) (param $b i32) (param $c i32) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $a
   i32x4.replace_lane 1
@@ -6659,7 +6659,7 @@
   i32x4.replace_lane 3
   return
  )
- (func $simd/test_vars_i32x4_full (type $i32_i32_i32_i32_=>_v128) (param $a i32) (param $b i32) (param $c i32) (param $d i32) (result v128)
+ (func $simd/test_vars_i32x4_full (param $a i32) (param $b i32) (param $c i32) (param $d i32) (result v128)
   local.get $a
   i32x4.splat
   local.get $b
@@ -6670,20 +6670,20 @@
   i32x4.replace_lane 3
   return
  )
- (func $simd/test_vars_i64x2_partial (type $i64_=>_v128) (param $a i64) (result v128)
+ (func $simd/test_vars_i64x2_partial (param $a i64) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $a
   i64x2.replace_lane 1
   return
  )
- (func $simd/test_vars_i64x2_full (type $i64_i64_=>_v128) (param $a i64) (param $b i64) (result v128)
+ (func $simd/test_vars_i64x2_full (param $a i64) (param $b i64) (result v128)
   local.get $a
   i64x2.splat
   local.get $b
   i64x2.replace_lane 1
   return
  )
- (func $simd/test_vars_f32x4_partial (type $f32_f32_f32_=>_v128) (param $a f32) (param $b f32) (param $c f32) (result v128)
+ (func $simd/test_vars_f32x4_partial (param $a f32) (param $b f32) (param $c f32) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $a
   f32x4.replace_lane 1
@@ -6693,7 +6693,7 @@
   f32x4.replace_lane 3
   return
  )
- (func $simd/test_vars_f32x4_full (type $f32_f32_f32_f32_=>_v128) (param $a f32) (param $b f32) (param $c f32) (param $d f32) (result v128)
+ (func $simd/test_vars_f32x4_full (param $a f32) (param $b f32) (param $c f32) (param $d f32) (result v128)
   local.get $a
   f32x4.splat
   local.get $b
@@ -6704,20 +6704,20 @@
   f32x4.replace_lane 3
   return
  )
- (func $simd/test_vars_f64x2_partial (type $f64_=>_v128) (param $a f64) (result v128)
+ (func $simd/test_vars_f64x2_partial (param $a f64) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $a
   f64x2.replace_lane 1
   return
  )
- (func $simd/test_vars_f64x2_full (type $f64_f64_=>_v128) (param $a f64) (param $b f64) (result v128)
+ (func $simd/test_vars_f64x2_full (param $a f64) (param $b f64) (result v128)
   local.get $a
   f64x2.splat
   local.get $b
   f64x2.replace_lane 1
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 272
   local.get $0
@@ -6726,7 +6726,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -6740,14 +6740,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<v128>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<v128>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<v128>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<v128>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -6755,11 +6755,11 @@
   local.get $1
   call $~lib/array/Array<v128>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -6767,7 +6767,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $~lib/array/Array<v128>
@@ -6804,10 +6804,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:simd
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -6820,7 +6820,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<v128>#__get (type $i32_i32_=>_v128) (param $this i32) (param $index i32) (result v128)
+ (func $~lib/array/Array<v128>#__get (param $this i32) (param $index i32) (result v128)
   (local $value v128)
   (local $3 i32)
   (local $4 v128)
@@ -6873,7 +6873,7 @@
   local.get $4
   return
  )
- (func $start:simd (type $none_=>_none)
+ (func $start:simd
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -6958,7 +6958,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<v128>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<v128>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6984,7 +6984,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7010,7 +7010,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
diff --git a/tests/compiler/simd.release.wat b/tests/compiler/simd.release.wat
index 5281530f34..1103cb213f 100644
--- a/tests/compiler/simd.release.wat
+++ b/tests/compiler/simd.release.wat
@@ -1,23 +1,23 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32) (result v128) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $v128_=>_v128 (func_subtype (param v128) (result v128) func))
- (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result v128) func))
- (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32 i32 i32 i32 i32) (result v128) func))
- (type $i32_i32_i32_i32_=>_v128 (func_subtype (param i32 i32 i32 i32) (result v128) func))
- (type $i64_=>_v128 (func_subtype (param i64) (result v128) func))
- (type $i64_i64_=>_v128 (func_subtype (param i64 i64) (result v128) func))
- (type $f32_f32_f32_=>_v128 (func_subtype (param f32 f32 f32) (result v128) func))
- (type $f32_f32_f32_f32_=>_v128 (func_subtype (param f32 f32 f32 f32) (result v128) func))
- (type $f64_=>_v128 (func_subtype (param f64) (result v128) func))
- (type $f64_f64_=>_v128 (func_subtype (param f64 f64) (result v128) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_v128 (func (param i32 i32 i32) (result v128)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $v128_=>_v128 (func (param v128) (result v128)))
+ (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result v128)))
+ (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32 i32 i32 i32 i32) (result v128)))
+ (type $i32_i32_i32_i32_=>_v128 (func (param i32 i32 i32 i32) (result v128)))
+ (type $i64_=>_v128 (func (param i64) (result v128)))
+ (type $i64_i64_=>_v128 (func (param i64 i64) (result v128)))
+ (type $f32_f32_f32_=>_v128 (func (param f32 f32 f32) (result v128)))
+ (type $f32_f32_f32_f32_=>_v128 (func (param f32 f32 f32 f32) (result v128)))
+ (type $f64_=>_v128 (func (param f64) (result v128)))
+ (type $f64_f64_=>_v128 (func (param f64 f64) (result v128)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -65,7 +65,7 @@
  (export "vec" (global $simd/vec))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1296
@@ -110,7 +110,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -242,7 +242,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -395,7 +395,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -641,7 +641,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -753,7 +753,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -832,7 +832,7 @@
   i32.const 34384
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tlsf/__free (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -884,7 +884,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1105,7 +1105,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1231,7 +1231,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1424,7 +1424,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/rt/itcms/total
@@ -1526,7 +1526,7 @@
   v128.store $0 align=1
   local.get $0
  )
- (func $simd/test_v128 (type $none_=>_none)
+ (func $simd/test_v128
   (local $0 i32)
   (local $1 v128)
   global.get $~lib/rt/tlsf/ROOT
@@ -1844,12 +1844,12 @@
   local.get $0
   call $~lib/rt/tlsf/__free
  )
- (func $simd/reexport (type $v128_=>_v128) (param $0 v128) (result v128)
+ (func $simd/reexport (param $0 v128) (result v128)
   local.get $0
   local.get $0
   i32x4.mul
  )
- (func $simd/test_vars_i8x16_partial (type $i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
+ (func $simd/test_vars_i8x16_partial (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
   v128.const i32x4 0x03000100 0x07000504 0x0b0a0908 0x000e0d0c
   local.get $0
   i8x16.replace_lane 2
@@ -1858,7 +1858,7 @@
   local.get $2
   i8x16.replace_lane 15
  )
- (func $simd/test_vars_i8x16_full (type $i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 i32) (param $11 i32) (param $12 i32) (param $13 i32) (param $14 i32) (param $15 i32) (result v128)
+ (func $simd/test_vars_i8x16_full (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 i32) (param $11 i32) (param $12 i32) (param $13 i32) (param $14 i32) (param $15 i32) (result v128)
   local.get $0
   i8x16.splat
   local.get $1
@@ -1892,7 +1892,7 @@
   local.get $15
   i8x16.replace_lane 15
  )
- (func $simd/test_vars_i16x8_partial (type $i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
+ (func $simd/test_vars_i16x8_partial (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
   v128.const i32x4 0x00010000 0x00030000 0x00050000 0x00000006
   local.get $0
   i16x8.replace_lane 2
@@ -1901,7 +1901,7 @@
   local.get $2
   i16x8.replace_lane 7
  )
- (func $simd/test_vars_i16x8_full (type $i32_i32_i32_i32_i32_i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (result v128)
+ (func $simd/test_vars_i16x8_full (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (result v128)
   local.get $0
   i16x8.splat
   local.get $1
@@ -1919,7 +1919,7 @@
   local.get $7
   i16x8.replace_lane 7
  )
- (func $simd/test_vars_i32x4_partial (type $i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
+ (func $simd/test_vars_i32x4_partial (param $0 i32) (param $1 i32) (param $2 i32) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $0
   i32x4.replace_lane 1
@@ -1928,7 +1928,7 @@
   local.get $2
   i32x4.replace_lane 3
  )
- (func $simd/test_vars_i32x4_full (type $i32_i32_i32_i32_=>_v128) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result v128)
+ (func $simd/test_vars_i32x4_full (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result v128)
   local.get $0
   i32x4.splat
   local.get $1
@@ -1938,18 +1938,18 @@
   local.get $3
   i32x4.replace_lane 3
  )
- (func $simd/test_vars_i64x2_partial (type $i64_=>_v128) (param $0 i64) (result v128)
+ (func $simd/test_vars_i64x2_partial (param $0 i64) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $0
   i64x2.replace_lane 1
  )
- (func $simd/test_vars_i64x2_full (type $i64_i64_=>_v128) (param $0 i64) (param $1 i64) (result v128)
+ (func $simd/test_vars_i64x2_full (param $0 i64) (param $1 i64) (result v128)
   local.get $0
   i64x2.splat
   local.get $1
   i64x2.replace_lane 1
  )
- (func $simd/test_vars_f32x4_partial (type $f32_f32_f32_=>_v128) (param $0 f32) (param $1 f32) (param $2 f32) (result v128)
+ (func $simd/test_vars_f32x4_partial (param $0 f32) (param $1 f32) (param $2 f32) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $0
   f32x4.replace_lane 1
@@ -1958,7 +1958,7 @@
   local.get $2
   f32x4.replace_lane 3
  )
- (func $simd/test_vars_f32x4_full (type $f32_f32_f32_f32_=>_v128) (param $0 f32) (param $1 f32) (param $2 f32) (param $3 f32) (result v128)
+ (func $simd/test_vars_f32x4_full (param $0 f32) (param $1 f32) (param $2 f32) (param $3 f32) (result v128)
   local.get $0
   f32x4.splat
   local.get $1
@@ -1968,18 +1968,18 @@
   local.get $3
   f32x4.replace_lane 3
  )
- (func $simd/test_vars_f64x2_partial (type $f64_=>_v128) (param $0 f64) (result v128)
+ (func $simd/test_vars_f64x2_partial (param $0 f64) (result v128)
   v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000
   local.get $0
   f64x2.replace_lane 1
  )
- (func $simd/test_vars_f64x2_full (type $f64_f64_=>_v128) (param $0 f64) (param $1 f64) (result v128)
+ (func $simd/test_vars_f64x2_full (param $0 f64) (param $1 f64) (result v128)
   local.get $0
   f64x2.splat
   local.get $1
   f64x2.replace_lane 1
  )
- (func $~lib/array/Array<v128>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<v128>~visit (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2015,7 +2015,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $~lib/array/Array<v128>
@@ -2054,7 +2054,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 v128)
   (local $2 i32)
@@ -2429,7 +2429,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/static-this.debug.wat b/tests/compiler/static-this.debug.wat
index 01420c4ea1..29386a4de1 100644
--- a/tests/compiler/static-this.debug.wat
+++ b/tests/compiler/static-this.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $static-this/Foo.bar (mut i32) (i32.const 42))
  (global $~lib/memory/__data_end i32 (i32.const 60))
@@ -13,11 +13,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $static-this/Foo.getBar (type $none_=>_i32) (result i32)
+ (func $static-this/Foo.getBar (result i32)
   global.get $static-this/Foo.bar
   return
  )
- (func $start:static-this (type $none_=>_none)
+ (func $start:static-this
   call $static-this/Foo.getBar
   i32.const 42
   i32.eq
@@ -31,7 +31,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:static-this
  )
 )
diff --git a/tests/compiler/std/array-access.debug.wat b/tests/compiler/std/array-access.debug.wat
index f4508e6bc0..eecc85d753 100644
--- a/tests/compiler/std/array-access.debug.wat
+++ b/tests/compiler/std/array-access.debug.wat
@@ -1,10 +1,10 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -28,35 +28,35 @@
  (export "stringArrayArrayPropertyAccess" (func $export:std/array-access/stringArrayArrayPropertyAccess))
  (export "stringArrayArrayMethodCall" (func $export:std/array-access/stringArrayArrayMethodCall))
  (export "functionArrayElementCall" (func $export:std/array-access/functionArrayElementCall))
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -65,7 +65,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -169,23 +169,23 @@
   i32.const 0
   return
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<%28i32%29=>i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<%28i32%29=>i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<%28i32%29=>i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<%28i32%29=>i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -198,7 +198,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -265,7 +265,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -317,7 +317,7 @@
   local.get $3
   return
  )
- (func $std/array-access/i32ArrayArrayElementAccess (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/i32ArrayArrayElementAccess (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -350,7 +350,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -417,7 +417,7 @@
   local.get $3
   return
  )
- (func $std/array-access/stringArrayPropertyAccess (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/stringArrayPropertyAccess (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -449,7 +449,7 @@
   local.get $1
   return
  )
- (func $~lib/string/String#startsWith (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#startsWith (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -538,7 +538,7 @@
   local.get $10
   return
  )
- (func $std/array-access/stringArrayMethodCall (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/stringArrayMethodCall (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -580,7 +580,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String>>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -647,7 +647,7 @@
   local.get $3
   return
  )
- (func $std/array-access/stringArrayArrayPropertyAccess (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/stringArrayArrayPropertyAccess (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -689,7 +689,7 @@
   local.get $1
   return
  )
- (func $std/array-access/stringArrayArrayMethodCall (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/stringArrayArrayMethodCall (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -738,7 +738,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<%28i32%29=>i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<%28i32%29=>i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -805,7 +805,7 @@
   local.get $3
   return
  )
- (func $std/array-access/functionArrayElementCall (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $std/array-access/functionArrayElementCall (param $a i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -836,7 +836,7 @@
   local.get $1
   return
  )
- (func $export:std/array-access/i32ArrayArrayElementAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/i32ArrayArrayElementAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -855,7 +855,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:std/array-access/stringArrayPropertyAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayPropertyAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -874,7 +874,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:std/array-access/stringArrayMethodCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayMethodCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -893,7 +893,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:std/array-access/stringArrayArrayPropertyAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayArrayPropertyAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -912,7 +912,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:std/array-access/stringArrayArrayMethodCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayArrayMethodCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -931,7 +931,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $export:std/array-access/functionArrayElementCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/functionArrayElementCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/array-access.release.wat b/tests/compiler/std/array-access.release.wat
index 0ab096d808..4ce951aa01 100644
--- a/tests/compiler/std/array-access.release.wat
+++ b/tests/compiler/std/array-access.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34076))
  (memory $0 1)
@@ -14,6 +14,7 @@
  (data (i32.const 1276) "\1c")
  (data (i32.const 1288) "\02")
  (table $0 1 1 funcref)
+ (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "i32ArrayArrayElementAccess" (func $export:std/array-access/i32ArrayArrayElementAccess))
  (export "stringArrayPropertyAccess" (func $export:std/array-access/stringArrayPropertyAccess))
@@ -21,7 +22,7 @@
  (export "stringArrayArrayPropertyAccess" (func $export:std/array-access/stringArrayArrayPropertyAccess))
  (export "stringArrayArrayMethodCall" (func $export:std/array-access/stringArrayArrayMethodCall))
  (export "functionArrayElementCall" (func $export:std/array-access/functionArrayElementCall))
- (func $~lib/array/Array<~lib/array/Array<i32>>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -87,7 +88,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#startsWith (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#startsWith (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -227,7 +228,7 @@
   local.get $2
   i32.eqz
  )
- (func $export:std/array-access/i32ArrayArrayElementAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/i32ArrayArrayElementAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -321,7 +322,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:std/array-access/stringArrayPropertyAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayPropertyAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -383,7 +384,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:std/array-access/stringArrayMethodCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayMethodCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -447,7 +448,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:std/array-access/stringArrayArrayPropertyAccess (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayArrayPropertyAccess (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -519,7 +520,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:std/array-access/stringArrayArrayMethodCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/stringArrayArrayMethodCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -590,7 +591,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $export:std/array-access/functionArrayElementCall (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $export:std/array-access/functionArrayElementCall (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/array-literal.debug.wat b/tests/compiler/std/array-literal.debug.wat
index 9635b306df..c0b9e092c3 100644
--- a/tests/compiler/std/array-literal.debug.wat
+++ b/tests/compiler/std/array-literal.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/array-literal/staticArrayI8 i32 (i32.const 64))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
@@ -60,33 +60,33 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/array/Array<i8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -96,11 +96,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -109,14 +109,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -158,7 +158,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -170,11 +170,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -184,7 +184,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -240,15 +240,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -274,7 +274,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -294,7 +294,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -314,7 +314,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -350,7 +350,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -376,7 +376,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -397,11 +397,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -412,39 +412,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -680,7 +680,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1044,7 +1044,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1209,7 +1209,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1354,7 +1354,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1392,7 +1392,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1405,7 +1405,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1422,7 +1422,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1447,7 +1447,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1627,7 +1627,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1685,7 +1685,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1706,7 +1706,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1722,7 +1722,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1930,7 +1930,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2020,7 +2020,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2129,7 +2129,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2193,7 +2193,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2206,17 +2206,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2269,7 +2269,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2285,7 +2285,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2353,19 +2353,19 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2411,46 +2411,46 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<i8>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i8>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array-literal/Ref>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array-literal/Ref>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array-literal/Ref>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/array-literal/doesntLeak (type $i32_=>_none) (param $refs i32)
+ (func $std/array-literal/doesntLeak (param $refs i32)
   nop
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2496,7 +2496,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/array-literal/staticArrayI8
   local.tee $1
@@ -2557,7 +2557,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2571,14 +2571,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2586,11 +2586,11 @@
   local.get $1
   call $~lib/array/Array<i8>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2598,11 +2598,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<std/array-literal/Ref>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array-literal/Ref>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array-literal/Ref>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2610,11 +2610,11 @@
   local.get $1
   call $~lib/array/Array<std/array-literal/Ref>#__visit
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2622,7 +2622,7 @@
   local.get $1
   call $~lib/array/Array<std/array-literal/RefWithCtor>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<std/array-literal/RefWithCtor>
     block $std/array-literal/RefWithCtor
@@ -2677,10 +2677,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/array-literal
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2693,7 +2693,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2718,7 +2718,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2770,7 +2770,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2795,7 +2795,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2847,7 +2847,7 @@
   local.get $3
   return
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -2966,7 +2966,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i8>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3035,7 +3035,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3104,7 +3104,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array-literal/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array-literal/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3142,7 +3142,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<std/array-literal/Ref>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3215,7 +3215,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array-literal/Ref>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3240,7 +3240,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3313,7 +3313,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3338,7 +3338,7 @@
   local.get $1
   return
  )
- (func $start:std/array-literal (type $none_=>_none)
+ (func $start:std/array-literal
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3911,7 +3911,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3937,7 +3937,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3963,7 +3963,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array-literal/Ref>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4033,7 +4033,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array-literal/RefWithCtor>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array-literal/RefWithCtor>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4103,7 +4103,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -4156,7 +4156,7 @@
   local.get $7
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4184,7 +4184,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $std/array-literal/RefWithCtor#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array-literal/RefWithCtor#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/array-literal.release.wat b/tests/compiler/std/array-literal.release.wat
index 7e30094a85..04aafd11ba 100644
--- a/tests/compiler/std/array-literal.release.wat
+++ b/tests/compiler/std/array-literal.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/array-literal/emptyArrayI32 (mut i32) (i32.const 1424))
  (global $std/array-literal/i (mut i32) (i32.const 0))
@@ -58,7 +58,7 @@
  (data (i32.const 1840) "\n\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00B\08\00\00\02\t\00\00 \00\00\00\02A\00\00 \00\00\00\02A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1088
@@ -139,7 +139,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -271,7 +271,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -424,7 +424,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -670,7 +670,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -782,7 +782,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -861,7 +861,7 @@
   i32.const 34656
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1128,7 +1128,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1254,7 +1254,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1560,7 +1560,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/array/Array<i8>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1596,7 +1596,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array-literal/Ref>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<std/array-literal/Ref>~visit (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1669,7 +1669,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/array/Array<std/array-literal/RefWithCtor>
     block $std/array-literal/RefWithCtor
@@ -1724,10 +1724,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/array-literal
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1760,7 +1760,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1812,7 +1812,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1866,7 +1866,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2003,7 +2003,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i8>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2072,7 +2072,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2143,7 +2143,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array-literal/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $std/array-literal/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2211,7 +2211,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<std/array-literal/Ref>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<std/array-literal/Ref>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2288,7 +2288,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array-literal (type $none_=>_none)
+ (func $start:std/array-literal
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 44
@@ -2826,7 +2826,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2884,7 +2884,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array-literal/RefWithCtor#constructor (type $none_=>_i32) (result i32)
+ (func $std/array-literal/RefWithCtor#constructor (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2917,7 +2917,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -2936,7 +2936,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/array.debug.wat b/tests/compiler/std/array.debug.wat
index 672d1c1cb2..f5909023f3 100644
--- a/tests/compiler/std/array.debug.wat
+++ b/tests/compiler/std/array.debug.wat
@@ -1,37 +1,37 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $none_=>_f64 (func_subtype (result f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i32_i32_=>_f32 (func_subtype (param i32 i32 i32) (result f32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_f32_i32_i32_=>_i32 (func_subtype (param i32 f32 i32 i32) (result i32) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_f32_i32_i32_=>_none (func_subtype (param i32 i32 f32 i32 i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i64_=>_i64 (func_subtype (param i64) (result i64) func))
- (type $i64_=>_none (func_subtype (param i64) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_f32_i32_i32_=>_i32 (func (param i32 f32 i32 i32) (result i32)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_f32_i32_i32_=>_none (func (param i32 i32 f32 i32 i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
+ (type $i64_=>_none (func (param i64)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "Math.random" (func $~lib/bindings/dom/Math.random (result f64)))
  (import "env" "seed" (func $~lib/builtins/seed (result f64)))
@@ -385,17 +385,17 @@
  (elem $0 (i32.const 1) $start:std/array~anonymous|0 $start:std/array~anonymous|1 $start:std/array~anonymous|2 $start:std/array~anonymous|3 $start:std/array~anonymous|4 $start:std/array~anonymous|5 $start:std/array~anonymous|6 $start:std/array~anonymous|7 $start:std/array~anonymous|8 $start:std/array~anonymous|9 $start:std/array~anonymous|10 $start:std/array~anonymous|11 $start:std/array~anonymous|12 $start:std/array~anonymous|13 $start:std/array~anonymous|14 $start:std/array~anonymous|15 $start:std/array~anonymous|16 $start:std/array~anonymous|17 $start:std/array~anonymous|18 $start:std/array~anonymous|19 $start:std/array~anonymous|20 $start:std/array~anonymous|21 $start:std/array~anonymous|22 $start:std/array~anonymous|23 $start:std/array~anonymous|24 $start:std/array~anonymous|25 $start:std/array~anonymous|26 $start:std/array~anonymous|27 $start:std/array~anonymous|28 $start:std/array~anonymous|29 $start:std/array~anonymous|30 $start:std/array~anonymous|31 $start:std/array~anonymous|32 $start:std/array~anonymous|33 $start:std/array~anonymous|34 $start:std/array~anonymous|35 $start:std/array~anonymous|36 $start:std/array~anonymous|37 $start:std/array~anonymous|38 $start:std/array~anonymous|39 $start:std/array~anonymous|40 $start:std/array~anonymous|41 $start:std/array~anonymous|42 $start:std/array~anonymous|43 $start:std/array~anonymous|44 $start:std/array~anonymous|45 $start:std/array~anonymous|46 $start:std/array~anonymous|47 $~lib/util/sort/COMPARATOR<f32>~anonymous|0 $~lib/util/sort/COMPARATOR<f64>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $~lib/util/sort/COMPARATOR<u32>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|1 $std/array/assertStableSortedForComplexObjects~anonymous|0 $start:std/array~anonymous|48 $start:std/array~anonymous|49 $start:std/array~anonymous|50 $start:std/array~anonymous|51 $start:std/array~anonymous|52 $start:std/array~anonymous|53 $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 $~lib/util/sort/COMPARATOR<~lib/string/String>~anonymous|0 $start:std/array~anonymous|54)
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -405,11 +405,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -418,14 +418,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -467,7 +467,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -479,11 +479,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -493,7 +493,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -549,15 +549,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -583,7 +583,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -603,7 +603,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -623,7 +623,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -659,7 +659,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -685,7 +685,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -706,11 +706,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -721,39 +721,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -989,7 +989,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1353,7 +1353,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1518,7 +1518,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1663,7 +1663,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1701,7 +1701,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1714,7 +1714,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1731,7 +1731,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1756,7 +1756,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1936,7 +1936,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1994,7 +1994,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2015,7 +2015,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2031,7 +2031,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2239,7 +2239,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2329,7 +2329,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2438,7 +2438,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2502,7 +2502,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2515,17 +2515,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2578,7 +2578,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2646,7 +2646,7 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2655,22 +2655,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array.isArray<~lib/array/Array<i32>|null> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<~lib/array/Array<i32>|null> (param $value i32) (result i32)
   local.get $value
   i32.const 0
   i32.ne
@@ -2681,12 +2681,12 @@
   end
   return
  )
- (func $std/array/Ref#set:v (type $i32_i32_=>_none) (param $this i32) (param $v i32)
+ (func $std/array/Ref#set:v (param $this i32) (param $v i32)
   local.get $this
   local.get $v
   i32.store $0
  )
- (func $~lib/array/Array.isArray<std/array/Ref> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<std/array/Ref> (param $value i32) (result i32)
   local.get $value
   i32.const 0
   i32.ne
@@ -2697,7 +2697,7 @@
   end
   return
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2706,17 +2706,17 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array.isArray<~lib/typedarray/Uint8Array> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<~lib/typedarray/Uint8Array> (param $value i32) (result i32)
   local.get $value
   i32.const 0
   i32.ne
@@ -2727,11 +2727,11 @@
   end
   return
  )
- (func $~lib/array/Array.isArray<i32> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<i32> (param $value i32) (result i32)
   i32.const 0
   return
  )
- (func $~lib/array/Array.isArray<~lib/string/String> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<~lib/string/String> (param $value i32) (result i32)
   local.get $value
   i32.const 0
   i32.ne
@@ -2742,7 +2742,7 @@
   end
   return
  )
- (func $~lib/array/Array.isArray<~lib/array/Array<i32>> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/array/Array.isArray<~lib/array/Array<i32>> (param $value i32) (result i32)
   local.get $value
   i32.const 0
   i32.ne
@@ -2753,7 +2753,7 @@
   end
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2769,15 +2769,15 @@
   local.get $buffer
   return
  )
- (func $~lib/array/Array<u8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/bytes/FILL<u8> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<u8> (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -2854,15 +2854,15 @@
    memory.fill $0
   end
  )
- (func $~lib/array/Array<u32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/bytes/FILL<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<u32> (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -2978,15 +2978,15 @@
    end
   end
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/bytes/FILL<f32> (type $i32_i32_f32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value f32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<f32> (param $ptr i32) (param $len i32) (param $value f32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -3108,38 +3108,38 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -3185,24 +3185,24 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<std/array/Ref>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array/Ref>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array/Ref>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array/Ref>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/bytes/REVERSE<i32> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<i32> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -3273,7 +3273,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<u8> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u8> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -3437,15 +3437,15 @@
    end
   end
  )
- (func $~lib/array/Array<u16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/bytes/REVERSE<u16> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u16> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -3565,109 +3565,109 @@
    end
   end
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/array/Ref#get:v (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Ref#get:v (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array/Ref|null>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array/Ref|null>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array/Ref|null>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array/Ref|null>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:std/array~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.eq
  )
- (func $start:std/array~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 1
   i32.eq
  )
- (func $start:std/array~anonymous|2 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|2 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 100
   i32.eq
  )
- (func $start:std/array~anonymous|4 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|4 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 100
   i32.eq
  )
- (func $start:std/array~anonymous|6 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|6 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.eq
  )
- (func $start:std/array~anonymous|7 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|7 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 1
   i32.eq
  )
- (func $start:std/array~anonymous|8 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|8 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 100
   i32.eq
  )
- (func $start:std/array~anonymous|10 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|10 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.ge_s
  )
- (func $start:std/array~anonymous|11 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|11 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.le_s
  )
- (func $start:std/array~anonymous|13 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|13 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 10
   i32.lt_s
  )
- (func $start:std/array~anonymous|15 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|15 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 3
   i32.ge_s
  )
- (func $start:std/array~anonymous|16 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|16 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const -1
   i32.le_s
  )
- (func $start:std/array~anonymous|18 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|18 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 10
   i32.gt_s
  )
- (func $start:std/array~anonymous|20 (type $i32_i32_i32_=>_none) (param $value i32) (param $$1 i32) (param $$2 i32)
+ (func $start:std/array~anonymous|20 (param $value i32) (param $$1 i32) (param $$2 i32)
   global.get $std/array/i
   local.get $value
   i32.add
   global.set $std/array/i
  )
- (func $start:std/array~anonymous|22 (type $i32_i32_i32_=>_none) (param $value i32) (param $$1 i32) (param $$2 i32)
+ (func $start:std/array~anonymous|22 (param $value i32) (param $$1 i32) (param $$2 i32)
   global.get $std/array/i
   local.get $value
   i32.add
   global.set $std/array/i
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -3722,7 +3722,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -3862,7 +3862,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -3909,7 +3909,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -3986,7 +3986,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -4077,26 +4077,26 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $start:std/array~anonymous|25 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|25 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 10
   call $~lib/number/I32#toString
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:std/array~anonymous|26 (type $i32_i32_i32_=>_f32) (param $value i32) (param $$1 i32) (param $$2 i32) (result f32)
+ (func $start:std/array~anonymous|26 (param $value i32) (param $$1 i32) (param $$2 i32) (result f32)
   local.get $value
   f32.convert_i32_s
  )
- (func $start:std/array~anonymous|28 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|28 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   global.get $std/array/i
   local.get $value
   i32.add
@@ -4104,12 +4104,12 @@
   local.get $value
   return
  )
- (func $start:std/array~anonymous|30 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|30 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.ge_s
  )
- (func $start:std/array~anonymous|32 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|32 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   global.get $std/array/i
   local.get $value
   i32.add
@@ -4119,17 +4119,17 @@
   i32.ge_s
   return
  )
- (func $start:std/array~anonymous|34 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|34 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $start:std/array~anonymous|35 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|35 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $start:std/array~anonymous|36 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|36 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   if (result i32)
    i32.const 1
@@ -4139,7 +4139,7 @@
    i32.gt_s
   end
  )
- (func $start:std/array~anonymous|37 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|37 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   if (result i32)
    i32.const 1
@@ -4149,22 +4149,22 @@
    i32.gt_s
   end
  )
- (func $start:std/array~anonymous|39 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|39 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $start:std/array~anonymous|41 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|41 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $start:std/array~anonymous|42 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|42 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $start:std/array~anonymous|43 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|43 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   if (result i32)
    i32.const 1
@@ -4174,7 +4174,7 @@
    i32.gt_s
   end
  )
- (func $start:std/array~anonymous|44 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|44 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   if (result i32)
    i32.const 1
@@ -4184,12 +4184,12 @@
    i32.gt_s
   end
  )
- (func $start:std/array~anonymous|46 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/array~anonymous|46 (param $prev i32) (param $current i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $prev
   local.get $current
   i32.add
  )
- (func $~lib/math/murmurHash3 (type $i64_=>_i64) (param $h i64) (result i64)
+ (func $~lib/math/murmurHash3 (param $h i64) (result i64)
   local.get $h
   local.get $h
   i64.const 33
@@ -4219,7 +4219,7 @@
   local.get $h
   return
  )
- (func $~lib/math/splitMix32 (type $i32_=>_i32) (param $h i32) (result i32)
+ (func $~lib/math/splitMix32 (param $h i32) (result i32)
   local.get $h
   i32.const 1831565813
   i32.add
@@ -4255,7 +4255,7 @@
   i32.xor
   return
  )
- (func $~lib/math/NativeMath.seedRandom (type $i64_=>_none) (param $value i64)
+ (func $~lib/math/NativeMath.seedRandom (param $value i64)
   local.get $value
   i64.const 0
   i64.eq
@@ -4281,30 +4281,30 @@
   i32.const 1
   global.set $~lib/math/random_seeded
  )
- (func $std/array/Dim#set:height (type $i32_i32_=>_none) (param $this i32) (param $height i32)
+ (func $std/array/Dim#set:height (param $this i32) (param $height i32)
   local.get $this
   local.get $height
   i32.store $0
  )
- (func $std/array/Dim#set:width (type $i32_i32_=>_none) (param $this i32) (param $width i32)
+ (func $std/array/Dim#set:width (param $this i32) (param $width i32)
   local.get $this
   local.get $width
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<std/array/Dim>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array/Dim>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array/Dim>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<std/array/Dim>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/sort/insertionSort<f32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<f32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a f32)
@@ -4485,7 +4485,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp f32)
@@ -4640,7 +4640,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/nodePower (type $i32_i32_i32_i32_i32_=>_i32) (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
+ (func $~lib/util/sort/nodePower (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
   (local $n i64)
   (local $s i32)
   (local $l i32)
@@ -4691,7 +4691,7 @@
   i32.clz
   return
  )
- (func $~lib/util/sort/mergeRuns<f32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<f32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -4829,7 +4829,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (type $f32_f32_=>_i32) (param $a f32) (param $b f32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (param $a f32) (param $b f32) (result i32)
   (local $ia i32)
   (local $ib i32)
   local.get $a
@@ -4863,7 +4863,7 @@
   i32.sub
   return
  )
- (func $~lib/util/sort/insertionSort<f64> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<f64> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a f64)
@@ -5044,7 +5044,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f64> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f64> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp f64)
@@ -5199,7 +5199,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<f64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<f64> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -5337,7 +5337,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (type $f64_f64_=>_i32) (param $a f64) (param $b f64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (param $a f64) (param $b f64) (result i32)
   (local $ia i64)
   (local $ib i64)
   local.get $a
@@ -5371,7 +5371,7 @@
   i32.sub
   return
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -5552,7 +5552,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -5707,7 +5707,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -5845,12 +5845,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<u32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -6031,7 +6031,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -6186,7 +6186,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<u32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<u32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -6324,7 +6324,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.gt_u
@@ -6333,7 +6333,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/math/NativeMath.random (type $none_=>_f64) (result f64)
+ (func $~lib/math/NativeMath.random (result f64)
   (local $s1 i64)
   (local $s0 i64)
   (local $r i64)
@@ -6386,40 +6386,40 @@
   f64.sub
   return
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|1 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|1 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $std/array/Dim#get:height (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Dim#get:height (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/array/Dim#get:width (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Dim#get:width (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:std/array~anonymous|48 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|48 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $start:std/array~anonymous|49 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|49 (param $a i32) (param $b i32) (result i32)
   local.get $b
   local.get $a
   i32.sub
  )
- (func $start:std/array~anonymous|50 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|50 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $start:std/array~anonymous|51 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|51 (param $a i32) (param $b i32) (result i32)
   local.get $b
   local.get $a
   i32.sub
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -6428,30 +6428,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -6460,47 +6460,47 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $std/array/Proxy<i32>#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $std/array/Proxy<i32>#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/array/Proxy<i32>#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Proxy<i32>#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -6509,7 +6509,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -6613,7 +6613,7 @@
   i32.const 0
   return
  )
- (func $~lib/array/Array<~lib/string/String>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<~lib/string/String>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -6622,34 +6622,34 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<~lib/string/String>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<~lib/string/String>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<~lib/string/String>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<~lib/string/String>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<~lib/string/String>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/string/String>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<bool>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<bool>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<bool>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<bool>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/number/itoa_buffered<i32> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i32> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6743,7 +6743,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<u32> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u32> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6809,7 +6809,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -7310,7 +7310,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -7648,7 +7648,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -8125,7 +8125,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/dtoa_buffered (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_buffered (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   local.get $value
   f64.const 0
@@ -8198,19 +8198,19 @@
   call $~lib/util/number/dtoa_core
   return
  )
- (func $std/array/Ref#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Ref#toString (param $this i32) (result i32)
   i32.const 12608
   return
  )
- (func $~lib/array/Array<i8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/number/itoa_buffered<i8> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i8> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -8341,7 +8341,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<u16> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u16> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -8413,15 +8413,15 @@
   i32.add
   return
  )
- (func $~lib/array/Array<i16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/number/itoa_buffered<i16> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i16> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -8567,15 +8567,15 @@
   i32.add
   return
  )
- (func $~lib/array/Array<u64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/number/decimalCount64High (type $i64_=>_i32) (param $value i64) (result i32)
+ (func $~lib/util/number/decimalCount64High (param $value i64) (result i32)
   local.get $value
   i64.const 1000000000000000
   i64.lt_u
@@ -8634,7 +8634,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $buffer i32) (param $num i64) (param $offset i32)
   (local $t i64)
   (local $r i32)
   (local $b i32)
@@ -8754,7 +8754,7 @@
   local.get $offset
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/itoa_buffered<u64> (type $i32_i64_=>_i32) (param $buffer i32) (param $value i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<u64> (param $buffer i32) (param $value i64) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -8852,15 +8852,15 @@
   i32.add
   return
  )
- (func $~lib/array/Array<i64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/util/number/itoa_buffered<i64> (type $i32_i64_=>_i32) (param $buffer i32) (param $value i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<i64> (param $buffer i32) (param $value i64) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -8986,20 +8986,20 @@
   i32.add
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/number/itoa_buffered<u8> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u8> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -9071,46 +9071,46 @@
   i32.add
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -9156,7 +9156,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/array/arr
   local.tee $1
@@ -9208,7 +9208,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -9222,10 +9222,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9233,16 +9233,16 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/array/Array<u8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9250,11 +9250,11 @@
   local.get $1
   call $~lib/array/Array<u8>#__visit
  )
- (func $~lib/array/Array<u32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9262,11 +9262,11 @@
   local.get $1
   call $~lib/array/Array<u32>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9274,11 +9274,11 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/array/Array<std/array/Ref>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array/Ref>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array/Ref>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9286,11 +9286,11 @@
   local.get $1
   call $~lib/array/Array<std/array/Ref>#__visit
  )
- (func $~lib/array/Array<u16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9298,11 +9298,11 @@
   local.get $1
   call $~lib/array/Array<u16>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9310,11 +9310,11 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/array/Array<std/array/Ref|null>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array/Ref|null>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array/Ref|null>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9322,11 +9322,11 @@
   local.get $1
   call $~lib/array/Array<std/array/Ref|null>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9334,11 +9334,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9346,11 +9346,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9358,11 +9358,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9370,11 +9370,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9382,11 +9382,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9394,11 +9394,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9406,11 +9406,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9418,11 +9418,11 @@
   local.get $1
   call $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit
  )
- (func $~lib/array/Array<std/array/Dim>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array/Dim>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array/Dim>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9430,11 +9430,11 @@
   local.get $1
   call $~lib/array/Array<std/array/Dim>#__visit
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9442,11 +9442,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9454,11 +9454,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9466,11 +9466,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9478,11 +9478,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9490,11 +9490,11 @@
   local.get $1
   call $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9502,11 +9502,11 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<i32>>#__visit
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9514,11 +9514,11 @@
   local.get $1
   call $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>#__visit
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9526,11 +9526,11 @@
   local.get $1
   call $~lib/array/Array<std/array/Proxy<i32>>#__visit
  )
- (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9538,11 +9538,11 @@
   local.get $1
   call $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>#__visit
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String|null>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String|null>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9550,11 +9550,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String|null>#__visit
  )
- (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9562,11 +9562,11 @@
   local.get $1
   call $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9574,11 +9574,11 @@
   local.get $1
   call $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>#__visit
  )
- (func $~lib/array/Array<bool>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<bool>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9586,11 +9586,11 @@
   local.get $1
   call $~lib/array/Array<bool>#__visit
  )
- (func $~lib/array/Array<i8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9598,11 +9598,11 @@
   local.get $1
   call $~lib/array/Array<i8>#__visit
  )
- (func $~lib/array/Array<i16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9610,11 +9610,11 @@
   local.get $1
   call $~lib/array/Array<i16>#__visit
  )
- (func $~lib/array/Array<u64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9622,11 +9622,11 @@
   local.get $1
   call $~lib/array/Array<u64>#__visit
  )
- (func $~lib/array/Array<i64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9634,11 +9634,11 @@
   local.get $1
   call $~lib/array/Array<i64>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9646,11 +9646,11 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<u8>>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9658,11 +9658,11 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<u32>>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9670,11 +9670,11 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#__visit
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9682,11 +9682,11 @@
   local.get $1
   call $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#__visit
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -9694,7 +9694,7 @@
   local.get $1
   call $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>
     block $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>
@@ -9968,7 +9968,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -9977,7 +9977,7 @@
   global.set $~started
   call $start:std/array
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -9990,7 +9990,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -10128,7 +10128,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $std/array/Ref#constructor (type $i32_i32_=>_i32) (param $this i32) (param $v i32) (result i32)
+ (func $std/array/Ref#constructor (param $this i32) (param $v i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -10164,7 +10164,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10275,7 +10275,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -10315,7 +10315,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/array/Array<u8>#fill (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<u8>#fill (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10354,7 +10354,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10379,7 +10379,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10431,7 +10431,7 @@
   local.get $3
   return
  )
- (func $std/array/isArraysEqual<u8> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<u8> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10538,7 +10538,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u8>#fill@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<u8>#fill@varargs (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10582,7 +10582,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<u32>#fill (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<u32>#fill (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10621,7 +10621,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10646,7 +10646,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10698,7 +10698,7 @@
   local.get $3
   return
  )
- (func $std/array/isArraysEqual<u32> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<u32> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10805,7 +10805,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u32>#fill@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<u32>#fill@varargs (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10849,7 +10849,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<f32>#fill (type $i32_f32_i32_i32_=>_i32) (param $this i32) (param $value f32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<f32>#fill (param $this i32) (param $value f32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10888,7 +10888,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10913,7 +10913,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $this i32) (param $index i32) (result f32)
   (local $value f32)
   (local $3 i32)
   (local $4 f32)
@@ -10966,7 +10966,7 @@
   local.get $4
   return
  )
- (func $std/array/isArraysEqual<f32> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<f32> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 f32)
   (local $5 f32)
@@ -11161,7 +11161,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<f32>#fill@varargs (type $i32_f32_i32_i32_=>_i32) (param $this i32) (param $value f32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<f32>#fill@varargs (param $this i32) (param $value f32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11205,7 +11205,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11230,7 +11230,7 @@
   local.get $1
   return
  )
- (func $std/array/internalCapacity<i32> (type $i32_=>_i32) (param $array i32) (result i32)
+ (func $std/array/internalCapacity<i32> (param $array i32) (result i32)
   (local $buffer i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11268,7 +11268,7 @@
   local.get $2
   return
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -11387,7 +11387,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#push (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<i32>#push (param $this i32) (param $value i32) (result i32)
   (local $oldLen i32)
   (local $len i32)
   (local $4 i32)
@@ -11448,7 +11448,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11500,7 +11500,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#pop (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#pop (param $this i32) (result i32)
   (local $len i32)
   (local $val i32)
   (local $3 i32)
@@ -11564,7 +11564,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<std/array/Ref>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array/Ref>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11637,7 +11637,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Ref>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<std/array/Ref>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11665,7 +11665,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Ref>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11690,7 +11690,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $value i32)
   (local $4 i32)
@@ -11754,7 +11754,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/array/Array<i32>#concat (param $this i32) (param $other i32) (result i32)
   (local $thisLen i32)
   (local $otherLen i32)
   (local $outLen i32)
@@ -11858,7 +11858,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#copyWithin (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<i32>#copyWithin (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $6 i32)
@@ -12026,7 +12026,7 @@
   local.get $26
   return
  )
- (func $~lib/array/Array<i32>#copyWithin@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<i32>#copyWithin@varargs (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12066,7 +12066,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $std/array/isArraysEqual<i32> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<i32> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12173,7 +12173,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#unshift (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<i32>#unshift (param $this i32) (param $value i32) (result i32)
   (local $len i32)
   (local $ptr i32)
   (local $4 i32)
@@ -12240,7 +12240,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#shift (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#shift (param $this i32) (result i32)
   (local $len i32)
   (local $base i32)
   (local $element i32)
@@ -12322,7 +12322,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<i32>#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<i32>#slice (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -12460,7 +12460,7 @@
   local.get $17
   return
  )
- (func $~lib/array/Array<i32>#slice@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<i32>#slice@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12501,7 +12501,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<i32>#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12535,7 +12535,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12569,7 +12569,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12603,7 +12603,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12628,7 +12628,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u16>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12680,7 +12680,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<i32>#indexOf (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -12785,7 +12785,7 @@
   local.get $7
   return
  )
- (func $~lib/array/Array<f32>#indexOf (type $i32_f32_i32_=>_i32) (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<f32>#indexOf (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -12890,7 +12890,7 @@
   local.get $7
   return
  )
- (func $~lib/array/Array<f64>#indexOf (type $i32_f64_i32_=>_i32) (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<f64>#indexOf (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -12995,7 +12995,7 @@
   local.get $7
   return
  )
- (func $~lib/array/Array<i32>#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<i32>#lastIndexOf (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $ptr i32)
   (local $5 i32)
@@ -13094,7 +13094,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<i32>#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<i32>#lastIndexOf@varargs (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13139,7 +13139,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<i32>#includes (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<i32>#includes (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13170,7 +13170,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<f32>#includes (type $i32_f32_i32_=>_i32) (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<f32>#includes (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -13291,7 +13291,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<f64>#includes (type $i32_f64_i32_=>_i32) (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
+ (func $~lib/array/Array<f64>#includes (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -13412,7 +13412,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#splice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
+ (func $~lib/array/Array<i32>#splice (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -13563,7 +13563,7 @@
   local.get $17
   return
  )
- (func $~lib/array/Array<i32>#splice@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
+ (func $~lib/array/Array<i32>#splice@varargs (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13602,7 +13602,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<std/array/Ref>#splice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#splice (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -13753,7 +13753,7 @@
   local.get $17
   return
  )
- (func $~lib/array/Array<std/array/Ref>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13820,7 +13820,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<std/array/Ref|null>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array/Ref|null>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13893,7 +13893,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Ref|null>#splice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#splice (param $this i32) (param $start i32) (param $deleteCount i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -14044,7 +14044,7 @@
   local.get $17
   return
  )
- (func $~lib/array/Array<std/array/Ref|null>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14069,7 +14069,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<std/array/Ref|null>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14126,7 +14126,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14195,7 +14195,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -14290,7 +14290,7 @@
   local.get $6
   return
  )
- (func $start:std/array~anonymous|3 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|3 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14320,7 +14320,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|5 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|5 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14349,7 +14349,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14428,7 +14428,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|9 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|9 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14457,7 +14457,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#every (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -14553,7 +14553,7 @@
   local.get $6
   return
  )
- (func $start:std/array~anonymous|12 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|12 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14583,7 +14583,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|14 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|14 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14612,7 +14612,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#some (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -14707,7 +14707,7 @@
   local.get $6
   return
  )
- (func $start:std/array~anonymous|17 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|17 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14737,7 +14737,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|19 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|19 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14766,7 +14766,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/array/Array<i32>#forEach (param $this i32) (param $fn i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -14847,7 +14847,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|21 (type $i32_i32_i32_=>_none) (param $value i32) (param $_ i32) (param $array i32)
+ (func $start:std/array~anonymous|21 (param $value i32) (param $_ i32) (param $array i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14875,7 +14875,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|23 (type $i32_i32_i32_=>_none) (param $value i32) (param $_ i32) (param $array i32)
+ (func $start:std/array~anonymous|23 (param $value i32) (param $_ i32) (param $array i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14902,7 +14902,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|24 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $array i32)
+ (func $start:std/array~anonymous|24 (param $value i32) (param $index i32) (param $array i32)
   (local $i i32)
   (local $i|4 i32)
   (local $i|5 i32)
@@ -15037,7 +15037,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#map<~lib/string/String> (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#map<~lib/string/String> (param $this i32) (param $fn i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $outStart i32)
@@ -15155,7 +15155,7 @@
   local.get $9
   return
  )
- (func $~lib/array/Array<i32>#map<f32> (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#map<f32> (param $this i32) (param $fn i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $outStart i32)
@@ -15269,7 +15269,7 @@
   local.get $9
   return
  )
- (func $start:std/array~anonymous|27 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|27 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15301,7 +15301,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#map<i32> (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#map<i32> (param $this i32) (param $fn i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $outStart i32)
@@ -15415,7 +15415,7 @@
   local.get $9
   return
  )
- (func $start:std/array~anonymous|29 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|29 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15446,7 +15446,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<i32>#filter (param $this i32) (param $fn i32) (result i32)
   (local $result i32)
   (local $i i32)
   (local $len i32)
@@ -15554,7 +15554,7 @@
   local.get $8
   return
  )
- (func $start:std/array~anonymous|31 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|31 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15588,7 +15588,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|33 (type $i32_i32_i32_=>_i32) (param $value i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|33 (param $value i32) (param $_ i32) (param $array i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15621,7 +15621,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#reduce<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/array/Array<i32>#reduce<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $len i32)
@@ -15711,7 +15711,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#reduce<bool> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/array/Array<i32>#reduce<bool> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $len i32)
@@ -15801,7 +15801,7 @@
   local.get $8
   return
  )
- (func $start:std/array~anonymous|38 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|38 (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15831,7 +15831,7 @@
   local.get $4
   return
  )
- (func $start:std/array~anonymous|40 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|40 (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15860,7 +15860,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#reduceRight<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/array/Array<i32>#reduceRight<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $5 i32)
@@ -15934,7 +15934,7 @@
   local.get $5
   return
  )
- (func $~lib/array/Array<i32>#reduceRight<bool> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/array/Array<i32>#reduceRight<bool> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $5 i32)
@@ -16008,7 +16008,7 @@
   local.get $5
   return
  )
- (func $start:std/array~anonymous|45 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|45 (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16038,7 +16038,7 @@
   local.get $4
   return
  )
- (func $start:std/array~anonymous|47 (type $i32_i32_i32_i32_=>_i32) (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
+ (func $start:std/array~anonymous|47 (param $prev i32) (param $current i32) (param $_ i32) (param $array i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16067,7 +16067,7 @@
   local.get $4
   return
  )
- (func $std/array/Dim#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/array/Dim#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16121,7 +16121,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<std/array/Dim>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array/Dim>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16194,7 +16194,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<f32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<f32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a f32)
   (local $b f32)
@@ -16671,7 +16671,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<f32>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16711,7 +16711,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<f32>#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<f32>#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -16768,7 +16768,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/SORT<f64> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<f64> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a f64)
   (local $b f64)
@@ -17245,7 +17245,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<f64>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -17285,7 +17285,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<f64>#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<f64>#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -17342,7 +17342,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/array/Array<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17367,7 +17367,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $this i32) (param $index i32) (result f64)
   (local $value f64)
   (local $3 i32)
   (local $4 f64)
@@ -17420,7 +17420,7 @@
   local.get $4
   return
  )
- (func $std/array/isArraysEqual<f64> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<f64> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 f64)
   (local $5 f64)
@@ -17613,7 +17613,7 @@
   local.get $8
   return
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -18090,7 +18090,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<i32>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -18130,7 +18130,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<i32>#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<i32>#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -18185,7 +18185,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/SORT<u32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<u32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -18662,7 +18662,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<u32>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -18702,7 +18702,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<u32>#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<u32>#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -18755,7 +18755,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/createReverseOrderedArray (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $std/array/createReverseOrderedArray (param $size i32) (result i32)
   (local $arr i32)
   (local $i i32)
   (local $3 i32)
@@ -18809,7 +18809,7 @@
   local.get $3
   return
  )
- (func $std/array/createRandomOrderedArray (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $std/array/createRandomOrderedArray (param $size i32) (result i32)
   (local $arr i32)
   (local $i i32)
   (local $3 i32)
@@ -18863,7 +18863,7 @@
   local.get $3
   return
  )
- (func $std/array/isSorted<i32> (type $i32_i32_=>_i32) (param $data i32) (param $comparator i32) (result i32)
+ (func $std/array/isSorted<i32> (param $data i32) (param $comparator i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -18941,7 +18941,7 @@
   local.get $4
   return
  )
- (func $std/array/assertSorted<i32> (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<i32> (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -18993,7 +18993,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/assertSortedDefault<i32> (type $i32_=>_none) (param $arr i32)
+ (func $std/array/assertSortedDefault<i32> (param $arr i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -19030,7 +19030,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Dim>#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#slice (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -19197,7 +19197,7 @@
   local.get $20
   return
  )
- (func $~lib/array/Array<std/array/Dim>#slice@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#slice@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19238,7 +19238,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/array/assertStableSortedForComplexObjects~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/array/assertStableSortedForComplexObjects~anonymous|0 (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19270,7 +19270,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/insertionSort<std/array/Dim> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<std/array/Dim> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -19511,7 +19511,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<std/array/Dim> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<std/array/Dim> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -19722,7 +19722,7 @@
   local.get $7
   return
  )
- (func $~lib/util/sort/mergeRuns<std/array/Dim> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<std/array/Dim> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -19890,7 +19890,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<std/array/Dim> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<std/array/Dim> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -20407,7 +20407,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Dim>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -20447,7 +20447,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<std/array/Dim>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20472,7 +20472,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<std/array/Dim>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20539,7 +20539,7 @@
   local.get $3
   return
  )
- (func $std/array/assertStableSortedForComplexObjects (type $none_=>_none)
+ (func $std/array/assertStableSortedForComplexObjects
   (local $sorted i32)
   (local $check i32)
   (local $i i32)
@@ -20684,7 +20684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -20822,7 +20822,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20895,7 +20895,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/createReverseOrderedNestedArray (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $std/array/createReverseOrderedNestedArray (param $size i32) (result i32)
   (local $arr i32)
   (local $i i32)
   (local $inner i32)
@@ -20973,7 +20973,7 @@
   local.get $4
   return
  )
- (func $start:std/array~anonymous|52 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|52 (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21007,7 +21007,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/insertionSort<~lib/array/Array<i32>> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<~lib/array/Array<i32>> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -21248,7 +21248,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<~lib/array/Array<i32>> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<~lib/array/Array<i32>> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -21459,7 +21459,7 @@
   local.get $7
   return
  )
- (func $~lib/util/sort/mergeRuns<~lib/array/Array<i32>> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<~lib/array/Array<i32>> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -21627,7 +21627,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<~lib/array/Array<i32>> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -22144,7 +22144,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -22184,7 +22184,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22209,7 +22209,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22276,7 +22276,7 @@
   local.get $3
   return
  )
- (func $std/array/isSorted<~lib/array/Array<i32>> (type $i32_i32_=>_i32) (param $data i32) (param $comparator i32) (result i32)
+ (func $std/array/isSorted<~lib/array/Array<i32>> (param $data i32) (param $comparator i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -22367,7 +22367,7 @@
   local.get $4
   return
  )
- (func $std/array/assertSorted<~lib/array/Array<i32>> (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<~lib/array/Array<i32>> (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -22419,7 +22419,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -22557,7 +22557,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $std/array/Proxy<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $x i32) (result i32)
+ (func $std/array/Proxy<i32>#constructor (param $this i32) (param $x i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -22593,7 +22593,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22666,7 +22666,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/createReverseOrderedElementsArray (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $std/array/createReverseOrderedElementsArray (param $size i32) (result i32)
   (local $arr i32)
   (local $i i32)
   (local $3 i32)
@@ -22730,7 +22730,7 @@
   local.get $3
   return
  )
- (func $start:std/array~anonymous|53 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $start:std/array~anonymous|53 (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22762,7 +22762,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/insertionSort<std/array/Proxy<i32>> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<std/array/Proxy<i32>> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -23003,7 +23003,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<std/array/Proxy<i32>> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<std/array/Proxy<i32>> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -23214,7 +23214,7 @@
   local.get $7
   return
  )
- (func $~lib/util/sort/mergeRuns<std/array/Proxy<i32>> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<std/array/Proxy<i32>> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -23382,7 +23382,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<std/array/Proxy<i32>> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<std/array/Proxy<i32>> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -23899,7 +23899,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -23939,7 +23939,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -23964,7 +23964,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -24031,7 +24031,7 @@
   local.get $3
   return
  )
- (func $std/array/isSorted<std/array/Proxy<i32>> (type $i32_i32_=>_i32) (param $data i32) (param $comparator i32) (result i32)
+ (func $std/array/isSorted<std/array/Proxy<i32>> (param $data i32) (param $comparator i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -24122,7 +24122,7 @@
   local.get $4
   return
  )
- (func $std/array/assertSorted<std/array/Proxy<i32>> (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<std/array/Proxy<i32>> (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -24174,7 +24174,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/insertionSort<~lib/string/String|null> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<~lib/string/String|null> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -24415,7 +24415,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<~lib/string/String|null> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<~lib/string/String|null> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -24626,7 +24626,7 @@
   local.get $7
   return
  )
- (func $~lib/util/sort/mergeRuns<~lib/string/String|null> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<~lib/string/String|null> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -24794,7 +24794,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<~lib/string/String|null> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<~lib/string/String|null> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -25311,7 +25311,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String|null>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -25351,7 +25351,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<~lib/string/String|null>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25376,7 +25376,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String|null>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -25433,7 +25433,7 @@
   local.get $3
   return
  )
- (func $std/array/isSorted<~lib/string/String|null> (type $i32_i32_=>_i32) (param $data i32) (param $comparator i32) (result i32)
+ (func $std/array/isSorted<~lib/string/String|null> (param $data i32) (param $comparator i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -25524,7 +25524,7 @@
   local.get $4
   return
  )
- (func $std/array/assertSorted<~lib/string/String|null> (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<~lib/string/String|null> (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -25576,7 +25576,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   (local $alen i32)
   (local $blen i32)
   (local $4 i32)
@@ -25712,7 +25712,7 @@
   local.get $7
   return
  )
- (func $std/array/assertSorted<~lib/string/String|null>@varargs (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<~lib/string/String|null>@varargs (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -25767,7 +25767,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -25863,7 +25863,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__ne (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__ne (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -25895,7 +25895,7 @@
   local.get $2
   return
  )
- (func $std/array/isArraysEqual<~lib/string/String|null> (type $i32_i32_i32_=>_i32) (param $a i32) (param $b i32) (param $len i32) (result i32)
+ (func $std/array/isArraysEqual<~lib/string/String|null> (param $a i32) (param $b i32) (param $len i32) (result i32)
   (local $i i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -26015,7 +26015,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/string/String>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -26153,7 +26153,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/string/String#charAt (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#charAt (param $this i32) (param $pos i32) (result i32)
   (local $out i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -26206,7 +26206,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -26282,7 +26282,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -26313,7 +26313,7 @@
   local.get $2
   return
  )
- (func $std/array/createRandomString (type $i32_=>_i32) (param $len i32) (result i32)
+ (func $std/array/createRandomString (param $len i32) (result i32)
   (local $result i32)
   (local $i i32)
   (local $x f64)
@@ -26393,7 +26393,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -26466,7 +26466,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/createRandomStringArray (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $std/array/createRandomStringArray (param $size i32) (result i32)
   (local $arr i32)
   (local $i i32)
   (local $3 i32)
@@ -26528,7 +26528,7 @@
   local.get $3
   return
  )
- (func $~lib/util/sort/insertionSort<~lib/string/String> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<~lib/string/String> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -26769,7 +26769,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<~lib/string/String> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<~lib/string/String> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -26980,7 +26980,7 @@
   local.get $7
   return
  )
- (func $~lib/util/sort/mergeRuns<~lib/string/String> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<~lib/string/String> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -27148,7 +27148,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<~lib/string/String> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<~lib/string/String> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -27665,7 +27665,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -27705,7 +27705,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -27730,7 +27730,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -27797,7 +27797,7 @@
   local.get $3
   return
  )
- (func $std/array/isSorted<~lib/string/String> (type $i32_i32_=>_i32) (param $data i32) (param $comparator i32) (result i32)
+ (func $std/array/isSorted<~lib/string/String> (param $data i32) (param $comparator i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -27888,7 +27888,7 @@
   local.get $4
   return
  )
- (func $std/array/assertSorted<~lib/string/String> (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<~lib/string/String> (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -27940,7 +27940,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/COMPARATOR<~lib/string/String>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<~lib/string/String>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   (local $alen i32)
   (local $blen i32)
   (local $4 i32)
@@ -28076,7 +28076,7 @@
   local.get $7
   return
  )
- (func $std/array/assertSorted<~lib/string/String>@varargs (type $i32_i32_=>_none) (param $arr i32) (param $comparator i32)
+ (func $std/array/assertSorted<~lib/string/String>@varargs (param $arr i32) (param $comparator i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -28131,7 +28131,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -28280,7 +28280,7 @@
   local.get $22
   return
  )
- (func $~lib/util/string/joinBooleanArray (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinBooleanArray (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $sepLen i32)
   (local $valueLen i32)
@@ -28474,7 +28474,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<bool>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<bool>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -28521,7 +28521,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinIntegerArray<i32> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i32> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -28700,7 +28700,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<i32>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<i32>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -28749,7 +28749,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinIntegerArray<u32> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u32> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -28928,7 +28928,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<u32>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<u32>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -28977,7 +28977,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinFloatArray<f64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinFloatArray<f64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $sepLen i32)
   (local $estLen i32)
@@ -29146,7 +29146,7 @@
   local.get $10
   return
  )
- (func $~lib/array/Array<f64>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<f64>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -29197,7 +29197,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $4 i32)
   (local $estLen i32)
@@ -29427,7 +29427,7 @@
   local.get $13
   return
  )
- (func $~lib/array/Array<~lib/string/String|null>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -29484,7 +29484,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinReferenceArray<std/array/Ref|null> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<std/array/Ref|null> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -29673,7 +29673,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<std/array/Ref|null>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -29732,7 +29732,7 @@
   local.get $4
   return
  )
- (func $~lib/util/string/joinReferenceArray<std/array/Ref> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<std/array/Ref> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -29921,7 +29921,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<std/array/Ref>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -29980,7 +29980,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30011,7 +30011,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinIntegerArray<i8> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i8> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -30190,7 +30190,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<i8>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<i8>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -30239,7 +30239,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i8>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30270,7 +30270,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinIntegerArray<u16> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u16> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -30449,7 +30449,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<u16>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<u16>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -30498,7 +30498,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u16>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30529,7 +30529,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinIntegerArray<i16> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i16> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -30708,7 +30708,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<i16>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<i16>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -30757,7 +30757,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i16>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30788,7 +30788,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinIntegerArray<u64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i64)
   (local $sepLen i32)
@@ -30967,7 +30967,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<u64>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<u64>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -31016,7 +31016,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u64>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31047,7 +31047,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinIntegerArray<i64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i64)
   (local $sepLen i32)
@@ -31228,7 +31228,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<i64>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<i64>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -31277,7 +31277,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i64>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31308,7 +31308,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String|null>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31339,7 +31339,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinReferenceArray<~lib/array/Array<i32>> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<~lib/array/Array<i32>> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -31528,7 +31528,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -31587,7 +31587,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31618,7 +31618,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -31691,7 +31691,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<u8> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u8> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -31870,7 +31870,7 @@
   local.get $11
   return
  )
- (func $~lib/array/Array<u8>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<u8>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -31919,7 +31919,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<u8>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31950,7 +31950,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinReferenceArray<~lib/array/Array<u8>> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<~lib/array/Array<u8>> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -32139,7 +32139,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -32198,7 +32198,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32229,7 +32229,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32302,7 +32302,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32375,7 +32375,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32406,7 +32406,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinReferenceArray<~lib/array/Array<u32>> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<~lib/array/Array<u32>> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -32595,7 +32595,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -32654,7 +32654,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32685,7 +32685,7 @@
   local.get $1
   return
  )
- (func $~lib/util/string/joinReferenceArray<~lib/array/Array<~lib/array/Array<u32>>> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinReferenceArray<~lib/array/Array<~lib/array/Array<u32>>> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $result i32)
@@ -32874,7 +32874,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#join (param $this i32) (param $separator i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $4 i32)
@@ -32933,7 +32933,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32964,7 +32964,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#flat (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#flat (param $this i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $size i32)
@@ -33132,7 +33132,7 @@
   local.get $13
   return
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -33205,7 +33205,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#flat (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#flat (param $this i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $size i32)
@@ -33400,7 +33400,7 @@
   local.get $15
   return
  )
- (func $start:std/array~anonymous|54 (type $i32_i32_i32_=>_i32) (param $nestedArray i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/array~anonymous|54 (param $nestedArray i32) (param $$1 i32) (param $$2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -33464,7 +33464,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#map<~lib/array/Array<i32>> (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#map<~lib/array/Array<i32>> (param $this i32) (param $fn i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $outStart i32)
@@ -33589,7 +33589,7 @@
   local.get $9
   return
  )
- (func $start:std/array (type $none_=>_none)
+ (func $start:std/array
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -44966,7 +44966,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -44992,7 +44992,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45018,7 +45018,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45044,7 +45044,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45070,7 +45070,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Ref>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array/Ref>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45140,7 +45140,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45166,7 +45166,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45192,7 +45192,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Ref|null>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array/Ref|null>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45262,7 +45262,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45286,7 +45286,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45310,7 +45310,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45380,7 +45380,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45404,7 +45404,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45428,7 +45428,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45452,7 +45452,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45476,7 +45476,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28bool%2Ci32%2Ci32%2C~lib/array/Array<i32>%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45500,7 +45500,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Dim>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array/Dim>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45570,7 +45570,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45594,7 +45594,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45618,7 +45618,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45642,7 +45642,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45666,7 +45666,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28std/array/Dim%2Cstd/array/Dim%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45690,7 +45690,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45760,7 +45760,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2C~lib/array/Array<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45784,7 +45784,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Proxy<i32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<std/array/Proxy<i32>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45854,7 +45854,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28std/array/Proxy<i32>%2Cstd/array/Proxy<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45878,7 +45878,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String|null>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String|null>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -45948,7 +45948,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28~lib/string/String|null%2C~lib/string/String|null%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45972,7 +45972,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28~lib/string/String%2C~lib/string/String%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45996,7 +45996,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46022,7 +46022,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46048,7 +46048,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46074,7 +46074,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46100,7 +46100,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46126,7 +46126,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<u8>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<u8>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -46196,7 +46196,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -46266,7 +46266,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/array/Array<u32>>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -46336,7 +46336,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/array/Array<~lib/string/String|null>>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -46406,7 +46406,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28~lib/array/Array<i32>%2Ci32%2C~lib/array/Array<~lib/array/Array<i32>>%29=>~lib/array/Array<i32>>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46430,7 +46430,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -46483,7 +46483,7 @@
   local.get $7
   return
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -46665,7 +46665,7 @@
   local.get $14
   return
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46693,7 +46693,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $value i32) (param $radix i32) (result i32)
   (local $out i32)
   (local $decimals i32)
   (local $buffer i32)
@@ -46840,7 +46840,7 @@
   local.get $12
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
@@ -46924,7 +46924,7 @@
   local.get $3
   return
  )
- (func $~lib/util/number/utoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa64 (param $value i64) (param $radix i32) (result i32)
   (local $out i32)
   (local $val32 i32)
   (local $decimals i32)
@@ -47111,7 +47111,7 @@
   local.get $17
   return
  )
- (func $~lib/util/number/itoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa64 (param $value i64) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $val32 i32)
diff --git a/tests/compiler/std/array.release.wat b/tests/compiler/std/array.release.wat
index 368a3f956f..2e9e595614 100644
--- a/tests/compiler/std/array.release.wat
+++ b/tests/compiler/std/array.release.wat
@@ -1,28 +1,28 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_f64 (func_subtype (result f64) func))
- (type $i32_i32_i32_=>_f32 (func_subtype (param i32 i32 i32) (result f32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_i64_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i64 i32 i64 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_f32_i32_i32_=>_none (func_subtype (param i32 f32 i32 i32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_f32_i32_=>_none (func_subtype (param i32 f32 i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_i64_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i64 i32 i64 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_f32_i32_i32_=>_none (func (param i32 f32 i32 i32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_f32_i32_=>_none (func (param i32 f32 i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "Math.random" (func $~lib/bindings/dom/Math.random (result f64)))
  (import "env" "seed" (func $~lib/builtins/seed (result f64)))
@@ -659,7 +659,7 @@
  (elem $0 (i32.const 1) $start:std/array~anonymous|0 $start:std/array~anonymous|1 $start:std/array~anonymous|2 $start:std/array~anonymous|3 $start:std/array~anonymous|2 $start:std/array~anonymous|5 $start:std/array~anonymous|0 $start:std/array~anonymous|1 $start:std/array~anonymous|2 $start:std/array~anonymous|5 $start:std/array~anonymous|10 $start:std/array~anonymous|11 $start:std/array~anonymous|12 $start:std/array~anonymous|13 $start:std/array~anonymous|14 $start:std/array~anonymous|15 $start:std/array~anonymous|16 $start:std/array~anonymous|17 $start:std/array~anonymous|18 $start:std/array~anonymous|19 $start:std/array~anonymous|20 $start:std/array~anonymous|21 $start:std/array~anonymous|20 $start:std/array~anonymous|23 $start:std/array~anonymous|24 $start:std/array~anonymous|25 $start:std/array~anonymous|26 $start:std/array~anonymous|27 $start:std/array~anonymous|28 $start:std/array~anonymous|29 $start:std/array~anonymous|30 $start:std/array~anonymous|31 $start:std/array~anonymous|32 $start:std/array~anonymous|33 $start:std/array~anonymous|34 $start:std/array~anonymous|34 $start:std/array~anonymous|36 $start:std/array~anonymous|37 $start:std/array~anonymous|38 $start:std/array~anonymous|34 $start:std/array~anonymous|40 $start:std/array~anonymous|34 $start:std/array~anonymous|34 $start:std/array~anonymous|36 $start:std/array~anonymous|37 $start:std/array~anonymous|38 $start:std/array~anonymous|34 $start:std/array~anonymous|40 $~lib/util/sort/COMPARATOR<f32>~anonymous|0 $~lib/util/sort/COMPARATOR<f64>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $~lib/util/sort/COMPARATOR<u32>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $std/array/assertStableSortedForComplexObjects~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $start:std/array~anonymous|49 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $start:std/array~anonymous|49 $start:std/array~anonymous|52 $std/array/assertStableSortedForComplexObjects~anonymous|0 $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 $start:std/array~anonymous|54)
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $std/array/arr
@@ -734,7 +734,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -866,7 +866,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1019,7 +1019,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1265,7 +1265,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -1377,7 +1377,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1456,7 +1456,7 @@
   i32.const 48960
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tlsf/__free (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1508,7 +1508,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1729,7 +1729,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1855,7 +1855,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2048,7 +2048,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -2164,57 +2164,57 @@
   memory.fill $0
   local.get $1
  )
- (func $start:std/array~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.eqz
  )
- (func $start:std/array~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 1
   i32.eq
  )
- (func $start:std/array~anonymous|2 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|2 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 100
   i32.eq
  )
- (func $start:std/array~anonymous|10 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|10 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 0
   i32.ge_s
  )
- (func $start:std/array~anonymous|11 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|11 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 0
   i32.le_s
  )
- (func $start:std/array~anonymous|13 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|13 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 10
   i32.lt_s
  )
- (func $start:std/array~anonymous|15 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|15 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 3
   i32.ge_s
  )
- (func $start:std/array~anonymous|16 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|16 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 0
   i32.lt_s
  )
- (func $start:std/array~anonymous|18 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|18 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 10
   i32.gt_s
  )
- (func $start:std/array~anonymous|20 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $start:std/array~anonymous|20 (param $0 i32) (param $1 i32) (param $2 i32)
   global.get $std/array/i
   local.get $0
   i32.add
   global.set $std/array/i
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -2318,27 +2318,27 @@
    i32.store16 $0
   end
  )
- (func $start:std/array~anonymous|25 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|25 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   call $~lib/util/number/itoa32
  )
- (func $start:std/array~anonymous|26 (type $i32_i32_i32_=>_f32) (param $0 i32) (param $1 i32) (param $2 i32) (result f32)
+ (func $start:std/array~anonymous|26 (param $0 i32) (param $1 i32) (param $2 i32) (result f32)
   local.get $0
   f32.convert_i32_s
  )
- (func $start:std/array~anonymous|28 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|28 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $std/array/i
   local.get $0
   i32.add
   global.set $std/array/i
   local.get $0
  )
- (func $start:std/array~anonymous|30 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|30 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.ge_s
  )
- (func $start:std/array~anonymous|32 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|32 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $std/array/i
   local.get $0
   i32.add
@@ -2347,12 +2347,12 @@
   i32.const 2
   i32.ge_s
  )
- (func $start:std/array~anonymous|34 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/array~anonymous|34 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $start:std/array~anonymous|36 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/array~anonymous|36 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   i32.const 1
   local.get $1
   i32.const 2
@@ -2360,7 +2360,7 @@
   local.get $0
   select
  )
- (func $start:std/array~anonymous|37 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/array~anonymous|37 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   i32.const 1
   local.get $1
   i32.const 100
@@ -2368,7 +2368,7 @@
   local.get $0
   select
  )
- (func $~lib/util/sort/insertionSort<f32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 f32)
   (local $6 f32)
   (local $7 i32)
@@ -2527,7 +2527,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 f32)
   (local $6 i32)
@@ -2680,7 +2680,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<f32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 f32)
   (local $8 f32)
@@ -2806,7 +2806,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (type $f32_f32_=>_i32) (param $0 f32) (param $1 f32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (param $0 f32) (param $1 f32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -2835,7 +2835,7 @@
   i32.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<f64> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 f64)
   (local $6 f64)
   (local $7 i32)
@@ -2994,7 +2994,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f64> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 f64)
   (local $6 i32)
@@ -3147,7 +3147,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<f64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 f64)
   (local $8 f64)
@@ -3273,7 +3273,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (type $f64_f64_=>_i32) (param $0 f64) (param $1 f64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (param $0 f64) (param $1 f64) (result i32)
   (local $2 i64)
   (local $3 i64)
   local.get $0
@@ -3302,7 +3302,7 @@
   i64.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -3461,7 +3461,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -3613,7 +3613,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -3737,12 +3737,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -3901,7 +3901,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -4053,7 +4053,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<u32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -4177,7 +4177,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.gt_u
@@ -4186,7 +4186,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/math/NativeMath.random (type $none_=>_f64) (result f64)
+ (func $~lib/math/NativeMath.random (result f64)
   (local $0 i64)
   (local $1 i64)
   global.get $~lib/math/random_seeded
@@ -4276,12 +4276,12 @@
   f64.const -1
   f64.add
  )
- (func $start:std/array~anonymous|49 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:std/array~anonymous|49 (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   local.get $0
   i32.sub
  )
- (func $~lib/util/number/itoa_buffered<i32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i32> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 0
@@ -4370,7 +4370,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u32> (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.const 10
   i32.lt_u
@@ -4435,7 +4435,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $0
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i64_i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i64) (param $3 i32) (param $4 i64) (param $5 i32) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i32) (param $1 i64) (param $2 i64) (param $3 i32) (param $4 i64) (param $5 i32) (result i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i64)
@@ -4860,7 +4860,7 @@
   i32.store16 $0
   local.get $5
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   local.get $2
@@ -5188,7 +5188,7 @@
    end
   end
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $0 i32) (param $1 f64) (result i32)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -5468,7 +5468,7 @@
   local.get $3
   i32.add
  )
- (func $~lib/util/number/dtoa_buffered (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/util/number/dtoa_buffered (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   local.get $1
   f64.const 0
@@ -5538,7 +5538,7 @@
   local.get $1
   call $~lib/util/number/dtoa_core
  )
- (func $~lib/util/number/itoa_buffered<i8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -5646,7 +5646,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u16> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u16> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 65535
@@ -5695,7 +5695,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $1
  )
- (func $~lib/util/number/itoa_buffered<i16> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i16> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -5806,7 +5806,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   loop $while-continue|0
@@ -5894,7 +5894,7 @@
   local.get $2
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/itoa_buffered<u64> (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<u64> (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -6026,7 +6026,7 @@
   end
   local.get $0
  )
- (func $~lib/util/number/itoa_buffered<i64> (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<i64> (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -6180,7 +6180,7 @@
   local.get $3
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 255
@@ -6219,7 +6219,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6381,7 +6381,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -6390,7 +6390,7 @@
   global.set $~started
   call $start:std/array
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6514,7 +6514,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/Ref#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $std/array/Ref#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6555,7 +6555,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<u8>#fill (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/array/Array<u8>#fill (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6632,7 +6632,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6665,7 +6665,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<u8>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u8>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6717,7 +6717,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/array/isArraysEqual<u8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/array/isArraysEqual<u8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -6803,7 +6803,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $~lib/array/Array<u8>#fill@varargs (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<u8>#fill@varargs (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6853,7 +6853,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#fill (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/array/Array<u32>#fill (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6966,7 +6966,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7020,7 +7020,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/array/isArraysEqual<u32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/array/isArraysEqual<u32> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -7106,7 +7106,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $~lib/array/Array<u32>#fill@varargs (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<u32>#fill@varargs (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7156,7 +7156,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#fill (type $i32_f32_i32_i32_=>_none) (param $0 i32) (param $1 f32) (param $2 i32) (param $3 i32)
+ (func $~lib/array/Array<f32>#fill (param $0 i32) (param $1 f32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7266,7 +7266,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $0 i32) (param $1 i32) (result f32)
   (local $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7321,7 +7321,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/isArraysEqual<f32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/array/isArraysEqual<f32> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 f32)
   (local $4 i32)
@@ -7459,7 +7459,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $~lib/array/Array<f32>#fill@varargs (type $i32_f32_i32_=>_none) (param $0 i32) (param $1 f32) (param $2 i32)
+ (func $~lib/array/Array<f32>#fill@varargs (param $0 i32) (param $1 f32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7509,7 +7509,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/internalCapacity<i32> (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $std/array/internalCapacity<i32> (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -7554,7 +7554,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7695,7 +7695,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#push (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#push (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7751,7 +7751,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7805,7 +7805,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#pop (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#pop (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -7871,7 +7871,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<std/array/Ref>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<std/array/Ref>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7948,7 +7948,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8011,7 +8011,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8103,7 +8103,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<i32>#copyWithin (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/array/Array<i32>#copyWithin (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -8236,7 +8236,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#copyWithin@varargs (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#copyWithin@varargs (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8284,7 +8284,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/array/isArraysEqual<i32> (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/array/isArraysEqual<i32> (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -8372,7 +8372,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $~lib/array/Array<i32>#unshift (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#unshift (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -8434,7 +8434,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#slice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#slice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -8549,7 +8549,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<i32>#slice@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#slice@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8598,7 +8598,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<u8>#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<u8>#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i64)
@@ -8769,7 +8769,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<u16>#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<u16>#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -8904,7 +8904,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<u16>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u16>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8958,7 +8958,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9053,7 +9053,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/array/Array<i32>#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9145,7 +9145,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/array/Array<i32>#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9196,7 +9196,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#includes (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#includes (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9233,7 +9233,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#splice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#splice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -9364,7 +9364,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<i32>#splice@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#splice@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9411,7 +9411,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<std/array/Ref>#splice (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#splice (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9543,7 +9543,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/array/Array<std/array/Ref>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9609,7 +9609,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<std/array/Ref|null>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9665,7 +9665,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9736,7 +9736,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9828,7 +9828,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $start:std/array~anonymous|3 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|3 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -9862,7 +9862,7 @@
   i32.const 100
   i32.eq
  )
- (func $start:std/array~anonymous|5 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|5 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -9896,7 +9896,7 @@
   i32.const 100
   i32.eq
  )
- (func $~lib/array/Array<i32>#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9979,7 +9979,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/array/Array<i32>#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -10072,7 +10072,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $start:std/array~anonymous|12 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|12 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10106,7 +10106,7 @@
   i32.const 10
   i32.lt_s
  )
- (func $start:std/array~anonymous|14 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|14 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10140,7 +10140,7 @@
   i32.const 3
   i32.lt_s
  )
- (func $~lib/array/Array<i32>#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -10232,7 +10232,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:std/array~anonymous|17 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|17 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10266,7 +10266,7 @@
   i32.const 10
   i32.gt_s
  )
- (func $start:std/array~anonymous|19 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|19 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10300,7 +10300,7 @@
   i32.const 3
   i32.gt_s
  )
- (func $~lib/array/Array<i32>#forEach (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#forEach (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -10383,7 +10383,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|21 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $start:std/array~anonymous|21 (param $0 i32) (param $1 i32) (param $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10418,7 +10418,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|23 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $start:std/array~anonymous|23 (param $0 i32) (param $1 i32) (param $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10453,7 +10453,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|24 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $start:std/array~anonymous|24 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10579,7 +10579,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|27 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|27 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10615,7 +10615,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#map<i32> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#map<i32> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -10718,7 +10718,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/array~anonymous|29 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|29 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10754,7 +10754,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#filter (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#filter (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -10855,7 +10855,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $start:std/array~anonymous|31 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|31 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10893,7 +10893,7 @@
   i32.const 2
   i32.ge_s
  )
- (func $start:std/array~anonymous|33 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|33 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -10931,7 +10931,7 @@
   i32.const 2
   i32.ge_s
  )
- (func $~lib/array/Array<i32>#reduce<i32> (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#reduce<i32> (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -11017,7 +11017,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $start:std/array~anonymous|38 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/array~anonymous|38 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -11051,7 +11051,7 @@
   local.get $1
   i32.add
  )
- (func $start:std/array~anonymous|40 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/array~anonymous|40 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -11085,7 +11085,7 @@
   local.get $1
   i32.add
  )
- (func $~lib/array/Array<i32>#reduceRight<i32> (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/array/Array<i32>#reduceRight<i32> (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -11162,7 +11162,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/Dim#constructor (type $none_=>_i32) (result i32)
+ (func $std/array/Dim#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11242,7 +11242,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<f32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<f32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -11685,7 +11685,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#sort@varargs (type $i32_=>_none) (param $0 i32)
+ (func $~lib/array/Array<f32>#sort@varargs (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -11774,7 +11774,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<f64> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<f64> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -12217,7 +12217,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $0 i32) (param $1 i32) (result f64)
   (local $2 f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12272,7 +12272,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -12712,7 +12712,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -12760,7 +12760,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/sort/SORT<u32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<u32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -13200,7 +13200,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/createReverseOrderedArray (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $std/array/createReverseOrderedArray (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13256,7 +13256,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/createRandomOrderedArray (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $std/array/createRandomOrderedArray (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13312,7 +13312,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/array/assertSorted<i32> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/array/assertSorted<i32> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -13443,7 +13443,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/array/assertSortedDefault<i32> (type $i32_=>_none) (param $0 i32)
+ (func $std/array/assertSortedDefault<i32> (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -13478,7 +13478,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/array/assertStableSortedForComplexObjects~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/array/assertStableSortedForComplexObjects~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13519,7 +13519,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/sort/insertionSort<std/array/Dim> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<std/array/Dim> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -13743,7 +13743,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/extendRunRight<std/array/Dim> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<std/array/Dim> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -13943,7 +13943,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<std/array/Dim> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<std/array/Dim> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -14105,7 +14105,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<std/array/Dim> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<std/array/Dim> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -14575,7 +14575,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<std/array/Dim>#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<std/array/Dim>#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14623,7 +14623,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/array~anonymous|52 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $start:std/array~anonymous|52 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14666,7 +14666,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/array/assertSorted<~lib/array/Array<i32>> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/array/assertSorted<~lib/array/Array<i32>> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14808,7 +14808,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<~lib/string/String|null>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14993,7 +14993,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15153,7 +15153,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15258,7 +15258,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/array/createRandomStringArray (type $none_=>_i32) (result i32)
+ (func $std/array/createRandomStringArray (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -15536,7 +15536,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String#substring (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#substring (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15644,7 +15644,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i32>#join (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#join (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15839,7 +15839,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<u32>#join (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u32>#join (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -16034,7 +16034,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/string/joinFloatArray<f64> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/string/joinFloatArray<f64> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 f64)
   (local $4 i32)
@@ -16264,7 +16264,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -16485,7 +16485,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<~lib/string/String|null>#join (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#join (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16533,7 +16533,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<std/array/Ref|null>#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<std/array/Ref|null>#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -16739,7 +16739,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<i32>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#toString (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16776,7 +16776,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i8>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i8>#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -16987,7 +16987,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/string/joinIntegerArray<u64> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u64> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i32)
@@ -17299,7 +17299,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<~lib/string/String|null>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String|null>#toString (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -17336,7 +17336,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<u8>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<u8>#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -17547,7 +17547,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<u32>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<u32>#toString (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -17584,7 +17584,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/array/Array<u32>>#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<u32>>#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -17819,7 +17819,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<~lib/array/Array<i32>>#flat (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<~lib/array/Array<i32>>#flat (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -17966,7 +17966,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/array~anonymous|54 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/array~anonymous|54 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -18028,7 +18028,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/array (type $none_=>_none)
+ (func $start:std/array
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -31645,7 +31645,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -31712,7 +31712,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/number/itoa32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -31829,7 +31829,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/number/utoa32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -31924,7 +31924,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -31943,7 +31943,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/arraybuffer.debug.wat b/tests/compiler/std/arraybuffer.debug.wat
index f924e23a59..0818ab8e4c 100644
--- a/tests/compiler/std/arraybuffer.debug.wat
+++ b/tests/compiler/std/arraybuffer.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -49,17 +49,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -69,11 +69,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -82,14 +82,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -131,7 +131,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -143,11 +143,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -157,7 +157,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -213,15 +213,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -247,7 +247,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -267,7 +267,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -287,7 +287,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -323,7 +323,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -349,7 +349,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -370,11 +370,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -385,39 +385,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -653,7 +653,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1017,7 +1017,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1182,7 +1182,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1327,7 +1327,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1365,7 +1365,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1378,7 +1378,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1395,7 +1395,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1420,7 +1420,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1600,7 +1600,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1658,7 +1658,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1679,7 +1679,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1695,7 +1695,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1903,7 +1903,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1993,7 +1993,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2102,7 +2102,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2166,7 +2166,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2179,17 +2179,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2242,18 +2242,18 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/array/Array<i32>|null> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/array/Array<i32>|null> (param $value i32) (result i32)
   i32.const 1
   drop
   local.get $value
@@ -2290,7 +2290,7 @@
   i32.const 0
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<usize> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<usize> (param $value i32) (result i32)
   i32.const 0
   drop
   i32.const 0
@@ -2320,7 +2320,7 @@
   i32.const 0
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Uint8Array|null> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Uint8Array|null> (param $value i32) (result i32)
   i32.const 1
   drop
   local.get $value
@@ -2337,7 +2337,7 @@
   i32.const 1
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Int32Array|null> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Int32Array|null> (param $value i32) (result i32)
   i32.const 1
   drop
   local.get $value
@@ -2362,7 +2362,7 @@
   i32.const 1
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/dataview/DataView|null> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/dataview/DataView|null> (param $value i32) (result i32)
   i32.const 1
   drop
   local.get $value
@@ -2399,7 +2399,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2467,7 +2467,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2476,17 +2476,17 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2502,7 +2502,7 @@
   local.get $buffer
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/array/Array<i32>> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/array/Array<i32>> (param $value i32) (result i32)
   i32.const 0
   drop
   i32.const 0
@@ -2532,7 +2532,7 @@
   i32.const 0
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Uint8Array> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Uint8Array> (param $value i32) (result i32)
   i32.const 0
   drop
   i32.const 0
@@ -2542,7 +2542,7 @@
   i32.const 1
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Int32Array> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/typedarray/Int32Array> (param $value i32) (result i32)
   i32.const 0
   drop
   i32.const 0
@@ -2560,7 +2560,7 @@
   i32.const 1
   return
  )
- (func $~lib/dataview/DataView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/dataview/DataView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2569,21 +2569,21 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/dataview/DataView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/dataview/DataView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/dataview/DataView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/dataview/DataView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/dataview/DataView> (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer.isView<~lib/dataview/DataView> (param $value i32) (result i32)
   i32.const 0
   drop
   i32.const 0
@@ -2613,7 +2613,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2659,7 +2659,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 336
   local.get $0
@@ -2671,7 +2671,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2685,14 +2685,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2700,62 +2700,62 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/typedarray/Int8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint8ClampedArray~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8ClampedArray~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/dataview/DataView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/dataview/DataView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2769,7 +2769,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/dataview/DataView
     block $~lib/typedarray/Float64Array
@@ -2872,10 +2872,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/arraybuffer
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2888,7 +2888,7 @@
    unreachable
   end
  )
- (func $~lib/arraybuffer/ArrayBuffer#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -3001,7 +3001,7 @@
   local.get $16
   return
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3112,7 +3112,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3152,7 +3152,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3192,7 +3192,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/dataview/DataView#constructor (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
+ (func $~lib/dataview/DataView#constructor (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
   (local $dataStart i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3304,7 +3304,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/dataview/DataView#constructor@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
+ (func $~lib/dataview/DataView#constructor@varargs (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3359,7 +3359,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $start:std/arraybuffer (type $none_=>_none)
+ (func $start:std/arraybuffer
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3854,7 +3854,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3880,7 +3880,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3921,7 +3921,7 @@
   local.get $3
   return
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
diff --git a/tests/compiler/std/arraybuffer.release.wat b/tests/compiler/std/arraybuffer.release.wat
index de84c8a494..144811d906 100644
--- a/tests/compiler/std/arraybuffer.release.wat
+++ b/tests/compiler/std/arraybuffer.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -44,7 +44,7 @@
  (data (i32.const 1712) "\11\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\02\t\00\00A\08\00\00A\00\00\00A\00\00\00\81\08\00\00\81\00\00\00\01\t\00\00\01\01\00\00\01\n\00\00\01\02\00\00\01\19\00\00\01\1a")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1360
@@ -91,7 +91,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -223,7 +223,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -376,7 +376,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -622,7 +622,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -734,7 +734,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -813,7 +813,7 @@
   i32.const 34560
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1080,7 +1080,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1206,7 +1206,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1512,7 +1512,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1567,7 +1567,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1632,10 +1632,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/arraybuffer
  )
- (func $~lib/arraybuffer/ArrayBuffer#slice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1733,7 +1733,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -1833,7 +1833,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/arraybuffer (type $none_=>_none)
+ (func $start:std/arraybuffer
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2535,7 +2535,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/console.debug.wat b/tests/compiler/std/console.debug.wat
index cf22e0b62e..e2b8470200 100644
--- a/tests/compiler/std/console.debug.wat
+++ b/tests/compiler/std/console.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "console.assert" (func $~lib/bindings/dom/console.assert (param i32 i32)))
  (import "env" "console.log" (func $~lib/bindings/dom/console.log (param i32)))
  (import "env" "console.debug" (func $~lib/bindings/dom/console.debug (param i32)))
@@ -35,10 +35,10 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/console
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -51,7 +51,7 @@
    unreachable
   end
  )
- (func $~lib/console/console.assert<bool> (type $i32_i32_=>_none) (param $condition i32) (param $message i32)
+ (func $~lib/console/console.assert<bool> (param $condition i32) (param $message i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -76,7 +76,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.log (type $i32_=>_none) (param $message i32)
+ (func $~lib/console/console.log (param $message i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -98,7 +98,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.debug (type $i32_=>_none) (param $message i32)
+ (func $~lib/console/console.debug (param $message i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -120,7 +120,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.info (type $i32_=>_none) (param $message i32)
+ (func $~lib/console/console.info (param $message i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -142,7 +142,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.warn (type $i32_=>_none) (param $message i32)
+ (func $~lib/console/console.warn (param $message i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -164,7 +164,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.error (type $i32_=>_none) (param $message i32)
+ (func $~lib/console/console.error (param $message i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -186,7 +186,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.time (type $i32_=>_none) (param $label i32)
+ (func $~lib/console/console.time (param $label i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -208,7 +208,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.timeLog (type $i32_=>_none) (param $label i32)
+ (func $~lib/console/console.timeLog (param $label i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -230,7 +230,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.timeEnd (type $i32_=>_none) (param $label i32)
+ (func $~lib/console/console.timeEnd (param $label i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -252,7 +252,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/console (type $none_=>_none)
+ (func $start:std/console
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
diff --git a/tests/compiler/std/console.release.wat b/tests/compiler/std/console.release.wat
index aefcb4f7fc..0b24dbe8df 100644
--- a/tests/compiler/std/console.release.wat
+++ b/tests/compiler/std/console.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "console.assert" (func $~lib/bindings/dom/console.assert (param i32 i32)))
  (import "env" "console.log" (func $~lib/bindings/dom/console.log (param i32)))
  (import "env" "console.debug" (func $~lib/bindings/dom/console.debug (param i32)))
@@ -45,7 +45,7 @@
  (data (i32.const 1592) "\02\00\00\00\08\00\00\001\002\003\004")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -241,7 +241,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/console/console.assert<bool> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/console/console.assert<bool> (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -275,7 +275,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.log (type $i32_=>_none) (param $0 i32)
+ (func $~lib/console/console.log (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -306,7 +306,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.time (type $i32_=>_none) (param $0 i32)
+ (func $~lib/console/console.time (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -337,7 +337,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.timeLog (type $i32_=>_none) (param $0 i32)
+ (func $~lib/console/console.timeLog (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -368,7 +368,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/console/console.timeEnd (type $i32_=>_none) (param $0 i32)
+ (func $~lib/console/console.timeEnd (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/dataview.debug.wat b/tests/compiler/std/dataview.debug.wat
index f8f20499ad..1c45fae5bc 100644
--- a/tests/compiler/std/dataview.debug.wat
+++ b/tests/compiler/std/dataview.debug.wat
@@ -1,20 +1,20 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i64 (func_subtype (param i32 i32 i32) (result i64) func))
- (type $i32_i32_i64_i32_=>_none (func_subtype (param i32 i32 i64 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_=>_f32 (func_subtype (param i32 i32 i32) (result f32) func))
- (type $i32_i32_i32_=>_f64 (func_subtype (param i32 i32 i32) (result f64) func))
- (type $i32_i32_f32_i32_=>_none (func_subtype (param i32 i32 f32 i32) func))
- (type $i32_i32_f64_i32_=>_none (func_subtype (param i32 i32 f64 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i64 (func (param i32 i32 i32) (result i64)))
+ (type $i32_i32_i64_i32_=>_none (func (param i32 i32 i64 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
+ (type $i32_i32_i32_=>_f64 (func (param i32 i32 i32) (result f64)))
+ (type $i32_i32_f32_i32_=>_none (func (param i32 i32 f32 i32)))
+ (type $i32_i32_f64_i32_=>_none (func (param i32 i32 f64 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -55,17 +55,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -75,11 +75,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -88,14 +88,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -137,7 +137,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -149,11 +149,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -163,7 +163,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -219,15 +219,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -253,7 +253,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -273,7 +273,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -293,7 +293,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -329,7 +329,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -355,7 +355,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -376,11 +376,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -391,39 +391,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -659,7 +659,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1023,7 +1023,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1188,7 +1188,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1333,7 +1333,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1371,7 +1371,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1384,7 +1384,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1401,7 +1401,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1426,7 +1426,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1606,7 +1606,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1664,7 +1664,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1685,7 +1685,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1701,7 +1701,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1909,7 +1909,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1999,7 +1999,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2108,7 +2108,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2172,7 +2172,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2185,17 +2185,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2248,7 +2248,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2316,7 +2316,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2325,36 +2325,36 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/dataview/DataView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/dataview/DataView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2363,33 +2363,33 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/dataview/DataView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/dataview/DataView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/dataview/DataView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/dataview/DataView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/dataview/DataView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/dataview/DataView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/dataview/DataView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/dataview/DataView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/dataview/DataView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/dataview/DataView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2435,7 +2435,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 336
   local.get $0
@@ -2447,7 +2447,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2461,15 +2461,15 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/dataview/DataView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/dataview/DataView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2483,7 +2483,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/dataview/DataView
     block $~lib/typedarray/Uint8Array
@@ -2520,10 +2520,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/dataview
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2536,7 +2536,7 @@
    unreachable
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2647,7 +2647,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2687,7 +2687,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2730,7 +2730,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#constructor (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
+ (func $~lib/dataview/DataView#constructor (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
   (local $dataStart i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2842,7 +2842,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2875,7 +2875,7 @@
   local.get $1
   return
  )
- (func $~lib/dataview/DataView#getFloat32 (type $i32_i32_i32_=>_f32) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f32)
+ (func $~lib/dataview/DataView#getFloat32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f32)
   (local $3 i32)
   (local $4 i32)
   (local $5 f32)
@@ -2954,7 +2954,7 @@
   local.get $5
   return
  )
- (func $~lib/dataview/DataView#getFloat64 (type $i32_i32_i32_=>_f64) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f64)
+ (func $~lib/dataview/DataView#getFloat64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result f64)
   (local $3 i64)
   (local $4 i64)
   (local $5 i32)
@@ -3047,7 +3047,7 @@
   local.get $6
   return
  )
- (func $~lib/dataview/DataView#getInt8 (type $i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (result i32)
+ (func $~lib/dataview/DataView#getInt8 (param $this i32) (param $byteOffset i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3092,7 +3092,7 @@
   local.get $2
   return
  )
- (func $~lib/dataview/DataView#getInt16 (type $i32_i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
+ (func $~lib/dataview/DataView#getInt16 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
   (local $5 i32)
@@ -3161,7 +3161,7 @@
   local.get $5
   return
  )
- (func $~lib/dataview/DataView#getInt32 (type $i32_i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
+ (func $~lib/dataview/DataView#getInt32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
   (local $5 i32)
@@ -3232,7 +3232,7 @@
   local.get $5
   return
  )
- (func $~lib/dataview/DataView#getInt64 (type $i32_i32_i32_=>_i64) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
+ (func $~lib/dataview/DataView#getInt64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
   (local $result i64)
   (local $4 i64)
   (local $5 i64)
@@ -3318,7 +3318,7 @@
   local.get $7
   return
  )
- (func $~lib/dataview/DataView#getUint8 (type $i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (result i32)
+ (func $~lib/dataview/DataView#getUint8 (param $this i32) (param $byteOffset i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3363,7 +3363,7 @@
   local.get $2
   return
  )
- (func $~lib/dataview/DataView#getUint16 (type $i32_i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
+ (func $~lib/dataview/DataView#getUint16 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
   (local $5 i32)
@@ -3430,7 +3430,7 @@
   local.get $5
   return
  )
- (func $~lib/dataview/DataView#getUint32 (type $i32_i32_i32_=>_i32) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
+ (func $~lib/dataview/DataView#getUint32 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i32)
   (local $result i32)
   (local $4 i32)
   (local $5 i32)
@@ -3501,7 +3501,7 @@
   local.get $5
   return
  )
- (func $~lib/dataview/DataView#getUint64 (type $i32_i32_i32_=>_i64) (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
+ (func $~lib/dataview/DataView#getUint64 (param $this i32) (param $byteOffset i32) (param $littleEndian i32) (result i64)
   (local $result i64)
   (local $4 i64)
   (local $5 i64)
@@ -3587,7 +3587,7 @@
   local.get $7
   return
  )
- (func $~lib/dataview/DataView#setFloat32 (type $i32_i32_f32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value f32) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setFloat32 (param $this i32) (param $byteOffset i32) (param $value f32) (param $littleEndian i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3664,7 +3664,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setFloat64 (type $i32_i32_f64_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value f64) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setFloat64 (param $this i32) (param $byteOffset i32) (param $value f64) (param $littleEndian i32)
   (local $4 i64)
   (local $5 i64)
   (local $6 i32)
@@ -3755,7 +3755,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt8 (type $i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32)
+ (func $~lib/dataview/DataView#setInt8 (param $this i32) (param $byteOffset i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3798,7 +3798,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt16 (type $i32_i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setInt16 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3862,7 +3862,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt32 (type $i32_i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setInt32 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3928,7 +3928,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt64 (type $i32_i32_i64_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setInt64 (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
   (local $4 i64)
   (local $5 i64)
   (local $6 i32)
@@ -4008,7 +4008,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint8 (type $i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32)
+ (func $~lib/dataview/DataView#setUint8 (param $this i32) (param $byteOffset i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4051,7 +4051,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint16 (type $i32_i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setUint16 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4115,7 +4115,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint32 (type $i32_i32_i32_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setUint32 (param $this i32) (param $byteOffset i32) (param $value i32) (param $littleEndian i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4181,7 +4181,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint64 (type $i32_i32_i64_i32_=>_none) (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
+ (func $~lib/dataview/DataView#setUint64 (param $this i32) (param $byteOffset i32) (param $value i64) (param $littleEndian i32)
   (local $4 i64)
   (local $5 i64)
   (local $6 i32)
@@ -4261,7 +4261,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#constructor@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
+ (func $~lib/dataview/DataView#constructor@varargs (param $this i32) (param $buffer i32) (param $byteOffset i32) (param $byteLength i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4316,7 +4316,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/dataview/DataView#get:byteOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/dataview/DataView#get:byteOffset (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4349,7 +4349,7 @@
   local.get $1
   return
  )
- (func $start:std/dataview (type $none_=>_none)
+ (func $start:std/dataview
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
diff --git a/tests/compiler/std/dataview.release.wat b/tests/compiler/std/dataview.release.wat
index d3e149b781..4fb12bf4bd 100644
--- a/tests/compiler/std/dataview.release.wat
+++ b/tests/compiler/std/dataview.release.wat
@@ -1,19 +1,19 @@
 (module
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_f32 (func_subtype (param i32 i32 i32) (result f32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_f32_i32_=>_none (func_subtype (param i32 f32 i32) func))
- (type $i32_f64_i32_=>_none (func_subtype (param i32 f64 i32) func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_f32 (func (param i32 i32 i32) (result f32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_f32_i32_=>_none (func (param i32 f32 i32)))
+ (type $i32_f64_i32_=>_none (func (param i32 f64 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -51,7 +51,7 @@
  (data (i32.const 1744) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00A")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1360
@@ -98,7 +98,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -230,7 +230,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -383,7 +383,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -629,7 +629,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -741,7 +741,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -820,7 +820,7 @@
   i32.const 34544
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1087,7 +1087,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1213,7 +1213,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1519,7 +1519,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   i32.store $0
@@ -1574,7 +1574,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $folding-inner0
    block $invalid
     block $~lib/string/String
@@ -1602,10 +1602,10 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__visit
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/dataview
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1656,7 +1656,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#constructor (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/dataview/DataView#constructor (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1758,7 +1758,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1800,7 +1800,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/dataview/DataView#getFloat32 (type $i32_i32_i32_=>_f32) (param $0 i32) (param $1 i32) (param $2 i32) (result f32)
+ (func $~lib/dataview/DataView#getFloat32 (param $0 i32) (param $1 i32) (param $2 i32) (result f32)
   (local $3 i32)
   (local $4 f32)
   global.get $~lib/memory/__stack_pointer
@@ -1882,7 +1882,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/dataview/DataView#getFloat64 (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/dataview/DataView#getFloat64 (param $0 i32) (param $1 i32) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 f64)
@@ -1968,7 +1968,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/dataview/DataView#getInt8 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/dataview/DataView#getInt8 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2020,7 +2020,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/dataview/DataView#getInt16 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/dataview/DataView#getInt16 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2092,7 +2092,7 @@
    i32.or
   end
  )
- (func $~lib/dataview/DataView#getInt32 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/dataview/DataView#getInt32 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2165,7 +2165,7 @@
    i32.or
   end
  )
- (func $~lib/dataview/DataView#getInt64 (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/dataview/DataView#getInt64 (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2244,7 +2244,7 @@
    i64.rotr
   end
  )
- (func $~lib/dataview/DataView#getUint8 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/dataview/DataView#getUint8 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2296,7 +2296,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/dataview/DataView#getUint16 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/dataview/DataView#getUint16 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2363,7 +2363,7 @@
   local.get $2
   select
  )
- (func $~lib/dataview/DataView#getUint32 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/dataview/DataView#getUint32 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2436,7 +2436,7 @@
    i32.or
   end
  )
- (func $~lib/dataview/DataView#getUint64 (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/dataview/DataView#getUint64 (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2515,7 +2515,7 @@
    i64.rotr
   end
  )
- (func $~lib/dataview/DataView#setFloat32 (type $i32_f32_i32_=>_none) (param $0 i32) (param $1 f32) (param $2 i32)
+ (func $~lib/dataview/DataView#setFloat32 (param $0 i32) (param $1 f32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2586,7 +2586,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setFloat64 (type $i32_f64_i32_=>_none) (param $0 i32) (param $1 f64) (param $2 i32)
+ (func $~lib/dataview/DataView#setFloat64 (param $0 i32) (param $1 f64) (param $2 i32)
   (local $3 i64)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2671,7 +2671,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt16 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/dataview/DataView#setInt16 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2733,7 +2733,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt32 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/dataview/DataView#setInt32 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2796,7 +2796,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setInt64 (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/dataview/DataView#setInt64 (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2872,7 +2872,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint16 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/dataview/DataView#setUint16 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2934,7 +2934,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint32 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/dataview/DataView#setUint32 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2997,7 +2997,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/dataview/DataView#setUint64 (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/dataview/DataView#setUint64 (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3073,7 +3073,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/dataview (type $none_=>_none)
+ (func $start:std/dataview
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5355,7 +5355,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/date.debug.wat b/tests/compiler/std/date.debug.wat
index cf5e6fb81e..9bb0c59e71 100644
--- a/tests/compiler/std/date.debug.wat
+++ b/tests/compiler/std/date.debug.wat
@@ -1,26 +1,26 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i32_i32_=>_i64 (func_subtype (param i32 i32 i32) (result i64) func))
- (type $i32_i32_i32_i32_i32_i32_i32_=>_i64 (func_subtype (param i32 i32 i32 i32 i32 i32 i32) (result i64) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_i32_i32_i64_=>_i64 (func_subtype (param i32 i32 i32 i64) (result i64) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_i64_=>_i64 (func_subtype (param i32 i64) (result i64) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i32_i32_=>_i64 (func (param i32 i32 i32) (result i64)))
+ (type $i32_i32_i32_i32_i32_i32_i32_=>_i64 (func (param i32 i32 i32 i32 i32 i32 i32) (result i64)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_i32_i32_i64_=>_i64 (func (param i32 i32 i32 i64) (result i64)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_i64_=>_i64 (func (param i32 i64) (result i64)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/date/_day (mut i32) (i32.const 0))
  (global $~lib/date/_month (mut i32) (i32.const 0))
@@ -162,7 +162,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/date/daysSinceEpoch (type $i32_i32_i32_=>_i64) (param $y i32) (param $m i32) (param $d i32) (result i64)
+ (func $~lib/date/daysSinceEpoch (param $y i32) (param $m i32) (param $d i32) (result i64)
   (local $a i32)
   (local $b i32)
   (local $era i32)
@@ -248,7 +248,7 @@
   i64.extend_i32_s
   return
  )
- (func $~lib/date/epochMillis (type $i32_i32_i32_i32_i32_i32_i32_=>_i64) (param $year i32) (param $month i32) (param $day i32) (param $hour i32) (param $minute i32) (param $second i32) (param $milliseconds i32) (result i64)
+ (func $~lib/date/epochMillis (param $year i32) (param $month i32) (param $day i32) (param $hour i32) (param $minute i32) (param $second i32) (param $milliseconds i32) (result i64)
   local.get $year
   local.get $month
   local.get $day
@@ -276,7 +276,7 @@
   i64.add
   return
  )
- (func $~lib/date/invalidDate (type $i64_=>_i32) (param $millis i64) (result i32)
+ (func $~lib/date/invalidDate (param $millis i64) (result i32)
   local.get $millis
   i64.const 0
   i64.const 8640000000000000
@@ -288,7 +288,7 @@
   i32.or
   return
  )
- (func $~lib/date/dateFromEpoch (type $i64_=>_i32) (param $ms i64) (result i32)
+ (func $~lib/date/dateFromEpoch (param $ms i64) (result i32)
   (local $a i64)
   (local $b i64)
   (local $da i32)
@@ -418,32 +418,32 @@
   local.get $year
   return
  )
- (func $~lib/date/Date#set:year (type $i32_i32_=>_none) (param $this i32) (param $year i32)
+ (func $~lib/date/Date#set:year (param $this i32) (param $year i32)
   local.get $this
   local.get $year
   i32.store $0
  )
- (func $~lib/date/Date#set:month (type $i32_i32_=>_none) (param $this i32) (param $month i32)
+ (func $~lib/date/Date#set:month (param $this i32) (param $month i32)
   local.get $this
   local.get $month
   i32.store $0 offset=4
  )
- (func $~lib/date/Date#set:day (type $i32_i32_=>_none) (param $this i32) (param $day i32)
+ (func $~lib/date/Date#set:day (param $this i32) (param $day i32)
   local.get $this
   local.get $day
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -453,11 +453,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -466,14 +466,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -515,7 +515,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -527,11 +527,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -541,7 +541,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -597,15 +597,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -631,7 +631,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -651,7 +651,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -671,7 +671,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -707,7 +707,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -733,7 +733,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -754,11 +754,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -769,39 +769,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1037,7 +1037,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1401,7 +1401,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1566,7 +1566,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1711,7 +1711,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1749,7 +1749,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1762,7 +1762,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1779,7 +1779,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1804,7 +1804,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1984,7 +1984,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2042,7 +2042,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2063,7 +2063,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2079,7 +2079,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2287,7 +2287,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2377,7 +2377,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2486,7 +2486,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2550,7 +2550,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2563,17 +2563,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2626,28 +2626,28 @@
   local.get $ptr
   return
  )
- (func $~lib/date/Date#set:epochMillis (type $i32_i64_=>_none) (param $this i32) (param $epochMillis i64)
+ (func $~lib/date/Date#set:epochMillis (param $this i32) (param $epochMillis i64)
   local.get $this
   local.get $epochMillis
   i64.store $0 offset=16
  )
- (func $~lib/date/Date#get:epochMillis (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/date/Date#get:epochMillis (param $this i32) (result i64)
   local.get $this
   i64.load $0 offset=16
  )
- (func $~lib/date/Date#get:year (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#get:year (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/date/Date#get:month (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#get:month (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/date/Date#get:day (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#get:day (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/date/join (type $i32_i32_i32_i64_=>_i64) (param $year i32) (param $month i32) (param $day i32) (param $ms i64) (result i64)
+ (func $~lib/date/join (param $year i32) (param $month i32) (param $day i32) (param $ms i64) (result i64)
   (local $a i64)
   (local $b i64)
   (local $m i64)
@@ -2683,7 +2683,7 @@
   i64.add
   return
  )
- (func $~lib/date/dayOfWeek (type $i32_i32_i32_=>_i32) (param $year i32) (param $month i32) (param $day i32) (result i32)
+ (func $~lib/date/dayOfWeek (param $year i32) (param $month i32) (param $day i32) (result i32)
   (local $a i32)
   (local $b i32)
   (local $a|5 i32)
@@ -2801,7 +2801,7 @@
   end
   return
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -2856,7 +2856,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2996,7 +2996,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -3043,7 +3043,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -3120,7 +3120,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -3211,17 +3211,17 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -3230,7 +3230,7 @@
   i32.shr_u
   return
  )
- (func $~lib/memory/memory.repeat (type $i32_i32_i32_i32_=>_none) (param $dst i32) (param $src i32) (param $srcLength i32) (param $count i32)
+ (func $~lib/memory/memory.repeat (param $dst i32) (param $src i32) (param $srcLength i32) (param $count i32)
   (local $index i32)
   (local $total i32)
   i32.const 0
@@ -3258,7 +3258,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -3326,7 +3326,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -3341,7 +3341,7 @@
   i32.const 1
   call $~lib/rt/itcms/__link
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -3350,7 +3350,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -3454,7 +3454,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -3470,7 +3470,7 @@
   local.get $buffer
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__uget (param $this i32) (param $index i32) (result i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -3479,23 +3479,23 @@
   i32.load $0
   return
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -3541,16 +3541,16 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<~lib/string/String>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/string/String>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/string/isSpace (type $i32_=>_i32) (param $c i32) (result i32)
+ (func $~lib/util/string/isSpace (param $c i32) (result i32)
   (local $1 i32)
   local.get $c
   i32.const 5760
@@ -3637,7 +3637,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 368
   local.get $0
@@ -3661,7 +3661,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3675,10 +3675,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3715,7 +3715,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3723,11 +3723,11 @@
   local.get $1
   call $~lib/staticarray/StaticArray<~lib/string/String>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3735,11 +3735,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3747,7 +3747,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<i32>
     block $~lib/array/Array<~lib/string/String>
@@ -3793,7 +3793,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -3802,7 +3802,7 @@
   global.set $~started
   call $start:std/date
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3815,7 +3815,7 @@
    unreachable
   end
  )
- (func $~lib/date/Date#constructor (type $i32_i64_=>_i32) (param $this i32) (param $epochMillis i64) (result i32)
+ (func $~lib/date/Date#constructor (param $this i32) (param $epochMillis i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3910,7 +3910,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/date/Date#setTime (type $i32_i64_=>_i64) (param $this i32) (param $time i64) (result i64)
+ (func $~lib/date/Date#setTime (param $this i32) (param $time i64) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -3973,7 +3973,7 @@
   local.get $3
   return
  )
- (func $~lib/date/Date#getUTCHours (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#getUTCHours (param $this i32) (result i32)
   (local $a i64)
   (local $b i64)
   (local $m i64)
@@ -4025,7 +4025,7 @@
   local.get $4
   return
  )
- (func $~lib/date/Date#getUTCMinutes (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#getUTCMinutes (param $this i32) (result i32)
   (local $a i64)
   (local $b i64)
   (local $m i64)
@@ -4077,7 +4077,7 @@
   local.get $4
   return
  )
- (func $~lib/date/Date#getUTCSeconds (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#getUTCSeconds (param $this i32) (result i32)
   (local $a i64)
   (local $b i64)
   (local $m i64)
@@ -4129,7 +4129,7 @@
   local.get $4
   return
  )
- (func $~lib/date/Date#getUTCMilliseconds (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#getUTCMilliseconds (param $this i32) (result i32)
   (local $a i64)
   (local $b i64)
   (local $m i64)
@@ -4179,7 +4179,7 @@
   local.get $4
   return
  )
- (func $~lib/date/Date#setUTCMilliseconds (type $i32_i32_=>_none) (param $this i32) (param $millis i32)
+ (func $~lib/date/Date#setUTCMilliseconds (param $this i32) (param $millis i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4220,7 +4220,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCSeconds (type $i32_i32_=>_none) (param $this i32) (param $seconds i32)
+ (func $~lib/date/Date#setUTCSeconds (param $this i32) (param $seconds i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4263,7 +4263,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCMinutes (type $i32_i32_=>_none) (param $this i32) (param $minutes i32)
+ (func $~lib/date/Date#setUTCMinutes (param $this i32) (param $minutes i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4306,7 +4306,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCHours (type $i32_i32_=>_none) (param $this i32) (param $hours i32)
+ (func $~lib/date/Date#setUTCHours (param $this i32) (param $hours i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4349,7 +4349,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCDate (type $i32_i32_=>_none) (param $this i32) (param $day i32)
+ (func $~lib/date/Date#setUTCDate (param $this i32) (param $day i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4411,7 +4411,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCMonth (type $i32_i32_i32_=>_none) (param $this i32) (param $month i32) (param $day i32)
+ (func $~lib/date/Date#setUTCMonth (param $this i32) (param $month i32) (param $day i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4471,7 +4471,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCMonth@varargs (type $i32_i32_i32_=>_none) (param $this i32) (param $month i32) (param $day i32)
+ (func $~lib/date/Date#setUTCMonth@varargs (param $this i32) (param $month i32) (param $day i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4514,7 +4514,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCFullYear (type $i32_i32_=>_none) (param $this i32) (param $year i32)
+ (func $~lib/date/Date#setUTCFullYear (param $this i32) (param $year i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4576,7 +4576,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#padStart (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $pad i32) (result i32)
+ (func $~lib/string/String#padStart (param $this i32) (param $length i32) (param $pad i32) (result i32)
   (local $thisSize i32)
   (local $targetSize i32)
   (local $padSize i32)
@@ -4697,7 +4697,7 @@
   local.get $11
   return
  )
- (func $~lib/date/stringify (type $i32_i32_=>_i32) (param $value i32) (param $padding i32) (result i32)
+ (func $~lib/date/stringify (param $value i32) (param $padding i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4731,7 +4731,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -4807,7 +4807,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4838,7 +4838,7 @@
   local.get $2
   return
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $4 i32)
   (local $estLen i32)
@@ -5068,7 +5068,7 @@
   local.get $13
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5113,7 +5113,7 @@
   local.get $2
   return
  )
- (func $~lib/date/Date#toISOString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#toISOString (param $this i32) (result i32)
   (local $yr i32)
   (local $isNeg i32)
   (local $3 i32)
@@ -5418,7 +5418,7 @@
   local.get $19
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5514,7 +5514,7 @@
   local.get $3
   return
  )
- (func $~lib/date/Date#toDateString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#toDateString (param $this i32) (result i32)
   (local $1 i32)
   (local $weeks i32)
   (local $3 i32)
@@ -5749,7 +5749,7 @@
   local.get $20
   return
  )
- (func $~lib/date/Date#toTimeString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#toTimeString (param $this i32) (result i32)
   (local $hours i32)
   (local $mins i32)
   (local $secs i32)
@@ -5877,7 +5877,7 @@
   local.get $7
   return
  )
- (func $~lib/date/Date#toUTCString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/date/Date#toUTCString (param $this i32) (result i32)
   (local $1 i32)
   (local $weeks i32)
   (local $3 i32)
@@ -6208,7 +6208,7 @@
   local.get $26
   return
  )
- (func $~lib/string/String#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#indexOf (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $searchLen i32)
   (local $len i32)
   (local $5 i32)
@@ -6333,7 +6333,7 @@
   local.get $10
   return
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -6482,7 +6482,7 @@
   local.get $22
   return
  )
- (func $~lib/string/String#substring@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6521,7 +6521,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -6640,7 +6640,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6713,7 +6713,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#push (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#push (param $this i32) (param $value i32) (result i32)
   (local $oldLen i32)
   (local $len i32)
   (local $4 i32)
@@ -6778,7 +6778,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#split (type $i32_i32_i32_=>_i32) (param $this i32) (param $separator i32) (param $limit i32) (result i32)
+ (func $~lib/string/String#split (param $this i32) (param $separator i32) (param $limit i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $length i32)
@@ -7202,7 +7202,7 @@
   local.get $22
   return
  )
- (func $~lib/string/String#split@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $separator i32) (param $limit i32) (result i32)
+ (func $~lib/string/String#split@varargs (param $this i32) (param $separator i32) (param $limit i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -7248,7 +7248,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7273,7 +7273,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7340,7 +7340,7 @@
   local.get $3
   return
  )
- (func $~lib/util/string/strtol<i32> (type $i32_i32_=>_i32) (param $str i32) (param $radix i32) (result i32)
+ (func $~lib/util/string/strtol<i32> (param $str i32) (param $radix i32) (result i32)
   (local $len i32)
   (local $ptr i32)
   (local $code i32)
@@ -7691,7 +7691,7 @@
   local.get $10
   return
  )
- (func $~lib/number/I32.parseInt (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32.parseInt (param $value i32) (param $radix i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7717,7 +7717,7 @@
   local.get $2
   return
  )
- (func $~lib/date/Date.fromString (type $i32_=>_i32) (param $dateTimeString i32) (result i32)
+ (func $~lib/date/Date.fromString (param $dateTimeString i32) (result i32)
   (local $hour i32)
   (local $min i32)
   (local $sec i32)
@@ -8081,7 +8081,7 @@
   local.get $17
   return
  )
- (func $start:std/date (type $none_=>_none)
+ (func $start:std/date
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -12794,7 +12794,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -12864,7 +12864,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12890,7 +12890,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -13072,7 +13072,7 @@
   local.get $14
   return
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
diff --git a/tests/compiler/std/date.release.wat b/tests/compiler/std/date.release.wat
index 1a04cb023d..0069aee13b 100644
--- a/tests/compiler/std/date.release.wat
+++ b/tests/compiler/std/date.release.wat
@@ -1,18 +1,18 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i32_i32_i32_i32_i32_i32_=>_i64 (func_subtype (param i32 i32 i32 i32 i32 i32 i32) (result i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i64_=>_i64 (func_subtype (param i32 i32 i32 i64) (result i64) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i32_i32_i32_i32_i32_i32_=>_i64 (func (param i32 i32 i32 i32 i32 i32 i32) (result i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i64_=>_i64 (func (param i32 i32 i32 i64) (result i64)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/date/_day (mut i32) (i32.const 0))
  (global $~lib/date/_month (mut i32) (i32.const 0))
@@ -240,7 +240,7 @@
  (data (i32.const 7792) "\08\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00\04A\00\00\02A\00\00\02\t")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/date/epochMillis (type $i32_i32_i32_i32_i32_i32_i32_=>_i64) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (result i64)
+ (func $~lib/date/epochMillis (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (result i64)
   local.get $6
   i64.extend_i32_s
   local.get $5
@@ -318,7 +318,7 @@
   i64.add
   i64.add
  )
- (func $~lib/date/dateFromEpoch (type $i64_=>_i32) (param $0 i64) (result i32)
+ (func $~lib/date/dateFromEpoch (param $0 i64) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -409,7 +409,7 @@
   global.set $~lib/date/_month
   local.get $1
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1392
@@ -464,7 +464,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -596,7 +596,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -749,7 +749,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -995,7 +995,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -1107,7 +1107,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1186,7 +1186,7 @@
   i32.const 40608
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1453,7 +1453,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1579,7 +1579,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1885,7 +1885,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/date/join (type $i32_i32_i32_i64_=>_i64) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64)
+ (func $~lib/date/join (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64)
   (local $4 i32)
   local.get $0
   local.get $1
@@ -1958,7 +1958,7 @@
   i64.mul
   i64.add
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2179,7 +2179,7 @@
   end
   local.get $2
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (param $0 i32) (param $1 i32) (param $2 i32)
   local.get $0
   local.get $1
   i32.const 2
@@ -2195,7 +2195,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__link
   end
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   local.get $0
   local.get $1
@@ -2274,7 +2274,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2426,7 +2426,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2435,7 +2435,7 @@
   global.set $~started
   call $start:std/date
  )
- (func $~lib/date/Date#constructor (type $i64_=>_i32) (param $0 i64) (result i32)
+ (func $~lib/date/Date#constructor (param $0 i64) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2528,7 +2528,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/date/Date#setTime (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/date/Date#setTime (param $0 i32) (param $1 i64)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2594,7 +2594,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#getUTCHours (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#getUTCHours (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2640,7 +2640,7 @@
   i32.const 3600000
   i32.div_s
  )
- (func $~lib/date/Date#getUTCMinutes (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#getUTCMinutes (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2686,7 +2686,7 @@
   i32.const 60000
   i32.div_s
  )
- (func $~lib/date/Date#getUTCSeconds (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#getUTCSeconds (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2732,7 +2732,7 @@
   i32.const 1000
   i32.div_s
  )
- (func $~lib/date/Date#getUTCMilliseconds (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#getUTCMilliseconds (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2776,7 +2776,7 @@
   i64.add
   i32.wrap_i64
  )
- (func $~lib/date/Date#setUTCMilliseconds (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCMilliseconds (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2824,7 +2824,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCSeconds (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCSeconds (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2874,7 +2874,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCMinutes (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCMinutes (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2924,7 +2924,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCHours (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCHours (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -2974,7 +2974,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCDate (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCDate (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3043,7 +3043,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/Date#setUTCMonth@varargs (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCMonth@varargs (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3143,7 +3143,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/date/Date#setUTCFullYear (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/date/Date#setUTCFullYear (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3212,7 +3212,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/date/stringify (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/date/stringify (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3367,7 +3367,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3586,7 +3586,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3631,7 +3631,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/date/Date#toISOString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#toISOString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -3961,7 +3961,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4050,7 +4050,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/date/Date#toDateString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#toDateString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -4303,7 +4303,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/date/Date#toTimeString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#toTimeString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4410,7 +4410,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/date/Date#toUTCString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date#toUTCString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -4733,7 +4733,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4850,7 +4850,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#substring (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4969,7 +4969,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String#substring@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#substring@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5016,7 +5016,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -5152,7 +5152,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#push (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>#push (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5215,7 +5215,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#split (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#split (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -5586,7 +5586,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String#split@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#split@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5640,7 +5640,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5673,7 +5673,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5739,7 +5739,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/string/strtol<i32> (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/string/strtol<i32> (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6047,7 +6047,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/number/I32.parseInt (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32.parseInt (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6080,7 +6080,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/date/Date.fromString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/date/Date.fromString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6385,7 +6385,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/date (type $none_=>_none)
+ (func $start:std/date
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -10153,7 +10153,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__newArray (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -10213,7 +10213,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -10232,7 +10232,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/hash.debug.wat b/tests/compiler/std/hash.debug.wat
index d9336af376..119095462b 100644
--- a/tests/compiler/std/hash.debug.wat
+++ b/tests/compiler/std/hash.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $f32_=>_i32 (func_subtype (param f32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $f32_=>_i32 (func (param f32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -26,11 +26,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -39,11 +39,11 @@
   i32.shr_u
   return
  )
- (func $std/hash/check (type $i32_=>_i32) (param $hash i32) (result i32)
+ (func $std/hash/check (param $hash i32) (result i32)
   i32.const 1
   return
  )
- (func $~lib/util/hash/HASH<f32> (type $f32_=>_i32) (param $key f32) (result i32)
+ (func $~lib/util/hash/HASH<f32> (param $key f32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -112,7 +112,7 @@
   end
   return
  )
- (func $~lib/util/hash/HASH<f64> (type $f64_=>_i32) (param $key f64) (result i32)
+ (func $~lib/util/hash/HASH<f64> (param $key f64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -198,10 +198,10 @@
   end
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/hash
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -214,7 +214,7 @@
    unreachable
   end
  )
- (func $~lib/util/hash/HASH<~lib/string/String|null> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<~lib/string/String|null> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $h i32)
   (local $len i32)
@@ -503,7 +503,7 @@
   local.get $19
   return
  )
- (func $~lib/util/hash/HASH<~lib/string/String> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<~lib/string/String> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $h i32)
   (local $len i32)
@@ -792,7 +792,7 @@
   local.get $19
   return
  )
- (func $start:std/hash (type $none_=>_none)
+ (func $start:std/hash
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/hash.release.wat b/tests/compiler/std/hash.release.wat
index 999031cf7a..cbc1f10dd8 100644
--- a/tests/compiler/std/hash.release.wat
+++ b/tests/compiler/std/hash.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34172))
  (memory $0 1)
@@ -27,7 +27,7 @@
  (data (i32.const 1368) "\02\00\00\00\12\00\00\00a\00b\00c\00d\00e\00f\00g\00h\00i")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -103,7 +103,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/hash/HASH<~lib/string/String|null> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/util/hash/HASH<~lib/string/String|null> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
diff --git a/tests/compiler/std/map.debug.wat b/tests/compiler/std/map.debug.wat
index b8d1a3e2b2..2ff9f8d109 100644
--- a/tests/compiler/std/map.debug.wat
+++ b/tests/compiler/std/map.debug.wat
@@ -1,37 +1,37 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_=>_f32 (func_subtype (param i32) (result f32) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i64_i64_=>_i32 (func_subtype (param i32 i64 i64) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f32_=>_i32 (func_subtype (param f32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_f32_f32_=>_i32 (func_subtype (param i32 f32 f32) (result i32) func))
- (type $i32_i32_f64_=>_none (func_subtype (param i32 i32 f64) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_f64_f64_=>_i32 (func_subtype (param i32 f64 f64) (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i64_i64_=>_i32 (func (param i32 i64 i64) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f32_=>_i32 (func (param f32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_f32_f32_=>_i32 (func (param i32 f32 f32) (result i32)))
+ (type $i32_i32_f64_=>_none (func (param i32 i32 f64)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_f64_f64_=>_i32 (func (param i32 f64 f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -72,17 +72,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -92,11 +92,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -105,14 +105,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -154,7 +154,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -166,11 +166,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -180,7 +180,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -236,15 +236,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -270,7 +270,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -290,7 +290,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -310,7 +310,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -346,7 +346,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -372,7 +372,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -393,11 +393,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -408,39 +408,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -676,7 +676,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1040,7 +1040,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1205,7 +1205,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1350,7 +1350,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1388,7 +1388,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1401,7 +1401,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1418,7 +1418,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1443,7 +1443,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1623,7 +1623,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1681,7 +1681,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1702,7 +1702,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1718,7 +1718,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1926,7 +1926,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2016,7 +2016,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2125,7 +2125,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2189,7 +2189,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2202,17 +2202,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2265,7 +2265,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2333,7 +2333,7 @@
    end
   end
  )
- (func $~lib/map/Map<i8,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i8,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2342,12 +2342,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i8,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i8,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i8,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i8,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2356,22 +2356,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i8,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i8,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i8,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i8,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i8,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i8,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i8> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i8> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2440,58 +2440,58 @@
   end
   return
  )
- (func $~lib/map/Map<i8,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i8,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i8,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i8,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0
  )
- (func $~lib/map/MapEntry<i8,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i8,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i8,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i8,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i8,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i8,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i8,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<i8,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/map/MapEntry<i8,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i8,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i8,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i8>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i8>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2500,38 +2500,38 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i8>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i8>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i8>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i8>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i8>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i8>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2577,11 +2577,11 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<i8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2590,30 +2590,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<i8,i8>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i8,i8>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2622,12 +2622,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i8,i8>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i8,i8>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i8,i8>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i8,i8>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2636,22 +2636,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i8,i8>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i8,i8>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i8,i8>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i8,i8>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i8,i8>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i8,i8>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<i32,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i32,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2660,12 +2660,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i32,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i32,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i32,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i32,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2674,73 +2674,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i32,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i32,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i32,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i32,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i32,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i32,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<i8,i8>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i8,i8>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i8,i8>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i8>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i8,i8>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i8>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0
  )
- (func $~lib/map/MapEntry<i8,i8>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i8,i8>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store8 $0 offset=1
  )
- (func $~lib/map/Map<i8,i8>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i8,i8>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i8,i8>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i8,i8>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i8,i8>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<i8,i8>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/map/MapEntry<i8,i8>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i8,i8>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0 offset=1
  )
- (func $~lib/map/MapEntry<i8,i8>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i8,i8>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/util/hash/HASH<i32> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i32> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2808,58 +2808,58 @@
   end
   return
  )
- (func $~lib/map/Map<i32,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i32,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i32,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i32,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i32,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i32,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/MapEntry<i32,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i32,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i32,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i32,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i32,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i32,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i32,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<i32,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/map/MapEntry<i32,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i32,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i32,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i32,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<u8,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u8,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2868,12 +2868,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u8,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u8,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u8,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u8,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2882,22 +2882,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u8,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u8,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u8,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u8,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u8,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u8,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u8> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u8> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2967,58 +2967,58 @@
   end
   return
  )
- (func $~lib/map/Map<u8,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u8,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u8,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u8,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0
  )
- (func $~lib/map/MapEntry<u8,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u8,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u8,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u8,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u8,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u8,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u8,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u8,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/map/MapEntry<u8,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u8,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u8,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u8>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u8>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3027,30 +3027,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u8>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u8>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u8>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u8>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u8>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u8>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<u8,u8>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u8,u8>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3059,12 +3059,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u8,u8>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u8,u8>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u8,u8>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u8,u8>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3073,73 +3073,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u8,u8>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u8,u8>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u8,u8>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u8,u8>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u8,u8>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u8,u8>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<u8,u8>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u8,u8>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u8,u8>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,u8>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u8,u8>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,u8>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0
  )
- (func $~lib/map/MapEntry<u8,u8>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u8,u8>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store8 $0 offset=1
  )
- (func $~lib/map/Map<u8,u8>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u8,u8>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u8,u8>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u8,u8>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u8,u8>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u8,u8>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/map/MapEntry<u8,u8>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u8,u8>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0 offset=1
  )
- (func $~lib/map/MapEntry<u8,u8>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u8,u8>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i16,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i16,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3148,12 +3148,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i16,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i16,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i16,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i16,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3162,22 +3162,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i16,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i16,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i16,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i16,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i16,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i16,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i16> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i16> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3246,58 +3246,58 @@
   end
   return
  )
- (func $~lib/map/Map<i16,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i16,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i16,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i16,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0
  )
- (func $~lib/map/MapEntry<i16,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i16,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i16,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i16,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i16,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i16,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i16,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<i16,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/map/MapEntry<i16,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i16,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i16,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i16>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i16>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3306,30 +3306,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i16>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i16>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i16>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i16>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i16>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i16>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<i16,i16>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i16,i16>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3338,12 +3338,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i16,i16>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i16,i16>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i16,i16>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i16,i16>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3352,73 +3352,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i16,i16>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i16,i16>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i16,i16>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i16,i16>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i16,i16>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i16,i16>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<i16,i16>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i16,i16>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i16,i16>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i16>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i16,i16>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i16>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0
  )
- (func $~lib/map/MapEntry<i16,i16>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i16,i16>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store16 $0 offset=2
  )
- (func $~lib/map/Map<i16,i16>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i16,i16>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i16,i16>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i16,i16>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i16,i16>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<i16,i16>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/map/MapEntry<i16,i16>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i16,i16>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0 offset=2
  )
- (func $~lib/map/MapEntry<i16,i16>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i16,i16>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u16,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u16,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3427,12 +3427,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u16,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u16,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u16,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u16,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3441,22 +3441,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u16,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u16,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u16,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u16,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u16,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u16,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u16> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u16> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3526,58 +3526,58 @@
   end
   return
  )
- (func $~lib/map/Map<u16,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u16,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u16,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u16,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_u $0
  )
- (func $~lib/map/MapEntry<u16,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u16,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u16,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u16,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u16,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u16,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u16,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u16,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/map/MapEntry<u16,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u16,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u16,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u16>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u16>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3586,30 +3586,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u16>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u16>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u16>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u16>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u16>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u16>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<u16,u16>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u16,u16>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3618,12 +3618,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u16,u16>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u16,u16>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u16,u16>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u16,u16>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3632,73 +3632,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u16,u16>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u16,u16>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u16,u16>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u16,u16>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u16,u16>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u16,u16>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<u16,u16>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u16,u16>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u16,u16>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,u16>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u16,u16>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,u16>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_u $0
  )
- (func $~lib/map/MapEntry<u16,u16>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u16,u16>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store16 $0 offset=2
  )
- (func $~lib/map/Map<u16,u16>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u16,u16>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u16,u16>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u16,u16>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u16,u16>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u16,u16>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/map/MapEntry<u16,u16>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u16,u16>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load16_u $0 offset=2
  )
- (func $~lib/map/MapEntry<u16,u16>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u16,u16>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u32,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u32,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3707,12 +3707,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u32,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u32,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u32,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u32,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3721,22 +3721,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u32,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u32,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u32,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u32,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u32,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u32,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u32> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u32> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3804,58 +3804,58 @@
   end
   return
  )
- (func $~lib/map/Map<u32,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u32,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u32,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u32,i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/MapEntry<u32,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u32,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u32,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u32,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u32,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u32,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u32,i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u32,i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/map/MapEntry<u32,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u32,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u32,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3864,30 +3864,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<u32,u32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u32,u32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3896,12 +3896,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u32,u32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u32,u32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u32,u32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u32,u32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3910,73 +3910,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u32,u32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u32,u32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u32,u32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u32,u32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u32,u32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u32,u32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<u32,u32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u32,u32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u32,u32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,u32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u32,u32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,u32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/MapEntry<u32,u32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u32,u32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u32,u32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u32,u32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u32,u32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u32,u32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u32,u32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<u32,u32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/map/MapEntry<u32,u32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u32,u32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u32,u32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u32,u32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<i64,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i64,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3985,12 +3985,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i64,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i64,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i64,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i64,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3999,22 +3999,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i64,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i64,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i64,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i64,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i64,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i64,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i64> (type $i64_=>_i32) (param $key i64) (result i32)
+ (func $~lib/util/hash/HASH<i64> (param $key i64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -4099,58 +4099,58 @@
   end
   return
  )
- (func $~lib/map/Map<i64,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i64,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i64,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i64,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/MapEntry<i64,i32>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<i64,i32>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/map/MapEntry<i64,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<i64,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<i64,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i64,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i64,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i64,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i64,i32>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/map/MapEntry<i64,i32>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/map/MapEntry<i64,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i64,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i64,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i64,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -4159,30 +4159,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<i64,i64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<i64,i64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4191,12 +4191,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i64,i64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<i64,i64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<i64,i64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<i64,i64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4205,73 +4205,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<i64,i64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<i64,i64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<i64,i64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<i64,i64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<i64,i64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<i64,i64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<i64,i64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<i64,i64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<i64,i64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<i64,i64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/MapEntry<i64,i64>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<i64,i64>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/map/MapEntry<i64,i64>#set:value (type $i32_i64_=>_none) (param $this i32) (param $value i64)
+ (func $~lib/map/MapEntry<i64,i64>#set:value (param $this i32) (param $value i64)
   local.get $this
   local.get $value
   i64.store $0 offset=8
  )
- (func $~lib/map/Map<i64,i64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<i64,i64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<i64,i64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<i64,i64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i64,i64>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/map/MapEntry<i64,i64>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/map/MapEntry<i64,i64>#get:value (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<i64,i64>#get:value (param $this i32) (result i64)
   local.get $this
   i64.load $0 offset=8
  )
- (func $~lib/map/MapEntry<i64,i64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<i64,i64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u64,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u64,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4280,12 +4280,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u64,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u64,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u64,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u64,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4294,22 +4294,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u64,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u64,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u64,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u64,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u64,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u64,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u64> (type $i64_=>_i32) (param $key i64) (result i32)
+ (func $~lib/util/hash/HASH<u64> (param $key i64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -4394,58 +4394,58 @@
   end
   return
  )
- (func $~lib/map/Map<u64,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u64,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u64,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u64,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/MapEntry<u64,i32>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<u64,i32>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/map/MapEntry<u64,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<u64,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<u64,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u64,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u64,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u64,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u64,i32>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/map/MapEntry<u64,i32>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/map/MapEntry<u64,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u64,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u64,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u64,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -4454,30 +4454,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<u64,u64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<u64,u64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4486,12 +4486,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u64,u64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<u64,u64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<u64,u64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<u64,u64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4500,73 +4500,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<u64,u64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<u64,u64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<u64,u64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<u64,u64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<u64,u64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<u64,u64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<u64,u64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<u64,u64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<u64,u64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<u64,u64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/MapEntry<u64,u64>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<u64,u64>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/map/MapEntry<u64,u64>#set:value (type $i32_i64_=>_none) (param $this i32) (param $value i64)
+ (func $~lib/map/MapEntry<u64,u64>#set:value (param $this i32) (param $value i64)
   local.get $this
   local.get $value
   i64.store $0 offset=8
  )
- (func $~lib/map/Map<u64,u64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<u64,u64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<u64,u64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<u64,u64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u64,u64>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/map/MapEntry<u64,u64>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/map/MapEntry<u64,u64>#get:value (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/map/MapEntry<u64,u64>#get:value (param $this i32) (result i64)
   local.get $this
   i64.load $0 offset=8
  )
- (func $~lib/map/MapEntry<u64,u64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<u64,u64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<f32,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<f32,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4575,12 +4575,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f32,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<f32,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<f32,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<f32,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4589,22 +4589,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f32,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<f32,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<f32,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<f32,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<f32,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<f32,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<f32> (type $f32_=>_i32) (param $key f32) (result i32)
+ (func $~lib/util/hash/HASH<f32> (param $key f32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -4673,58 +4673,58 @@
   end
   return
  )
- (func $~lib/map/Map<f32,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<f32,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f32,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f32,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f32,i32>#get:key (type $i32_=>_f32) (param $this i32) (result f32)
+ (func $~lib/map/MapEntry<f32,i32>#get:key (param $this i32) (result f32)
   local.get $this
   f32.load $0
  )
- (func $~lib/map/MapEntry<f32,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<f32,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<f32,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<f32,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<f32,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<f32,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f32,i32>#set:key (type $i32_f32_=>_none) (param $this i32) (param $key f32)
+ (func $~lib/map/MapEntry<f32,i32>#set:key (param $this i32) (param $key f32)
   local.get $this
   local.get $key
   f32.store $0
  )
- (func $~lib/map/MapEntry<f32,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f32,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f32,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<f32,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<f32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -4733,30 +4733,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<f32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<f32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<f32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<f32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<f32,f32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<f32,f32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4765,12 +4765,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f32,f32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<f32,f32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<f32,f32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<f32,f32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4779,73 +4779,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f32,f32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<f32,f32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<f32,f32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<f32,f32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<f32,f32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<f32,f32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<f32,f32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<f32,f32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f32,f32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f32,f32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f32,f32>#get:key (type $i32_=>_f32) (param $this i32) (result f32)
+ (func $~lib/map/MapEntry<f32,f32>#get:key (param $this i32) (result f32)
   local.get $this
   f32.load $0
  )
- (func $~lib/map/MapEntry<f32,f32>#set:value (type $i32_f32_=>_none) (param $this i32) (param $value f32)
+ (func $~lib/map/MapEntry<f32,f32>#set:value (param $this i32) (param $value f32)
   local.get $this
   local.get $value
   f32.store $0 offset=4
  )
- (func $~lib/map/Map<f32,f32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<f32,f32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<f32,f32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<f32,f32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f32,f32>#set:key (type $i32_f32_=>_none) (param $this i32) (param $key f32)
+ (func $~lib/map/MapEntry<f32,f32>#set:key (param $this i32) (param $key f32)
   local.get $this
   local.get $key
   f32.store $0
  )
- (func $~lib/map/MapEntry<f32,f32>#get:value (type $i32_=>_f32) (param $this i32) (result f32)
+ (func $~lib/map/MapEntry<f32,f32>#get:value (param $this i32) (result f32)
   local.get $this
   f32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f32,f32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<f32,f32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<f64,i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<f64,i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4854,12 +4854,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f64,i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<f64,i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<f64,i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<f64,i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4868,22 +4868,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f64,i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<f64,i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<f64,i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<f64,i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<f64,i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<f64,i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<f64> (type $f64_=>_i32) (param $key f64) (result i32)
+ (func $~lib/util/hash/HASH<f64> (param $key f64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -4969,58 +4969,58 @@
   end
   return
  )
- (func $~lib/map/Map<f64,i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<f64,i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f64,i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f64,i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/MapEntry<f64,i32>#get:key (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $~lib/map/MapEntry<f64,i32>#get:key (param $this i32) (result f64)
   local.get $this
   f64.load $0
  )
- (func $~lib/map/MapEntry<f64,i32>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<f64,i32>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<f64,i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<f64,i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<f64,i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<f64,i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f64,i32>#set:key (type $i32_f64_=>_none) (param $this i32) (param $key f64)
+ (func $~lib/map/MapEntry<f64,i32>#set:key (param $this i32) (param $key f64)
   local.get $this
   local.get $key
   f64.store $0
  )
- (func $~lib/map/MapEntry<f64,i32>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f64,i32>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f64,i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<f64,i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<f64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -5029,30 +5029,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<f64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<f64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<f64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<f64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/Map<f64,f64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<f64,f64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -5061,12 +5061,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f64,f64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<f64,f64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<f64,f64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<f64,f64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -5075,73 +5075,73 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<f64,f64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<f64,f64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<f64,f64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<f64,f64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<f64,f64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<f64,f64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/map/Map<f64,f64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<f64,f64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<f64,f64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<f64,f64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/MapEntry<f64,f64>#get:key (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $~lib/map/MapEntry<f64,f64>#get:key (param $this i32) (result f64)
   local.get $this
   f64.load $0
  )
- (func $~lib/map/MapEntry<f64,f64>#set:value (type $i32_f64_=>_none) (param $this i32) (param $value f64)
+ (func $~lib/map/MapEntry<f64,f64>#set:value (param $this i32) (param $value f64)
   local.get $this
   local.get $value
   f64.store $0 offset=8
  )
- (func $~lib/map/Map<f64,f64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<f64,f64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<f64,f64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<f64,f64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f64,f64>#set:key (type $i32_f64_=>_none) (param $this i32) (param $key f64)
+ (func $~lib/map/MapEntry<f64,f64>#set:key (param $this i32) (param $key f64)
   local.get $this
   local.get $key
   f64.store $0
  )
- (func $~lib/map/MapEntry<f64,f64>#get:value (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $~lib/map/MapEntry<f64,f64>#get:value (param $this i32) (result f64)
   local.get $this
   f64.load $0 offset=8
  )
- (func $~lib/map/MapEntry<f64,f64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<f64,f64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -5187,7 +5187,7 @@
   i32.const 0
   drop
  )
- (func $start:std/map (type $none_=>_none)
+ (func $start:std/map
   memory.size $0
   i32.const 16
   i32.shl
@@ -5217,7 +5217,7 @@
   call $std/map/testNumeric<f64,i32>
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -5232,7 +5232,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -5246,10 +5246,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/map/Map<i8,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i8,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5257,11 +5257,11 @@
   local.get $1
   call $~lib/map/Map<i8,i32>#__visit
  )
- (func $~lib/array/Array<i8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5269,11 +5269,11 @@
   local.get $1
   call $~lib/array/Array<i8>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5281,7 +5281,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/map/Map<i8,i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i8,i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5289,7 +5289,7 @@
   local.get $1
   call $~lib/map/Map<i8,i8>#__visit
  )
- (func $~lib/map/Map<i32,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i32,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5297,7 +5297,7 @@
   local.get $1
   call $~lib/map/Map<i32,i32>#__visit
  )
- (func $~lib/map/Map<u8,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u8,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5305,11 +5305,11 @@
   local.get $1
   call $~lib/map/Map<u8,i32>#__visit
  )
- (func $~lib/array/Array<u8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5317,7 +5317,7 @@
   local.get $1
   call $~lib/array/Array<u8>#__visit
  )
- (func $~lib/map/Map<u8,u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u8,u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5325,7 +5325,7 @@
   local.get $1
   call $~lib/map/Map<u8,u8>#__visit
  )
- (func $~lib/map/Map<i16,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i16,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5333,11 +5333,11 @@
   local.get $1
   call $~lib/map/Map<i16,i32>#__visit
  )
- (func $~lib/array/Array<i16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5345,7 +5345,7 @@
   local.get $1
   call $~lib/array/Array<i16>#__visit
  )
- (func $~lib/map/Map<i16,i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i16,i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5353,7 +5353,7 @@
   local.get $1
   call $~lib/map/Map<i16,i16>#__visit
  )
- (func $~lib/map/Map<u16,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u16,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5361,11 +5361,11 @@
   local.get $1
   call $~lib/map/Map<u16,i32>#__visit
  )
- (func $~lib/array/Array<u16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5373,7 +5373,7 @@
   local.get $1
   call $~lib/array/Array<u16>#__visit
  )
- (func $~lib/map/Map<u16,u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u16,u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5381,7 +5381,7 @@
   local.get $1
   call $~lib/map/Map<u16,u16>#__visit
  )
- (func $~lib/map/Map<u32,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u32,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5389,11 +5389,11 @@
   local.get $1
   call $~lib/map/Map<u32,i32>#__visit
  )
- (func $~lib/array/Array<u32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5401,7 +5401,7 @@
   local.get $1
   call $~lib/array/Array<u32>#__visit
  )
- (func $~lib/map/Map<u32,u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u32,u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5409,7 +5409,7 @@
   local.get $1
   call $~lib/map/Map<u32,u32>#__visit
  )
- (func $~lib/map/Map<i64,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i64,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5417,11 +5417,11 @@
   local.get $1
   call $~lib/map/Map<i64,i32>#__visit
  )
- (func $~lib/array/Array<i64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5429,7 +5429,7 @@
   local.get $1
   call $~lib/array/Array<i64>#__visit
  )
- (func $~lib/map/Map<i64,i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i64,i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5437,7 +5437,7 @@
   local.get $1
   call $~lib/map/Map<i64,i64>#__visit
  )
- (func $~lib/map/Map<u64,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u64,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5445,11 +5445,11 @@
   local.get $1
   call $~lib/map/Map<u64,i32>#__visit
  )
- (func $~lib/array/Array<u64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5457,7 +5457,7 @@
   local.get $1
   call $~lib/array/Array<u64>#__visit
  )
- (func $~lib/map/Map<u64,u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u64,u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5465,7 +5465,7 @@
   local.get $1
   call $~lib/map/Map<u64,u64>#__visit
  )
- (func $~lib/map/Map<f32,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f32,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5473,11 +5473,11 @@
   local.get $1
   call $~lib/map/Map<f32,i32>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5485,7 +5485,7 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/map/Map<f32,f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f32,f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5493,7 +5493,7 @@
   local.get $1
   call $~lib/map/Map<f32,f32>#__visit
  )
- (func $~lib/map/Map<f64,i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f64,i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5501,11 +5501,11 @@
   local.get $1
   call $~lib/map/Map<f64,i32>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5513,7 +5513,7 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/map/Map<f64,f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f64,f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5521,7 +5521,7 @@
   local.get $1
   call $~lib/map/Map<f64,f64>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/map/Map<f64,f64>
     block $~lib/array/Array<f64>
@@ -5720,10 +5720,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/map
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -5736,7 +5736,7 @@
    unreachable
   end
  )
- (func $~lib/map/Map<i8,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -5838,7 +5838,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<i8,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -5919,7 +5919,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i8,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5949,7 +5949,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<i8,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i8,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -6150,7 +6150,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -6352,7 +6352,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i8,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6394,7 +6394,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i8,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6419,7 +6419,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i8>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i8>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -6557,7 +6557,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -6676,7 +6676,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i8>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6745,7 +6745,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i8>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6773,7 +6773,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -6876,7 +6876,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -7014,7 +7014,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7083,7 +7083,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7111,7 +7111,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -7214,7 +7214,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i8,i8>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -7316,7 +7316,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<i32,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -7418,7 +7418,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7443,7 +7443,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7495,7 +7495,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7547,7 +7547,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i8,i8>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -7628,7 +7628,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i8,i8>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i8,i8>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -7829,7 +7829,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i8>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -8031,7 +8031,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i32,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -8110,7 +8110,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i32,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i32,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -8311,7 +8311,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i32,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -8513,7 +8513,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i8,i8>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i8,i8>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8538,7 +8538,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<i32,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8563,7 +8563,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<i8,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -8692,7 +8692,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<i8,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<i8,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -8778,7 +8778,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i8,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i8,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -9423,7 +9423,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -9525,7 +9525,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<u8,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -9608,7 +9608,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u8,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9638,7 +9638,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<u8,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u8,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -9839,7 +9839,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -10041,7 +10041,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u8,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10083,7 +10083,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u8,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10108,7 +10108,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u8>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -10246,7 +10246,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u8>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u8>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10315,7 +10315,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u8>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10343,7 +10343,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -10446,7 +10446,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u8,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -10549,7 +10549,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u8,u8>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -10651,7 +10651,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<u8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10676,7 +10676,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10728,7 +10728,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u8,u8>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -10811,7 +10811,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u8,u8>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u8,u8>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -11012,7 +11012,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,u8>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -11214,7 +11214,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u8,u8>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u8,u8>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11239,7 +11239,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<u8,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -11368,7 +11368,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<u8,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<u8,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -11454,7 +11454,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u8,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u8,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -12099,7 +12099,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -12201,7 +12201,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<i16,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -12282,7 +12282,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i16,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12312,7 +12312,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<i16,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i16,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -12513,7 +12513,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -12715,7 +12715,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i16,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12757,7 +12757,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i16,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12782,7 +12782,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i16>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i16>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -12920,7 +12920,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i16>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i16>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12989,7 +12989,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i16>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13017,7 +13017,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -13120,7 +13120,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i16,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -13223,7 +13223,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i16,i16>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -13325,7 +13325,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13350,7 +13350,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i16>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i16>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13402,7 +13402,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i16,i16>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -13483,7 +13483,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i16,i16>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i16,i16>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -13684,7 +13684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i16>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -13886,7 +13886,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i16,i16>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i16,i16>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13911,7 +13911,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<i16,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -14040,7 +14040,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<i16,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<i16,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14126,7 +14126,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i16,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i16,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -14771,7 +14771,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -14873,7 +14873,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<u16,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -14956,7 +14956,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u16,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14986,7 +14986,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<u16,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u16,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -15187,7 +15187,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -15389,7 +15389,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u16,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -15431,7 +15431,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u16,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15456,7 +15456,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u16>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -15594,7 +15594,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u16>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u16>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15663,7 +15663,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u16>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15691,7 +15691,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -15794,7 +15794,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u16,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -15897,7 +15897,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u16,u16>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -15999,7 +15999,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<u16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16024,7 +16024,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u16>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16076,7 +16076,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u16,u16>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -16159,7 +16159,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u16,u16>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u16,u16>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -16360,7 +16360,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,u16>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -16562,7 +16562,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u16,u16>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u16,u16>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16587,7 +16587,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<u16,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -16716,7 +16716,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<u16,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<u16,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16802,7 +16802,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u16,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u16,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -17447,7 +17447,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i32,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17477,7 +17477,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<i32,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -17519,7 +17519,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i32,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -17622,7 +17622,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i32,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -17725,7 +17725,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17750,7 +17750,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<i32,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -17879,7 +17879,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<i32,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<i32,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -17965,7 +17965,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i32,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -18610,7 +18610,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -18712,7 +18712,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<u32,i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -18791,7 +18791,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u32,i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18821,7 +18821,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<u32,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u32,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -19022,7 +19022,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -19224,7 +19224,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u32,i32>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -19266,7 +19266,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u32,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19291,7 +19291,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -19429,7 +19429,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19498,7 +19498,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19526,7 +19526,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -19629,7 +19629,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u32,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -19732,7 +19732,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u32,u32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -19834,7 +19834,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<u32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19859,7 +19859,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -19911,7 +19911,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u32,u32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -19990,7 +19990,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u32,u32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u32,u32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -20191,7 +20191,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,u32>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -20393,7 +20393,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u32,u32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u32,u32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20418,7 +20418,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<u32,i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -20547,7 +20547,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<u32,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<u32,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -20633,7 +20633,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u32,i32>
   (local $map i32)
   (local $k i32)
   (local $k|2 i32)
@@ -21278,7 +21278,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -21380,7 +21380,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<i64,i32>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -21459,7 +21459,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i64,i32>#has (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<i64,i32>#has (param $this i32) (param $key i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21489,7 +21489,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<i64,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i64,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -21690,7 +21690,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#set (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $value i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#set (param $this i32) (param $key i64) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -21892,7 +21892,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i64,i32>#get (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<i64,i32>#get (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21934,7 +21934,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<i64,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21959,7 +21959,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -22097,7 +22097,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i64>#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/array/Array<i64>#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22166,7 +22166,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22194,7 +22194,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -22297,7 +22297,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i64,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -22400,7 +22400,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i64,i64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -22502,7 +22502,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22527,7 +22527,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -22580,7 +22580,7 @@
   local.get $4
   return
  )
- (func $~lib/map/Map<i64,i64>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -22659,7 +22659,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<i64,i64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<i64,i64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -22860,7 +22860,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i64>#set (type $i32_i64_i64_=>_i32) (param $this i32) (param $key i64) (param $value i64) (result i32)
+ (func $~lib/map/Map<i64,i64>#set (param $this i32) (param $key i64) (param $value i64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -23062,7 +23062,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<i64,i64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<i64,i64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -23087,7 +23087,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<i64,i32>#delete (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<i64,i32>#delete (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -23216,7 +23216,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<i64,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<i64,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -23302,7 +23302,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i64,i32>
   (local $map i32)
   (local $k i64)
   (local $k|2 i64)
@@ -23955,7 +23955,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -24057,7 +24057,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<u64,i32>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -24136,7 +24136,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u64,i32>#has (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<u64,i32>#has (param $this i32) (param $key i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24166,7 +24166,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<u64,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u64,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -24367,7 +24367,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#set (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $value i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#set (param $this i32) (param $key i64) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -24569,7 +24569,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u64,i32>#get (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<u64,i32>#get (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -24611,7 +24611,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<u64,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24636,7 +24636,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -24774,7 +24774,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u64>#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/array/Array<u64>#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24843,7 +24843,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24871,7 +24871,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -24974,7 +24974,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u64,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -25077,7 +25077,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u64,u64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -25179,7 +25179,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<u64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25204,7 +25204,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<u64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -25257,7 +25257,7 @@
   local.get $4
   return
  )
- (func $~lib/map/Map<u64,u64>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -25336,7 +25336,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<u64,u64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<u64,u64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -25537,7 +25537,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,u64>#set (type $i32_i64_i64_=>_i32) (param $this i32) (param $key i64) (param $value i64) (result i32)
+ (func $~lib/map/Map<u64,u64>#set (param $this i32) (param $key i64) (param $value i64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -25739,7 +25739,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<u64,u64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<u64,u64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25764,7 +25764,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<u64,i32>#delete (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/map/Map<u64,i32>#delete (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -25893,7 +25893,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<u64,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<u64,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -25979,7 +25979,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u64,i32>
   (local $map i32)
   (local $k i64)
   (local $k|2 i64)
@@ -26632,7 +26632,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -26734,7 +26734,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<f32,i32>#find (type $i32_f32_i32_=>_i32) (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#find (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -26813,7 +26813,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<f32,i32>#has (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/map/Map<f32,i32>#has (param $this i32) (param $key f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -26843,7 +26843,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<f32,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<f32,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -27044,7 +27044,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#set (type $i32_f32_i32_=>_i32) (param $this i32) (param $key f32) (param $value i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#set (param $this i32) (param $key f32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -27246,7 +27246,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f32,i32>#get (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get (param $this i32) (param $key f32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -27288,7 +27288,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<f32,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -27313,7 +27313,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<f32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -27451,7 +27451,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<f32>#__set (type $i32_i32_f32_=>_none) (param $this i32) (param $index i32) (param $value f32)
+ (func $~lib/array/Array<f32>#__set (param $this i32) (param $index i32) (param $value f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -27520,7 +27520,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<f32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -27548,7 +27548,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -27651,7 +27651,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f32,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -27754,7 +27754,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f32,f32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -27856,7 +27856,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -27881,7 +27881,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $this i32) (param $index i32) (result f32)
   (local $value f32)
   (local $3 i32)
   (local $4 f32)
@@ -27934,7 +27934,7 @@
   local.get $4
   return
  )
- (func $~lib/map/Map<f32,f32>#find (type $i32_f32_i32_=>_i32) (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#find (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -28013,7 +28013,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<f32,f32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<f32,f32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -28214,7 +28214,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,f32>#set (type $i32_f32_f32_=>_i32) (param $this i32) (param $key f32) (param $value f32) (result i32)
+ (func $~lib/map/Map<f32,f32>#set (param $this i32) (param $key f32) (param $value f32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -28416,7 +28416,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f32,f32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f32,f32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -28441,7 +28441,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<f32,i32>#delete (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/map/Map<f32,i32>#delete (param $this i32) (param $key f32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -28570,7 +28570,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<f32,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<f32,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -28656,7 +28656,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<f32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<f32,i32>
   (local $map i32)
   (local $k f32)
   (local $k|2 f32)
@@ -29309,7 +29309,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -29411,7 +29411,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<f64,i32>#find (type $i32_f64_i32_=>_i32) (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#find (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -29490,7 +29490,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<f64,i32>#has (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/map/Map<f64,i32>#has (param $this i32) (param $key f64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -29520,7 +29520,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<f64,i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<f64,i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -29721,7 +29721,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#set (type $i32_f64_i32_=>_i32) (param $this i32) (param $key f64) (param $value i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#set (param $this i32) (param $key f64) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -29923,7 +29923,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f64,i32>#get (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/map/Map<f64,i32>#get (param $this i32) (param $key f64) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -29965,7 +29965,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<f64,i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -29990,7 +29990,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<f64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -30128,7 +30128,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<f64>#__set (type $i32_i32_f64_=>_none) (param $this i32) (param $index i32) (param $value f64)
+ (func $~lib/array/Array<f64>#__set (param $this i32) (param $index i32) (param $value f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -30197,7 +30197,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<f64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -30225,7 +30225,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#keys (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#keys (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $keys i32)
@@ -30328,7 +30328,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f64,i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -30431,7 +30431,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f64,f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -30533,7 +30533,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -30558,7 +30558,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $this i32) (param $index i32) (result f64)
   (local $value f64)
   (local $3 i32)
   (local $4 f64)
@@ -30611,7 +30611,7 @@
   local.get $4
   return
  )
- (func $~lib/map/Map<f64,f64>#find (type $i32_f64_i32_=>_i32) (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#find (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -30690,7 +30690,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<f64,f64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<f64,f64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -30891,7 +30891,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,f64>#set (type $i32_f64_f64_=>_i32) (param $this i32) (param $key f64) (param $value f64) (result i32)
+ (func $~lib/map/Map<f64,f64>#set (param $this i32) (param $key f64) (param $value f64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -31093,7 +31093,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<f64,f64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<f64,f64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -31118,7 +31118,7 @@
   local.get $1
   return
  )
- (func $~lib/map/Map<f64,i32>#delete (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/map/Map<f64,i32>#delete (param $this i32) (param $key f64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -31247,7 +31247,7 @@
   local.get $6
   return
  )
- (func $~lib/map/Map<f64,i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/map/Map<f64,i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31333,7 +31333,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<f64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<f64,i32>
   (local $map i32)
   (local $k f64)
   (local $k|2 f64)
@@ -31986,7 +31986,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i8,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32024,7 +32024,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32050,7 +32050,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32076,7 +32076,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i8,i8>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32114,7 +32114,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i32,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i32,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32152,7 +32152,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u8,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32190,7 +32190,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32216,7 +32216,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u8,u8>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32254,7 +32254,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i16,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32292,7 +32292,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32318,7 +32318,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i16,i16>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32356,7 +32356,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u16,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32394,7 +32394,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32420,7 +32420,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u16,u16>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32458,7 +32458,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u32,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32496,7 +32496,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32522,7 +32522,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u32,u32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32560,7 +32560,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i64,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32598,7 +32598,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32624,7 +32624,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<i64,i64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32662,7 +32662,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u64,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32700,7 +32700,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32726,7 +32726,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<u64,u64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32764,7 +32764,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<f32,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32802,7 +32802,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32828,7 +32828,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<f32,f32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32866,7 +32866,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<f64,i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32904,7 +32904,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32930,7 +32930,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<f64,f64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -32968,7 +32968,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/map.release.wat b/tests/compiler/std/map.release.wat
index a0b706d036..53df77daec 100644
--- a/tests/compiler/std/map.release.wat
+++ b/tests/compiler/std/map.release.wat
@@ -1,29 +1,29 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i64_i64_=>_none (func_subtype (param i32 i64 i64) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f32_i32_=>_none (func_subtype (param i32 f32 i32) func))
- (type $i32_f32_f32_=>_none (func_subtype (param i32 f32 f32) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i32_f64_i32_=>_none (func_subtype (param i32 f64 i32) func))
- (type $i32_f64_f64_=>_none (func_subtype (param i32 f64 f64) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i64_i64_=>_none (func (param i32 i64 i64)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f32_i32_=>_none (func (param i32 f32 i32)))
+ (type $i32_f32_f32_=>_none (func (param i32 f32 f32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i32_f64_i32_=>_none (func (param i32 f64 i32)))
+ (type $i32_f64_f64_=>_none (func (param i32 f64 f64)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -62,7 +62,7 @@
  (data (i32.const 1760) "!\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\10\89\10\00B\08\00\00\02\t\00\00P\88\10\00\10\t\12\00\10\89\00\00B\00\00\00P\80\00\00\10\t\11\00\82\08\00\00\90\08\11\00\10\t\01\00\82\00\00\00\90\00\01\00\10\t\02\00\02\01\00\00\10\01\02\00\10\t\14\00\02\n\00\00\10\n\14\00\10\t\04\00\02\02\00\00\10\02\04\00\10\t2\00\02\19\00\00\10\192\00\10\t4\00\02\1a\00\00\10\1a4")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -111,7 +111,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -243,7 +243,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -396,7 +396,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -642,7 +642,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -754,7 +754,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -833,7 +833,7 @@
   i32.const 34672
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1100,7 +1100,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1226,7 +1226,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1532,7 +1532,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner2
    block $folding-inner1
@@ -1638,7 +1638,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1715,7 +1715,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/map/Map<i8,i32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1795,7 +1795,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<i8,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1860,7 +1860,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i8,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i8,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2064,7 +2064,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<i8,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2264,7 +2264,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2339,7 +2339,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i8,i32>#get:size (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#get:size (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2372,7 +2372,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2514,7 +2514,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i8>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2584,7 +2584,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2619,7 +2619,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2742,7 +2742,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2814,7 +2814,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2849,7 +2849,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#values (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/map/Map<i8,i32>#values (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2938,7 +2938,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/map/Map<i32,i32>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3037,7 +3037,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3070,7 +3070,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3124,7 +3124,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i8,i8>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<i8,i8>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -3585,7 +3585,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i32,i32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3663,7 +3663,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<i32,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i32,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3866,7 +3866,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i32,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<i32,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4065,7 +4065,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i8,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4208,7 +4208,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i8,i32>#clear (type $i32_=>_none) (param $0 i32)
+ (func $~lib/map/Map<i8,i32>#clear (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4296,7 +4296,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i8,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i8,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5239,7 +5239,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u8,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5305,7 +5305,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u8,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u8,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -5508,7 +5508,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u8,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -5709,7 +5709,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u8,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u8,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5785,7 +5785,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u8,u8>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u8,u8>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -6246,7 +6246,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u8,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u8,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6390,7 +6390,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u8,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u8,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -7333,7 +7333,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i16,i32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7413,7 +7413,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<i16,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7478,7 +7478,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i16,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i16,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -7682,7 +7682,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<i16,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -7882,7 +7882,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i16,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7957,7 +7957,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i16>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i16>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8029,7 +8029,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -8064,7 +8064,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i16,i16>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<i16,i16>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -8525,7 +8525,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i16,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i16,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -8668,7 +8668,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i16,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i16,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -9615,7 +9615,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u16,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9681,7 +9681,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u16,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u16,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9884,7 +9884,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u16,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -10085,7 +10085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u16,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u16,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10161,7 +10161,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u16,u16>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u16,u16>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -10622,7 +10622,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u16,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u16,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10766,7 +10766,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u16,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u16,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -11713,7 +11713,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i32,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11777,7 +11777,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i32,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<i32,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11851,7 +11851,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i32,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i32,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11993,7 +11993,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i32,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -12616,7 +12616,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u32,i32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12694,7 +12694,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<u32,i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12758,7 +12758,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u32,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u32,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -12961,7 +12961,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u32,i32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -13160,7 +13160,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u32,i32>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<u32,i32>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13234,7 +13234,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u32,u32>#set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/map/Map<u32,u32>#set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -13626,7 +13626,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u32,i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u32,i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13768,7 +13768,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u32,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -14715,7 +14715,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i64,i32>#find (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#find (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14793,7 +14793,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<i64,i32>#has (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/map/Map<i64,i32>#has (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14869,7 +14869,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<i64,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i64,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15085,7 +15085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#set (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/map/Map<i64,i32>#set (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -15296,7 +15296,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#get (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/map/Map<i64,i32>#get (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15382,7 +15382,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i64>#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/array/Array<i64>#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15454,7 +15454,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -15489,7 +15489,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#values (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/map/Map<i64,i32>#values (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -15578,7 +15578,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/map/Map<i64,i64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<i64,i64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15794,7 +15794,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i64>#set (type $i32_i64_i64_=>_none) (param $0 i32) (param $1 i64) (param $2 i64)
+ (func $~lib/map/Map<i64,i64>#set (param $0 i32) (param $1 i64) (param $2 i64)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -16073,7 +16073,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<i64,i32>#delete (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/map/Map<i64,i32>#delete (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -16228,7 +16228,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<i64,i32>#clear (type $i32_=>_none) (param $0 i32)
+ (func $~lib/map/Map<i64,i32>#clear (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16316,7 +16316,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<i64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<i64,i32>
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -17272,7 +17272,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u64,i32>#find (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/map/Map<u64,i32>#find (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -17350,7 +17350,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<u64,i32>#has (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/map/Map<u64,i32>#has (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17426,7 +17426,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u64,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u64,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -17642,7 +17642,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#set (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/map/Map<u64,i32>#set (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -17853,7 +17853,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,i32>#get (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/map/Map<u64,i32>#get (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17939,7 +17939,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<u64,u64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<u64,u64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -18155,7 +18155,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<u64,u64>#set (type $i32_i64_i64_=>_none) (param $0 i32) (param $1 i64) (param $2 i64)
+ (func $~lib/map/Map<u64,u64>#set (param $0 i32) (param $1 i64) (param $2 i64)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -18434,7 +18434,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<u64,i32>#delete (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/map/Map<u64,i32>#delete (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -18589,7 +18589,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<u64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<u64,i32>
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -19545,7 +19545,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f32,i32>#find (type $i32_f32_i32_=>_i32) (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#find (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -19623,7 +19623,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<f32,i32>#has (type $i32_f32_=>_i32) (param $0 i32) (param $1 f32) (result i32)
+ (func $~lib/map/Map<f32,i32>#has (param $0 i32) (param $1 f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19688,7 +19688,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<f32,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f32,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -19893,7 +19893,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#set (type $i32_f32_i32_=>_none) (param $0 i32) (param $1 f32) (param $2 i32)
+ (func $~lib/map/Map<f32,i32>#set (param $0 i32) (param $1 f32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -20093,7 +20093,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f32,i32>#get (type $i32_f32_=>_i32) (param $0 i32) (param $1 f32) (result i32)
+ (func $~lib/map/Map<f32,i32>#get (param $0 i32) (param $1 f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20168,7 +20168,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<f32,i32>#keys (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/map/Map<f32,i32>#keys (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f32)
@@ -20434,7 +20434,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f32,f32>#set (type $i32_f32_f32_=>_none) (param $0 i32) (param $1 f32) (param $2 f32)
+ (func $~lib/map/Map<f32,f32>#set (param $0 i32) (param $1 f32) (param $2 f32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -20829,7 +20829,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f32,i32>#delete (type $i32_f32_=>_none) (param $0 i32) (param $1 f32)
+ (func $~lib/map/Map<f32,i32>#delete (param $0 i32) (param $1 f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20973,7 +20973,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<f32,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<f32,i32>
   (local $0 i32)
   (local $1 f32)
   (local $2 i32)
@@ -21743,7 +21743,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f64,i32>#find (type $i32_f64_i32_=>_i32) (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#find (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21821,7 +21821,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<f64,i32>#has (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/map/Map<f64,i32>#has (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -21900,7 +21900,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<f64,i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f64,i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -22119,7 +22119,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#set (type $i32_f64_i32_=>_none) (param $0 i32) (param $1 f64) (param $2 i32)
+ (func $~lib/map/Map<f64,i32>#set (param $0 i32) (param $1 f64) (param $2 i32)
   (local $3 i64)
   (local $4 i32)
   (local $5 i32)
@@ -22333,7 +22333,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,i32>#get (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/map/Map<f64,i32>#get (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -22422,7 +22422,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<f64,i32>#keys (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/map/Map<f64,i32>#keys (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -22688,7 +22688,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f64,f64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<f64,f64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -22907,7 +22907,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<f64,f64>#set (type $i32_f64_f64_=>_none) (param $0 i32) (param $1 f64) (param $2 f64)
+ (func $~lib/map/Map<f64,f64>#set (param $0 i32) (param $1 f64) (param $2 f64)
   (local $3 i32)
   (local $4 i64)
   (local $5 i32)
@@ -23189,7 +23189,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<f64,i32>#delete (type $i32_f64_=>_none) (param $0 i32) (param $1 f64)
+ (func $~lib/map/Map<f64,i32>#delete (param $0 i32) (param $1 f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -23347,7 +23347,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/map/testNumeric<f64,i32> (type $none_=>_none)
+ (func $std/map/testNumeric<f64,i32>
   (local $0 i32)
   (local $1 f64)
   (local $2 i32)
@@ -24117,7 +24117,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -24159,7 +24159,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -24178,7 +24178,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   local.get $0
   i32.eqz
   if
diff --git a/tests/compiler/std/math.debug.wat b/tests/compiler/std/math.debug.wat
index 84914e9713..85725744ef 100644
--- a/tests/compiler/std/math.debug.wat
+++ b/tests/compiler/std/math.debug.wat
@@ -1,34 +1,34 @@
 (module
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $f64_f64_f64_i32_=>_i32 (func_subtype (param f64 f64 f64 i32) (result i32) func))
- (type $f32_f32_f32_i32_=>_i32 (func_subtype (param f32 f32 f32 i32) (result i32) func))
- (type $f32_=>_f32 (func_subtype (param f32) (result f32) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $f64_f64_f64_f64_i32_=>_i32 (func_subtype (param f64 f64 f64 f64 i32) (result i32) func))
- (type $f32_f32_f32_f32_i32_=>_i32 (func_subtype (param f32 f32 f32 f32 i32) (result i32) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $none_=>_f64 (func_subtype (result f64) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $f64_i32_=>_f64 (func_subtype (param f64 i32) (result f64) func))
- (type $f64_f64_f64_=>_f64 (func_subtype (param f64 f64 f64) (result f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f32_=>_i32 (func_subtype (param f32) (result i32) func))
- (type $f32_i32_=>_f32 (func_subtype (param f32 i32) (result f32) func))
- (type $f32_f32_f32_=>_f32 (func_subtype (param f32 f32 f32) (result f32) func))
- (type $f64_i32_f64_f64_i32_=>_i32 (func_subtype (param f64 i32 f64 f64 i32) (result i32) func))
- (type $f32_i32_f32_f32_i32_=>_i32 (func_subtype (param f32 i32 f32 f32 i32) (result i32) func))
- (type $f64_i64_=>_i32 (func_subtype (param f64 i64) (result i32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i64_=>_i64 (func_subtype (param i64) (result i64) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i64_=>_none (func_subtype (param i64) func))
- (type $none_=>_f32 (func_subtype (result f32) func))
- (type $f64_f64_i32_=>_f64 (func_subtype (param f64 f64 i32) (result f64) func))
- (type $f64_=>_none (func_subtype (param f64) func))
- (type $i64_i64_i64_i64_i64_i32_=>_i32 (func_subtype (param i64 i64 i64 i64 i64 i32) (result i32) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $f64_f64_f64_i32_=>_i32 (func (param f64 f64 f64 i32) (result i32)))
+ (type $f32_f32_f32_i32_=>_i32 (func (param f32 f32 f32 i32) (result i32)))
+ (type $f32_=>_f32 (func (param f32) (result f32)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $f64_f64_f64_f64_i32_=>_i32 (func (param f64 f64 f64 f64 i32) (result i32)))
+ (type $f32_f32_f32_f32_i32_=>_i32 (func (param f32 f32 f32 f32 i32) (result i32)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $none_=>_none (func))
+ (type $f64_i32_=>_f64 (func (param f64 i32) (result f64)))
+ (type $f64_f64_f64_=>_f64 (func (param f64 f64 f64) (result f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f32_=>_i32 (func (param f32) (result i32)))
+ (type $f32_i32_=>_f32 (func (param f32 i32) (result f32)))
+ (type $f32_f32_f32_=>_f32 (func (param f32 f32 f32) (result f32)))
+ (type $f64_i32_f64_f64_i32_=>_i32 (func (param f64 i32 f64 f64 i32) (result i32)))
+ (type $f32_i32_f32_f32_i32_=>_i32 (func (param f32 i32 f32 f32 i32) (result i32)))
+ (type $f64_i64_=>_i32 (func (param f64 i64) (result i32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i64_=>_i64 (func (param i64) (result i64)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i64_=>_none (func (param i64)))
+ (type $none_=>_f32 (func (result f32)))
+ (type $f64_f64_i32_=>_f64 (func (param f64 f64 i32) (result f64)))
+ (type $f64_=>_none (func (param f64)))
+ (type $i64_i64_i64_i64_i64_i32_=>_i32 (func (param i64 i64 i64 i64 i64 i32) (result i32)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "Math.LN2" (global $~lib/bindings/dom/Math.LN2 f64))
  (import "env" "Math.LN10" (global $~lib/bindings/dom/Math.LN10 f64))
@@ -129,7 +129,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $std/math/eulp (type $f64_=>_i32) (param $x f64) (result i32)
+ (func $std/math/eulp (param $x f64) (result i32)
   (local $u i64)
   (local $e i32)
   local.get $x
@@ -157,7 +157,7 @@
   i32.sub
   return
  )
- (func $~lib/math/NativeMath.scalbn (type $f64_i32_=>_f64) (param $x f64) (param $n i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (param $x f64) (param $n i32) (result f64)
   (local $y f64)
   (local $3 i32)
   (local $4 i32)
@@ -251,7 +251,7 @@
   f64.mul
   return
  )
- (func $std/math/ulperr (type $f64_f64_f64_=>_f64) (param $got f64) (param $want f64) (param $dwant f64) (result f64)
+ (func $std/math/ulperr (param $got f64) (param $want f64) (param $dwant f64) (result f64)
   (local $x f64)
   (local $x|4 f64)
   local.get $got
@@ -334,7 +334,7 @@
   f64.add
   return
  )
- (func $std/math/check<f64> (type $f64_f64_f64_i32_=>_i32) (param $actual f64) (param $expected f64) (param $dy f64) (param $flags i32) (result i32)
+ (func $std/math/check<f64> (param $actual f64) (param $expected f64) (param $dy f64) (param $flags i32) (result i32)
   (local $d f64)
   local.get $actual
   local.get $expected
@@ -372,7 +372,7 @@
   i32.const 1
   return
  )
- (func $std/math/eulpf (type $f32_=>_i32) (param $x f32) (result i32)
+ (func $std/math/eulpf (param $x f32) (result i32)
   (local $u i32)
   (local $e i32)
   local.get $x
@@ -399,7 +399,7 @@
   i32.sub
   return
  )
- (func $~lib/math/NativeMathf.scalbn (type $f32_i32_=>_f32) (param $x f32) (param $n i32) (result f32)
+ (func $~lib/math/NativeMathf.scalbn (param $x f32) (param $n i32) (result f32)
   (local $y f32)
   (local $3 i32)
   (local $4 i32)
@@ -492,7 +492,7 @@
   f32.mul
   return
  )
- (func $std/math/ulperrf (type $f32_f32_f32_=>_f32) (param $got f32) (param $want f32) (param $dwant f32) (result f32)
+ (func $std/math/ulperrf (param $got f32) (param $want f32) (param $dwant f32) (result f32)
   (local $x f32)
   (local $x|4 f32)
   local.get $got
@@ -571,7 +571,7 @@
   f32.add
   return
  )
- (func $std/math/check<f32> (type $f32_f32_f32_i32_=>_i32) (param $actual f32) (param $expected f32) (param $dy f32) (param $flags i32) (result i32)
+ (func $std/math/check<f32> (param $actual f32) (param $expected f32) (param $dy f32) (param $flags i32) (result i32)
   (local $d f32)
   local.get $actual
   local.get $expected
@@ -613,7 +613,7 @@
   i32.const 1
   return
  )
- (func $std/math/test_scalbn (type $f64_i32_f64_f64_i32_=>_i32) (param $value f64) (param $n i32) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_scalbn (param $value f64) (param $n i32) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   local.get $n
   call $~lib/math/NativeMath.scalbn
@@ -623,7 +623,7 @@
   call $std/math/check<f64>
   return
  )
- (func $std/math/test_scalbnf (type $f32_i32_f32_f32_i32_=>_i32) (param $value f32) (param $n i32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_scalbnf (param $value f32) (param $n i32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   local.get $n
   call $~lib/math/NativeMathf.scalbn
@@ -633,7 +633,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_abs (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_abs (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $x f64)
   block $~lib/math/NativeMath.abs|inlined.0 (result f64)
    local.get $value
@@ -658,7 +658,7 @@
   end
   return
  )
- (func $std/math/test_absf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_absf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $x f32)
   block $~lib/math/NativeMathf.abs|inlined.0 (result f32)
    local.get $value
@@ -673,7 +673,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/R (type $f64_=>_f64) (param $z f64) (result f64)
+ (func $~lib/math/R (param $z f64) (result f64)
   (local $p f64)
   (local $q f64)
   local.get $z
@@ -723,7 +723,7 @@
   f64.div
   return
  )
- (func $~lib/math/NativeMath.acos (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.acos (param $x f64) (result f64)
   (local $hx i32)
   (local $ix i32)
   (local $lx i32)
@@ -876,7 +876,7 @@
   f64.mul
   return
  )
- (func $std/math/test_acos (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_acos (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.acos
   local.get $expected
@@ -895,7 +895,7 @@
   end
   return
  )
- (func $~lib/math/Rf (type $f32_=>_f32) (param $z f32) (result f32)
+ (func $~lib/math/Rf (param $z f32) (result f32)
   (local $p f32)
   (local $q f32)
   local.get $z
@@ -921,7 +921,7 @@
   f32.div
   return
  )
- (func $~lib/math/NativeMathf.acos (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.acos (param $x f32) (result f32)
   (local $hx i32)
   (local $ix i32)
   (local $z f32)
@@ -1060,7 +1060,7 @@
   f32.mul
   return
  )
- (func $std/math/test_acosf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_acosf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.acos
   local.get $expected
@@ -1069,7 +1069,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.log1p (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.log1p (param $x f64) (result f64)
   (local $u i64)
   (local $hx i32)
   (local $k i32)
@@ -1314,7 +1314,7 @@
   f64.add
   return
  )
- (func $~lib/math/NativeMath.log (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.log (param $x f64) (result f64)
   (local $x|1 f64)
   (local $ix i64)
   (local $r f64)
@@ -1657,7 +1657,7 @@
   end
   return
  )
- (func $~lib/math/NativeMath.acosh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.acosh (param $x f64) (result f64)
   (local $u i64)
   (local $e i64)
   local.get $x
@@ -1736,7 +1736,7 @@
   f64.add
   return
  )
- (func $std/math/test_acosh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_acosh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.acosh
   local.get $expected
@@ -1755,7 +1755,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.log1p (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.log1p (param $x f32) (result f32)
   (local $ix i32)
   (local $c f32)
   (local $f f32)
@@ -1967,7 +1967,7 @@
   f32.add
   return
  )
- (func $~lib/math/NativeMathf.log (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.log (param $x f32) (result f32)
   (local $x|1 f32)
   (local $ux i32)
   (local $tmp i32)
@@ -2139,7 +2139,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.acosh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.acosh (param $x f32) (result f32)
   (local $u i32)
   (local $a i32)
   (local $xm1 f32)
@@ -2204,7 +2204,7 @@
   f32.add
   return
  )
- (func $std/math/test_acoshf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_acoshf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.acosh
   local.get $expected
@@ -2213,7 +2213,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.asin (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.asin (param $x f64) (result f64)
   (local $hx i32)
   (local $ix i32)
   (local $lx i32)
@@ -2371,7 +2371,7 @@
   select
   return
  )
- (func $std/math/test_asin (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_asin (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.asin
   local.get $expected
@@ -2390,7 +2390,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.asin (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.asin (param $x f32) (result f32)
   (local $sx f32)
   (local $hx i32)
   (local $z f32)
@@ -2483,7 +2483,7 @@
   f32.copysign
   return
  )
- (func $std/math/test_asinf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_asinf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.asin
   local.get $expected
@@ -2492,7 +2492,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.asinh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.asinh (param $x f64) (result f64)
   (local $u i64)
   (local $e i64)
   (local $y f64)
@@ -2575,7 +2575,7 @@
   f64.copysign
   return
  )
- (func $std/math/test_asinh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_asinh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.asinh
   local.get $expected
@@ -2594,7 +2594,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.asinh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.asinh (param $x f32) (result f32)
   (local $u i32)
   (local $y f32)
   local.get $x
@@ -2676,7 +2676,7 @@
   f32.copysign
   return
  )
- (func $std/math/test_asinhf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_asinhf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.asinh
   local.get $expected
@@ -2685,7 +2685,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.atan (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.atan (param $x f64) (result f64)
   (local $ix i32)
   (local $sx f64)
   (local $z f64)
@@ -2944,7 +2944,7 @@
   f64.copysign
   return
  )
- (func $std/math/test_atan (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_atan (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.atan
   local.get $expected
@@ -2963,7 +2963,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.atan (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.atan (param $x f32) (result f32)
   (local $ix i32)
   (local $sx f32)
   (local $z f32)
@@ -3194,7 +3194,7 @@
   f32.copysign
   return
  )
- (func $std/math/test_atanf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_atanf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.atan
   local.get $expected
@@ -3203,7 +3203,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.atanh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.atanh (param $x f64) (result f64)
   (local $u i64)
   (local $e i64)
   (local $y f64)
@@ -3267,7 +3267,7 @@
   f64.copysign
   return
  )
- (func $std/math/test_atanh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_atanh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.atanh
   local.get $expected
@@ -3286,7 +3286,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.atanh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.atanh (param $x f32) (result f32)
   (local $u i32)
   (local $y f32)
   local.get $x
@@ -3345,7 +3345,7 @@
   f32.copysign
   return
  )
- (func $std/math/test_atanhf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_atanhf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.atanh
   local.get $expected
@@ -3354,7 +3354,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.atan2 (type $f64_f64_=>_f64) (param $y f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.atan2 (param $y f64) (param $x f64) (result f64)
   (local $u i64)
   (local $ix i32)
   (local $lx i32)
@@ -3660,7 +3660,7 @@
   end
   unreachable
  )
- (func $std/math/test_atan2 (type $f64_f64_f64_f64_i32_=>_i32) (param $value1 f64) (param $value2 f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_atan2 (param $value1 f64) (param $value2 f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value1
   local.get $value2
   call $~lib/math/NativeMath.atan2
@@ -3681,7 +3681,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.atan2 (type $f32_f32_=>_f32) (param $y f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.atan2 (param $y f32) (param $x f32) (result f32)
   (local $ix i32)
   (local $iy i32)
   (local $m i32)
@@ -3959,7 +3959,7 @@
   end
   unreachable
  )
- (func $std/math/test_atan2f (type $f32_f32_f32_f32_i32_=>_i32) (param $value1 f32) (param $value2 f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_atan2f (param $value1 f32) (param $value2 f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value1
   local.get $value2
   call $~lib/math/NativeMathf.atan2
@@ -3969,7 +3969,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.cbrt (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.cbrt (param $x f64) (result f64)
   (local $u i64)
   (local $hx i32)
   (local $t f64)
@@ -4114,7 +4114,7 @@
   local.get $t
   return
  )
- (func $std/math/test_cbrt (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_cbrt (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.cbrt
   local.get $expected
@@ -4133,7 +4133,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.cbrt (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.cbrt (param $x f32) (result f32)
   (local $u i32)
   (local $hx i32)
   (local $t f64)
@@ -4250,7 +4250,7 @@
   f32.demote_f64
   return
  )
- (func $std/math/test_cbrtf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_cbrtf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.cbrt
   local.get $expected
@@ -4259,7 +4259,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_ceil (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_ceil (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $x f64)
   block $~lib/math/NativeMath.ceil|inlined.0 (result f64)
    local.get $value
@@ -4284,7 +4284,7 @@
   end
   return
  )
- (func $std/math/test_ceilf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_ceilf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $x f32)
   block $~lib/math/NativeMathf.ceil|inlined.0 (result f32)
    local.get $value
@@ -4299,7 +4299,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/pio2_large_quot (type $f64_i64_=>_i32) (param $x f64) (param $u i64) (result i32)
+ (func $~lib/math/pio2_large_quot (param $x f64) (param $u i64) (result i32)
   (local $magnitude i64)
   (local $offset i64)
   (local $shift i64)
@@ -4721,7 +4721,7 @@
   i32.wrap_i64
   return
  )
- (func $~lib/math/NativeMath.cos (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.cos (param $x f64) (result f64)
   (local $u i64)
   (local $ux i32)
   (local $sign i32)
@@ -5276,7 +5276,7 @@
   end
   return
  )
- (func $std/math/test_cos (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_cos (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.cos
   local.get $expected
@@ -5295,7 +5295,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.cos (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.cos (param $x f32) (result f32)
   (local $ux i32)
   (local $sign i32)
   (local $x|3 f64)
@@ -5984,7 +5984,7 @@
   end
   return
  )
- (func $std/math/test_cosf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_cosf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.cos
   local.get $expected
@@ -5993,7 +5993,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.expm1 (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.expm1 (param $x f64) (result f64)
   (local $u i64)
   (local $hx i32)
   (local $sign i32)
@@ -6307,7 +6307,7 @@
   f64.mul
   return
  )
- (func $~lib/math/NativeMath.exp (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.exp (param $x f64) (result f64)
   (local $x|1 f64)
   (local $ux i64)
   (local $abstop i32)
@@ -6594,7 +6594,7 @@
   end
   return
  )
- (func $~lib/math/NativeMath.cosh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.cosh (param $x f64) (result f64)
   (local $u i64)
   (local $w i32)
   (local $t f64)
@@ -6696,7 +6696,7 @@
   local.get $t
   return
  )
- (func $std/math/test_cosh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_cosh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.cosh
   local.get $expected
@@ -6715,7 +6715,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.expm1 (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.expm1 (param $x f32) (result f32)
   (local $u i32)
   (local $hx i32)
   (local $sign i32)
@@ -7009,7 +7009,7 @@
   f32.mul
   return
  )
- (func $~lib/math/NativeMathf.exp (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.exp (param $x f32) (result f32)
   (local $x|1 f32)
   (local $xd f64)
   (local $ix i32)
@@ -7148,7 +7148,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.cosh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.cosh (param $x f32) (result f32)
   (local $u i32)
   (local $t f32)
   (local $t|3 f32)
@@ -7240,7 +7240,7 @@
   end
   return
  )
- (func $std/math/test_coshf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_coshf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.cosh
   local.get $expected
@@ -7249,7 +7249,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_exp (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_exp (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.exp
   local.get $expected
@@ -7268,7 +7268,7 @@
   end
   return
  )
- (func $std/math/test_expf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_expf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.exp
   local.get $expected
@@ -7277,7 +7277,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_expm1 (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_expm1 (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.expm1
   local.get $expected
@@ -7296,7 +7296,7 @@
   end
   return
  )
- (func $std/math/test_expm1f (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_expm1f (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.expm1
   local.get $expected
@@ -7305,7 +7305,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.exp2 (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.exp2 (param $x f64) (result f64)
   (local $x|1 f64)
   (local $ux i64)
   (local $abstop i32)
@@ -7575,7 +7575,7 @@
   end
   return
  )
- (func $std/math/test_exp2 (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_exp2 (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.exp2
   local.get $expected
@@ -7595,7 +7595,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.exp2 (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.exp2 (param $x f32) (result f32)
   (local $x|1 f32)
   (local $xd f64)
   (local $ix i32)
@@ -7721,7 +7721,7 @@
   end
   return
  )
- (func $std/math/test_exp2f (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_exp2f (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.exp2
   local.get $expected
@@ -7730,7 +7730,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_floor (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_floor (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $x f64)
   block $~lib/math/NativeMath.floor|inlined.0 (result f64)
    local.get $value
@@ -7755,7 +7755,7 @@
   end
   return
  )
- (func $std/math/test_floorf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_floorf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $x f32)
   block $~lib/math/NativeMathf.floor|inlined.0 (result f32)
    local.get $value
@@ -7770,7 +7770,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.hypot (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.hypot (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ut i64)
@@ -7970,7 +7970,7 @@
   f64.mul
   return
  )
- (func $std/math/test_hypot (type $f64_f64_f64_f64_i32_=>_i32) (param $value1 f64) (param $value2 f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_hypot (param $value1 f64) (param $value2 f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value1
   local.get $value2
   call $~lib/math/NativeMath.hypot
@@ -7980,7 +7980,7 @@
   call $std/math/check<f64>
   return
  )
- (func $~lib/math/NativeMathf.hypot (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.hypot (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ut i32)
@@ -8112,7 +8112,7 @@
   f32.mul
   return
  )
- (func $std/math/test_hypotf (type $f32_f32_f32_f32_i32_=>_i32) (param $value1 f32) (param $value2 f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_hypotf (param $value1 f32) (param $value2 f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value1
   local.get $value2
   call $~lib/math/NativeMathf.hypot
@@ -8122,7 +8122,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_log (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_log (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.log
   local.get $expected
@@ -8141,7 +8141,7 @@
   end
   return
  )
- (func $std/math/test_logf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_logf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.log
   local.get $expected
@@ -8150,7 +8150,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.log10 (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.log10 (param $x f64) (result f64)
   (local $u i64)
   (local $hx i32)
   (local $k i32)
@@ -8412,7 +8412,7 @@
   f64.add
   return
  )
- (func $std/math/test_log10 (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_log10 (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.log10
   local.get $expected
@@ -8431,7 +8431,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.log10 (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.log10 (param $x f32) (result f32)
   (local $ux i32)
   (local $k i32)
   (local $sign i32)
@@ -8633,7 +8633,7 @@
   f32.add
   return
  )
- (func $std/math/test_log10f (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_log10f (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.log10
   local.get $expected
@@ -8642,7 +8642,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_log1p (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_log1p (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.log1p
   local.get $expected
@@ -8661,7 +8661,7 @@
   end
   return
  )
- (func $std/math/test_log1pf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_log1pf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.log1p
   local.get $expected
@@ -8670,7 +8670,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.log2 (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.log2 (param $x f64) (result f64)
   (local $x|1 f64)
   (local $ix i64)
   (local $r f64)
@@ -9033,7 +9033,7 @@
   end
   return
  )
- (func $std/math/test_log2 (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_log2 (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.log2
   local.get $expected
@@ -9052,7 +9052,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.log2 (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.log2 (param $x f32) (result f32)
   (local $x|1 f32)
   (local $ux i32)
   (local $tmp i32)
@@ -9228,7 +9228,7 @@
   end
   return
  )
- (func $std/math/test_log2f (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_log2f (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.log2
   local.get $expected
@@ -9237,7 +9237,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_max (type $f64_f64_f64_f64_i32_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_max (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $value1 f64)
   (local $value2 f64)
   block $~lib/math/NativeMath.max|inlined.0 (result f64)
@@ -9267,7 +9267,7 @@
   end
   return
  )
- (func $std/math/test_maxf (type $f32_f32_f32_f32_i32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_maxf (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $value1 f32)
   (local $value2 f32)
   block $~lib/math/NativeMathf.max|inlined.0 (result f32)
@@ -9286,7 +9286,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_min (type $f64_f64_f64_f64_i32_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_min (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $value1 f64)
   (local $value2 f64)
   block $~lib/math/NativeMath.min|inlined.0 (result f64)
@@ -9316,7 +9316,7 @@
   end
   return
  )
- (func $std/math/test_minf (type $f32_f32_f32_f32_i32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_minf (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $value1 f32)
   (local $value2 f32)
   block $~lib/math/NativeMathf.min|inlined.0 (result f32)
@@ -9335,7 +9335,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.mod (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.mod (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ex i64)
@@ -9590,7 +9590,7 @@
   f64.reinterpret_i64
   return
  )
- (func $std/math/test_mod (type $f64_f64_f64_f64_i32_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_mod (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMath.mod
@@ -9611,7 +9611,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.mod (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ex i32)
@@ -9860,7 +9860,7 @@
   f32.reinterpret_i32
   return
  )
- (func $std/math/test_modf (type $f32_f32_f32_f32_i32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_modf (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMathf.mod
@@ -9870,7 +9870,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.pow (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.pow (param $x f64) (param $y f64) (result f64)
   (local $x|2 f64)
   (local $y|3 f64)
   (local $sign_bias i32)
@@ -10914,7 +10914,7 @@
   end
   return
  )
- (func $std/math/test_pow (type $f64_f64_f64_f64_i32_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_pow (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMath.pow
@@ -10935,7 +10935,7 @@
   end
   return
  )
- (func $~lib/object/Object.is<f64> (type $f64_f64_=>_i32) (param $x f64) (param $y f64) (result i32)
+ (func $~lib/object/Object.is<f64> (param $x f64) (param $y f64) (result i32)
   i32.const 1
   drop
   i32.const 8
@@ -10957,7 +10957,7 @@
   i32.or
   return
  )
- (func $~lib/math/NativeMathf.pow (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (param $x f32) (param $y f32) (result f32)
   (local $x|2 f32)
   (local $y|3 f32)
   (local $signBias i32)
@@ -11621,7 +11621,7 @@
   end
   return
  )
- (func $std/math/test_powf (type $f32_f32_f32_f32_i32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_powf (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMathf.pow
@@ -11631,7 +11631,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/murmurHash3 (type $i64_=>_i64) (param $h i64) (result i64)
+ (func $~lib/math/murmurHash3 (param $h i64) (result i64)
   local.get $h
   local.get $h
   i64.const 33
@@ -11661,7 +11661,7 @@
   local.get $h
   return
  )
- (func $~lib/math/splitMix32 (type $i32_=>_i32) (param $h i32) (result i32)
+ (func $~lib/math/splitMix32 (param $h i32) (result i32)
   local.get $h
   i32.const 1831565813
   i32.add
@@ -11697,7 +11697,7 @@
   i32.xor
   return
  )
- (func $~lib/math/NativeMath.seedRandom (type $i64_=>_none) (param $value i64)
+ (func $~lib/math/NativeMath.seedRandom (param $value i64)
   local.get $value
   i64.const 0
   i64.eq
@@ -11723,7 +11723,7 @@
   i32.const 1
   global.set $~lib/math/random_seeded
  )
- (func $~lib/math/NativeMath.random (type $none_=>_f64) (result f64)
+ (func $~lib/math/NativeMath.random (result f64)
   (local $s1 i64)
   (local $s0 i64)
   (local $r i64)
@@ -11776,7 +11776,7 @@
   f64.sub
   return
  )
- (func $~lib/math/NativeMathf.random (type $none_=>_f32) (result f32)
+ (func $~lib/math/NativeMathf.random (result f32)
   (local $value i64)
   (local $s0 i32)
   (local $s1 i32)
@@ -11832,7 +11832,7 @@
   f32.sub
   return
  )
- (func $~lib/math/NativeMath.round (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.round (param $x f64) (result f64)
   (local $roundUp f64)
   i32.const 0
   i32.const 0
@@ -11853,7 +11853,7 @@
   select
   return
  )
- (func $std/math/test_round (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_round (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.round
   local.get $expected
@@ -11862,7 +11862,7 @@
   call $std/math/check<f64>
   return
  )
- (func $~lib/math/NativeMathf.round (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.round (param $x f32) (result f32)
   (local $roundUp f32)
   i32.const 0
   i32.const 0
@@ -11883,7 +11883,7 @@
   select
   return
  )
- (func $std/math/test_roundf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_roundf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.round
   local.get $expected
@@ -11892,7 +11892,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.sign (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.sign (param $x f64) (result f64)
   i32.const 0
   i32.const 0
   i32.gt_s
@@ -11910,7 +11910,7 @@
   select
   return
  )
- (func $std/math/test_sign (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_sign (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.sign
   local.get $expected
@@ -11929,7 +11929,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.sign (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.sign (param $x f32) (result f32)
   i32.const 0
   i32.const 0
   i32.gt_s
@@ -11947,7 +11947,7 @@
   select
   return
  )
- (func $std/math/test_signf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_signf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.sign
   local.get $expected
@@ -11956,7 +11956,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.rem (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.rem (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ex i64)
@@ -12264,7 +12264,7 @@
   end
   return
  )
- (func $std/math/test_rem (type $f64_f64_f64_f64_i32_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_rem (param $left f64) (param $right f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMath.rem
@@ -12274,7 +12274,7 @@
   call $std/math/check<f64>
   return
  )
- (func $~lib/math/NativeMathf.rem (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.rem (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ex i32)
@@ -12577,7 +12577,7 @@
   end
   return
  )
- (func $std/math/test_remf (type $f32_f32_f32_f32_i32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_remf (param $left f32) (param $right f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMathf.rem
@@ -12587,7 +12587,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.sin (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.sin (param $x f64) (result f64)
   (local $u i64)
   (local $ux i32)
   (local $sign i32)
@@ -13151,7 +13151,7 @@
   end
   return
  )
- (func $std/math/test_sin (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_sin (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.sin
   local.get $expected
@@ -13170,7 +13170,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.sin (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.sin (param $x f32) (result f32)
   (local $ux i32)
   (local $sign i32)
   (local $x|3 f64)
@@ -13850,7 +13850,7 @@
   end
   return
  )
- (func $std/math/test_sinf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_sinf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.sin
   local.get $expected
@@ -13859,7 +13859,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.sinh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.sinh (param $x f64) (result f64)
   (local $u i64)
   (local $a f64)
   (local $w i32)
@@ -13966,7 +13966,7 @@
   end
   return
  )
- (func $std/math/test_sinh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_sinh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.sinh
   local.get $expected
@@ -13985,7 +13985,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.sinh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.sinh (param $x f32) (result f32)
   (local $u i32)
   (local $a f32)
   (local $h f32)
@@ -14083,7 +14083,7 @@
   end
   return
  )
- (func $std/math/test_sinhf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_sinhf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.sinh
   local.get $expected
@@ -14092,7 +14092,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_sqrt (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_sqrt (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $x f64)
   block $~lib/math/NativeMath.sqrt|inlined.0 (result f64)
    local.get $value
@@ -14117,7 +14117,7 @@
   end
   return
  )
- (func $std/math/test_sqrtf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_sqrtf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $x f32)
   block $~lib/math/NativeMathf.sqrt|inlined.0 (result f32)
    local.get $value
@@ -14132,7 +14132,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/tan_kern (type $f64_f64_i32_=>_f64) (param $x f64) (param $y f64) (param $iy i32) (result f64)
+ (func $~lib/math/tan_kern (param $x f64) (param $y f64) (param $iy i32) (result f64)
   (local $z f64)
   (local $r f64)
   (local $v f64)
@@ -14346,7 +14346,7 @@
   f64.add
   return
  )
- (func $~lib/math/NativeMath.tan (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.tan (param $x f64) (result f64)
   (local $u i64)
   (local $ux i32)
   (local $sign i32)
@@ -14670,7 +14670,7 @@
   call $~lib/math/tan_kern
   return
  )
- (func $std/math/test_tan (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_tan (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.tan
   local.get $expected
@@ -14689,7 +14689,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.tan (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.tan (param $x f32) (result f32)
   (local $ux i32)
   (local $sign i32)
   (local $x|3 f64)
@@ -15407,7 +15407,7 @@
   end
   return
  )
- (func $std/math/test_tanf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_tanf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.tan
   local.get $expected
@@ -15416,7 +15416,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.tanh (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.tanh (param $x f64) (result f64)
   (local $u i64)
   (local $y f64)
   (local $w i32)
@@ -15509,7 +15509,7 @@
   f64.copysign
   return
  )
- (func $std/math/test_tanh (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_tanh (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMath.tanh
   local.get $expected
@@ -15528,7 +15528,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.tanh (type $f32_=>_f32) (param $x f32) (result f32)
+ (func $~lib/math/NativeMathf.tanh (param $x f32) (result f32)
   (local $u i32)
   (local $y f32)
   (local $t f32)
@@ -15615,7 +15615,7 @@
   f32.copysign
   return
  )
- (func $std/math/test_tanhf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_tanhf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   local.get $value
   call $~lib/math/NativeMathf.tanh
   local.get $expected
@@ -15624,7 +15624,7 @@
   call $std/math/check<f32>
   return
  )
- (func $std/math/test_trunc (type $f64_f64_f64_i32_=>_i32) (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
+ (func $std/math/test_trunc (param $value f64) (param $expected f64) (param $error f64) (param $flags i32) (result i32)
   (local $x f64)
   block $~lib/math/NativeMath.trunc|inlined.0 (result f64)
    local.get $value
@@ -15649,7 +15649,7 @@
   end
   return
  )
- (func $std/math/test_truncf (type $f32_f32_f32_i32_=>_i32) (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
+ (func $std/math/test_truncf (param $value f32) (param $expected f32) (param $error f32) (param $flags i32) (result i32)
   (local $x f32)
   block $~lib/math/NativeMathf.trunc|inlined.0 (result f32)
    local.get $value
@@ -15664,7 +15664,7 @@
   call $std/math/check<f32>
   return
  )
- (func $~lib/math/NativeMath.sincos (type $f64_=>_none) (param $x f64)
+ (func $~lib/math/NativeMath.sincos (param $x f64)
   (local $u i64)
   (local $ux i32)
   (local $sign i32)
@@ -16327,7 +16327,7 @@
   local.get $cos
   global.set $~lib/math/NativeMath.sincos_cos
  )
- (func $std/math/test_sincos (type $i64_i64_i64_i64_i64_i32_=>_i32) (param $value i64) (param $expected_sin i64) (param $error_sin i64) (param $expected_cos i64) (param $error_cos i64) (param $flags i32) (result i32)
+ (func $std/math/test_sincos (param $value i64) (param $expected_sin i64) (param $error_sin i64) (param $expected_cos i64) (param $error_cos i64) (param $flags i32) (result i32)
   (local $arg f64)
   (local $expsin f64)
   (local $expcos f64)
@@ -16366,7 +16366,7 @@
   end
   return
  )
- (func $~lib/math/dtoi32 (type $f64_=>_i32) (param $x f64) (result i32)
+ (func $~lib/math/dtoi32 (param $x f64) (result i32)
   (local $result i32)
   (local $u i64)
   (local $e i64)
@@ -16445,7 +16445,7 @@
   local.get $result
   return
  )
- (func $~lib/math/NativeMath.imul (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.imul (param $x f64) (param $y f64) (result f64)
   (local $2 f64)
   local.get $x
   local.get $y
@@ -16468,7 +16468,7 @@
   f64.convert_i32_s
   return
  )
- (func $~lib/math/NativeMath.clz32 (type $f64_=>_f64) (param $x f64) (result f64)
+ (func $~lib/math/NativeMath.clz32 (param $x f64) (result f64)
   local.get $x
   local.get $x
   f64.sub
@@ -16485,7 +16485,7 @@
   f64.convert_i32_s
   return
  )
- (func $~lib/math/ipow64 (type $i64_i64_=>_i64) (param $x i64) (param $e i64) (result i64)
+ (func $~lib/math/ipow64 (param $x i64) (param $e i64) (result i64)
   (local $out i64)
   (local $log i32)
   (local $4 i32)
@@ -16747,7 +16747,7 @@
   local.get $out
   return
  )
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $x i32) (param $e i32) (result i32)
+ (func $~lib/math/ipow32 (param $x i32) (param $e i32) (result i32)
   (local $out i32)
   (local $log i32)
   (local $4 i32)
@@ -16965,7 +16965,7 @@
   local.get $out
   return
  )
- (func $start:std/math (type $none_=>_none)
+ (func $start:std/math
   (local $0 f64)
   (local $1 f64)
   (local $2 f64)
@@ -60240,7 +60240,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/math
  )
 )
diff --git a/tests/compiler/std/math.release.wat b/tests/compiler/std/math.release.wat
index 385c9ce001..712b1b2a1e 100644
--- a/tests/compiler/std/math.release.wat
+++ b/tests/compiler/std/math.release.wat
@@ -1,24 +1,24 @@
 (module
- (type $f64_=>_f64 (func_subtype (param f64) (result f64) func))
- (type $f64_f64_f64_=>_i32 (func_subtype (param f64 f64 f64) (result i32) func))
- (type $f32_f32_f32_=>_i32 (func_subtype (param f32 f32 f32) (result i32) func))
- (type $f32_=>_f32 (func_subtype (param f32) (result f32) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $f64_f64_f64_f64_=>_i32 (func_subtype (param f64 f64 f64 f64) (result i32) func))
- (type $none_=>_f64 (func_subtype (result f64) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $f64_i32_=>_f64 (func_subtype (param f64 i32) (result f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $f32_f32_f32_f32_=>_i32 (func_subtype (param f32 f32 f32 f32) (result i32) func))
- (type $i64_=>_none (func_subtype (param i64) func))
- (type $f64_f64_i32_=>_f64 (func_subtype (param f64 f64 i32) (result f64) func))
- (type $f64_=>_none (func_subtype (param f64) func))
- (type $i64_i64_i64_i64_i64_=>_none (func_subtype (param i64 i64 i64 i64 i64) func))
- (type $i64_i64_=>_i64 (func_subtype (param i64 i64) (result i64) func))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $f64_f64_f64_=>_i32 (func (param f64 f64 f64) (result i32)))
+ (type $f32_f32_f32_=>_i32 (func (param f32 f32 f32) (result i32)))
+ (type $f32_=>_f32 (func (param f32) (result f32)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $f64_f64_f64_f64_=>_i32 (func (param f64 f64 f64 f64) (result i32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $none_=>_none (func))
+ (type $f64_i32_=>_f64 (func (param f64 i32) (result f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $f32_f32_f32_f32_=>_i32 (func (param f32 f32 f32 f32) (result i32)))
+ (type $i64_=>_none (func (param i64)))
+ (type $f64_f64_i32_=>_f64 (func (param f64 f64 i32) (result f64)))
+ (type $f64_=>_none (func (param f64)))
+ (type $i64_i64_i64_i64_i64_=>_none (func (param i64 i64 i64 i64 i64)))
+ (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
  (import "env" "Math.LN2" (global $~lib/bindings/dom/Math.LN2 f64))
  (import "env" "Math.LN10" (global $~lib/bindings/dom/Math.LN10 f64))
@@ -215,7 +215,7 @@
  (data (i32.const 14353) "`Y\df\bd\d5\d5?\dce\a4\08*\0b\n\bd")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/math/NativeMath.scalbn (type $f64_i32_=>_f64) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (param $0 f64) (param $1 i32) (result f64)
   local.get $1
   i32.const 1023
   i32.gt_s
@@ -292,7 +292,7 @@
   f64.reinterpret_i64
   f64.mul
  )
- (func $std/math/check<f64> (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/check<f64> (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i32)
   local.get $0
   local.get $1
@@ -388,7 +388,7 @@
   end
   i32.const 1
  )
- (func $std/math/check<f32> (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/check<f32> (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   local.get $0
   local.get $1
@@ -555,7 +555,7 @@
   end
   i32.const 1
  )
- (func $~lib/math/NativeMath.acos (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.acos (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -797,7 +797,7 @@
   f64.const 2
   f64.mul
  )
- (func $~lib/math/NativeMathf.acos (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.acos (param $0 f32) (result f32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f32)
@@ -957,7 +957,7 @@
   f32.const 2
   f32.mul
  )
- (func $~lib/math/NativeMath.log1p (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log1p (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i64)
@@ -1154,7 +1154,7 @@
   f64.mul
   f64.add
  )
- (func $~lib/math/NativeMath.log (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i64)
@@ -1394,7 +1394,7 @@
    f64.add
   end
  )
- (func $std/math/test_acosh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_acosh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 f64)
   (local $4 i64)
   block $__inlined_func$~lib/math/NativeMath.acosh (result f64)
@@ -1474,7 +1474,7 @@
    i32.const 0
   end
  )
- (func $~lib/math/NativeMathf.log1p (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.log1p (param $0 f32) (result f32)
   (local $1 f32)
   (local $2 i32)
   (local $3 f32)
@@ -1643,7 +1643,7 @@
   f32.mul
   f32.add
  )
- (func $~lib/math/NativeMathf.log (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.log (param $0 f32) (result f32)
   (local $1 i32)
   (local $2 f64)
   (local $3 i32)
@@ -1752,7 +1752,7 @@
    f32.demote_f64
   end
  )
- (func $std/math/test_acoshf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_acoshf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   block $__inlined_func$~lib/math/NativeMathf.acosh (result f32)
    local.get $0
@@ -1807,7 +1807,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/NativeMath.asin (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.asin (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -2020,7 +2020,7 @@
   i32.lt_s
   select
  )
- (func $~lib/math/NativeMathf.asin (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.asin (param $0 f32) (result f32)
   (local $1 i32)
   (local $2 f64)
   (local $3 f32)
@@ -2130,7 +2130,7 @@
   local.get $0
   f32.copysign
  )
- (func $std/math/test_asinh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_asinh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i64)
   (local $4 i64)
   (local $5 f64)
@@ -2214,7 +2214,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_asinhf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_asinhf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   (local $4 f32)
   local.get $0
@@ -2282,7 +2282,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/NativeMath.atan (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.atan (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -2501,7 +2501,7 @@
   local.get $1
   f64.copysign
  )
- (func $~lib/math/NativeMathf.atan (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.atan (param $0 f32) (result f32)
   (local $1 f32)
   (local $2 i32)
   (local $3 i32)
@@ -2693,7 +2693,7 @@
   local.get $1
   f32.copysign
  )
- (func $std/math/test_atanh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_atanh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i64)
   (local $4 f64)
   (local $5 f64)
@@ -2759,7 +2759,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_atanhf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_atanhf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 f32)
   (local $4 i32)
   local.get $0
@@ -2810,7 +2810,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $std/math/test_atan2 (type $f64_f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
+ (func $std/math/test_atan2 (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
   (local $4 i32)
   (local $5 i64)
   (local $6 i32)
@@ -3023,7 +3023,7 @@
    i32.const 0
   end
  )
- (func $~lib/math/NativeMathf.atan2 (type $f32_f32_=>_f32) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.atan2 (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3198,7 +3198,7 @@
   i32.and
   select
  )
- (func $std/math/test_cbrt (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_cbrt (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 f64)
   (local $4 i32)
   (local $5 i64)
@@ -3332,7 +3332,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_cbrtf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_cbrtf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 f64)
   (local $4 i32)
   (local $5 f64)
@@ -3431,7 +3431,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/pio2_large_quot (type $i64_=>_i32) (param $0 i64) (result i32)
+ (func $~lib/math/pio2_large_quot (param $0 i64) (result i32)
   (local $1 i64)
   (local $2 i64)
   (local $3 i64)
@@ -3717,7 +3717,7 @@
   i64.sub
   i32.wrap_i64
  )
- (func $~lib/math/NativeMath.cos (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.cos (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -4130,7 +4130,7 @@
   i32.and
   select
  )
- (func $~lib/math/NativeMathf.cos (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.cos (param $0 f32) (result f32)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -4573,7 +4573,7 @@
   f64.add
   f32.demote_f64
  )
- (func $~lib/math/NativeMath.expm1 (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.expm1 (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 f64)
   (local $3 i32)
@@ -4844,7 +4844,7 @@
   local.get $6
   f64.mul
  )
- (func $~lib/math/NativeMath.exp (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.exp (param $0 f64) (result f64)
   (local $1 i32)
   (local $2 i64)
   (local $3 i32)
@@ -5056,7 +5056,7 @@
    f64.add
   end
  )
- (func $std/math/test_cosh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_cosh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i32)
   (local $4 i64)
   (local $5 f64)
@@ -5134,7 +5134,7 @@
    i32.const 0
   end
  )
- (func $~lib/math/NativeMathf.expm1 (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.expm1 (param $0 f32) (result f32)
   (local $1 i32)
   (local $2 f32)
   (local $3 i32)
@@ -5382,7 +5382,7 @@
   local.get $4
   f32.mul
  )
- (func $~lib/math/NativeMathf.exp (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.exp (param $0 f32) (result f32)
   (local $1 f64)
   (local $2 i64)
   (local $3 i32)
@@ -5477,7 +5477,7 @@
    f32.demote_f64
   end
  )
- (func $std/math/test_coshf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_coshf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   block $__inlined_func$~lib/math/NativeMathf.cosh (result f32)
    local.get $0
@@ -5540,7 +5540,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $std/math/test_exp2 (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_exp2 (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i32)
   (local $4 i64)
   (local $5 i32)
@@ -5754,7 +5754,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_exp2f (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_exp2f (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 f64)
   (local $4 i64)
   (local $5 i32)
@@ -5850,7 +5850,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $std/math/test_hypot (type $f64_f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
+ (func $std/math/test_hypot (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
   (local $4 i64)
   (local $5 i64)
   (local $6 i64)
@@ -6023,7 +6023,7 @@
   local.get $3
   call $std/math/check<f64>
  )
- (func $std/math/test_hypotf (type $f32_f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (param $3 f32) (result i32)
+ (func $std/math/test_hypotf (param $0 f32) (param $1 f32) (param $2 f32) (param $3 f32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -6126,7 +6126,7 @@
   local.get $3
   call $std/math/check<f32>
  )
- (func $std/math/test_log10 (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_log10 (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i32)
   (local $4 i64)
   (local $5 i32)
@@ -6338,7 +6338,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_log10f (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_log10f (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 f32)
@@ -6495,7 +6495,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/NativeMath.log2 (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.log2 (param $0 f64) (result f64)
   (local $1 i64)
   (local $2 i32)
   (local $3 i64)
@@ -6749,7 +6749,7 @@
    f64.add
   end
  )
- (func $std/math/test_log2f (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_log2f (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   (local $4 f64)
   (local $5 i32)
@@ -6861,7 +6861,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $std/math/test_max (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_max (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   local.get $0
   local.get $1
   f64.max
@@ -6879,7 +6879,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_min (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_min (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   local.get $0
   local.get $1
   f64.min
@@ -6897,7 +6897,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_mod (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_mod (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i64)
   (local $4 i64)
   (local $5 i64)
@@ -7111,7 +7111,7 @@
    i32.const 0
   end
  )
- (func $~lib/math/NativeMathf.mod (type $f32_f32_=>_f32) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -7313,7 +7313,7 @@
   i32.or
   f32.reinterpret_i32
  )
- (func $~lib/math/NativeMath.pow (type $f64_f64_=>_f64) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.pow (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -8034,7 +8034,7 @@
    end
   end
  )
- (func $std/math/test_pow (type $f64_f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
+ (func $std/math/test_pow (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (result i32)
   local.get $0
   local.get $1
   call $~lib/math/NativeMath.pow
@@ -8052,7 +8052,7 @@
    i32.const 0
   end
  )
- (func $~lib/math/NativeMathf.pow (type $f32_f32_=>_f32) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.pow (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 f64)
   (local $4 i32)
@@ -8483,7 +8483,7 @@
    f32.demote_f64
   end
  )
- (func $~lib/math/NativeMath.seedRandom (type $i64_=>_none) (param $0 i64)
+ (func $~lib/math/NativeMath.seedRandom (param $0 i64)
   (local $1 i32)
   (local $2 i64)
   i64.const -7046029254386353131
@@ -8600,7 +8600,7 @@
   i32.const 1
   global.set $~lib/math/random_seeded
  )
- (func $std/math/test_round (type $f64_f64_=>_i32) (param $0 f64) (param $1 f64) (result i32)
+ (func $std/math/test_round (param $0 f64) (param $1 f64) (result i32)
   (local $2 f64)
   local.get $0
   f64.ceil
@@ -8618,7 +8618,7 @@
   f64.const 0
   call $std/math/check<f64>
  )
- (func $std/math/test_roundf (type $f32_f32_=>_i32) (param $0 f32) (param $1 f32) (result i32)
+ (func $std/math/test_roundf (param $0 f32) (param $1 f32) (result i32)
   (local $2 f32)
   local.get $0
   f32.ceil
@@ -8636,7 +8636,7 @@
   f32.const 0
   call $std/math/check<f32>
  )
- (func $std/math/test_sign (type $f64_f64_=>_i32) (param $0 f64) (param $1 f64) (result i32)
+ (func $std/math/test_sign (param $0 f64) (param $1 f64) (result i32)
   f64.const 1
   f64.const -1
   local.get $0
@@ -8661,7 +8661,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_signf (type $f32_f32_=>_i32) (param $0 f32) (param $1 f32) (result i32)
+ (func $std/math/test_signf (param $0 f32) (param $1 f32) (result i32)
   f32.const 1
   f32.const -1
   local.get $0
@@ -8677,7 +8677,7 @@
   f32.const 0
   call $std/math/check<f32>
  )
- (func $~lib/math/NativeMath.rem (type $f64_f64_=>_f64) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.rem (param $0 f64) (param $1 f64) (result f64)
   (local $2 i64)
   (local $3 i64)
   (local $4 i64)
@@ -8913,7 +8913,7 @@
   i64.lt_s
   select
  )
- (func $~lib/math/NativeMathf.rem (type $f32_f32_=>_f32) (param $0 f32) (param $1 f32) (result f32)
+ (func $~lib/math/NativeMathf.rem (param $0 f32) (param $1 f32) (result f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9146,7 +9146,7 @@
   i32.lt_s
   select
  )
- (func $~lib/math/NativeMath.sin (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.sin (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -9539,7 +9539,7 @@
   i32.and
   select
  )
- (func $~lib/math/NativeMathf.sin (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.sin (param $0 f32) (result f32)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -9997,7 +9997,7 @@
   f64.add
   f32.demote_f64
  )
- (func $std/math/test_sinh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_sinh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 f64)
   (local $4 i32)
   (local $5 i64)
@@ -10087,7 +10087,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_sinhf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_sinhf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 f32)
   (local $4 i32)
   (local $5 f32)
@@ -10165,7 +10165,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/tan_kern (type $f64_f64_i32_=>_f64) (param $0 f64) (param $1 f64) (param $2 i32) (result f64)
+ (func $~lib/math/tan_kern (param $0 f64) (param $1 f64) (param $2 i32) (result f64)
   (local $3 i32)
   (local $4 i32)
   (local $5 f64)
@@ -10344,7 +10344,7 @@
   f64.mul
   f64.add
  )
- (func $~lib/math/NativeMath.tan (type $f64_=>_f64) (param $0 f64) (result f64)
+ (func $~lib/math/NativeMath.tan (param $0 f64) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i64)
@@ -10602,7 +10602,7 @@
   i32.sub
   call $~lib/math/tan_kern
  )
- (func $~lib/math/NativeMathf.tan (type $f32_=>_f32) (param $0 f32) (result f32)
+ (func $~lib/math/NativeMathf.tan (param $0 f32) (result f32)
   (local $1 f64)
   (local $2 f64)
   (local $3 f64)
@@ -10985,7 +10985,7 @@
   f64.div
   f32.demote_f64
  )
- (func $std/math/test_tanh (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/math/test_tanh (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i32)
   (local $4 i64)
   (local $5 f64)
@@ -11074,7 +11074,7 @@
    i32.const 0
   end
  )
- (func $std/math/test_tanhf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/math/test_tanhf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   (local $4 f32)
   local.get $0
@@ -11149,7 +11149,7 @@
   local.get $2
   call $std/math/check<f32>
  )
- (func $~lib/math/NativeMath.sincos (type $f64_=>_none) (param $0 f64)
+ (func $~lib/math/NativeMath.sincos (param $0 f64)
   (local $1 f64)
   (local $2 f64)
   (local $3 i32)
@@ -11608,7 +11608,7 @@
   local.get $1
   global.set $~lib/math/NativeMath.sincos_cos
  )
- (func $std/math/test_sincos (type $i64_i64_i64_i64_i64_=>_none) (param $0 i64) (param $1 i64) (param $2 i64) (param $3 i64) (param $4 i64)
+ (func $std/math/test_sincos (param $0 i64) (param $1 i64) (param $2 i64) (param $3 i64) (param $4 i64)
   (local $5 f64)
   local.get $0
   f64.reinterpret_i64
@@ -11629,7 +11629,7 @@
    drop
   end
  )
- (func $~lib/math/NativeMath.imul (type $f64_f64_=>_f64) (param $0 f64) (param $1 f64) (result f64)
+ (func $~lib/math/NativeMath.imul (param $0 f64) (param $1 f64) (result f64)
   (local $2 i32)
   (local $3 i64)
   (local $4 f64)
@@ -11733,7 +11733,7 @@
   i32.mul
   f64.convert_i32_s
  )
- (func $~lib/math/ipow64 (type $i64_i64_=>_i64) (param $0 i64) (param $1 i64) (result i64)
+ (func $~lib/math/ipow64 (param $0 i64) (param $1 i64) (result i64)
   (local $2 i64)
   i64.const 1
   local.set $2
@@ -11950,7 +11950,7 @@
   end
   local.get $2
  )
- (func $start:std/math (type $none_=>_none)
+ (func $start:std/math
   (local $0 f64)
   (local $1 i32)
   (local $2 i64)
@@ -56203,7 +56203,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/math
  )
 )
diff --git a/tests/compiler/std/mod.debug.wat b/tests/compiler/std/mod.debug.wat
index 1b005c70ab..db665be74a 100644
--- a/tests/compiler/std/mod.debug.wat
+++ b/tests/compiler/std/mod.debug.wat
@@ -1,12 +1,12 @@
 (module
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $none_=>_none (func_subtype func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $f64_f64_f64_=>_i32 (func_subtype (param f64 f64 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $f32_f32_f32_=>_i32 (func_subtype (param f32 f32 f32) (result i32) func))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $none_=>_none (func))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $f64_f64_f64_=>_i32 (func (param f64 f64 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $f32_f32_f32_=>_i32 (func (param f32 f32 f32) (result i32)))
  (import "mod" "mod" (func $std/mod/mod (param f64 f64) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/mod/js i32 (i32.const 1))
@@ -20,7 +20,7 @@
  (export "mod" (func $std/mod/mod))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/math/NativeMath.mod (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.mod (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ex i64)
@@ -275,7 +275,7 @@
   f64.reinterpret_i64
   return
  )
- (func $std/mod/check<f64> (type $f64_f64_=>_i32) (param $actual f64) (param $expected f64) (result i32)
+ (func $std/mod/check<f64> (param $actual f64) (param $expected f64) (result i32)
   local.get $expected
   local.get $expected
   f64.ne
@@ -304,7 +304,7 @@
   f64.eq
   return
  )
- (func $std/mod/test_fmod (type $f64_f64_f64_=>_i32) (param $left f64) (param $right f64) (param $expected f64) (result i32)
+ (func $std/mod/test_fmod (param $left f64) (param $right f64) (param $expected f64) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMath.mod
@@ -321,7 +321,7 @@
   end
   return
  )
- (func $~lib/math/NativeMathf.mod (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ex i32)
@@ -570,7 +570,7 @@
   f32.reinterpret_i32
   return
  )
- (func $std/mod/check<f32> (type $f32_f32_=>_i32) (param $actual f32) (param $expected f32) (result i32)
+ (func $std/mod/check<f32> (param $actual f32) (param $expected f32) (result i32)
   local.get $expected
   local.get $expected
   f32.ne
@@ -599,7 +599,7 @@
   f32.eq
   return
  )
- (func $std/mod/test_fmodf (type $f32_f32_f32_=>_i32) (param $left f32) (param $right f32) (param $expected f32) (result i32)
+ (func $std/mod/test_fmodf (param $left f32) (param $right f32) (param $expected f32) (result i32)
   local.get $left
   local.get $right
   call $~lib/math/NativeMathf.mod
@@ -607,7 +607,7 @@
   call $std/mod/check<f32>
   return
  )
- (func $start:std/mod (type $none_=>_none)
+ (func $start:std/mod
   f64.const 3
   f64.const 2
   f64.const 1
@@ -2392,7 +2392,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/mod
  )
 )
diff --git a/tests/compiler/std/mod.release.wat b/tests/compiler/std/mod.release.wat
index 9978738272..e472e4c835 100644
--- a/tests/compiler/std/mod.release.wat
+++ b/tests/compiler/std/mod.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $f64_f64_f64_=>_i32 (func_subtype (param f64 f64 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f32_f32_f32_=>_i32 (func_subtype (param f32 f32 f32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $f64_f64_f64_=>_i32 (func (param f64 f64 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f32_f32_f32_=>_i32 (func (param f32 f32 f32) (result i32)))
  (import "mod" "mod" (func $std/mod/mod (param f64 f64) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
@@ -12,7 +12,7 @@
  (export "mod" (func $std/mod/mod))
  (export "memory" (memory $0))
  (start $~start)
- (func $std/mod/test_fmod (type $f64_f64_f64_=>_i32) (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
+ (func $std/mod/test_fmod (param $0 f64) (param $1 f64) (param $2 f64) (result i32)
   (local $3 i64)
   (local $4 f64)
   (local $5 i64)
@@ -270,7 +270,7 @@
    i32.const 0
   end
  )
- (func $std/mod/test_fmodf (type $f32_f32_f32_=>_i32) (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
+ (func $std/mod/test_fmodf (param $0 f32) (param $1 f32) (param $2 f32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -493,7 +493,7 @@
    f32.eq
   end
  )
- (func $start:std/mod (type $none_=>_none)
+ (func $start:std/mod
   f64.const 3
   f64.const 2
   f64.const 1
@@ -2250,7 +2250,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/mod
  )
 )
diff --git a/tests/compiler/std/new.debug.wat b/tests/compiler/std/new.debug.wat
index 8ef60f2ed2..ec9b9d39f4 100644
--- a/tests/compiler/std/new.debug.wat
+++ b/tests/compiler/std/new.debug.wat
@@ -1,15 +1,15 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/new/AClass.aStaticField (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -45,31 +45,31 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $std/new/AClass#get:aField (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/new/AClass#get:aField (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/new/AClass#set:aField (type $i32_i32_=>_none) (param $this i32) (param $aField i32)
+ (func $std/new/AClass#set:aField (param $this i32) (param $aField i32)
   local.get $this
   local.get $aField
   i32.store $0
  )
- (func $std/new/AClass#set:anotherField (type $i32_f32_=>_none) (param $this i32) (param $anotherField f32)
+ (func $std/new/AClass#set:anotherField (param $this i32) (param $anotherField f32)
   local.get $this
   local.get $anotherField
   f32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -79,11 +79,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -92,14 +92,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -141,7 +141,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -153,11 +153,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -167,7 +167,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -223,15 +223,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -257,7 +257,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -277,7 +277,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -297,7 +297,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -333,7 +333,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -359,7 +359,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -380,11 +380,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -395,39 +395,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -663,7 +663,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1027,7 +1027,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1192,7 +1192,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1337,7 +1337,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1375,7 +1375,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1388,7 +1388,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1405,7 +1405,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1430,7 +1430,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1610,7 +1610,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1668,7 +1668,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1689,7 +1689,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1705,7 +1705,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1913,7 +1913,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2003,7 +2003,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2112,7 +2112,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2176,7 +2176,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2189,17 +2189,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2252,7 +2252,7 @@
   local.get $ptr
   return
  )
- (func $start:std/new (type $none_=>_none)
+ (func $start:std/new
   memory.size $0
   i32.const 16
   i32.shl
@@ -2275,7 +2275,7 @@
   call $std/new/AClass#constructor
   global.set $std/new/aClass
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/new/aClass
   local.tee $1
@@ -2291,7 +2291,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2305,10 +2305,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $std/new/AClass
     block $~lib/arraybuffer/ArrayBufferView
@@ -2336,10 +2336,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/new
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2352,7 +2352,7 @@
    unreachable
   end
  )
- (func $std/new/AClass#constructor (type $i32_f32_=>_i32) (param $this i32) (param $value f32) (result i32)
+ (func $std/new/AClass#constructor (param $this i32) (param $value f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
diff --git a/tests/compiler/std/new.release.wat b/tests/compiler/std/new.release.wat
index f8e0775bf5..dea36e1c16 100644
--- a/tests/compiler/std/new.release.wat
+++ b/tests/compiler/std/new.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -33,7 +33,7 @@
  (data (i32.const 1440) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $std/new/aClass
@@ -84,7 +84,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -216,7 +216,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -369,7 +369,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -615,7 +615,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -727,7 +727,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -806,7 +806,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1073,7 +1073,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1130,7 +1130,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/__new (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1362,7 +1362,7 @@
   i64.store $0 align=1
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $std/new/AClass
     block $~lib/arraybuffer/ArrayBufferView
@@ -1394,7 +1394,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1493,7 +1493,7 @@
   local.get $1
   global.set $std/new/aClass
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/object.debug.wat b/tests/compiler/std/object.debug.wat
index 8c0b93bcc5..5df2cdbc16 100644
--- a/tests/compiler/std/object.debug.wat
+++ b/tests/compiler/std/object.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -28,7 +28,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/object/Object.is<f64> (type $f64_f64_=>_i32) (param $x f64) (param $y f64) (result i32)
+ (func $~lib/object/Object.is<f64> (param $x f64) (param $y f64) (result i32)
   i32.const 1
   drop
   i32.const 8
@@ -50,7 +50,7 @@
   i32.or
   return
  )
- (func $~lib/object/Object.is<f32> (type $f32_f32_=>_i32) (param $x f32) (param $y f32) (result i32)
+ (func $~lib/object/Object.is<f32> (param $x f32) (param $y f32) (result i32)
   i32.const 1
   drop
   i32.const 4
@@ -72,7 +72,7 @@
   i32.or
   return
  )
- (func $~lib/object/Object.is<i32> (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
+ (func $~lib/object/Object.is<i32> (param $x i32) (param $y i32) (result i32)
   i32.const 0
   drop
   local.get $x
@@ -80,7 +80,7 @@
   i32.eq
   return
  )
- (func $~lib/object/Object.is<bool> (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
+ (func $~lib/object/Object.is<bool> (param $x i32) (param $y i32) (result i32)
   i32.const 0
   drop
   local.get $x
@@ -92,11 +92,11 @@
   i32.eq
   return
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -105,7 +105,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -209,7 +209,7 @@
   i32.const 0
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   local.get $left
   local.get $right
@@ -252,7 +252,7 @@
   i32.eqz
   return
  )
- (func $~lib/object/Object.is<~lib/string/String> (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
+ (func $~lib/object/Object.is<~lib/string/String> (param $x i32) (param $y i32) (result i32)
   i32.const 0
   drop
   local.get $x
@@ -260,7 +260,7 @@
   call $~lib/string/String.__eq
   return
  )
- (func $~lib/object/Object.is<~lib/string/String|null> (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
+ (func $~lib/object/Object.is<~lib/string/String|null> (param $x i32) (param $y i32) (result i32)
   i32.const 0
   drop
   local.get $x
@@ -268,7 +268,7 @@
   call $~lib/string/String.__eq
   return
  )
- (func $~lib/rt/stub/maybeGrowMemory (type $i32_=>_none) (param $newOffset i32)
+ (func $~lib/rt/stub/maybeGrowMemory (param $newOffset i32)
   (local $pagesBefore i32)
   (local $maxOffset i32)
   (local $pagesNeeded i32)
@@ -329,12 +329,12 @@
   local.get $newOffset
   global.set $~lib/rt/stub/offset
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/stub/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/stub/__alloc (param $size i32) (result i32)
   (local $block i32)
   (local $ptr i32)
   (local $size|3 i32)
@@ -383,27 +383,27 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/common/OBJECT#set:gcInfo (type $i32_i32_=>_none) (param $this i32) (param $gcInfo i32)
+ (func $~lib/rt/common/OBJECT#set:gcInfo (param $this i32) (param $gcInfo i32)
   local.get $this
   local.get $gcInfo
   i32.store $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#set:gcInfo2 (type $i32_i32_=>_none) (param $this i32) (param $gcInfo2 i32)
+ (func $~lib/rt/common/OBJECT#set:gcInfo2 (param $this i32) (param $gcInfo2 i32)
   local.get $this
   local.get $gcInfo2
   i32.store $0 offset=8
  )
- (func $~lib/rt/common/OBJECT#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/common/OBJECT#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/common/OBJECT#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/common/OBJECT#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/stub/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/stub/__new (param $size i32) (param $id i32) (result i32)
   (local $ptr i32)
   (local $object i32)
   local.get $size
@@ -443,7 +443,7 @@
   i32.add
   return
  )
- (func $std/object/Implicit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/object/Implicit#constructor (param $this i32) (result i32)
   local.get $this
   i32.eqz
   if
@@ -454,7 +454,7 @@
   end
   local.get $this
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   local.get $this
   i32.eqz
   if
@@ -465,7 +465,7 @@
   end
   local.get $this
  )
- (func $std/object/Explicit#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/object/Explicit#constructor (param $this i32) (result i32)
   local.get $this
   i32.eqz
   if
@@ -479,7 +479,7 @@
   local.set $this
   local.get $this
  )
- (func $start:std/object (type $none_=>_none)
+ (func $start:std/object
   (local $implicit i32)
   (local $explicit i32)
   (local $object i32)
@@ -1184,7 +1184,7 @@
    unreachable
   end
  )
- (func $~instanceof|std/object/Explicit (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|std/object/Explicit (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -1201,7 +1201,7 @@
   end
   i32.const 1
  )
- (func $~instanceof|std/object/Implicit (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~instanceof|std/object/Implicit (param $0 i32) (result i32)
   (local $1 i32)
   block $is_instance
    local.get $0
@@ -1218,7 +1218,7 @@
   end
   i32.const 1
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/object
  )
 )
diff --git a/tests/compiler/std/object.release.wat b/tests/compiler/std/object.release.wat
index 14dfb3170d..5aa4699d10 100644
--- a/tests/compiler/std/object.release.wat
+++ b/tests/compiler/std/object.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 1036) ",")
@@ -20,7 +20,7 @@
  (data (i32.const 1288) "\02\00\00\00\1e\00\00\00~\00l\00i\00b\00/\00r\00t\00/\00s\00t\00u\00b\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -137,7 +137,7 @@
   local.get $3
   i32.eqz
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   i32.const 1104
diff --git a/tests/compiler/std/operator-overloading.debug.wat b/tests/compiler/std/operator-overloading.debug.wat
index 8a24a9bf28..0effb19c6b 100644
--- a/tests/compiler/std/operator-overloading.debug.wat
+++ b/tests/compiler/std/operator-overloading.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -114,17 +114,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -134,11 +134,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -147,14 +147,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -196,7 +196,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -208,11 +208,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -222,7 +222,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -278,15 +278,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -312,7 +312,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -332,7 +332,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -352,7 +352,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -388,7 +388,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -414,7 +414,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -435,11 +435,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -450,39 +450,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -718,7 +718,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1082,7 +1082,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1247,7 +1247,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1392,7 +1392,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1430,7 +1430,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1443,7 +1443,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1460,7 +1460,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1485,7 +1485,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1665,7 +1665,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1723,7 +1723,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1744,7 +1744,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1760,7 +1760,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1968,7 +1968,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2058,7 +2058,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2167,7 +2167,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2231,7 +2231,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2244,17 +2244,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2307,25 +2307,25 @@
   local.get $ptr
   return
  )
- (func $std/operator-overloading/Tester#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $std/operator-overloading/Tester#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $std/operator-overloading/Tester#set:y (type $i32_i32_=>_none) (param $this i32) (param $y i32)
+ (func $std/operator-overloading/Tester#set:y (param $this i32) (param $y i32)
   local.get $this
   local.get $y
   i32.store $0 offset=4
  )
- (func $std/operator-overloading/Tester#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/operator-overloading/Tester#get:y (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#get:y (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $x i32) (param $e i32) (result i32)
+ (func $~lib/math/ipow32 (param $x i32) (param $e i32) (result i32)
   (local $out i32)
   (local $log i32)
   (local $4 i32)
@@ -2543,57 +2543,57 @@
   local.get $out
   return
  )
- (func $std/operator-overloading/TesterInlineStatic#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $std/operator-overloading/TesterInlineStatic#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $std/operator-overloading/TesterInlineStatic#set:y (type $i32_i32_=>_none) (param $this i32) (param $y i32)
+ (func $std/operator-overloading/TesterInlineStatic#set:y (param $this i32) (param $y i32)
   local.get $this
   local.get $y
   i32.store $0 offset=4
  )
- (func $std/operator-overloading/TesterInlineStatic#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterInlineStatic#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/operator-overloading/TesterInlineStatic#get:y (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterInlineStatic#get:y (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/operator-overloading/TesterInlineInstance#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $std/operator-overloading/TesterInlineInstance#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $std/operator-overloading/TesterInlineInstance#set:y (type $i32_i32_=>_none) (param $this i32) (param $y i32)
+ (func $std/operator-overloading/TesterInlineInstance#set:y (param $this i32) (param $y i32)
   local.get $this
   local.get $y
   i32.store $0 offset=4
  )
- (func $std/operator-overloading/TesterInlineInstance#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterInlineInstance#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/operator-overloading/TesterInlineInstance#get:y (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterInlineInstance#get:y (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/operator-overloading/TesterElementAccess#set:x (type $i32_i32_=>_none) (param $this i32) (param $x i32)
+ (func $std/operator-overloading/TesterElementAccess#set:x (param $this i32) (param $x i32)
   local.get $this
   local.get $x
   i32.store $0
  )
- (func $std/operator-overloading/TesterElementAccess#set:y (type $i32_i32_=>_none) (param $this i32) (param $y i32)
+ (func $std/operator-overloading/TesterElementAccess#set:y (param $this i32) (param $y i32)
   local.get $this
   local.get $y
   i32.store $0 offset=4
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2602,7 +2602,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2706,15 +2706,15 @@
   i32.const 0
   return
  )
- (func $std/operator-overloading/TesterElementAccess#get:x (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterElementAccess#get:x (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/operator-overloading/TesterElementAccess#get:y (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/TesterElementAccess#get:y (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/operator-overloading/a1
   local.tee $1
@@ -3143,7 +3143,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3157,10 +3157,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $std/operator-overloading/TesterElementAccess
     block $std/operator-overloading/TesterInlineInstance
@@ -3197,10 +3197,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/operator-overloading
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3213,7 +3213,7 @@
    unreachable
   end
  )
- (func $std/operator-overloading/Tester#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $x i32) (param $y i32) (result i32)
+ (func $std/operator-overloading/Tester#constructor (param $this i32) (param $x i32) (param $y i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3257,7 +3257,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/operator-overloading/Tester.add (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.add (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3307,7 +3307,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.sub (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.sub (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3357,7 +3357,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.mul (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.mul (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3407,7 +3407,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.div (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.div (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3457,7 +3457,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.mod (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.mod (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3507,7 +3507,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.pow (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.pow (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3557,7 +3557,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.and (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.and (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3607,7 +3607,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.or (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.or (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3657,7 +3657,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.xor (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.xor (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3707,7 +3707,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.equals (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.equals (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3759,7 +3759,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.notEquals (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.notEquals (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3811,7 +3811,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.greater (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.greater (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3863,7 +3863,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.greaterEquals (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.greaterEquals (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3915,7 +3915,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.less (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.less (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3967,7 +3967,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.lessEquals (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/operator-overloading/Tester.lessEquals (param $a i32) (param $b i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4019,7 +4019,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.shr (type $i32_i32_=>_i32) (param $value i32) (param $shift i32) (result i32)
+ (func $std/operator-overloading/Tester.shr (param $value i32) (param $shift i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4057,7 +4057,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.shu (type $i32_i32_=>_i32) (param $value i32) (param $shift i32) (result i32)
+ (func $std/operator-overloading/Tester.shu (param $value i32) (param $shift i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4095,7 +4095,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.shl (type $i32_i32_=>_i32) (param $value i32) (param $shift i32) (result i32)
+ (func $std/operator-overloading/Tester.shl (param $value i32) (param $shift i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4133,7 +4133,7 @@
   local.get $2
   return
  )
- (func $std/operator-overloading/Tester.pos (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $std/operator-overloading/Tester.pos (param $value i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4167,7 +4167,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester.neg (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $std/operator-overloading/Tester.neg (param $value i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4205,7 +4205,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester.not (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $std/operator-overloading/Tester.not (param $value i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4243,7 +4243,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester.excl (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $std/operator-overloading/Tester.excl (param $value i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4281,7 +4281,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester#inc (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#inc (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4332,7 +4332,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester#dec (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#dec (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4383,7 +4383,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester#postInc (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#postInc (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4421,7 +4421,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/Tester#postDec (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/operator-overloading/Tester#postDec (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4459,7 +4459,7 @@
   local.get $1
   return
  )
- (func $std/operator-overloading/TesterInlineStatic#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $x i32) (param $y i32) (result i32)
+ (func $std/operator-overloading/TesterInlineStatic#constructor (param $this i32) (param $x i32) (param $y i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4503,7 +4503,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/operator-overloading/TesterInlineInstance#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $x i32) (param $y i32) (result i32)
+ (func $std/operator-overloading/TesterInlineInstance#constructor (param $this i32) (param $x i32) (param $y i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4547,7 +4547,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/operator-overloading/TesterElementAccess#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $x i32) (param $y i32) (result i32)
+ (func $std/operator-overloading/TesterElementAccess#constructor (param $this i32) (param $x i32) (param $y i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4591,7 +4591,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4687,7 +4687,7 @@
   local.get $3
   return
  )
- (func $std/operator-overloading/TesterElementAccess#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $key i32) (param $value i32)
+ (func $std/operator-overloading/TesterElementAccess#__set (param $this i32) (param $key i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4734,7 +4734,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/operator-overloading/TesterElementAccess#__get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $std/operator-overloading/TesterElementAccess#__get (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4782,7 +4782,7 @@
   local.get $2
   return
  )
- (func $start:std/operator-overloading (type $none_=>_none)
+ (func $start:std/operator-overloading
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
diff --git a/tests/compiler/std/operator-overloading.release.wat b/tests/compiler/std/operator-overloading.release.wat
index f0da5f633a..281b80699f 100644
--- a/tests/compiler/std/operator-overloading.release.wat
+++ b/tests/compiler/std/operator-overloading.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -106,7 +106,7 @@
  (data (i32.const 1584) "\08\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   call $~lib/rt/__visit_globals
@@ -148,7 +148,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -301,7 +301,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -547,7 +547,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -659,7 +659,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -738,7 +738,7 @@
   i32.const 34400
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1005,7 +1005,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1062,7 +1062,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1294,7 +1294,7 @@
   i64.store $0 align=1
   local.get $0
  )
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/math/ipow32 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   i32.const 1
   local.set $2
@@ -1479,7 +1479,7 @@
   end
   local.get $2
  )
- (func $~lib/rt/__visit_globals (type $none_=>_none)
+ (func $~lib/rt/__visit_globals
   (local $0 i32)
   global.get $std/operator-overloading/a1
   local.tee $0
@@ -1846,7 +1846,7 @@
   i32.const 1056
   call $byn-split-outlined-A$~lib/rt/itcms/__visit
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $std/operator-overloading/TesterElementAccess
     block $std/operator-overloading/TesterInlineInstance
@@ -1887,10 +1887,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/operator-overloading
  )
- (func $std/operator-overloading/Tester#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/Tester#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1936,7 +1936,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/operator-overloading/Tester.equals (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/Tester.equals (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1996,7 +1996,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/operator-overloading/Tester.notEquals (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/Tester.notEquals (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2056,7 +2056,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/operator-overloading/TesterInlineStatic#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/TesterInlineStatic#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2102,7 +2102,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/operator-overloading/TesterInlineInstance#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/TesterInlineInstance#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2148,7 +2148,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.__eq (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2302,7 +2302,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $std/operator-overloading/TesterElementAccess#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $std/operator-overloading/TesterElementAccess#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2351,7 +2351,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/operator-overloading/TesterElementAccess#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/operator-overloading/TesterElementAccess#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2400,7 +2400,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/operator-overloading (type $none_=>_none)
+ (func $start:std/operator-overloading
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5073,7 +5073,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
diff --git a/tests/compiler/std/pointer.debug.wat b/tests/compiler/std/pointer.debug.wat
index 6af7d2c7f9..0f644caf57 100644
--- a/tests/compiler/std/pointer.debug.wat
+++ b/tests/compiler/std/pointer.debug.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/pointer/one (mut i32) (i32.const 0))
  (global $std/pointer/two (mut i32) (i32.const 0))
@@ -19,25 +19,25 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $std/pointer/Entry#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $std/pointer/Entry#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $std/pointer/Entry#set:val (type $i32_i32_=>_none) (param $this i32) (param $val i32)
+ (func $std/pointer/Entry#set:val (param $this i32) (param $val i32)
   local.get $this
   local.get $val
   i32.store $0 offset=4
  )
- (func $std/pointer/Entry#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/pointer/Entry#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $std/pointer/Entry#get:val (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/pointer/Entry#get:val (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $start:std/pointer (type $none_=>_none)
+ (func $start:std/pointer
   (local $this i32)
   (local $offset i32)
   (local $this|2 i32)
@@ -778,7 +778,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/pointer
  )
 )
diff --git a/tests/compiler/std/pointer.release.wat b/tests/compiler/std/pointer.release.wat
index 270bdb08bd..928fc6299b 100644
--- a/tests/compiler/std/pointer.release.wat
+++ b/tests/compiler/std/pointer.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/pointer/one (mut i32) (i32.const 0))
  (global $std/pointer/two (mut i32) (i32.const 0))
@@ -12,7 +12,7 @@
  (data (i32.const 1048) "\02\00\00\00\1c\00\00\00s\00t\00d\00/\00p\00o\00i\00n\00t\00e\00r\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $start:std/pointer (type $none_=>_none)
+ (func $start:std/pointer
   (local $0 i32)
   (local $1 i32)
   i32.const 8
@@ -367,7 +367,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/pointer
  )
 )
diff --git a/tests/compiler/std/set.debug.wat b/tests/compiler/std/set.debug.wat
index 0e1961e209..ea63fb3eac 100644
--- a/tests/compiler/std/set.debug.wat
+++ b/tests/compiler/std/set.debug.wat
@@ -1,34 +1,34 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f32_=>_i32 (func_subtype (param f32) (result i32) func))
- (type $i32_=>_f32 (func_subtype (param i32) (result f32) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i32_i32_f64_=>_none (func_subtype (param i32 i32 f64) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f32_=>_i32 (func (param f32) (result i32)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i32_i32_f64_=>_none (func (param i32 i32 f64)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -67,17 +67,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -87,11 +87,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -100,14 +100,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -149,7 +149,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -161,11 +161,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -175,7 +175,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -231,15 +231,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -265,7 +265,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -285,7 +285,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -305,7 +305,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -341,7 +341,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -367,7 +367,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -388,11 +388,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -403,39 +403,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -671,7 +671,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1035,7 +1035,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1200,7 +1200,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1345,7 +1345,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1383,7 +1383,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1396,7 +1396,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1413,7 +1413,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1438,7 +1438,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1618,7 +1618,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1676,7 +1676,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1697,7 +1697,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1713,7 +1713,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1921,7 +1921,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2011,7 +2011,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2120,7 +2120,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2184,7 +2184,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2197,17 +2197,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2260,7 +2260,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2328,7 +2328,7 @@
    end
   end
  )
- (func $~lib/set/Set<i8>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<i8>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2337,12 +2337,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i8>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<i8>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<i8>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<i8>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2351,22 +2351,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i8>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<i8>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<i8>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<i8>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<i8>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<i8>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i8> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i8> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2435,49 +2435,49 @@
   end
   return
  )
- (func $~lib/set/Set<i8>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<i8>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i8>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i8>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i8>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i8>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_s $0
  )
- (func $~lib/set/Set<i8>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<i8>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<i8>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<i8>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<i8>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<i8>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/set/SetEntry<i8>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<i8>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i8>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i8>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2486,38 +2486,38 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i8>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i8>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i8>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i8>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i8>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i8>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2563,11 +2563,11 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<i8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<u8>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<u8>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2576,12 +2576,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u8>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<u8>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<u8>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<u8>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2590,22 +2590,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u8>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<u8>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<u8>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<u8>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<u8>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<u8>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u8> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u8> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2675,49 +2675,49 @@
   end
   return
  )
- (func $~lib/set/Set<u8>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<u8>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u8>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u8>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u8>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u8>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load8_u $0
  )
- (func $~lib/set/Set<u8>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<u8>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<u8>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<u8>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<u8>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<u8>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store8 $0
  )
- (func $~lib/set/SetEntry<u8>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<u8>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u8>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u8>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2726,30 +2726,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u8>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u8>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u8>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u8>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u8>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u8>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<i16>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<i16>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2758,12 +2758,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i16>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<i16>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<i16>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<i16>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2772,22 +2772,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i16>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<i16>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<i16>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<i16>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<i16>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<i16>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i16> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i16> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2856,49 +2856,49 @@
   end
   return
  )
- (func $~lib/set/Set<i16>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<i16>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i16>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i16>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i16>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i16>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_s $0
  )
- (func $~lib/set/Set<i16>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<i16>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<i16>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<i16>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<i16>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<i16>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/set/SetEntry<i16>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<i16>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i16>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i16>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2907,30 +2907,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i16>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i16>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i16>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i16>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i16>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i16>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<u16>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<u16>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2939,12 +2939,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u16>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<u16>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<u16>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<u16>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2953,22 +2953,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u16>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<u16>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<u16>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<u16>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<u16>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<u16>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u16> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u16> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3038,49 +3038,49 @@
   end
   return
  )
- (func $~lib/set/Set<u16>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<u16>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u16>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u16>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u16>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u16>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load16_u $0
  )
- (func $~lib/set/Set<u16>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<u16>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<u16>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<u16>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<u16>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<u16>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store16 $0
  )
- (func $~lib/set/SetEntry<u16>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<u16>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u16>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u16>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3089,30 +3089,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u16>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u16>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u16>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u16>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u16>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u16>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<i32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<i32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3121,12 +3121,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<i32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<i32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<i32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3135,22 +3135,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<i32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<i32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<i32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<i32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<i32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i32> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<i32> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3218,49 +3218,49 @@
   end
   return
  )
- (func $~lib/set/Set<i32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<i32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<i32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<i32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<i32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<i32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<i32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<i32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/set/SetEntry<i32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<i32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3269,30 +3269,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<u32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<u32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3301,12 +3301,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<u32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<u32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<u32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3315,22 +3315,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<u32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<u32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<u32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<u32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<u32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u32> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<u32> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3398,49 +3398,49 @@
   end
   return
  )
- (func $~lib/set/Set<u32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<u32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u32>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u32>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<u32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<u32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<u32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<u32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<u32>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/set/SetEntry<u32>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/set/SetEntry<u32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<u32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3449,30 +3449,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<i64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<i64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3481,12 +3481,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<i64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<i64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<i64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3495,22 +3495,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<i64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<i64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<i64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<i64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<i64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<i64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<i64> (type $i64_=>_i32) (param $key i64) (result i32)
+ (func $~lib/util/hash/HASH<i64> (param $key i64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -3595,49 +3595,49 @@
   end
   return
  )
- (func $~lib/set/Set<i64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<i64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<i64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<i64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<i64>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/set/SetEntry<i64>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/set/Set<i64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<i64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<i64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<i64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<i64>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/set/SetEntry<i64>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/set/SetEntry<i64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<i64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<i64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3646,30 +3646,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<i64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<i64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<i64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<i64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<u64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<u64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3678,12 +3678,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<u64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<u64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<u64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3692,22 +3692,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<u64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<u64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<u64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<u64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<u64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<u64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<u64> (type $i64_=>_i32) (param $key i64) (result i32)
+ (func $~lib/util/hash/HASH<u64> (param $key i64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -3792,49 +3792,49 @@
   end
   return
  )
- (func $~lib/set/Set<u64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<u64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<u64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<u64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<u64>#get:key (type $i32_=>_i64) (param $this i32) (result i64)
+ (func $~lib/set/SetEntry<u64>#get:key (param $this i32) (result i64)
   local.get $this
   i64.load $0
  )
- (func $~lib/set/Set<u64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<u64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<u64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<u64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<u64>#set:key (type $i32_i64_=>_none) (param $this i32) (param $key i64)
+ (func $~lib/set/SetEntry<u64>#set:key (param $this i32) (param $key i64)
   local.get $this
   local.get $key
   i64.store $0
  )
- (func $~lib/set/SetEntry<u64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<u64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<u64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -3843,30 +3843,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<u64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<u64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<u64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<u64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<u64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<u64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<f32>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<f32>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -3875,12 +3875,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<f32>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<f32>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<f32>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<f32>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -3889,22 +3889,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<f32>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<f32>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<f32>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<f32>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<f32>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<f32>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<f32> (type $f32_=>_i32) (param $key f32) (result i32)
+ (func $~lib/util/hash/HASH<f32> (param $key f32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -3973,49 +3973,49 @@
   end
   return
  )
- (func $~lib/set/Set<f32>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<f32>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<f32>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<f32>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<f32>#get:key (type $i32_=>_f32) (param $this i32) (result f32)
+ (func $~lib/set/SetEntry<f32>#get:key (param $this i32) (result f32)
   local.get $this
   f32.load $0
  )
- (func $~lib/set/Set<f32>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<f32>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<f32>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<f32>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<f32>#set:key (type $i32_f32_=>_none) (param $this i32) (param $key f32)
+ (func $~lib/set/SetEntry<f32>#set:key (param $this i32) (param $key f32)
   local.get $this
   local.get $key
   f32.store $0
  )
- (func $~lib/set/SetEntry<f32>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<f32>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<f32>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<f32>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -4024,30 +4024,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<f32>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<f32>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<f32>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<f32>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/Set<f64>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/set/Set<f64>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -4056,12 +4056,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<f64>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/set/Set<f64>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/set/Set<f64>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/set/Set<f64>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -4070,22 +4070,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/set/Set<f64>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/set/Set<f64>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/set/Set<f64>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/set/Set<f64>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/set/Set<f64>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/set/Set<f64>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<f64> (type $f64_=>_i32) (param $key f64) (result i32)
+ (func $~lib/util/hash/HASH<f64> (param $key f64) (result i32)
   (local $key|1 i64)
   (local $h i32)
   i32.const 0
@@ -4171,49 +4171,49 @@
   end
   return
  )
- (func $~lib/set/Set<f64>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/set/Set<f64>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/set/SetEntry<f64>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/SetEntry<f64>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<f64>#get:key (type $i32_=>_f64) (param $this i32) (result f64)
+ (func $~lib/set/SetEntry<f64>#get:key (param $this i32) (result f64)
   local.get $this
   f64.load $0
  )
- (func $~lib/set/Set<f64>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/set/Set<f64>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/set/Set<f64>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/set/Set<f64>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/set/SetEntry<f64>#set:key (type $i32_f64_=>_none) (param $this i32) (param $key f64)
+ (func $~lib/set/SetEntry<f64>#set:key (param $this i32) (param $key f64)
   local.get $this
   local.get $key
   f64.store $0
  )
- (func $~lib/set/SetEntry<f64>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/set/SetEntry<f64>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f64>#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/array/Array<f64>#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -4222,30 +4222,30 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<f64>#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/array/Array<f64>#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/array/Array<f64>#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/array/Array<f64>#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/array/Array<f64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -4291,7 +4291,7 @@
   i32.const 0
   drop
  )
- (func $start:std/set (type $none_=>_none)
+ (func $start:std/set
   memory.size $0
   i32.const 16
   i32.shl
@@ -4321,7 +4321,7 @@
   call $std/set/testNumeric<f64>
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 224
   local.get $0
@@ -4333,7 +4333,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4347,10 +4347,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/set/Set<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4358,11 +4358,11 @@
   local.get $1
   call $~lib/set/Set<i8>#__visit
  )
- (func $~lib/array/Array<i8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4370,7 +4370,7 @@
   local.get $1
   call $~lib/array/Array<i8>#__visit
  )
- (func $~lib/set/Set<u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4378,11 +4378,11 @@
   local.get $1
   call $~lib/set/Set<u8>#__visit
  )
- (func $~lib/array/Array<u8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4390,7 +4390,7 @@
   local.get $1
   call $~lib/array/Array<u8>#__visit
  )
- (func $~lib/set/Set<i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4398,11 +4398,11 @@
   local.get $1
   call $~lib/set/Set<i16>#__visit
  )
- (func $~lib/array/Array<i16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4410,7 +4410,7 @@
   local.get $1
   call $~lib/array/Array<i16>#__visit
  )
- (func $~lib/set/Set<u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4418,11 +4418,11 @@
   local.get $1
   call $~lib/set/Set<u16>#__visit
  )
- (func $~lib/array/Array<u16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4430,7 +4430,7 @@
   local.get $1
   call $~lib/array/Array<u16>#__visit
  )
- (func $~lib/set/Set<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4438,11 +4438,11 @@
   local.get $1
   call $~lib/set/Set<i32>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4450,7 +4450,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/set/Set<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4458,11 +4458,11 @@
   local.get $1
   call $~lib/set/Set<u32>#__visit
  )
- (func $~lib/array/Array<u32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4470,7 +4470,7 @@
   local.get $1
   call $~lib/array/Array<u32>#__visit
  )
- (func $~lib/set/Set<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4478,11 +4478,11 @@
   local.get $1
   call $~lib/set/Set<i64>#__visit
  )
- (func $~lib/array/Array<i64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4490,7 +4490,7 @@
   local.get $1
   call $~lib/array/Array<i64>#__visit
  )
- (func $~lib/set/Set<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4498,11 +4498,11 @@
   local.get $1
   call $~lib/set/Set<u64>#__visit
  )
- (func $~lib/array/Array<u64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4510,7 +4510,7 @@
   local.get $1
   call $~lib/array/Array<u64>#__visit
  )
- (func $~lib/set/Set<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4518,11 +4518,11 @@
   local.get $1
   call $~lib/set/Set<f32>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4530,7 +4530,7 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/set/Set<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4538,11 +4538,11 @@
   local.get $1
   call $~lib/set/Set<f64>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4550,7 +4550,7 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<f64>
     block $~lib/set/Set<f64>
@@ -4695,10 +4695,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/set
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -4711,7 +4711,7 @@
    unreachable
   end
  )
- (func $~lib/set/Set<i8>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4813,7 +4813,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<i8>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<i8>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -4894,7 +4894,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<i8>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i8>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4924,7 +4924,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<i8>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<i8>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -5121,7 +5121,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i8>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -5305,7 +5305,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i8>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5330,7 +5330,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i8>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i8>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -5468,7 +5468,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -5587,7 +5587,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i8>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5656,7 +5656,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i8>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5684,7 +5684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i8>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -5787,7 +5787,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5812,7 +5812,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5864,7 +5864,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<i8>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i8>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -5993,7 +5993,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i8>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<i8>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -6079,7 +6079,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i8> (type $none_=>_none)
+ (func $std/set/testNumeric<i8>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -6562,7 +6562,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u8>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -6664,7 +6664,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<u8>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<u8>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -6747,7 +6747,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<u8>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u8>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6777,7 +6777,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<u8>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<u8>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -6974,7 +6974,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u8>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u8>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -7158,7 +7158,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u8>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7183,7 +7183,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u8>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -7321,7 +7321,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u8>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u8>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7390,7 +7390,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u8>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7418,7 +7418,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u8>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u8>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -7521,7 +7521,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<u8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7546,7 +7546,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7598,7 +7598,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<u8>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u8>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -7727,7 +7727,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u8>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<u8>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -7813,7 +7813,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u8> (type $none_=>_none)
+ (func $std/set/testNumeric<u8>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -8296,7 +8296,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i16>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -8398,7 +8398,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<i16>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<i16>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -8479,7 +8479,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<i16>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i16>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8509,7 +8509,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<i16>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<i16>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -8706,7 +8706,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i16>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i16>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -8890,7 +8890,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i16>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8915,7 +8915,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i16>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i16>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -9053,7 +9053,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i16>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i16>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9122,7 +9122,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i16>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9150,7 +9150,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i16>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i16>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -9253,7 +9253,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9278,7 +9278,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i16>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i16>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9330,7 +9330,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<i16>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i16>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -9459,7 +9459,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i16>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<i16>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9545,7 +9545,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i16> (type $none_=>_none)
+ (func $std/set/testNumeric<i16>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -10028,7 +10028,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u16>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -10130,7 +10130,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<u16>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<u16>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -10213,7 +10213,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<u16>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u16>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10243,7 +10243,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<u16>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<u16>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -10440,7 +10440,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u16>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u16>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -10624,7 +10624,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u16>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10649,7 +10649,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u16>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -10787,7 +10787,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u16>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u16>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10856,7 +10856,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u16>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10884,7 +10884,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u16>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u16>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -10987,7 +10987,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<u16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11012,7 +11012,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u16>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u16>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11064,7 +11064,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<u16>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u16>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -11193,7 +11193,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u16>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<u16>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -11279,7 +11279,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u16> (type $none_=>_none)
+ (func $std/set/testNumeric<u16>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -11762,7 +11762,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -11864,7 +11864,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<i32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<i32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -11943,7 +11943,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<i32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11973,7 +11973,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<i32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<i32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -12170,7 +12170,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i32>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i32>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -12354,7 +12354,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12379,7 +12379,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -12517,7 +12517,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12586,7 +12586,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12614,7 +12614,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -12717,7 +12717,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12742,7 +12742,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12794,7 +12794,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<i32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<i32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -12923,7 +12923,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<i32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -13009,7 +13009,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i32> (type $none_=>_none)
+ (func $std/set/testNumeric<i32>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -13492,7 +13492,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -13594,7 +13594,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<u32>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<u32>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -13673,7 +13673,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<u32>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u32>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13703,7 +13703,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<u32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<u32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -13900,7 +13900,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u32>#add (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u32>#add (param $this i32) (param $key i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -14084,7 +14084,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14109,7 +14109,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -14247,7 +14247,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<u32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14316,7 +14316,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14344,7 +14344,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -14447,7 +14447,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<u32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14472,7 +14472,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14524,7 +14524,7 @@
   local.get $3
   return
  )
- (func $~lib/set/Set<u32>#delete (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/set/Set<u32>#delete (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -14653,7 +14653,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<u32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14739,7 +14739,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u32> (type $none_=>_none)
+ (func $std/set/testNumeric<u32>
   (local $set i32)
   (local $k i32)
   (local $k|2 i32)
@@ -15222,7 +15222,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -15324,7 +15324,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<i64>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<i64>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -15403,7 +15403,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<i64>#has (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<i64>#has (param $this i32) (param $key i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15433,7 +15433,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<i64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<i64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -15630,7 +15630,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#add (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<i64>#add (param $this i32) (param $key i64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -15814,7 +15814,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15839,7 +15839,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<i64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -15977,7 +15977,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<i64>#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/array/Array<i64>#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16046,7 +16046,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<i64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16074,7 +16074,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<i64>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -16177,7 +16177,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<i64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16202,7 +16202,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -16255,7 +16255,7 @@
   local.get $4
   return
  )
- (func $~lib/set/Set<i64>#delete (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<i64>#delete (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -16384,7 +16384,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<i64>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<i64>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16470,7 +16470,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i64> (type $none_=>_none)
+ (func $std/set/testNumeric<i64>
   (local $set i32)
   (local $k i64)
   (local $k|2 i64)
@@ -16953,7 +16953,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -17055,7 +17055,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<u64>#find (type $i32_i64_i32_=>_i32) (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<u64>#find (param $this i32) (param $key i64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -17134,7 +17134,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<u64>#has (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<u64>#has (param $this i32) (param $key i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17164,7 +17164,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<u64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<u64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -17361,7 +17361,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u64>#add (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<u64>#add (param $this i32) (param $key i64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -17545,7 +17545,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17570,7 +17570,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<u64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -17708,7 +17708,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<u64>#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/array/Array<u64>#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17777,7 +17777,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<u64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17805,7 +17805,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u64>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<u64>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -17908,7 +17908,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<u64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17933,7 +17933,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<u64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<u64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -17986,7 +17986,7 @@
   local.get $4
   return
  )
- (func $~lib/set/Set<u64>#delete (type $i32_i64_=>_i32) (param $this i32) (param $key i64) (result i32)
+ (func $~lib/set/Set<u64>#delete (param $this i32) (param $key i64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -18115,7 +18115,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<u64>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<u64>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -18201,7 +18201,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u64> (type $none_=>_none)
+ (func $std/set/testNumeric<u64>
   (local $set i32)
   (local $k i64)
   (local $k|2 i64)
@@ -18684,7 +18684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -18786,7 +18786,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<f32>#find (type $i32_f32_i32_=>_i32) (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<f32>#find (param $this i32) (param $key f32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -18865,7 +18865,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<f32>#has (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/set/Set<f32>#has (param $this i32) (param $key f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18895,7 +18895,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<f32>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<f32>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -19092,7 +19092,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#add (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/set/Set<f32>#add (param $this i32) (param $key f32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -19276,7 +19276,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<f32>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19301,7 +19301,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<f32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -19439,7 +19439,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<f32>#__set (type $i32_i32_f32_=>_none) (param $this i32) (param $index i32) (param $value f32)
+ (func $~lib/array/Array<f32>#__set (param $this i32) (param $index i32) (param $value f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19508,7 +19508,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<f32>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19536,7 +19536,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f32>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -19639,7 +19639,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19664,7 +19664,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $this i32) (param $index i32) (result f32)
   (local $value f32)
   (local $3 i32)
   (local $4 f32)
@@ -19717,7 +19717,7 @@
   local.get $4
   return
  )
- (func $~lib/set/Set<f32>#delete (type $i32_f32_=>_i32) (param $this i32) (param $key f32) (result i32)
+ (func $~lib/set/Set<f32>#delete (param $this i32) (param $key f32) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -19846,7 +19846,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<f32>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<f32>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -19932,7 +19932,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<f32> (type $none_=>_none)
+ (func $std/set/testNumeric<f32>
   (local $set i32)
   (local $k f32)
   (local $k|2 f32)
@@ -20415,7 +20415,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -20517,7 +20517,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/set/Set<f64>#find (type $i32_f64_i32_=>_i32) (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
+ (func $~lib/set/Set<f64>#find (param $this i32) (param $key f64) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -20596,7 +20596,7 @@
   local.get $5
   return
  )
- (func $~lib/set/Set<f64>#has (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/set/Set<f64>#has (param $this i32) (param $key f64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20626,7 +20626,7 @@
   local.get $2
   return
  )
- (func $~lib/set/Set<f64>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/set/Set<f64>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -20823,7 +20823,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#add (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/set/Set<f64>#add (param $this i32) (param $key f64) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $4 i32)
@@ -21007,7 +21007,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<f64>#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#get:size (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21032,7 +21032,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/array/Array<f64>#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $bufferSize i32)
@@ -21170,7 +21170,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/array/Array<f64>#__set (type $i32_i32_f64_=>_none) (param $this i32) (param $index i32) (param $value f64)
+ (func $~lib/array/Array<f64>#__set (param $this i32) (param $index i32) (param $value f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21239,7 +21239,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#set:length (type $i32_i32_=>_none) (param $this i32) (param $newLength i32)
+ (func $~lib/array/Array<f64>#set:length (param $this i32) (param $newLength i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21267,7 +21267,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#values (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/set/Set<f64>#values (param $this i32) (result i32)
   (local $start i32)
   (local $size i32)
   (local $values i32)
@@ -21370,7 +21370,7 @@
   local.get $8
   return
  )
- (func $~lib/array/Array<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -21395,7 +21395,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $this i32) (param $index i32) (result f64)
   (local $value f64)
   (local $3 i32)
   (local $4 f64)
@@ -21448,7 +21448,7 @@
   local.get $4
   return
  )
- (func $~lib/set/Set<f64>#delete (type $i32_f64_=>_i32) (param $this i32) (param $key f64) (result i32)
+ (func $~lib/set/Set<f64>#delete (param $this i32) (param $key f64) (result i32)
   (local $entry i32)
   (local $halfBucketsMask i32)
   (local $4 i32)
@@ -21577,7 +21577,7 @@
   local.get $6
   return
  )
- (func $~lib/set/Set<f64>#clear (type $i32_=>_none) (param $this i32)
+ (func $~lib/set/Set<f64>#clear (param $this i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -21663,7 +21663,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<f64> (type $none_=>_none)
+ (func $std/set/testNumeric<f64>
   (local $set i32)
   (local $k f64)
   (local $k|2 f64)
@@ -22146,7 +22146,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<i8>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22184,7 +22184,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22210,7 +22210,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<u8>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22248,7 +22248,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22274,7 +22274,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<i16>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22312,7 +22312,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22338,7 +22338,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<u16>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22376,7 +22376,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22402,7 +22402,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<i32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22440,7 +22440,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22466,7 +22466,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<u32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22504,7 +22504,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22530,7 +22530,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<i64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22568,7 +22568,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22594,7 +22594,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<u64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22632,7 +22632,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22658,7 +22658,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<f32>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22696,7 +22696,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22722,7 +22722,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/set/Set<f64>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22760,7 +22760,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -22786,7 +22786,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/set.release.wat b/tests/compiler/std/set.release.wat
index dbaabcef3b..0f138139c4 100644
--- a/tests/compiler/std/set.release.wat
+++ b/tests/compiler/std/set.release.wat
@@ -1,26 +1,26 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i64_=>_none (func_subtype (param i32 i64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_f32_=>_none (func_subtype (param i32 f32) func))
- (type $i32_f64_=>_none (func_subtype (param i32 f64) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i64_=>_none (func (param i32 i64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -55,7 +55,7 @@
  (data (i32.const 1648) "\18\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00H\08\00\00B\08\00\00H\00\00\00B\00\00\00\88\08\00\00\82\08\00\00\88\00\00\00\82\00\00\00\08\t\00\00\02\t\00\00\08\01\00\00\02\01\00\00\08\n\00\00\02\n\00\00\08\02\00\00\02\02\00\00\08\19\00\00\02\19\00\00\08\1a\00\00\02\1a")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1248
@@ -102,7 +102,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -234,7 +234,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -387,7 +387,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -633,7 +633,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -745,7 +745,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -824,7 +824,7 @@
   i32.const 34528
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1091,7 +1091,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1217,7 +1217,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1523,7 +1523,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner2
    block $folding-inner1
@@ -1629,7 +1629,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   memory.size $0
   i32.const 16
   i32.shl
@@ -1706,7 +1706,7 @@
   i32.add
   global.set $~lib/rt/itcms/threshold
  )
- (func $~lib/set/Set<i8>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<i8>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1805,7 +1805,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i8>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/set/Set<i8>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1885,7 +1885,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<i8>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i8>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1950,7 +1950,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i8>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i8>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2150,7 +2150,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i8>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2338,7 +2338,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#get:size (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/set/Set<i8>#get:size (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2371,7 +2371,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2513,7 +2513,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i8>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2583,7 +2583,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -2618,7 +2618,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2651,7 +2651,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2703,7 +2703,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i8>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i8>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2846,7 +2846,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i8>#clear (type $i32_=>_none) (param $0 i32)
+ (func $~lib/set/Set<i8>#clear (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2934,7 +2934,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i8> (type $none_=>_none)
+ (func $std/set/testNumeric<i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3533,7 +3533,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<u8>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<u8>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3632,7 +3632,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u8>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<u8>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3698,7 +3698,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u8>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u8>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3897,7 +3897,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u8>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u8>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4086,7 +4086,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u8>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4138,7 +4138,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u8>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u8>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4282,7 +4282,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u8> (type $none_=>_none)
+ (func $std/set/testNumeric<u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -4881,7 +4881,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<i16>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<i16>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4980,7 +4980,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i16>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/set/Set<i16>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5060,7 +5060,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<i16>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i16>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5125,7 +5125,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i16>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i16>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -5325,7 +5325,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i16>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i16>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -5513,7 +5513,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i16>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5585,7 +5585,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -5620,7 +5620,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i16>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5674,7 +5674,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i16>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i16>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5817,7 +5817,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i16> (type $none_=>_none)
+ (func $std/set/testNumeric<i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -6418,7 +6418,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<u16>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<u16>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6517,7 +6517,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u16>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<u16>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -6583,7 +6583,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u16>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u16>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -6782,7 +6782,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u16>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u16>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -6971,7 +6971,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u16>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -7025,7 +7025,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u16>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u16>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7169,7 +7169,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u16> (type $none_=>_none)
+ (func $std/set/testNumeric<u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -7770,7 +7770,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<i32>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<i32>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7869,7 +7869,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/set/Set<i32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -7947,7 +7947,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<i32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<i32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8011,7 +8011,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8210,7 +8210,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i32>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i32>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8397,7 +8397,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/array/Array<i32>#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8469,7 +8469,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -8504,7 +8504,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -8558,7 +8558,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -8700,7 +8700,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i32> (type $none_=>_none)
+ (func $std/set/testNumeric<i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -9301,7 +9301,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<u32>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<u32>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9400,7 +9400,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u32>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/set/Set<u32>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9478,7 +9478,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<u32>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/set/Set<u32>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9542,7 +9542,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9741,7 +9741,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u32>#add (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u32>#add (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -9928,7 +9928,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<u32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9982,7 +9982,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u32>#delete (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u32>#delete (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10124,7 +10124,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u32> (type $none_=>_none)
+ (func $std/set/testNumeric<u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -10725,7 +10725,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<i64>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<i64>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10824,7 +10824,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i64>#find (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/set/Set<i64>#find (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10902,7 +10902,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<i64>#has (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/set/Set<i64>#has (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10978,7 +10978,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<i64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<i64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -11190,7 +11190,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#add (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/set/Set<i64>#add (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -11389,7 +11389,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/array/Array<i64>#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11461,7 +11461,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#set:length (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>#set:length (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -11496,7 +11496,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__get (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11551,7 +11551,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/set/Set<i64>#delete (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/set/Set<i64>#delete (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -11706,7 +11706,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<i64>#clear (type $i32_=>_none) (param $0 i32)
+ (func $~lib/set/Set<i64>#clear (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -11794,7 +11794,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<i64> (type $none_=>_none)
+ (func $std/set/testNumeric<i64>
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -12396,7 +12396,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<u64>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<u64>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12495,7 +12495,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u64>#find (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/set/Set<u64>#find (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12573,7 +12573,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<u64>#has (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/set/Set<u64>#has (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12649,7 +12649,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<u64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<u64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -12861,7 +12861,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<u64>#add (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/set/Set<u64>#add (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -13060,7 +13060,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#__get (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/array/Array<u64>#__get (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13115,7 +13115,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/set/Set<u64>#delete (type $i32_i64_=>_none) (param $0 i32) (param $1 i64)
+ (func $~lib/set/Set<u64>#delete (param $0 i32) (param $1 i64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -13270,7 +13270,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<u64> (type $none_=>_none)
+ (func $std/set/testNumeric<u64>
   (local $0 i32)
   (local $1 i64)
   (local $2 i32)
@@ -13872,7 +13872,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/set/Set<f32>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<f32>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13971,7 +13971,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<f32>#find (type $i32_f32_i32_=>_i32) (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
+ (func $~lib/set/Set<f32>#find (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14049,7 +14049,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<f32>#has (type $i32_f32_=>_i32) (param $0 i32) (param $1 f32) (result i32)
+ (func $~lib/set/Set<f32>#has (param $0 i32) (param $1 f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14114,7 +14114,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<f32>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<f32>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14315,7 +14315,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#add (type $i32_f32_=>_none) (param $0 i32) (param $1 f32)
+ (func $~lib/set/Set<f32>#add (param $0 i32) (param $1 f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14503,7 +14503,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f32>#values (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/set/Set<f32>#values (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f32)
@@ -14769,7 +14769,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $0 i32) (param $1 i32) (result f32)
   (local $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14824,7 +14824,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/set/Set<f32>#delete (type $i32_f32_=>_none) (param $0 i32) (param $1 f32)
+ (func $~lib/set/Set<f32>#delete (param $0 i32) (param $1 f32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14968,7 +14968,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<f32> (type $none_=>_none)
+ (func $std/set/testNumeric<f32>
   (local $0 i32)
   (local $1 f32)
   (local $2 i32)
@@ -15380,7 +15380,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#constructor (type $none_=>_i32) (result i32)
+ (func $~lib/set/Set<f64>#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -15479,7 +15479,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<f64>#find (type $i32_f64_i32_=>_i32) (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
+ (func $~lib/set/Set<f64>#find (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -15557,7 +15557,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/set/Set<f64>#has (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/set/Set<f64>#has (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -15636,7 +15636,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/set/Set<f64>#rehash (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/set/Set<f64>#rehash (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -15851,7 +15851,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#add (type $i32_f64_=>_none) (param $0 i32) (param $1 f64)
+ (func $~lib/set/Set<f64>#add (param $0 i32) (param $1 f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -16053,7 +16053,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/set/Set<f64>#values (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/set/Set<f64>#values (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -16319,7 +16319,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $0 i32) (param $1 i32) (result f64)
   (local $2 f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16374,7 +16374,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/set/Set<f64>#delete (type $i32_f64_=>_none) (param $0 i32) (param $1 f64)
+ (func $~lib/set/Set<f64>#delete (param $0 i32) (param $1 f64)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -16532,7 +16532,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/set/testNumeric<f64> (type $none_=>_none)
+ (func $std/set/testNumeric<f64>
   (local $0 i32)
   (local $1 f64)
   (local $2 i32)
@@ -16944,7 +16944,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -16986,7 +16986,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -17005,7 +17005,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   local.get $0
   i32.eqz
   if
diff --git a/tests/compiler/std/static-array.debug.wat b/tests/compiler/std/static-array.debug.wat
index c033cdb01a..4376463cde 100644
--- a/tests/compiler/std/static-array.debug.wat
+++ b/tests/compiler/std/static-array.debug.wat
@@ -1,19 +1,19 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_i32_f64_=>_none (func_subtype (param i32 i32 f64) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_i32_f64_=>_none (func (param i32 i32 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/static-array/i i32 (i32.const 64))
  (global $std/static-array/I i32 (i32.const 160))
@@ -63,46 +63,46 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -112,11 +112,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -125,14 +125,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -174,7 +174,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -186,11 +186,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -200,7 +200,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -256,11 +256,11 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -286,7 +286,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -306,7 +306,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -326,7 +326,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -362,7 +362,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -388,7 +388,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -409,7 +409,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -420,39 +420,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -688,7 +688,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1052,7 +1052,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1217,7 +1217,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1362,7 +1362,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1400,7 +1400,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1413,7 +1413,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1430,7 +1430,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1455,7 +1455,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1635,7 +1635,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1693,7 +1693,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1714,7 +1714,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1730,7 +1730,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1938,7 +1938,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2028,7 +2028,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2137,7 +2137,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2201,7 +2201,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2214,12 +2214,12 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2272,11 +2272,11 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2322,7 +2322,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2390,51 +2390,51 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f64>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<f64>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/static-array/i
   local.tee $1
@@ -2474,7 +2474,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2488,14 +2488,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2503,11 +2503,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<i64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2515,11 +2515,11 @@
   local.get $1
   call $~lib/array/Array<i64>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2527,11 +2527,11 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2539,7 +2539,7 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<f64>
     block $~lib/array/Array<f32>
@@ -2588,10 +2588,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/static-array
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2604,7 +2604,7 @@
    unreachable
   end
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2629,7 +2629,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2681,7 +2681,7 @@
   local.get $3
   return
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -2800,7 +2800,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2869,7 +2869,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2894,7 +2894,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i64>#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (param $this i32) (param $index i32) (result i64)
   (local $value i64)
   (local $3 i32)
   (local $4 i64)
@@ -2947,7 +2947,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i64>#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/array/Array<i64>#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3016,7 +3016,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3041,7 +3041,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f32>#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $this i32) (param $index i32) (result f32)
   (local $value f32)
   (local $3 i32)
   (local $4 f32)
@@ -3094,7 +3094,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<f32>#__set (type $i32_i32_f32_=>_none) (param $this i32) (param $index i32) (param $value f32)
+ (func $~lib/array/Array<f32>#__set (param $this i32) (param $index i32) (param $value f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3163,7 +3163,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3188,7 +3188,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<f64>#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $this i32) (param $index i32) (result f64)
   (local $value f64)
   (local $3 i32)
   (local $4 f64)
@@ -3241,7 +3241,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<f64>#__set (type $i32_i32_f64_=>_none) (param $this i32) (param $index i32) (param $value f64)
+ (func $~lib/array/Array<f64>#__set (param $this i32) (param $index i32) (param $value f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3310,7 +3310,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/static-array (type $none_=>_none)
+ (func $start:std/static-array
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3686,7 +3686,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3712,7 +3712,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3738,7 +3738,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3764,7 +3764,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/static-array.release.wat b/tests/compiler/std/static-array.release.wat
index 8c7efdf151..7b54aac30a 100644
--- a/tests/compiler/std/static-array.release.wat
+++ b/tests/compiler/std/static-array.release.wat
@@ -1,15 +1,15 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i64 (func_subtype (param i32) (result i64) func))
- (type $i32_=>_f32 (func_subtype (param i32) (result f32) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i64 (func (param i32) (result i64)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -59,7 +59,7 @@
  (data (i32.const 1952) "\08\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\02\t\00\00\02\n\00\00\02\19\00\00\02\1a")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1088
@@ -114,7 +114,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -246,7 +246,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -399,7 +399,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -645,7 +645,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -757,7 +757,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -836,7 +836,7 @@
   i32.const 34768
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1103,7 +1103,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1229,7 +1229,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner0
    block $invalid
@@ -1294,10 +1294,10 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/static-array
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1330,7 +1330,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<i32>#__get (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1384,7 +1384,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1860,7 +1860,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__get (type $i32_=>_i64) (param $0 i32) (result i64)
+ (func $~lib/array/Array<i64>#__get (param $0 i32) (result i64)
   (local $1 i64)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1915,7 +1915,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<f32>#__get (type $i32_=>_f32) (param $0 i32) (result f32)
+ (func $~lib/array/Array<f32>#__get (param $0 i32) (result f32)
   (local $1 f32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1970,7 +1970,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<f64>#__get (type $i32_=>_f64) (param $0 i32) (result f64)
+ (func $~lib/array/Array<f64>#__get (param $0 i32) (result f64)
   (local $1 f64)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2025,7 +2025,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:std/static-array (type $none_=>_none)
+ (func $start:std/static-array
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2505,7 +2505,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/staticarray.debug.wat b/tests/compiler/std/staticarray.debug.wat
index fc3349d6a7..91f0a53256 100644
--- a/tests/compiler/std/staticarray.debug.wat
+++ b/tests/compiler/std/staticarray.debug.wat
@@ -1,19 +1,19 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/staticarray/arr1 i32 (i32.const 32))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
@@ -116,11 +116,11 @@
  (elem $0 (i32.const 1) $start:std/staticarray~anonymous|0 $start:std/staticarray~anonymous|1 $start:std/staticarray~anonymous|2 $start:std/staticarray~anonymous|3 $start:std/staticarray~anonymous|4 $start:std/staticarray~anonymous|5 $start:std/staticarray~anonymous|6 $start:std/staticarray~anonymous|7 $start:std/staticarray~anonymous|8 $start:std/staticarray~anonymous|9 $start:std/staticarray~anonymous|10 $start:std/staticarray~anonymous|11 $start:std/staticarray~anonymous|12 $~lib/util/sort/COMPARATOR<i32>~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/staticarray/StaticArray<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -129,7 +129,7 @@
   i32.shr_u
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -140,21 +140,21 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/common/OBJECT#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -164,11 +164,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -177,14 +177,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -226,7 +226,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -238,11 +238,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -252,7 +252,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -308,15 +308,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -342,7 +342,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -362,7 +362,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -382,7 +382,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -418,7 +418,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -444,7 +444,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -465,11 +465,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -480,39 +480,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -748,7 +748,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1112,7 +1112,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1277,7 +1277,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1422,7 +1422,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1460,7 +1460,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1473,7 +1473,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1490,7 +1490,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1515,7 +1515,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1695,7 +1695,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1753,7 +1753,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1774,7 +1774,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1790,7 +1790,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1998,7 +1998,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2088,7 +2088,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2197,7 +2197,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2261,7 +2261,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2274,17 +2274,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2337,7 +2337,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2353,7 +2353,7 @@
   local.get $buffer
   return
  )
- (func $std/staticarray/test (type $none_=>_i32) (result i32)
+ (func $std/staticarray/test (result i32)
   (local $0 i32)
   i32.const 12
   i32.const 4
@@ -2361,7 +2361,7 @@
   call $~lib/rt/__newBuffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2429,7 +2429,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -2444,15 +2444,15 @@
   i32.const 1
   call $~lib/rt/itcms/__link
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2461,7 +2461,7 @@
   i32.shr_u
   return
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2470,7 +2470,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2574,15 +2574,15 @@
   i32.const 0
   return
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/staticarray/StaticArray<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<f64>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2591,7 +2591,7 @@
   i32.shr_u
   return
  )
- (func $~lib/staticarray/StaticArray<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<f32>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2600,7 +2600,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/bytes/FILL<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<i32> (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -2716,7 +2716,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<i32> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<i32> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -2787,12 +2787,12 @@
    end
   end
  )
- (func $start:std/staticarray~anonymous|0 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|0 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 1
   i32.add
  )
- (func $start:std/staticarray~anonymous|1 (type $i32_i32_i32_=>_none) (param $x i32) (param $$1 i32) (param $$2 i32)
+ (func $start:std/staticarray~anonymous|1 (param $x i32) (param $$1 i32) (param $$2 i32)
   (local $3 i32)
   (local $4 i32)
   global.get $std/staticarray/maxVal
@@ -2805,24 +2805,24 @@
   select
   global.set $std/staticarray/maxVal
  )
- (func $start:std/staticarray~anonymous|2 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|2 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 2
   i32.ge_s
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2868,62 +2868,62 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<i32>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<i32>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $start:std/staticarray~anonymous|3 (type $i32_i32_i32_i32_=>_i32) (param $x i32) (param $y i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/staticarray~anonymous|3 (param $x i32) (param $y i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $x
   local.get $y
   i32.add
  )
- (func $start:std/staticarray~anonymous|4 (type $i32_i32_i32_i32_=>_i32) (param $x i32) (param $y i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $start:std/staticarray~anonymous|4 (param $x i32) (param $y i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $x
   local.get $y
   i32.add
  )
- (func $start:std/staticarray~anonymous|5 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|5 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 2
   i32.eq
  )
- (func $start:std/staticarray~anonymous|6 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|6 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 4
   i32.eq
  )
- (func $start:std/staticarray~anonymous|7 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|7 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 3
   i32.le_s
  )
- (func $start:std/staticarray~anonymous|8 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|8 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 3
   i32.gt_s
  )
- (func $start:std/staticarray~anonymous|9 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|9 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 2
   i32.eq
  )
- (func $start:std/staticarray~anonymous|10 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|10 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 4
   i32.eq
  )
- (func $start:std/staticarray~anonymous|11 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|11 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 2
   i32.eq
  )
- (func $start:std/staticarray~anonymous|12 (type $i32_i32_i32_=>_i32) (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|12 (param $x i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $x
   i32.const 4
   i32.eq
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -3104,7 +3104,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -3259,7 +3259,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/nodePower (type $i32_i32_i32_i32_i32_=>_i32) (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
+ (func $~lib/util/sort/nodePower (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
   (local $n i64)
   (local $s i32)
   (local $l i32)
@@ -3310,7 +3310,7 @@
   i32.clz
   return
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -3448,12 +3448,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -3499,7 +3499,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/staticarray/arr1
   local.tee $1
@@ -3542,7 +3542,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3556,10 +3556,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3596,7 +3596,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<std/staticarray/Ref>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/staticarray/StaticArray<std/staticarray/Ref>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3604,11 +3604,11 @@
   local.get $1
   call $~lib/staticarray/StaticArray<std/staticarray/Ref>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3616,7 +3616,7 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -3653,7 +3653,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3661,11 +3661,11 @@
   local.get $1
   call $~lib/staticarray/StaticArray<~lib/string/String>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3673,11 +3673,11 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3685,11 +3685,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3697,11 +3697,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3709,11 +3709,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3721,11 +3721,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -3733,7 +3733,7 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28i32%2Ci32%29=>i32>
     block $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>
@@ -3824,10 +3824,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/staticarray
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3840,7 +3840,7 @@
    unreachable
   end
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3886,7 +3886,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3927,7 +3927,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/staticarray/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $std/staticarray/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3965,7 +3965,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3990,7 +3990,7 @@
   local.get $1
   return
  )
- (func $~lib/staticarray/StaticArray.fromArray<i32> (type $i32_=>_i32) (param $source i32) (result i32)
+ (func $~lib/staticarray/StaticArray.fromArray<i32> (param $source i32) (result i32)
   (local $length i32)
   (local $outSize i32)
   (local $out i32)
@@ -4042,7 +4042,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4094,7 +4094,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#concat<~lib/staticarray/StaticArray<i32>> (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#concat<~lib/staticarray/StaticArray<i32>> (param $this i32) (param $other i32) (result i32)
   (local $sourceLen i32)
   (local $otherLen i32)
   (local $outLen i32)
@@ -4194,7 +4194,7 @@
   local.get $10
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>> (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>> (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -4355,7 +4355,7 @@
   local.get $20
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>>@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>>@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4396,7 +4396,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4457,7 +4457,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4553,7 +4553,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4578,7 +4578,7 @@
   local.get $1
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#concat<~lib/array/Array<~lib/string/String>> (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#concat<~lib/array/Array<~lib/string/String>> (param $this i32) (param $other i32) (result i32)
   (local $sourceLen i32)
   (local $otherLen i32)
   (local $outLen i32)
@@ -4745,7 +4745,7 @@
   local.get $15
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#indexOf (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -4851,7 +4851,7 @@
   local.get $6
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#includes (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#includes (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4887,7 +4887,7 @@
   local.get $3
   return
  )
- (func $~lib/staticarray/StaticArray<f64>#includes (type $i32_f64_i32_=>_i32) (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<f64>#includes (param $this i32) (param $value f64) (param $fromIndex i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -4999,7 +4999,7 @@
   local.get $7
   return
  )
- (func $~lib/staticarray/StaticArray<f32>#includes (type $i32_f32_i32_=>_i32) (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<f32>#includes (param $this i32) (param $value f32) (param $fromIndex i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -5111,7 +5111,7 @@
   local.get $7
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#indexOf (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -5207,7 +5207,7 @@
   local.get $6
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#lastIndexOf (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $length i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5297,7 +5297,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#lastIndexOf@varargs (param $this i32) (param $value i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5342,7 +5342,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $4 i32)
   (local $estLen i32)
@@ -5572,7 +5572,7 @@
   local.get $13
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5617,7 +5617,7 @@
   local.get $2
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5648,7 +5648,7 @@
   local.get $1
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#fill (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#fill (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5681,7 +5681,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#fill@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#fill@varargs (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5725,7 +5725,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/staticarray/StaticArray<i32>#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5753,7 +5753,7 @@
   local.get $1
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#copyWithin (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#copyWithin (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $ptr i32)
   (local $len i32)
   (local $6 i32)
@@ -5915,7 +5915,7 @@
   local.get $26
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#copyWithin@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#copyWithin@varargs (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5955,7 +5955,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/staticarray/StaticArray<i32>#map<i32> (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#map<i32> (param $this i32) (param $fn i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $outStart i32)
@@ -6048,7 +6048,7 @@
   local.get $7
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/staticarray/StaticArray<i32>#forEach (param $this i32) (param $fn i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -6105,7 +6105,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -6224,7 +6224,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#push (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<i32>#push (param $this i32) (param $value i32) (result i32)
   (local $oldLen i32)
   (local $len i32)
   (local $4 i32)
@@ -6285,7 +6285,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#filter (param $this i32) (param $fn i32) (result i32)
   (local $result i32)
   (local $i i32)
   (local $len i32)
@@ -6372,7 +6372,7 @@
   local.get $6
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#reduce<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#reduce<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $len i32)
@@ -6438,7 +6438,7 @@
   local.get $6
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#reduceRight<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#reduceRight<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $acc i32)
   (local $i i32)
   (local $5 i32)
@@ -6503,7 +6503,7 @@
   local.get $5
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#some (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -6574,7 +6574,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#every (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -6646,7 +6646,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -6717,7 +6717,7 @@
   local.get $4
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $i i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -6787,7 +6787,7 @@
   local.get $3
   return
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -7264,7 +7264,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/staticarray/StaticArray<i32>#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -7298,7 +7298,7 @@
   local.get $2
   return
  )
- (func $~lib/staticarray/StaticArray<i32>#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -7353,7 +7353,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $start:std/staticarray (type $none_=>_none)
+ (func $start:std/staticarray
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -9883,7 +9883,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9909,7 +9909,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -9979,7 +9979,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10003,7 +10003,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10027,7 +10027,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10051,7 +10051,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/staticarray/StaticArray<i32>%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10075,7 +10075,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10099,7 +10099,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10127,7 +10127,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/staticarray/StaticArray<i32>#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#constructor (param $this i32) (param $length i32) (result i32)
   (local $outSize i32)
   (local $out i32)
   (local $4 i32)
@@ -10175,7 +10175,7 @@
   local.get $4
   return
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
diff --git a/tests/compiler/std/staticarray.release.wat b/tests/compiler/std/staticarray.release.wat
index 1af032120d..21bca5a439 100644
--- a/tests/compiler/std/staticarray.release.wat
+++ b/tests/compiler/std/staticarray.release.wat
@@ -1,16 +1,16 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -162,7 +162,7 @@
  (elem $0 (i32.const 1) $start:std/staticarray~anonymous|0 $start:std/staticarray~anonymous|1 $start:std/staticarray~anonymous|2 $start:std/staticarray~anonymous|3 $start:std/staticarray~anonymous|3 $start:std/staticarray~anonymous|5 $start:std/staticarray~anonymous|6 $start:std/staticarray~anonymous|7 $start:std/staticarray~anonymous|8 $start:std/staticarray~anonymous|5 $start:std/staticarray~anonymous|6 $start:std/staticarray~anonymous|5 $start:std/staticarray~anonymous|6 $~lib/util/sort/COMPARATOR<i32>~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1056
@@ -227,7 +227,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -359,7 +359,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -512,7 +512,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -758,7 +758,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -870,7 +870,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -949,7 +949,7 @@
   i32.const 36576
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tlsf/__free (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1001,7 +1001,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1222,7 +1222,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1348,7 +1348,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1541,7 +1541,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -1657,7 +1657,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__uset (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/staticarray/StaticArray<std/staticarray/Ref>#__uset (param $0 i32) (param $1 i32) (param $2 i32)
   local.get $0
   local.get $1
   i32.const 2
@@ -1673,12 +1673,12 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__link
   end
  )
- (func $start:std/staticarray~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 1
   i32.add
  )
- (func $start:std/staticarray~anonymous|1 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $start:std/staticarray~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32)
   global.get $std/staticarray/maxVal
   local.tee $1
   local.get $0
@@ -1688,37 +1688,37 @@
   select
   global.set $std/staticarray/maxVal
  )
- (func $start:std/staticarray~anonymous|2 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|2 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.ge_s
  )
- (func $start:std/staticarray~anonymous|3 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $start:std/staticarray~anonymous|3 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $start:std/staticarray~anonymous|5 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|5 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.eq
  )
- (func $start:std/staticarray~anonymous|6 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|6 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 4
   i32.eq
  )
- (func $start:std/staticarray~anonymous|7 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|7 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 3
   i32.le_s
  )
- (func $start:std/staticarray~anonymous|8 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $start:std/staticarray~anonymous|8 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 3
   i32.gt_s
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -1877,7 +1877,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -2029,7 +2029,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -2153,12 +2153,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $~lib/staticarray/StaticArray<std/staticarray/Ref>~visit (type $i32_=>_none) (param $0 i32)
+ (func $~lib/staticarray/StaticArray<std/staticarray/Ref>~visit (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -2188,7 +2188,7 @@
    end
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2360,10 +2360,10 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/staticarray
  )
- (func $~lib/staticarray/StaticArray<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2416,7 +2416,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<i32>#__set (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/staticarray/StaticArray<i32>#__set (param $0 i32) (param $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2468,7 +2468,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/staticarray/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $std/staticarray/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2536,7 +2536,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2569,7 +2569,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray.fromArray<i32> (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/staticarray/StaticArray.fromArray<i32> (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2619,7 +2619,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2673,7 +2673,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<i32>#concat<~lib/staticarray/StaticArray<i32>> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#concat<~lib/staticarray/StaticArray<i32>> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2763,7 +2763,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>> (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>> (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2900,7 +2900,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>>@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#slice<~lib/staticarray/StaticArray<~lib/string/String>>@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2949,7 +2949,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3014,7 +3014,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3174,7 +3174,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#concat<~lib/array/Array<~lib/string/String>> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#concat<~lib/array/Array<~lib/string/String>> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3328,7 +3328,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#includes (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#includes (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -3461,7 +3461,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/staticarray/StaticArray<i32>#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3554,7 +3554,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/staticarray/StaticArray<i32>#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3644,7 +3644,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/staticarray/StaticArray<i32>#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3699,7 +3699,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -3920,7 +3920,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3966,7 +3966,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/staticarray/StaticArray<i32>#filter (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#filter (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -4228,7 +4228,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/staticarray/StaticArray<i32>#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4305,7 +4305,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/staticarray/StaticArray<i32>#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4383,7 +4383,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 1
  )
- (func $~lib/staticarray/StaticArray<i32>#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4460,7 +4460,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/staticarray/StaticArray<i32>#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<i32>#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4538,7 +4538,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4978,7 +4978,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/staticarray (type $none_=>_none)
+ (func $start:std/staticarray
   (local $0 i32)
   (local $1 i32)
   (local $2 f64)
@@ -8110,7 +8110,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -8178,7 +8178,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -8197,7 +8197,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/string-casemapping.debug.wat b/tests/compiler/std/string-casemapping.debug.wat
index 8d70df075d..2efe638941 100644
--- a/tests/compiler/std/string-casemapping.debug.wat
+++ b/tests/compiler/std/string-casemapping.debug.wat
@@ -1,19 +1,19 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "string_casemapping" "toLowerCaseFromIndex" (func $std/string-casemapping/toLowerCaseFromIndex (param i32 i32) (result i32)))
  (import "string_casemapping" "toUpperCaseFromIndex" (func $std/string-casemapping/toUpperCaseFromIndex (param i32 i32) (result i32)))
@@ -223,11 +223,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -236,17 +236,17 @@
   i32.shr_u
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -256,11 +256,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -269,14 +269,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -318,7 +318,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -330,11 +330,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -344,7 +344,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -400,15 +400,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -434,7 +434,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -454,7 +454,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -474,7 +474,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -510,7 +510,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -536,7 +536,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -557,11 +557,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -572,39 +572,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -840,7 +840,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1204,7 +1204,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1369,7 +1369,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1514,7 +1514,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1552,7 +1552,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1565,7 +1565,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1582,7 +1582,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1607,7 +1607,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1787,7 +1787,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1845,7 +1845,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1866,7 +1866,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1882,7 +1882,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2090,7 +2090,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2180,7 +2180,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2289,7 +2289,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2353,7 +2353,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2366,17 +2366,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2429,7 +2429,7 @@
   local.get $ptr
   return
  )
- (func $~lib/staticarray/StaticArray<u16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<u16>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2438,7 +2438,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/casemap/casemap (type $i32_i32_=>_i32) (param $c i32) (param $dir i32) (result i32)
+ (func $~lib/util/casemap/casemap (param $c i32) (param $dir i32) (result i32)
   (local $c0 i32)
   (local $b i32)
   (local $x i32)
@@ -2626,11 +2626,11 @@
   local.get $c0
   return
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2676,7 +2676,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2780,7 +2780,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/string/stagedBinaryLookup (type $i32_i32_=>_i32) (param $table i32) (param $c i32) (result i32)
+ (func $~lib/util/string/stagedBinaryLookup (param $table i32) (param $c i32) (result i32)
   local.get $table
   local.get $table
   local.get $c
@@ -2806,7 +2806,7 @@
   i32.and
   return
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -2861,7 +2861,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -3001,7 +3001,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/decimalCount64High (type $i64_=>_i32) (param $value i64) (result i32)
+ (func $~lib/util/number/decimalCount64High (param $value i64) (result i32)
   local.get $value
   i64.const 1000000000000000
   i64.lt_u
@@ -3060,7 +3060,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $buffer i32) (param $num i64) (param $offset i32)
   (local $t i64)
   (local $r i32)
   (local $b i32)
@@ -3180,7 +3180,7 @@
   local.get $offset
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -3227,7 +3227,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -3304,7 +3304,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -3395,13 +3395,13 @@
    end
   end
  )
- (func $~lib/number/I64#toString (type $i64_i32_=>_i32) (param $this i64) (param $radix i32) (result i32)
+ (func $~lib/number/I64#toString (param $this i64) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa64
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 256
   local.get $0
@@ -3423,7 +3423,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3437,10 +3437,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/staticarray/StaticArray<u16>
     block $~lib/arraybuffer/ArrayBufferView
@@ -3468,10 +3468,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string-casemapping
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3484,7 +3484,7 @@
    unreachable
   end
  )
- (func $~lib/string/String#toUpperCase (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#toUpperCase (param $this i32) (result i32)
   (local $len i32)
   (local $codes i32)
   (local $specialsPtr i32)
@@ -3885,7 +3885,7 @@
   local.get $24
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3981,7 +3981,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String#toLowerCase (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#toLowerCase (param $this i32) (result i32)
   (local $len i32)
   (local $codes i32)
   (local $j i32)
@@ -4592,7 +4592,7 @@
   local.get $36
   return
  )
- (func $~lib/string/String#codePointAt (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#codePointAt (param $this i32) (param $pos i32) (result i32)
   (local $len i32)
   (local $first i32)
   (local $second i32)
@@ -4698,7 +4698,7 @@
   local.get $5
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -4774,7 +4774,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4805,7 +4805,7 @@
   local.get $2
   return
  )
- (func $start:std/string-casemapping (type $none_=>_none)
+ (func $start:std/string-casemapping
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -7491,7 +7491,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.fromCodePoint (type $i32_=>_i32) (param $code i32) (result i32)
+ (func $~lib/string/String.fromCodePoint (param $code i32) (result i32)
   (local $hasSur i32)
   (local $out i32)
   (local $hi i32)
@@ -7569,7 +7569,7 @@
   local.get $5
   return
  )
- (func $~lib/util/number/itoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa64 (param $value i64) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $val32 i32)
diff --git a/tests/compiler/std/string-casemapping.release.wat b/tests/compiler/std/string-casemapping.release.wat
index 3b46a01669..0093badf9b 100644
--- a/tests/compiler/std/string-casemapping.release.wat
+++ b/tests/compiler/std/string-casemapping.release.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "string_casemapping" "toLowerCaseFromIndex" (func $std/string-casemapping/toLowerCaseFromIndex (param i32 i32) (result i32)))
  (import "string_casemapping" "toUpperCaseFromIndex" (func $std/string-casemapping/toUpperCaseFromIndex (param i32 i32) (result i32)))
@@ -481,7 +481,7 @@
  (data (i32.const 21056) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\a4")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1280
@@ -532,7 +532,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -664,7 +664,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -817,7 +817,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1063,7 +1063,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -1175,7 +1175,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1254,7 +1254,7 @@
   i32.const 53856
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1521,7 +1521,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1647,7 +1647,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1953,7 +1953,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/util/casemap/casemap (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/casemap/casemap (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2106,7 +2106,7 @@
   i32.and
   i32.add
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2144,7 +2144,7 @@
   memory.copy $0 $0
   local.get $2
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -2248,7 +2248,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/staticarray/StaticArray<u16>
     block $~lib/arraybuffer/ArrayBufferView
@@ -2280,10 +2280,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string-casemapping
  )
- (func $~lib/string/String#toUpperCase (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#toUpperCase (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2616,7 +2616,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2776,7 +2776,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String#toLowerCase (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#toLowerCase (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -3352,7 +3352,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#codePointAt (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#codePointAt (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3443,7 +3443,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3548,7 +3548,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $start:std/string-casemapping (type $none_=>_none)
+ (func $start:std/string-casemapping
   (local $0 i64)
   (local $1 i64)
   (local $2 i64)
@@ -5909,7 +5909,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.fromCodePoint (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.fromCodePoint (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5984,7 +5984,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/number/itoa64 (type $i64_=>_i32) (param $0 i64) (result i32)
+ (func $~lib/util/number/itoa64 (param $0 i64) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6261,7 +6261,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/string-encoding.debug.wat b/tests/compiler/std/string-encoding.debug.wat
index f91e6c7c87..efe98f27d7 100644
--- a/tests/compiler/std/string-encoding.debug.wat
+++ b/tests/compiler/std/string-encoding.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/string-encoding/str (mut i32) (i32.const 32))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
@@ -63,28 +63,28 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String.UTF16.byteLength (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/string/String.UTF16.byteLength (param $str i32) (result i32)
   local.get $str
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -94,11 +94,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -107,14 +107,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -156,7 +156,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -168,11 +168,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -182,7 +182,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -238,15 +238,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -272,7 +272,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -292,7 +292,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -312,7 +312,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -348,7 +348,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -374,7 +374,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -395,11 +395,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -410,39 +410,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -678,7 +678,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1042,7 +1042,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1207,7 +1207,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1352,7 +1352,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1390,7 +1390,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1403,7 +1403,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1420,7 +1420,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1445,7 +1445,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1625,7 +1625,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1683,7 +1683,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1704,7 +1704,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1720,7 +1720,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1928,7 +1928,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2018,7 +2018,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2127,7 +2127,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2191,7 +2191,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2204,17 +2204,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2267,7 +2267,7 @@
   local.get $ptr
   return
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2276,7 +2276,7 @@
   i32.shr_u
   return
  )
- (func $~lib/string/String.UTF16.encodeUnsafe (type $i32_i32_i32_=>_i32) (param $str i32) (param $len i32) (param $buf i32) (result i32)
+ (func $~lib/string/String.UTF16.encodeUnsafe (param $str i32) (param $len i32) (param $buf i32) (result i32)
   (local $size i32)
   local.get $len
   i32.const 1
@@ -2289,14 +2289,14 @@
   local.get $size
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2400,7 +2400,7 @@
   i32.const 0
   return
  )
- (func $~lib/string/String.UTF8.byteLength (type $i32_i32_=>_i32) (param $str i32) (param $nullTerminated i32) (result i32)
+ (func $~lib/string/String.UTF8.byteLength (param $str i32) (param $nullTerminated i32) (result i32)
   (local $strOff i32)
   (local $strEnd i32)
   (local $bufLen i32)
@@ -2502,7 +2502,7 @@
   local.get $bufLen
   return
  )
- (func $~lib/string/String.UTF8.encodeUnsafe (type $i32_i32_i32_i32_i32_=>_i32) (param $str i32) (param $len i32) (param $buf i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
+ (func $~lib/string/String.UTF8.encodeUnsafe (param $str i32) (param $len i32) (param $buf i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
   (local $strEnd i32)
   (local $bufOff i32)
   (local $c1 i32)
@@ -2755,11 +2755,11 @@
   i32.sub
   return
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2805,7 +2805,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2851,7 +2851,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/string-encoding/str
   local.tee $1
@@ -2870,7 +2870,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2884,10 +2884,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2912,10 +2912,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string-encoding
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2928,7 +2928,7 @@
    unreachable
   end
  )
- (func $std/string-encoding/testUTF16Length (type $none_=>_none)
+ (func $std/string-encoding/testUTF16Length
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2961,7 +2961,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF16.encode (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/string/String.UTF16.encode (param $str i32) (result i32)
   (local $buf i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3004,7 +3004,7 @@
   local.get $2
   return
  )
- (func $std/string-encoding/testUTF16Encode (type $none_=>_none)
+ (func $std/string-encoding/testUTF16Encode
   (local $buf i32)
   (local $ptr i32)
   (local $2 i32)
@@ -3207,7 +3207,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF16.decode (type $i32_=>_i32) (param $buf i32) (result i32)
+ (func $~lib/string/String.UTF16.decode (param $buf i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3234,7 +3234,7 @@
   local.get $1
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3330,7 +3330,7 @@
   local.get $3
   return
  )
- (func $std/string-encoding/testUTF16Decode (type $none_=>_none)
+ (func $std/string-encoding/testUTF16Decode
   (local $buf i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3387,7 +3387,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF16DecodeUnsafe (type $none_=>_none)
+ (func $std/string-encoding/testUTF16DecodeUnsafe
   (local $buf i32)
   (local $len i32)
   (local $ptr i32)
@@ -3604,7 +3604,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF8Length (type $none_=>_none)
+ (func $std/string-encoding/testUTF8Length
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3657,7 +3657,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF8.encode (type $i32_i32_i32_=>_i32) (param $str i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
+ (func $~lib/string/String.UTF8.encode (param $str i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
   (local $buf i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3703,7 +3703,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String.UTF8.encode@varargs (type $i32_i32_i32_=>_i32) (param $str i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
+ (func $~lib/string/String.UTF8.encode@varargs (param $str i32) (param $nullTerminated i32) (param $errorMode i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3746,7 +3746,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/string-encoding/testUTF8Encode (type $none_=>_none)
+ (func $std/string-encoding/testUTF8Encode
   (local $buf i32)
   (local $ptr i32)
   (local $2 i32)
@@ -3927,7 +3927,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF8EncodeNullTerminated (type $none_=>_none)
+ (func $std/string-encoding/testUTF8EncodeNullTerminated
   (local $buf i32)
   (local $ptr i32)
   (local $str2 i32)
@@ -4169,7 +4169,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF8.decode (type $i32_i32_=>_i32) (param $buf i32) (param $nullTerminated i32) (result i32)
+ (func $~lib/string/String.UTF8.decode (param $buf i32) (param $nullTerminated i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4197,7 +4197,7 @@
   local.get $2
   return
  )
- (func $std/string-encoding/testUTF8ErrorMode (type $none_=>_none)
+ (func $std/string-encoding/testUTF8ErrorMode
   (local $str i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4380,7 +4380,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF8Decode (type $none_=>_none)
+ (func $std/string-encoding/testUTF8Decode
   (local $buf i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4442,7 +4442,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF8DecodeNullTerminated (type $none_=>_none)
+ (func $std/string-encoding/testUTF8DecodeNullTerminated
   (local $buf i32)
   (local $str2 i32)
   (local $buf2 i32)
@@ -4656,7 +4656,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testUTF8DecodeUnsafe (type $none_=>_none)
+ (func $std/string-encoding/testUTF8DecodeUnsafe
   (local $buf i32)
   (local $len i32)
   (local $ptr i32)
@@ -4939,7 +4939,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testRoundtrip (type $i32_=>_none) (param $str i32)
+ (func $std/string-encoding/testRoundtrip (param $str i32)
   (local $buf8 i32)
   (local $buf16 i32)
   (local $3 i32)
@@ -5038,7 +5038,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/string-encoding (type $none_=>_none)
+ (func $start:std/string-encoding
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5096,7 +5096,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF16.decodeUnsafe (type $i32_i32_=>_i32) (param $buf i32) (param $len i32) (result i32)
+ (func $~lib/string/String.UTF16.decodeUnsafe (param $buf i32) (param $len i32) (result i32)
   (local $str i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5131,7 +5131,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.UTF8.decodeUnsafe (type $i32_i32_i32_=>_i32) (param $buf i32) (param $len i32) (param $nullTerminated i32) (result i32)
+ (func $~lib/string/String.UTF8.decodeUnsafe (param $buf i32) (param $len i32) (param $nullTerminated i32) (result i32)
   (local $bufOff i32)
   (local $bufEnd i32)
   (local $str i32)
diff --git a/tests/compiler/std/string-encoding.release.wat b/tests/compiler/std/string-encoding.release.wat
index b595d8f1c1..15f2ab71e4 100644
--- a/tests/compiler/std/string-encoding.release.wat
+++ b/tests/compiler/std/string-encoding.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -71,7 +71,7 @@
  (data (i32.const 22784) "\04\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1056
@@ -120,7 +120,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -252,7 +252,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -405,7 +405,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -651,7 +651,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -763,7 +763,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -842,7 +842,7 @@
   i32.const 55584
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1109,7 +1109,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1235,7 +1235,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1541,7 +1541,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/string/String.UTF8.byteLength (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.UTF8.byteLength (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1631,7 +1631,7 @@
   end
   local.get $2
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1660,7 +1660,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2643,7 +2643,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.UTF16.encode (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.UTF16.encode (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2694,7 +2694,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.UTF16.decode (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.UTF16.decode (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2731,7 +2731,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2891,7 +2891,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $std/string-encoding/testUTF16DecodeUnsafe (type $none_=>_none)
+ (func $std/string-encoding/testUTF16DecodeUnsafe
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3104,7 +3104,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF8.encode (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String.UTF8.encode (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -3350,7 +3350,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/string/String.UTF8.encode@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.UTF8.encode@varargs (param $0 i32) (param $1 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -3396,7 +3396,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/string-encoding/testUTF8EncodeNullTerminated (type $none_=>_none)
+ (func $std/string-encoding/testUTF8EncodeNullTerminated
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -3622,7 +3622,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF8.decode (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.UTF8.decode (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3660,7 +3660,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/string-encoding/testUTF8DecodeUnsafe (type $none_=>_none)
+ (func $std/string-encoding/testUTF8DecodeUnsafe
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3936,7 +3936,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/string-encoding/testRoundtrip (type $i32_=>_none) (param $0 i32)
+ (func $std/string-encoding/testRoundtrip (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 20
@@ -4032,7 +4032,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.UTF16.decodeUnsafe (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.UTF16.decodeUnsafe (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4072,7 +4072,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.UTF8.decodeUnsafe (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String.UTF8.decodeUnsafe (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4323,7 +4323,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/std/string-nonnull.debug.wat b/tests/compiler/std/string-nonnull.debug.wat
index f1cbb45e89..8d69ea5e0b 100644
--- a/tests/compiler/std/string-nonnull.debug.wat
+++ b/tests/compiler/std/string-nonnull.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -18,11 +18,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -31,7 +31,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -135,10 +135,10 @@
   i32.const 0
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string-nonnull
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -151,7 +151,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -247,7 +247,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__ne (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__ne (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -279,7 +279,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String.__not (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/string/String.__not (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -312,7 +312,7 @@
   local.get $1
   return
  )
- (func $start:std/string-nonnull (type $none_=>_none)
+ (func $start:std/string-nonnull
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/string-nonnull.release.wat b/tests/compiler/std/string-nonnull.release.wat
index 71a99c2062..ef7345c2f1 100644
--- a/tests/compiler/std/string-nonnull.release.wat
+++ b/tests/compiler/std/string-nonnull.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33836))
  (memory $0 1)
@@ -9,7 +9,7 @@
  (data (i32.const 1048) "\02")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -137,7 +137,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $none_=>_i32) (result i32)
+ (func $~lib/string/String.__eq (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -164,7 +164,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__ne (type $none_=>_i32) (result i32)
+ (func $~lib/string/String.__ne (result i32)
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
diff --git a/tests/compiler/std/string.debug.wat b/tests/compiler/std/string.debug.wat
index 071ba0a1ae..ce0fc84384 100644
--- a/tests/compiler/std/string.debug.wat
+++ b/tests/compiler/std/string.debug.wat
@@ -1,28 +1,28 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $f64_i32_=>_f64 (func_subtype (param f64 i32) (result f64) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_=>_f32 (func_subtype (param i32) (result f32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $f64_i32_=>_f64 (func (param f64 i32) (result f64)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/string/str (mut i32) (i32.const 32))
  (global $std/string/nullStr (mut i32) (i32.const 0))
@@ -548,11 +548,11 @@
  (export "getString" (func $std/string/getString))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -561,7 +561,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -665,17 +665,17 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -685,11 +685,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -698,14 +698,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -747,7 +747,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -759,11 +759,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -773,7 +773,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -829,15 +829,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -863,7 +863,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -883,7 +883,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -903,7 +903,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -939,7 +939,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -965,7 +965,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -986,11 +986,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -1001,39 +1001,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1269,7 +1269,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1633,7 +1633,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1798,7 +1798,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1943,7 +1943,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1981,7 +1981,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1994,7 +1994,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -2011,7 +2011,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -2036,7 +2036,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -2216,7 +2216,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2274,7 +2274,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2295,7 +2295,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2311,7 +2311,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2519,7 +2519,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2609,7 +2609,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2718,7 +2718,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2782,7 +2782,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2795,17 +2795,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2858,7 +2858,7 @@
   local.get $ptr
   return
  )
- (func $~lib/string/String.fromCharCode@varargs (type $i32_i32_=>_i32) (param $unit i32) (param $surr i32) (result i32)
+ (func $~lib/string/String.fromCharCode@varargs (param $unit i32) (param $surr i32) (result i32)
   block $1of1
    block $0of1
     block $outOfRange
@@ -2876,7 +2876,7 @@
   local.get $surr
   call $~lib/string/String.fromCharCode
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -2892,7 +2892,7 @@
   local.get $buffer
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2960,15 +2960,15 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/memory/memory.repeat (type $i32_i32_i32_i32_=>_none) (param $dst i32) (param $src i32) (param $srcLength i32) (param $count i32)
+ (func $~lib/memory/memory.repeat (param $dst i32) (param $src i32) (param $srcLength i32) (param $count i32)
   (local $index i32)
   (local $total i32)
   i32.const 0
@@ -2996,7 +2996,7 @@
    end
   end
  )
- (func $~lib/util/string/isSpace (type $i32_=>_i32) (param $c i32) (result i32)
+ (func $~lib/util/string/isSpace (param $c i32) (result i32)
   (local $1 i32)
   local.get $c
   i32.const 5760
@@ -3083,7 +3083,7 @@
   i32.const 0
   return
  )
- (func $~lib/math/ipow32 (type $i32_i32_=>_i32) (param $x i32) (param $e i32) (result i32)
+ (func $~lib/math/ipow32 (param $x i32) (param $e i32) (result i32)
   (local $out i32)
   (local $log i32)
   (local $4 i32)
@@ -3301,7 +3301,7 @@
   local.get $out
   return
  )
- (func $~lib/math/NativeMath.scalbn (type $f64_i32_=>_f64) (param $x f64) (param $n i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (param $x f64) (param $n i32) (result f64)
   (local $y f64)
   (local $3 i32)
   (local $4 i32)
@@ -3395,7 +3395,7 @@
   f64.mul
   return
  )
- (func $~lib/object/Object.is<f64> (type $f64_f64_=>_i32) (param $x f64) (param $y f64) (result i32)
+ (func $~lib/object/Object.is<f64> (param $x f64) (param $y f64) (result i32)
   i32.const 1
   drop
   i32.const 8
@@ -3417,11 +3417,11 @@
   i32.or
   return
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -3467,28 +3467,28 @@
   local.get $newPtr
   return
  )
- (func $~lib/array/Array<~lib/string/String>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>#set:length_ (type $i32_i32_=>_none) (param $this i32) (param $length_ i32)
+ (func $~lib/array/Array<~lib/string/String>#set:length_ (param $this i32) (param $length_ i32)
   local.get $this
   local.get $length_
   i32.store $0 offset=12
  )
- (func $~lib/array/Array<~lib/string/String>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -3543,7 +3543,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -3683,7 +3683,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -3730,7 +3730,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -3807,7 +3807,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -3898,7 +3898,7 @@
    end
   end
  )
- (func $~lib/util/number/decimalCount64High (type $i64_=>_i32) (param $value i64) (result i32)
+ (func $~lib/util/number/decimalCount64High (param $value i64) (result i32)
   local.get $value
   i64.const 1000000000000000
   i64.lt_u
@@ -3957,7 +3957,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $buffer i32) (param $num i64) (param $offset i32)
   (local $t i64)
   (local $r i32)
   (local $b i32)
@@ -4077,7 +4077,7 @@
   local.get $offset
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -4578,7 +4578,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -4916,7 +4916,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -5393,7 +5393,7 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -5439,11 +5439,11 @@
   i32.const 0
   drop
  )
- (func $std/string/getString (type $none_=>_i32) (result i32)
+ (func $std/string/getString (result i32)
   global.get $std/string/str
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/string/str
   local.tee $1
@@ -5478,7 +5478,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -5492,14 +5492,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5507,11 +5507,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/array/Array<~lib/string/String>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -5519,7 +5519,7 @@
   local.get $1
   call $~lib/array/Array<~lib/string/String>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/array/Array<~lib/string/String>
     block $~lib/array/Array<i32>
@@ -5556,10 +5556,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -5572,7 +5572,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5668,7 +5668,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String#charCodeAt (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#charCodeAt (param $this i32) (param $pos i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5711,7 +5711,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String#codePointAt (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#codePointAt (param $this i32) (param $pos i32) (result i32)
   (local $len i32)
   (local $first i32)
   (local $second i32)
@@ -5817,7 +5817,7 @@
   local.get $5
   return
  )
- (func $~lib/string/String#at (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#at (param $this i32) (param $pos i32) (result i32)
   (local $len i32)
   (local $out i32)
   (local $4 i32)
@@ -5878,7 +5878,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#charAt (type $i32_i32_=>_i32) (param $this i32) (param $pos i32) (result i32)
+ (func $~lib/string/String#charAt (param $this i32) (param $pos i32) (result i32)
   (local $out i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5931,7 +5931,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String.__not (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/string/String.__not (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5964,7 +5964,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -5989,7 +5989,7 @@
   local.get $1
   return
  )
- (func $~lib/string/String.fromCharCodes (type $i32_=>_i32) (param $units i32) (result i32)
+ (func $~lib/string/String.fromCharCodes (param $units i32) (result i32)
   (local $length i32)
   (local $out i32)
   (local $ptr i32)
@@ -6062,7 +6062,7 @@
   local.get $5
   return
  )
- (func $~lib/string/String#startsWith (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#startsWith (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -6151,7 +6151,7 @@
   local.get $10
   return
  )
- (func $~lib/string/String#endsWith (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $end i32) (result i32)
+ (func $~lib/string/String#endsWith (param $this i32) (param $search i32) (param $end i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -6239,7 +6239,7 @@
   local.get $9
   return
  )
- (func $~lib/string/String#endsWith@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $end i32) (result i32)
+ (func $~lib/string/String#endsWith@varargs (param $this i32) (param $search i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -6283,7 +6283,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#indexOf (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $searchLen i32)
   (local $len i32)
   (local $5 i32)
@@ -6408,7 +6408,7 @@
   local.get $10
   return
  )
- (func $~lib/string/String#includes (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#includes (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -6442,7 +6442,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String#padStart (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $pad i32) (result i32)
+ (func $~lib/string/String#padStart (param $this i32) (param $length i32) (param $pad i32) (result i32)
   (local $thisSize i32)
   (local $targetSize i32)
   (local $padSize i32)
@@ -6563,7 +6563,7 @@
   local.get $11
   return
  )
- (func $~lib/string/String#padEnd (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $pad i32) (result i32)
+ (func $~lib/string/String#padEnd (param $this i32) (param $length i32) (param $pad i32) (result i32)
   (local $thisSize i32)
   (local $targetSize i32)
   (local $padSize i32)
@@ -6688,7 +6688,7 @@
   local.get $11
   return
  )
- (func $~lib/string/String#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#lastIndexOf (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $searchLen i32)
   (local $len i32)
   (local $5 i32)
@@ -6817,7 +6817,7 @@
   local.get $10
   return
  )
- (func $~lib/string/String#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $start i32) (result i32)
+ (func $~lib/string/String#lastIndexOf@varargs (param $this i32) (param $search i32) (param $start i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -6861,7 +6861,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#localeCompare (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#localeCompare (param $this i32) (param $other i32) (result i32)
   (local $alen i32)
   (local $blen i32)
   (local $4 i32)
@@ -6953,7 +6953,7 @@
   local.get $7
   return
  )
- (func $~lib/string/String#trimStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#trimStart (param $this i32) (result i32)
   (local $size i32)
   (local $offset i32)
   (local $out i32)
@@ -7048,7 +7048,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#trimEnd (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#trimEnd (param $this i32) (result i32)
   (local $originalSize i32)
   (local $size i32)
   (local $out i32)
@@ -7138,7 +7138,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#trim (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#trim (param $this i32) (result i32)
   (local $len i32)
   (local $size i32)
   (local $offset i32)
@@ -7266,7 +7266,7 @@
   local.get $5
   return
  )
- (func $~lib/util/string/strtob (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/util/string/strtob (param $str i32) (result i32)
   (local $size i32)
   (local $offset i32)
   (local $3 i32)
@@ -7373,7 +7373,7 @@
   local.get $3
   return
  )
- (func $~lib/util/string/strtol<f64> (type $i32_i32_=>_f64) (param $str i32) (param $radix i32) (result f64)
+ (func $~lib/util/string/strtol<f64> (param $str i32) (param $radix i32) (result f64)
   (local $len i32)
   (local $ptr i32)
   (local $code i32)
@@ -7727,7 +7727,7 @@
   local.get $11
   return
  )
- (func $~lib/string/parseInt (type $i32_i32_=>_f64) (param $str i32) (param $radix i32) (result f64)
+ (func $~lib/string/parseInt (param $str i32) (param $radix i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -7754,7 +7754,7 @@
   local.get $3
   return
  )
- (func $~lib/util/string/strtod (type $i32_=>_f64) (param $str i32) (result f64)
+ (func $~lib/util/string/strtod (param $str i32) (result f64)
   (local $len i32)
   (local $ptr i32)
   (local $code i32)
@@ -8807,7 +8807,7 @@
   local.get $56
   return
  )
- (func $~lib/number/F32.parseFloat (type $i32_=>_f32) (param $value i32) (result f32)
+ (func $~lib/number/F32.parseFloat (param $value i32) (result f32)
   (local $1 i32)
   (local $2 f32)
   global.get $~lib/memory/__stack_pointer
@@ -8834,7 +8834,7 @@
   local.get $2
   return
  )
- (func $~lib/number/F64.parseFloat (type $i32_=>_f64) (param $value i32) (result f64)
+ (func $~lib/number/F64.parseFloat (param $value i32) (result f64)
   (local $1 i32)
   (local $2 f64)
   global.get $~lib/memory/__stack_pointer
@@ -8860,7 +8860,7 @@
   local.get $2
   return
  )
- (func $~lib/util/string/strtol<i32> (type $i32_i32_=>_i32) (param $str i32) (param $radix i32) (result i32)
+ (func $~lib/util/string/strtol<i32> (param $str i32) (param $radix i32) (result i32)
   (local $len i32)
   (local $ptr i32)
   (local $code i32)
@@ -9211,7 +9211,7 @@
   local.get $10
   return
  )
- (func $~lib/number/I32.parseInt (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32.parseInt (param $value i32) (param $radix i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9237,7 +9237,7 @@
   local.get $2
   return
  )
- (func $~lib/util/string/strtol<i64> (type $i32_i32_=>_i64) (param $str i32) (param $radix i32) (result i64)
+ (func $~lib/util/string/strtol<i64> (param $str i32) (param $radix i32) (result i64)
   (local $len i32)
   (local $ptr i32)
   (local $code i32)
@@ -9591,7 +9591,7 @@
   local.get $11
   return
  )
- (func $~lib/number/I64.parseInt (type $i32_i32_=>_i64) (param $value i32) (param $radix i32) (result i64)
+ (func $~lib/number/I64.parseInt (param $value i32) (param $radix i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -9618,7 +9618,7 @@
   local.get $3
   return
  )
- (func $~lib/string/parseFloat (type $i32_=>_f64) (param $str i32) (result f64)
+ (func $~lib/string/parseFloat (param $str i32) (result f64)
   (local $1 i32)
   (local $2 f64)
   global.get $~lib/memory/__stack_pointer
@@ -9644,7 +9644,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -9720,7 +9720,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9751,7 +9751,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String.__ne (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__ne (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9783,7 +9783,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String.__gt (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__gt (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $rightLength i32)
   (local $4 i32)
@@ -9893,7 +9893,7 @@
   local.get $7
   return
  )
- (func $~lib/string/String.__lt (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__lt (param $left i32) (param $right i32) (result i32)
   (local $rightLength i32)
   (local $leftLength i32)
   (local $4 i32)
@@ -10003,7 +10003,7 @@
   local.get $7
   return
  )
- (func $~lib/string/String.__gte (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__gte (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -10035,7 +10035,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String.__lte (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__lte (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -10067,7 +10067,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String#repeat (type $i32_i32_=>_i32) (param $this i32) (param $count i32) (result i32)
+ (func $~lib/string/String#repeat (param $this i32) (param $count i32) (result i32)
   (local $length i32)
   (local $out i32)
   (local $4 i32)
@@ -10169,7 +10169,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#replace (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $replacement i32) (result i32)
+ (func $~lib/string/String#replace (param $this i32) (param $search i32) (param $replacement i32) (result i32)
   (local $len i32)
   (local $slen i32)
   (local $index i32)
@@ -10339,7 +10339,7 @@
   local.get $9
   return
  )
- (func $~lib/string/String#replaceAll (type $i32_i32_i32_=>_i32) (param $this i32) (param $search i32) (param $replacement i32) (result i32)
+ (func $~lib/string/String#replaceAll (param $this i32) (param $search i32) (param $replacement i32) (result i32)
   (local $thisLen i32)
   (local $searchLen i32)
   (local $replaceLen i32)
@@ -10766,7 +10766,7 @@
   local.get $19
   return
  )
- (func $~lib/string/String#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#slice (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -10888,7 +10888,7 @@
   local.get $13
   return
  )
- (func $~lib/string/String#slice@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#slice@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10927,7 +10927,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#substr (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $length i32) (result i32)
+ (func $~lib/string/String#substr (param $this i32) (param $start i32) (param $length i32) (result i32)
   (local $intStart i32)
   (local $end i32)
   (local $len i32)
@@ -11032,7 +11032,7 @@
   local.get $14
   return
  )
- (func $~lib/string/String#substr@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $length i32) (result i32)
+ (func $~lib/string/String#substr@varargs (param $this i32) (param $start i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11071,7 +11071,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -11220,7 +11220,7 @@
   local.get $22
   return
  )
- (func $~lib/string/String#substring@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring@varargs (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11259,7 +11259,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_i32_i32_=>_none) (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
+ (func $~lib/array/ensureCapacity (param $array i32) (param $newSize i32) (param $alignLog2 i32) (param $canGrow i32)
   (local $oldCapacity i32)
   (local $oldData i32)
   (local $6 i32)
@@ -11378,7 +11378,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/array/Array<~lib/string/String>#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11451,7 +11451,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#push (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#push (param $this i32) (param $value i32) (result i32)
   (local $oldLen i32)
   (local $len i32)
   (local $4 i32)
@@ -11516,7 +11516,7 @@
   local.get $4
   return
  )
- (func $~lib/string/String#split (type $i32_i32_i32_=>_i32) (param $this i32) (param $separator i32) (param $limit i32) (result i32)
+ (func $~lib/string/String#split (param $this i32) (param $separator i32) (param $limit i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $length i32)
@@ -11940,7 +11940,7 @@
   local.get $22
   return
  )
- (func $~lib/string/String#split@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $separator i32) (param $limit i32) (result i32)
+ (func $~lib/string/String#split@varargs (param $this i32) (param $separator i32) (param $limit i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -11986,7 +11986,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/array/Array<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12011,7 +12011,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12078,7 +12078,7 @@
   local.get $3
   return
  )
- (func $start:std/string (type $none_=>_none)
+ (func $start:std/string
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -28423,7 +28423,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -28449,7 +28449,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -28519,7 +28519,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String.fromCharCode (type $i32_i32_=>_i32) (param $unit i32) (param $surr i32) (result i32)
+ (func $~lib/string/String.fromCharCode (param $unit i32) (param $surr i32) (result i32)
   (local $hasSur i32)
   (local $out i32)
   (local $4 i32)
@@ -28561,7 +28561,7 @@
   local.get $4
   return
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -28614,7 +28614,7 @@
   local.get $7
   return
  )
- (func $~lib/string/String.fromCodePoint (type $i32_=>_i32) (param $code i32) (result i32)
+ (func $~lib/string/String.fromCodePoint (param $code i32) (result i32)
   (local $hasSur i32)
   (local $out i32)
   (local $hi i32)
@@ -28692,7 +28692,7 @@
   local.get $5
   return
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -28874,7 +28874,7 @@
   local.get $14
   return
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $value i32) (param $radix i32) (result i32)
   (local $out i32)
   (local $decimals i32)
   (local $buffer i32)
@@ -29021,7 +29021,7 @@
   local.get $12
   return
  )
- (func $~lib/util/number/utoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa64 (param $value i64) (param $radix i32) (result i32)
   (local $out i32)
   (local $val32 i32)
   (local $decimals i32)
@@ -29208,7 +29208,7 @@
   local.get $17
   return
  )
- (func $~lib/util/number/itoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa64 (param $value i64) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $val32 i32)
@@ -29432,7 +29432,7 @@
   local.get $18
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
diff --git a/tests/compiler/std/string.release.wat b/tests/compiler/std/string.release.wat
index 003faf7104..038fc87bde 100644
--- a/tests/compiler/std/string.release.wat
+++ b/tests/compiler/std/string.release.wat
@@ -1,23 +1,23 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_=>_f64 (func_subtype (param i32) (result f64) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $f64_i32_=>_f64 (func_subtype (param f64 i32) (result f64) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i64_i32_i64_i32_=>_i32 (func_subtype (param i64 i64 i32 i64 i32) (result i32) func))
- (type $none_=>_i64 (func_subtype (result i64) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $f64_i32_=>_f64 (func (param f64 i32) (result f64)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i64_i32_i64_i32_=>_i32 (func (param i64 i64 i32 i64 i32) (result i32)))
+ (type $none_=>_i64 (func (result i64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $std/string/str (mut i32) (i32.const 1056))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -973,7 +973,7 @@
  (export "getString" (func $std/string/getString))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   local.get $0
   local.get $1
@@ -1052,7 +1052,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $std/string/str
@@ -1111,7 +1111,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1243,7 +1243,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1396,7 +1396,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1642,7 +1642,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -1754,7 +1754,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1833,7 +1833,7 @@
   i32.const 59216
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -2100,7 +2100,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2226,7 +2226,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2532,7 +2532,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/string/String.fromCharCode@varargs (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.fromCharCode@varargs (param $0 i32) (result i32)
   (local $1 i32)
   block $1of1
    block $0of1
@@ -2551,7 +2551,7 @@
   local.get $1
   call $~lib/string/String.fromCharCode
  )
- (func $~lib/math/ipow32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/math/ipow32 (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   i32.const 5
@@ -2705,7 +2705,7 @@
   end
   local.get $2
  )
- (func $~lib/math/NativeMath.scalbn (type $f64_i32_=>_f64) (param $0 f64) (param $1 i32) (result f64)
+ (func $~lib/math/NativeMath.scalbn (param $0 f64) (param $1 i32) (result f64)
   local.get $1
   i32.const 1023
   i32.gt_s
@@ -2782,7 +2782,7 @@
   f64.reinterpret_i64
   f64.mul
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2820,7 +2820,7 @@
   memory.copy $0 $0
   local.get $2
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -2924,7 +2924,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32) (param $3 i32)
+ (func $~lib/util/number/utoa64_any_core (param $0 i32) (param $1 i64) (param $2 i32) (param $3 i32)
   (local $4 i64)
   (local $5 i64)
   local.get $3
@@ -3005,7 +3005,7 @@
    end
   end
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   loop $while-continue|0
@@ -3093,7 +3093,7 @@
   local.get $2
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/genDigits (type $i64_i64_i32_i64_i32_=>_i32) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i64)
@@ -3517,7 +3517,7 @@
   i32.store16 $0
   local.get $4
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   local.get $2
@@ -3845,7 +3845,7 @@
    end
   end
  )
- (func $~lib/util/number/dtoa_core (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $0 f64) (result i32)
   (local $1 i64)
   (local $2 i32)
   (local $3 i64)
@@ -4123,10 +4123,10 @@
   local.get $2
   i32.add
  )
- (func $std/string/getString (type $none_=>_i32) (result i32)
+ (func $std/string/getString (result i32)
   global.get $std/string/str
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -4246,10 +4246,10 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/string
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4338,7 +4338,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4404,7 +4404,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String#charAt (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#charAt (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4464,7 +4464,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.__not (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.__not (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4505,7 +4505,7 @@
   local.get $0
   i32.eqz
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4538,7 +4538,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.fromCharCodes (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.fromCharCodes (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -4613,7 +4613,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4730,7 +4730,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/string/String#padStart (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#padStart (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4858,7 +4858,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $7
  )
- (func $~lib/string/String#padEnd (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#padEnd (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -4993,7 +4993,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $6
  )
- (func $~lib/string/String#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5119,7 +5119,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const -1
  )
- (func $~lib/string/String#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -5171,7 +5171,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#localeCompare (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#localeCompare (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -5260,7 +5260,7 @@
   i32.lt_s
   i32.sub
  )
- (func $~lib/string/String#trimStart (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#trimStart (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -5417,7 +5417,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#trimEnd (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#trimEnd (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -5571,7 +5571,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String#trim (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String#trim (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -5822,7 +5822,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/string/strtob (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/string/strtob (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -6060,7 +6060,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/string/strtol<f64> (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/util/string/strtol<f64> (param $0 i32) (param $1 i32) (result f64)
   (local $2 i32)
   (local $3 i32)
   (local $4 f64)
@@ -6410,7 +6410,7 @@
   global.set $~lib/memory/__stack_pointer
   f64.const nan:0x8000000000000
  )
- (func $~lib/string/parseInt (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/string/parseInt (param $0 i32) (param $1 i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -6445,7 +6445,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/string/strtod (type $i32_=>_f64) (param $0 i32) (result f64)
+ (func $~lib/util/string/strtod (param $0 i32) (result f64)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -7283,7 +7283,7 @@
   f64.const 0
   f64.mul
  )
- (func $~lib/number/F64.parseFloat (type $i32_=>_f64) (param $0 i32) (result f64)
+ (func $~lib/number/F64.parseFloat (param $0 i32) (result f64)
   (local $1 i32)
   (local $2 f64)
   global.get $~lib/memory/__stack_pointer
@@ -7317,7 +7317,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/string/strtol<i32> (type $none_=>_i32) (result i32)
+ (func $~lib/util/string/strtol<i32> (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -7623,7 +7623,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/util/string/strtol<i64> (type $none_=>_i64) (result i64)
+ (func $~lib/util/string/strtol<i64> (result i64)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -7931,7 +7931,7 @@
   global.set $~lib/memory/__stack_pointer
   i64.const 0
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8008,7 +8008,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -8045,7 +8045,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__ne (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__ne (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -8083,7 +8083,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__gt (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__gt (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8179,7 +8179,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__lt (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__lt (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8274,7 +8274,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String.__gte (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__gte (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -8312,7 +8312,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__lte (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__lte (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -8350,7 +8350,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#repeat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#repeat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -8466,7 +8466,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/string/String#replace (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#replace (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -8632,7 +8632,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String#replaceAll (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#replaceAll (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -9008,7 +9008,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#slice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#slice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9118,7 +9118,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#slice@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#slice@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9165,7 +9165,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#substr (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#substr (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -9258,7 +9258,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/string/String#substr@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#substr@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9305,7 +9305,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#substring (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9424,7 +9424,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String#substring@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#substring@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9471,7 +9471,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/ensureCapacity (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/ensureCapacity (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9573,7 +9573,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<~lib/string/String>#push (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<~lib/string/String>#push (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9636,7 +9636,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#split (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/string/String#split (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -10017,7 +10017,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String#split@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#split@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10071,7 +10071,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/array/Array<~lib/string/String>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<~lib/string/String>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -10137,7 +10137,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/string (type $none_=>_none)
+ (func $start:std/string
   (local $0 i32)
   (local $1 i32)
   (local $2 f64)
@@ -24847,7 +24847,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.fromCharCode (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.fromCharCode (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -24895,7 +24895,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -24963,7 +24963,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/string/String.fromCodePoint (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/string/String.fromCodePoint (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -25038,7 +25038,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i32)
@@ -25342,7 +25342,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i64)
@@ -25613,7 +25613,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/number/utoa64 (type $i64_i32_=>_i32) (param $0 i64) (param $1 i32) (result i32)
+ (func $~lib/util/number/utoa64 (param $0 i64) (param $1 i32) (result i32)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -25950,7 +25950,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/number/itoa64 (type $i64_i32_=>_i32) (param $0 i64) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa64 (param $0 i64) (param $1 i32) (result i32)
   (local $2 i64)
   (local $3 i32)
   (local $4 i32)
@@ -26325,7 +26325,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/util/number/dtoa (param $0 f64) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -26407,7 +26407,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -26426,7 +26426,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/symbol.debug.wat b/tests/compiler/std/symbol.debug.wat
index f33223b3f6..b23a88be48 100644
--- a/tests/compiler/std/symbol.debug.wat
+++ b/tests/compiler/std/symbol.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/symbol/nextId (mut i32) (i32.const 12))
  (global $std/symbol/sym1 (mut i32) (i32.const 0))
@@ -85,7 +85,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/symbol/Symbol (type $i32_=>_i32) (param $description i32) (result i32)
+ (func $~lib/symbol/Symbol (param $description i32) (result i32)
   (local $1 i32)
   (local $id i32)
   global.get $~lib/symbol/nextId
@@ -103,17 +103,17 @@
   local.get $id
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -123,11 +123,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -136,14 +136,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -185,7 +185,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -197,11 +197,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -211,7 +211,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -267,15 +267,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -301,7 +301,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -321,7 +321,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -341,7 +341,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -377,7 +377,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -403,7 +403,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -424,11 +424,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -439,39 +439,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -707,7 +707,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1071,7 +1071,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1236,7 +1236,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1381,7 +1381,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1419,7 +1419,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1432,7 +1432,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1449,7 +1449,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1474,7 +1474,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1654,7 +1654,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1712,7 +1712,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1733,7 +1733,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1749,7 +1749,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1957,7 +1957,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2047,7 +2047,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2156,7 +2156,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2220,7 +2220,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2233,17 +2233,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2296,7 +2296,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2364,7 +2364,7 @@
    end
   end
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2373,12 +2373,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2387,26 +2387,26 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2415,23 +2415,23 @@
   i32.shr_u
   return
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2535,42 +2535,42 @@
   i32.const 0
   return
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/map/MapEntry<~lib/string/String,usize>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<~lib/string/String,usize>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:buckets (type $i32_i32_=>_none) (param $this i32) (param $buckets i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:buckets (param $this i32) (param $buckets i32)
   local.get $this
   local.get $buckets
   i32.store $0
@@ -2579,12 +2579,12 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:bucketsMask (type $i32_i32_=>_none) (param $this i32) (param $bucketsMask i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:bucketsMask (param $this i32) (param $bucketsMask i32)
   local.get $this
   local.get $bucketsMask
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:entries (type $i32_i32_=>_none) (param $this i32) (param $entries i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:entries (param $this i32) (param $entries i32)
   local.get $this
   local.get $entries
   i32.store $0 offset=8
@@ -2593,22 +2593,22 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:entriesCapacity (type $i32_i32_=>_none) (param $this i32) (param $entriesCapacity i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:entriesCapacity (param $this i32) (param $entriesCapacity i32)
   local.get $this
   local.get $entriesCapacity
   i32.store $0 offset=12
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:entriesOffset (type $i32_i32_=>_none) (param $this i32) (param $entriesOffset i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:entriesOffset (param $this i32) (param $entriesOffset i32)
   local.get $this
   local.get $entriesOffset
   i32.store $0 offset=16
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set:entriesCount (type $i32_i32_=>_none) (param $this i32) (param $entriesCount i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set:entriesCount (param $this i32) (param $entriesCount i32)
   local.get $this
   local.get $entriesCount
   i32.store $0 offset=20
  )
- (func $~lib/util/hash/HASH<usize> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<usize> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $len i32)
   (local $h i32)
@@ -2676,58 +2676,58 @@
   end
   return
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:buckets (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:buckets (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:bucketsMask (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:bucketsMask (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#get:taggedNext (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#get:taggedNext (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0 offset=4
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:entriesOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:entriesOffset (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:entriesCapacity (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:entriesCapacity (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:entriesCount (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:entriesCount (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=20
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get:entries (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get:entries (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/map/MapEntry<usize,~lib/string/String>#set:taggedNext (type $i32_i32_=>_none) (param $this i32) (param $taggedNext i32)
+ (func $~lib/map/MapEntry<usize,~lib/string/String>#set:taggedNext (param $this i32) (param $taggedNext i32)
   local.get $this
   local.get $taggedNext
   i32.store $0 offset=8
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $~lib/symbol/stringToId
   local.tee $1
@@ -2784,7 +2784,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2798,10 +2798,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/map/Map<~lib/string/String,usize>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<~lib/string/String,usize>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2809,7 +2809,7 @@
   local.get $1
   call $~lib/map/Map<~lib/string/String,usize>#__visit
  )
- (func $~lib/map/Map<usize,~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<usize,~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2817,7 +2817,7 @@
   local.get $1
   call $~lib/map/Map<usize,~lib/string/String>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/map/Map<usize,~lib/string/String>
     block $~lib/map/Map<~lib/string/String,usize>
@@ -2854,7 +2854,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2863,7 +2863,7 @@
   global.set $~started
   call $start:std/symbol
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2876,7 +2876,7 @@
    unreachable
   end
  )
- (func $~lib/map/Map<~lib/string/String,usize>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -2978,7 +2978,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/hash/HASH<~lib/string/String> (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/util/hash/HASH<~lib/string/String> (param $key i32) (result i32)
   (local $key|1 i32)
   (local $h i32)
   (local $len i32)
@@ -3267,7 +3267,7 @@
   local.get $19
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3363,7 +3363,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<~lib/string/String,usize>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -3452,7 +3452,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<~lib/string/String,usize>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -3495,7 +3495,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<~lib/string/String,usize>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3550,7 +3550,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<~lib/string/String,usize>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -3761,7 +3761,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -3982,7 +3982,7 @@
   local.get $8
   return
  )
- (func $~lib/map/Map<usize,~lib/string/String>#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4084,7 +4084,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/map/Map<usize,~lib/string/String>#find (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#find (param $this i32) (param $key i32) (param $hashCode i32) (result i32)
   (local $entry i32)
   (local $taggedNext i32)
   (local $5 i32)
@@ -4163,7 +4163,7 @@
   local.get $5
   return
  )
- (func $~lib/map/Map<usize,~lib/string/String>#rehash (type $i32_i32_=>_none) (param $this i32) (param $newBucketsMask i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#rehash (param $this i32) (param $newBucketsMask i32)
   (local $newBucketsCapacity i32)
   (local $newBuckets i32)
   (local $newEntriesCapacity i32)
@@ -4369,7 +4369,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $value i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set (param $this i32) (param $key i32) (param $value i32) (result i32)
   (local $hashCode i32)
   (local $entry i32)
   (local $entries i32)
@@ -4589,7 +4589,7 @@
   local.get $8
   return
  )
- (func $~lib/symbol/_Symbol.for (type $i32_=>_i32) (param $key i32) (result i32)
+ (func $~lib/symbol/_Symbol.for (param $key i32) (result i32)
   (local $1 i32)
   (local $id i32)
   (local $3 i32)
@@ -4690,7 +4690,7 @@
   local.get $3
   return
  )
- (func $~lib/map/Map<usize,~lib/string/String>#has (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#has (param $this i32) (param $key i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4720,7 +4720,7 @@
   local.get $2
   return
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get (type $i32_i32_=>_i32) (param $this i32) (param $key i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get (param $this i32) (param $key i32) (result i32)
   (local $entry i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4762,7 +4762,7 @@
   local.get $3
   return
  )
- (func $~lib/symbol/_Symbol.keyFor (type $i32_=>_i32) (param $sym i32) (result i32)
+ (func $~lib/symbol/_Symbol.keyFor (param $sym i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -4800,7 +4800,7 @@
   local.get $1
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -4876,7 +4876,7 @@
   local.get $6
   return
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4907,7 +4907,7 @@
   local.get $2
   return
  )
- (func $~lib/symbol/_Symbol#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/symbol/_Symbol#toString (param $this i32) (result i32)
   (local $id i32)
   (local $str i32)
   (local $3 i32)
@@ -5117,7 +5117,7 @@
   local.get $4
   return
  )
- (func $start:std/symbol (type $none_=>_none)
+ (func $start:std/symbol
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -5435,7 +5435,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<~lib/string/String,usize>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $cur i32)
   (local $end i32)
@@ -5530,7 +5530,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/map/Map<usize,~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $entries i32)
   (local $cur i32)
   (local $end i32)
@@ -5625,7 +5625,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/symbol.release.wat b/tests/compiler/std/symbol.release.wat
index bc62a62629..5731d5a3f8 100644
--- a/tests/compiler/std/symbol.release.wat
+++ b/tests/compiler/std/symbol.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/symbol/nextId (mut i32) (i32.const 12))
  (global $std/symbol/sym1 (mut i32) (i32.const 0))
@@ -97,7 +97,7 @@
  (data (i32.const 2720) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\10\01\82\00\10A\02")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/symbol/stringToId
@@ -182,7 +182,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -314,7 +314,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -467,7 +467,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -713,7 +713,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -825,7 +825,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -904,7 +904,7 @@
   i32.const 35520
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1171,7 +1171,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1297,7 +1297,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1603,7 +1603,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1792,7 +1792,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -1801,7 +1801,7 @@
   global.set $~started
   call $start:std/symbol
  )
- (func $~lib/util/hash/HASH<~lib/string/String> (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/hash/HASH<~lib/string/String> (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -2025,7 +2025,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2185,7 +2185,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<~lib/string/String,usize>#find (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#find (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2271,7 +2271,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<~lib/string/String,usize>#set (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<~lib/string/String,usize>#set (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2636,7 +2636,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/map/Map<usize,~lib/string/String>#find (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#find (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2714,7 +2714,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/map/Map<usize,~lib/string/String>#set (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#set (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3128,7 +3128,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/symbol/_Symbol.for (type $none_=>_i32) (result i32)
+ (func $~lib/symbol/_Symbol.for (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3294,7 +3294,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<usize,~lib/string/String>#has (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#has (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3358,7 +3358,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/map/Map<usize,~lib/string/String>#get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/map/Map<usize,~lib/string/String>#get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3432,7 +3432,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/symbol/_Symbol.keyFor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/symbol/_Symbol.keyFor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3478,7 +3478,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3583,7 +3583,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/symbol/_Symbol#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/symbol/_Symbol#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3759,7 +3759,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/symbol (type $none_=>_none)
+ (func $start:std/symbol
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4280,7 +4280,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -4322,7 +4322,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -4341,7 +4341,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/std/trace.debug.wat b/tests/compiler/std/trace.debug.wat
index 4576313547..01bf8a9999 100644
--- a/tests/compiler/std/trace.debug.wat
+++ b/tests/compiler/std/trace.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 396))
@@ -21,7 +21,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -30,7 +30,7 @@
   global.set $~started
   call $start:std/trace
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -43,7 +43,7 @@
    unreachable
   end
  )
- (func $start:std/trace (type $none_=>_none)
+ (func $start:std/trace
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/std/trace.release.wat b/tests/compiler/std/trace.release.wat
index 9df1cadfca..de07b9d2df 100644
--- a/tests/compiler/std/trace.release.wat
+++ b/tests/compiler/std/trace.release.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34188))
@@ -25,7 +25,7 @@
  (data (i32.const 1384) "\02\00\00\00\10\00\00\00f\00i\00v\00e\00_\00d\00b\00l")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~started
   if
diff --git a/tests/compiler/std/typedarray.debug.wat b/tests/compiler/std/typedarray.debug.wat
index a08a189ab2..73cae226a4 100644
--- a/tests/compiler/std/typedarray.debug.wat
+++ b/tests/compiler/std/typedarray.debug.wat
@@ -1,55 +1,55 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i64_i32_i32_=>_i32 (func_subtype (param i64 i32 i32) (result i32) func))
- (type $i64_i64_=>_i32 (func_subtype (param i64 i64) (result i32) func))
- (type $f32_i32_i32_=>_i32 (func_subtype (param f32 i32 i32) (result i32) func))
- (type $f64_i32_i32_=>_i32 (func_subtype (param f64 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i64_i64_i32_i32_=>_i64 (func_subtype (param i64 i64 i32 i32) (result i64) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $f32_f32_i32_i32_=>_f32 (func_subtype (param f32 f32 i32 i32) (result f32) func))
- (type $f64_f64_i32_i32_=>_f64 (func_subtype (param f64 f64 i32 i32) (result f64) func))
- (type $i64_i32_i32_=>_i64 (func_subtype (param i64 i32 i32) (result i64) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_i32_i64_=>_i64 (func_subtype (param i32 i32 i64) (result i64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i64_i32_i32_=>_none (func_subtype (param i64 i32 i32) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $f32_i32_i32_=>_f32 (func_subtype (param f32 i32 i32) (result f32) func))
- (type $f64_i32_i32_=>_f64 (func_subtype (param f64 i32 i32) (result f64) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $i32_i32_f32_=>_f32 (func_subtype (param i32 i32 f32) (result f32) func))
- (type $i32_i32_f64_=>_f64 (func_subtype (param i32 i32 f64) (result f64) func))
- (type $f32_i32_i32_=>_none (func_subtype (param f32 i32 i32) func))
- (type $f64_i32_i32_=>_none (func_subtype (param f64 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $f32_f32_=>_f32 (func_subtype (param f32 f32) (result f32) func))
- (type $f64_f64_=>_f64 (func_subtype (param f64 f64) (result f64) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i64_=>_i32 (func_subtype (param i64) (result i32) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $i32_i32_f64_=>_none (func_subtype (param i32 i32 f64) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i64_i32_i32_=>_i32 (func (param i64 i32 i32) (result i32)))
+ (type $i64_i64_=>_i32 (func (param i64 i64) (result i32)))
+ (type $f32_i32_i32_=>_i32 (func (param f32 i32 i32) (result i32)))
+ (type $f64_i32_i32_=>_i32 (func (param f64 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i64_i64_i32_i32_=>_i64 (func (param i64 i64 i32 i32) (result i64)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $f32_f32_i32_i32_=>_f32 (func (param f32 f32 i32 i32) (result f32)))
+ (type $f64_f64_i32_i32_=>_f64 (func (param f64 f64 i32 i32) (result f64)))
+ (type $i64_i32_i32_=>_i64 (func (param i64 i32 i32) (result i64)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_i32_i64_=>_i64 (func (param i32 i32 i64) (result i64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i64_i32_i32_=>_none (func (param i64 i32 i32)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $f32_i32_i32_=>_f32 (func (param f32 i32 i32) (result f32)))
+ (type $f64_i32_i32_=>_f64 (func (param f64 i32 i32) (result f64)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $i32_i32_f32_=>_f32 (func (param i32 i32 f32) (result f32)))
+ (type $i32_i32_f64_=>_f64 (func (param i32 i32 f64) (result f64)))
+ (type $f32_i32_i32_=>_none (func (param f32 i32 i32)))
+ (type $f64_i32_i32_=>_none (func (param f64 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $f32_f32_=>_f32 (func (param f32 f32) (result f32)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i64_=>_i32 (func (param i64) (result i32)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $i32_i32_f64_=>_none (func (param i32 i32 f64)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (global $~lib/typedarray/Int8Array.BYTES_PER_ELEMENT i32 (i32.const 1))
@@ -412,17 +412,17 @@
  (elem $0 (i32.const 1) $~lib/util/sort/COMPARATOR<f64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testReduceRight<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 $~lib/util/sort/COMPARATOR<i8>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 $~lib/util/sort/COMPARATOR<u8>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 $~lib/util/sort/COMPARATOR<u8>~anonymous|1 $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 $~lib/util/sort/COMPARATOR<i16>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 $~lib/util/sort/COMPARATOR<u16>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 $~lib/util/sort/COMPARATOR<u32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 $~lib/util/sort/COMPARATOR<i64>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 $~lib/util/sort/COMPARATOR<u64>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 $~lib/util/sort/COMPARATOR<f32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -432,11 +432,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -445,14 +445,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -494,7 +494,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -506,11 +506,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -520,7 +520,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -576,15 +576,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -610,7 +610,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -630,7 +630,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -650,7 +650,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -686,7 +686,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -712,7 +712,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -733,11 +733,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -748,39 +748,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1016,7 +1016,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1380,7 +1380,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1545,7 +1545,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1690,7 +1690,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1728,7 +1728,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1741,7 +1741,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1758,7 +1758,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1783,7 +1783,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1963,7 +1963,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2021,7 +2021,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2042,7 +2042,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2058,7 +2058,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2266,7 +2266,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2356,7 +2356,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2465,7 +2465,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2529,7 +2529,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2542,17 +2542,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2605,7 +2605,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2673,7 +2673,7 @@
    end
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:buffer (type $i32_i32_=>_none) (param $this i32) (param $buffer i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:buffer (param $this i32) (param $buffer i32)
   local.get $this
   local.get $buffer
   i32.store $0
@@ -2682,29 +2682,29 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (type $i32_i32_=>_none) (param $this i32) (param $dataStart i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:dataStart (param $this i32) (param $dataStart i32)
   local.get $this
   local.get $dataStart
   i32.store $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (type $i32_i32_=>_none) (param $this i32) (param $byteLength i32)
+ (func $~lib/arraybuffer/ArrayBufferView#set:byteLength (param $this i32) (param $byteLength i32)
   local.get $this
   local.get $byteLength
   i32.store $0 offset=8
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/util/sort/insertionSort<f64> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<f64> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a f64)
@@ -2885,7 +2885,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f64> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f64> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp f64)
@@ -3040,7 +3040,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/nodePower (type $i32_i32_i32_i32_i32_=>_i32) (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
+ (func $~lib/util/sort/nodePower (param $left i32) (param $right i32) (param $startA i32) (param $startB i32) (param $endB i32) (result i32)
   (local $n i64)
   (local $s i32)
   (local $l i32)
@@ -3091,7 +3091,7 @@
   i32.clz
   return
  )
- (func $~lib/util/sort/mergeRuns<f64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<f64> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -3229,7 +3229,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (type $f64_f64_=>_i32) (param $a f64) (param $b f64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (param $a f64) (param $b f64) (result i32)
   (local $ia i64)
   (local $ib i64)
   local.get $a
@@ -3263,7 +3263,7 @@
   i32.sub
   return
  )
- (func $~lib/util/bytes/FILL<u8> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<u8> (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -3340,7 +3340,7 @@
    memory.fill $0
   end
  )
- (func $~lib/rt/__newBuffer (type $i32_i32_i32_=>_i32) (param $size i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newBuffer (param $size i32) (param $id i32) (param $data i32) (result i32)
   (local $buffer i32)
   local.get $size
   local.get $id
@@ -3356,15 +3356,15 @@
   local.get $buffer
   return
  )
- (func $~lib/array/Array<i8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/bytes/FILL<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
+ (func $~lib/util/bytes/FILL<u32> (param $ptr i32) (param $len i32) (param $value i32) (param $start i32) (param $end i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -3480,190 +3480,190 @@
    end
   end
  )
- (func $~lib/array/Array<i32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i64_i32_i32_=>_i64) (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
   local.get $acc
   local.get $val
   i64.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i64_i32_i32_=>_i64) (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
   local.get $acc
   local.get $val
   i64.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_f32_i32_i32_=>_f32) (param $acc f32) (param $val f32) (param $$2 i32) (param $$3 i32) (result f32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $acc f32) (param $val f32) (param $$2 i32) (param $$3 i32) (result f32)
   local.get $acc
   local.get $val
   f32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_f64_i32_i32_=>_f64) (param $acc f64) (param $val f64) (param $$2 i32) (param $$3 i32) (result f64)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $acc f64) (param $val f64) (param $$2 i32) (param $$3 i32) (result f64)
   local.get $acc
   local.get $val
   f64.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $acc i32) (param $val i32) (param $$2 i32) (param $$3 i32) (result i32)
   local.get $acc
   local.get $val
   i32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i64_i32_i32_=>_i64) (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
   local.get $acc
   local.get $val
   i64.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i64_i32_i32_=>_i64) (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $acc i64) (param $val i64) (param $$2 i32) (param $$3 i32) (result i64)
   local.get $acc
   local.get $val
   i64.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_f32_i32_i32_=>_f32) (param $acc f32) (param $val f32) (param $$2 i32) (param $$3 i32) (result f32)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $acc f32) (param $val f32) (param $$2 i32) (param $$3 i32) (result f32)
   local.get $acc
   local.get $val
   f32.add
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_f64_i32_i32_=>_f64) (param $acc f64) (param $val f64) (param $$2 i32) (param $$3 i32) (result f64)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $acc f64) (param $val f64) (param $$2 i32) (param $$3 i32) (result f64)
   local.get $acc
   local.get $val
   f64.add
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   local.get $value
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i64) (param $value i64) (param $$1 i32) (param $$2 i32) (result i64)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i64)
   local.get $value
   local.get $value
   i64.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i64) (param $value i64) (param $$1 i32) (param $$2 i32) (result i64)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i64)
   local.get $value
   local.get $value
   i64.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_f32) (param $value f32) (param $$1 i32) (param $$2 i32) (result f32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result f32)
   local.get $value
   local.get $value
   f32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_f64) (param $value f64) (param $$1 i32) (param $$2 i32) (result f64)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result f64)
   local.get $value
   local.get $value
   f64.mul
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
   i32.gt_s
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -3709,442 +3709,442 @@
   local.get $newPtr
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
   i32.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   f32.gt
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   f64.gt
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 0
   i64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 0
   i64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   f32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 0
   f32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   f64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 0
   f64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 4
   i64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 4
   i64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   f32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 4
   f32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   f64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 4
   f64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 4
   i64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 4
   i64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   f32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 4
   f32.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   f64.eq
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 4
   f64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
@@ -4152,13 +4152,13 @@
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend8_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
@@ -4167,14 +4167,14 @@
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
@@ -4183,14 +4183,14 @@
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
@@ -4198,13 +4198,13 @@
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.extend16_s
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
@@ -4213,62 +4213,62 @@
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 65535
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.rem_s
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.rem_u
   i32.const 0
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>~anonymous|1 (param $value i32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.rem_s
   i64.const 0
   i64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.rem_u
   i64.const 0
   i64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>~anonymous|1 (param $value i64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   i64.const 2
   i64.eq
  )
- (func $~lib/math/NativeMathf.mod (type $f32_f32_=>_f32) (param $x f32) (param $y f32) (result f32)
+ (func $~lib/math/NativeMathf.mod (param $x f32) (param $y f32) (result f32)
   (local $ux i32)
   (local $uy i32)
   (local $ex i32)
@@ -4517,19 +4517,19 @@
   f32.reinterpret_i32
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   call $~lib/math/NativeMathf.mod
   f32.const 0
   f32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $value f32) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f32.const 2
   f32.eq
  )
- (func $~lib/math/NativeMath.mod (type $f64_f64_=>_f64) (param $x f64) (param $y f64) (result f64)
+ (func $~lib/math/NativeMath.mod (param $x f64) (param $y f64) (result f64)
   (local $ux i64)
   (local $uy i64)
   (local $ex i64)
@@ -4784,19 +4784,19 @@
   f64.reinterpret_i64
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   call $~lib/math/NativeMath.mod
   f64.const 0
   f64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $value f64) (param $$1 i32) (param $$2 i32) (result i32)
   local.get $value
   f64.const 2
   f64.eq
  )
- (func $~lib/util/bytes/REVERSE<u8> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u8> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -4960,7 +4960,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<u16> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u16> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -5080,7 +5080,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<u32> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u32> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -5151,7 +5151,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<u64> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<u64> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -5222,7 +5222,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<f32> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<f32> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -5293,7 +5293,7 @@
    end
   end
  )
- (func $~lib/util/bytes/REVERSE<f64> (type $i32_i32_=>_none) (param $ptr i32) (param $len i32)
+ (func $~lib/util/bytes/REVERSE<f64> (param $ptr i32) (param $len i32)
   (local $i i32)
   (local $tail i32)
   (local $hlen i32)
@@ -5364,7 +5364,7 @@
    end
   end
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -5419,7 +5419,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -5559,7 +5559,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -5606,7 +5606,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -5683,7 +5683,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -5774,11 +5774,11 @@
    end
   end
  )
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -5787,7 +5787,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/number/itoa_buffered<i8> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i8> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -5918,7 +5918,7 @@
   i32.add
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -6022,7 +6022,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/number/itoa_buffered<u8> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u8> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6094,7 +6094,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<i16> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i16> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6240,7 +6240,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<u16> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u16> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6312,7 +6312,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<i32> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i32> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6406,7 +6406,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<u32> (type $i32_i32_=>_i32) (param $buffer i32) (param $value i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u32> (param $buffer i32) (param $value i32) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6472,7 +6472,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/decimalCount64High (type $i64_=>_i32) (param $value i64) (result i32)
+ (func $~lib/util/number/decimalCount64High (param $value i64) (result i32)
   local.get $value
   i64.const 1000000000000000
   i64.lt_u
@@ -6531,7 +6531,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $buffer i32) (param $num i64) (param $offset i32)
   (local $t i64)
   (local $r i32)
   (local $b i32)
@@ -6651,7 +6651,7 @@
   local.get $offset
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/itoa_buffered<i64> (type $i32_i64_=>_i32) (param $buffer i32) (param $value i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<i64> (param $buffer i32) (param $value i64) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6777,7 +6777,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/itoa_buffered<u64> (type $i32_i64_=>_i32) (param $buffer i32) (param $value i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<u64> (param $buffer i32) (param $value i64) (result i32)
   (local $sign i32)
   (local $dest i32)
   (local $decimals i32)
@@ -6875,7 +6875,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -7376,7 +7376,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -7714,7 +7714,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -8191,7 +8191,7 @@
   i32.add
   return
  )
- (func $~lib/util/number/dtoa_buffered (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_buffered (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   local.get $value
   f64.const 0
@@ -8264,78 +8264,78 @@
   call $~lib/util/number/dtoa_core
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#get:byteLength (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
   call $~lib/rt/common/OBJECT#get:rtSize
   return
  )
- (func $~lib/array/Array<f32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<f64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<f64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u8>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u8>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u16>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u16>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u32>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u32>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<i64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<i64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/array/Array<u64>#get:length_ (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length_ (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/array/Array<u64>#get:dataStart (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:dataStart (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/util/sort/insertionSort<i8> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i8> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -8516,7 +8516,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i8> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i8> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -8671,7 +8671,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<i8> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i8> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -8809,14 +8809,14 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i8>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i8>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   i32.extend8_s
   local.get $b
   i32.extend8_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   i32.extend8_s
   local.get $a
@@ -8829,7 +8829,7 @@
   i32.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u8> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<u8> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -9010,7 +9010,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u8> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u8> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -9165,7 +9165,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<u8> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<u8> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -9303,7 +9303,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u8>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u8>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   i32.const 255
   i32.and
@@ -9320,7 +9320,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   i32.const 255
   i32.and
@@ -9337,7 +9337,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/util/sort/COMPARATOR<u8>~anonymous|1 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u8>~anonymous|1 (param $a i32) (param $b i32) (result i32)
   local.get $a
   i32.const 255
   i32.and
@@ -9354,7 +9354,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   i32.const 255
   i32.and
@@ -9371,7 +9371,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i16> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i16> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -9552,7 +9552,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i16> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i16> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -9707,7 +9707,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<i16> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i16> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -9845,14 +9845,14 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i16>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i16>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   i32.extend16_s
   local.get $b
   i32.extend16_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   i32.extend16_s
   local.get $a
@@ -9865,7 +9865,7 @@
   i32.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u16> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<u16> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -10046,7 +10046,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u16> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u16> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -10201,7 +10201,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<u16> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<u16> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -10339,7 +10339,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u16>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u16>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   i32.const 65535
   i32.and
@@ -10356,7 +10356,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   i32.const 65535
   i32.and
@@ -10373,7 +10373,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -10554,7 +10554,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -10709,7 +10709,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -10847,12 +10847,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   local.get $a
   i32.gt_s
@@ -10861,7 +10861,7 @@
   i32.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<u32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i32)
@@ -11042,7 +11042,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i32)
@@ -11197,7 +11197,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<u32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<u32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -11335,7 +11335,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $a
   local.get $b
   i32.gt_u
@@ -11344,7 +11344,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $a i32) (param $b i32) (result i32)
   local.get $b
   local.get $a
   i32.gt_u
@@ -11353,7 +11353,7 @@
   i32.lt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i64> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<i64> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i64)
@@ -11534,7 +11534,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i64> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i64> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i64)
@@ -11689,7 +11689,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<i64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<i64> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -11827,7 +11827,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i64>~anonymous|0 (type $i64_i64_=>_i32) (param $a i64) (param $b i64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i64>~anonymous|0 (param $a i64) (param $b i64) (result i32)
   local.get $a
   local.get $b
   i64.gt_s
@@ -11836,7 +11836,7 @@
   i64.lt_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i64_=>_i32) (param $a i64) (param $b i64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $a i64) (param $b i64) (result i32)
   local.get $b
   local.get $a
   i64.gt_s
@@ -11845,7 +11845,7 @@
   i64.lt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u64> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<u64> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a i64)
@@ -12026,7 +12026,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u64> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u64> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp i64)
@@ -12181,7 +12181,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<u64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<u64> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -12319,7 +12319,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u64>~anonymous|0 (type $i64_i64_=>_i32) (param $a i64) (param $b i64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u64>~anonymous|0 (param $a i64) (param $b i64) (result i32)
   local.get $a
   local.get $b
   i64.gt_u
@@ -12328,7 +12328,7 @@
   i64.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i64_=>_i32) (param $a i64) (param $b i64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $a i64) (param $b i64) (result i32)
   local.get $b
   local.get $a
   i64.gt_u
@@ -12337,7 +12337,7 @@
   i64.lt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<f32> (type $i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
+ (func $~lib/util/sort/insertionSort<f32> (param $ptr i32) (param $left i32) (param $right i32) (param $presorted i32) (param $comparator i32)
   (local $range i32)
   (local $i i32)
   (local $a f32)
@@ -12518,7 +12518,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f32> (type $i32_i32_i32_i32_=>_i32) (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f32> (param $ptr i32) (param $i i32) (param $right i32) (param $comparator i32) (result i32)
   (local $j i32)
   (local $k i32)
   (local $tmp f32)
@@ -12673,7 +12673,7 @@
   local.get $j
   return
  )
- (func $~lib/util/sort/mergeRuns<f32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
+ (func $~lib/util/sort/mergeRuns<f32> (param $ptr i32) (param $l i32) (param $m i32) (param $r i32) (param $buffer i32) (param $comparator i32)
   (local $i i32)
   (local $j i32)
   (local $t i32)
@@ -12811,7 +12811,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (type $f32_f32_=>_i32) (param $a f32) (param $b f32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (param $a f32) (param $b f32) (result i32)
   (local $ia i32)
   (local $ib i32)
   local.get $a
@@ -12845,7 +12845,7 @@
   i32.sub
   return
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_f32_=>_i32) (param $a f32) (param $b f32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $a f32) (param $b f32) (result i32)
   local.get $b
   local.get $a
   f32.gt
@@ -12854,7 +12854,7 @@
   f32.lt
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_f64_=>_i32) (param $a f64) (param $b f64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $a f64) (param $b f64) (result i32)
   local.get $b
   local.get $a
   f64.gt
@@ -12863,7 +12863,7 @@
   f64.lt
   i32.sub
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -12909,7 +12909,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $std/typedarray/forEachValues
   local.tee $1
@@ -12983,7 +12983,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -12997,69 +12997,69 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/typedarray/Int8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint8Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint8ClampedArray~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8ClampedArray~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint16Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint16Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Int64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Uint64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float32Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float32Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/typedarray/Float64Array~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Float64Array~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/arraybuffer/ArrayBufferView~visit
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13067,11 +13067,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit
  )
- (func $~lib/array/Array<i8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13079,11 +13079,11 @@
   local.get $1
   call $~lib/array/Array<i8>#__visit
  )
- (func $~lib/array/Array<i32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13091,11 +13091,11 @@
   local.get $1
   call $~lib/array/Array<i32>#__visit
  )
- (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13103,11 +13103,11 @@
   local.get $1
   call $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13115,11 +13115,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13127,11 +13127,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit
  )
- (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13139,11 +13139,11 @@
   local.get $1
   call $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit
  )
- (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13151,11 +13151,11 @@
   local.get $1
   call $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13163,11 +13163,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13175,11 +13175,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit
  )
- (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13187,11 +13187,11 @@
   local.get $1
   call $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit
  )
- (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13199,11 +13199,11 @@
   local.get $1
   call $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit
  )
- (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13211,11 +13211,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit
  )
- (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13223,11 +13223,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13235,11 +13235,11 @@
   local.get $1
   call $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13247,11 +13247,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13259,11 +13259,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13271,11 +13271,11 @@
   local.get $1
   call $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13283,11 +13283,11 @@
   local.get $1
   call $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13295,11 +13295,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13307,11 +13307,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13319,11 +13319,11 @@
   local.get $1
   call $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13331,11 +13331,11 @@
   local.get $1
   call $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13343,11 +13343,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13355,11 +13355,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13367,11 +13367,11 @@
   local.get $1
   call $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13379,11 +13379,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13391,11 +13391,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13403,11 +13403,11 @@
   local.get $1
   call $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13415,11 +13415,11 @@
   local.get $1
   call $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13427,11 +13427,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13439,11 +13439,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13451,11 +13451,11 @@
   local.get $1
   call $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13463,11 +13463,11 @@
   local.get $1
   call $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13475,11 +13475,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13487,11 +13487,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>#__visit
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13499,11 +13499,11 @@
   local.get $1
   call $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13511,11 +13511,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13523,11 +13523,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>#__visit
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13535,11 +13535,11 @@
   local.get $1
   call $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13547,11 +13547,11 @@
   local.get $1
   call $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13559,11 +13559,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13571,11 +13571,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13583,11 +13583,11 @@
   local.get $1
   call $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13595,11 +13595,11 @@
   local.get $1
   call $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13607,11 +13607,11 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>#__visit
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13619,11 +13619,11 @@
   local.get $1
   call $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>#__visit
  )
- (func $~lib/array/Array<f32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13631,11 +13631,11 @@
   local.get $1
   call $~lib/array/Array<f32>#__visit
  )
- (func $~lib/array/Array<f64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<f64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<f64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13643,11 +13643,11 @@
   local.get $1
   call $~lib/array/Array<f64>#__visit
  )
- (func $~lib/array/Array<u8>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u8>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u8>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13655,11 +13655,11 @@
   local.get $1
   call $~lib/array/Array<u8>#__visit
  )
- (func $~lib/array/Array<i16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13667,11 +13667,11 @@
   local.get $1
   call $~lib/array/Array<i16>#__visit
  )
- (func $~lib/array/Array<u16>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u16>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u16>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13679,11 +13679,11 @@
   local.get $1
   call $~lib/array/Array<u16>#__visit
  )
- (func $~lib/array/Array<u32>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13691,11 +13691,11 @@
   local.get $1
   call $~lib/array/Array<u32>#__visit
  )
- (func $~lib/array/Array<i64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<i64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<i64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13703,11 +13703,11 @@
   local.get $1
   call $~lib/array/Array<i64>#__visit
  )
- (func $~lib/array/Array<u64>#get:buffer (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:buffer (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/array/Array<u64>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/array/Array<u64>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13715,11 +13715,11 @@
   local.get $1
   call $~lib/array/Array<u64>#__visit
  )
- (func $~lib/function/Function<%28i8%2Ci8%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i8%2Ci8%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i8%2Ci8%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i8%2Ci8%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13727,11 +13727,11 @@
   local.get $1
   call $~lib/function/Function<%28i8%2Ci8%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u8%2Cu8%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u8%2Cu8%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u8%2Cu8%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u8%2Cu8%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13739,11 +13739,11 @@
   local.get $1
   call $~lib/function/Function<%28u8%2Cu8%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i16%2Ci16%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i16%2Ci16%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i16%2Ci16%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i16%2Ci16%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13751,11 +13751,11 @@
   local.get $1
   call $~lib/function/Function<%28i16%2Ci16%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u16%2Cu16%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u16%2Cu16%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u16%2Cu16%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u16%2Cu16%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13763,11 +13763,11 @@
   local.get $1
   call $~lib/function/Function<%28u16%2Cu16%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13775,11 +13775,11 @@
   local.get $1
   call $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13787,11 +13787,11 @@
   local.get $1
   call $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28i64%2Ci64%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28i64%2Ci64%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28i64%2Ci64%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28i64%2Ci64%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13799,11 +13799,11 @@
   local.get $1
   call $~lib/function/Function<%28i64%2Ci64%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28u64%2Cu64%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28u64%2Cu64%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28u64%2Cu64%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28u64%2Cu64%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13811,11 +13811,11 @@
   local.get $1
   call $~lib/function/Function<%28u64%2Cu64%29=>i32>#__visit
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -13823,7 +13823,7 @@
   local.get $1
   call $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/function/Function<%28f32%2Cf32%29=>i32>
     block $~lib/function/Function<%28u64%2Cu64%29=>i32>
@@ -14298,10 +14298,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/typedarray
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -14314,7 +14314,7 @@
    unreachable
   end
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $this i32) (param $length i32) (param $alignLog2 i32) (result i32)
   (local $buffer i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14425,7 +14425,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14465,7 +14465,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14498,7 +14498,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int8Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int8Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14523,7 +14523,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14563,7 +14563,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14588,7 +14588,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14628,7 +14628,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8ClampedArray#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14653,7 +14653,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int16Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int16Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14693,7 +14693,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14720,7 +14720,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint16Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14760,7 +14760,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint16Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14787,7 +14787,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14827,7 +14827,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int32Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int32Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14854,7 +14854,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14894,7 +14894,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint32Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14921,7 +14921,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int64Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int64Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -14961,7 +14961,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int64Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int64Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14988,7 +14988,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint64Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -15028,7 +15028,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint64Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15055,7 +15055,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Float32Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float32Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -15095,7 +15095,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float32Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float32Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15122,7 +15122,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Float64Array#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float64Array#constructor (param $this i32) (param $length i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -15162,7 +15162,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float64Array#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float64Array#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15189,7 +15189,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testInstantiate (type $i32_=>_none) (param $len i32)
+ (func $std/typedarray/testInstantiate (param $len i32)
   (local $i8a i32)
   (local $u8a i32)
   (local $c8a i32)
@@ -15898,7 +15898,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Int32Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15945,7 +15945,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int32Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15994,7 +15994,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int32Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -16151,7 +16151,7 @@
   local.get $19
   return
  )
- (func $~lib/typedarray/Float64Array#__set (type $i32_i32_f64_=>_none) (param $this i32) (param $index i32) (param $value f64)
+ (func $~lib/typedarray/Float64Array#__set (param $this i32) (param $index i32) (param $value f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -16198,7 +16198,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Float64Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -16355,7 +16355,7 @@
   local.get $19
   return
  )
- (func $~lib/util/sort/SORT<f64> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<f64> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a f64)
   (local $b f64)
@@ -16832,7 +16832,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Float64Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -16872,7 +16872,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Float64Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Float64Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -16929,7 +16929,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float64Array#__get (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/typedarray/Float64Array#__get (param $this i32) (param $index i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -16979,7 +16979,7 @@
   local.get $3
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint8ClampedArray#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17034,7 +17034,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17079,7 +17079,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int8Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Int8Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17122,7 +17122,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#fill (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int8Array#fill (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17159,7 +17159,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17184,7 +17184,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int8Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int8Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17229,7 +17229,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<i8>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i8>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -17281,7 +17281,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/isInt8ArrayEqual (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/isInt8ArrayEqual (param $a i32) (param $b i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -17376,7 +17376,7 @@
   local.get $4
   return
  )
- (func $~lib/typedarray/Int8Array#fill@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int8Array#fill@varargs (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17420,7 +17420,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int8Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int8Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -17577,7 +17577,7 @@
   local.get $19
   return
  )
- (func $~lib/typedarray/Int32Array#fill (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#fill (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17614,7 +17614,7 @@
   local.get $4
   return
  )
- (func $~lib/array/Array<i32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17639,7 +17639,7 @@
   local.get $1
   return
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $this i32) (param $index i32) (result i32)
   (local $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -17691,7 +17691,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/isInt32ArrayEqual (type $i32_i32_=>_i32) (param $a i32) (param $b i32) (result i32)
+ (func $std/typedarray/isInt32ArrayEqual (param $a i32) (param $b i32) (result i32)
   (local $i i32)
   (local $len i32)
   (local $4 i32)
@@ -17786,7 +17786,7 @@
   local.get $4
   return
  )
- (func $~lib/typedarray/Int32Array#fill@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#fill@varargs (param $this i32) (param $value i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -17830,7 +17830,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int32Array#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#slice (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $start i32)
   (local $end|5 i32)
@@ -17975,7 +17975,7 @@
   local.get $18
   return
  )
- (func $~lib/typedarray/Int32Array#slice@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#slice@varargs (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18016,7 +18016,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/typedarray/Int32Array#copyWithin (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#copyWithin (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $array i32)
   (local $target|5 i32)
   (local $start|6 i32)
@@ -18201,7 +18201,7 @@
   local.get $30
   return
  )
- (func $~lib/typedarray/Int32Array#copyWithin@varargs (type $i32_i32_i32_i32_=>_i32) (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int32Array#copyWithin@varargs (param $this i32) (param $target i32) (param $start i32) (param $end i32) (result i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18241,7 +18241,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int8Array#reduce<i8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int8Array#reduce<i8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -18332,7 +18332,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -18413,7 +18413,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18456,7 +18456,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#reduce<u8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#reduce<u8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -18547,7 +18547,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint8Array,u8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -18629,7 +18629,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#reduce<u8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#reduce<u8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -18720,7 +18720,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint8ClampedArray,u8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -18802,7 +18802,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Int16Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -18849,7 +18849,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#reduce<i16> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int16Array#reduce<i16> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -18940,7 +18940,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int16Array,i16>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -19021,7 +19021,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint16Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19068,7 +19068,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#reduce<u16> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#reduce<u16> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -19159,7 +19159,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint16Array,u16>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -19241,7 +19241,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#reduce<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int32Array#reduce<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -19332,7 +19332,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int32Array,i32>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -19412,7 +19412,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#__set (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/typedarray/Uint32Array#__set (param $this i32) (param $index i32) (param $value i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19459,7 +19459,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#reduce<u32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#reduce<u32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -19550,7 +19550,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint32Array,u32>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -19630,7 +19630,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/typedarray/Int64Array#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19677,7 +19677,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#reduce<i64> (type $i32_i32_i64_=>_i64) (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
+ (func $~lib/typedarray/Int64Array#reduce<i64> (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i64)
@@ -19769,7 +19769,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>
   (local $array i32)
   (local $result i64)
   (local $2 i32)
@@ -19849,7 +19849,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $this i32) (param $index i32) (param $value i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $this i32) (param $index i32) (param $value i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -19896,7 +19896,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#reduce<u64> (type $i32_i32_i64_=>_i64) (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
+ (func $~lib/typedarray/Uint64Array#reduce<u64> (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i64)
@@ -19988,7 +19988,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Uint64Array,u64>
   (local $array i32)
   (local $result i64)
   (local $2 i32)
@@ -20068,7 +20068,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__set (type $i32_i32_f32_=>_none) (param $this i32) (param $index i32) (param $value f32)
+ (func $~lib/typedarray/Float32Array#__set (param $this i32) (param $index i32) (param $value f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -20115,7 +20115,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#reduce<f32> (type $i32_i32_f32_=>_f32) (param $this i32) (param $fn i32) (param $initialValue f32) (result f32)
+ (func $~lib/typedarray/Float32Array#reduce<f32> (param $this i32) (param $fn i32) (param $initialValue f32) (result f32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 f32)
@@ -20207,7 +20207,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>
   (local $array i32)
   (local $result f32)
   (local $2 i32)
@@ -20287,7 +20287,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#reduce<f64> (type $i32_i32_f64_=>_f64) (param $this i32) (param $fn i32) (param $initialValue f64) (result f64)
+ (func $~lib/typedarray/Float64Array#reduce<f64> (param $this i32) (param $fn i32) (param $initialValue f64) (result f64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 f64)
@@ -20379,7 +20379,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>
   (local $array i32)
   (local $result f64)
   (local $2 i32)
@@ -20459,7 +20459,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int8Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20516,7 +20516,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Int8Array,i8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20622,7 +20622,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20679,7 +20679,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Uint8Array,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20785,7 +20785,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20842,7 +20842,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Uint8ClampedArray,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -20948,7 +20948,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int16Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21009,7 +21009,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Int16Array,i16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21115,7 +21115,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21176,7 +21176,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Uint16Array,u16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21282,7 +21282,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int32Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21343,7 +21343,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Int32Array,i32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21449,7 +21449,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#at (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#at (param $this i32) (param $index i32) (result i32)
   (local $len i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21510,7 +21510,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Uint32Array,u32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21616,7 +21616,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#at (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Int64Array#at (param $this i32) (param $index i32) (result i64)
   (local $len i32)
   (local $3 i32)
   (local $4 i64)
@@ -21678,7 +21678,7 @@
   local.get $4
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Int64Array,i64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21784,7 +21784,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#at (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#at (param $this i32) (param $index i32) (result i64)
   (local $len i32)
   (local $3 i32)
   (local $4 i64)
@@ -21846,7 +21846,7 @@
   local.get $4
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Uint64Array,u64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -21952,7 +21952,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#at (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#at (param $this i32) (param $index i32) (result f32)
   (local $len i32)
   (local $3 i32)
   (local $4 f32)
@@ -22014,7 +22014,7 @@
   local.get $4
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Float32Array,f32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22120,7 +22120,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#at (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/typedarray/Float64Array#at (param $this i32) (param $index i32) (result f64)
   (local $len i32)
   (local $3 i32)
   (local $4 f64)
@@ -22182,7 +22182,7 @@
   local.get $4
   return
  )
- (func $std/typedarray/testAt<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testAt<~lib/typedarray/Float64Array,f64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -22288,7 +22288,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#reduceRight<i8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int8Array#reduceRight<i8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -22378,7 +22378,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int8Array,i8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -22459,7 +22459,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#reduceRight<u8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#reduceRight<u8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -22549,7 +22549,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8Array,u8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -22631,7 +22631,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#reduceRight<u8> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#reduceRight<u8> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -22721,7 +22721,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint8ClampedArray,u8>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -22803,7 +22803,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#reduceRight<i16> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int16Array#reduceRight<i16> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -22893,7 +22893,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int16Array,i16>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -22974,7 +22974,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#reduceRight<u16> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#reduceRight<u16> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -23064,7 +23064,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint16Array,u16>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -23146,7 +23146,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#reduceRight<i32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Int32Array#reduceRight<i32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -23236,7 +23236,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int32Array,i32>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -23316,7 +23316,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#reduceRight<u32> (type $i32_i32_i32_=>_i32) (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#reduceRight<u32> (param $this i32) (param $fn i32) (param $initialValue i32) (result i32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i32)
@@ -23406,7 +23406,7 @@
   local.get $8
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint32Array,u32>
   (local $array i32)
   (local $result i32)
   (local $2 i32)
@@ -23486,7 +23486,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#reduceRight<i64> (type $i32_i32_i64_=>_i64) (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
+ (func $~lib/typedarray/Int64Array#reduceRight<i64> (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i64)
@@ -23577,7 +23577,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Int64Array,i64>
   (local $array i32)
   (local $result i64)
   (local $2 i32)
@@ -23657,7 +23657,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#reduceRight<u64> (type $i32_i32_i64_=>_i64) (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
+ (func $~lib/typedarray/Uint64Array#reduceRight<u64> (param $this i32) (param $fn i32) (param $initialValue i64) (result i64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 i64)
@@ -23748,7 +23748,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Uint64Array,u64>
   (local $array i32)
   (local $result i64)
   (local $2 i32)
@@ -23828,7 +23828,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#reduceRight<f32> (type $i32_i32_f32_=>_f32) (param $this i32) (param $fn i32) (param $initialValue f32) (result f32)
+ (func $~lib/typedarray/Float32Array#reduceRight<f32> (param $this i32) (param $fn i32) (param $initialValue f32) (result f32)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 f32)
@@ -23919,7 +23919,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Float32Array,f32>
   (local $array i32)
   (local $result f32)
   (local $2 i32)
@@ -23999,7 +23999,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#reduceRight<f64> (type $i32_i32_f64_=>_f64) (param $this i32) (param $fn i32) (param $initialValue f64) (result f64)
+ (func $~lib/typedarray/Float64Array#reduceRight<f64> (param $this i32) (param $fn i32) (param $initialValue f64) (result f64)
   (local $array i32)
   (local $fn|4 i32)
   (local $initialValue|5 f64)
@@ -24090,7 +24090,7 @@
   local.get $9
   return
  )
- (func $std/typedarray/testReduceRight<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testReduceRight<~lib/typedarray/Float64Array,f64>
   (local $array i32)
   (local $result f64)
   (local $2 i32)
@@ -24170,7 +24170,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -24292,7 +24292,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -24418,7 +24418,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -24540,7 +24540,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Uint8Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24585,7 +24585,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -24711,7 +24711,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -24833,7 +24833,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -24959,7 +24959,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -25081,7 +25081,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Int16Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25130,7 +25130,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -25256,7 +25256,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -25378,7 +25378,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Uint16Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25427,7 +25427,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -25553,7 +25553,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -25675,7 +25675,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -25801,7 +25801,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -25923,7 +25923,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Uint32Array#__get (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#__get (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -25972,7 +25972,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -26098,7 +26098,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -26220,7 +26220,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Int64Array#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Int64Array#__get (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -26270,7 +26270,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -26396,7 +26396,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -26518,7 +26518,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Uint64Array#__get (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#__get (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -26568,7 +26568,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -26694,7 +26694,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -26816,7 +26816,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -26866,7 +26866,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -26992,7 +26992,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#map (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#map (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -27114,7 +27114,7 @@
   local.get $10
   return
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -27240,7 +27240,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -27384,7 +27384,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -27564,7 +27564,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -27708,7 +27708,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -27888,7 +27888,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -28032,7 +28032,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -28212,7 +28212,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -28356,7 +28356,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -28536,7 +28536,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -28680,7 +28680,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -28860,7 +28860,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -29004,7 +29004,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -29184,7 +29184,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -29328,7 +29328,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -29508,7 +29508,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -29652,7 +29652,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -29832,7 +29832,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -29976,7 +29976,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -30156,7 +30156,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -30300,7 +30300,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -30480,7 +30480,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#filter (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#filter (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $len i32)
@@ -30624,7 +30624,7 @@
   local.get $14
   return
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -30804,7 +30804,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -30894,7 +30894,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -30999,7 +30999,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -31089,7 +31089,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -31194,7 +31194,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -31284,7 +31284,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -31389,7 +31389,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -31479,7 +31479,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -31584,7 +31584,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -31674,7 +31674,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -31779,7 +31779,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -31869,7 +31869,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -31974,7 +31974,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -32064,7 +32064,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -32169,7 +32169,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -32259,7 +32259,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -32364,7 +32364,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -32454,7 +32454,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -32559,7 +32559,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -32649,7 +32649,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -32754,7 +32754,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#some (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#some (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -32844,7 +32844,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -32949,7 +32949,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -33039,7 +33039,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -33145,7 +33145,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -33235,7 +33235,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -33341,7 +33341,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -33431,7 +33431,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -33537,7 +33537,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -33627,7 +33627,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -33733,7 +33733,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -33823,7 +33823,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -33929,7 +33929,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34019,7 +34019,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -34125,7 +34125,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34215,7 +34215,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -34321,7 +34321,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34411,7 +34411,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -34517,7 +34517,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34607,7 +34607,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -34713,7 +34713,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34803,7 +34803,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -34909,7 +34909,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#findIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#findIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -34999,7 +34999,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -35105,7 +35105,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -35194,7 +35194,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -35300,7 +35300,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -35389,7 +35389,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -35495,7 +35495,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -35584,7 +35584,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -35690,7 +35690,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -35779,7 +35779,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -35885,7 +35885,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -35974,7 +35974,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -36080,7 +36080,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -36169,7 +36169,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -36275,7 +36275,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -36364,7 +36364,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -36470,7 +36470,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -36559,7 +36559,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -36665,7 +36665,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -36754,7 +36754,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -36860,7 +36860,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -36949,7 +36949,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -37055,7 +37055,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#findLastIndex (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#findLastIndex (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -37144,7 +37144,7 @@
   local.get $6
   return
  )
- (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFindLastIndex<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -37250,7 +37250,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int8Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -37343,7 +37343,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -37448,7 +37448,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -37541,7 +37541,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -37646,7 +37646,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -37739,7 +37739,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -37844,7 +37844,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int16Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -37937,7 +37937,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -38042,7 +38042,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -38135,7 +38135,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -38240,7 +38240,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int32Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -38333,7 +38333,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -38438,7 +38438,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -38531,7 +38531,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -38636,7 +38636,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Int64Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -38729,7 +38729,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -38834,7 +38834,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -38927,7 +38927,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -39032,7 +39032,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float32Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -39125,7 +39125,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -39230,7 +39230,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#every (type $i32_i32_=>_i32) (param $this i32) (param $fn i32) (result i32)
+ (func $~lib/typedarray/Float64Array#every (param $this i32) (param $fn i32) (result i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -39323,7 +39323,7 @@
   local.get $7
   return
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $failResult i32)
@@ -39428,7 +39428,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -39495,7 +39495,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Int8Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -39574,7 +39574,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -39679,7 +39679,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -39748,7 +39748,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Uint8Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -39827,7 +39827,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8Array,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -39935,7 +39935,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8ClampedArray,u8>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40004,7 +40004,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Uint8ClampedArray#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -40083,7 +40083,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint8ClampedArray,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40191,7 +40191,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40258,7 +40258,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Int16Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -40337,7 +40337,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40442,7 +40442,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40511,7 +40511,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Uint16Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -40590,7 +40590,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint16Array,u16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40698,7 +40698,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40763,7 +40763,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Int32Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -40842,7 +40842,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -40944,7 +40944,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_none) (param $value i32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $value i32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41009,7 +41009,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Uint32Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -41088,7 +41088,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint32Array,u32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41190,7 +41190,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_none) (param $value i64) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $value i64) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41256,7 +41256,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Int64Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -41335,7 +41335,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41440,7 +41440,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_none) (param $value i64) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $value i64) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41506,7 +41506,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Uint64Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -41585,7 +41585,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Uint64Array,u64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41690,7 +41690,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_none) (param $value f32) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $value f32) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41756,7 +41756,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Float32Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -41835,7 +41835,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41940,7 +41940,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_none) (param $value f64) (param $index i32) (param $self i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $value f64) (param $index i32) (param $self i32)
   (local $matchedValue i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -42006,7 +42006,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#forEach (type $i32_i32_=>_none) (param $this i32) (param $fn i32)
+ (func $~lib/typedarray/Float64Array#forEach (param $this i32) (param $fn i32)
   (local $array i32)
   (local $fn|3 i32)
   (local $ptr i32)
@@ -42085,7 +42085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -42190,7 +42190,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int8Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -42224,7 +42224,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int8Array,i8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -42466,7 +42466,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -42500,7 +42500,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint8Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -42657,7 +42657,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8Array,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -42902,7 +42902,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -42936,7 +42936,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#subarray (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin i32)
   (local $end|5 i32)
@@ -43093,7 +43093,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8ClampedArray,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -43338,7 +43338,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int16Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -43372,7 +43372,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int16Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int16Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -43529,7 +43529,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int16Array,i16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -43771,7 +43771,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -43805,7 +43805,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint16Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -43962,7 +43962,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint16Array,u16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -44207,7 +44207,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int32Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -44241,7 +44241,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int32Array,i32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -44480,7 +44480,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -44514,7 +44514,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint32Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -44671,7 +44671,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint32Array,u32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -44910,7 +44910,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int64Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -44944,7 +44944,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int64Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Int64Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -45101,7 +45101,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int64Array,i64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -45343,7 +45343,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45377,7 +45377,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint64Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -45534,7 +45534,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint64Array,u64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -45776,7 +45776,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float32Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45810,7 +45810,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Float32Array#subarray (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/typedarray/Float32Array#subarray (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $array i32)
   (local $begin|4 i32)
   (local $end|5 i32)
@@ -45967,7 +45967,7 @@
   local.get $19
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Float32Array,f32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -46209,7 +46209,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#reverse (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float64Array#reverse (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46243,7 +46243,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Float64Array,f64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -46485,7 +46485,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int8Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -46596,7 +46596,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int8Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int8Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -46701,7 +46701,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int8Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int8Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46746,7 +46746,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int8Array,i8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -47382,7 +47382,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -47494,7 +47494,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint8Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -47600,7 +47600,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint8Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -47645,7 +47645,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8Array,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -48282,7 +48282,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -48394,7 +48394,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -48500,7 +48500,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -48545,7 +48545,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8ClampedArray,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -49182,7 +49182,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int16Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -49293,7 +49293,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int16Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int16Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -49398,7 +49398,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int16Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int16Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -49443,7 +49443,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int16Array,i16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -50079,7 +50079,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -50191,7 +50191,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint16Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -50297,7 +50297,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint16Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -50342,7 +50342,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint16Array,u16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -50979,7 +50979,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int32Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -51089,7 +51089,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int32Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int32Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -51193,7 +51193,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int32Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int32Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -51238,7 +51238,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int32Array,i32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -51873,7 +51873,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#indexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#indexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -51983,7 +51983,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint32Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#lastIndexOf (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i32)
   (local $fromIndex|5 i32)
@@ -52087,7 +52087,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint32Array#lastIndexOf@varargs (type $i32_i32_i32_=>_i32) (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#lastIndexOf@varargs (param $this i32) (param $searchElement i32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -52132,7 +52132,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint32Array,u32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -52767,7 +52767,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#indexOf (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int64Array#indexOf (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i64)
   (local $fromIndex|5 i32)
@@ -52877,7 +52877,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int64Array#lastIndexOf (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int64Array#lastIndexOf (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i64)
   (local $fromIndex|5 i32)
@@ -52981,7 +52981,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int64Array#lastIndexOf@varargs (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Int64Array#lastIndexOf@varargs (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -53026,7 +53026,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int64Array,i64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -53662,7 +53662,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#indexOf (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#indexOf (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i64)
   (local $fromIndex|5 i32)
@@ -53772,7 +53772,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint64Array#lastIndexOf (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#lastIndexOf (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 i64)
   (local $fromIndex|5 i32)
@@ -53876,7 +53876,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint64Array#lastIndexOf@varargs (type $i32_i64_i32_=>_i32) (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#lastIndexOf@varargs (param $this i32) (param $searchElement i64) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -53921,7 +53921,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint64Array,u64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -54557,7 +54557,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#indexOf (type $i32_f32_i32_=>_i32) (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float32Array#indexOf (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f32)
   (local $fromIndex|5 i32)
@@ -54667,7 +54667,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Float32Array#lastIndexOf (type $i32_f32_i32_=>_i32) (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float32Array#lastIndexOf (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f32)
   (local $fromIndex|5 i32)
@@ -54771,7 +54771,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Float32Array#lastIndexOf@varargs (type $i32_f32_i32_=>_i32) (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float32Array#lastIndexOf@varargs (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -54816,7 +54816,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float32Array,f32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -55452,7 +55452,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#indexOf (type $i32_f64_i32_=>_i32) (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float64Array#indexOf (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f64)
   (local $fromIndex|5 i32)
@@ -55562,7 +55562,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Float64Array#lastIndexOf (type $i32_f64_i32_=>_i32) (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float64Array#lastIndexOf (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f64)
   (local $fromIndex|5 i32)
@@ -55666,7 +55666,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Float64Array#lastIndexOf@varargs (type $i32_f64_i32_=>_i32) (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float64Array#lastIndexOf@varargs (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -55711,7 +55711,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float64Array,f64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -56347,7 +56347,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#includes (type $i32_f64_i32_=>_i32) (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float64Array#includes (param $this i32) (param $searchElement f64) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f64)
   (local $fromIndex|5 i32)
@@ -56473,7 +56473,7 @@
   local.get $12
   return
  )
- (func $~lib/typedarray/Float32Array#includes (type $i32_f32_i32_=>_i32) (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
+ (func $~lib/typedarray/Float32Array#includes (param $this i32) (param $searchElement f32) (param $fromIndex i32) (result i32)
   (local $array i32)
   (local $searchElement|4 f32)
   (local $fromIndex|5 i32)
@@ -56599,7 +56599,7 @@
   local.get $12
   return
  )
- (func $~lib/string/String#substring (type $i32_i32_i32_=>_i32) (param $this i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/string/String#substring (param $this i32) (param $start i32) (param $end i32) (result i32)
   (local $len i32)
   (local $4 i32)
   (local $5 i32)
@@ -56748,7 +56748,7 @@
   local.get $22
   return
  )
- (func $~lib/util/string/joinIntegerArray<i8> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i8> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -56927,7 +56927,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int8Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Int8Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -56966,7 +56966,7 @@
   local.get $2
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -57062,7 +57062,7 @@
   local.get $3
   return
  )
- (func $~lib/typedarray/Int8Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int8Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -57093,7 +57093,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int8Array,i8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -57225,7 +57225,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<u8> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u8> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -57404,7 +57404,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint8Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -57443,7 +57443,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint8Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -57474,7 +57474,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint8Array,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -57606,7 +57606,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -57645,7 +57645,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -57676,7 +57676,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint8ClampedArray,u8>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -57808,7 +57808,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<i16> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i16> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -57987,7 +57987,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int16Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Int16Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58026,7 +58026,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int16Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int16Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58057,7 +58057,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int16Array,i16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -58189,7 +58189,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<u16> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u16> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -58368,7 +58368,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint16Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58407,7 +58407,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint16Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58438,7 +58438,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint16Array,u16>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -58570,7 +58570,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<i32> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i32> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -58749,7 +58749,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int32Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Int32Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58788,7 +58788,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int32Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int32Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -58819,7 +58819,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int32Array,i32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -58951,7 +58951,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<u32> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u32> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i32)
   (local $sepLen i32)
@@ -59130,7 +59130,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint32Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59169,7 +59169,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint32Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59200,7 +59200,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint32Array,u32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -59332,7 +59332,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<i64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<i64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i64)
   (local $sepLen i32)
@@ -59513,7 +59513,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Int64Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Int64Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59552,7 +59552,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int64Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Int64Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59583,7 +59583,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Int64Array,i64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -59715,7 +59715,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinIntegerArray<u64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $value i64)
   (local $sepLen i32)
@@ -59894,7 +59894,7 @@
   local.get $11
   return
  )
- (func $~lib/typedarray/Uint64Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59933,7 +59933,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint64Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -59964,7 +59964,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Uint64Array,u64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -60096,7 +60096,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinFloatArray<f32> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinFloatArray<f32> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $sepLen i32)
   (local $estLen i32)
@@ -60268,7 +60268,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Float32Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Float32Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -60307,7 +60307,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Float32Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float32Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -60338,7 +60338,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Float32Array,f32>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -60470,7 +60470,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/string/joinFloatArray<f64> (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinFloatArray<f64> (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $sepLen i32)
   (local $estLen i32)
@@ -60639,7 +60639,7 @@
   local.get $10
   return
  )
- (func $~lib/typedarray/Float64Array#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/typedarray/Float64Array#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -60678,7 +60678,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Float64Array#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/typedarray/Float64Array#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -60709,7 +60709,7 @@
   local.get $1
   return
  )
- (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayJoinAndToString<~lib/typedarray/Float64Array,f64>
   (local $array i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -60841,7 +60841,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -60974,7 +60974,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint8Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -61017,7 +61017,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/arraybuffer/ArrayBuffer#slice (type $i32_i32_i32_=>_i32) (param $this i32) (param $begin i32) (param $end i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (param $this i32) (param $begin i32) (param $end i32) (result i32)
   (local $length i32)
   (local $4 i32)
   (local $5 i32)
@@ -61130,7 +61130,7 @@
   local.get $16
   return
  )
- (func $~lib/typedarray/Int8Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int8Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -61263,7 +61263,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int8Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int8Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -61306,7 +61306,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int8Array,i8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -61472,7 +61472,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8Array,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -61641,7 +61641,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -61774,7 +61774,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -61817,7 +61817,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8ClampedArray,u8>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -61988,7 +61988,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int16Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -62121,7 +62121,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int16Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int16Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -62164,7 +62164,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int16Array,i16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -62336,7 +62336,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint16Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -62469,7 +62469,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint16Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint16Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -62512,7 +62512,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint16Array,u16>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -62687,7 +62687,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int32Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -62820,7 +62820,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int32Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int32Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -62863,7 +62863,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int32Array,i32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -63038,7 +63038,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint32Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -63171,7 +63171,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint32Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint32Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -63214,7 +63214,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint32Array,u32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -63391,7 +63391,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int64Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -63524,7 +63524,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Int64Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Int64Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -63567,7 +63567,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int64Array,i64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -63747,7 +63747,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint64Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -63880,7 +63880,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Uint64Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Uint64Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -63923,7 +63923,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint64Array,u64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -64105,7 +64105,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float32Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -64238,7 +64238,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Float32Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float32Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -64281,7 +64281,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Float32Array,f32>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -64465,7 +64465,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array.wrap (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float64Array.wrap (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $buffer|3 i32)
   (local $byteOffset|4 i32)
   (local $len i32)
@@ -64598,7 +64598,7 @@
   local.get $9
   return
  )
- (func $~lib/typedarray/Float64Array.wrap@varargs (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
+ (func $~lib/typedarray/Float64Array.wrap@varargs (param $buffer i32) (param $byteOffset i32) (param $length i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -64641,7 +64641,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Float64Array,f64>
   (local $values i32)
   (local $length i32)
   (local $array i32)
@@ -64827,7 +64827,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -64958,7 +64958,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int8Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -64986,7 +64986,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<i8>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i8>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -65016,7 +65016,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int8Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int8Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -65124,7 +65124,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -65149,7 +65149,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65291,7 +65291,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65423,7 +65423,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<f64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -65448,7 +65448,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65590,7 +65590,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65689,7 +65689,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65820,7 +65820,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -65919,7 +65919,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int8Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int8Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -66250,7 +66250,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -66381,7 +66381,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u8>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -66406,7 +66406,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint8Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -66434,7 +66434,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<u8>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u8>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -66464,7 +66464,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -66572,7 +66572,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -66714,7 +66714,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -66846,7 +66846,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -66988,7 +66988,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -67087,7 +67087,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -67218,7 +67218,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -67317,7 +67317,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -67648,7 +67648,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -67798,7 +67798,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -67826,7 +67826,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8ClampedArray> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8ClampedArray> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -67934,7 +67934,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68079,7 +68079,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68233,7 +68233,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68378,7 +68378,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68477,7 +68477,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68627,7 +68627,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -68776,7 +68776,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8ClampedArray> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8ClampedArray>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -69107,7 +69107,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -69238,7 +69238,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -69263,7 +69263,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int16Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -69293,7 +69293,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<i16>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i16>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -69323,7 +69323,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int16Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -69431,7 +69431,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -69573,7 +69573,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -69705,7 +69705,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -69847,7 +69847,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -69978,7 +69978,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -70077,7 +70077,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -70208,7 +70208,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int16Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int16Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -70539,7 +70539,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -70670,7 +70670,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u16>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -70695,7 +70695,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint16Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -70725,7 +70725,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<u16>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u16>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -70755,7 +70755,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint16Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint16Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -70863,7 +70863,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71005,7 +71005,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71137,7 +71137,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71279,7 +71279,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71410,7 +71410,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71509,7 +71509,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint16Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -71640,7 +71640,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint16Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint16Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -71971,7 +71971,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72070,7 +72070,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Int32Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -72100,7 +72100,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<i32>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<i32>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -72130,7 +72130,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int32Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int32Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -72238,7 +72238,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72380,7 +72380,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72512,7 +72512,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72654,7 +72654,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72785,7 +72785,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -72916,7 +72916,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -73047,7 +73047,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int32Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -73378,7 +73378,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -73477,7 +73477,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u32>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -73502,7 +73502,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint32Array#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -73532,7 +73532,7 @@
   local.get $2
   return
  )
- (func $~lib/array/Array<u32>#__uget (type $i32_i32_=>_i32) (param $this i32) (param $index i32) (result i32)
+ (func $~lib/array/Array<u32>#__uget (param $this i32) (param $index i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -73562,7 +73562,7 @@
   local.get $2
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint32Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint32Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i32)
@@ -73670,7 +73670,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -73812,7 +73812,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -73944,7 +73944,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -74086,7 +74086,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -74217,7 +74217,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -74348,7 +74348,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint32Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -74479,7 +74479,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint32Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -74810,7 +74810,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -74942,7 +74942,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<i64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -74967,7 +74967,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Int64Array#__uget (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Int64Array#__uget (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -74998,7 +74998,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<i64>#__uget (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<i64>#__uget (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -75029,7 +75029,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int64Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i64)
@@ -75137,7 +75137,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75279,7 +75279,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75378,7 +75378,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75520,7 +75520,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75652,7 +75652,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75784,7 +75784,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -75916,7 +75916,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int64Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -76247,7 +76247,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -76379,7 +76379,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/array/Array<u64>#get:length (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -76404,7 +76404,7 @@
   local.get $1
   return
  )
- (func $~lib/typedarray/Uint64Array#__uget (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#__uget (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -76435,7 +76435,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<u64>#__uget (type $i32_i32_=>_i64) (param $this i32) (param $index i32) (result i64)
+ (func $~lib/array/Array<u64>#__uget (param $this i32) (param $index i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -76466,7 +76466,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint64Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint64Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala i64)
@@ -76574,7 +76574,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -76716,7 +76716,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -76815,7 +76815,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<f64>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<f64>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -76957,7 +76957,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -77089,7 +77089,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -77221,7 +77221,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint64Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -77353,7 +77353,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint64Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -77684,7 +77684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -77816,7 +77816,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__uget (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__uget (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -77847,7 +77847,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<f32>#__uget (type $i32_i32_=>_f32) (param $this i32) (param $index i32) (result f32)
+ (func $~lib/array/Array<f32>#__uget (param $this i32) (param $index i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -77878,7 +77878,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Float32Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Float32Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala f32)
@@ -77986,7 +77986,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -78085,7 +78085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -78217,7 +78217,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -78349,7 +78349,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -78481,7 +78481,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float32Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -78613,7 +78613,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float32Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -78911,7 +78911,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/array/Array<i32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79043,7 +79043,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#__uget (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/typedarray/Float64Array#__uget (param $this i32) (param $index i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -79074,7 +79074,7 @@
   local.get $3
   return
  )
- (func $~lib/array/Array<f64>#__uget (type $i32_i32_=>_f64) (param $this i32) (param $index i32) (result f64)
+ (func $~lib/array/Array<f64>#__uget (param $this i32) (param $index i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -79105,7 +79105,7 @@
   local.get $3
   return
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Float64Array> (type $i32_i32_=>_none) (param $target i32) (param $compare i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Float64Array> (param $target i32) (param $compare i32)
   (local $len i32)
   (local $i i32)
   (local $vala f64)
@@ -79211,7 +79211,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/array/Array<f32>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/array/Array<f32>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79344,7 +79344,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Int64Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79476,7 +79476,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Uint8Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79608,7 +79608,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/typedarray/Int16Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79740,7 +79740,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#set<~lib/array/Array<i8>> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Float64Array#set<~lib/array/Array<i8>> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -79872,7 +79872,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float64Array>
   (local $setSource4 i32)
   (local $setSource5 i32)
   (local $setSource6 i32)
@@ -80170,7 +80170,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Float32Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Float32Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -80315,7 +80315,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int32Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int32Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -80465,7 +80465,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Uint32Array> (type $i32_i32_i32_=>_none) (param $this i32) (param $source i32) (param $offset i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Uint32Array> (param $this i32) (param $source i32) (param $offset i32)
   (local $target i32)
   (local $source|4 i32)
   (local $offset|5 i32)
@@ -80608,7 +80608,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<i8> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i8> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -81085,7 +81085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int8Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -81125,7 +81125,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int8Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int8Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -81180,7 +81180,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -81374,7 +81374,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<u8> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<u8> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -81851,7 +81851,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -81891,7 +81891,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint8Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -81944,7 +81944,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -82138,7 +82138,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -82178,7 +82178,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint8ClampedArray#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -82231,7 +82231,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -82425,7 +82425,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<i16> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i16> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -82902,7 +82902,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int16Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -82942,7 +82942,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int16Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int16Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -82997,7 +82997,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -83191,7 +83191,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<u16> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<u16> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -83668,7 +83668,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -83708,7 +83708,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint16Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -83761,7 +83761,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -83955,7 +83955,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -84432,7 +84432,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int32Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -84472,7 +84472,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int32Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int32Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -84527,7 +84527,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -84721,7 +84721,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<u32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<u32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i32)
   (local $b i32)
@@ -85198,7 +85198,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -85238,7 +85238,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint32Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -85291,7 +85291,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -85485,7 +85485,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<i64> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<i64> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i64)
   (local $b i64)
@@ -85962,7 +85962,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int64Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -86002,7 +86002,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Int64Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Int64Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -86057,7 +86057,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -86251,7 +86251,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<u64> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<u64> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a i64)
   (local $b i64)
@@ -86728,7 +86728,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -86768,7 +86768,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Uint64Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -86821,7 +86821,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -87015,7 +87015,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/sort/SORT<f32> (type $i32_i32_i32_=>_none) (param $ptr i32) (param $len i32) (param $comparator i32)
+ (func $~lib/util/sort/SORT<f32> (param $ptr i32) (param $len i32) (param $comparator i32)
   (local $3 i32)
   (local $a f32)
   (local $b f32)
@@ -87492,7 +87492,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#sort (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Float32Array#sort (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -87532,7 +87532,7 @@
   local.get $2
   return
  )
- (func $~lib/typedarray/Float32Array#sort@varargs (type $i32_i32_=>_i32) (param $this i32) (param $comparator i32) (result i32)
+ (func $~lib/typedarray/Float32Array#sort@varargs (param $this i32) (param $comparator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -87589,7 +87589,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -87783,7 +87783,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>
   (local $source i32)
   (local $result i32)
   (local $2 i32)
@@ -87977,7 +87977,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $start:std/typedarray (type $none_=>_none)
+ (func $start:std/typedarray
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -91481,7 +91481,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Cf64%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91505,7 +91505,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91531,7 +91531,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91557,7 +91557,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i8%2Ci8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91581,7 +91581,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91605,7 +91605,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Cu8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91629,7 +91629,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i16%2Ci16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91653,7 +91653,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u16%2Cu16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91677,7 +91677,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91701,7 +91701,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Cu32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91725,7 +91725,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i64%2Ci64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91749,7 +91749,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u64%2Cu64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91773,7 +91773,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Cf32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91797,7 +91797,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Cf64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91821,7 +91821,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>i8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91845,7 +91845,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91869,7 +91869,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91893,7 +91893,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91917,7 +91917,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91941,7 +91941,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91965,7 +91965,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -91989,7 +91989,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92013,7 +92013,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92037,7 +92037,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92061,7 +92061,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92085,7 +92085,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92109,7 +92109,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92133,7 +92133,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92157,7 +92157,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92181,7 +92181,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92205,7 +92205,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92229,7 +92229,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92253,7 +92253,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92277,7 +92277,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92301,7 +92301,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92325,7 +92325,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>bool>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92349,7 +92349,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i8%2Ci32%2C~lib/typedarray/Int8Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92373,7 +92373,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92397,7 +92397,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Ci32%2C~lib/typedarray/Uint8ClampedArray%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92421,7 +92421,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i16%2Ci32%2C~lib/typedarray/Int16Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92445,7 +92445,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u16%2Ci32%2C~lib/typedarray/Uint16Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92469,7 +92469,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%2C~lib/typedarray/Int32Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92493,7 +92493,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Ci32%2C~lib/typedarray/Uint32Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92517,7 +92517,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i64%2Ci32%2C~lib/typedarray/Int64Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92541,7 +92541,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u64%2Ci32%2C~lib/typedarray/Uint64Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92565,7 +92565,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Ci32%2C~lib/typedarray/Float32Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92589,7 +92589,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f64%2Ci32%2C~lib/typedarray/Float64Array%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92613,7 +92613,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92639,7 +92639,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<f64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<f64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92665,7 +92665,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u8>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u8>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92691,7 +92691,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92717,7 +92717,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u16>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u16>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92743,7 +92743,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92769,7 +92769,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<i64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92795,7 +92795,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<u64>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/array/Array<u64>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92821,7 +92821,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i8%2Ci8%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i8%2Ci8%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92845,7 +92845,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u8%2Cu8%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u8%2Cu8%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92869,7 +92869,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i16%2Ci16%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i16%2Ci16%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92893,7 +92893,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u16%2Cu16%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u16%2Cu16%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92917,7 +92917,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i32%2Ci32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92941,7 +92941,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u32%2Cu32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92965,7 +92965,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28i64%2Ci64%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28i64%2Ci64%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -92989,7 +92989,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28u64%2Cu64%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28u64%2Cu64%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -93013,7 +93013,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28f32%2Cf32%29=>i32>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -93037,7 +93037,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
+ (func $~lib/rt/__newArray (param $length i32) (param $alignLog2 i32) (param $id i32) (param $data i32) (result i32)
   (local $bufferSize i32)
   (local $buffer i32)
   (local $array i32)
@@ -93090,7 +93090,7 @@
   local.get $7
   return
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -93272,7 +93272,7 @@
   local.get $14
   return
  )
- (func $~lib/util/number/utoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $value i32) (param $radix i32) (result i32)
   (local $out i32)
   (local $decimals i32)
   (local $buffer i32)
@@ -93419,7 +93419,7 @@
   local.get $12
   return
  )
- (func $~lib/util/number/itoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa64 (param $value i64) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $val32 i32)
@@ -93643,7 +93643,7 @@
   local.get $18
   return
  )
- (func $~lib/util/number/utoa64 (type $i64_i32_=>_i32) (param $value i64) (param $radix i32) (result i32)
+ (func $~lib/util/number/utoa64 (param $value i64) (param $radix i32) (result i32)
   (local $out i32)
   (local $val32 i32)
   (local $decimals i32)
@@ -93830,7 +93830,7 @@
   local.get $17
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
@@ -93914,7 +93914,7 @@
   local.get $3
   return
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_i32_=>_i32) (param $this i32) (param $length i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $this i32) (param $length i32) (result i32)
   (local $buffer i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/std/typedarray.release.wat b/tests/compiler/std/typedarray.release.wat
index 2265bdb01d..09c5ad4c20 100644
--- a/tests/compiler/std/typedarray.release.wat
+++ b/tests/compiler/std/typedarray.release.wat
@@ -1,47 +1,47 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32) (result i32) func))
- (type $i64_i64_=>_i32 (func_subtype (param i64 i64) (result i32) func))
- (type $i64_i32_i32_=>_i32 (func_subtype (param i64 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $f64_f64_=>_i32 (func_subtype (param f64 f64) (result i32) func))
- (type $f32_f32_=>_i32 (func_subtype (param f32 f32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32 i32 i32) func))
- (type $f32_i32_i32_=>_i32 (func_subtype (param f32 i32 i32) (result i32) func))
- (type $f64_i32_i32_=>_i32 (func_subtype (param f64 i32 i32) (result i32) func))
- (type $i32_i32_=>_i64 (func_subtype (param i32 i32) (result i64) func))
- (type $i64_i64_i32_i32_=>_i64 (func_subtype (param i64 i64 i32 i32) (result i64) func))
- (type $i32_i64_=>_i32 (func_subtype (param i32 i64) (result i32) func))
- (type $i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $f32_f32_i32_i32_=>_f32 (func_subtype (param f32 f32 i32 i32) (result f32) func))
- (type $f64_f64_i32_i32_=>_f64 (func_subtype (param f64 f64 i32 i32) (result f64) func))
- (type $i64_i32_i32_=>_i64 (func_subtype (param i64 i32 i32) (result i64) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $i32_i32_=>_f64 (func_subtype (param i32 i32) (result f64) func))
- (type $i32_i32_=>_f32 (func_subtype (param i32 i32) (result f32) func))
- (type $i64_i32_i32_=>_none (func_subtype (param i64 i32 i32) func))
- (type $f32_i32_i32_=>_f32 (func_subtype (param f32 i32 i32) (result f32) func))
- (type $f64_i32_i32_=>_f64 (func_subtype (param f64 i32 i32) (result f64) func))
- (type $i32_i32_i64_=>_none (func_subtype (param i32 i32 i64) func))
- (type $f32_i32_i32_=>_none (func_subtype (param f32 i32 i32) func))
- (type $f64_i32_i32_=>_none (func_subtype (param f64 i32 i32) func))
- (type $i32_f32_i32_=>_i32 (func_subtype (param i32 f32 i32) (result i32) func))
- (type $i32_f64_i32_=>_i32 (func_subtype (param i32 f64 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i32_i64_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i64 i32 i64 i32) (result i32) func))
- (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func_subtype (param i32 i32 f64 f64 f64 f64 f64) func))
- (type $i32_i32_f64_=>_none (func_subtype (param i32 i32 f64) func))
- (type $i32_i32_f32_=>_none (func_subtype (param i32 i32 f32) func))
- (type $i32_f32_=>_i32 (func_subtype (param i32 f32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
+ (type $i64_i64_=>_i32 (func (param i64 i64) (result i32)))
+ (type $i64_i32_i32_=>_i32 (func (param i64 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $f64_f64_=>_i32 (func (param f64 f64) (result i32)))
+ (type $f32_f32_=>_i32 (func (param f32 f32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32)))
+ (type $f32_i32_i32_=>_i32 (func (param f32 i32 i32) (result i32)))
+ (type $f64_i32_i32_=>_i32 (func (param f64 i32 i32) (result i32)))
+ (type $i32_i32_=>_i64 (func (param i32 i32) (result i64)))
+ (type $i64_i64_i32_i32_=>_i64 (func (param i64 i64 i32 i32) (result i64)))
+ (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
+ (type $i32_i64_i32_=>_i32 (func (param i32 i64 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $f32_f32_i32_i32_=>_f32 (func (param f32 f32 i32 i32) (result f32)))
+ (type $f64_f64_i32_i32_=>_f64 (func (param f64 f64 i32 i32) (result f64)))
+ (type $i64_i32_i32_=>_i64 (func (param i64 i32 i32) (result i64)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $i32_i32_=>_f64 (func (param i32 i32) (result f64)))
+ (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
+ (type $i64_i32_i32_=>_none (func (param i64 i32 i32)))
+ (type $f32_i32_i32_=>_f32 (func (param f32 i32 i32) (result f32)))
+ (type $f64_i32_i32_=>_f64 (func (param f64 i32 i32) (result f64)))
+ (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
+ (type $f32_i32_i32_=>_none (func (param f32 i32 i32)))
+ (type $f64_i32_i32_=>_none (func (param f64 i32 i32)))
+ (type $i32_f32_i32_=>_i32 (func (param i32 f32 i32) (result i32)))
+ (type $i32_f64_i32_=>_i32 (func (param i32 f64 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i32_i64_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i64 i32 i64 i32) (result i32)))
+ (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
+ (type $i32_i32_f64_=>_none (func (param i32 i32 f64)))
+ (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
+ (type $i32_f32_=>_i32 (func (param i32 f32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (import "env" "trace" (func $~lib/builtins/trace (param i32 i32 f64 f64 f64 f64 f64)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -677,7 +677,7 @@
  (elem $0 (i32.const 1) $~lib/util/sort/COMPARATOR<f64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 $~lib/util/sort/COMPARATOR<i8>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 $~lib/util/sort/COMPARATOR<u8>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 $~lib/util/sort/COMPARATOR<u8>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 $~lib/util/sort/COMPARATOR<i16>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 $~lib/util/sort/COMPARATOR<u16>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 $~lib/util/sort/COMPARATOR<i32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 $~lib/util/sort/COMPARATOR<u32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 $~lib/util/sort/COMPARATOR<i64>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 $~lib/util/sort/COMPARATOR<u64>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 $~lib/util/sort/COMPARATOR<f32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 7152
@@ -744,7 +744,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -876,7 +876,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1029,7 +1029,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1275,7 +1275,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -1387,7 +1387,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -1466,7 +1466,7 @@
   i32.const 49088
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/tlsf/__free (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1518,7 +1518,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1739,7 +1739,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1865,7 +1865,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2058,7 +2058,7 @@
   end
   local.get $1
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -2174,7 +2174,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/util/sort/insertionSort<f64> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 f64)
   (local $6 f64)
   (local $7 i32)
@@ -2333,7 +2333,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f64> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 f64)
   (local $6 i32)
@@ -2486,7 +2486,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<f64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<f64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 f64)
   (local $8 f64)
@@ -2612,7 +2612,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (type $f64_f64_=>_i32) (param $0 f64) (param $1 f64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f64>~anonymous|0 (param $0 f64) (param $1 f64) (result i32)
   (local $2 i64)
   (local $3 i64)
   local.get $0
@@ -2641,53 +2641,53 @@
   i64.lt_s
   i32.sub
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   local.get $0
   local.get $1
   i32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i64_i32_i32_=>_i64) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i32) (result i64)
+ (func $std/typedarray/testReduce<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i32) (result i64)
   local.get $0
   local.get $1
   i64.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_f32_i32_i32_=>_f32) (param $0 f32) (param $1 f32) (param $2 i32) (param $3 i32) (result f32)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 f32) (param $2 i32) (param $3 i32) (result f32)
   local.get $0
   local.get $1
   f32.add
  )
- (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_f64_i32_i32_=>_f64) (param $0 f64) (param $1 f64) (param $2 i32) (param $3 i32) (result f64)
+ (func $std/typedarray/testReduce<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 f64) (param $2 i32) (param $3 i32) (result f64)
   local.get $0
   local.get $1
   f64.add
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   local.get $0
   i32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i64) (param $0 i64) (param $1 i32) (param $2 i32) (result i64)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32) (result i64)
   local.get $0
   local.get $0
   i64.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_f32) (param $0 f32) (param $1 i32) (param $2 i32) (result f32)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 i32) (param $2 i32) (result f32)
   local.get $0
   local.get $0
   f32.mul
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_f64) (param $0 f64) (param $1 i32) (param $2 i32) (result f64)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 i32) (param $2 i32) (result f64)
   local.get $0
   local.get $0
   f64.mul
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.extend8_s
   i32.const 2
   i32.gt_s
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -2725,181 +2725,181 @@
   memory.copy $0 $0
   local.get $2
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 255
   i32.and
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.extend16_s
   i32.const 2
   i32.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 65535
   i32.and
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.const 2
   i64.gt_s
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.const 2
   i64.gt_u
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f32.const 2
   f32.gt
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f64.const 2
   f64.gt
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 255
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 255
   i32.and
   i32.eqz
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 65535
   i32.and
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 65535
   i32.and
   i32.eqz
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 2
   i32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.eqz
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.const 2
   i64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.eqz
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f32.const 2
   f32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f32.const 0
   f32.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f64.const 2
   f64.eq
  )
- (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArraySome<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f64.const 0
   f64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int8Array,i8>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 255
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int16Array,i16>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 65535
   i32.and
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int32Array,i32>~anonymous|1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 4
   i32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Int64Array,i64>~anonymous|1 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.const 4
   i64.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (type $f32_i32_i32_=>_i32) (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float32Array,f32>~anonymous|1 (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f32.const 4
   f32.eq
  )
- (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (type $f64_i32_i32_=>_i32) (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayFindIndex<~lib/typedarray/Float64Array,f64>~anonymous|1 (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   f64.const 4
   f64.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.extend8_s
   i32.const 1
   i32.and
   i32.eqz
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.const 1
   i32.and
   i32.eqz
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i32.extend16_s
   i32.const 1
   i32.and
   i32.eqz
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_i32) (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32) (result i32)
   local.get $0
   i64.const 1
   i64.and
   i64.eqz
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_i32) (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   block $__inlined_func$~lib/math/NativeMathf.mod (result f32)
@@ -3044,7 +3044,7 @@
   f32.const 0
   f32.eq
  )
- (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_i32) (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
+ (func $std/typedarray/testArrayEvery<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i64)
   (local $4 i64)
   (local $5 i64)
@@ -3192,7 +3192,7 @@
   f64.const 0
   f64.eq
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -3296,7 +3296,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/itoa_buffered<i8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -3404,7 +3404,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 255
@@ -3443,7 +3443,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $1
  )
- (func $~lib/util/number/itoa_buffered<i16> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i16> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -3554,7 +3554,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u16> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u16> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 65535
@@ -3603,7 +3603,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $1
  )
- (func $~lib/util/number/itoa_buffered<i32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<i32> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   local.get $1
   i32.const 0
@@ -3692,7 +3692,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u32> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/number/itoa_buffered<u32> (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.const 10
   i32.lt_u
@@ -3757,7 +3757,7 @@
   call $~lib/util/number/utoa32_dec_lut
   local.get $0
  )
- (func $~lib/util/number/utoa64_dec_lut (type $i32_i64_i32_=>_none) (param $0 i32) (param $1 i64) (param $2 i32)
+ (func $~lib/util/number/utoa64_dec_lut (param $0 i32) (param $1 i64) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   loop $while-continue|0
@@ -3845,7 +3845,7 @@
   local.get $2
   call $~lib/util/number/utoa32_dec_lut
  )
- (func $~lib/util/number/itoa_buffered<i64> (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<i64> (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3999,7 +3999,7 @@
   local.get $3
   i32.add
  )
- (func $~lib/util/number/itoa_buffered<u64> (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/util/number/itoa_buffered<u64> (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -4131,7 +4131,7 @@
   end
   local.get $0
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i64_i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i64) (param $3 i32) (param $4 i64) (param $5 i32) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i32) (param $1 i64) (param $2 i64) (param $3 i32) (param $4 i64) (param $5 i32) (result i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i64)
@@ -4556,7 +4556,7 @@
   i32.store16 $0
   local.get $5
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   local.get $2
@@ -4884,7 +4884,7 @@
    end
   end
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $0 i32) (param $1 f64) (result i32)
   (local $2 i64)
   (local $3 i32)
   (local $4 i64)
@@ -5164,7 +5164,7 @@
   local.get $3
   i32.add
  )
- (func $~lib/util/number/dtoa_buffered (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/util/number/dtoa_buffered (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   local.get $1
   f64.const 0
@@ -5234,7 +5234,7 @@
   local.get $1
   call $~lib/util/number/dtoa_core
  )
- (func $~lib/util/sort/insertionSort<i8> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -5379,7 +5379,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i8> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -5519,7 +5519,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i8> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -5628,14 +5628,14 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i8>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i8>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   i32.extend8_s
   local.get $1
   i32.extend8_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.extend8_s
   local.tee $1
@@ -5648,7 +5648,7 @@
   i32.gt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u8> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<u8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -5793,7 +5793,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u8> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -5933,7 +5933,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<u8> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<u8> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -6042,7 +6042,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u8>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u8>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   i32.const 255
   i32.and
@@ -6057,7 +6057,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.const 255
   i32.and
@@ -6072,7 +6072,7 @@
   i32.gt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i16> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -6231,7 +6231,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i16> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -6383,7 +6383,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i16> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -6507,14 +6507,14 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i16>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i16>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   i32.extend16_s
   local.get $1
   i32.extend16_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.extend16_s
   local.tee $1
@@ -6527,7 +6527,7 @@
   i32.gt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u16> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<u16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -6686,7 +6686,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u16> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -6838,7 +6838,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<u16> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<u16> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -6962,7 +6962,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u16>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u16>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   i32.const 65535
   i32.and
@@ -6977,7 +6977,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $1
   i32.const 65535
   i32.and
@@ -6992,7 +6992,7 @@
   i32.gt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -7151,7 +7151,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -7303,7 +7303,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -7427,12 +7427,12 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.lt_s
@@ -7441,7 +7441,7 @@
   i32.gt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i32)
@@ -7600,7 +7600,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -7752,7 +7752,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<u32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<u32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i32)
   (local $8 i32)
@@ -7876,7 +7876,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.gt_u
@@ -7885,7 +7885,7 @@
   i32.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>~anonymous|0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.lt_u
@@ -7894,7 +7894,7 @@
   i32.gt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<i64> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<i64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i64)
   (local $6 i64)
   (local $7 i32)
@@ -8053,7 +8053,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<i64> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<i64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i64)
   (local $6 i32)
@@ -8206,7 +8206,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<i64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<i64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i64)
   (local $8 i64)
@@ -8332,7 +8332,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<i64>~anonymous|0 (type $i64_i64_=>_i32) (param $0 i64) (param $1 i64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<i64>~anonymous|0 (param $0 i64) (param $1 i64) (result i32)
   local.get $0
   local.get $1
   i64.gt_s
@@ -8341,7 +8341,7 @@
   i64.lt_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i64_=>_i32) (param $0 i64) (param $1 i64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i64) (result i32)
   local.get $0
   local.get $1
   i64.lt_s
@@ -8350,7 +8350,7 @@
   i64.gt_s
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<u64> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<u64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 i64)
   (local $6 i64)
   (local $7 i32)
@@ -8509,7 +8509,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<u64> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<u64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i64)
   (local $6 i32)
@@ -8662,7 +8662,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<u64> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<u64> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 i64)
   (local $8 i64)
@@ -8788,7 +8788,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<u64>~anonymous|0 (type $i64_i64_=>_i32) (param $0 i64) (param $1 i64) (result i32)
+ (func $~lib/util/sort/COMPARATOR<u64>~anonymous|0 (param $0 i64) (param $1 i64) (result i32)
   local.get $0
   local.get $1
   i64.gt_u
@@ -8797,7 +8797,7 @@
   i64.lt_u
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 (type $i64_i64_=>_i32) (param $0 i64) (param $1 i64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>~anonymous|0 (param $0 i64) (param $1 i64) (result i32)
   local.get $0
   local.get $1
   i64.lt_u
@@ -8806,7 +8806,7 @@
   i64.gt_u
   i32.sub
  )
- (func $~lib/util/sort/insertionSort<f32> (type $i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+ (func $~lib/util/sort/insertionSort<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
   (local $5 f32)
   (local $6 f32)
   (local $7 i32)
@@ -8965,7 +8965,7 @@
    end
   end
  )
- (func $~lib/util/sort/extendRunRight<f32> (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/util/sort/extendRunRight<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 f32)
   (local $6 i32)
@@ -9118,7 +9118,7 @@
   end
   local.get $4
  )
- (func $~lib/util/sort/mergeRuns<f32> (type $i32_i32_i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
+ (func $~lib/util/sort/mergeRuns<f32> (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32)
   (local $6 i32)
   (local $7 f32)
   (local $8 f32)
@@ -9244,7 +9244,7 @@
    end
   end
  )
- (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (type $f32_f32_=>_i32) (param $0 f32) (param $1 f32) (result i32)
+ (func $~lib/util/sort/COMPARATOR<f32>~anonymous|0 (param $0 f32) (param $1 f32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $0
@@ -9273,7 +9273,7 @@
   i32.lt_s
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_f32_=>_i32) (param $0 f32) (param $1 f32) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 f32) (result i32)
   local.get $0
   local.get $1
   f32.lt
@@ -9282,7 +9282,7 @@
   f32.gt
   i32.sub
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_f64_=>_i32) (param $0 f64) (param $1 f64) (result i32)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 f64) (result i32)
   local.get $0
   local.get $1
   f64.lt
@@ -9291,7 +9291,7 @@
   f64.gt
   i32.sub
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $folding-inner3
    block $folding-inner2
@@ -9387,10 +9387,10 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/typedarray
  )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 16
@@ -9499,7 +9499,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9544,7 +9544,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBufferView#get:byteOffset (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9586,7 +9586,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9619,7 +9619,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9664,7 +9664,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8ClampedArray#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9709,7 +9709,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9754,7 +9754,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9789,7 +9789,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint16Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9834,7 +9834,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9879,7 +9879,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -9914,7 +9914,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -9959,7 +9959,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10004,7 +10004,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10039,7 +10039,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10084,7 +10084,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10129,7 +10129,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10174,7 +10174,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testInstantiate (type $i32_=>_none) (param $0 i32)
+ (func $std/typedarray/testInstantiate (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 48
@@ -10745,7 +10745,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int32Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10800,7 +10800,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -10856,7 +10856,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#subarray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#subarray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -10985,7 +10985,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/typedarray/Float64Array#__set (type $i32_i32_f64_=>_none) (param $0 i32) (param $1 i32) (param $2 f64)
+ (func $~lib/typedarray/Float64Array#__set (param $0 i32) (param $1 i32) (param $2 f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11040,7 +11040,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#subarray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#subarray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11169,7 +11169,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/sort/SORT<f64> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<f64> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -11612,7 +11612,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11659,7 +11659,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#sort@varargs (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#sort@varargs (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11715,7 +11715,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#__get (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/typedarray/Float64Array#__get (param $0 i32) (param $1 i32) (result f64)
   (local $2 f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -11772,7 +11772,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8ClampedArray#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8ClampedArray#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11835,7 +11835,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11887,7 +11887,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int8Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -11938,7 +11938,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#fill (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/typedarray/Int8Array#fill (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12015,7 +12015,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i8>#get:length (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/array/Array<i8>#get:length (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12048,7 +12048,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12100,7 +12100,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/isInt8ArrayEqual (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/isInt8ArrayEqual (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -12227,7 +12227,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/typedarray/Int8Array#fill@varargs (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int8Array#fill@varargs (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12277,7 +12277,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#subarray (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#subarray (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12402,7 +12402,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/typedarray/Int32Array#fill (type $i32_i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
+ (func $~lib/typedarray/Int32Array#fill (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -12515,7 +12515,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/array/Array<i32>#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<i32>#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12569,7 +12569,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/isInt32ArrayEqual (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $std/typedarray/isInt32ArrayEqual (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -12654,7 +12654,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/typedarray/Int32Array#fill@varargs (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int32Array#fill@varargs (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12704,7 +12704,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#slice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#slice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -12822,7 +12822,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/typedarray/Int32Array#slice@varargs (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#slice@varargs (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -12867,7 +12867,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#copyWithin (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#copyWithin (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -13003,7 +13003,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#copyWithin@varargs (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#copyWithin@varargs (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13051,7 +13051,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13102,7 +13102,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#reduce<u8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#reduce<u8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -13184,7 +13184,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/typedarray/Int16Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int16Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13239,7 +13239,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint16Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13294,7 +13294,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#__set (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint32Array#__set (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13349,7 +13349,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/typedarray/Int64Array#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13404,7 +13404,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#__set (type $i32_i32_i64_=>_none) (param $0 i32) (param $1 i32) (param $2 i64)
+ (func $~lib/typedarray/Uint64Array#__set (param $0 i32) (param $1 i32) (param $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13459,7 +13459,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#__set (type $i32_i32_f32_=>_none) (param $0 i32) (param $1 i32) (param $2 f32)
+ (func $~lib/typedarray/Float32Array#__set (param $0 i32) (param $1 i32) (param $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13514,7 +13514,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13575,7 +13575,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13636,7 +13636,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8ClampedArray#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13697,7 +13697,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13762,7 +13762,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint16Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13827,7 +13827,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13892,7 +13892,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#at (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#at (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -13957,7 +13957,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#at (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Int64Array#at (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14023,7 +14023,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint64Array#at (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#at (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14089,7 +14089,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float32Array#at (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/typedarray/Float32Array#at (param $0 i32) (param $1 i32) (result f32)
   (local $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14155,7 +14155,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float64Array#at (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/typedarray/Float64Array#at (param $0 i32) (param $1 i32) (result f64)
   (local $2 f64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -14221,7 +14221,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#reduceRight<u8> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#reduceRight<u8> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -14304,7 +14304,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -14521,7 +14521,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint8Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -14573,7 +14573,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8Array,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -14790,7 +14790,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -15007,7 +15007,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int16Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15063,7 +15063,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -15288,7 +15288,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint16Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15344,7 +15344,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -15569,7 +15569,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -15794,7 +15794,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint32Array#__get (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#__get (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -15850,7 +15850,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -16075,7 +16075,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int64Array#__get (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Int64Array#__get (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16132,7 +16132,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -16357,7 +16357,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint64Array#__get (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#__get (param $0 i32) (param $1 i32) (result i64)
   (local $2 i64)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16414,7 +16414,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -16639,7 +16639,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Float32Array#__get (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__get (param $0 i32) (param $1 i32) (result f32)
   (local $2 f32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -16696,7 +16696,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -16921,7 +16921,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayMap<~lib/typedarray/Float64Array,f64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -17146,7 +17146,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -17416,7 +17416,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8Array,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -17686,7 +17686,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -17956,7 +17956,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -18235,7 +18235,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -18514,7 +18514,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -18793,7 +18793,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -19072,7 +19072,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i64)
@@ -19351,7 +19351,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i64)
@@ -19630,7 +19630,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 f32)
@@ -19909,7 +19909,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayFilter<~lib/typedarray/Float64Array,f64>
   (local $0 i32)
   (local $1 i32)
   (local $2 f64)
@@ -20188,7 +20188,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int8Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20274,7 +20274,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20360,7 +20360,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20448,7 +20448,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint16Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20536,7 +20536,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20624,7 +20624,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -20712,7 +20712,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -20800,7 +20800,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -20888,7 +20888,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -20976,7 +20976,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#some (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#some (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f64)
@@ -21064,7 +21064,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21148,7 +21148,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21232,7 +21232,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int16Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21318,7 +21318,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint16Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21404,7 +21404,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int32Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21490,7 +21490,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint32Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -21576,7 +21576,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int64Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -21662,7 +21662,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint64Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -21748,7 +21748,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float32Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -21834,7 +21834,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float64Array#findIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#findIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f64)
@@ -21920,7 +21920,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int8Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22005,7 +22005,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint8Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22090,7 +22090,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int16Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22177,7 +22177,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint16Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22264,7 +22264,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int32Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22351,7 +22351,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint32Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22438,7 +22438,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int64Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -22525,7 +22525,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Uint64Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -22612,7 +22612,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float32Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -22699,7 +22699,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Float64Array#findLastIndex (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#findLastIndex (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f64)
@@ -22786,7 +22786,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/typedarray/Int8Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22873,7 +22873,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint8Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -22960,7 +22960,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -23049,7 +23049,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint16Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -23138,7 +23138,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -23227,7 +23227,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -23316,7 +23316,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -23405,7 +23405,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i64)
@@ -23494,7 +23494,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f32)
@@ -23583,7 +23583,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#every (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#every (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 f64)
@@ -23672,7 +23672,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int8Array,i8>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -23744,7 +23744,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#forEach (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Uint8Array#forEach (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -23822,7 +23822,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int16Array,i16>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -23894,7 +23894,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int32Array,i32>~anonymous|0 (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -23962,7 +23962,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 (type $i64_i32_i32_=>_none) (param $0 i64) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Int64Array,i64>~anonymous|0 (param $0 i64) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24031,7 +24031,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 (type $f32_i32_i32_=>_none) (param $0 f32) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float32Array,f32>~anonymous|0 (param $0 f32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24100,7 +24100,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 (type $f64_i32_i32_=>_none) (param $0 f64) (param $1 i32) (param $2 i32)
+ (func $std/typedarray/testArrayForEach<~lib/typedarray/Float64Array,f64>~anonymous|0 (param $0 f64) (param $1 i32) (param $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -24169,7 +24169,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i64)
@@ -24340,7 +24340,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -24558,7 +24558,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -24668,7 +24668,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8Array,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -24888,7 +24888,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8ClampedArray#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -24998,7 +24998,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -25218,7 +25218,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -25353,7 +25353,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -25467,7 +25467,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -25684,7 +25684,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -25798,7 +25798,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -26018,7 +26018,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -26108,7 +26108,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -26323,7 +26323,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -26437,7 +26437,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -26651,7 +26651,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i64)
@@ -26741,7 +26741,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -26855,7 +26855,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -27073,7 +27073,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -27187,7 +27187,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -27405,7 +27405,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f32)
@@ -27495,7 +27495,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#subarray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#subarray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -27609,7 +27609,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -27827,7 +27827,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#reverse (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#reverse (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -27917,7 +27917,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayReverse<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayReverse<~lib/typedarray/Float64Array,f64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -28136,7 +28136,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -28228,7 +28228,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -28317,7 +28317,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int8Array#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -28368,7 +28368,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -28906,7 +28906,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8Array,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -29444,7 +29444,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -29982,7 +29982,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30076,7 +30076,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -30167,7 +30167,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -30218,7 +30218,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -30755,7 +30755,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -31293,7 +31293,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31385,7 +31385,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -31474,7 +31474,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int32Array#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -31525,7 +31525,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -32062,7 +32062,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#indexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#indexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32154,7 +32154,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#lastIndexOf (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#lastIndexOf (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32243,7 +32243,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint32Array#lastIndexOf@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#lastIndexOf@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -32294,7 +32294,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -32830,7 +32830,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#indexOf (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#indexOf (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -32922,7 +32922,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#lastIndexOf (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#lastIndexOf (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -33011,7 +33011,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int64Array#lastIndexOf@varargs (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/typedarray/Int64Array#lastIndexOf@varargs (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -33062,7 +33062,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -33599,7 +33599,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#indexOf (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#indexOf (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -33691,7 +33691,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#lastIndexOf (type $i32_i64_i32_=>_i32) (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#lastIndexOf (param $0 i32) (param $1 i64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -33780,7 +33780,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Uint64Array#lastIndexOf@varargs (type $i32_i64_=>_i32) (param $0 i32) (param $1 i64) (result i32)
+ (func $~lib/typedarray/Uint64Array#lastIndexOf@varargs (param $0 i32) (param $1 i64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -33831,7 +33831,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -34368,7 +34368,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#indexOf (type $i32_f32_i32_=>_i32) (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#indexOf (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -34460,7 +34460,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#lastIndexOf (type $i32_f32_i32_=>_i32) (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#lastIndexOf (param $0 i32) (param $1 f32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -34549,7 +34549,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#lastIndexOf@varargs (type $i32_f32_=>_i32) (param $0 i32) (param $1 f32) (result i32)
+ (func $~lib/typedarray/Float32Array#lastIndexOf@varargs (param $0 i32) (param $1 f32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -34600,7 +34600,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -35137,7 +35137,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float64Array#indexOf (type $i32_f64_i32_=>_i32) (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#indexOf (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -35229,7 +35229,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#lastIndexOf (type $i32_f64_i32_=>_i32) (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#lastIndexOf (param $0 i32) (param $1 f64) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -35318,7 +35318,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float64Array#lastIndexOf@varargs (type $i32_f64_=>_i32) (param $0 i32) (param $1 f64) (result i32)
+ (func $~lib/typedarray/Float64Array#lastIndexOf@varargs (param $0 i32) (param $1 f64) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -35369,7 +35369,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayIndexOfAndLastIndexOf<~lib/typedarray/Float64Array,f64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -35907,7 +35907,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/string/String#substring (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#substring (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -36015,7 +36015,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/typedarray/Int8Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -36204,7 +36204,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -36364,7 +36364,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/typedarray/Uint8Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -36553,7 +36553,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint8Array#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#toString (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -36589,7 +36589,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Int16Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -36782,7 +36782,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint16Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -36975,7 +36975,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int32Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -37168,7 +37168,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint32Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -37361,7 +37361,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int64Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i64)
@@ -37736,7 +37736,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/string/joinIntegerArray<u64> (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/string/joinIntegerArray<u64> (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i32)
@@ -38048,7 +38048,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/typedarray/Uint64Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -38095,7 +38095,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/typedarray/Float32Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -38290,7 +38290,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Float64Array#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/typedarray/Float64Array#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -38482,7 +38482,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint8Array.wrap@varargs (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array.wrap@varargs (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -38630,7 +38630,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/arraybuffer/ArrayBuffer#slice (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#slice (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -38728,7 +38728,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -38999,7 +38999,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -39271,7 +39271,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -39555,7 +39555,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -39840,7 +39840,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -40123,7 +40123,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -40406,7 +40406,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -40691,7 +40691,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -40976,7 +40976,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -41261,7 +41261,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArrayWrap<~lib/typedarray/Float64Array,f64> (type $none_=>_none)
+ (func $std/typedarray/testArrayWrap<~lib/typedarray/Float64Array,f64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -41546,7 +41546,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i32>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i32>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -41641,7 +41641,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -41788,7 +41788,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -41887,7 +41887,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Uint8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -41959,7 +41959,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -42058,7 +42058,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i8>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int8Array#set<~lib/array/Array<i8>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -42134,7 +42134,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int8Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int8Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -42576,7 +42576,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint8Array#__uget (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#__uget (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -42612,7 +42612,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -42712,7 +42712,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -43154,7 +43154,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8ClampedArray> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint8ClampedArray> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -43254,7 +43254,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int64Array> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i64)
   (local $4 i32)
   (local $5 i32)
@@ -43377,7 +43377,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int16Array> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Uint8ClampedArray#set<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -43495,7 +43495,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8ClampedArray> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint8ClampedArray>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -44124,7 +44124,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i32>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i32>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -44221,7 +44221,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#__uget (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#__uget (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -44259,7 +44259,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -44359,7 +44359,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -44460,7 +44460,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Uint8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -44555,7 +44555,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -44633,7 +44633,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i8>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int16Array#set<~lib/array/Array<i8>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -44732,7 +44732,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int16Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int16Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -45178,7 +45178,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint16Array#__uget (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#__uget (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45216,7 +45216,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -45316,7 +45316,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint16Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint16Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -45762,7 +45762,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i32>> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i32>> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   global.get $~lib/memory/__stack_pointer
@@ -45849,7 +45849,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#__uget (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#__uget (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -45887,7 +45887,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int32Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int32Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -45987,7 +45987,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -46088,7 +46088,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Uint8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -46183,7 +46183,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -46284,7 +46284,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i8>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int32Array#set<~lib/array/Array<i8>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -46383,7 +46383,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int32Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -46832,7 +46832,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint32Array#__uget (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#__uget (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -46870,7 +46870,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint32Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint32Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -46970,7 +46970,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint32Array>
   (local $0 i32)
   (local $1 f32)
   (local $2 f64)
@@ -47419,7 +47419,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i32>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i32>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -47516,7 +47516,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#__uget (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Int64Array#__uget (param $0 i32) (param $1 i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -47555,7 +47555,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i64)
@@ -47655,7 +47655,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -47733,7 +47733,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Uint8Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Uint8Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -47828,7 +47828,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int16Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/typedarray/Int16Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -47929,7 +47929,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i8>> (type $i32_=>_none) (param $0 i32)
+ (func $~lib/typedarray/Int64Array#set<~lib/array/Array<i8>> (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -48028,7 +48028,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Int64Array>
   (local $0 i32)
   (local $1 f64)
   (local $2 f32)
@@ -48474,7 +48474,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Uint64Array#__uget (type $i32_i32_=>_i64) (param $0 i32) (param $1 i32) (result i64)
+ (func $~lib/typedarray/Uint64Array#__uget (param $0 i32) (param $1 i32) (result i64)
   (local $2 i32)
   (local $3 i64)
   global.get $~lib/memory/__stack_pointer
@@ -48513,7 +48513,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Uint64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Uint64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i64)
   (local $4 i64)
@@ -48613,7 +48613,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Uint64Array>
   (local $0 i32)
   (local $1 f64)
   (local $2 f32)
@@ -49059,7 +49059,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Float32Array#__uget (type $i32_i32_=>_f32) (param $0 i32) (param $1 i32) (result f32)
+ (func $~lib/typedarray/Float32Array#__uget (param $0 i32) (param $1 i32) (result f32)
   (local $2 i32)
   (local $3 f32)
   global.get $~lib/memory/__stack_pointer
@@ -49098,7 +49098,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Float32Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Float32Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 f32)
   (local $4 f32)
@@ -49198,7 +49198,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float32Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float32Array>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -49833,7 +49833,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/typedarray/Float64Array#__uget (type $i32_i32_=>_f64) (param $0 i32) (param $1 i32) (result f64)
+ (func $~lib/typedarray/Float64Array#__uget (param $0 i32) (param $1 i32) (result f64)
   (local $2 i32)
   (local $3 f64)
   global.get $~lib/memory/__stack_pointer
@@ -49872,7 +49872,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $std/typedarray/valuesEqual<~lib/typedarray/Float64Array> (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $std/typedarray/valuesEqual<~lib/typedarray/Float64Array> (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 f64)
   (local $4 f64)
@@ -49970,7 +49970,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float64Array> (type $none_=>_none)
+ (func $std/typedarray/testTypedArraySet<~lib/typedarray/Float64Array>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -50683,7 +50683,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<i8> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i8> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -51121,7 +51121,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int8Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int8Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -51168,7 +51168,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int8Array,i8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -51389,7 +51389,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<u8> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<u8> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -51827,7 +51827,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint8Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint8Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -51874,7 +51874,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8Array,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -52095,7 +52095,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint8ClampedArray,u8>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -52316,7 +52316,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<i16> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i16> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -52756,7 +52756,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int16Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int16Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -52803,7 +52803,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int16Array,i16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -53024,7 +53024,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<u16> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<u16> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -53464,7 +53464,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint16Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint16Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -53511,7 +53511,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint16Array,u16>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -53732,7 +53732,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<i32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -54172,7 +54172,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int32Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int32Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -54219,7 +54219,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int32Array,i32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -54440,7 +54440,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<u32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<u32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -54880,7 +54880,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint32Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint32Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -54927,7 +54927,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint32Array,u32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -55148,7 +55148,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<i64> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<i64> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -55590,7 +55590,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Int64Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Int64Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -55637,7 +55637,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Int64Array,i64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -55858,7 +55858,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<u64> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<u64> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -56300,7 +56300,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Uint64Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Uint64Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -56347,7 +56347,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Uint64Array,u64>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -56568,7 +56568,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/util/sort/SORT<f32> (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/sort/SORT<f32> (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -57011,7 +57011,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/typedarray/Float32Array#sort (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/typedarray/Float32Array#sort (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -57058,7 +57058,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32> (type $none_=>_none)
+ (func $std/typedarray/testArraySort<~lib/typedarray/Float32Array,f32>
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -57279,7 +57279,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $start:std/typedarray (type $none_=>_none)
+ (func $start:std/typedarray
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -69953,7 +69953,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__newArray (type $i32_i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/rt/__newArray (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
@@ -70019,7 +70019,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/util/number/itoa32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -70136,7 +70136,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $~lib/util/number/utoa32 (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/util/number/utoa32 (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -70231,7 +70231,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/util/number/dtoa (param $0 f64) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -70314,7 +70314,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/arraybuffer/ArrayBuffer#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/arraybuffer/ArrayBuffer#constructor (param $0 i32) (result i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -70356,7 +70356,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -70375,7 +70375,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32)
   local.get $0
   i32.eqz
   if
diff --git a/tests/compiler/std/uri.debug.wat b/tests/compiler/std/uri.debug.wat
index 49d96e1587..8e053c1551 100644
--- a/tests/compiler/std/uri.debug.wat
+++ b/tests/compiler/std/uri.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -104,11 +104,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -117,17 +117,17 @@
   i32.shr_u
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -137,11 +137,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -150,14 +150,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -199,7 +199,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -211,11 +211,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -225,7 +225,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -281,15 +281,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -315,7 +315,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -335,7 +335,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -355,7 +355,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -391,7 +391,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -417,7 +417,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -438,11 +438,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -453,39 +453,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -721,7 +721,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1085,7 +1085,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1250,7 +1250,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1395,7 +1395,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1433,7 +1433,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1446,7 +1446,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1463,7 +1463,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1488,7 +1488,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1668,7 +1668,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1726,7 +1726,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1747,7 +1747,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1763,7 +1763,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1971,7 +1971,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2061,7 +2061,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2170,7 +2170,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2234,7 +2234,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2247,17 +2247,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2310,11 +2310,11 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/Object#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $oldPtr i32) (param $size i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $oldPtr i32) (param $size i32) (result i32)
   (local $oldObj i32)
   (local $newPtr i32)
   (local $4 i32)
@@ -2360,7 +2360,7 @@
   local.get $newPtr
   return
  )
- (func $~lib/util/uri/storeHex (type $i32_i32_i32_=>_none) (param $dst i32) (param $offset i32) (param $ch i32)
+ (func $~lib/util/uri/storeHex (param $dst i32) (param $offset i32) (param $ch i32)
   local.get $dst
   local.get $offset
   i32.add
@@ -2388,7 +2388,7 @@
   i32.or
   i32.store $0 offset=2
  )
- (func $~lib/util/uri/encode (type $i32_i32_i32_=>_i32) (param $src i32) (param $len i32) (param $table i32) (result i32)
+ (func $~lib/util/uri/encode (param $src i32) (param $len i32) (param $table i32) (result i32)
   (local $i i32)
   (local $offset i32)
   (local $outSize i32)
@@ -2742,7 +2742,7 @@
   local.get $dst
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -2846,7 +2846,7 @@
   i32.const 0
   return
  )
- (func $~lib/util/uri/loadHex (type $i32_i32_=>_i32) (param $src i32) (param $offset i32) (result i32)
+ (func $~lib/util/uri/loadHex (param $src i32) (param $offset i32) (result i32)
   (local $c0 i32)
   (local $c1 i32)
   (local $ch i32)
@@ -2942,7 +2942,7 @@
   end
   return
  )
- (func $~lib/util/uri/decode (type $i32_i32_i32_=>_i32) (param $src i32) (param $len i32) (param $component i32) (result i32)
+ (func $~lib/util/uri/decode (param $src i32) (param $len i32) (param $component i32) (result i32)
   (local $i i32)
   (local $offset i32)
   (local $ch i32)
@@ -3349,7 +3349,7 @@
   local.get $dst
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -3395,7 +3395,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 352
   local.get $0
@@ -3407,7 +3407,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3421,10 +3421,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -3449,10 +3449,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/uri
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3465,7 +3465,7 @@
    unreachable
   end
  )
- (func $~lib/uri/encodeURIComponent (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/uri/encodeURIComponent (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3493,7 +3493,7 @@
   local.get $1
   return
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -3589,7 +3589,7 @@
   local.get $3
   return
  )
- (func $~lib/uri/encodeURI (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/uri/encodeURI (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3617,7 +3617,7 @@
   local.get $1
   return
  )
- (func $~lib/uri/decodeURIComponent (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/uri/decodeURIComponent (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3645,7 +3645,7 @@
   local.get $1
   return
  )
- (func $~lib/uri/decodeURI (type $i32_=>_i32) (param $str i32) (result i32)
+ (func $~lib/uri/decodeURI (param $str i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3673,7 +3673,7 @@
   local.get $1
   return
  )
- (func $start:std/uri (type $none_=>_none)
+ (func $start:std/uri
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
diff --git a/tests/compiler/std/uri.release.wat b/tests/compiler/std/uri.release.wat
index 88cb18c987..d2bd63fbce 100644
--- a/tests/compiler/std/uri.release.wat
+++ b/tests/compiler/std/uri.release.wat
@@ -1,13 +1,13 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -153,7 +153,7 @@
  (data (i32.const 4336) "\04\00\00\00 \00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1376
@@ -200,7 +200,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -332,7 +332,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -485,7 +485,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -731,7 +731,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -843,7 +843,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -922,7 +922,7 @@
   i32.const 37136
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1189,7 +1189,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1315,7 +1315,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1621,7 +1621,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/rt/itcms/__renew (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__renew (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1659,7 +1659,7 @@
   memory.copy $0 $0
   local.get $2
  )
- (func $~lib/util/uri/encode (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/uri/encode (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2108,7 +2108,7 @@
    local.get $3
   end
  )
- (func $~lib/util/uri/decode (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/uri/decode (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2573,7 +2573,7 @@
    local.get $8
   end
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -2602,10 +2602,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:std/uri
  )
- (func $~lib/uri/encodeURIComponent (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/uri/encodeURIComponent (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2645,7 +2645,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2805,7 +2805,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/uri/encodeURI (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/uri/encodeURI (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2845,7 +2845,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/uri/decodeURIComponent (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/uri/decodeURIComponent (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2885,7 +2885,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $~lib/uri/decodeURI (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/uri/decodeURI (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2925,7 +2925,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $start:std/uri (type $none_=>_none)
+ (func $start:std/uri
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4221,7 +4221,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/super-inline.debug.wat b/tests/compiler/super-inline.debug.wat
index 7403d9dc7b..7ea89483c7 100644
--- a/tests/compiler/super-inline.debug.wat
+++ b/tests/compiler/super-inline.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -43,17 +43,17 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -63,11 +63,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -76,14 +76,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -125,7 +125,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -137,11 +137,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -151,7 +151,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -207,15 +207,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -241,7 +241,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -261,7 +261,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -281,7 +281,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -317,7 +317,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -343,7 +343,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -364,11 +364,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -379,39 +379,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -647,7 +647,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1011,7 +1011,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1176,7 +1176,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1321,7 +1321,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1359,7 +1359,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1372,7 +1372,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1389,7 +1389,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1414,7 +1414,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1594,7 +1594,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1652,7 +1652,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1673,7 +1673,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1689,7 +1689,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -1897,7 +1897,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -1987,7 +1987,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2096,7 +2096,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2160,7 +2160,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2173,17 +2173,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2236,11 +2236,11 @@
   local.get $ptr
   return
  )
- (func $super-inline/Foo#a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $super-inline/Foo#a (param $this i32) (result i32)
   i32.const 1
   return
  )
- (func $super-inline/Foo#a@override (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $super-inline/Foo#a@override (param $0 i32) (result i32)
   (local $1 i32)
   block $default
    block $case0
@@ -2262,7 +2262,7 @@
   local.get $0
   call $super-inline/Foo#a
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $super-inline/foo
   local.tee $1
@@ -2285,7 +2285,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2299,10 +2299,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $super-inline/Bar
     block $super-inline/Foo
@@ -2333,10 +2333,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:super-inline
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2349,7 +2349,7 @@
    unreachable
   end
  )
- (func $super-inline/Foo#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $super-inline/Foo#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2387,7 +2387,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $super-inline/Bar#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $super-inline/Bar#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2425,7 +2425,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:super-inline (type $none_=>_none)
+ (func $start:super-inline
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2479,7 +2479,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -2507,7 +2507,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $super-inline/Bar#a (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $super-inline/Bar#a (param $this i32) (result i32)
   (local $this|1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
diff --git a/tests/compiler/super-inline.release.wat b/tests/compiler/super-inline.release.wat
index ad0ed2e465..8de879fd22 100644
--- a/tests/compiler/super-inline.release.wat
+++ b/tests/compiler/super-inline.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -34,7 +34,7 @@
  (data (i32.const 1440) "\06\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 \00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $super-inline/foo
@@ -91,7 +91,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -223,7 +223,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -376,7 +376,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -622,7 +622,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -734,7 +734,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -813,7 +813,7 @@
   i32.const 34240
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1080,7 +1080,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1137,7 +1137,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1370,7 +1370,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $super-inline/Bar
     block $super-inline/Foo
@@ -1405,7 +1405,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1520,7 +1520,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $super-inline/Foo#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $super-inline/Foo#constructor (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -1588,7 +1588,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $super-inline/Bar#a (type $i32_=>_none) (param $0 i32)
+ (func $super-inline/Bar#a (param $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1617,7 +1617,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/switch.debug.wat b/tests/compiler/switch.debug.wat
index b57c16116b..290a4c7c1c 100644
--- a/tests/compiler/switch.debug.wat
+++ b/tests/compiler/switch.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__data_end i32 (i32.const 60))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32828))
@@ -12,7 +12,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $switch/doSwitch (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitch (param $n i32) (result i32)
   (local $1 i32)
   block $case4|0
    block $case3|0
@@ -50,7 +50,7 @@
   i32.const 23
   return
  )
- (func $switch/doSwitchDefaultOmitted (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchDefaultOmitted (param $n i32) (result i32)
   (local $1 i32)
   block $break|0
    block $case2|0
@@ -82,7 +82,7 @@
   i32.const 0
   return
  )
- (func $switch/doSwitchBreakCase (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchBreakCase (param $n i32) (result i32)
   (local $1 i32)
   block $break|0
    block $case1|0
@@ -103,7 +103,7 @@
   i32.const 1
   return
  )
- (func $switch/doSwitchBreakDefault (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchBreakDefault (param $n i32) (result i32)
   (local $1 i32)
   block $break|0
    block $case1|0
@@ -124,7 +124,7 @@
   i32.const 2
   return
  )
- (func $switch/doSwitchFallThroughCase (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchFallThroughCase (param $n i32) (result i32)
   (local $1 i32)
   block $case1|0
    block $case0|0
@@ -142,7 +142,7 @@
   i32.const 1
   return
  )
- (func $switch/doSwitchFallThroughDefault (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchFallThroughDefault (param $n i32) (result i32)
   (local $1 i32)
   block $case1|0
    block $case0|0
@@ -160,13 +160,13 @@
   i32.const 2
   return
  )
- (func $switch/doSwitchEmpty (type $i32_=>_i32) (param $n i32) (result i32)
+ (func $switch/doSwitchEmpty (param $n i32) (result i32)
   local.get $n
   drop
   i32.const 2
   return
  )
- (func $start:switch (type $none_=>_none)
+ (func $start:switch
   i32.const 0
   call $switch/doSwitch
   i32.const 0
@@ -558,7 +558,7 @@
    unreachable
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:switch
  )
 )
diff --git a/tests/compiler/tablebase.debug.wat b/tests/compiler/tablebase.debug.wat
index 58c7a0f809..d5f3c80a3f 100644
--- a/tests/compiler/tablebase.debug.wat
+++ b/tests/compiler/tablebase.debug.wat
@@ -1,7 +1,7 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $tablebase/staticFunction i32 (i32.const 32))
  (global $~lib/native/ASC_TABLE_BASE i32 (i32.const 32))
@@ -15,18 +15,18 @@
  (elem $0 (i32.const 32) $tablebase/foo)
  (export "memory" (memory $0))
  (start $~start)
- (func $tablebase/foo (type $none_=>_none)
+ (func $tablebase/foo
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:index (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:index (param $this i32) (result i32)
   local.get $this
   i32.load $0
   return
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:tablebase
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -39,7 +39,7 @@
    unreachable
   end
  )
- (func $start:tablebase (type $none_=>_none)
+ (func $start:tablebase
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/tablebase.release.wat b/tests/compiler/tablebase.release.wat
index 562e67423f..8155e7499c 100644
--- a/tests/compiler/tablebase.release.wat
+++ b/tests/compiler/tablebase.release.wat
@@ -1,6 +1,6 @@
 (module
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_none (func_subtype func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_none (func))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33884))
  (memory $0 1)
@@ -10,7 +10,7 @@
  (data (i32.const 1080) "\02\00\00\00\18\00\00\00t\00a\00b\00l\00e\00b\00a\00s\00e\00.\00t\00s")
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/templateliteral.debug.wat b/tests/compiler/templateliteral.debug.wat
index 633cd83eb4..54859d9aaa 100644
--- a/tests/compiler/templateliteral.debug.wat
+++ b/tests/compiler/templateliteral.debug.wat
@@ -1,21 +1,21 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i64_i32_=>_none (func_subtype (param i32 i64 i32) func))
- (type $i64_i32_=>_i32 (func_subtype (param i64 i32) (result i32) func))
- (type $i32_i64_i32_i32_=>_none (func_subtype (param i32 i64 i32 i32) func))
- (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func_subtype (param i32 i64 i32 i64 i32 i64 i32) (result i32) func))
- (type $i32_f64_=>_i32 (func_subtype (param i32 f64) (result i32) func))
- (type $f64_i32_=>_i32 (func_subtype (param f64 i32) (result i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i64_i32_=>_none (func (param i32 i64 i32)))
+ (type $i64_i32_=>_i32 (func (param i64 i32) (result i32)))
+ (type $i32_i64_i32_i32_=>_none (func (param i32 i64 i32 i32)))
+ (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
+ (type $i32_f64_=>_i32 (func (param i32 f64) (result i32)))
+ (type $f64_i32_=>_i32 (func (param f64 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -106,11 +106,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -119,7 +119,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -223,17 +223,17 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -243,11 +243,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -256,14 +256,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -305,7 +305,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -317,11 +317,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -331,7 +331,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -387,15 +387,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -421,7 +421,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -441,7 +441,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -461,7 +461,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -497,7 +497,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -523,7 +523,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -544,11 +544,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -559,39 +559,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -827,7 +827,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1191,7 +1191,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1356,7 +1356,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1501,7 +1501,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1539,7 +1539,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1552,7 +1552,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1569,7 +1569,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1594,7 +1594,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1774,7 +1774,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1832,7 +1832,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1853,7 +1853,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1869,7 +1869,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2077,7 +2077,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2167,7 +2167,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2276,7 +2276,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2340,7 +2340,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2353,17 +2353,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2416,7 +2416,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
+ (func $~lib/rt/itcms/__link (param $parentPtr i32) (param $childPtr i32) (param $expectMultiple i32)
   (local $child i32)
   (local $parent i32)
   (local $parentColor i32)
@@ -2484,7 +2484,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (type $i32_i32_i32_=>_none) (param $this i32) (param $index i32) (param $value i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (param $this i32) (param $index i32) (param $value i32)
   local.get $this
   local.get $index
   i32.const 2
@@ -2499,7 +2499,7 @@
   i32.const 1
   call $~lib/rt/itcms/__link
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -2508,7 +2508,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/number/decimalCount32 (type $i32_=>_i32) (param $value i32) (result i32)
+ (func $~lib/util/number/decimalCount32 (param $value i32) (result i32)
   local.get $value
   i32.const 100000
   i32.lt_u
@@ -2563,7 +2563,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $buffer i32) (param $num i32) (param $offset i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $buffer i32) (param $num i32) (param $offset i32)
   (local $t i32)
   (local $r i32)
   (local $d1 i32)
@@ -2703,7 +2703,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/utoa_hex_lut (type $i32_i64_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32)
+ (func $~lib/util/number/utoa_hex_lut (param $buffer i32) (param $num i64) (param $offset i32)
   loop $while-continue|0
    local.get $offset
    i32.const 2
@@ -2750,7 +2750,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/util/number/ulog_base (type $i64_i32_=>_i32) (param $num i64) (param $base i32) (result i32)
+ (func $~lib/util/number/ulog_base (param $num i64) (param $base i32) (result i32)
   (local $value i32)
   (local $b64 i64)
   (local $b i64)
@@ -2827,7 +2827,7 @@
   i32.sub
   return
  )
- (func $~lib/util/number/utoa64_any_core (type $i32_i64_i32_i32_=>_none) (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
+ (func $~lib/util/number/utoa64_any_core (param $buffer i32) (param $num i64) (param $offset i32) (param $radix i32)
   (local $base i64)
   (local $shift i64)
   (local $mask i64)
@@ -2918,13 +2918,13 @@
    end
   end
  )
- (func $~lib/number/I32#toString (type $i32_i32_=>_i32) (param $this i32) (param $radix i32) (result i32)
+ (func $~lib/number/I32#toString (param $this i32) (param $radix i32) (result i32)
   local.get $this
   local.get $radix
   call $~lib/util/number/itoa32
   return
  )
- (func $~lib/util/number/genDigits (type $i32_i64_i32_i64_i32_i64_i32_=>_i32) (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
+ (func $~lib/util/number/genDigits (param $buffer i32) (param $w_frc i64) (param $w_exp i32) (param $mp_frc i64) (param $mp_exp i32) (param $delta i64) (param $sign i32) (result i32)
   (local $one_exp i32)
   (local $one_frc i64)
   (local $mask i64)
@@ -3425,7 +3425,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $buffer i32) (param $length i32) (param $k i32) (result i32)
+ (func $~lib/util/number/prettify (param $buffer i32) (param $length i32) (param $k i32) (result i32)
   (local $kk i32)
   (local $i i32)
   (local $ptr i32)
@@ -3763,7 +3763,7 @@
   end
   unreachable
  )
- (func $~lib/util/number/dtoa_core (type $i32_f64_=>_i32) (param $buffer i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $buffer i32) (param $value f64) (result i32)
   (local $sign i32)
   (local $value|3 f64)
   (local $buffer|4 i32)
@@ -4240,21 +4240,21 @@
   i32.add
   return
  )
- (func $~lib/number/F64#toString (type $f64_i32_=>_i32) (param $this f64) (param $radix i32) (result i32)
+ (func $~lib/number/F64#toString (param $this f64) (param $radix i32) (result i32)
   local.get $this
   call $~lib/util/number/dtoa
   return
  )
- (func $templateliteral/Ref#set:value (type $i32_i32_=>_none) (param $this i32) (param $value i32)
+ (func $templateliteral/Ref#set:value (param $this i32) (param $value i32)
   local.get $this
   local.get $value
   i32.store $0
  )
- (func $templateliteral/Ref#get:value (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $templateliteral/Ref#get:value (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $templateliteral/RecursiveObject#set:key (type $i32_i32_=>_none) (param $this i32) (param $key i32)
+ (func $templateliteral/RecursiveObject#set:key (param $this i32) (param $key i32)
   local.get $this
   local.get $key
   i32.store $0
@@ -4263,7 +4263,7 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $templateliteral/RecursiveObject#set:val (type $i32_i32_=>_none) (param $this i32) (param $val i32)
+ (func $templateliteral/RecursiveObject#set:val (param $this i32) (param $val i32)
   local.get $this
   local.get $val
   i32.store $0 offset=4
@@ -4272,15 +4272,15 @@
   i32.const 0
   call $~lib/rt/itcms/__link
  )
- (func $templateliteral/RecursiveObject#get:val (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $templateliteral/RecursiveObject#get:val (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $templateliteral/RecursiveObject#get:key (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $templateliteral/RecursiveObject#get:key (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $start:templateliteral (type $none_=>_none)
+ (func $start:templateliteral
   memory.size $0
   i32.const 16
   i32.shl
@@ -4305,7 +4305,7 @@
   call $templateliteral/test_ref
   call $templateliteral/test_recursive
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 384
   local.get $0
@@ -4320,7 +4320,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4334,10 +4334,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__visit (param $this i32) (param $cookie i32)
   (local $cur i32)
   (local $end i32)
   (local $val i32)
@@ -4374,7 +4374,7 @@
    end
   end
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -4382,7 +4382,7 @@
   local.get $1
   call $~lib/staticarray/StaticArray<~lib/string/String>#__visit
  )
- (func $templateliteral/RecursiveObject~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $templateliteral/RecursiveObject~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -4404,7 +4404,7 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $templateliteral/RecursiveObject
     block $templateliteral/Ref
@@ -4444,7 +4444,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -4453,7 +4453,7 @@
   global.set $~started
   call $start:templateliteral
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -4466,7 +4466,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4562,7 +4562,7 @@
   local.get $3
   return
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $this i32) (param $other i32) (result i32)
+ (func $~lib/string/String#concat (param $this i32) (param $other i32) (result i32)
   (local $thisSize i32)
   (local $otherSize i32)
   (local $outSize i32)
@@ -4638,7 +4638,7 @@
   local.get $6
   return
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_i32_=>_i32) (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $dataStart i32) (param $length i32) (param $separator i32) (result i32)
   (local $lastIndex i32)
   (local $4 i32)
   (local $estLen i32)
@@ -4868,7 +4868,7 @@
   local.get $13
   return
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_i32_=>_i32) (param $this i32) (param $separator i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $this i32) (param $separator i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -4913,7 +4913,7 @@
   local.get $2
   return
  )
- (func $templateliteral/test_string (type $none_=>_none)
+ (func $templateliteral/test_string
   (local $a i32)
   (local $b i32)
   (local $2 i32)
@@ -5067,7 +5067,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/test_integer (type $none_=>_none)
+ (func $templateliteral/test_integer
   (local $a i32)
   (local $b i32)
   (local $2 i32)
@@ -5227,7 +5227,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/test_float (type $none_=>_none)
+ (func $templateliteral/test_float
   (local $a f64)
   (local $b f64)
   (local $2 i32)
@@ -5387,7 +5387,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/test_fast_paths_string (type $none_=>_none)
+ (func $templateliteral/test_fast_paths_string
   (local $a i32)
   (local $b i32)
   (local $2 i32)
@@ -5633,7 +5633,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/Ref#constructor (type $i32_i32_=>_i32) (param $this i32) (param $value i32) (result i32)
+ (func $templateliteral/Ref#constructor (param $this i32) (param $value i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5669,7 +5669,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $~lib/string/String.__concat (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__concat (param $left i32) (param $right i32) (result i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -5700,7 +5700,7 @@
   local.get $2
   return
  )
- (func $templateliteral/Ref#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $templateliteral/Ref#toString (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -5742,7 +5742,7 @@
   local.get $1
   return
  )
- (func $templateliteral/test_ref (type $none_=>_none)
+ (func $templateliteral/test_ref
   (local $a i32)
   (local $b i32)
   (local $2 i32)
@@ -5930,7 +5930,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/RecursiveObject#constructor (type $i32_i32_i32_=>_i32) (param $this i32) (param $key i32) (param $val i32) (result i32)
+ (func $templateliteral/RecursiveObject#constructor (param $this i32) (param $key i32) (param $val i32) (result i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -5987,7 +5987,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $3
  )
- (func $templateliteral/RecursiveObject#toString (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $templateliteral/RecursiveObject#toString (param $this i32) (result i32)
   (local $val i32)
   (local $2 i32)
   (local $3 i32)
@@ -6098,7 +6098,7 @@
   local.get $4
   return
  )
- (func $templateliteral/test_recursive (type $none_=>_none)
+ (func $templateliteral/test_recursive
   (local $c i32)
   (local $b i32)
   (local $a i32)
@@ -6191,7 +6191,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/util/number/itoa32 (type $i32_i32_=>_i32) (param $value i32) (param $radix i32) (result i32)
+ (func $~lib/util/number/itoa32 (param $value i32) (param $radix i32) (result i32)
   (local $sign i32)
   (local $out i32)
   (local $decimals i32)
@@ -6373,7 +6373,7 @@
   local.get $14
   return
  )
- (func $~lib/util/number/dtoa (type $f64_=>_i32) (param $value f64) (result i32)
+ (func $~lib/util/number/dtoa (param $value f64) (result i32)
   (local $size i32)
   (local $result i32)
   (local $3 i32)
diff --git a/tests/compiler/templateliteral.release.wat b/tests/compiler/templateliteral.release.wat
index 51ce10d1bb..cf23409f3f 100644
--- a/tests/compiler/templateliteral.release.wat
+++ b/tests/compiler/templateliteral.release.wat
@@ -1,15 +1,15 @@
 (module
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $f64_=>_i32 (func_subtype (param f64) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i64_i64_i32_i64_i32_=>_i32 (func_subtype (param i64 i64 i32 i64 i32) (result i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i64_i64_i32_i64_i32_=>_i32 (func (param i64 i64 i32 i64 i32) (result i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -130,7 +130,7 @@
  (data (i32.const 5664) "\07\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00\04A\00\00 ")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1408
@@ -179,7 +179,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -311,7 +311,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -464,7 +464,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -710,7 +710,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -822,7 +822,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -901,7 +901,7 @@
   i32.const 38464
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1168,7 +1168,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   local.get $1
@@ -1294,7 +1294,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1600,7 +1600,7 @@
   memory.fill $0
   local.get $1
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#__uset (param $0 i32) (param $1 i32) (param $2 i32)
   local.get $0
   local.get $1
   i32.const 2
@@ -1616,7 +1616,7 @@
    call $byn-split-outlined-A$~lib/rt/itcms/__link
   end
  )
- (func $~lib/util/number/utoa32_dec_lut (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/util/number/utoa32_dec_lut (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   loop $while-continue|0
    local.get $1
@@ -1720,7 +1720,7 @@
    i32.store16 $0
   end
  )
- (func $~lib/number/I32#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/number/I32#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1840,7 +1840,7 @@
   end
   local.get $0
  )
- (func $~lib/util/number/genDigits (type $i64_i64_i32_i64_i32_=>_i32) (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
+ (func $~lib/util/number/genDigits (param $0 i64) (param $1 i64) (param $2 i32) (param $3 i64) (param $4 i32) (result i32)
   (local $5 i32)
   (local $6 i32)
   (local $7 i64)
@@ -2264,7 +2264,7 @@
   i32.store16 $0
   local.get $4
  )
- (func $~lib/util/number/prettify (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $~lib/util/number/prettify (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)
   (local $4 i32)
   local.get $2
@@ -2592,7 +2592,7 @@
    end
   end
  )
- (func $~lib/util/number/dtoa_core (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/util/number/dtoa_core (param $0 f64) (result i32)
   (local $1 i64)
   (local $2 i32)
   (local $3 i64)
@@ -2870,7 +2870,7 @@
   local.get $2
   i32.add
  )
- (func $~lib/number/F64#toString (type $f64_=>_i32) (param $0 f64) (result i32)
+ (func $~lib/number/F64#toString (param $0 f64) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2957,7 +2957,7 @@
   end
   local.get $1
  )
- (func $start:templateliteral (type $none_=>_none)
+ (func $start:templateliteral
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -3614,7 +3614,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   block $invalid
@@ -3694,7 +3694,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -3703,7 +3703,7 @@
   global.set $~started
   call $start:templateliteral
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3863,7 +3863,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $~lib/string/String#concat (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String#concat (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3940,7 +3940,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $4
  )
- (func $~lib/util/string/joinStringArray (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/util/string/joinStringArray (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -4159,7 +4159,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $5
  )
- (func $~lib/staticarray/StaticArray<~lib/string/String>#join (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/staticarray/StaticArray<~lib/string/String>#join (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4204,7 +4204,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $templateliteral/test_fast_paths_string (type $none_=>_none)
+ (func $templateliteral/test_fast_paths_string
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4428,7 +4428,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $templateliteral/Ref#constructor (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $templateliteral/Ref#constructor (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4469,7 +4469,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $templateliteral/Ref#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $templateliteral/Ref#toString (param $0 i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 12
@@ -4540,7 +4540,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $templateliteral/RecursiveObject#constructor (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $templateliteral/RecursiveObject#constructor (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4611,7 +4611,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $2
  )
- (func $templateliteral/RecursiveObject#toString (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $templateliteral/RecursiveObject#toString (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
@@ -4711,7 +4711,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $0
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
@@ -4730,7 +4730,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__link (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   local.get $0
   i32.eqz
diff --git a/tests/compiler/ternary.debug.wat b/tests/compiler/ternary.debug.wat
index 88c9f65163..3f7d976762 100644
--- a/tests/compiler/ternary.debug.wat
+++ b/tests/compiler/ternary.debug.wat
@@ -1,9 +1,9 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $ternary/a (mut i32) (i32.const 0))
  (global $~argumentsLength (mut i32) (i32.const 0))
@@ -19,7 +19,7 @@
  (export "memory" (memory $0))
  (export "testVoidInclTypeMismatch" (func $export:ternary/testVoidInclTypeMismatch))
  (start $~start)
- (func $start:ternary (type $none_=>_none)
+ (func $start:ternary
   i32.const 1
   drop
   i32.const 1
@@ -33,7 +33,7 @@
   i32.const 1
   global.set $ternary/a
  )
- (func $ternary/test (type $i32_i32_i32_=>_i32) (param $x i32) (param $y i32) (param $z i32) (result i32)
+ (func $ternary/test (param $x i32) (param $y i32) (param $z i32) (result i32)
   local.get $x
   if (result i32)
    local.get $y
@@ -42,7 +42,7 @@
   end
   return
  )
- (func $ternary/testDropWithTypeMismatch (type $i32_=>_none) (param $cond i32)
+ (func $ternary/testDropWithTypeMismatch (param $cond i32)
   (local $x i32)
   (local $y i32)
   global.get $~lib/memory/__stack_pointer
@@ -72,7 +72,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $ternary/testVoidInclTypeMismatch (type $i32_i32_=>_none) (param $cond i32) (param $nop i32)
+ (func $ternary/testVoidInclTypeMismatch (param $cond i32) (param $nop i32)
   local.get $cond
   if
    i32.const 0
@@ -110,10 +110,10 @@
    call_indirect $0 (type $none_=>_none)
   end
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:ternary
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -126,7 +126,7 @@
    unreachable
   end
  )
- (func $export:ternary/testVoidInclTypeMismatch (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:ternary/testVoidInclTypeMismatch (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/ternary.release.wat b/tests/compiler/ternary.release.wat
index 1c864b0699..875e187d55 100644
--- a/tests/compiler/ternary.release.wat
+++ b/tests/compiler/ternary.release.wat
@@ -1,26 +1,27 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 33836))
  (memory $0 1)
  (data (i32.const 1036) "\1c")
  (data (i32.const 1048) "\02\00\00\00\02\00\00\00a")
  (table $0 1 1 funcref)
+ (elem $0 (i32.const 1))
  (export "test" (func $ternary/test))
  (export "testDropWithTypeMismatch" (func $ternary/testDropWithTypeMismatch))
  (export "memory" (memory $0))
  (export "testVoidInclTypeMismatch" (func $export:ternary/testVoidInclTypeMismatch))
- (func $ternary/test (type $i32_i32_i32_=>_i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+ (func $ternary/test (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   local.get $1
   local.get $2
   local.get $0
   select
  )
- (func $ternary/testDropWithTypeMismatch (type $i32_=>_none) (param $0 i32)
+ (func $ternary/testDropWithTypeMismatch (param $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
@@ -48,7 +49,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $export:ternary/testVoidInclTypeMismatch (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $export:ternary/testVoidInclTypeMismatch (param $0 i32) (param $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
   i32.sub
diff --git a/tests/compiler/throw.debug.wat b/tests/compiler/throw.debug.wat
index 7cc2066fa5..90f3693c9e 100644
--- a/tests/compiler/throw.debug.wat
+++ b/tests/compiler/throw.debug.wat
@@ -1,12 +1,12 @@
 (module
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/state (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/visitCount (mut i32) (i32.const 0))
@@ -49,7 +49,7 @@
  (export "doThrow" (func $throw/doThrow))
  (export "memory" (memory $0))
  (start $~start)
- (func $throw/doThrowIf (type $i32_=>_none) (param $cond i32)
+ (func $throw/doThrowIf (param $cond i32)
   (local $a i32)
   (local $b i32)
   (local $c i32)
@@ -90,7 +90,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $throw/doThrowIfLoop (type $i32_=>_none) (param $max i32)
+ (func $throw/doThrowIfLoop (param $max i32)
   (local $a i32)
   (local $i i32)
   (local $b i32)
@@ -155,17 +155,17 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -175,11 +175,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -188,14 +188,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -237,7 +237,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -249,11 +249,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -263,7 +263,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -319,15 +319,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -353,7 +353,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -373,7 +373,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -393,7 +393,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -429,7 +429,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -455,7 +455,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -476,11 +476,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -491,39 +491,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -759,7 +759,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1123,7 +1123,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1288,7 +1288,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1433,7 +1433,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1471,7 +1471,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1484,7 +1484,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1501,7 +1501,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1526,7 +1526,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1706,7 +1706,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -1752,7 +1752,7 @@
   i32.const 0
   drop
  )
- (func $start:throw (type $none_=>_none)
+ (func $start:throw
   i32.const 0
   call $throw/doThrowIf
   i32.const 10
@@ -1776,7 +1776,7 @@
   global.set $~lib/rt/itcms/threshold
   call $~lib/rt/itcms/__collect
  )
- (func $throw/doThrow (type $none_=>_none)
+ (func $throw/doThrow
   (local $a i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1797,13 +1797,13 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 464
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -1817,10 +1817,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1845,10 +1845,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:throw
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
diff --git a/tests/compiler/throw.release.wat b/tests/compiler/throw.release.wat
index d171cb219b..1ca9444e00 100644
--- a/tests/compiler/throw.release.wat
+++ b/tests/compiler/throw.release.wat
@@ -1,8 +1,8 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/state (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/visitCount (mut i32) (i32.const 0))
@@ -45,7 +45,7 @@
  (export "doThrow" (func $throw/doThrow))
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/rt/itcms/white
@@ -100,7 +100,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -232,7 +232,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -385,7 +385,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -631,7 +631,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/step (type $none_=>_none)
+ (func $~lib/rt/itcms/step
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1052,7 +1052,7 @@
    global.set $~lib/rt/itcms/state
   end
  )
- (func $throw/doThrow (type $none_=>_none)
+ (func $throw/doThrow
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -1083,7 +1083,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $~lib/arraybuffer/ArrayBufferView
     block $~lib/string/String
@@ -1112,7 +1112,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i32)
   block $__inlined_func$start:throw
@@ -1253,7 +1253,7 @@
    unreachable
   end
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/typealias.debug.wat b/tests/compiler/typealias.debug.wat
index f45ca3449d..e51e2efe80 100644
--- a/tests/compiler/typealias.debug.wat
+++ b/tests/compiler/typealias.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -8,7 +8,7 @@
  (elem $0 (i32.const 1))
  (export "alias" (func $typealias/alias))
  (export "memory" (memory $0))
- (func $typealias/alias (type $i32_=>_i32) (param $a i32) (result i32)
+ (func $typealias/alias (param $a i32) (result i32)
   local.get $a
   return
  )
diff --git a/tests/compiler/typealias.release.wat b/tests/compiler/typealias.release.wat
index b0cf94d289..4265f6537e 100644
--- a/tests/compiler/typealias.release.wat
+++ b/tests/compiler/typealias.release.wat
@@ -1,9 +1,9 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (memory $0 0)
  (export "alias" (func $typealias/alias))
  (export "memory" (memory $0))
- (func $typealias/alias (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $typealias/alias (param $0 i32) (result i32)
   local.get $0
  )
 )
diff --git a/tests/compiler/typeof.debug.wat b/tests/compiler/typeof.debug.wat
index c9558483d5..7de9f8c340 100644
--- a/tests/compiler/typeof.debug.wat
+++ b/tests/compiler/typeof.debug.wat
@@ -1,14 +1,14 @@
 (module
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_none (func_subtype func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32 i32 i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/shared/runtime/Runtime.Stub i32 (i32.const 0))
  (global $~lib/shared/runtime/Runtime.Minimal i32 (i32.const 1))
@@ -62,11 +62,11 @@
  (elem $0 (i32.const 1) $start:typeof~anonymous|0)
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/common/OBJECT#get:rtSize (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/OBJECT#get:rtSize (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=16
  )
- (func $~lib/string/String#get:length (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/string/String#get:length (param $this i32) (result i32)
   local.get $this
   i32.const 20
   i32.sub
@@ -75,7 +75,7 @@
   i32.shr_u
   return
  )
- (func $~lib/util/string/compareImpl (type $i32_i32_i32_i32_i32_=>_i32) (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
+ (func $~lib/util/string/compareImpl (param $str1 i32) (param $index1 i32) (param $str2 i32) (param $index2 i32) (param $len i32) (result i32)
   (local $ptr1 i32)
   (local $ptr2 i32)
   (local $7 i32)
@@ -179,20 +179,20 @@
   i32.const 0
   return
  )
- (func $start:typeof~anonymous|0 (type $none_=>_none)
+ (func $start:typeof~anonymous|0
   nop
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -202,11 +202,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -215,14 +215,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -264,7 +264,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -276,11 +276,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -290,7 +290,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -346,15 +346,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -380,7 +380,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -400,7 +400,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -420,7 +420,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -456,7 +456,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -482,7 +482,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -503,11 +503,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -518,39 +518,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -786,7 +786,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1150,7 +1150,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1315,7 +1315,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1460,7 +1460,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1498,7 +1498,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1511,7 +1511,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1528,7 +1528,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1553,7 +1553,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -1733,7 +1733,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -1791,7 +1791,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -1812,7 +1812,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -1828,7 +1828,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2036,7 +2036,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2126,7 +2126,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2235,7 +2235,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2299,7 +2299,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2312,17 +2312,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2375,7 +2375,7 @@
   local.get $ptr
   return
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   global.get $typeof/s
   local.tee $1
@@ -2398,7 +2398,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -2412,14 +2412,14 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/function/Function<%28%29=>void>#get:_env (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/function/Function<%28%29=>void>#get:_env (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/function/Function<%28%29=>void>~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/function/Function<%28%29=>void>~visit (param $0 i32) (param $1 i32)
   local.get $0
   local.get $1
   call $~lib/object/Object~visit
@@ -2427,7 +2427,7 @@
   local.get $1
   call $~lib/function/Function<%28%29=>void>#__visit
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $typeof/SomeClass
     block $~lib/function/Function<%28%29=>void>
@@ -2461,7 +2461,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -2470,7 +2470,7 @@
   global.set $~started
   call $start:typeof
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -2483,7 +2483,7 @@
    unreachable
   end
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $left i32) (param $right i32) (result i32)
+ (func $~lib/string/String.__eq (param $left i32) (param $right i32) (result i32)
   (local $leftLength i32)
   (local $3 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2579,7 +2579,7 @@
   local.get $3
   return
  )
- (func $typeof/SomeClass#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $typeof/SomeClass#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -2617,7 +2617,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $start:typeof (type $none_=>_none)
+ (func $start:typeof
   (local $0 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3212,7 +3212,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/function/Function<%28%29=>void>#__visit (type $i32_i32_=>_none) (param $this i32) (param $cookie i32)
+ (func $~lib/function/Function<%28%29=>void>#__visit (param $this i32) (param $cookie i32)
   (local $2 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
@@ -3236,7 +3236,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/typeof.release.wat b/tests/compiler/typeof.release.wat
index 52162817ab..834c5a7023 100644
--- a/tests/compiler/typeof.release.wat
+++ b/tests/compiler/typeof.release.wat
@@ -1,12 +1,12 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -54,7 +54,7 @@
  (data (i32.const 1816) " ")
  (export "memory" (memory $0))
  (export "_start" (func $~start))
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1264
@@ -107,7 +107,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -239,7 +239,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -392,7 +392,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -638,7 +638,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -750,7 +750,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -829,7 +829,7 @@
   i32.const 34592
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1096,7 +1096,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1153,7 +1153,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1386,7 +1386,7 @@
   memory.fill $0
   local.get $0
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   (local $1 i32)
   block $invalid
    block $typeof/SomeClass
@@ -1455,7 +1455,7 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   global.get $~started
   if
    return
@@ -1464,7 +1464,7 @@
   global.set $~started
   call $start:typeof
  )
- (func $~lib/string/String.__eq (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/string/String.__eq (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1624,7 +1624,7 @@
   global.set $~lib/memory/__stack_pointer
   i32.const 0
  )
- (func $start:typeof (type $none_=>_none)
+ (func $start:typeof
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -2193,7 +2193,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20
diff --git a/tests/compiler/unary.debug.wat b/tests/compiler/unary.debug.wat
index 86936991db..61268eaa15 100644
--- a/tests/compiler/unary.debug.wat
+++ b/tests/compiler/unary.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $unary/i (mut i32) (i32.const 0))
  (global $unary/I (mut i64) (i64.const 0))
  (global $unary/f (mut f32) (f32.const 0))
@@ -12,7 +12,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $start:unary (type $none_=>_none)
+ (func $start:unary
   (local $0 i32)
   (local $1 i32)
   (local $2 i64)
@@ -387,7 +387,7 @@
   local.get $7
   global.set $unary/F
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:unary
  )
 )
diff --git a/tests/compiler/unary.release.wat b/tests/compiler/unary.release.wat
index d309114671..faeff2a9f0 100644
--- a/tests/compiler/unary.release.wat
+++ b/tests/compiler/unary.release.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $unary/i (mut i32) (i32.const 0))
  (global $unary/I (mut i64) (i64.const 0))
  (global $unary/f (mut f32) (f32.const 0))
@@ -7,7 +7,7 @@
  (memory $0 0)
  (export "memory" (memory $0))
  (start $~start)
- (func $~start (type $none_=>_none)
+ (func $~start
   (local $0 i32)
   (local $1 i64)
   global.get $unary/i
diff --git a/tests/compiler/unify-local-flags.debug.wat b/tests/compiler/unify-local-flags.debug.wat
index ac8ef9b17c..078971bf23 100644
--- a/tests/compiler/unify-local-flags.debug.wat
+++ b/tests/compiler/unify-local-flags.debug.wat
@@ -1,5 +1,5 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (global $~lib/memory/__data_end i32 (i32.const 8))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 32776))
  (global $~lib/memory/__heap_base i32 (i32.const 32776))
@@ -10,7 +10,7 @@
  (export "testWhile" (func $unify-local-flags/testWhile))
  (export "testDo" (func $unify-local-flags/testDo))
  (export "memory" (memory $0))
- (func $unify-local-flags/testFor (type $none_=>_none)
+ (func $unify-local-flags/testFor
   (local $x i32)
   (local $i i32)
   i32.const 0
@@ -32,7 +32,7 @@
    end
   end
  )
- (func $unify-local-flags/testWhile (type $none_=>_none)
+ (func $unify-local-flags/testWhile
   (local $x i32)
   (local $i i32)
   i32.const 0
@@ -56,7 +56,7 @@
    end
   end
  )
- (func $unify-local-flags/testDo (type $none_=>_none)
+ (func $unify-local-flags/testDo
   (local $x i32)
   (local $i i32)
   i32.const 0
diff --git a/tests/compiler/unify-local-flags.release.wat b/tests/compiler/unify-local-flags.release.wat
index f34ecdf68b..8ec6838110 100644
--- a/tests/compiler/unify-local-flags.release.wat
+++ b/tests/compiler/unify-local-flags.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
+ (type $none_=>_none (func))
  (memory $0 0)
  (export "testFor" (func $unify-local-flags/testFor))
  (export "testWhile" (func $unify-local-flags/testWhile))
  (export "testDo" (func $unify-local-flags/testDo))
  (export "memory" (memory $0))
- (func $unify-local-flags/testFor (type $none_=>_none)
+ (func $unify-local-flags/testFor
   (local $0 i32)
   loop $for-loop|0
    local.get $0
@@ -20,7 +20,7 @@
    end
   end
  )
- (func $unify-local-flags/testWhile (type $none_=>_none)
+ (func $unify-local-flags/testWhile
   (local $0 i32)
   loop $while-continue|2
    local.get $0
@@ -37,7 +37,7 @@
    end
   end
  )
- (func $unify-local-flags/testDo (type $none_=>_none)
+ (func $unify-local-flags/testDo
   (local $0 i32)
   loop $do-loop|2
    local.get $0
diff --git a/tests/compiler/void.debug.wat b/tests/compiler/void.debug.wat
index 47d7563b8c..4e207ea3f9 100644
--- a/tests/compiler/void.debug.wat
+++ b/tests/compiler/void.debug.wat
@@ -1,6 +1,6 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $none_=>_i32 (func_subtype (result i32) func))
+ (type $none_=>_none (func))
+ (type $none_=>_i32 (func (result i32)))
  (global $void/u8Val1 (mut i32) (i32.const 1))
  (global $void/u8Val2 (mut i32) (i32.const 255))
  (global $~lib/memory/__data_end i32 (i32.const 8))
@@ -11,11 +11,11 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $void/anInt (type $none_=>_i32) (result i32)
+ (func $void/anInt (result i32)
   i32.const 2
   return
  )
- (func $start:void (type $none_=>_none)
+ (func $start:void
   i32.const 1
   drop
   call $void/anInt
@@ -25,7 +25,7 @@
   i32.add
   drop
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:void
  )
 )
diff --git a/tests/compiler/while.debug.wat b/tests/compiler/while.debug.wat
index 79033ee371..f129f4a0c0 100644
--- a/tests/compiler/while.debug.wat
+++ b/tests/compiler/while.debug.wat
@@ -1,13 +1,13 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_i32_=>_i32 (func_subtype (param i32 i32) (result i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_i32 (func_subtype (param i32 i32 i32) (result i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $while/ran (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
@@ -43,7 +43,7 @@
  (elem $0 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
- (func $while/testSimple (type $none_=>_none)
+ (func $while/testSimple
   (local $i i32)
   (local $j i32)
   i32.const 10
@@ -91,7 +91,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testNested (type $none_=>_none)
+ (func $while/testNested
   (local $i i32)
   (local $j i32)
   (local $k i32)
@@ -192,7 +192,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testEmpty (type $none_=>_none)
+ (func $while/testEmpty
   (local $i i32)
   (local $j i32)
   (local $2 i32)
@@ -247,7 +247,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testAlwaysTrue (type $none_=>_none)
+ (func $while/testAlwaysTrue
   (local $i i32)
   i32.const 0
   local.set $i
@@ -283,7 +283,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testAlwaysTrueNeverBreaks (type $none_=>_i32) (result i32)
+ (func $while/testAlwaysTrueNeverBreaks (result i32)
   (local $i i32)
   i32.const 0
   local.set $i
@@ -305,7 +305,7 @@
   end
   unreachable
  )
- (func $while/testAlwaysFalse (type $none_=>_none)
+ (func $while/testAlwaysFalse
   (local $i i32)
   i32.const 0
   local.set $i
@@ -326,7 +326,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testAlwaysBreaks (type $none_=>_none)
+ (func $while/testAlwaysBreaks
   (local $i i32)
   i32.const 0
   local.set $i
@@ -356,7 +356,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testAlwaysReturns (type $none_=>_none)
+ (func $while/testAlwaysReturns
   (local $i i32)
   i32.const 0
   local.set $i
@@ -382,7 +382,7 @@
    unreachable
   end
  )
- (func $while/testContinue (type $none_=>_none)
+ (func $while/testContinue
   (local $i i32)
   i32.const 10
   local.set $i
@@ -411,7 +411,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testNestedContinue (type $none_=>_none)
+ (func $while/testNestedContinue
   (local $i i32)
   (local $j i32)
   i32.const 10
@@ -465,17 +465,17 @@
   i32.const 1
   global.set $while/ran
  )
- (func $~lib/rt/itcms/Object#set:nextWithColor (type $i32_i32_=>_none) (param $this i32) (param $nextWithColor i32)
+ (func $~lib/rt/itcms/Object#set:nextWithColor (param $this i32) (param $nextWithColor i32)
   local.get $this
   local.get $nextWithColor
   i32.store $0 offset=4
  )
- (func $~lib/rt/itcms/Object#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/itcms/Object#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=8
  )
- (func $~lib/rt/itcms/initLazy (type $i32_=>_i32) (param $space i32) (result i32)
+ (func $~lib/rt/itcms/initLazy (param $space i32) (result i32)
   local.get $space
   local.get $space
   call $~lib/rt/itcms/Object#set:nextWithColor
@@ -485,11 +485,11 @@
   local.get $space
   return
  )
- (func $~lib/rt/itcms/Object#get:nextWithColor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:nextWithColor (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/itcms/Object#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:next (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
@@ -498,14 +498,14 @@
   i32.and
   return
  )
- (func $~lib/rt/itcms/Object#get:color (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:color (param $this i32) (result i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
   i32.const 3
   i32.and
   return
  )
- (func $~lib/rt/itcms/visitRoots (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitRoots (param $cookie i32)
   (local $pn i32)
   (local $iter i32)
   local.get $cookie
@@ -547,7 +547,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#set:color (type $i32_i32_=>_none) (param $this i32) (param $color i32)
+ (func $~lib/rt/itcms/Object#set:color (param $this i32) (param $color i32)
   local.get $this
   local.get $this
   call $~lib/rt/itcms/Object#get:nextWithColor
@@ -559,11 +559,11 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/itcms/Object#set:next (type $i32_i32_=>_none) (param $this i32) (param $obj i32)
+ (func $~lib/rt/itcms/Object#set:next (param $this i32) (param $obj i32)
   local.get $this
   local.get $obj
   local.get $this
@@ -573,7 +573,7 @@
   i32.or
   call $~lib/rt/itcms/Object#set:nextWithColor
  )
- (func $~lib/rt/itcms/Object#unlink (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#unlink (param $this i32)
   (local $next i32)
   (local $prev i32)
   local.get $this
@@ -629,15 +629,15 @@
   local.get $next
   call $~lib/rt/itcms/Object#set:next
  )
- (func $~lib/rt/itcms/Object#get:rtId (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:rtId (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=12
  )
- (func $~lib/shared/typeinfo/Typeinfo#get:flags (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/shared/typeinfo/Typeinfo#get:flags (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/__typeinfo (type $i32_=>_i32) (param $id i32) (result i32)
+ (func $~lib/rt/__typeinfo (param $id i32) (result i32)
   (local $ptr i32)
   global.get $~lib/rt/__rtti_base
   local.set $ptr
@@ -663,7 +663,7 @@
   call $~lib/shared/typeinfo/Typeinfo#get:flags
   return
  )
- (func $~lib/rt/itcms/Object#get:isPointerfree (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:isPointerfree (param $this i32) (result i32)
   (local $rtId i32)
   local.get $this
   call $~lib/rt/itcms/Object#get:rtId
@@ -683,7 +683,7 @@
   end
   return
  )
- (func $~lib/rt/itcms/Object#linkTo (type $i32_i32_i32_=>_none) (param $this i32) (param $list i32) (param $withColor i32)
+ (func $~lib/rt/itcms/Object#linkTo (param $this i32) (param $list i32) (param $withColor i32)
   (local $prev i32)
   local.get $list
   call $~lib/rt/itcms/Object#get:prev
@@ -703,7 +703,7 @@
   local.get $this
   call $~lib/rt/itcms/Object#set:prev
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $this i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $this i32)
   (local $1 i32)
   local.get $this
   global.get $~lib/rt/itcms/iter
@@ -739,7 +739,7 @@
   end
   call $~lib/rt/itcms/Object#linkTo
  )
- (func $~lib/rt/itcms/__visit (type $i32_i32_=>_none) (param $ptr i32) (param $cookie i32)
+ (func $~lib/rt/itcms/__visit (param $ptr i32) (param $cookie i32)
   (local $obj i32)
   local.get $ptr
   i32.eqz
@@ -765,7 +765,7 @@
    global.set $~lib/rt/itcms/visitCount
   end
  )
- (func $~lib/rt/itcms/visitStack (type $i32_=>_none) (param $cookie i32)
+ (func $~lib/rt/itcms/visitStack (param $cookie i32)
   (local $ptr i32)
   global.get $~lib/memory/__stack_pointer
   local.set $ptr
@@ -786,11 +786,11 @@
    end
   end
  )
- (func $~lib/rt/common/BLOCK#get:mmInfo (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/common/BLOCK#get:mmInfo (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/itcms/Object#get:size (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/itcms/Object#get:size (param $this i32) (result i32)
   i32.const 4
   local.get $this
   call $~lib/rt/common/BLOCK#get:mmInfo
@@ -801,39 +801,39 @@
   i32.add
   return
  )
- (func $~lib/rt/tlsf/Root#set:flMap (type $i32_i32_=>_none) (param $this i32) (param $flMap i32)
+ (func $~lib/rt/tlsf/Root#set:flMap (param $this i32) (param $flMap i32)
   local.get $this
   local.get $flMap
   i32.store $0
  )
- (func $~lib/rt/common/BLOCK#set:mmInfo (type $i32_i32_=>_none) (param $this i32) (param $mmInfo i32)
+ (func $~lib/rt/common/BLOCK#set:mmInfo (param $this i32) (param $mmInfo i32)
   local.get $this
   local.get $mmInfo
   i32.store $0
  )
- (func $~lib/rt/tlsf/Block#set:prev (type $i32_i32_=>_none) (param $this i32) (param $prev i32)
+ (func $~lib/rt/tlsf/Block#set:prev (param $this i32) (param $prev i32)
   local.get $this
   local.get $prev
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#set:next (type $i32_i32_=>_none) (param $this i32) (param $next i32)
+ (func $~lib/rt/tlsf/Block#set:next (param $this i32) (param $next i32)
   local.get $this
   local.get $next
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/Block#get:prev (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:prev (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=4
  )
- (func $~lib/rt/tlsf/Block#get:next (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Block#get:next (param $this i32) (result i32)
   local.get $this
   i32.load $0 offset=8
  )
- (func $~lib/rt/tlsf/Root#get:flMap (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/rt/tlsf/Root#get:flMap (param $this i32) (result i32)
   local.get $this
   i32.load $0
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/removeBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $size i32)
   (local $fl i32)
@@ -1069,7 +1069,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/insertBlock (param $root i32) (param $block i32)
   (local $blockInfo i32)
   (local $block|3 i32)
   (local $right i32)
@@ -1433,7 +1433,7 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_i32) (param $root i32) (param $start i32) (param $end i32) (result i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
   (local $root|3 i32)
   (local $tail i32)
   (local $tailInfo i32)
@@ -1598,7 +1598,7 @@
   i32.const 1
   return
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $rootOffset i32)
   (local $pagesBefore i32)
   (local $pagesNeeded i32)
@@ -1743,7 +1743,7 @@
   local.get $root
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/tlsf/checkUsedBlock (type $i32_=>_i32) (param $ptr i32) (result i32)
+ (func $~lib/rt/tlsf/checkUsedBlock (param $ptr i32) (result i32)
   (local $block i32)
   local.get $ptr
   i32.const 4
@@ -1781,7 +1781,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/freeBlock (type $i32_i32_=>_none) (param $root i32) (param $block i32)
+ (func $~lib/rt/tlsf/freeBlock (param $root i32) (param $block i32)
   i32.const 0
   drop
   local.get $block
@@ -1794,7 +1794,7 @@
   local.get $block
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/__free (type $i32_=>_none) (param $ptr i32)
+ (func $~lib/rt/tlsf/__free (param $ptr i32)
   local.get $ptr
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1811,7 +1811,7 @@
   call $~lib/rt/tlsf/checkUsedBlock
   call $~lib/rt/tlsf/freeBlock
  )
- (func $~lib/rt/itcms/free (type $i32_=>_none) (param $obj i32)
+ (func $~lib/rt/itcms/free (param $obj i32)
   local.get $obj
   global.get $~lib/memory/__heap_base
   i32.lt_u
@@ -1836,7 +1836,7 @@
    call $~lib/rt/tlsf/__free
   end
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $obj i32)
   (local $1 i32)
   (local $black i32)
@@ -2016,7 +2016,7 @@
   i32.const 0
   return
  )
- (func $~lib/rt/itcms/interrupt (type $none_=>_none)
+ (func $~lib/rt/itcms/interrupt
   (local $budget i32)
   i32.const 0
   drop
@@ -2074,7 +2074,7 @@
   i32.const 0
   drop
  )
- (func $~lib/rt/tlsf/computeSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/computeSize (param $size i32) (result i32)
   local.get $size
   i32.const 12
   i32.le_u
@@ -2095,7 +2095,7 @@
   end
   return
  )
- (func $~lib/rt/tlsf/prepareSize (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/prepareSize (param $size i32) (result i32)
   local.get $size
   i32.const 1073741820
   i32.gt_u
@@ -2111,7 +2111,7 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
   (local $requestSize i32)
@@ -2319,7 +2319,7 @@
   local.get $head
   return
  )
- (func $~lib/rt/tlsf/growMemory (type $i32_i32_=>_none) (param $root i32) (param $size i32)
+ (func $~lib/rt/tlsf/growMemory (param $root i32) (param $size i32)
   (local $pagesBefore i32)
   (local $root|3 i32)
   (local $pagesNeeded i32)
@@ -2409,7 +2409,7 @@
   call $~lib/rt/tlsf/addMemory
   drop
  )
- (func $~lib/rt/tlsf/prepareBlock (type $i32_i32_i32_=>_none) (param $root i32) (param $block i32) (param $size i32)
+ (func $~lib/rt/tlsf/prepareBlock (param $root i32) (param $block i32) (param $size i32)
   (local $blockInfo i32)
   (local $remaining i32)
   (local $spare i32)
@@ -2518,7 +2518,7 @@
    call $~lib/rt/common/BLOCK#set:mmInfo
   end
  )
- (func $~lib/rt/tlsf/allocateBlock (type $i32_i32_=>_i32) (param $root i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/allocateBlock (param $root i32) (param $size i32) (result i32)
   (local $payloadSize i32)
   (local $block i32)
   local.get $size
@@ -2582,7 +2582,7 @@
   local.get $block
   return
  )
- (func $~lib/rt/tlsf/__alloc (type $i32_=>_i32) (param $size i32) (result i32)
+ (func $~lib/rt/tlsf/__alloc (param $size i32) (result i32)
   global.get $~lib/rt/tlsf/ROOT
   i32.eqz
   if
@@ -2595,17 +2595,17 @@
   i32.add
   return
  )
- (func $~lib/rt/itcms/Object#set:rtId (type $i32_i32_=>_none) (param $this i32) (param $rtId i32)
+ (func $~lib/rt/itcms/Object#set:rtId (param $this i32) (param $rtId i32)
   local.get $this
   local.get $rtId
   i32.store $0 offset=12
  )
- (func $~lib/rt/itcms/Object#set:rtSize (type $i32_i32_=>_none) (param $this i32) (param $rtSize i32)
+ (func $~lib/rt/itcms/Object#set:rtSize (param $this i32) (param $rtSize i32)
   local.get $this
   local.get $rtSize
   i32.store $0 offset=16
  )
- (func $~lib/rt/itcms/__new (type $i32_i32_=>_i32) (param $size i32) (param $id i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $size i32) (param $id i32) (result i32)
   (local $obj i32)
   (local $ptr i32)
   local.get $size
@@ -2658,7 +2658,7 @@
   local.get $ptr
   return
  )
- (func $while/testRef (type $none_=>_none)
+ (func $while/testRef
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2728,12 +2728,12 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $while/getRef (type $none_=>_i32) (result i32)
+ (func $while/getRef (result i32)
   i32.const 0
   call $while/Ref#constructor
   return
  )
- (func $while/testRefAutorelease (type $none_=>_none)
+ (func $while/testRefAutorelease
   (local $i i32)
   (local $ref i32)
   global.get $~lib/memory/__stack_pointer
@@ -2800,7 +2800,7 @@
   i32.add
   global.set $~lib/memory/__stack_pointer
  )
- (func $while/testIfImplicitContinueThen (type $none_=>_none)
+ (func $while/testIfImplicitContinueThen
   (local $i i32)
   i32.const 0
   local.set $i
@@ -2827,7 +2827,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testIfImplicitContinueElse (type $none_=>_none)
+ (func $while/testIfImplicitContinueElse
   (local $i i32)
   i32.const 0
   local.set $i
@@ -2854,7 +2854,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $while/testConditionalContinue (type $none_=>_none)
+ (func $while/testConditionalContinue
   (local $i i32)
   i32.const 0
   local.set $i
@@ -2886,7 +2886,7 @@
   i32.const 1
   global.set $while/ran
  )
- (func $~lib/rt/itcms/__collect (type $none_=>_none)
+ (func $~lib/rt/itcms/__collect
   i32.const 0
   drop
   global.get $~lib/rt/itcms/state
@@ -2932,7 +2932,7 @@
   i32.const 0
   drop
  )
- (func $start:while (type $none_=>_none)
+ (func $start:while
   i32.const 0
   global.set $while/ran
   call $while/testSimple
@@ -3146,7 +3146,7 @@
   end
   call $~lib/rt/itcms/__collect
  )
- (func $~lib/rt/__visit_globals (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_globals (param $0 i32)
   (local $1 i32)
   i32.const 272
   local.get $0
@@ -3155,7 +3155,7 @@
   local.get $0
   call $~lib/rt/itcms/__visit
  )
- (func $~lib/arraybuffer/ArrayBufferView~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/arraybuffer/ArrayBufferView~visit (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $0
   local.get $1
@@ -3169,10 +3169,10 @@
    call $~lib/rt/itcms/__visit
   end
  )
- (func $~lib/object/Object~visit (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/object/Object~visit (param $0 i32) (param $1 i32)
   nop
  )
- (func $~lib/rt/__visit_members (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   block $invalid
    block $while/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -3200,10 +3200,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:while
  )
- (func $~stack_check (type $none_=>_none)
+ (func $~stack_check
   global.get $~lib/memory/__stack_pointer
   global.get $~lib/memory/__data_end
   i32.lt_s
@@ -3216,7 +3216,7 @@
    unreachable
   end
  )
- (func $while/Ref#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $while/Ref#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 8
@@ -3254,7 +3254,7 @@
   global.set $~lib/memory/__stack_pointer
   local.get $1
  )
- (func $~lib/object/Object#constructor (type $i32_=>_i32) (param $this i32) (result i32)
+ (func $~lib/object/Object#constructor (param $this i32) (result i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
   i32.const 4
diff --git a/tests/compiler/while.release.wat b/tests/compiler/while.release.wat
index a4d0e7202e..499c73439d 100644
--- a/tests/compiler/while.release.wat
+++ b/tests/compiler/while.release.wat
@@ -1,11 +1,11 @@
 (module
- (type $none_=>_none (func_subtype func))
- (type $i32_=>_none (func_subtype (param i32) func))
- (type $i32_i32_=>_none (func_subtype (param i32 i32) func))
- (type $none_=>_i32 (func_subtype (result i32) func))
- (type $i32_=>_i32 (func_subtype (param i32) (result i32) func))
- (type $i32_i32_i32_i32_=>_none (func_subtype (param i32 i32 i32 i32) func))
- (type $i32_i32_i32_=>_none (func_subtype (param i32 i32 i32) func))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/rt/itcms/total (mut i32) (i32.const 0))
  (global $~lib/rt/itcms/threshold (mut i32) (i32.const 0))
@@ -34,7 +34,7 @@
  (data (i32.const 1488) "\05\00\00\00 \00\00\00 \00\00\00 \00\00\00\00\00\00\00 ")
  (export "memory" (memory $0))
  (start $~start)
- (func $~lib/rt/itcms/visitRoots (type $none_=>_none)
+ (func $~lib/rt/itcms/visitRoots
   (local $0 i32)
   (local $1 i32)
   i32.const 1296
@@ -79,7 +79,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/Object#makeGray (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/itcms/Object#makeGray (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -211,7 +211,7 @@
   local.get $0
   i32.store $0 offset=8
  )
- (func $~lib/rt/tlsf/removeBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -364,7 +364,7 @@
    end
   end
  )
- (func $~lib/rt/tlsf/insertBlock (type $i32_i32_=>_none) (param $0 i32) (param $1 i32)
+ (func $~lib/rt/tlsf/insertBlock (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -610,7 +610,7 @@
   i32.or
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (type $i32_i32_i32_=>_none) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/rt/tlsf/addMemory (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   local.get $1
@@ -722,7 +722,7 @@
   local.get $1
   call $~lib/rt/tlsf/insertBlock
  )
- (func $~lib/rt/tlsf/initialize (type $none_=>_none)
+ (func $~lib/rt/tlsf/initialize
   (local $0 i32)
   (local $1 i32)
   memory.size $0
@@ -801,7 +801,7 @@
   i32.const 34288
   global.set $~lib/rt/tlsf/ROOT
  )
- (func $~lib/rt/itcms/step (type $none_=>_i32) (result i32)
+ (func $~lib/rt/itcms/step (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1068,7 +1068,7 @@
   end
   i32.const 0
  )
- (func $~lib/rt/tlsf/searchBlock (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/tlsf/searchBlock (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -1125,7 +1125,7 @@
    end
   end
  )
- (func $~lib/rt/itcms/__new (type $i32_=>_i32) (param $0 i32) (result i32)
+ (func $~lib/rt/itcms/__new (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1358,7 +1358,7 @@
   memory.fill $0
   local.get $0
  )
- (func $start:while (type $none_=>_none)
+ (func $start:while
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1874,7 +1874,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $~lib/rt/__visit_members (type $i32_=>_none) (param $0 i32)
+ (func $~lib/rt/__visit_members (param $0 i32)
   block $invalid
    block $while/Ref
     block $~lib/arraybuffer/ArrayBufferView
@@ -1906,10 +1906,10 @@
   end
   unreachable
  )
- (func $~start (type $none_=>_none)
+ (func $~start
   call $start:while
  )
- (func $while/Ref#constructor (type $none_=>_i32) (result i32)
+ (func $while/Ref#constructor (result i32)
   (local $0 i32)
   (local $1 i32)
   global.get $~lib/memory/__stack_pointer
@@ -1975,7 +1975,7 @@
   call $~lib/builtins/abort
   unreachable
  )
- (func $byn-split-outlined-A$~lib/rt/itcms/__visit (type $i32_=>_none) (param $0 i32)
+ (func $byn-split-outlined-A$~lib/rt/itcms/__visit (param $0 i32)
   global.get $~lib/rt/itcms/white
   local.get $0
   i32.const 20