14 files changed, 925 insertions, 925 deletions

diff --git a/test/address.2asm.js b/test/address.2asm.js
index c2db815c4..0b4627703 100644
--- a/test/address.2asm.js
+++ b/test/address.2asm.js
@@ -13,9 +13,9 @@ function asmFunc(global, env, buffer) {
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
  var print = env.print;
- function $$0(i) {
+ function $0(i) {
   i = i | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, wasm2asm_i32$0 = 0;
   print(HEAPU8[i >> 0] | 0 | 0);
   print(HEAPU8[(i + 1 | 0) >> 0] | 0 | 0);
   print(HEAPU8[(i + 2 | 0) >> 0] | 0 | 0);
@@ -31,26 +31,26 @@ function asmFunc(global, env, buffer) {
   print((wasm2asm_i32$0 = i, HEAPU8[(wasm2asm_i32$0 + 25 | 0) >> 0] | 0 | 0 | (HEAPU8[(wasm2asm_i32$0 + 26 | 0) >> 0] | 0 | 0) << 8 | (HEAPU8[(wasm2asm_i32$0 + 27 | 0) >> 0] | 0 | 0) << 16 | (HEAPU8[(wasm2asm_i32$0 + 28 | 0) >> 0] | 0 | 0) << 24) | 0);
  }
  
- function $$1(i) {
+ function $1(i) {
   i = i | 0;
-  var $$1 = 0, $$2 = 0;
+  var $1 = 0, $2 = 0;
   HEAPU32[(i + 4294967295 | 0) >> 2] | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -58,13 +58,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -72,14 +72,14 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  good: $$0, 
-  bad: $$1
+  good: $0, 
+  bad: $1
  };
 }
 
diff --git a/test/binaryen.js/emit_asmjs.js.txt b/test/binaryen.js/emit_asmjs.js.txt
index 807936d93..1dc266145 100644
--- a/test/binaryen.js/emit_asmjs.js.txt
+++ b/test/binaryen.js/emit_asmjs.js.txt
@@ -12,27 +12,27 @@ function asmFunc(global, env, buffer) {
  var Math_fround = global.Math.fround;
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
- function main($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, wasm2asm_i32$0 = 0;
-  return $$0 | 0;
+ function main($0) {
+  $0 = $0 | 0;
+  var $1 = 0, wasm2asm_i32$0 = 0;
+  return $0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -40,13 +40,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -54,7 +54,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
diff --git a/test/br_table_temp.2asm.js b/test/br_table_temp.2asm.js
index 00f8f6ab9..e5f8ef9c0 100644
--- a/test/br_table_temp.2asm.js
+++ b/test/br_table_temp.2asm.js
@@ -16,26 +16,26 @@ function asmFunc(global, env, buffer) {
   
  }
  
- function $$1() {
+ function $1() {
   
  }
  
- function $$2() {
+ function $2() {
   
  }
  
- function $$3() {
+ function $3() {
   
  }
  
- function $$4() {
+ function $4() {
   
  }
  
- function $$5() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $5() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 1;
+   $1 = 1;
    switch (0 | 0) {
    case 0:
     break block;
@@ -43,18 +43,18 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$6() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+ function $6() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   block : {
    $i64toi32_block_1 : {
     $i64toi32_block_0 : {
      i64toi32_i32$0 = 0;
-     $$5 = 2;
-     $$6 = $$5;
-     $$7 = $$5;
+     $5 = 2;
+     $6 = $5;
+     $7 = $5;
      switch (0 | 0) {
      case 0:
       break $i64toi32_block_0;
@@ -62,21 +62,21 @@ function asmFunc(global, env, buffer) {
       break $i64toi32_block_1;
      };
     };
-    i64toi32_i32$1 = $$6;
-    $$11 = i64toi32_i32$1;
+    i64toi32_i32$1 = $6;
+    $11 = i64toi32_i32$1;
     break block;
    };
-   i64toi32_i32$1 = $$7;
-   $$11 = i64toi32_i32$1;
+   i64toi32_i32$1 = $7;
+   $11 = i64toi32_i32$1;
    break block;
   };
-  return $$11 | 0;
+  return $11 | 0;
  }
  
- function $$7() {
-  var $$0 = Math_fround(0), $$1 = Math_fround(0), $$2 = Math_fround(0);
+ function $7() {
+  var $0 = Math_fround(0), $1 = Math_fround(0), $2 = Math_fround(0);
   block : {
-   $$1 = Math_fround(3.0);
+   $1 = Math_fround(3.0);
    switch (0 | 0) {
    case 0:
     break block;
@@ -84,13 +84,13 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return Math_fround($$1);
+  return Math_fround($1);
  }
  
- function $$8() {
-  var $$0 = 0.0, $$1 = 0.0, $$2 = 0.0;
+ function $8() {
+  var $0 = 0.0, $1 = 0.0, $2 = 0.0;
   block : {
-   $$1 = 4.0;
+   $1 = 4.0;
    switch (0 | 0) {
    case 0:
     break block;
@@ -98,35 +98,35 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return +$$1;
+  return +$1;
  }
  
- function $$9($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, wasm2asm_i32$0 = 0;
+ function $9($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, wasm2asm_i32$0 = 0;
   return 22 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$10($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0;
+ function $10($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0;
   block : {
-   $$3 = 33;
-   switch ($$0 | 0) {
+   $3 = 33;
+   switch ($0 | 0) {
    default:
     break block;
    };
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$11($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0;
+ function $11($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0;
   block : {
    block0 : {
-    switch ($$0 | 0) {
+    switch ($0 | 0) {
     case 0:
      break block;
     default:
@@ -138,35 +138,35 @@ function asmFunc(global, env, buffer) {
   return 22 | 0;
  }
  
- function $$12($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
+ function $12($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
   block : {
    block1 : {
-    $$2 = 33;
-    $$3 = $$2;
-    $$4 = $$2;
-    switch ($$0 | 0) {
+    $2 = 33;
+    $3 = $2;
+    $4 = $2;
+    switch ($0 | 0) {
     case 0:
      break block1;
     default:
      break block;
     };
    };
-   $$3 = 32;
+   $3 = 32;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$13($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0;
+ function $13($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0;
   block : {
    block2 : {
     block3 : {
      block4 : {
       block5 : {
-       switch ($$0 | 0) {
+       switch ($0 | 0) {
        case 0:
         break block2;
        case 1:
@@ -190,21 +190,21 @@ function asmFunc(global, env, buffer) {
   return 104 | 0;
  }
  
- function $$14($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0;
+ function $14($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0;
   block : {
    block6 : {
     block7 : {
      block8 : {
       block9 : {
-       $$3 = 200;
-       $$4 = $$3;
-       $$5 = $$3;
-       $$6 = $$3;
-       $$7 = $$3;
-       $$8 = $$3;
-       switch ($$0 | 0) {
+       $3 = 200;
+       $4 = $3;
+       $5 = $3;
+       $6 = $3;
+       $7 = $3;
+       $8 = $3;
+       switch ($0 | 0) {
        case 0:
         break block6;
        case 1:
@@ -217,28 +217,28 @@ function asmFunc(global, env, buffer) {
         break block;
        };
       };
-      $$1 = $$8;
-      return $$1 + 10 | 0 | 0;
+      $1 = $8;
+      return $1 + 10 | 0 | 0;
      };
-     $$1 = $$7;
-     return $$1 + 11 | 0 | 0;
+     $1 = $7;
+     return $1 + 11 | 0 | 0;
     };
-    $$1 = $$6;
-    return $$1 + 12 | 0 | 0;
+    $1 = $6;
+    return $1 + 12 | 0 | 0;
    };
-   $$1 = $$5;
-   return $$1 + 13 | 0 | 0;
+   $1 = $5;
+   return $1 + 13 | 0 | 0;
   };
-  $$1 = $$4;
-  return $$1 + 14 | 0 | 0;
+  $1 = $4;
+  return $1 + 14 | 0 | 0;
  }
  
- function $$15($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0;
+ function $15($0) {
+  $0 = $0 | 0;
+  var $1 = 0;
   block : {
    block10 : {
-    switch ($$0 | 0) {
+    switch ($0 | 0) {
     case 0:
      break block10;
     case 1:
@@ -49478,11 +49478,11 @@ function asmFunc(global, env, buffer) {
   return 1 | 0;
  }
  
- function $$16() {
+ function $16() {
   
  }
  
- function $$17() {
+ function $17() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -49496,7 +49496,7 @@ function asmFunc(global, env, buffer) {
   };
  }
  
- function $$18() {
+ function $18() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -49510,11 +49510,11 @@ function asmFunc(global, env, buffer) {
   };
  }
  
- function $$19() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $19() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
    dummy();
-   $$1 = 2;
+   $1 = 2;
    switch (0 | 0) {
    case 0:
     break block;
@@ -49524,14 +49524,14 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$20() {
-  var $$0 = 0, $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
+ function $20() {
+  var $0 = 0, $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
   fake_return_waka123 : {
    loop_in : do {
-    $$1 = 3;
+    $1 = 3;
     switch (0 | 0) {
     case 0:
      break fake_return_waka123;
@@ -49541,15 +49541,15 @@ function asmFunc(global, env, buffer) {
     break loop_in;
    } while (1);
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$21() {
-  var $$0 = 0, $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
+ function $21() {
+  var $0 = 0, $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
   fake_return_waka123 : {
    loop_in : do {
     dummy();
-    $$1 = 4;
+    $1 = 4;
     switch (4294967295 | 0) {
     case 0:
      break fake_return_waka123;
@@ -49561,15 +49561,15 @@ function asmFunc(global, env, buffer) {
     break loop_in;
    } while (1);
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$22() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $22() {
+  var $0 = 0, $1 = 0, $2 = 0;
   fake_return_waka123 : {
    loop_in : do {
     dummy();
-    $$1 = 5;
+    $1 = 5;
     switch (1 | 0) {
     case 0:
      break fake_return_waka123;
@@ -49581,38 +49581,38 @@ function asmFunc(global, env, buffer) {
     break loop_in;
    } while (1);
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$23() {
-  var $$0 = 0, $$1 = 0;
+ function $23() {
+  var $0 = 0, $1 = 0;
   block : {
-   $$0 = 9;
+   $0 = 9;
    break block;
   };
-  return $$0 | 0;
+  return $0 | 0;
  }
  
- function $$24() {
+ function $24() {
   
  }
  
- function $$25() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $25() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 8;
+   $1 = 8;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$26() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $26() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 9;
+   $1 = 9;
    switch (0 | 0) {
    case 0:
     break block;
@@ -49620,346 +49620,346 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$27() {
+ function $27() {
   
  }
  
- function $$28() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $28() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 10;
+   $1 = 10;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$29() {
-  var $$0 = 0, $$1 = 0, $$2 = 0, $$3 = 0;
+ function $29() {
+  var $0 = 0, $1 = 0, $2 = 0, $3 = 0;
   block : {
-   $$1 = 11;
+   $1 = 11;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$30() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0;
+ function $30() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0;
   block : {
    $i64toi32_block_0 : {
     i64toi32_i32$0 = 0;
-    $$6 = 7;
+    $6 = 7;
     switch (0 | 0) {
     default:
      break $i64toi32_block_0;
     };
    };
-   $$10 = $$6;
+   $10 = $6;
    break block;
   };
-  return $$10 | 0;
+  return $10 | 0;
  }
  
- function $$31() {
-  var $$0 = 0, $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
-  $$if : {
-   $$1 = 2;
+ function $31() {
+  var $0 = 0, $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
+  if_ : {
+   $1 = 2;
    switch (0 | 0) {
    default:
-    break $$if;
+    break if_;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$32($$0, $$1) {
-  $$0 = $$0 | 0;
-  $$1 = $$1 | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0;
+ function $32($0, $1) {
+  $0 = $0 | 0;
+  $1 = $1 | 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0;
   block : {
-   if ($$0) {
-    $$4 = 3;
+   if ($0) {
+    $4 = 3;
     switch (0 | 0) {
     default:
      break block;
     };
-   } else $$6 = $$1;
-   $$4 = $$6;
+   } else $6 = $1;
+   $4 = $6;
   };
-  return $$4 | 0;
+  return $4 | 0;
  }
  
- function $$33($$0, $$1) {
-  $$0 = $$0 | 0;
-  $$1 = $$1 | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
+ function $33($0, $1) {
+  $0 = $0 | 0;
+  $1 = $1 | 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
   block : {
-   $$if : {
-    if ($$0) $$7 = $$1; else {
-     $$4 = 4;
-     $$5 = $$4;
-     $$6 = $$4;
+   if_ : {
+    if ($0) $7 = $1; else {
+     $4 = 4;
+     $5 = $4;
+     $6 = $4;
      switch (0 | 0) {
      case 0:
       break block;
      default:
-      break $$if;
+      break if_;
      };
     }
-    $$6 = $$7;
+    $6 = $7;
    };
-   $$5 = $$6;
+   $5 = $6;
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
- function $$34($$0, $$1) {
-  $$0 = $$0 | 0;
-  $$1 = $$1 | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
+ function $34($0, $1) {
+  $0 = $0 | 0;
+  $1 = $1 | 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
   block : {
-   $$3 = 5;
+   $3 = 5;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$35($$0, $$1) {
-  $$0 = $$0 | 0;
-  $$1 = $$1 | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0;
+ function $35($0, $1) {
+  $0 = $0 | 0;
+  $1 = $1 | 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
   block : {
-   $$2 = $$0;
-   $$4 = 6;
+   $2 = $0;
+   $4 = 6;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$4 | 0;
+  return $4 | 0;
  }
  
- function $$36() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $36() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 7;
+   $1 = 7;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function f($$0, $$1, $$2) {
-  $$0 = $$0 | 0;
-  $$1 = $$1 | 0;
-  $$2 = $$2 | 0;
+ function f($0, $1, $2) {
+  $0 = $0 | 0;
+  $1 = $1 | 0;
+  $2 = $2 | 0;
   var wasm2asm_i32$0 = 0;
   return 4294967295 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$38() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $38() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 12;
+   $1 = 12;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$39() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $39() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 13;
+   $1 = 13;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$40() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $40() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 14;
+   $1 = 14;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$41() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $41() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 20;
+   $1 = 20;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$42() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $42() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 21;
+   $1 = 21;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$43() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $43() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 22;
+   $1 = 22;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$44() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $44() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 23;
+   $1 = 23;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$45() {
-  var $$0 = Math_fround(0), $$1 = 0, $$2 = 0, $$3 = 0;
+ function $45() {
+  var $0 = Math_fround(0), $1 = 0, $2 = 0, $3 = 0;
   block : {
-   $$2 = 17;
+   $2 = 17;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$2 | 0;
+  return $2 | 0;
  }
  
- function $$46() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $46() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 2;
+   $1 = 2;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$47() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0;
+ function $47() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0;
   block : {
    $i64toi32_block_0 : {
     i64toi32_i32$0 = 0;
-    $$6 = 30;
+    $6 = 30;
     switch (1 | 0) {
     default:
      break $i64toi32_block_0;
     };
    };
-   $$10 = $$6;
+   $10 = $6;
    break block;
   };
-  return $$10 | 0;
+  return $10 | 0;
  }
  
- function $$48() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $48() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 30;
+   $1 = 30;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$49() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $49() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 31;
+   $1 = 31;
    switch (1 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$50() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $50() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 32;
+   $1 = 32;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$51() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $51() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 33;
+   $1 = 33;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$52() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $52() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 3;
+   $1 = 3;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$53() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $53() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 3;
+   $1 = 3;
    switch (0 | 0) {
    case 0:
     break block;
@@ -49967,42 +49967,42 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$54() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0;
+ function $54() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0;
   block : {
    $i64toi32_block_0 : {
     i64toi32_i32$1 = 0;
-    $$9 = 45;
+    $9 = 45;
     switch (0 | 0) {
     default:
      break $i64toi32_block_0;
     };
    };
-   $$13 = $$9;
+   $13 = $9;
    break block;
   };
-  return $$13 | 0;
+  return $13 | 0;
  }
  
- function $$55() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $55() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 44;
+   $1 = 44;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$56() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $56() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 43;
+   $1 = 43;
    switch (0 | 0) {
    case 0:
     break block;
@@ -50010,56 +50010,56 @@ function asmFunc(global, env, buffer) {
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$57() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $57() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 42;
+   $1 = 42;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$58() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $58() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 41;
+   $1 = 41;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$59() {
-  var $$0 = 0, $$1 = 0, $$2 = 0;
+ function $59() {
+  var $0 = 0, $1 = 0, $2 = 0;
   block : {
-   $$1 = 40;
+   $1 = 40;
    switch (0 | 0) {
    default:
     break block;
    };
   };
-  return $$1 | 0;
+  return $1 | 0;
  }
  
- function $$60($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
+ function $60($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
   block : {
    block11 : {
     block12 : {
-     $$2 = 16;
-     $$3 = $$2;
-     $$4 = $$2;
-     $$5 = $$2;
-     switch ($$0 | 0) {
+     $2 = 16;
+     $3 = $2;
+     $4 = $2;
+     $5 = $2;
+     switch ($0 | 0) {
      case 0:
       break block12;
      case 1:
@@ -50068,24 +50068,24 @@ function asmFunc(global, env, buffer) {
       break block;
      };
     };
-    $$4 = 2 + $$5 | 0;
+    $4 = 2 + $5 | 0;
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$61($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0;
+ function $61($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0;
   block : {
    block13 : {
     block14 : {
-     $$2 = 8;
-     $$3 = $$2;
-     $$4 = $$2;
-     $$5 = $$2;
-     switch ($$0 | 0) {
+     $2 = 8;
+     $3 = $2;
+     $4 = $2;
+     $5 = $2;
+     switch ($0 | 0) {
      case 0:
       break block;
      case 1:
@@ -50094,24 +50094,24 @@ function asmFunc(global, env, buffer) {
       break block14;
      };
     };
-    $$4 = 16;
+    $4 = 16;
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$62($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0;
+ function $62($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0;
   block : {
    block15 : {
     block16 : {
-     $$2 = 8;
-     $$3 = $$2;
-     $$4 = $$2;
-     $$5 = $$2;
-     switch ($$0 | 0) {
+     $2 = 8;
+     $3 = $2;
+     $4 = $2;
+     $5 = $2;
+     switch ($0 | 0) {
      case 0:
       break block16;
      case 1:
@@ -50120,22 +50120,22 @@ function asmFunc(global, env, buffer) {
       break block;
      };
     };
-    $$4 = 16;
+    $4 = 16;
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$63($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0;
+ function $63($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0;
   block : {
    block17 : {
-    $$2 = 8;
-    $$3 = $$2;
-    $$4 = $$2;
-    switch ($$0 | 0) {
+    $2 = 8;
+    $3 = $2;
+    $4 = $2;
+    switch ($0 | 0) {
     case 0:
      break block17;
     case 1:
@@ -50144,22 +50144,22 @@ function asmFunc(global, env, buffer) {
      break block17;
     };
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$64($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0;
+ function $64($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0;
   block : {
    block18 : {
     block19 : {
-     $$2 = 8;
-     $$3 = $$2;
-     $$4 = $$2;
-     $$5 = $$2;
-     switch ($$0 | 0) {
+     $2 = 8;
+     $3 = $2;
+     $4 = $2;
+     $5 = $2;
+     switch ($0 | 0) {
      case 0:
       break block19;
      case 1:
@@ -50168,22 +50168,22 @@ function asmFunc(global, env, buffer) {
       break block;
      };
     };
-    $$4 = 16;
+    $4 = 16;
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
- function $$65($$0) {
-  $$0 = $$0 | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0;
+ function $65($0) {
+  $0 = $0 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0;
   block : {
    block20 : {
-    $$2 = 8;
-    $$3 = $$2;
-    $$4 = $$2;
-    switch ($$0 | 0) {
+    $2 = 8;
+    $3 = $2;
+    $4 = $2;
+    switch ($0 | 0) {
     case 0:
      break block20;
     case 1:
@@ -50192,25 +50192,25 @@ function asmFunc(global, env, buffer) {
      break block20;
     };
    };
-   $$3 = 1 + $$4 | 0;
+   $3 = 1 + $4 | 0;
   };
-  return $$3 | 0;
+  return $3 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -50218,13 +50218,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -50232,77 +50232,77 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  var FUNCTION_TABLE_iiii = [f];
  return {
-  type_i32: $$1, 
-  type_i64: $$2, 
-  type_f32: $$3, 
-  type_f64: $$4, 
-  type_i32_value: $$5, 
-  type_i64_value: $$6, 
-  type_f32_value: $$7, 
-  type_f64_value: $$8, 
-  empty: $$9, 
-  empty_value: $$10, 
-  singleton: $$11, 
-  singleton_value: $$12, 
-  multiple: $$13, 
-  multiple_value: $$14, 
-  large: $$15, 
-  as_block_first: $$16, 
-  as_block_mid: $$17, 
-  as_block_last: $$18, 
-  as_block_value: $$19, 
-  as_loop_first: $$20, 
-  as_loop_mid: $$21, 
-  as_loop_last: $$22, 
-  as_br_value: $$23, 
-  as_br_if_cond: $$24, 
-  as_br_if_value: $$25, 
-  as_br_if_value_cond: $$26, 
-  as_br_table_index: $$27, 
-  as_br_table_value: $$28, 
-  as_br_table_value_index: $$29, 
-  as_return_value: $$30, 
-  as_if_cond: $$31, 
-  as_if_then: $$32, 
-  as_if_else: $$33, 
-  as_select_first: $$34, 
-  as_select_second: $$35, 
-  as_select_cond: $$36, 
-  as_call_first: $$38, 
-  as_call_mid: $$39, 
-  as_call_last: $$40, 
-  as_call_indirect_first: $$41, 
-  as_call_indirect_mid: $$42, 
-  as_call_indirect_last: $$43, 
-  as_call_indirect_func: $$44, 
-  as_set_local_value: $$45, 
-  as_load_address: $$46, 
-  as_loadN_address: $$47, 
-  as_store_address: $$48, 
-  as_store_value: $$49, 
-  as_storeN_address: $$50, 
-  as_storeN_value: $$51, 
-  as_unary_operand: $$52, 
-  as_binary_left: $$53, 
-  as_binary_right: $$54, 
-  as_test_operand: $$55, 
-  as_compare_left: $$56, 
-  as_compare_right: $$57, 
-  as_convert_operand: $$58, 
-  as_grow_memory_size: $$59, 
-  nested_block_value: $$60, 
-  nested_br_value: $$61, 
-  nested_br_if_value: $$62, 
-  nested_br_if_value_cond: $$63, 
-  nested_br_table_value: $$64, 
-  nested_br_table_value_index: $$65
+  type_i32: $1, 
+  type_i64: $2, 
+  type_f32: $3, 
+  type_f64: $4, 
+  type_i32_value: $5, 
+  type_i64_value: $6, 
+  type_f32_value: $7, 
+  type_f64_value: $8, 
+  empty: $9, 
+  empty_value: $10, 
+  singleton: $11, 
+  singleton_value: $12, 
+  multiple: $13, 
+  multiple_value: $14, 
+  large: $15, 
+  as_block_first: $16, 
+  as_block_mid: $17, 
+  as_block_last: $18, 
+  as_block_value: $19, 
+  as_loop_first: $20, 
+  as_loop_mid: $21, 
+  as_loop_last: $22, 
+  as_br_value: $23, 
+  as_br_if_cond: $24, 
+  as_br_if_value: $25, 
+  as_br_if_value_cond: $26, 
+  as_br_table_index: $27, 
+  as_br_table_value: $28, 
+  as_br_table_value_index: $29, 
+  as_return_value: $30, 
+  as_if_cond: $31, 
+  as_if_then: $32, 
+  as_if_else: $33, 
+  as_select_first: $34, 
+  as_select_second: $35, 
+  as_select_cond: $36, 
+  as_call_first: $38, 
+  as_call_mid: $39, 
+  as_call_last: $40, 
+  as_call_indirect_first: $41, 
+  as_call_indirect_mid: $42, 
+  as_call_indirect_last: $43, 
+  as_call_indirect_func: $44, 
+  as_set_local_value: $45, 
+  as_load_address: $46, 
+  as_loadN_address: $47, 
+  as_store_address: $48, 
+  as_store_value: $49, 
+  as_storeN_address: $50, 
+  as_storeN_value: $51, 
+  as_unary_operand: $52, 
+  as_binary_left: $53, 
+  as_binary_right: $54, 
+  as_test_operand: $55, 
+  as_compare_left: $56, 
+  as_compare_right: $57, 
+  as_convert_operand: $58, 
+  as_grow_memory_size: $59, 
+  nested_block_value: $60, 
+  nested_br_value: $61, 
+  nested_br_if_value: $62, 
+  nested_br_if_value_cond: $63, 
+  nested_br_table_value: $64, 
+  nested_br_table_value_index: $65
  };
 }
 
diff --git a/test/empty_imported_table.2asm.js b/test/empty_imported_table.2asm.js
index 240aa7e86..08df8f3d8 100644
--- a/test/empty_imported_table.2asm.js
+++ b/test/empty_imported_table.2asm.js
@@ -15,18 +15,18 @@ function asmFunc(global, env, buffer) {
  var import$table$0 = env.table;
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -34,13 +34,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -48,7 +48,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
diff --git a/test/empty_table.2asm.js b/test/empty_table.2asm.js
index db1d0677d..582717db2 100644
--- a/test/empty_table.2asm.js
+++ b/test/empty_table.2asm.js
@@ -14,18 +14,18 @@ function asmFunc(global, env, buffer) {
  var Math_clz32 = global.Math.clz32;
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -33,13 +33,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -47,7 +47,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
diff --git a/test/float-ops.2asm.js b/test/float-ops.2asm.js
index 524377aa3..e82ddf13a 100644
--- a/test/float-ops.2asm.js
+++ b/test/float-ops.2asm.js
@@ -16,226 +16,226 @@ function asmFunc(global, env, buffer) {
   
  }
  
- function $$1($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround($$0 + $$1));
+ function $1($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround($0 + $1));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$2($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround($$0 - $$1));
+ function $2($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround($0 - $1));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$3($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround($$0 * $$1));
+ function $3($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround($0 * $1));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$4($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround($$0 / $$1));
+ function $4($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround($0 / $1));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$5($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +($$0 + $$1);
+ function $5($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +($0 + $1);
   return +wasm2asm_f64$0;
  }
  
- function $$6($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +($$0 - $$1);
+ function $6($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +($0 - $1);
   return +wasm2asm_f64$0;
  }
  
- function $$7($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +($$0 * $$1);
+ function $7($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +($0 * $1);
   return +wasm2asm_f64$0;
  }
  
- function $$8($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +($$0 / $$1);
+ function $8($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +($0 / $1);
   return +wasm2asm_f64$0;
  }
  
- function $$9($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 == $$1 | 0;
+ function $9($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 == $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$10($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 != $$1 | 0;
+ function $10($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 != $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$11($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 >= $$1 | 0;
+ function $11($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 >= $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$12($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 > $$1 | 0;
+ function $12($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 > $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$13($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 <= $$1 | 0;
+ function $13($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 <= $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$14($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 < $$1 | 0;
+ function $14($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 < $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$15($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 == $$1 | 0;
+ function $15($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 == $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$16($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 != $$1 | 0;
+ function $16($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 != $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$17($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 >= $$1 | 0;
+ function $17($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 >= $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$18($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 > $$1 | 0;
+ function $18($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 > $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$19($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 <= $$1 | 0;
+ function $19($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 <= $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$20($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0, wasm2asm_i32$0 = 0;
-  return $$0 < $$1 | 0;
+ function $20($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0, wasm2asm_i32$0 = 0;
+  return $0 < $1 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$21($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround(Math_min($$0, $$1)));
+ function $21($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround(Math_min($0, $1)));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$22($$0, $$1) {
-  $$0 = Math_fround($$0);
-  $$1 = Math_fround($$1);
-  var $$2 = Math_fround(0), $$3 = Math_fround(0), $$4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround(Math_max($$0, $$1)));
+ function $22($0, $1) {
+  $0 = Math_fround($0);
+  $1 = Math_fround($1);
+  var $2 = Math_fround(0), $3 = Math_fround(0), $4 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround(Math_max($0, $1)));
   return Math_fround(wasm2asm_f32$0);
  }
  
- function $$23($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +Math_min($$0, $$1);
+ function $23($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +Math_min($0, $1);
   return +wasm2asm_f64$0;
  }
  
- function $$24($$0, $$1) {
-  $$0 = +$$0;
-  $$1 = +$$1;
-  var $$2 = 0.0, $$3 = 0.0, $$4 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +Math_max($$0, $$1);
+ function $24($0, $1) {
+  $0 = +$0;
+  $1 = +$1;
+  var $2 = 0.0, $3 = 0.0, $4 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +Math_max($0, $1);
   return +wasm2asm_f64$0;
  }
  
- function $$25($$0) {
-  $$0 = Math_fround($$0);
-  var $$1 = Math_fround(0), $$2 = 0.0, wasm2asm_f64$0 = 0.0;
-  return +(+$$0);
+ function $25($0) {
+  $0 = Math_fround($0);
+  var $1 = Math_fround(0), $2 = 0.0, wasm2asm_f64$0 = 0.0;
+  return +(+$0);
   return +wasm2asm_f64$0;
  }
  
- function $$26($$0) {
-  $$0 = +$$0;
-  var $$1 = 0.0, $$2 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
-  return Math_fround(Math_fround($$0));
+ function $26($0) {
+  $0 = +$0;
+  var $1 = 0.0, $2 = Math_fround(0), wasm2asm_f32$0 = Math_fround(0);
+  return Math_fround(Math_fround($0));
   return Math_fround(wasm2asm_f32$0);
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -243,13 +243,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -257,38 +257,38 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  "f32.add": $$1, 
-  "f32.sub": $$2, 
-  "f32.mul": $$3, 
-  "f32.div": $$4, 
-  "f64.add": $$5, 
-  "f64.sub": $$6, 
-  "f64.mul": $$7, 
-  "f64.div": $$8, 
-  "f32.eq": $$9, 
-  "f32.ne": $$10, 
-  "f32.ge": $$11, 
-  "f32.gt": $$12, 
-  "f32.le": $$13, 
-  "f32.lt": $$14, 
-  "f64.eq": $$15, 
-  "f64.ne": $$16, 
-  "f64.ge": $$17, 
-  "f64.gt": $$18, 
-  "f64.le": $$19, 
-  "f64.lt": $$20, 
-  "f32.min": $$21, 
-  "f32.max": $$22, 
-  "f64.min": $$23, 
-  "f64.max": $$24, 
-  "f64.promote": $$25, 
-  "f32.demote": $$26
+  f32_add: $1, 
+  f32_sub: $2, 
+  f32_mul: $3, 
+  f32_div: $4, 
+  f64_add: $5, 
+  f64_sub: $6, 
+  f64_mul: $7, 
+  f64_div: $8, 
+  f32_eq: $9, 
+  f32_ne: $10, 
+  f32_ge: $11, 
+  f32_gt: $12, 
+  f32_le: $13, 
+  f32_lt: $14, 
+  f64_eq: $15, 
+  f64_ne: $16, 
+  f64_ge: $17, 
+  f64_gt: $18, 
+  f64_le: $19, 
+  f64_lt: $20, 
+  f32_min: $21, 
+  f32_max: $22, 
+  f64_min: $23, 
+  f64_max: $24, 
+  f64_promote: $25, 
+  f32_demote: $26
  };
 }
 
diff --git a/test/forward.2asm.js b/test/forward.2asm.js
index 00a15d035..7be5eba8a 100644
--- a/test/forward.2asm.js
+++ b/test/forward.2asm.js
@@ -14,32 +14,32 @@ function asmFunc(global, env, buffer) {
  var Math_clz32 = global.Math.clz32;
  function even(n) {
   n = n | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0;
-  if ((n | 0) == (0 | 0)) $$6 = 1; else $$6 = odd(n - 1 | 0 | 0) | 0;
-  return $$6 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0;
+  if ((n | 0) == (0 | 0)) $6 = 1; else $6 = odd(n - 1 | 0 | 0) | 0;
+  return $6 | 0;
  }
  
  function odd(n) {
   n = n | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0;
-  if ((n | 0) == (0 | 0)) $$6 = 0; else $$6 = even(n - 1 | 0 | 0) | 0;
-  return $$6 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0;
+  if ((n | 0) == (0 | 0)) $6 = 0; else $6 = even(n - 1 | 0 | 0) | 0;
+  return $6 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -47,13 +47,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -61,7 +61,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
diff --git a/test/grow_memory.2asm.js b/test/grow_memory.2asm.js
index 0f181d94b..f3782ef9c 100644
--- a/test/grow_memory.2asm.js
+++ b/test/grow_memory.2asm.js
@@ -12,33 +12,33 @@ function asmFunc(global, env, buffer) {
  var Math_fround = global.Math.fround;
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
- function $$0(var$0) {
+ function $0(var$0) {
   var$0 = var$0 | 0;
-  var $$1 = 0, $$2 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, wasm2asm_i32$0 = 0;
   return __wasm_grow_memory(var$0 | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$1() {
-  var $$0 = 0, wasm2asm_i32$0 = 0;
+ function $1() {
+  var $0 = 0, wasm2asm_i32$0 = 0;
   return __wasm_current_memory() | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -46,13 +46,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -60,7 +60,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -102,8 +102,8 @@ function asmFunc(global, env, buffer) {
     
    }
   }), 
-  grow: $$0, 
-  current: $$1
+  grow: $0, 
+  current: $1
  };
 }
 
diff --git a/test/hello_world.2asm.js b/test/hello_world.2asm.js
index 3302af096..c75a24e14 100644
--- a/test/hello_world.2asm.js
+++ b/test/hello_world.2asm.js
@@ -15,25 +15,25 @@ function asmFunc(global, env, buffer) {
  function add(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x + y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -41,13 +41,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -55,7 +55,7 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
diff --git a/test/i32.2asm.js b/test/i32.2asm.js
index 83bbb5a56..4c6500471 100644
--- a/test/i32.2asm.js
+++ b/test/i32.2asm.js
@@ -12,248 +12,248 @@ function asmFunc(global, env, buffer) {
  var Math_fround = global.Math.fround;
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
- function $$0(x, y) {
+ function $0(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x + y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$1(x, y) {
+ function $1(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x - y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$2(x, y) {
+ function $2(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return Math_imul(x, y) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$3(x, y) {
+ function $3(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) / (y | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$4(x, y) {
+ function $4(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x >>> 0) / (y >>> 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$5(x, y) {
+ function $5(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) % (y | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$6(x, y) {
+ function $6(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x >>> 0) % (y >>> 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$7(x, y) {
+ function $7(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x & y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$8(x, y) {
+ function $8(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x | y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$9(x, y) {
+ function $9(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x ^ y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$10(x, y) {
+ function $10(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x << y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$11(x, y) {
+ function $11(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >> y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$12(x, y) {
+ function $12(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >>> y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$13(x, y) {
+ function $13(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return __wasm_rotl_i32(x, y) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$14(x, y) {
+ function $14(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return __wasm_rotr_i32(x, y) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$15(x) {
+ function $15(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, wasm2asm_i32$0 = 0;
   return Math_clz32(x) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$16(x) {
+ function $16(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, wasm2asm_i32$0 = 0;
   return __wasm_ctz_i32(x) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$17(x) {
+ function $17(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, wasm2asm_i32$0 = 0;
   return __wasm_popcnt_i32(x) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$18(x) {
+ function $18(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, wasm2asm_i32$0 = 0;
+  var $1 = 0, $2 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) == (0 | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$19(x, y) {
+ function $19(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) == (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$20(x, y) {
+ function $20(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) != (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$21(x, y) {
+ function $21(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) < (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$22(x, y) {
+ function $22(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >>> 0 < y >>> 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$23(x, y) {
+ function $23(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) <= (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$24(x, y) {
+ function $24(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >>> 0 <= y >>> 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$25(x, y) {
+ function $25(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) > (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$26(x, y) {
+ function $26(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >>> 0 > y >>> 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$27(x, y) {
+ function $27(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) >= (y | 0) | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$28(x, y) {
+ function $28(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x >>> 0 >= y >>> 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -261,13 +261,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -275,41 +275,41 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  add: $$0, 
-  sub: $$1, 
-  mul: $$2, 
-  div_s: $$3, 
-  div_u: $$4, 
-  rem_s: $$5, 
-  rem_u: $$6, 
-  and: $$7, 
-  or: $$8, 
-  xor: $$9, 
-  shl: $$10, 
-  shr_s: $$11, 
-  shr_u: $$12, 
-  rotl: $$13, 
-  rotr: $$14, 
-  clz: $$15, 
-  ctz: $$16, 
-  popcnt: $$17, 
-  eqz: $$18, 
-  eq: $$19, 
-  ne: $$20, 
-  lt_s: $$21, 
-  lt_u: $$22, 
-  le_s: $$23, 
-  le_u: $$24, 
-  gt_s: $$25, 
-  gt_u: $$26, 
-  ge_s: $$27, 
-  ge_u: $$28
+  add: $0, 
+  sub: $1, 
+  mul: $2, 
+  div_s: $3, 
+  div_u: $4, 
+  rem_s: $5, 
+  rem_u: $6, 
+  and: $7, 
+  or: $8, 
+  xor: $9, 
+  shl: $10, 
+  shr_s: $11, 
+  shr_u: $12, 
+  rotl: $13, 
+  rotr: $14, 
+  clz: $15, 
+  ctz: $16, 
+  popcnt: $17, 
+  eqz: $18, 
+  eq: $19, 
+  ne: $20, 
+  lt_s: $21, 
+  lt_u: $22, 
+  le_s: $23, 
+  le_u: $24, 
+  gt_s: $25, 
+  gt_u: $26, 
+  ge_s: $27, 
+  ge_u: $28
  };
 }
 
diff --git a/test/i64-add-sub.2asm.js b/test/i64-add-sub.2asm.js
index 277ee1996..2a9c8af74 100644
--- a/test/i64-add-sub.2asm.js
+++ b/test/i64-add-sub.2asm.js
@@ -16,19 +16,19 @@ function asmFunc(global, env, buffer) {
   
  }
  
- function $$1($$0, $$0$hi, $$1, $$1$hi, r, r$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
+ function $1($0, $0$hi, $1, $1$hi, r, r$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0, $$33 = 0, $$34 = 0, $$35 = 0, $$36 = 0, $$37 = 0, $$38 = 0, $$39 = 0, $$40 = 0, $$41 = 0, $$42 = 0, $$43 = 0, $$44 = 0, $$45 = 0, $$46 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$3 = $$1;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0, $33 = 0, $34 = 0, $35 = 0, $36 = 0, $37 = 0, $38 = 0, $39 = 0, $40 = 0, $41 = 0, $42 = 0, $43 = 0, $44 = 0, $45 = 0, $46 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$3 = $1;
   i64toi32_i32$4 = i64toi32_i32$2 + i64toi32_i32$3 | 0;
-  i64toi32_i32$5 = i64toi32_i32$0 + $$1$hi | 0;
+  i64toi32_i32$5 = i64toi32_i32$0 + $1$hi | 0;
   if (i64toi32_i32$4 >>> 0 < i64toi32_i32$3 >>> 0) i64toi32_i32$5 = i64toi32_i32$5 + 1 | 0;
   i64toi32_i32$0 = i64toi32_i32$4;
   i64toi32_i32$2 = r$hi;
@@ -36,18 +36,18 @@ function asmFunc(global, env, buffer) {
   return (i64toi32_i32$0 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$5 | 0) == (i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function $$2($$0, $$0$hi, $$1, $$1$hi, r, r$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
+ function $2($0, $0$hi, $1, $1$hi, r, r$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, i64toi32_i32$6 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0, $$33 = 0, $$34 = 0, $$35 = 0, $$36 = 0, $$37 = 0, $$38 = 0, $$39 = 0, $$40 = 0, $$41 = 0, $$42 = 0, $$43 = 0, $$44 = 0, $$45 = 0, $$46 = 0, $$47 = 0, $$48 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$3 = $$1;
-  i64toi32_i32$5 = (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) + $$1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, i64toi32_i32$6 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0, $33 = 0, $34 = 0, $35 = 0, $36 = 0, $37 = 0, $38 = 0, $39 = 0, $40 = 0, $41 = 0, $42 = 0, $43 = 0, $44 = 0, $45 = 0, $46 = 0, $47 = 0, $48 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$3 = $1;
+  i64toi32_i32$5 = (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) + $1$hi | 0;
   i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
   i64toi32_i32$0 = i64toi32_i32$2 - i64toi32_i32$3 | 0;
   i64toi32_i32$2 = r$hi;
@@ -57,18 +57,18 @@ function asmFunc(global, env, buffer) {
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -76,13 +76,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -90,14 +90,14 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  check_add_i64: $$1, 
-  check_sub_i64: $$2
+  check_add_i64: $1, 
+  check_sub_i64: $2
  };
 }
 
diff --git a/test/i64-lowering.2asm.js b/test/i64-lowering.2asm.js
index e326ed93d..5960f94a6 100644
--- a/test/i64-lowering.2asm.js
+++ b/test/i64-lowering.2asm.js
@@ -16,164 +16,164 @@ function asmFunc(global, env, buffer) {
   
  }
  
- function $$1($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, wasm2asm_i32$0 = 0;
-  return ($$0 | 0) == ($$1 | 0) & ($$0$hi | 0) == ($$1$hi | 0) | 0 | 0;
+ function $1($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, wasm2asm_i32$0 = 0;
+  return ($0 | 0) == ($1 | 0) & ($0$hi | 0) == ($1$hi | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$2($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, wasm2asm_i32$0 = 0;
-  return ($$0 | 0) != ($$1 | 0) | ($$0$hi | 0) != ($$1$hi | 0) | 0 | 0;
+ function $2($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, wasm2asm_i32$0 = 0;
+  return ($0 | 0) != ($1 | 0) | ($0$hi | 0) != ($1$hi | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$3($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$1 = $$1$hi;
-  i64toi32_i32$3 = $$1;
-  if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) $$29 = 1; else {
+ function $3($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$1 = $1$hi;
+  i64toi32_i32$3 = $1;
+  if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) $29 = 1; else {
    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
-    if (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) $$25 = 0; else $$25 = 1;
-    $$27 = $$25;
-   } else $$27 = 0;
-   $$29 = $$27;
+    if (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) $25 = 0; else $25 = 1;
+    $27 = $25;
+   } else $27 = 0;
+   $29 = $27;
   }
-  return $$29 | 0;
+  return $29 | 0;
  }
  
- function $$4($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$1 = $$1$hi;
-  i64toi32_i32$3 = $$1;
-  if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) $$29 = 1; else {
+ function $4($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$1 = $1$hi;
+  i64toi32_i32$3 = $1;
+  if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) $29 = 1; else {
    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
-    if (i64toi32_i32$2 >>> 0 <= i64toi32_i32$3 >>> 0) $$25 = 0; else $$25 = 1;
-    $$27 = $$25;
-   } else $$27 = 0;
-   $$29 = $$27;
+    if (i64toi32_i32$2 >>> 0 <= i64toi32_i32$3 >>> 0) $25 = 0; else $25 = 1;
+    $27 = $25;
+   } else $27 = 0;
+   $29 = $27;
   }
-  return $$29 | 0;
+  return $29 | 0;
  }
  
- function $$5($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$1 = $$1$hi;
-  i64toi32_i32$3 = $$1;
-  if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) $$29 = 1; else {
+ function $5($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$1 = $1$hi;
+  i64toi32_i32$3 = $1;
+  if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) $29 = 1; else {
    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
-    if (i64toi32_i32$2 >>> 0 > i64toi32_i32$3 >>> 0) $$25 = 0; else $$25 = 1;
-    $$27 = $$25;
-   } else $$27 = 0;
-   $$29 = $$27;
+    if (i64toi32_i32$2 >>> 0 > i64toi32_i32$3 >>> 0) $25 = 0; else $25 = 1;
+    $27 = $25;
+   } else $27 = 0;
+   $29 = $27;
   }
-  return $$29 | 0;
+  return $29 | 0;
  }
  
- function $$6($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0, $$29 = 0, $$30 = 0, $$31 = 0, $$32 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$2 = $$0;
-  i64toi32_i32$1 = $$1$hi;
-  i64toi32_i32$3 = $$1;
-  if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) $$29 = 1; else {
+ function $6($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$2 = $0;
+  i64toi32_i32$1 = $1$hi;
+  i64toi32_i32$3 = $1;
+  if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) $29 = 1; else {
    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
-    if (i64toi32_i32$2 >>> 0 >= i64toi32_i32$3 >>> 0) $$25 = 0; else $$25 = 1;
-    $$27 = $$25;
-   } else $$27 = 0;
-   $$29 = $$27;
+    if (i64toi32_i32$2 >>> 0 >= i64toi32_i32$3 >>> 0) $25 = 0; else $25 = 1;
+    $27 = $25;
+   } else $27 = 0;
+   $29 = $27;
   }
-  return $$29 | 0;
+  return $29 | 0;
  }
  
- function $$7($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$1 = $$1$hi;
-  return i64toi32_i32$0 >>> 0 > i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $$0 >>> 0 >= $$1 >>> 0 | 0) | 0 | 0;
+ function $7($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$1 = $1$hi;
+  return i64toi32_i32$0 >>> 0 > i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $0 >>> 0 >= $1 >>> 0 | 0) | 0 | 0;
  }
  
- function $$8($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$1 = $$1$hi;
-  return i64toi32_i32$0 >>> 0 > i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $$0 >>> 0 > $$1 >>> 0 | 0) | 0 | 0;
+ function $8($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$1 = $1$hi;
+  return i64toi32_i32$0 >>> 0 > i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $0 >>> 0 > $1 >>> 0 | 0) | 0 | 0;
  }
  
- function $$9($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$1 = $$1$hi;
-  return i64toi32_i32$0 >>> 0 < i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $$0 >>> 0 <= $$1 >>> 0 | 0) | 0 | 0;
+ function $9($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$1 = $1$hi;
+  return i64toi32_i32$0 >>> 0 < i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $0 >>> 0 <= $1 >>> 0 | 0) | 0 | 0;
  }
  
- function $$10($$0, $$0$hi, $$1, $$1$hi) {
-  $$0 = $$0 | 0;
-  $$0$hi = $$0$hi | 0;
-  $$1 = $$1 | 0;
-  $$1$hi = $$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, $$21 = 0, $$22 = 0, $$23 = 0, $$24 = 0, $$25 = 0, $$26 = 0, $$27 = 0, $$28 = 0;
-  i64toi32_i32$0 = $$0$hi;
-  i64toi32_i32$1 = $$1$hi;
-  return i64toi32_i32$0 >>> 0 < i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $$0 >>> 0 < $$1 >>> 0 | 0) | 0 | 0;
+ function $10($0, $0$hi, $1, $1$hi) {
+  $0 = $0 | 0;
+  $0$hi = $0$hi | 0;
+  $1 = $1 | 0;
+  $1$hi = $1$hi | 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0;
+  i64toi32_i32$0 = $0$hi;
+  i64toi32_i32$1 = $1$hi;
+  return i64toi32_i32$0 >>> 0 < i64toi32_i32$1 >>> 0 | ((i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) & $0 >>> 0 < $1 >>> 0 | 0) | 0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -181,13 +181,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -195,22 +195,22 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  eq_i64: $$1, 
-  ne_i64: $$2, 
-  ge_s_i64: $$3, 
-  gt_s_i64: $$4, 
-  le_s_i64: $$5, 
-  lt_s_i64: $$6, 
-  ge_u_i64: $$7, 
-  gt_u_i64: $$8, 
-  le_u_i64: $$9, 
-  lt_u_i64: $$10
+  eq_i64: $1, 
+  ne_i64: $2, 
+  ge_s_i64: $3, 
+  gt_s_i64: $4, 
+  le_s_i64: $5, 
+  lt_s_i64: $6, 
+  ge_u_i64: $7, 
+  gt_u_i64: $8, 
+  le_u_i64: $9, 
+  lt_u_i64: $10
  };
 }
 
diff --git a/test/wasm2asm.asserts.js b/test/wasm2asm.asserts.js
index a9f5c86ff..bbe946e1b 100644
--- a/test/wasm2asm.asserts.js
+++ b/test/wasm2asm.asserts.js
@@ -12,40 +12,40 @@ function asmFunc(global, env, buffer) {
  var Math_fround = global.Math.fround;
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
- function $$0() {
+ function $0() {
   
  }
  
- function $$1(x, y) {
+ function $1(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x + y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$2(x, y) {
+ function $2(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) / (y | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -53,13 +53,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -67,15 +67,15 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  empty: $$0, 
-  add: $$1, 
-  div_s: $$2
+  empty: $0, 
+  add: $1, 
+  div_s: $2
  };
 }
 
diff --git a/test/wasm2asm.traps.js b/test/wasm2asm.traps.js
index 52824341e..f7bb948c6 100644
--- a/test/wasm2asm.traps.js
+++ b/test/wasm2asm.traps.js
@@ -12,40 +12,40 @@ function asmFunc(global, env, buffer) {
  var Math_fround = global.Math.fround;
  var Math_abs = global.Math.abs;
  var Math_clz32 = global.Math.clz32;
- function $$0() {
+ function $0() {
   
  }
  
- function $$1(x, y) {
+ function $1(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return x + y | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
- function $$2(x, y) {
+ function $2(x, y) {
   x = x | 0;
   y = y | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, wasm2asm_i32$0 = 0;
   return (x | 0) / (y | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $$1 = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0;
-  if ((x | 0) == (0 | 0)) $$9 = 32; else $$9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $$9 | 0;
+  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $9 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0;
+  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
   count = 0;
   b : {
    l : do {
-    $$5 = count;
+    $5 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -53,13 +53,13 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $$5 | 0;
+  return $5 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
@@ -67,15 +67,15 @@ function asmFunc(global, env, buffer) {
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $$2 = 0, $$3 = 0, $$4 = 0, $$5 = 0, $$6 = 0, $$7 = 0, $$8 = 0, $$9 = 0, $$10 = 0, $$11 = 0, $$12 = 0, $$13 = 0, $$14 = 0, $$15 = 0, $$16 = 0, $$17 = 0, $$18 = 0, $$19 = 0, $$20 = 0, wasm2asm_i32$0 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, wasm2asm_i32$0 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
   return wasm2asm_i32$0 | 0;
  }
  
  return {
-  empty: $$0, 
-  add: $$1, 
-  div_s: $$2
+  empty: $0, 
+  add: $1, 
+  div_s: $2
  };
 }