Use new wast parser in wasm2js (#6606)

When generating assertions, traverse the `WASTScript` data structure rather than
interleaving assertion parsing with emitting.

41 files changed, 2445 insertions, 2445 deletions

diff --git a/test/wasm2js/add_div.wast b/test/wasm2js/add_div.wast
index 440510edd..5ec09ca01 100644
--- a/test/wasm2js/add_div.wast
+++ b/test/wasm2js/add_div.wast
@@ -1,5 +1,5 @@
 (module
- (export "foo" (func $foo (param i32) (result i32)))
+ (export "foo" (func $foo))
  (func $foo (param $0 i32) (result i32)
   (i32.add
    (i32.div_u
diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js
index eb6dedfff..a0e923979 100644
--- a/test/wasm2js/br.2asm.js
+++ b/test/wasm2js/br.2asm.js
@@ -18,6 +18,10 @@ function asmFunc(imports) {
   
  }
  
+ function $0() {
+  
+ }
+ 
  function $1() {
   
  }
@@ -31,193 +35,189 @@ function asmFunc(imports) {
  }
  
  function $4() {
-  
- }
- 
- function $5() {
-  var $0 = 0;
+  var $0_1 = 0;
   block : {
-   $0 = 1;
+   $0_1 = 1;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $6() {
-  var i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0;
+ function $5() {
+  var i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
-   $0 = 2;
+   $0_1 = 2;
    $0$hi = i64toi32_i32$0;
    break block;
   }
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $7() {
-  var $0 = Math_fround(0);
+ function $6() {
+  var $0_1 = Math_fround(0);
   block : {
-   $0 = Math_fround(3.0);
+   $0_1 = Math_fround(3.0);
    break block;
   }
-  return Math_fround($0);
+  return Math_fround($0_1);
  }
  
- function $8() {
-  var $0 = 0.0;
+ function $7() {
+  var $0_1 = 0.0;
   block : {
-   $0 = 4.0;
+   $0_1 = 4.0;
    break block;
   }
-  return +$0;
+  return +$0_1;
  }
  
- function $9() {
+ function $8() {
   
  }
  
- function $10() {
+ function $9() {
   block : {
    dummy();
    break block;
   }
  }
  
- function $11() {
+ function $10() {
   block : {
    dummy();
    break block;
   }
  }
  
- function $12() {
-  var $0 = 0;
+ function $11() {
+  var $0_1 = 0;
   block : {
    dummy();
-   $0 = 2;
+   $0_1 = 2;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $13() {
-  var $0 = 0, $1_1 = 0, $3_1 = 0;
+ function $12() {
+  var $0_1 = 0, $1_1 = 0, $3_1 = 0;
   block : {
-   loop_in : while (1) {
-    $0 = 3;
+   $null_Name_ : while (1) {
+    $0_1 = 3;
     break block;
    };
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $14() {
-  var $0 = 0, $1_1 = 0, $3_1 = 0;
+ function $13() {
+  var $0_1 = 0, $1_1 = 0, $3_1 = 0;
   block : {
-   loop_in : while (1) {
+   $null_Name_ : while (1) {
     dummy();
-    $0 = 4;
+    $0_1 = 4;
     break block;
    };
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $15() {
-  var $0 = 0;
+ function $14() {
+  var $0_1 = 0;
   block : {
-   loop_in : while (1) {
+   $null_Name_ : while (1) {
     dummy();
-    $0 = 5;
+    $0_1 = 5;
     break block;
    };
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $16() {
-  var $0 = 0;
+ function $15() {
+  var $0_1 = 0;
   block : {
-   $0 = 9;
+   $0_1 = 9;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $17() {
+ function $16() {
   
  }
  
- function $18() {
-  var $0 = 0;
+ function $17() {
+  var $0_1 = 0;
   block : {
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $19() {
-  var $0 = 0;
+ function $18() {
+  var $0_1 = 0;
   block : {
-   $0 = 9;
+   $0_1 = 9;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $20() {
+ function $19() {
   
  }
  
- function $21() {
-  var $0 = 0;
+ function $20() {
+  var $0_1 = 0;
   block : {
-   $0 = 10;
+   $0_1 = 10;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $22() {
-  var $0 = 0;
+ function $21() {
+  var $0_1 = 0;
   block : {
-   $0 = 11;
+   $0_1 = 11;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $23() {
-  var i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0;
+ function $22() {
+  var i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
-   $0 = 7;
+   $0_1 = 7;
    $0$hi = i64toi32_i32$0;
    break block;
   }
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $24() {
-  var $0 = 0, $1_1 = 0;
-  if_ : {
-   $0 = 2;
-   break if_;
+ function $23() {
+  var $0_1 = 0, $1_1 = 0;
+  block : {
+   $0_1 = 2;
+   break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $25($0, $1_1) {
-  $0 = $0 | 0;
+ function $24($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $3_1 = 0, $5_1 = 0;
   block : {
-   if ($0) {
+   if ($0_1) {
     $3_1 = 3;
     break block;
    } else {
@@ -228,12 +228,12 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $26($0, $1_1) {
-  $0 = $0 | 0;
+ function $25($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $4_1 = 0, $5_1 = 0;
   block : {
-   if ($0) {
+   if ($0_1) {
     $5_1 = $1_1
    } else {
     $4_1 = 4;
@@ -244,8 +244,8 @@ function asmFunc(imports) {
   return $4_1 | 0;
  }
  
- function $27($0, $1_1) {
-  $0 = $0 | 0;
+ function $26($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0;
   block : {
@@ -255,98 +255,98 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function $28($0, $1_1) {
-  $0 = $0 | 0;
+ function $27($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0;
   block : {
-   $2_1 = $0;
+   $2_1 = $0_1;
    $3_1 = 6;
    break block;
   }
   return $3_1 | 0;
  }
  
- function $29() {
-  var $0 = 0;
+ function $28() {
+  var $0_1 = 0;
   block : {
-   $0 = 7;
+   $0_1 = 7;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function f($0, $1_1, $2_1) {
-  $0 = $0 | 0;
+ function f($0_1, $1_1, $2_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   return -1 | 0;
  }
  
- function $31() {
-  var $0 = 0;
+ function $29() {
+  var $0_1 = 0;
   block : {
-   $0 = 12;
+   $0_1 = 12;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $32() {
-  var $0 = 0;
+ function $30() {
+  var $0_1 = 0;
   block : {
-   $0 = 13;
+   $0_1 = 13;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $33() {
-  var $0 = 0;
+ function $31() {
+  var $0_1 = 0;
   block : {
-   $0 = 14;
+   $0_1 = 14;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $34() {
-  var $0 = 0;
+ function $32() {
+  var $0_1 = 0;
   block : {
-   $0 = 20;
+   $0_1 = 20;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $35() {
-  var $0 = 0;
+ function $33() {
+  var $0_1 = 0;
   block : {
-   $0 = 21;
+   $0_1 = 21;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $36() {
-  var $0 = 0;
+ function $34() {
+  var $0_1 = 0;
   block : {
-   $0 = 22;
+   $0_1 = 22;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $37() {
-  var $0 = 0;
+ function $35() {
+  var $0_1 = 0;
   block : {
-   $0 = 23;
+   $0_1 = 23;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $38() {
+ function $36() {
   var $1_1 = 0;
   block : {
    $1_1 = 17;
@@ -355,7 +355,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $39() {
+ function $37() {
   var $1_1 = 0;
   block : {
    $1_1 = 1;
@@ -364,210 +364,210 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $40() {
-  var $0 = 0;
+ function $38() {
+  var $0_1 = 0;
   block : {
-   $0 = 1;
+   $0_1 = 1;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $41() {
-  var $0 = Math_fround(0);
+ function $39() {
+  var $0_1 = Math_fround(0);
   block : {
-   $0 = Math_fround(1.7000000476837158);
+   $0_1 = Math_fround(1.7000000476837158);
    break block;
   }
-  return Math_fround($0);
+  return Math_fround($0_1);
  }
  
- function $42() {
-  var i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0;
+ function $40() {
+  var i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
-   $0 = 30;
+   $0_1 = 30;
    $0$hi = i64toi32_i32$0;
    break block;
   }
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $43() {
-  var $0 = 0;
+ function $41() {
+  var $0_1 = 0;
   block : {
-   $0 = 30;
+   $0_1 = 30;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $44() {
-  var $0 = 0;
+ function $42() {
+  var $0_1 = 0;
   block : {
-   $0 = 31;
+   $0_1 = 31;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $45() {
-  var $0 = 0;
+ function $43() {
+  var $0_1 = 0;
   block : {
-   $0 = 32;
+   $0_1 = 32;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $46() {
-  var $0 = 0;
+ function $44() {
+  var $0_1 = 0;
   block : {
-   $0 = 33;
+   $0_1 = 33;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $47() {
-  var $0 = Math_fround(0);
+ function $45() {
+  var $0_1 = Math_fround(0);
   block : {
-   $0 = Math_fround(3.4000000953674316);
+   $0_1 = Math_fround(3.4000000953674316);
    break block;
   }
-  return Math_fround($0);
+  return Math_fround($0_1);
  }
  
- function $48() {
-  var $0 = 0;
+ function $46() {
+  var $0_1 = 0;
   block : {
-   $0 = 3;
+   $0_1 = 3;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $49() {
-  var $0 = 0, $0$hi = 0, i64toi32_i32$1 = 0;
+ function $47() {
+  var $0_1 = 0, $0$hi = 0, i64toi32_i32$1 = 0;
   block : {
-   $0 = 45;
+   $0_1 = 45;
    $0$hi = 0;
    break block;
   }
   i64toi32_i32$1 = $0$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $50() {
-  var $0 = 0;
+ function $48() {
+  var $0_1 = 0;
   block : {
-   $0 = 44;
+   $0_1 = 44;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $51() {
-  var $0 = 0;
+ function $49() {
+  var $0_1 = 0;
   block : {
-   $0 = 43;
+   $0_1 = 43;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $52() {
-  var $0 = 0;
+ function $50() {
+  var $0_1 = 0;
   block : {
-   $0 = 42;
+   $0_1 = 42;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $53() {
-  var $0 = 0;
+ function $51() {
+  var $0_1 = 0;
   block : {
-   $0 = 41;
+   $0_1 = 41;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $54() {
-  var $0 = 0;
+ function $52() {
+  var $0_1 = 0;
   block : {
-   $0 = 40;
+   $0_1 = 40;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $55() {
-  var $0 = 0;
+ function $53() {
+  var $0_1 = 0;
   block : {
    dummy();
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function $56() {
-  var $0 = 0;
+ function $54() {
+  var $0_1 = 0;
   block : {
    block0 : {
-    $0 = 8;
+    $0_1 = 8;
     break block;
    }
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function $57() {
-  var $0 = 0, $1_1 = 0;
+ function $55() {
+  var $0_1 = 0, $1_1 = 0;
   block : {
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function $58() {
-  var $0 = 0;
+ function $56() {
+  var $0_1 = 0;
   block : {
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function $59() {
-  var $0 = 0;
+ function $57() {
+  var $0_1 = 0;
   block : {
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function $60() {
-  var $0 = 0;
+ function $58() {
+  var $0_1 = 0;
   block : {
-   $0 = 8;
+   $0_1 = 8;
    break block;
   }
-  return 1 + $0 | 0 | 0;
+  return 1 + $0_1 | 0 | 0;
  }
  
- function legalstub$6() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $6() | 0;
+ function legalstub$5() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $5() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -582,14 +582,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$23() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $23() | 0;
+ function legalstub$22() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $22() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -604,14 +604,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$42() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $42() | 0;
+ function legalstub$40() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $40() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -626,14 +626,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$49() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $49() | 0;
+ function legalstub$47() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $47() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -648,69 +648,69 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
  return {
-  "type_i32": $1, 
-  "type_i64": $2, 
-  "type_f32": $3, 
-  "type_f64": $4, 
-  "type_i32_value": $5, 
-  "type_i64_value": legalstub$6, 
-  "type_f32_value": $7, 
-  "type_f64_value": $8, 
-  "as_block_first": $9, 
-  "as_block_mid": $10, 
-  "as_block_last": $11, 
-  "as_block_value": $12, 
-  "as_loop_first": $13, 
-  "as_loop_mid": $14, 
-  "as_loop_last": $15, 
-  "as_br_value": $16, 
-  "as_br_if_cond": $17, 
-  "as_br_if_value": $18, 
-  "as_br_if_value_cond": $19, 
-  "as_br_table_index": $20, 
-  "as_br_table_value": $21, 
-  "as_br_table_value_index": $22, 
-  "as_return_value": legalstub$23, 
-  "as_if_cond": $24, 
-  "as_if_then": $25, 
-  "as_if_else": $26, 
-  "as_select_first": $27, 
-  "as_select_second": $28, 
-  "as_select_cond": $29, 
-  "as_call_first": $31, 
-  "as_call_mid": $32, 
-  "as_call_last": $33, 
-  "as_call_indirect_func": $34, 
-  "as_call_indirect_first": $35, 
-  "as_call_indirect_mid": $36, 
-  "as_call_indirect_last": $37, 
-  "as_local_set_value": $38, 
-  "as_local_tee_value": $39, 
-  "as_global_set_value": $40, 
-  "as_load_address": $41, 
-  "as_loadN_address": legalstub$42, 
-  "as_store_address": $43, 
-  "as_store_value": $44, 
-  "as_storeN_address": $45, 
-  "as_storeN_value": $46, 
-  "as_unary_operand": $47, 
-  "as_binary_left": $48, 
-  "as_binary_right": legalstub$49, 
-  "as_test_operand": $50, 
-  "as_compare_left": $51, 
-  "as_compare_right": $52, 
-  "as_convert_operand": $53, 
-  "as_memory_grow_size": $54, 
-  "nested_block_value": $55, 
-  "nested_br_value": $56, 
-  "nested_br_if_value": $57, 
-  "nested_br_if_value_cond": $58, 
-  "nested_br_table_value": $59, 
-  "nested_br_table_value_index": $60
+  "type_i32": $0, 
+  "type_i64": $1, 
+  "type_f32": $2, 
+  "type_f64": $3, 
+  "type_i32_value": $4, 
+  "type_i64_value": legalstub$5, 
+  "type_f32_value": $6, 
+  "type_f64_value": $7, 
+  "as_block_first": $8, 
+  "as_block_mid": $9, 
+  "as_block_last": $10, 
+  "as_block_value": $11, 
+  "as_loop_first": $12, 
+  "as_loop_mid": $13, 
+  "as_loop_last": $14, 
+  "as_br_value": $15, 
+  "as_br_if_cond": $16, 
+  "as_br_if_value": $17, 
+  "as_br_if_value_cond": $18, 
+  "as_br_table_index": $19, 
+  "as_br_table_value": $20, 
+  "as_br_table_value_index": $21, 
+  "as_return_value": legalstub$22, 
+  "as_if_cond": $23, 
+  "as_if_then": $24, 
+  "as_if_else": $25, 
+  "as_select_first": $26, 
+  "as_select_second": $27, 
+  "as_select_cond": $28, 
+  "as_call_first": $29, 
+  "as_call_mid": $30, 
+  "as_call_last": $31, 
+  "as_call_indirect_func": $32, 
+  "as_call_indirect_first": $33, 
+  "as_call_indirect_mid": $34, 
+  "as_call_indirect_last": $35, 
+  "as_local_set_value": $36, 
+  "as_local_tee_value": $37, 
+  "as_global_set_value": $38, 
+  "as_load_address": $39, 
+  "as_loadN_address": legalstub$40, 
+  "as_store_address": $41, 
+  "as_store_value": $42, 
+  "as_storeN_address": $43, 
+  "as_storeN_value": $44, 
+  "as_unary_operand": $45, 
+  "as_binary_left": $46, 
+  "as_binary_right": legalstub$47, 
+  "as_test_operand": $48, 
+  "as_compare_left": $49, 
+  "as_compare_right": $50, 
+  "as_convert_operand": $51, 
+  "as_memory_grow_size": $52, 
+  "nested_block_value": $53, 
+  "nested_br_value": $54, 
+  "nested_br_if_value": $55, 
+  "nested_br_if_value_cond": $56, 
+  "nested_br_table_value": $57, 
+  "nested_br_table_value_index": $58
  };
 }
 
diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js
index c3fa8e31d..93670ee62 100644
--- a/test/wasm2js/br_table.2asm.js
+++ b/test/wasm2js/br_table.2asm.js
@@ -18,6 +18,10 @@ function asmFunc(imports) {
   
  }
  
+ function $0() {
+  
+ }
+ 
  function $1() {
   
  }
@@ -31,10 +35,6 @@ function asmFunc(imports) {
  }
  
  function $4() {
-  
- }
- 
- function $5() {
   var $1_1 = 0;
   block : {
    $1_1 = 1;
@@ -46,7 +46,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $6() {
+ function $5() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -62,7 +62,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $7() {
+ function $6() {
   var $1_1 = Math_fround(0);
   block : {
    $1_1 = Math_fround(3.0);
@@ -74,7 +74,7 @@ function asmFunc(imports) {
   return Math_fround($1_1);
  }
  
- function $8() {
+ function $7() {
   var $1_1 = 0.0;
   block : {
    $1_1 = 4.0;
@@ -86,17 +86,17 @@ function asmFunc(imports) {
   return +$1_1;
  }
  
- function $9($0) {
-  $0 = $0 | 0;
+ function $8($0_1) {
+  $0_1 = $0_1 | 0;
   return 22 | 0;
  }
  
- function $10($0) {
-  $0 = $0 | 0;
+ function $9($0_1) {
+  $0_1 = $0_1 | 0;
   var $3_1 = 0;
   block : {
    $3_1 = 33;
-   switch ($0 | 0) {
+   switch ($0_1 | 0) {
    default:
     break block;
    };
@@ -104,10 +104,10 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $11($0) {
-  $0 = $0 | 0;
+ function $10($0_1) {
+  $0_1 = $0_1 | 0;
   block : {
-   switch ($0 | 0) {
+   switch ($0_1 | 0) {
    default:
     return 20 | 0;
    case 0:
@@ -117,30 +117,30 @@ function asmFunc(imports) {
   return 22 | 0;
  }
  
- function $12($0) {
-  $0 = $0 | 0;
-  var $2_1 = 0, $3_1 = 0, $4_1 = 0;
-  block : {
-   block1 : {
+ function $11($0_1) {
+  $0_1 = $0_1 | 0;
+  var $2_1 = 0, $4_1 = 0, $3_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 33;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 0:
-     break block1;
-    default:
      break block;
+    default:
+     break block0;
     };
    }
-   $3_1 = 32;
+   $4_1 = 32;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
- function $13($0) {
-  $0 = $0 | 0;
-  block : {
-   switch ($0 | 0) {
+ function $12($0_1) {
+  $0_1 = $0_1 | 0;
+  block3 : {
+   switch ($0_1 | 0) {
    case 3:
     return 100 | 0;
    case 2:
@@ -150,59 +150,59 @@ function asmFunc(imports) {
    case 0:
     return 103 | 0;
    default:
-    break block;
+    break block3;
    };
   }
   return 104 | 0;
  }
  
- function $14($0) {
-  $0 = $0 | 0;
+ function $13($0_1) {
+  $0_1 = $0_1 | 0;
   var $1_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0;
-  block : {
-   block6 : {
-    block7 : {
-     block8 : {
-      block9 : {
+  block3 : {
+   block : {
+    block0 : {
+     block1 : {
+      block2 : {
        $3_1 = 200;
        $4_1 = $3_1;
        $5_1 = $3_1;
        $6_1 = $3_1;
        $7_1 = $3_1;
        $8_1 = $3_1;
-       switch ($0 | 0) {
+       switch ($0_1 | 0) {
        case 0:
-        break block6;
+        break block;
        case 1:
-        break block7;
+        break block0;
        case 2:
-        break block8;
+        break block1;
        case 3:
-        break block9;
+        break block2;
        default:
-        break block;
+        break block3;
        };
       }
-      $1_1 = $8_1;
+      $1_1 = $7_1;
       return $1_1 + 10 | 0 | 0;
      }
-     $1_1 = $7_1;
+     $1_1 = $6_1;
      return $1_1 + 11 | 0 | 0;
     }
-    $1_1 = $6_1;
+    $1_1 = $5_1;
     return $1_1 + 12 | 0 | 0;
    }
-   $1_1 = $5_1;
+   $1_1 = $4_1;
    return $1_1 + 13 | 0 | 0;
   }
-  $1_1 = $4_1;
+  $1_1 = $8_1;
   return $1_1 + 14 | 0 | 0;
  }
  
- function $15($0) {
-  $0 = $0 | 0;
-  block : {
-   switch ($0 | 0) {
+ function $14($0_1) {
+  $0_1 = $0_1 | 0;
+  block0 : {
+   switch ($0_1 | 0) {
    case 0:
    case 2:
    case 4:
@@ -12513,17 +12513,17 @@ function asmFunc(imports) {
    case 24614:
     return 0 | 0;
    default:
-    break block;
+    break block0;
    };
   }
   return 1 | 0;
  }
  
- function $16() {
+ function $15() {
   
  }
  
- function $17() {
+ function $16() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -12533,7 +12533,7 @@ function asmFunc(imports) {
   }
  }
  
- function $18() {
+ function $17() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -12543,7 +12543,7 @@ function asmFunc(imports) {
   }
  }
  
- function $19() {
+ function $18() {
   var $1_1 = 0;
   block : {
    dummy();
@@ -12556,51 +12556,51 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $20() {
+ function $19() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     $1_1 = 3;
     switch (0 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $21() {
+ function $20() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     dummy();
     $1_1 = 4;
     switch (-1 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $22() {
+ function $21() {
   var $1_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     dummy();
     $1_1 = 5;
     switch (1 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $23() {
+ function $22() {
   var $1_1 = 0;
   block : {
    $1_1 = 9;
@@ -12612,11 +12612,11 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $24() {
+ function $23() {
   
  }
  
- function $25() {
+ function $24() {
   var $1_1 = 0;
   block : {
    $1_1 = 8;
@@ -12628,7 +12628,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $26() {
+ function $25() {
   var $1_1 = 0;
   block : {
    $1_1 = 9;
@@ -12640,11 +12640,11 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $27() {
+ function $26() {
   
  }
  
- function $28() {
+ function $27() {
   var $1_1 = 0;
   block : {
    $1_1 = 10;
@@ -12656,7 +12656,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $29() {
+ function $28() {
   var $1_1 = 0;
   block : {
    $1_1 = 11;
@@ -12668,7 +12668,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $30() {
+ function $29() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -12684,24 +12684,24 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $31() {
+ function $30() {
   var $1_1 = 0, $2_1 = 0;
-  if_ : {
+  block : {
    $1_1 = 2;
    switch (0 | 0) {
    default:
-    break if_;
+    break block;
    };
   }
   return $1_1 | 0;
  }
  
- function $32($0, $1_1) {
-  $0 = $0 | 0;
+ function $31($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $4_1 = 0, $6_1 = 0;
   block : {
-   if ($0) {
+   if ($0_1) {
     $4_1 = 3;
     switch (0 | 0) {
     default:
@@ -12715,13 +12715,13 @@ function asmFunc(imports) {
   return $4_1 | 0;
  }
  
- function $33($0, $1_1) {
-  $0 = $0 | 0;
+ function $32($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0;
   block : {
-   if_ : {
-    if ($0) {
+   label : {
+    if ($0_1) {
      $7_1 = $1_1
     } else {
      $4_1 = 4;
@@ -12731,7 +12731,7 @@ function asmFunc(imports) {
      case 0:
       break block;
      default:
-      break if_;
+      break label;
      };
     }
     $6_1 = $7_1;
@@ -12741,8 +12741,8 @@ function asmFunc(imports) {
   return $5_1 | 0;
  }
  
- function $34($0, $1_1) {
-  $0 = $0 | 0;
+ function $33($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $3_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
@@ -12755,12 +12755,12 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $35($0, $1_1) {
-  $0 = $0 | 0;
+ function $34($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $2_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
-   $2_1 = $0;
+   $2_1 = $0_1;
    $4_1 = 6;
    switch (1 | 0) {
    default:
@@ -12770,7 +12770,7 @@ function asmFunc(imports) {
   return $4_1 | 0;
  }
  
- function $36() {
+ function $35() {
   var $1_1 = 0;
   block : {
    $1_1 = 7;
@@ -12782,14 +12782,14 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function f($0, $1_1, $2_1) {
-  $0 = $0 | 0;
+ function f($0_1, $1_1, $2_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   return -1 | 0;
  }
  
- function $38() {
+ function $36() {
   var $1_1 = 0;
   block : {
    $1_1 = 12;
@@ -12801,7 +12801,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $39() {
+ function $37() {
   var $1_1 = 0;
   block : {
    $1_1 = 13;
@@ -12813,7 +12813,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $40() {
+ function $38() {
   var $1_1 = 0;
   block : {
    $1_1 = 14;
@@ -12825,7 +12825,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $41() {
+ function $39() {
   var $1_1 = 0;
   block : {
    $1_1 = 20;
@@ -12837,7 +12837,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $42() {
+ function $40() {
   var $1_1 = 0;
   block : {
    $1_1 = 21;
@@ -12849,7 +12849,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $43() {
+ function $41() {
   var $1_1 = 0;
   block : {
    $1_1 = 22;
@@ -12861,7 +12861,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $44() {
+ function $42() {
   var $1_1 = 0;
   block : {
    $1_1 = 23;
@@ -12873,7 +12873,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $45() {
+ function $43() {
   var $2_1 = 0;
   block : {
    $2_1 = 17;
@@ -12885,7 +12885,7 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function $46() {
+ function $44() {
   var $2_1 = 0;
   block : {
    $2_1 = 1;
@@ -12897,7 +12897,7 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function $47() {
+ function $45() {
   var $1_1 = 0;
   block : {
    $1_1 = 1;
@@ -12909,7 +12909,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $48() {
+ function $46() {
   var $1_1 = Math_fround(0);
   block : {
    $1_1 = Math_fround(1.7000000476837158);
@@ -12921,7 +12921,7 @@ function asmFunc(imports) {
   return Math_fround($1_1);
  }
  
- function $49() {
+ function $47() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -12937,7 +12937,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $50() {
+ function $48() {
   var $1_1 = 0;
   block : {
    $1_1 = 30;
@@ -12949,7 +12949,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $51() {
+ function $49() {
   var $1_1 = 0;
   block : {
    $1_1 = 31;
@@ -12961,7 +12961,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $52() {
+ function $50() {
   var $1_1 = 0;
   block : {
    $1_1 = 32;
@@ -12973,7 +12973,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $53() {
+ function $51() {
   var $1_1 = 0;
   block : {
    $1_1 = 33;
@@ -12985,7 +12985,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $54() {
+ function $52() {
   var $1_1 = Math_fround(0);
   block : {
    $1_1 = Math_fround(3.4000000953674316);
@@ -12997,7 +12997,7 @@ function asmFunc(imports) {
   return Math_fround($1_1);
  }
  
- function $55() {
+ function $53() {
   var $1_1 = 0;
   block : {
    $1_1 = 3;
@@ -13009,7 +13009,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $56() {
+ function $54() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$1 = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -13025,7 +13025,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $57() {
+ function $55() {
   var $1_1 = 0;
   block : {
    $1_1 = 44;
@@ -13037,7 +13037,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $58() {
+ function $56() {
   var $1_1 = 0;
   block : {
    $1_1 = 43;
@@ -13049,7 +13049,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $59() {
+ function $57() {
   var $1_1 = 0;
   block : {
    $1_1 = 42;
@@ -13061,7 +13061,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $60() {
+ function $58() {
   var $1_1 = 0;
   block : {
    $1_1 = 41;
@@ -13073,7 +13073,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $61() {
+ function $59() {
   var $1_1 = 0;
   block : {
    $1_1 = 40;
@@ -13085,49 +13085,49 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $62($0) {
-  $0 = $0 | 0;
-  var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block11 : {
-    block12 : {
+ function $60($0_1) {
+  $0_1 = $0_1 | 0;
+  var $2_1 = 0, $4_1 = 0, $5_1 = 0, $3_1 = 0;
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 16;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block11;
+     switch ($0_1 | 0) {
      case 0:
-      break block12;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
-    $4_1 = 2 + $5_1 | 0;
+    $4_1 = 2 + $3_1 | 0;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $63($0) {
-  $0 = $0 | 0;
+ function $61($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
-   block13 : {
-    block14 : {
+   block0 : {
+    block1 : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
+     switch ($0_1 | 0) {
      case 0:
       break block;
      case 1:
-      break block13;
+      break block0;
      default:
-      break block14;
+      break block1;
      };
     }
     $4_1 = 16;
@@ -13137,134 +13137,134 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $64($0) {
-  $0 = $0 | 0;
+ function $62($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block15 : {
-    block16 : {
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block15;
+     switch ($0_1 | 0) {
      case 0:
-      break block16;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
     $4_1 = 16;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $65($0) {
-  $0 = $0 | 0;
-  var $4_1 = 0, $2_1 = 0, $3_1 = 0;
-  block : {
-   block17 : {
+ function $63($0_1) {
+  $0_1 = $0_1 | 0;
+  var $3_1 = 0, $2_1 = 0, $4_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 8;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 1:
-     break block;
+     break block0;
     default:
-     break block17;
+     break block;
     };
    }
-   $3_1 = 1 + $4_1 | 0;
+   $4_1 = 1 + $3_1 | 0;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
- function $66($0) {
-  $0 = $0 | 0;
+ function $64($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block18 : {
-    block19 : {
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block18;
+     switch ($0_1 | 0) {
      case 0:
-      break block19;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
     $4_1 = 16;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $67($0) {
-  $0 = $0 | 0;
-  var $4_1 = 0, $2_1 = 0, $3_1 = 0;
-  block : {
-   block20 : {
+ function $65($0_1) {
+  $0_1 = $0_1 | 0;
+  var $3_1 = 0, $2_1 = 0, $4_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 8;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 1:
-     break block;
+     break block0;
     default:
-     break block20;
+     break block;
     };
    }
-   $3_1 = 1 + $4_1 | 0;
+   $4_1 = 1 + $3_1 | 0;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
- function $68($0) {
-  $0 = $0 | 0;
+ function $66($0_1) {
+  $0_1 = $0_1 | 0;
   var $4_1 = 0, $9_1 = 0;
-  loop_in : while (1) {
+  label : while (1) {
    block : {
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 0:
-     continue loop_in;
+     continue label;
     default:
      break block;
     };
    }
    $4_1 = 0;
-   break loop_in;
+   break label;
   };
-  $0 = $4_1;
-  loop_in21 : while (1) {
-   block22 : {
-    switch ($0 | 0) {
+  $0_1 = $4_1;
+  label0 : while (1) {
+   block0 : {
+    switch ($0_1 | 0) {
     case 0:
-     break block22;
+     break block0;
     default:
-     continue loop_in21;
+     continue label0;
     };
    }
    $9_1 = 3;
-   break loop_in21;
+   break label0;
   };
   return $9_1 | 0;
  }
  
- function legalstub$6() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $6() | 0;
+ function legalstub$5() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $5() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -13279,14 +13279,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$30() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $30() | 0;
+ function legalstub$29() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $29() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -13301,14 +13301,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$49() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $49() | 0;
+ function legalstub$47() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $47() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -13323,14 +13323,14 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$56() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $56() | 0;
+ function legalstub$54() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0_1 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
+  i64toi32_i32$0 = $54() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -13345,77 +13345,77 @@ function asmFunc(imports) {
   }
   setTempRet0($7_1 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
  return {
-  "type_i32": $1, 
-  "type_i64": $2, 
-  "type_f32": $3, 
-  "type_f64": $4, 
-  "type_i32_value": $5, 
-  "type_i64_value": legalstub$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": legalstub$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_local_set_value": $45, 
-  "as_local_tee_value": $46, 
-  "as_global_set_value": $47, 
-  "as_load_address": $48, 
-  "as_loadN_address": legalstub$49, 
-  "as_store_address": $50, 
-  "as_store_value": $51, 
-  "as_storeN_address": $52, 
-  "as_storeN_value": $53, 
-  "as_unary_operand": $54, 
-  "as_binary_left": $55, 
-  "as_binary_right": legalstub$56, 
-  "as_test_operand": $57, 
-  "as_compare_left": $58, 
-  "as_compare_right": $59, 
-  "as_convert_operand": $60, 
-  "as_memory_grow_size": $61, 
-  "nested_block_value": $62, 
-  "nested_br_value": $63, 
-  "nested_br_if_value": $64, 
-  "nested_br_if_value_cond": $65, 
-  "nested_br_table_value": $66, 
-  "nested_br_table_value_index": $67, 
-  "nested_br_table_loop_block": $68
+  "type_i32": $0, 
+  "type_i64": $1, 
+  "type_f32": $2, 
+  "type_f64": $3, 
+  "type_i32_value": $4, 
+  "type_i64_value": legalstub$5, 
+  "type_f32_value": $6, 
+  "type_f64_value": $7, 
+  "empty": $8, 
+  "empty_value": $9, 
+  "singleton": $10, 
+  "singleton_value": $11, 
+  "multiple": $12, 
+  "multiple_value": $13, 
+  "large": $14, 
+  "as_block_first": $15, 
+  "as_block_mid": $16, 
+  "as_block_last": $17, 
+  "as_block_value": $18, 
+  "as_loop_first": $19, 
+  "as_loop_mid": $20, 
+  "as_loop_last": $21, 
+  "as_br_value": $22, 
+  "as_br_if_cond": $23, 
+  "as_br_if_value": $24, 
+  "as_br_if_value_cond": $25, 
+  "as_br_table_index": $26, 
+  "as_br_table_value": $27, 
+  "as_br_table_value_index": $28, 
+  "as_return_value": legalstub$29, 
+  "as_if_cond": $30, 
+  "as_if_then": $31, 
+  "as_if_else": $32, 
+  "as_select_first": $33, 
+  "as_select_second": $34, 
+  "as_select_cond": $35, 
+  "as_call_first": $36, 
+  "as_call_mid": $37, 
+  "as_call_last": $38, 
+  "as_call_indirect_first": $39, 
+  "as_call_indirect_mid": $40, 
+  "as_call_indirect_last": $41, 
+  "as_call_indirect_func": $42, 
+  "as_local_set_value": $43, 
+  "as_local_tee_value": $44, 
+  "as_global_set_value": $45, 
+  "as_load_address": $46, 
+  "as_loadN_address": legalstub$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": legalstub$54, 
+  "as_test_operand": $55, 
+  "as_compare_left": $56, 
+  "as_compare_right": $57, 
+  "as_convert_operand": $58, 
+  "as_memory_grow_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, 
+  "nested_br_table_loop_block": $66
  };
 }
 
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js
index 70a097570..9bc6cafa4 100644
--- a/test/wasm2js/br_table_temp.2asm.js
+++ b/test/wasm2js/br_table_temp.2asm.js
@@ -14,6 +14,10 @@ function asmFunc(imports) {
   
  }
  
+ function $0() {
+  
+ }
+ 
  function $1() {
   
  }
@@ -27,10 +31,6 @@ function asmFunc(imports) {
  }
  
  function $4() {
-  
- }
- 
- function $5() {
   var $1_1 = 0;
   block : {
    $1_1 = 1;
@@ -42,7 +42,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $6() {
+ function $5() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -57,7 +57,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $7() {
+ function $6() {
   var $1_1 = Math_fround(0);
   block : {
    $1_1 = Math_fround(3.0);
@@ -69,7 +69,7 @@ function asmFunc(imports) {
   return Math_fround($1_1);
  }
  
- function $8() {
+ function $7() {
   var $1_1 = 0.0;
   block : {
    $1_1 = 4.0;
@@ -81,17 +81,17 @@ function asmFunc(imports) {
   return +$1_1;
  }
  
- function $9($0) {
-  $0 = $0 | 0;
+ function $8($0_1) {
+  $0_1 = $0_1 | 0;
   return 22 | 0;
  }
  
- function $10($0) {
-  $0 = $0 | 0;
+ function $9($0_1) {
+  $0_1 = $0_1 | 0;
   var $3_1 = 0;
   block : {
    $3_1 = 33;
-   switch ($0 | 0) {
+   switch ($0_1 | 0) {
    default:
     break block;
    };
@@ -99,10 +99,10 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $11($0) {
-  $0 = $0 | 0;
+ function $10($0_1) {
+  $0_1 = $0_1 | 0;
   block : {
-   switch ($0 | 0) {
+   switch ($0_1 | 0) {
    default:
     return 20 | 0;
    case 0:
@@ -112,30 +112,30 @@ function asmFunc(imports) {
   return 22 | 0;
  }
  
- function $12($0) {
-  $0 = $0 | 0;
-  var $2_1 = 0, $3_1 = 0, $4_1 = 0;
-  block : {
-   block1 : {
+ function $11($0_1) {
+  $0_1 = $0_1 | 0;
+  var $2_1 = 0, $4_1 = 0, $3_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 33;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 0:
-     break block1;
-    default:
      break block;
+    default:
+     break block0;
     };
    }
-   $3_1 = 32;
+   $4_1 = 32;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
- function $13($0) {
-  $0 = $0 | 0;
-  block : {
-   switch ($0 | 0) {
+ function $12($0_1) {
+  $0_1 = $0_1 | 0;
+  block3 : {
+   switch ($0_1 | 0) {
    case 3:
     return 100 | 0;
    case 2:
@@ -145,59 +145,59 @@ function asmFunc(imports) {
    case 0:
     return 103 | 0;
    default:
-    break block;
+    break block3;
    };
   }
   return 104 | 0;
  }
  
- function $14($0) {
-  $0 = $0 | 0;
+ function $13($0_1) {
+  $0_1 = $0_1 | 0;
   var $1_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0;
-  block : {
-   block6 : {
-    block7 : {
-     block8 : {
-      block9 : {
+  block3 : {
+   block : {
+    block0 : {
+     block1 : {
+      block2 : {
        $3_1 = 200;
        $4_1 = $3_1;
        $5_1 = $3_1;
        $6_1 = $3_1;
        $7_1 = $3_1;
        $8_1 = $3_1;
-       switch ($0 | 0) {
+       switch ($0_1 | 0) {
        case 0:
-        break block6;
+        break block;
        case 1:
-        break block7;
+        break block0;
        case 2:
-        break block8;
+        break block1;
        case 3:
-        break block9;
+        break block2;
        default:
-        break block;
+        break block3;
        };
       }
-      $1_1 = $8_1;
+      $1_1 = $7_1;
       return $1_1 + 10 | 0 | 0;
      }
-     $1_1 = $7_1;
+     $1_1 = $6_1;
      return $1_1 + 11 | 0 | 0;
     }
-    $1_1 = $6_1;
+    $1_1 = $5_1;
     return $1_1 + 12 | 0 | 0;
    }
-   $1_1 = $5_1;
+   $1_1 = $4_1;
    return $1_1 + 13 | 0 | 0;
   }
-  $1_1 = $4_1;
+  $1_1 = $8_1;
   return $1_1 + 14 | 0 | 0;
  }
  
- function $15($0) {
-  $0 = $0 | 0;
-  block : {
-   switch ($0 | 0) {
+ function $14($0_1) {
+  $0_1 = $0_1 | 0;
+  block0 : {
+   switch ($0_1 | 0) {
    case 0:
    case 2:
    case 4:
@@ -12508,17 +12508,17 @@ function asmFunc(imports) {
    case 24614:
     return 0 | 0;
    default:
-    break block;
+    break block0;
    };
   }
   return 1 | 0;
  }
  
- function $16() {
+ function $15() {
   
  }
  
- function $17() {
+ function $16() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -12528,7 +12528,7 @@ function asmFunc(imports) {
   }
  }
  
- function $18() {
+ function $17() {
   block : {
    dummy();
    switch (0 | 0) {
@@ -12538,7 +12538,7 @@ function asmFunc(imports) {
   }
  }
  
- function $19() {
+ function $18() {
   var $1_1 = 0;
   block : {
    dummy();
@@ -12551,64 +12551,64 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $20() {
+ function $19() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     $1_1 = 3;
     switch (0 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $21() {
+ function $20() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     dummy();
     $1_1 = 4;
     switch (-1 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $22() {
+ function $21() {
   var $1_1 = 0;
-  __binaryen_fake_return : {
-   loop_in : while (1) {
+  label : {
+   $null_Name_ : while (1) {
     dummy();
     $1_1 = 5;
     switch (1 | 0) {
     default:
-     break __binaryen_fake_return;
+     break label;
     };
    };
   }
   return $1_1 | 0;
  }
  
- function $23() {
-  var $0 = 0;
+ function $22() {
+  var $0_1 = 0;
   block : {
-   $0 = 9;
+   $0_1 = 9;
    break block;
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function $24() {
+ function $23() {
   
  }
  
- function $25() {
+ function $24() {
   var $1_1 = 0;
   block : {
    $1_1 = 8;
@@ -12620,7 +12620,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $26() {
+ function $25() {
   var $1_1 = 0;
   block : {
    $1_1 = 9;
@@ -12632,11 +12632,11 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $27() {
+ function $26() {
   
  }
  
- function $28() {
+ function $27() {
   var $1_1 = 0;
   block : {
    $1_1 = 10;
@@ -12648,7 +12648,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $29() {
+ function $28() {
   var $1_1 = 0;
   block : {
    $1_1 = 11;
@@ -12660,7 +12660,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $30() {
+ function $29() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -12675,24 +12675,24 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $31() {
+ function $30() {
   var $1_1 = 0, $2_1 = 0;
-  if_ : {
+  block : {
    $1_1 = 2;
    switch (0 | 0) {
    default:
-    break if_;
+    break block;
    };
   }
   return $1_1 | 0;
  }
  
- function $32($0, $1_1) {
-  $0 = $0 | 0;
+ function $31($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $4_1 = 0, $6_1 = 0;
   block : {
-   if ($0) {
+   if ($0_1) {
     $4_1 = 3;
     switch (0 | 0) {
     default:
@@ -12706,13 +12706,13 @@ function asmFunc(imports) {
   return $4_1 | 0;
  }
  
- function $33($0, $1_1) {
-  $0 = $0 | 0;
+ function $32($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $4_1 = 0, $5_1 = 0, $6_1 = 0, $7_1 = 0;
   block : {
-   if_ : {
-    if ($0) {
+   label : {
+    if ($0_1) {
      $7_1 = $1_1
     } else {
      $4_1 = 4;
@@ -12722,7 +12722,7 @@ function asmFunc(imports) {
      case 0:
       break block;
      default:
-      break if_;
+      break label;
      };
     }
     $6_1 = $7_1;
@@ -12732,8 +12732,8 @@ function asmFunc(imports) {
   return $5_1 | 0;
  }
  
- function $34($0, $1_1) {
-  $0 = $0 | 0;
+ function $33($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $3_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
@@ -12746,12 +12746,12 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $35($0, $1_1) {
-  $0 = $0 | 0;
+ function $34($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var $2_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
-   $2_1 = $0;
+   $2_1 = $0_1;
    $4_1 = 6;
    switch (1 | 0) {
    default:
@@ -12761,7 +12761,7 @@ function asmFunc(imports) {
   return $4_1 | 0;
  }
  
- function $36() {
+ function $35() {
   var $1_1 = 0;
   block : {
    $1_1 = 7;
@@ -12773,14 +12773,14 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function f($0, $1_1, $2_1) {
-  $0 = $0 | 0;
+ function f($0_1, $1_1, $2_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   return -1 | 0;
  }
  
- function $38() {
+ function $36() {
   var $1_1 = 0;
   block : {
    $1_1 = 12;
@@ -12792,7 +12792,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $39() {
+ function $37() {
   var $1_1 = 0;
   block : {
    $1_1 = 13;
@@ -12804,7 +12804,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $40() {
+ function $38() {
   var $1_1 = 0;
   block : {
    $1_1 = 14;
@@ -12816,7 +12816,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $41() {
+ function $39() {
   var $1_1 = 0;
   block : {
    $1_1 = 20;
@@ -12828,7 +12828,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $42() {
+ function $40() {
   var $1_1 = 0;
   block : {
    $1_1 = 21;
@@ -12840,7 +12840,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $43() {
+ function $41() {
   var $1_1 = 0;
   block : {
    $1_1 = 22;
@@ -12852,7 +12852,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $44() {
+ function $42() {
   var $1_1 = 0;
   block : {
    $1_1 = 23;
@@ -12864,7 +12864,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $45() {
+ function $43() {
   var $2_1 = 0;
   block : {
    $2_1 = 17;
@@ -12876,7 +12876,7 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function $46() {
+ function $44() {
   var $1_1 = 0;
   block : {
    $1_1 = 2;
@@ -12888,7 +12888,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $47() {
+ function $45() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -12903,7 +12903,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $48() {
+ function $46() {
   var $1_1 = 0;
   block : {
    $1_1 = 30;
@@ -12915,7 +12915,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $49() {
+ function $47() {
   var $1_1 = 0;
   block : {
    $1_1 = 31;
@@ -12927,7 +12927,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $50() {
+ function $48() {
   var $1_1 = 0;
   block : {
    $1_1 = 32;
@@ -12939,7 +12939,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $51() {
+ function $49() {
   var $1_1 = 0;
   block : {
    $1_1 = 33;
@@ -12951,7 +12951,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $52() {
+ function $50() {
   var $1_1 = 0;
   block : {
    $1_1 = 3;
@@ -12963,7 +12963,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $53() {
+ function $51() {
   var $1_1 = 0;
   block : {
    $1_1 = 3;
@@ -12975,7 +12975,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $54() {
+ function $52() {
   var i64toi32_i32$0 = 0, $1_1 = 0, $1$hi = 0;
   block : {
    i64toi32_i32$0 = 0;
@@ -12989,7 +12989,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $55() {
+ function $53() {
   var $1_1 = 0;
   block : {
    $1_1 = 44;
@@ -13001,7 +13001,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $56() {
+ function $54() {
   var $1_1 = 0;
   block : {
    $1_1 = 43;
@@ -13013,7 +13013,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $57() {
+ function $55() {
   var $1_1 = 0;
   block : {
    $1_1 = 42;
@@ -13025,7 +13025,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $58() {
+ function $56() {
   var $1_1 = 0;
   block : {
    $1_1 = 41;
@@ -13037,7 +13037,7 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $59() {
+ function $57() {
   var $1_1 = 0;
   block : {
    $1_1 = 40;
@@ -13049,49 +13049,49 @@ function asmFunc(imports) {
   return $1_1 | 0;
  }
  
- function $60($0) {
-  $0 = $0 | 0;
-  var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block11 : {
-    block12 : {
+ function $58($0_1) {
+  $0_1 = $0_1 | 0;
+  var $2_1 = 0, $4_1 = 0, $5_1 = 0, $3_1 = 0;
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 16;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block11;
+     switch ($0_1 | 0) {
      case 0:
-      break block12;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
-    $4_1 = 2 + $5_1 | 0;
+    $4_1 = 2 + $3_1 | 0;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $61($0) {
-  $0 = $0 | 0;
+ function $59($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
   block : {
-   block13 : {
-    block14 : {
+   block0 : {
+    block1 : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
+     switch ($0_1 | 0) {
      case 0:
       break block;
      case 1:
-      break block13;
+      break block0;
      default:
-      break block14;
+      break block1;
      };
     }
     $4_1 = 16;
@@ -13101,163 +13101,163 @@ function asmFunc(imports) {
   return $3_1 | 0;
  }
  
- function $62($0) {
-  $0 = $0 | 0;
+ function $60($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block15 : {
-    block16 : {
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block15;
+     switch ($0_1 | 0) {
      case 0:
-      break block16;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
     $4_1 = 16;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $63($0) {
-  $0 = $0 | 0;
-  var $4_1 = 0, $2_1 = 0, $3_1 = 0;
-  block : {
-   block17 : {
+ function $61($0_1) {
+  $0_1 = $0_1 | 0;
+  var $3_1 = 0, $2_1 = 0, $4_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 8;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 1:
-     break block;
+     break block0;
     default:
-     break block17;
+     break block;
     };
    }
-   $3_1 = 1 + $4_1 | 0;
+   $4_1 = 1 + $3_1 | 0;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
- function $64($0) {
-  $0 = $0 | 0;
+ function $62($0_1) {
+  $0_1 = $0_1 | 0;
   var $2_1 = 0, $3_1 = 0, $4_1 = 0, $5_1 = 0;
-  block : {
-   block18 : {
-    block19 : {
+  block1 : {
+   block0 : {
+    block : {
      $2_1 = 8;
      $3_1 = $2_1;
      $4_1 = $2_1;
      $5_1 = $2_1;
-     switch ($0 | 0) {
-     case 1:
-      break block18;
+     switch ($0_1 | 0) {
      case 0:
-      break block19;
-     default:
       break block;
+     case 1:
+      break block0;
+     default:
+      break block1;
      };
     }
     $4_1 = 16;
    }
-   $3_1 = 1 + $4_1 | 0;
+   $5_1 = 1 + $4_1 | 0;
   }
-  return $3_1 | 0;
+  return $5_1 | 0;
  }
  
- function $65($0) {
-  $0 = $0 | 0;
-  var $4_1 = 0, $2_1 = 0, $3_1 = 0;
-  block : {
-   block20 : {
+ function $63($0_1) {
+  $0_1 = $0_1 | 0;
+  var $3_1 = 0, $2_1 = 0, $4_1 = 0;
+  block0 : {
+   block : {
     $2_1 = 8;
     $3_1 = $2_1;
     $4_1 = $2_1;
-    switch ($0 | 0) {
+    switch ($0_1 | 0) {
     case 1:
-     break block;
+     break block0;
     default:
-     break block20;
+     break block;
     };
    }
-   $3_1 = 1 + $4_1 | 0;
+   $4_1 = 1 + $3_1 | 0;
   }
-  return $3_1 | 0;
+  return $4_1 | 0;
  }
  
  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_local_set_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_memory_grow_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": $0, 
+  "type_i64": $1, 
+  "type_f32": $2, 
+  "type_f64": $3, 
+  "type_i32_value": $4, 
+  "type_i64_value": $5, 
+  "type_f32_value": $6, 
+  "type_f64_value": $7, 
+  "empty": $8, 
+  "empty_value": $9, 
+  "singleton": $10, 
+  "singleton_value": $11, 
+  "multiple": $12, 
+  "multiple_value": $13, 
+  "large": $14, 
+  "as_block_first": $15, 
+  "as_block_mid": $16, 
+  "as_block_last": $17, 
+  "as_block_value": $18, 
+  "as_loop_first": $19, 
+  "as_loop_mid": $20, 
+  "as_loop_last": $21, 
+  "as_br_value": $22, 
+  "as_br_if_cond": $23, 
+  "as_br_if_value": $24, 
+  "as_br_if_value_cond": $25, 
+  "as_br_table_index": $26, 
+  "as_br_table_value": $27, 
+  "as_br_table_value_index": $28, 
+  "as_return_value": $29, 
+  "as_if_cond": $30, 
+  "as_if_then": $31, 
+  "as_if_else": $32, 
+  "as_select_first": $33, 
+  "as_select_second": $34, 
+  "as_select_cond": $35, 
+  "as_call_first": $36, 
+  "as_call_mid": $37, 
+  "as_call_last": $38, 
+  "as_call_indirect_first": $39, 
+  "as_call_indirect_mid": $40, 
+  "as_call_indirect_last": $41, 
+  "as_call_indirect_func": $42, 
+  "as_local_set_value": $43, 
+  "as_load_address": $44, 
+  "as_loadN_address": $45, 
+  "as_store_address": $46, 
+  "as_store_value": $47, 
+  "as_storeN_address": $48, 
+  "as_storeN_value": $49, 
+  "as_unary_operand": $50, 
+  "as_binary_left": $51, 
+  "as_binary_right": $52, 
+  "as_test_operand": $53, 
+  "as_compare_left": $54, 
+  "as_compare_right": $55, 
+  "as_convert_operand": $56, 
+  "as_memory_grow_size": $57, 
+  "nested_block_value": $58, 
+  "nested_br_value": $59, 
+  "nested_br_if_value": $60, 
+  "nested_br_if_value_cond": $61, 
+  "nested_br_table_value": $62, 
+  "nested_br_table_value_index": $63
  };
 }
 
diff --git a/test/wasm2js/br_table_temp.2asm.js.opt b/test/wasm2js/br_table_temp.2asm.js.opt
index 8252eba66..b64e46a77 100644
--- a/test/wasm2js/br_table_temp.2asm.js.opt
+++ b/test/wasm2js/br_table_temp.2asm.js.opt
@@ -14,33 +14,33 @@ function asmFunc(imports) {
   
  }
  
- function $5() {
+ function $4() {
   return 1;
  }
  
- function $6() {
+ function $5() {
   return 2;
  }
  
- function $7() {
+ function $6() {
   return Math_fround(Math_fround(3.0));
  }
  
- function $8() {
+ function $7() {
   return 4.0;
  }
  
- function $9($0) {
+ function $8($0) {
   $0 = $0 | 0;
   return 22;
  }
  
- function $10($0) {
+ function $9($0) {
   $0 = $0 | 0;
   return 33;
  }
  
- function $11($0) {
+ function $10($0) {
   $0 = $0 | 0;
   if ($0) {
    return 20
@@ -48,7 +48,7 @@ function asmFunc(imports) {
   return 22;
  }
  
- function $12($0) {
+ function $11($0) {
   $0 = $0 | 0;
   if ($0) {
    $0 = 33
@@ -58,9 +58,9 @@ function asmFunc(imports) {
   return $0 | 0;
  }
  
- function $13($0) {
+ function $12($0) {
   $0 = $0 | 0;
-  block : {
+  block3 : {
    switch ($0 | 0) {
    case 3:
     return 100;
@@ -71,15 +71,15 @@ function asmFunc(imports) {
    case 0:
     return 103;
    default:
-    break block;
+    break block3;
    };
   }
   return 104;
  }
  
- function $14($0) {
+ function $13($0) {
   $0 = $0 | 0;
-  block : {
+  block3 : {
    switch ($0 | 0) {
    case 3:
     return 210;
@@ -90,15 +90,15 @@ function asmFunc(imports) {
    case 0:
     return 213;
    default:
-    break block;
+    break block3;
    };
   }
   return 214;
  }
  
- function $15($0) {
+ function $14($0) {
   $0 = $0 | 0;
-  block : {
+  block0 : {
    switch ($0 | 0) {
    case 0:
    case 2:
@@ -12410,45 +12410,45 @@ function asmFunc(imports) {
    case 24614:
     return 0;
    default:
-    break block;
+    break block0;
    };
   }
   return 1;
  }
  
- function $20() {
+ function $19() {
   return 3;
  }
  
- function $21() {
+ function $20() {
   return 4;
  }
  
- function $22() {
+ function $21() {
   return 5;
  }
  
- function $23() {
+ function $22() {
   return 9;
  }
  
- function $25() {
+ function $24() {
   return 8;
  }
  
- function $28() {
+ function $27() {
   return 10;
  }
  
- function $29() {
+ function $28() {
   return 11;
  }
  
- function $30() {
+ function $29() {
   return 7;
  }
  
- function $32($0, $1) {
+ function $31($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   if ($0) {
@@ -12457,7 +12457,7 @@ function asmFunc(imports) {
   return $1 | 0;
  }
  
- function $33($0, $1) {
+ function $32($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   if (!$0) {
@@ -12466,95 +12466,95 @@ function asmFunc(imports) {
   return $1 | 0;
  }
  
- function $34($0, $1) {
+ function $33($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   return 5;
  }
  
- function $35($0, $1) {
+ function $34($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   return 6;
  }
  
- function $38() {
+ function $36() {
   return 12;
  }
  
- function $39() {
+ function $37() {
   return 13;
  }
  
- function $40() {
+ function $38() {
   return 14;
  }
  
- function $41() {
+ function $39() {
   return 20;
  }
  
- function $42() {
+ function $40() {
   return 21;
  }
  
- function $43() {
+ function $41() {
   return 22;
  }
  
- function $44() {
+ function $42() {
   return 23;
  }
  
- function $45() {
+ function $43() {
   return 17;
  }
  
- function $47() {
+ function $45() {
   return 30;
  }
  
- function $49() {
+ function $47() {
   return 31;
  }
  
- function $50() {
+ function $48() {
   return 32;
  }
  
- function $51() {
+ function $49() {
   return 33;
  }
  
- function $54() {
+ function $52() {
   return 45;
  }
  
- function $55() {
+ function $53() {
   return 44;
  }
  
- function $56() {
+ function $54() {
   return 43;
  }
  
- function $57() {
+ function $55() {
   return 42;
  }
  
- function $58() {
+ function $56() {
   return 41;
  }
  
- function $59() {
+ function $57() {
   return 40;
  }
  
- function $60($0) {
+ function $58($0) {
   $0 = $0 | 0;
   var $1 = 0;
   $1 = 16;
-  block : {
+  block1 : {
    switch ($0 | 0) {
    case 0:
     $1 = 18;
@@ -12562,13 +12562,13 @@ function asmFunc(imports) {
     $1 = $1 + 1 | 0;
     break;
    default:
-    break block;
+    break block1;
    };
   }
   return $1 | 0;
  }
  
- function $61($0) {
+ function $59($0) {
   $0 = $0 | 0;
   var $1 = 0;
   $1 = 8;
@@ -12586,11 +12586,11 @@ function asmFunc(imports) {
   return $1 | 0;
  }
  
- function $62($0) {
+ function $60($0) {
   $0 = $0 | 0;
   var $1 = 0;
   $1 = 8;
-  block : {
+  block1 : {
    switch ($0 | 0) {
    case 0:
     $1 = 16;
@@ -12598,13 +12598,13 @@ function asmFunc(imports) {
     $1 = $1 + 1 | 0;
     break;
    default:
-    break block;
+    break block1;
    };
   }
   return $1 | 0;
  }
  
- function $63($0) {
+ function $61($0) {
   $0 = $0 | 0;
   if (($0 | 0) == 1) {
    $0 = 8
@@ -12619,66 +12619,66 @@ function asmFunc(imports) {
   "type_i64": dummy, 
   "type_f32": dummy, 
   "type_f64": dummy, 
-  "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, 
+  "type_i32_value": $4, 
+  "type_i64_value": $5, 
+  "type_f32_value": $6, 
+  "type_f64_value": $7, 
+  "empty": $8, 
+  "empty_value": $9, 
+  "singleton": $10, 
+  "singleton_value": $11, 
+  "multiple": $12, 
+  "multiple_value": $13, 
+  "large": $14, 
   "as_block_first": dummy, 
   "as_block_mid": dummy, 
   "as_block_last": dummy, 
-  "as_block_value": $6, 
-  "as_loop_first": $20, 
-  "as_loop_mid": $21, 
-  "as_loop_last": $22, 
-  "as_br_value": $23, 
+  "as_block_value": $5, 
+  "as_loop_first": $19, 
+  "as_loop_mid": $20, 
+  "as_loop_last": $21, 
+  "as_br_value": $22, 
   "as_br_if_cond": dummy, 
-  "as_br_if_value": $25, 
-  "as_br_if_value_cond": $23, 
+  "as_br_if_value": $24, 
+  "as_br_if_value_cond": $22, 
   "as_br_table_index": dummy, 
-  "as_br_table_value": $28, 
-  "as_br_table_value_index": $29, 
-  "as_return_value": $30, 
-  "as_if_cond": $6, 
-  "as_if_then": $32, 
-  "as_if_else": $33, 
-  "as_select_first": $34, 
-  "as_select_second": $35, 
-  "as_select_cond": $30, 
-  "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_local_set_value": $45, 
-  "as_load_address": $6, 
-  "as_loadN_address": $47, 
-  "as_store_address": $47, 
-  "as_store_value": $49, 
-  "as_storeN_address": $50, 
-  "as_storeN_value": $51, 
-  "as_unary_operand": $20, 
-  "as_binary_left": $20, 
-  "as_binary_right": $54, 
-  "as_test_operand": $55, 
-  "as_compare_left": $56, 
-  "as_compare_right": $57, 
-  "as_convert_operand": $58, 
-  "as_memory_grow_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": $62, 
-  "nested_br_table_value_index": $63
+  "as_br_table_value": $27, 
+  "as_br_table_value_index": $28, 
+  "as_return_value": $29, 
+  "as_if_cond": $5, 
+  "as_if_then": $31, 
+  "as_if_else": $32, 
+  "as_select_first": $33, 
+  "as_select_second": $34, 
+  "as_select_cond": $29, 
+  "as_call_first": $36, 
+  "as_call_mid": $37, 
+  "as_call_last": $38, 
+  "as_call_indirect_first": $39, 
+  "as_call_indirect_mid": $40, 
+  "as_call_indirect_last": $41, 
+  "as_call_indirect_func": $42, 
+  "as_local_set_value": $43, 
+  "as_load_address": $5, 
+  "as_loadN_address": $45, 
+  "as_store_address": $45, 
+  "as_store_value": $47, 
+  "as_storeN_address": $48, 
+  "as_storeN_value": $49, 
+  "as_unary_operand": $19, 
+  "as_binary_left": $19, 
+  "as_binary_right": $52, 
+  "as_test_operand": $53, 
+  "as_compare_left": $54, 
+  "as_compare_right": $55, 
+  "as_convert_operand": $56, 
+  "as_memory_grow_size": $57, 
+  "nested_block_value": $58, 
+  "nested_br_value": $59, 
+  "nested_br_if_value": $60, 
+  "nested_br_if_value_cond": $61, 
+  "nested_br_table_value": $60, 
+  "nested_br_table_value_index": $61
  };
 }
 
diff --git a/test/wasm2js/br_table_temp.wast b/test/wasm2js/br_table_temp.wast
index 2c49ca9be..e629db646 100644
--- a/test/wasm2js/br_table_temp.wast
+++ b/test/wasm2js/br_table_temp.wast
@@ -18,16 +18,16 @@
   )
 
   (func (export "type-i32-value") (result i32)
-    (block i32 (i32.ctz (br_table 0 0 (i32.const 1) (i32.const 0))))
+    (block (result i32) (i32.ctz (br_table 0 0 (i32.const 1) (i32.const 0))))
   )
   (func (export "type-i64-value") (result i32)
-    (i32.wrap_i64 (block i64 (i64.ctz (br_table 0 0 (i64.const 2) (i32.const 0)))))
+    (i32.wrap_i64 (block (result i64) (i64.ctz (br_table 0 0 (i64.const 2) (i32.const 0)))))
   )
   (func (export "type-f32-value") (result f32)
-    (block f32 (f32.neg (br_table 0 0 (f32.const 3) (i32.const 0))))
+    (block (result f32) (f32.neg (br_table 0 0 (f32.const 3) (i32.const 0))))
   )
   (func (export "type-f64-value") (result f64)
-    (block f64 (f64.neg (br_table 0 0 (f64.const 4) (i32.const 0))))
+    (block (result f64) (f64.neg (br_table 0 0 (f64.const 4) (i32.const 0))))
   )
 
   (func (export "empty") (param i32) (result i32)
@@ -35,7 +35,7 @@
     (i32.const 22)
   )
   (func (export "empty-value") (param i32) (result i32)
-    (block i32 (br_table 0 (i32.const 33) (local.get 0)) (i32.const 31))
+    (block (result i32) (br_table 0 (i32.const 33) (local.get 0)) (i32.const 31))
   )
 
   (func (export "singleton") (param i32) (result i32)
@@ -50,9 +50,9 @@
   )
 
   (func (export "singleton-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (drop
-        (block i32
+        (block (result i32)
           (br_table 0 1 (i32.const 33) (local.get 0))
           (return (i32.const 31))
         )
@@ -83,11 +83,11 @@
 
   (func (export "multiple-value") (param i32) (result i32)
     (local i32)
-    (local.set 1 (block i32
-      (local.set 1 (block i32
-        (local.set 1 (block i32
-          (local.set 1 (block i32
-            (local.set 1 (block i32
+    (local.set 1 (block (result i32)
+      (local.set 1 (block (result i32)
+        (local.set 1 (block (result i32)
+          (local.set 1 (block (result i32)
+            (local.set 1 (block (result i32)
               (br_table 3 2 1 0 4 (i32.const 200) (local.get 0))
               (return (i32.add (local.get 1) (i32.const 99)))
             ))
@@ -849,38 +849,38 @@
     (block (nop) (call $dummy) (br_table 0 0 0 (i32.const 0)))
   )
   (func (export "as-block-value") (result i32)
-    (block i32 (nop) (call $dummy) (br_table 0 0 0 (i32.const 2) (i32.const 0)))
+    (block (result i32) (nop) (call $dummy) (br_table 0 0 0 (i32.const 2) (i32.const 0)))
   )
 
   (func (export "as-loop-first") (result i32)
-    (loop i32 (br_table 1 1 (i32.const 3) (i32.const 0)) (i32.const 1))
+    (loop (result i32) (br_table 1 1 (i32.const 3) (i32.const 0)) (i32.const 1))
   )
   (func (export "as-loop-mid") (result i32)
-    (loop i32
+    (loop (result i32)
       (call $dummy)
       (br_table 1 1 1 (i32.const 4) (i32.const -1))
       (i32.const 2)
     )
   )
   (func (export "as-loop-last") (result i32)
-    (loop i32 (nop) (call $dummy) (br_table 1 1 1 (i32.const 5) (i32.const 1)))
+    (loop (result i32) (nop) (call $dummy) (br_table 1 1 1 (i32.const 5) (i32.const 1)))
   )
 
   (func (export "as-br-value") (result i32)
-    (block i32 (br 0 (br 0 (i32.const 9))))
+    (block (result i32) (br 0 (br 0 (i32.const 9))))
   )
 
   (func (export "as-br_if-cond")
     (block (br_if 0 (br_table 0 0 0 (i32.const 1))))
   )
   (func (export "as-br_if-value") (result i32)
-    (block i32
+    (block (result i32)
       (br_if 0 (br_table 0 (i32.const 8) (i32.const 0)) (i32.const 1))
       (i32.const 7)
     )
   )
   (func (export "as-br_if-value-cond") (result i32)
-    (block i32
+    (block (result i32)
       (drop (br_if 0 (i32.const 6) (br_table 0 0 (i32.const 9) (i32.const 0))))
       (i32.const 7)
     )
@@ -890,25 +890,25 @@
     (block (br_table 0 0 0 (br_table 0 (i32.const 1))))
   )
   (func (export "as-br_table-value") (result i32)
-    (block i32
+    (block (result i32)
       (br_table 0 0 0 (br_table 0 (i32.const 10) (i32.const 0)) (i32.const 1))
       (i32.const 7)
     )
   )
   (func (export "as-br_table-value-index") (result i32)
-    (block i32
+    (block (result i32)
       (br_table 0 0 (i32.const 6) (br_table 0 (i32.const 11) (i32.const 1)))
       (i32.const 7)
     )
   )
 
   (func (export "as-return-value") (result i32)
-    (i32.wrap_i64 (block i64 (return (br_table 0 (i64.const 7) (i32.const 0)))))
+    (i32.wrap_i64 (block (result i64) (return (br_table 0 (i64.const 7) (i32.const 0)))))
   )
 
   (func (export "as-if-cond") (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (br_table 0 (i32.const 2) (i32.const 0))
         (then
           (i32.const 0)
@@ -920,8 +920,8 @@
     )
   )
   (func (export "as-if-then") (param i32 i32) (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (local.get 0)
         (then
           (br_table 1 (i32.const 3) (i32.const 0))
@@ -933,8 +933,8 @@
     )
   )
   (func (export "as-if-else") (param i32 i32) (result i32)
-    (block i32
-      (if i32
+    (block (result i32)
+      (if (result i32)
         (local.get 0)
         (then
           (local.get 1)
@@ -947,21 +947,21 @@
   )
 
   (func (export "as-select-first") (param i32 i32) (result i32)
-    (block i32
+    (block (result i32)
       (select
         (br_table 0 (i32.const 5) (i32.const 0)) (local.get 0) (local.get 1)
       )
     )
   )
   (func (export "as-select-second") (param i32 i32) (result i32)
-    (block i32
+    (block (result i32)
       (select
         (local.get 0) (br_table 0 (i32.const 6) (i32.const 1)) (local.get 1)
       )
     )
   )
   (func (export "as-select-cond") (result i32)
-    (block i32
+    (block (result i32)
       (select
         (i32.const 0) (i32.const 1) (br_table 0 (i32.const 7) (i32.const 1))
       )
@@ -970,21 +970,21 @@
 
   (func $f (param i32 i32 i32) (result i32) (i32.const -1))
   (func (export "as-call-first") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (br_table 0 (i32.const 12) (i32.const 1)) (i32.const 2) (i32.const 3)
       )
     )
   )
   (func (export "as-call-mid") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (i32.const 1) (br_table 0 (i32.const 13) (i32.const 1)) (i32.const 3)
       )
     )
   )
   (func (export "as-call-last") (result i32)
-    (block i32
+    (block (result i32)
       (call $f
         (i32.const 1) (i32.const 2) (br_table 0 (i32.const 14) (i32.const 1))
       )
@@ -994,7 +994,7 @@
   (type $sig (func (param i32 i32 i32) (result i32)))
   (table funcref (elem $f))
   (func (export "as-call_indirect-first") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (br_table 0 (i32.const 20) (i32.const 1)) (i32.const 1) (i32.const 2)
         (i32.const 3)
@@ -1002,7 +1002,7 @@
     )
   )
   (func (export "as-call_indirect-mid") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (br_table 0 (i32.const 21) (i32.const 1)) (i32.const 2)
         (i32.const 3)
@@ -1010,7 +1010,7 @@
     )
   )
   (func (export "as-call_indirect-last") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (i32.const 1) (br_table 0 (i32.const 22) (i32.const 1))
         (i32.const 3)
@@ -1018,7 +1018,7 @@
     )
   )
   (func (export "as-call_indirect-func") (result i32)
-    (block i32
+    (block (result i32)
       (call_indirect (type $sig)
         (i32.const 0) (i32.const 1) (i32.const 2)
         (br_table 0 (i32.const 23) (i32.const 1))
@@ -1028,7 +1028,7 @@
 
   (func (export "as-local.set-value") (result i32)
     (local f32)
-    (block i32
+    (block (result i32)
       (local.set 0 (br_table 0 (i32.const 17) (i32.const 1)))
       (i32.const -1)
     )
@@ -1036,85 +1036,85 @@
 
   (memory 1)
   (func (export "as-load-address") (result i32)
-    (block i32 (i32.load (br_table 0 (i32.const 2) (i32.const 1))))
+    (block (result i32) (i32.load (br_table 0 (i32.const 2) (i32.const 1))))
   )
   (func (export "as-loadN-address") (result i32)
-    (i32.wrap_i64 (block i64 (i64.load8_s (br_table 0 (i64.const 30) (i32.const 1)))))
+    (i32.wrap_i64 (block (result i64) (i64.load8_s (br_table 0 (i64.const 30) (i32.const 1)))))
   )
 
   (func (export "as-store-address") (result i32)
-    (block i32
+    (block (result i32)
       (f64.store (br_table 0 (i32.const 30) (i32.const 1)) (f64.const 7))
       (i32.const -1)
     )
   )
   (func (export "as-store-value") (result i32)
-    (block i32
+    (block (result i32)
       (i64.store (i32.const 2) (br_table 0 (i32.const 31) (i32.const 1)))
       (i32.const -1)
      )
   )
 
   (func (export "as-storeN-address") (result i32)
-    (block i32
+    (block (result i32)
       (i32.store8 (br_table 0 (i32.const 32) (i32.const 0)) (i32.const 7))
       (i32.const -1)
     )
   )
   (func (export "as-storeN-value") (result i32)
-    (block i32
+    (block (result i32)
       (i64.store16 (i32.const 2) (br_table 0 (i32.const 33) (i32.const 0)))
       (i32.const -1)
     )
   )
 
   (func (export "as-unary-operand") (result i32)
-    (block i32 (i32.ctz (br_table 0 (i32.const 3) (i32.const 0))))
+    (block (result i32) (i32.ctz (br_table 0 (i32.const 3) (i32.const 0))))
   )
 
   (func (export "as-binary-left") (result i32)
-    (block i32
+    (block (result i32)
       (i32.add (br_table 0 0 (i32.const 3) (i32.const 0)) (i32.const 10))
     )
   )
   (func (export "as-binary-right") (result i32)
-    (i32.wrap_i64 (block i64
+    (i32.wrap_i64 (block (result i64)
       (i64.add (i64.const 10) (br_table 0 (i64.const 45) (i32.const 0))))
     )
   )
 
   (func (export "as-test-operand") (result i32)
-    (block i32 (i32.eqz (br_table 0 (i32.const 44) (i32.const 0))))
+    (block (result i32) (i32.eqz (br_table 0 (i32.const 44) (i32.const 0))))
   )
 
   (func (export "as-compare-left") (result i32)
-    (block i32
+    (block (result i32)
       (f64.le (br_table 0 0 (i32.const 43) (i32.const 0)) (f64.const 10))
     )
   )
   (func (export "as-compare-right") (result i32)
-    (block i32
+    (block (result i32)
       (f32.ne (f32.const 10) (br_table 0 (i32.const 42) (i32.const 0)))
     )
   )
 
   (func (export "as-convert-operand") (result i32)
-    (block i32 (i32.wrap_i64 (br_table 0 (i32.const 41) (i32.const 0))))
+    (block (result i32) (i32.wrap_i64 (br_table 0 (i32.const 41) (i32.const 0))))
   )
 
   (func (export "as-memory.grow-size") (result i32)
-    (block i32 (memory.grow (br_table 0 (i32.const 40) (i32.const 0))))
+    (block (result i32) (memory.grow (br_table 0 (i32.const 40) (i32.const 0))))
   )
 
   (func (export "nested-block-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (drop (i32.const -1))
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (i32.add
             (i32.const 2)
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (i32.add
                 (i32.const 8)
@@ -1128,13 +1128,13 @@
   )
 
   (func (export "nested-br-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br 0 (br_table 2 1 0 (i32.const 8) (local.get 0)))
             )
@@ -1146,13 +1146,13 @@
   )
 
   (func (export "nested-br_if-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br_if 0 (br_table 0 1 2 (i32.const 8) (local.get 0)) (i32.const 1))
               (i32.const 32)
@@ -1165,10 +1165,10 @@
   )
 
   (func (export "nested-br_if-value-cond") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop (br_if 0 (i32.const 4) (br_table 0 1 0 (i32.const 8) (local.get 0))))
           (i32.const 16)
@@ -1178,13 +1178,13 @@
   )
 
   (func (export "nested-br_table-value") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (drop
-            (block i32
+            (block (result i32)
               (drop (i32.const 4))
               (br_table 0 (br_table 0 1 2 (i32.const 8) (local.get 0)) (i32.const 1))
               (i32.const 32)
@@ -1197,10 +1197,10 @@
   )
 
   (func (export "nested-br_table-value-index") (param i32) (result i32)
-    (block i32
+    (block (result i32)
       (i32.add
         (i32.const 1)
-        (block i32
+        (block (result i32)
           (drop (i32.const 2))
           (br_table 0 (i32.const 4) (br_table 0 1 0 (i32.const 8) (local.get 0)))
           (i32.const 16)
@@ -1405,13 +1405,13 @@
 
 (assert_invalid
   (module (func $type-arg-void-vs-num (result i32)
-    (block i32 (br_table 0 (nop) (i32.const 1)) (i32.const 1))
+    (block (result i32) (br_table 0 (nop) (i32.const 1)) (i32.const 1))
   ))
   "type mismatch"
 )
 (assert_invalid
   (module (func $type-arg-num-vs-num (result i32)
-    (block i32 (br_table 0 0 0 (i64.const 1) (i32.const 1)) (i32.const 1))
+    (block (result i32) (br_table 0 0 0 (i64.const 1) (i32.const 1)) (i32.const 1))
   ))
   "type mismatch"
 )
@@ -1430,13 +1430,13 @@
 )
 (assert_invalid
   (module (func $type-arg-index-void-vs-i32 (result i32)
-    (block i32 (br_table 0 0 (i32.const 0) (nop)) (i32.const 1))
+    (block (result i32) (br_table 0 0 (i32.const 0) (nop)) (i32.const 1))
   ))
   "type mismatch"
 )
 (assert_invalid
   (module (func $type-arg-index-num-vs-i32 (result i32)
-    (block i32 (br_table 0 0 (i32.const 0) (i64.const 0)) (i32.const 1))
+    (block (result i32) (br_table 0 0 (i32.const 0) (i64.const 0)) (i32.const 1))
   ))
   "type mismatch"
 )
diff --git a/test/wasm2js/conversions-modified.wast b/test/wasm2js/conversions-modified.wast
index d2f732ce5..0628b7479 100644
--- a/test/wasm2js/conversions-modified.wast
+++ b/test/wasm2js/conversions-modified.wast
@@ -69,8 +69,8 @@
 (assert_return (invoke "i32.trunc_s_f32" (f32.const -2147483648.0)) (i32.const -2147483648))
 (assert_trap (invoke "i32.trunc_s_f32" (f32.const 2147483648.0)) "integer overflow")
 (assert_trap (invoke "i32.trunc_s_f32" (f32.const -2147483904.0)) "integer overflow")
-(assert_trap (invoke "i32.trunc_s_f32" (f32.const infinity)) "integer overflow")
-(assert_trap (invoke "i32.trunc_s_f32" (f32.const -infinity)) "integer overflow")
+(assert_trap (invoke "i32.trunc_s_f32" (f32.const inf)) "integer overflow")
+(assert_trap (invoke "i32.trunc_s_f32" (f32.const -inf)) "integer overflow")
 (assert_trap (invoke "i32.trunc_s_f32" (f32.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i32.trunc_u_f32" (f32.const 0.0)) (i32.const 0))
@@ -88,8 +88,8 @@
 (assert_return (invoke "i32.trunc_u_f32" (f32.const -0x1.fffffep-1)) (i32.const 0))
 (assert_trap (invoke "i32.trunc_u_f32" (f32.const 4294967296.0)) "integer overflow")
 (assert_trap (invoke "i32.trunc_u_f32" (f32.const -1.0)) "integer overflow")
-(assert_trap (invoke "i32.trunc_u_f32" (f32.const infinity)) "integer overflow")
-(assert_trap (invoke "i32.trunc_u_f32" (f32.const -infinity)) "integer overflow")
+(assert_trap (invoke "i32.trunc_u_f32" (f32.const inf)) "integer overflow")
+(assert_trap (invoke "i32.trunc_u_f32" (f32.const -inf)) "integer overflow")
 (assert_trap (invoke "i32.trunc_u_f32" (f32.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i32.trunc_s_f64" (f64.const 0.0)) (i32.const 0))
@@ -108,8 +108,8 @@
 (assert_return (invoke "i32.trunc_s_f64" (f64.const -2147483648.0)) (i32.const -2147483648))
 (assert_trap (invoke "i32.trunc_s_f64" (f64.const 2147483648.0)) "integer overflow")
 (assert_trap (invoke "i32.trunc_s_f64" (f64.const -2147483649.0)) "integer overflow")
-(assert_trap (invoke "i32.trunc_s_f64" (f64.const infinity)) "integer overflow")
-(assert_trap (invoke "i32.trunc_s_f64" (f64.const -infinity)) "integer overflow")
+(assert_trap (invoke "i32.trunc_s_f64" (f64.const inf)) "integer overflow")
+(assert_trap (invoke "i32.trunc_s_f64" (f64.const -inf)) "integer overflow")
 (assert_trap (invoke "i32.trunc_s_f64" (f64.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i32.trunc_u_f64" (f64.const 0.0)) (i32.const 0))
@@ -131,8 +131,8 @@
 (assert_trap (invoke "i32.trunc_u_f64" (f64.const 1e16)) "integer overflow")
 (assert_trap (invoke "i32.trunc_u_f64" (f64.const 1e30)) "integer overflow")
 (assert_trap (invoke "i32.trunc_u_f64" (f64.const 9223372036854775808)) "integer overflow")
-(assert_trap (invoke "i32.trunc_u_f64" (f64.const infinity)) "integer overflow")
-(assert_trap (invoke "i32.trunc_u_f64" (f64.const -infinity)) "integer overflow")
+(assert_trap (invoke "i32.trunc_u_f64" (f64.const inf)) "integer overflow")
+(assert_trap (invoke "i32.trunc_u_f64" (f64.const -inf)) "integer overflow")
 (assert_trap (invoke "i32.trunc_u_f64" (f64.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i64.trunc_s_f32" (f32.const 0.0)) (i64.const 0))
@@ -153,8 +153,8 @@
 (assert_return (invoke "i64.trunc_s_f32" (f32.const -9223372036854775808.0)) (i64.const -9223372036854775808))
 (assert_trap (invoke "i64.trunc_s_f32" (f32.const 9223372036854775808.0)) "integer overflow")
 (assert_trap (invoke "i64.trunc_s_f32" (f32.const -9223373136366403584.0)) "integer overflow")
-(assert_trap (invoke "i64.trunc_s_f32" (f32.const infinity)) "integer overflow")
-(assert_trap (invoke "i64.trunc_s_f32" (f32.const -infinity)) "integer overflow")
+(assert_trap (invoke "i64.trunc_s_f32" (f32.const inf)) "integer overflow")
+(assert_trap (invoke "i64.trunc_s_f32" (f32.const -inf)) "integer overflow")
 (assert_trap (invoke "i64.trunc_s_f32" (f32.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i64.trunc_u_f32" (f32.const 0.0)) (i64.const 0))
@@ -170,8 +170,8 @@
 (assert_return (invoke "i64.trunc_u_f32" (f32.const -0x1.fffffep-1)) (i64.const 0))
 (assert_trap (invoke "i64.trunc_u_f32" (f32.const 18446744073709551616.0)) "integer overflow")
 (assert_trap (invoke "i64.trunc_u_f32" (f32.const -1.0)) "integer overflow")
-(assert_trap (invoke "i64.trunc_u_f32" (f32.const infinity)) "integer overflow")
-(assert_trap (invoke "i64.trunc_u_f32" (f32.const -infinity)) "integer overflow")
+(assert_trap (invoke "i64.trunc_u_f32" (f32.const inf)) "integer overflow")
+(assert_trap (invoke "i64.trunc_u_f32" (f32.const -inf)) "integer overflow")
 (assert_trap (invoke "i64.trunc_u_f32" (f32.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i64.trunc_s_f64" (f64.const 0.0)) (i64.const 0))
@@ -192,8 +192,8 @@
 (assert_return (invoke "i64.trunc_s_f64" (f64.const -9223372036854775808.0)) (i64.const -9223372036854775808))
 (assert_trap (invoke "i64.trunc_s_f64" (f64.const 9223372036854775808.0)) "integer overflow")
 (assert_trap (invoke "i64.trunc_s_f64" (f64.const -9223372036854777856.0)) "integer overflow")
-(assert_trap (invoke "i64.trunc_s_f64" (f64.const infinity)) "integer overflow")
-(assert_trap (invoke "i64.trunc_s_f64" (f64.const -infinity)) "integer overflow")
+(assert_trap (invoke "i64.trunc_s_f64" (f64.const inf)) "integer overflow")
+(assert_trap (invoke "i64.trunc_s_f64" (f64.const -inf)) "integer overflow")
 (assert_trap (invoke "i64.trunc_s_f64" (f64.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "i64.trunc_u_f64" (f64.const 0.0)) (i64.const 0))
@@ -213,8 +213,8 @@
 (assert_return (invoke "i64.trunc_u_f64" (f64.const 9223372036854775808)) (i64.const -9223372036854775808))
 (assert_trap (invoke "i64.trunc_u_f64" (f64.const 18446744073709551616.0)) "integer overflow")
 (assert_trap (invoke "i64.trunc_u_f64" (f64.const -1.0)) "integer overflow")
-(assert_trap (invoke "i64.trunc_u_f64" (f64.const infinity)) "integer overflow")
-(assert_trap (invoke "i64.trunc_u_f64" (f64.const -infinity)) "integer overflow")
+(assert_trap (invoke "i64.trunc_u_f64" (f64.const inf)) "integer overflow")
+(assert_trap (invoke "i64.trunc_u_f64" (f64.const -inf)) "integer overflow")
 (assert_trap (invoke "i64.trunc_u_f64" (f64.const nan)) "invalid conversion to integer")
 
 (assert_return (invoke "f32.convert_s_i32" (i32.const 1)) (f32.const 1.0))
@@ -306,8 +306,8 @@
 (assert_return (invoke "f64.promote_f32" (f32.const 0x1p-119)) (f64.const 0x1p-119))
 ;; Generated randomly by picking a random float.
 (assert_return (invoke "f64.promote_f32" (f32.const 0x1.8f867ep+125)) (f64.const 6.6382536710104395e+37))
-(assert_return (invoke "f64.promote_f32" (f32.const infinity)) (f64.const infinity))
-(assert_return (invoke "f64.promote_f32" (f32.const -infinity)) (f64.const -infinity))
+(assert_return (invoke "f64.promote_f32" (f32.const inf)) (f64.const inf))
+(assert_return (invoke "f64.promote_f32" (f32.const -inf)) (f64.const -inf))
 (assert_return (invoke "f64.promote_f32" (f32.const nan)) (f64.const nan))
 
 (assert_return (invoke "f32.demote_f64" (f64.const 0.0)) (f32.const 0.0))
@@ -330,12 +330,12 @@
 (assert_return (invoke "f32.demote_f64" (f64.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1.fffffefffffffp+127)) (f32.const 0x1.fffffep+127))
 (assert_return (invoke "f32.demote_f64" (f64.const -0x1.fffffefffffffp+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "f32.demote_f64" (f64.const 0x1.ffffffp+127)) (f32.const infinity))
-(assert_return (invoke "f32.demote_f64" (f64.const -0x1.ffffffp+127)) (f32.const -infinity))
+(assert_return (invoke "f32.demote_f64" (f64.const 0x1.ffffffp+127)) (f32.const inf))
+(assert_return (invoke "f32.demote_f64" (f64.const -0x1.ffffffp+127)) (f32.const -inf))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1p-119)) (f32.const 0x1p-119))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1.8f867ep+125)) (f32.const 0x1.8f867ep+125))
-(assert_return (invoke "f32.demote_f64" (f64.const infinity)) (f32.const infinity))
-(assert_return (invoke "f32.demote_f64" (f64.const -infinity)) (f32.const -infinity))
+(assert_return (invoke "f32.demote_f64" (f64.const inf)) (f32.const inf))
+(assert_return (invoke "f32.demote_f64" (f64.const -inf)) (f32.const -inf))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1.0000000000001p+0)) (f32.const 1.0))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1.fffffffffffffp-1)) (f32.const 1.0))
 (assert_return (invoke "f32.demote_f64" (f64.const 0x1.0000010000000p+0)) (f32.const 0x1.000000p+0))
@@ -366,8 +366,8 @@
 (assert_return (invoke "f32.reinterpret_i32" (i32.const -1)) (f32.const -nan:0x7fffff))
 (assert_return (invoke "f32.reinterpret_i32" (i32.const 123456789)) (f32.const 0x1.b79a2ap-113))
 (assert_return (invoke "f32.reinterpret_i32" (i32.const -2147483647)) (f32.const -0x1p-149))
-(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7f800000)) (f32.const infinity))
-(assert_return (invoke "f32.reinterpret_i32" (i32.const 0xff800000)) (f32.const -infinity))
+(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7f800000)) (f32.const inf))
+(assert_return (invoke "f32.reinterpret_i32" (i32.const 0xff800000)) (f32.const -inf))
 (assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7fc00000)) (f32.const nan))
 (assert_return (invoke "f32.reinterpret_i32" (i32.const 0xffc00000)) (f32.const -nan))
 (assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7fa00000)) (f32.const nan:0x200000))
@@ -379,8 +379,8 @@
 (assert_return (invoke "f64.reinterpret_i64" (i64.const 0x8000000000000000)) (f64.const -0.0))
 (assert_return (invoke "f64.reinterpret_i64" (i64.const 1234567890)) (f64.const 0x0.00000499602d2p-1022))
 (assert_return (invoke "f64.reinterpret_i64" (i64.const -9223372036854775807)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff0000000000000)) (f64.const infinity))
-(assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff0000000000000)) (f64.const -infinity))
+(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff0000000000000)) (f64.const inf))
+(assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff0000000000000)) (f64.const -inf))
 (assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff8000000000000)) (f64.const nan))
 (assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff8000000000000)) (f64.const -nan))
 (assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff4000000000000)) (f64.const nan:0x4000000000000))
@@ -395,8 +395,8 @@
 (assert_return (invoke "i32.reinterpret_f32" (f32.const 3.1415926)) (i32.const 1078530010))
 (assert_return (invoke "i32.reinterpret_f32" (f32.const 0x1.fffffep+127)) (i32.const 2139095039))
 (assert_return (invoke "i32.reinterpret_f32" (f32.const -0x1.fffffep+127)) (i32.const -8388609))
-(assert_return (invoke "i32.reinterpret_f32" (f32.const infinity)) (i32.const 0x7f800000))
-(assert_return (invoke "i32.reinterpret_f32" (f32.const -infinity)) (i32.const 0xff800000))
+(assert_return (invoke "i32.reinterpret_f32" (f32.const inf)) (i32.const 0x7f800000))
+(assert_return (invoke "i32.reinterpret_f32" (f32.const -inf)) (i32.const 0xff800000))
 ;;(assert_return (invoke "i32.reinterpret_f32" (f32.const nan)) (i32.const 0x7fc00000))
 ;;(assert_return (invoke "i32.reinterpret_f32" (f32.const -nan)) (i32.const 0xffc00000))
 ;;(assert_return (invoke "i32.reinterpret_f32" (f32.const nan:0x200000)) (i32.const 0x7fa00000))
@@ -411,8 +411,8 @@
 (assert_return (invoke "i64.reinterpret_f64" (f64.const 3.14159265358979)) (i64.const 4614256656552045841))
 (assert_return (invoke "i64.reinterpret_f64" (f64.const 0x1.fffffffffffffp+1023)) (i64.const 9218868437227405311))
 (assert_return (invoke "i64.reinterpret_f64" (f64.const -0x1.fffffffffffffp+1023)) (i64.const -4503599627370497))
-(assert_return (invoke "i64.reinterpret_f64" (f64.const infinity)) (i64.const 0x7ff0000000000000))
-(assert_return (invoke "i64.reinterpret_f64" (f64.const -infinity)) (i64.const 0xfff0000000000000))
+(assert_return (invoke "i64.reinterpret_f64" (f64.const inf)) (i64.const 0x7ff0000000000000))
+(assert_return (invoke "i64.reinterpret_f64" (f64.const -inf)) (i64.const 0xfff0000000000000))
 ;;(assert_return (invoke "i64.reinterpret_f64" (f64.const nan)) (i64.const 0x7ff8000000000000))
 ;;(assert_return (invoke "i64.reinterpret_f64" (f64.const -nan)) (i64.const 0xfff8000000000000))
 ;;(assert_return (invoke "i64.reinterpret_f64" (f64.const nan:0x4000000000000)) (i64.const 0x7ff4000000000000))
diff --git a/test/wasm2js/deterministic.wast b/test/wasm2js/deterministic.wast
index 6e2322201..4938cf4fd 100644
--- a/test/wasm2js/deterministic.wast
+++ b/test/wasm2js/deterministic.wast
@@ -1,6 +1,6 @@
 (module
- (global $global$0 (mut i32) (i32.const -44))
  (import "env" "memory" (memory $0 1 1))
+ (global $global$0 (mut i32) (i32.const -44))
  (func $foo (export "foo") (result i32)
   (if
    (i32.div_u
diff --git a/test/wasm2js/dynamicLibrary.wast b/test/wasm2js/dynamicLibrary.wast
index 28175633c..f8f95456b 100644
--- a/test/wasm2js/dynamicLibrary.wast
+++ b/test/wasm2js/dynamicLibrary.wast
@@ -4,10 +4,11 @@
 
  (import "env" "memory" (memory $import$memory 256 256))
  (import "env" "memoryBase" (global $import$memoryBase i32))
+ (import "env" "tableBase" (global $import$tableBase i32))
+
  (data (global.get $import$memoryBase) "dynamic data")
 
  (table 10 10 funcref)
- (import "env" "tableBase" (global $import$tableBase i32))
  (elem (global.get $import$tableBase) $foo $bar)
 
  (export "baz" (func $baz))
diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js b/test/wasm2js/emscripten-grow-yes.2asm.js
index 789db164b..6ab56747b 100644
--- a/test/wasm2js/emscripten-grow-yes.2asm.js
+++ b/test/wasm2js/emscripten-grow-yes.2asm.js
@@ -84,6 +84,7 @@ function asmFunc(imports) {
  }
  
  return {
+  "get_size": $0, 
   "memory": Object.create(Object.prototype, {
    "grow": {
     "value": __wasm_memory_grow
@@ -94,8 +95,7 @@ function asmFunc(imports) {
     }
     
    }
-  }), 
-  "get_size": $0
+  })
  };
 }
 
diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js.opt b/test/wasm2js/emscripten-grow-yes.2asm.js.opt
index 789db164b..6ab56747b 100644
--- a/test/wasm2js/emscripten-grow-yes.2asm.js.opt
+++ b/test/wasm2js/emscripten-grow-yes.2asm.js.opt
@@ -84,6 +84,7 @@ function asmFunc(imports) {
  }
  
  return {
+  "get_size": $0, 
   "memory": Object.create(Object.prototype, {
    "grow": {
     "value": __wasm_memory_grow
@@ -94,8 +95,7 @@ function asmFunc(imports) {
     }
     
    }
-  }), 
-  "get_size": $0
+  })
  };
 }
 
diff --git a/test/wasm2js/emscripten.wast b/test/wasm2js/emscripten.wast
index 453c9d312..515994205 100644
--- a/test/wasm2js/emscripten.wast
+++ b/test/wasm2js/emscripten.wast
@@ -1,12 +1,12 @@
 (module
  (type $0 (func))
+ (import "env" "table" (table $timport$9 7 funcref))
+ (import "env" "__syscall6" (func $syscall$6 (param i32 i32) (result i32)))
+ (import "env" "__syscall54" (func $syscall$54 (param i32 i32) (result i32)))
  (memory $8 256 256)
  (data (i32.const 1024) "hello, world!\n\00\00\9c\0c\00\00-+   0X0x\00(null)\00\00\00\00\00\00\00\00\00\00\00\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b\00\00\00\00\00\00\00\00\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\00\00\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0e\00\00\00\00\00\00\00\00\00\00\00\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\00\00\00\00\00\00\00\00\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\12\00\00\00\12\12\12\00\00\00\00\00\00\t\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00")
  (data (i32.const 1600) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
- (import "env" "table" (table $timport$9 7 funcref))
  (elem (i32.const 1) $foo $bar $tabled)
- (import "env" "__syscall6" (func $syscall$6 (param i32 i32) (result i32)))
- (import "env" "__syscall54" (func $syscall$54 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 5243904))
  (export "main" (func $main))
  (export "other" (func $other))
@@ -288,4 +288,3 @@
   (unreachable)
  )
 )
-
diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js
index 493f4100e..5e29d67c3 100644
--- a/test/wasm2js/endianness.2asm.js
+++ b/test/wasm2js/endianness.2asm.js
@@ -102,9 +102,9 @@ function asmFunc(imports) {
  
  function i64_load_little(address) {
   address = address | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9_1 = 0, $3 = 0, $3$hi = 0, $8$hi = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9_1 = 0, $3_1 = 0, $3$hi = 0, $8$hi = 0;
   i64toi32_i32$0 = 0;
-  $3 = i32_load_little(address | 0) | 0;
+  $3_1 = i32_load_little(address | 0) | 0;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = i32_load_little(address + 4 | 0 | 0) | 0;
@@ -120,7 +120,7 @@ function asmFunc(imports) {
   }
   $8$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $3$hi;
-  i64toi32_i32$0 = $3;
+  i64toi32_i32$0 = $3_1;
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $9_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
@@ -129,25 +129,25 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $6(value) {
+ function $0(value) {
   value = value | 0;
   i16_store_little(0 | 0, value | 0);
   return HEAP16[0 >> 1] | 0 | 0;
  }
  
- function $7(value) {
+ function $1(value) {
   value = value | 0;
   i16_store_little(0 | 0, value | 0);
   return HEAPU16[0 >> 1] | 0 | 0;
  }
  
- function $8(value) {
+ function $2(value) {
   value = value | 0;
   i32_store_little(0 | 0, value | 0);
   return HEAP32[0 >> 2] | 0 | 0;
  }
  
- function $9(value, value$hi) {
+ function $3(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -159,7 +159,7 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $10(value, value$hi) {
+ function $4(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -171,7 +171,7 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $11(value, value$hi) {
+ function $5(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -183,7 +183,7 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $12(value, value$hi) {
+ function $6(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -195,7 +195,7 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $13(value, value$hi) {
+ function $7(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0;
@@ -208,13 +208,13 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $14(value) {
+ function $8(value) {
   value = Math_fround(value);
   i32_store_little(0 | 0, (wasm2js_scratch_store_f32(value), wasm2js_scratch_load_i32(2)) | 0);
   return Math_fround(Math_fround(HEAPF32[0 >> 2]));
  }
  
- function $15(value) {
+ function $9(value) {
   value = +value;
   var i64toi32_i32$0 = 0;
   wasm2js_scratch_store_f64(+value);
@@ -223,19 +223,19 @@ function asmFunc(imports) {
   return +(+HEAPF64[0 >> 3]);
  }
  
- function $16(value) {
+ function $10(value) {
   value = value | 0;
   HEAP16[0 >> 1] = value;
   return i16_load_little(0 | 0) | 0 | 0;
  }
  
- function $17(value) {
+ function $11(value) {
   value = value | 0;
   HEAP32[0 >> 2] = value;
   return i32_load_little(0 | 0) | 0 | 0;
  }
  
- function $18(value, value$hi) {
+ function $12(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -247,7 +247,7 @@ function asmFunc(imports) {
   return i64toi32_i32$1 | 0;
  }
  
- function $19(value, value$hi) {
+ function $13(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
@@ -259,7 +259,7 @@ function asmFunc(imports) {
   return i64toi32_i32$1 | 0;
  }
  
- function $20(value, value$hi) {
+ function $14(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
   var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0;
@@ -273,13 +273,13 @@ function asmFunc(imports) {
   return i64toi32_i32$0 | 0;
  }
  
- function $21(value) {
+ function $15(value) {
   value = Math_fround(value);
   HEAPF32[0 >> 2] = value;
   return Math_fround((wasm2js_scratch_store_i32(2, i32_load_little(0 | 0) | 0), wasm2js_scratch_load_f32()));
  }
  
- function $22(value) {
+ function $16(value) {
   value = +value;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   HEAPF64[0 >> 3] = value;
@@ -290,15 +290,15 @@ function asmFunc(imports) {
   return +(+wasm2js_scratch_load_f64());
  }
  
- function legalstub$9($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$3($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -311,13 +311,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $9(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $3(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -332,18 +332,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$10($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$4($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -356,13 +356,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $10(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $4(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -377,18 +377,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$11($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$5($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -401,13 +401,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $11(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $5(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -422,18 +422,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$12($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$6($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -446,13 +446,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $12(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $6(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -467,18 +467,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$13($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$7($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -491,13 +491,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $13(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $7(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -512,18 +512,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$18($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$12($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -536,13 +536,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $18(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $12(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -557,18 +557,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$19($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$13($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -581,13 +581,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $19(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $13(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -602,18 +602,18 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
- function legalstub$20($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
+ function legalstub$14($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4 = $0;
+  $4_1 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -626,13 +626,13 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4;
+  i64toi32_i32$0 = $4_1;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $20(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $14(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $2 = i64toi32_i32$2;
+  $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
   i64toi32_i32$1 = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
@@ -647,7 +647,7 @@ function asmFunc(imports) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2_1 | 0;
  }
  
  bufferView = HEAPU8;
@@ -678,23 +678,23 @@ function asmFunc(imports) {
  }
  
  return {
-  "i32_load16_s": $6, 
-  "i32_load16_u": $7, 
-  "i32_load": $8, 
-  "i64_load16_s": legalstub$9, 
-  "i64_load16_u": legalstub$10, 
-  "i64_load32_s": legalstub$11, 
-  "i64_load32_u": legalstub$12, 
-  "i64_load": legalstub$13, 
-  "f32_load": $14, 
-  "f64_load": $15, 
-  "i32_store16": $16, 
-  "i32_store": $17, 
-  "i64_store16": legalstub$18, 
-  "i64_store32": legalstub$19, 
-  "i64_store": legalstub$20, 
-  "f32_store": $21, 
-  "f64_store": $22
+  "i32_load16_s": $0, 
+  "i32_load16_u": $1, 
+  "i32_load": $2, 
+  "i64_load16_s": legalstub$3, 
+  "i64_load16_u": legalstub$4, 
+  "i64_load32_s": legalstub$5, 
+  "i64_load32_u": legalstub$6, 
+  "i64_load": legalstub$7, 
+  "f32_load": $8, 
+  "f64_load": $9, 
+  "i32_store16": $10, 
+  "i32_store": $11, 
+  "i64_store16": legalstub$12, 
+  "i64_store32": legalstub$13, 
+  "i64_store": legalstub$14, 
+  "f32_store": $15, 
+  "f64_store": $16
  };
 }
 
diff --git a/test/wasm2js/fac.2asm.js b/test/wasm2js/fac.2asm.js
index f87d217ba..b98604c0e 100644
--- a/test/wasm2js/fac.2asm.js
+++ b/test/wasm2js/fac.2asm.js
@@ -76,20 +76,20 @@ function asmFunc(imports) {
   return i64toi32_i32$5 | 0;
  }
  
- function $2($0_1, $0$hi) {
+ function $1($0_1, $0$hi) {
   $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $1$hi = 0, i64toi32_i32$5 = 0, $1 = 0, $2$hi = 0, i64toi32_i32$1 = 0, $2_1 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $1$hi = 0, i64toi32_i32$5 = 0, $1_1 = 0, $2$hi = 0, i64toi32_i32$1 = 0, $2_1 = 0;
   i64toi32_i32$0 = $0$hi;
-  $1 = $0_1;
+  $1_1 = $0_1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   $2_1 = 1;
   $2$hi = i64toi32_i32$0;
   block : {
-   loop_in : while (1) {
+   label : while (1) {
     i64toi32_i32$0 = $1$hi;
-    i64toi32_i32$2 = $1;
+    i64toi32_i32$2 = $1_1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
     if ((i64toi32_i32$2 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0) {
@@ -99,20 +99,20 @@ function asmFunc(imports) {
      i64toi32_i32$2 = $2$hi;
      i64toi32_i32$2 = $1$hi;
      i64toi32_i32$0 = $2$hi;
-     i64toi32_i32$0 = __wasm_i64_mul($1 | 0, i64toi32_i32$2 | 0, $2_1 | 0, i64toi32_i32$0 | 0) | 0;
+     i64toi32_i32$0 = __wasm_i64_mul($1_1 | 0, i64toi32_i32$2 | 0, $2_1 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
      $2_1 = i64toi32_i32$0;
      $2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = $1$hi;
-     i64toi32_i32$3 = $1;
+     i64toi32_i32$3 = $1_1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     $1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
+     $1_1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      $1$hi = i64toi32_i32$5;
     }
-    continue loop_in;
+    continue label;
    };
   }
   i64toi32_i32$5 = $2$hi;
@@ -121,7 +121,7 @@ function asmFunc(imports) {
   return i64toi32_i32$3 | 0;
  }
  
- function $3(n, n$hi) {
+ function $2(n, n$hi) {
   n = n | 0;
   n$hi = n$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i$hi = 0, i64toi32_i32$5 = 0, i = 0, res$hi = 0, i64toi32_i32$1 = 0, res = 0;
@@ -166,12 +166,12 @@ function asmFunc(imports) {
   return i64toi32_i32$3 | 0;
  }
  
- function $4($0_1, $0$hi) {
+ function $3($0_1, $0$hi) {
   $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, $1$hi = 0, $1 = 0, $10 = 0, $11 = 0, $12 = 0, i64toi32_i32$4 = 0, $13 = 0, $14 = 0, $15 = 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, $1$hi = 0, $1_1 = 0, $10 = 0, $11 = 0, $12 = 0, i64toi32_i32$4 = 0, $13 = 0, $14 = 0, $15 = 0;
   i64toi32_i32$0 = 0;
-  $1 = 1;
+  $1_1 = 1;
   $1$hi = i64toi32_i32$0;
   block : {
    i64toi32_i32$0 = $0$hi;
@@ -196,14 +196,14 @@ function asmFunc(imports) {
    if ($10) {
     break block
    }
-   loop_in : while (1) {
+   label : while (1) {
     i64toi32_i32$2 = $1$hi;
     i64toi32_i32$2 = $0$hi;
     i64toi32_i32$2 = $1$hi;
     i64toi32_i32$0 = $0$hi;
-    i64toi32_i32$0 = __wasm_i64_mul($1 | 0, i64toi32_i32$2 | 0, $0_1 | 0, i64toi32_i32$0 | 0) | 0;
+    i64toi32_i32$0 = __wasm_i64_mul($1_1 | 0, i64toi32_i32$2 | 0, $0_1 | 0, i64toi32_i32$0 | 0) | 0;
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-    $1 = i64toi32_i32$0;
+    $1_1 = i64toi32_i32$0;
     $1$hi = i64toi32_i32$2;
     i64toi32_i32$2 = $0$hi;
     i64toi32_i32$3 = $0_1;
@@ -235,26 +235,26 @@ function asmFunc(imports) {
      $13 = $15;
     }
     if ($13) {
-     continue loop_in
+     continue label
     }
-    break loop_in;
+    break label;
    };
   }
   i64toi32_i32$2 = $1$hi;
-  i64toi32_i32$5 = $1;
+  i64toi32_i32$5 = $1_1;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$2;
   return i64toi32_i32$5 | 0;
  }
  
- function legalstub$0($0_1, $1) {
+ function legalstub$0($0_1, $1_1) {
   $0_1 = $0_1 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4_1 = $0_1;
+  $4 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -267,7 +267,7 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4_1;
+  i64toi32_i32$0 = $4;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
@@ -291,15 +291,15 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function legalstub$fac_rec_named($0_1, $1) {
+ function legalstub$fac_rec_named($0_1, $1_1) {
   $0_1 = $0_1 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4_1 = $0_1;
+  $4 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -312,7 +312,7 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4_1;
+  i64toi32_i32$0 = $4;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
@@ -336,15 +336,15 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function legalstub$2($0_1, $1) {
+ function legalstub$1($0_1, $1_1) {
   $0_1 = $0_1 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4_1 = $0_1;
+  $4 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -357,11 +357,11 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4_1;
+  i64toi32_i32$0 = $4;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $2(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $1(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
@@ -381,15 +381,15 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function legalstub$3($0_1, $1) {
+ function legalstub$2($0_1, $1_1) {
   $0_1 = $0_1 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4_1 = $0_1;
+  $4 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -402,11 +402,11 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4_1;
+  i64toi32_i32$0 = $4;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $3(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $2(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
@@ -426,15 +426,15 @@ function asmFunc(imports) {
   return $2_1 | 0;
  }
  
- function legalstub$4($0_1, $1) {
+ function legalstub$3($0_1, $1_1) {
   $0_1 = $0_1 | 0;
-  $1 = $1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
+  $1_1 = $1_1 | 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
-  $4_1 = $0_1;
+  $4 = $0_1;
   $4$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $1;
+  i64toi32_i32$2 = $1_1;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -447,11 +447,11 @@ function asmFunc(imports) {
   }
   $7$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $4$hi;
-  i64toi32_i32$0 = $4_1;
+  i64toi32_i32$0 = $4;
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  i64toi32_i32$2 = $4(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = $3(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $2_1 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
@@ -560,9 +560,9 @@ function asmFunc(imports) {
  return {
   "fac_rec": legalstub$0, 
   "fac_rec_named": legalstub$fac_rec_named, 
-  "fac_iter": legalstub$2, 
-  "fac_iter_named": legalstub$3, 
-  "fac_opt": legalstub$4
+  "fac_iter": legalstub$1, 
+  "fac_iter_named": legalstub$2, 
+  "fac_opt": legalstub$3
  };
 }
 
diff --git a/test/wasm2js/float-ops.2asm.js b/test/wasm2js/float-ops.2asm.js
index 3749da5b4..eacfc01eb 100644
--- a/test/wasm2js/float-ops.2asm.js
+++ b/test/wasm2js/float-ops.2asm.js
@@ -10,266 +10,266 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, $1_1) {
-  $0 = Math_fround($0);
+ function $0($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 + $1_1));
+  return Math_fround(Math_fround($0_1 + $1_1));
  }
  
- function $2($0, $1_1) {
-  $0 = Math_fround($0);
+ function $1($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 - $1_1));
+  return Math_fround(Math_fround($0_1 - $1_1));
  }
  
- function $3($0, $1_1) {
-  $0 = Math_fround($0);
+ function $2($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 * $1_1));
+  return Math_fround(Math_fround($0_1 * $1_1));
  }
  
- function $4($0, $1_1) {
-  $0 = Math_fround($0);
+ function $3($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 / $1_1));
+  return Math_fround(Math_fround($0_1 / $1_1));
  }
  
- function $5($0, $1_1) {
-  $0 = +$0;
+ function $4($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 + $1_1);
+  return +($0_1 + $1_1);
  }
  
- function $6($0, $1_1) {
-  $0 = +$0;
+ function $5($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 - $1_1);
+  return +($0_1 - $1_1);
  }
  
- function $7($0, $1_1) {
-  $0 = +$0;
+ function $6($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 * $1_1);
+  return +($0_1 * $1_1);
  }
  
- function $8($0, $1_1) {
-  $0 = +$0;
+ function $7($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 / $1_1);
+  return +($0_1 / $1_1);
  }
  
- function $9($0, $1_1) {
-  $0 = Math_fround($0);
+ function $8($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 == $1_1 | 0;
+  return $0_1 == $1_1 | 0;
  }
  
- function $10($0, $1_1) {
-  $0 = Math_fround($0);
+ function $9($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 != $1_1 | 0;
+  return $0_1 != $1_1 | 0;
  }
  
- function $11($0, $1_1) {
-  $0 = Math_fround($0);
+ function $10($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 >= $1_1 | 0;
+  return $0_1 >= $1_1 | 0;
  }
  
- function $12($0, $1_1) {
-  $0 = Math_fround($0);
+ function $11($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 > $1_1 | 0;
+  return $0_1 > $1_1 | 0;
  }
  
- function $13($0, $1_1) {
-  $0 = Math_fround($0);
+ function $12($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 <= $1_1 | 0;
+  return $0_1 <= $1_1 | 0;
  }
  
- function $14($0, $1_1) {
-  $0 = Math_fround($0);
+ function $13($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 < $1_1 | 0;
+  return $0_1 < $1_1 | 0;
  }
  
- function $15($0, $1_1) {
-  $0 = +$0;
+ function $14($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 == $1_1 | 0;
+  return $0_1 == $1_1 | 0;
  }
  
- function $16($0, $1_1) {
-  $0 = +$0;
+ function $15($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 != $1_1 | 0;
+  return $0_1 != $1_1 | 0;
  }
  
- function $17($0, $1_1) {
-  $0 = +$0;
+ function $16($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 >= $1_1 | 0;
+  return $0_1 >= $1_1 | 0;
  }
  
- function $18($0, $1_1) {
-  $0 = +$0;
+ function $17($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 > $1_1 | 0;
+  return $0_1 > $1_1 | 0;
  }
  
- function $19($0, $1_1) {
-  $0 = +$0;
+ function $18($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 <= $1_1 | 0;
+  return $0_1 <= $1_1 | 0;
  }
  
- function $20($0, $1_1) {
-  $0 = +$0;
+ function $19($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 < $1_1 | 0;
+  return $0_1 < $1_1 | 0;
  }
  
- function $21($0, $1_1) {
-  $0 = Math_fround($0);
+ function $20($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround(Math_min($0, $1_1)));
+  return Math_fround(Math_fround(Math_min($0_1, $1_1)));
  }
  
- function $22($0, $1_1) {
-  $0 = Math_fround($0);
+ function $21($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround(Math_max($0, $1_1)));
+  return Math_fround(Math_fround(Math_max($0_1, $1_1)));
  }
  
- function $23($0, $1_1) {
-  $0 = +$0;
+ function $22($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +Math_min($0, $1_1);
+  return +Math_min($0_1, $1_1);
  }
  
- function $24($0, $1_1) {
-  $0 = +$0;
+ function $23($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +Math_max($0, $1_1);
+  return +Math_max($0_1, $1_1);
  }
  
- function $25($0) {
-  $0 = Math_fround($0);
-  return +(+$0);
+ function $24($0_1) {
+  $0_1 = Math_fround($0_1);
+  return +(+$0_1);
  }
  
- function $26($0) {
-  $0 = +$0;
-  return Math_fround(Math_fround($0));
+ function $25($0_1) {
+  $0_1 = +$0_1;
+  return Math_fround(Math_fround($0_1));
  }
  
- function $27($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_floor($0)));
+ function $26($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_floor($0_1)));
  }
  
- function $28($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_ceil($0)));
+ function $27($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_ceil($0_1)));
  }
  
- function $29($0) {
-  $0 = +$0;
-  return +Math_floor($0);
+ function $28($0_1) {
+  $0_1 = +$0_1;
+  return +Math_floor($0_1);
  }
  
- function $30($0) {
-  $0 = +$0;
-  return +Math_ceil($0);
+ function $29($0_1) {
+  $0_1 = +$0_1;
+  return +Math_ceil($0_1);
  }
  
- function $31($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_sqrt($0)));
+ function $30($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_sqrt($0_1)));
  }
  
- function $32($0) {
-  $0 = +$0;
-  return +Math_sqrt($0);
+ function $31($0_1) {
+  $0_1 = +$0_1;
+  return +Math_sqrt($0_1);
  }
  
- function $35($0) {
-  $0 = $0 | 0;
-  return Math_fround(Math_fround($0 | 0));
+ function $32($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_fround(Math_fround($0_1 | 0));
  }
  
- function $36($0) {
-  $0 = $0 | 0;
-  return +(+($0 | 0));
+ function $33($0_1) {
+  $0_1 = $0_1 | 0;
+  return +(+($0_1 | 0));
  }
  
- function $37($0) {
-  $0 = $0 | 0;
-  return Math_fround(Math_fround($0 >>> 0));
+ function $34($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_fround(Math_fround($0_1 >>> 0));
  }
  
- function $38($0) {
-  $0 = $0 | 0;
-  return +(+($0 >>> 0));
+ function $35($0_1) {
+  $0_1 = $0_1 | 0;
+  return +(+($0_1 >>> 0));
  }
  
- function $39($0) {
-  $0 = Math_fround($0);
-  return ~~$0 | 0;
+ function $36($0_1) {
+  $0_1 = Math_fround($0_1);
+  return ~~$0_1 | 0;
  }
  
- function $40($0) {
-  $0 = +$0;
-  return ~~$0 | 0;
+ function $37($0_1) {
+  $0_1 = +$0_1;
+  return ~~$0_1 | 0;
  }
  
- function $41($0) {
-  $0 = Math_fround($0);
-  return ~~$0 >>> 0 | 0;
+ function $38($0_1) {
+  $0_1 = Math_fround($0_1);
+  return ~~$0_1 >>> 0 | 0;
  }
  
- function $42($0) {
-  $0 = +$0;
-  return ~~$0 >>> 0 | 0;
+ function $39($0_1) {
+  $0_1 = +$0_1;
+  return ~~$0_1 >>> 0 | 0;
  }
  
- function $43($0, $0$hi) {
-  $0 = $0 | 0;
+ function $40($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
-  return Math_fround(Math_fround(+($0 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 | 0)));
+  return Math_fround(Math_fround(+($0_1 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 | 0)));
  }
  
- function $44($0, $0$hi) {
-  $0 = $0 | 0;
+ function $41($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
-  return +(+($0 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 | 0));
+  return +(+($0_1 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 | 0));
  }
  
- function $45($0, $0$hi) {
-  $0 = $0 | 0;
+ function $42($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
-  return Math_fround(Math_fround(+($0 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 >>> 0)));
+  return Math_fround(Math_fround(+($0_1 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 >>> 0)));
  }
  
- function $46($0, $0$hi) {
-  $0 = $0 | 0;
+ function $43($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
-  return +(+($0 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 >>> 0));
+  return +(+($0_1 >>> 0) + 4294967296.0 * +(i64toi32_i32$0 >>> 0));
  }
  
- function $47($0) {
-  $0 = Math_fround($0);
+ function $44($0_1) {
+  $0_1 = Math_fround($0_1);
   var i64toi32_i32$0 = Math_fround(0), $3_1 = 0, $4_1 = 0, i64toi32_i32$1 = 0;
-  i64toi32_i32$0 = $0;
+  i64toi32_i32$0 = $0_1;
   if (Math_fround(Math_abs(i64toi32_i32$0)) >= Math_fround(1.0)) {
    if (i64toi32_i32$0 > Math_fround(0.0)) {
     $3_1 = ~~Math_fround(Math_min(Math_fround(Math_floor(Math_fround(i64toi32_i32$0 / Math_fround(4294967296.0)))), Math_fround(Math_fround(4294967296.0) - Math_fround(1.0)))) >>> 0
@@ -284,10 +284,10 @@ function asmFunc(imports) {
   return (~~i64toi32_i32$0 >>> 0 | 0) == (0 | 0) & (i64toi32_i32$1 | 0) == (0 | 0) | 0 | 0;
  }
  
- function $48($0) {
-  $0 = +$0;
+ function $45($0_1) {
+  $0_1 = +$0_1;
   var i64toi32_i32$0 = 0.0, $3_1 = 0, $4_1 = 0, i64toi32_i32$1 = 0;
-  i64toi32_i32$0 = $0;
+  i64toi32_i32$0 = $0_1;
   if (Math_abs(i64toi32_i32$0) >= 1.0) {
    if (i64toi32_i32$0 > 0.0) {
     $3_1 = ~~Math_min(Math_floor(i64toi32_i32$0 / 4294967296.0), 4294967296.0 - 1.0) >>> 0
@@ -302,10 +302,10 @@ function asmFunc(imports) {
   return (~~i64toi32_i32$0 >>> 0 | 0) == (0 | 0) & (i64toi32_i32$1 | 0) == (0 | 0) | 0 | 0;
  }
  
- function $49($0) {
-  $0 = Math_fround($0);
+ function $46($0_1) {
+  $0_1 = Math_fround($0_1);
   var i64toi32_i32$0 = Math_fround(0), $3_1 = 0, $4_1 = 0, i64toi32_i32$1 = 0;
-  i64toi32_i32$0 = $0;
+  i64toi32_i32$0 = $0_1;
   if (Math_fround(Math_abs(i64toi32_i32$0)) >= Math_fround(1.0)) {
    if (i64toi32_i32$0 > Math_fround(0.0)) {
     $3_1 = ~~Math_fround(Math_min(Math_fround(Math_floor(Math_fround(i64toi32_i32$0 / Math_fround(4294967296.0)))), Math_fround(Math_fround(4294967296.0) - Math_fround(1.0)))) >>> 0
@@ -320,10 +320,10 @@ function asmFunc(imports) {
   return (~~i64toi32_i32$0 >>> 0 | 0) == (0 | 0) & (i64toi32_i32$1 | 0) == (0 | 0) | 0 | 0;
  }
  
- function $50($0) {
-  $0 = +$0;
+ function $47($0_1) {
+  $0_1 = +$0_1;
   var i64toi32_i32$0 = 0.0, $3_1 = 0, $4_1 = 0, i64toi32_i32$1 = 0;
-  i64toi32_i32$0 = $0;
+  i64toi32_i32$0 = $0_1;
   if (Math_abs(i64toi32_i32$0) >= 1.0) {
    if (i64toi32_i32$0 > 0.0) {
     $3_1 = ~~Math_min(Math_floor(i64toi32_i32$0 / 4294967296.0), 4294967296.0 - 1.0) >>> 0
@@ -338,12 +338,12 @@ function asmFunc(imports) {
   return (~~i64toi32_i32$0 >>> 0 | 0) == (0 | 0) & (i64toi32_i32$1 | 0) == (0 | 0) | 0 | 0;
  }
  
- function legalstub$43($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$40($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -363,15 +363,15 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return Math_fround(Math_fround($43(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0)));
+  return Math_fround(Math_fround($40(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0)));
  }
  
- function legalstub$44($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$41($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -391,15 +391,15 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return +(+$44(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0));
+  return +(+$41(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0));
  }
  
- function legalstub$45($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$42($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -419,15 +419,15 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return Math_fround(Math_fround($45(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0)));
+  return Math_fround(Math_fround($42(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0)));
  }
  
- function legalstub$46($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$43($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -447,58 +447,58 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return +(+$46(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0));
+  return +(+$43(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 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_floor": $27, 
-  "f32_ceil": $28, 
-  "f64_floor": $29, 
-  "f64_ceil": $30, 
-  "f32_sqrt": $31, 
-  "f64_sqrt": $32, 
-  "i32_to_f32": $35, 
-  "i32_to_f64": $36, 
-  "u32_to_f32": $37, 
-  "u32_to_f64": $38, 
-  "f32_to_i32": $39, 
-  "f64_to_i32": $40, 
-  "f32_to_u32": $41, 
-  "f64_to_u32": $42, 
-  "i64_to_f32": legalstub$43, 
-  "i64_to_f64": legalstub$44, 
-  "u64_to_f32": legalstub$45, 
-  "u64_to_f64": legalstub$46, 
-  "f32_to_i64": $47, 
-  "f64_to_i64": $48, 
-  "f32_to_u64": $49, 
-  "f64_to_u64": $50
+  "f32_add": $0, 
+  "f32_sub": $1, 
+  "f32_mul": $2, 
+  "f32_div": $3, 
+  "f64_add": $4, 
+  "f64_sub": $5, 
+  "f64_mul": $6, 
+  "f64_div": $7, 
+  "f32_eq": $8, 
+  "f32_ne": $9, 
+  "f32_ge": $10, 
+  "f32_gt": $11, 
+  "f32_le": $12, 
+  "f32_lt": $13, 
+  "f64_eq": $14, 
+  "f64_ne": $15, 
+  "f64_ge": $16, 
+  "f64_gt": $17, 
+  "f64_le": $18, 
+  "f64_lt": $19, 
+  "f32_min": $20, 
+  "f32_max": $21, 
+  "f64_min": $22, 
+  "f64_max": $23, 
+  "f64_promote": $24, 
+  "f32_demote": $25, 
+  "f32_floor": $26, 
+  "f32_ceil": $27, 
+  "f64_floor": $28, 
+  "f64_ceil": $29, 
+  "f32_sqrt": $30, 
+  "f64_sqrt": $31, 
+  "i32_to_f32": $32, 
+  "i32_to_f64": $33, 
+  "u32_to_f32": $34, 
+  "u32_to_f64": $35, 
+  "f32_to_i32": $36, 
+  "f64_to_i32": $37, 
+  "f32_to_u32": $38, 
+  "f64_to_u32": $39, 
+  "i64_to_f32": legalstub$40, 
+  "i64_to_f64": legalstub$41, 
+  "u64_to_f32": legalstub$42, 
+  "u64_to_f64": legalstub$43, 
+  "f32_to_i64": $44, 
+  "f64_to_i64": $45, 
+  "f32_to_u64": $46, 
+  "f64_to_u64": $47
  };
 }
 
diff --git a/test/wasm2js/float-ops.2asm.js.opt b/test/wasm2js/float-ops.2asm.js.opt
index e00c51801..9475a4698 100644
--- a/test/wasm2js/float-ops.2asm.js.opt
+++ b/test/wasm2js/float-ops.2asm.js.opt
@@ -10,317 +10,317 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, $1_1) {
-  $0 = Math_fround($0);
+ function $0($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 + $1_1));
+  return Math_fround(Math_fround($0_1 + $1_1));
  }
  
- function $2($0, $1_1) {
-  $0 = Math_fround($0);
+ function $1($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 - $1_1));
+  return Math_fround(Math_fround($0_1 - $1_1));
  }
  
- function $3($0, $1_1) {
-  $0 = Math_fround($0);
+ function $2($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 * $1_1));
+  return Math_fround(Math_fround($0_1 * $1_1));
  }
  
- function $4($0, $1_1) {
-  $0 = Math_fround($0);
+ function $3($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround($0 / $1_1));
+  return Math_fround(Math_fround($0_1 / $1_1));
  }
  
- function $5($0, $1_1) {
-  $0 = +$0;
+ function $4($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 + $1_1);
+  return +($0_1 + $1_1);
  }
  
- function $6($0, $1_1) {
-  $0 = +$0;
+ function $5($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 - $1_1);
+  return +($0_1 - $1_1);
  }
  
- function $7($0, $1_1) {
-  $0 = +$0;
+ function $6($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 * $1_1);
+  return +($0_1 * $1_1);
  }
  
- function $8($0, $1_1) {
-  $0 = +$0;
+ function $7($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +($0 / $1_1);
+  return +($0_1 / $1_1);
  }
  
- function $9($0, $1_1) {
-  $0 = Math_fround($0);
+ function $8($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 == $1_1 | 0;
+  return $0_1 == $1_1 | 0;
  }
  
- function $10($0, $1_1) {
-  $0 = Math_fround($0);
+ function $9($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 != $1_1 | 0;
+  return $0_1 != $1_1 | 0;
  }
  
- function $11($0, $1_1) {
-  $0 = Math_fround($0);
+ function $10($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 >= $1_1 | 0;
+  return $0_1 >= $1_1 | 0;
  }
  
- function $12($0, $1_1) {
-  $0 = Math_fround($0);
+ function $11($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 > $1_1 | 0;
+  return $0_1 > $1_1 | 0;
  }
  
- function $13($0, $1_1) {
-  $0 = Math_fround($0);
+ function $12($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 <= $1_1 | 0;
+  return $0_1 <= $1_1 | 0;
  }
  
- function $14($0, $1_1) {
-  $0 = Math_fround($0);
+ function $13($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return $0 < $1_1 | 0;
+  return $0_1 < $1_1 | 0;
  }
  
- function $15($0, $1_1) {
-  $0 = +$0;
+ function $14($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 == $1_1 | 0;
+  return $0_1 == $1_1 | 0;
  }
  
- function $16($0, $1_1) {
-  $0 = +$0;
+ function $15($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 != $1_1 | 0;
+  return $0_1 != $1_1 | 0;
  }
  
- function $17($0, $1_1) {
-  $0 = +$0;
+ function $16($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 >= $1_1 | 0;
+  return $0_1 >= $1_1 | 0;
  }
  
- function $18($0, $1_1) {
-  $0 = +$0;
+ function $17($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 > $1_1 | 0;
+  return $0_1 > $1_1 | 0;
  }
  
- function $19($0, $1_1) {
-  $0 = +$0;
+ function $18($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 <= $1_1 | 0;
+  return $0_1 <= $1_1 | 0;
  }
  
- function $20($0, $1_1) {
-  $0 = +$0;
+ function $19($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return $0 < $1_1 | 0;
+  return $0_1 < $1_1 | 0;
  }
  
- function $21($0, $1_1) {
-  $0 = Math_fround($0);
+ function $20($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround(Math_min($0, $1_1)));
+  return Math_fround(Math_fround(Math_min($0_1, $1_1)));
  }
  
- function $22($0, $1_1) {
-  $0 = Math_fround($0);
+ function $21($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
   $1_1 = Math_fround($1_1);
-  return Math_fround(Math_fround(Math_max($0, $1_1)));
+  return Math_fround(Math_fround(Math_max($0_1, $1_1)));
  }
  
- function $23($0, $1_1) {
-  $0 = +$0;
+ function $22($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +Math_min($0, $1_1);
+  return +Math_min($0_1, $1_1);
  }
  
- function $24($0, $1_1) {
-  $0 = +$0;
+ function $23($0_1, $1_1) {
+  $0_1 = +$0_1;
   $1_1 = +$1_1;
-  return +Math_max($0, $1_1);
+  return +Math_max($0_1, $1_1);
  }
  
- function $25($0) {
-  $0 = Math_fround($0);
-  return +$0;
+ function $24($0_1) {
+  $0_1 = Math_fround($0_1);
+  return +$0_1;
  }
  
- function $26($0) {
-  $0 = +$0;
-  return Math_fround(Math_fround($0));
+ function $25($0_1) {
+  $0_1 = +$0_1;
+  return Math_fround(Math_fround($0_1));
  }
  
- function $27($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_floor($0)));
+ function $26($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_floor($0_1)));
  }
  
- function $28($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_ceil($0)));
+ function $27($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_ceil($0_1)));
  }
  
- function $29($0) {
-  $0 = +$0;
-  return +Math_floor($0);
+ function $28($0_1) {
+  $0_1 = +$0_1;
+  return +Math_floor($0_1);
  }
  
- function $30($0) {
-  $0 = +$0;
-  return +Math_ceil($0);
+ function $29($0_1) {
+  $0_1 = +$0_1;
+  return +Math_ceil($0_1);
  }
  
- function $31($0) {
-  $0 = Math_fround($0);
-  return Math_fround(Math_fround(Math_sqrt($0)));
+ function $30($0_1) {
+  $0_1 = Math_fround($0_1);
+  return Math_fround(Math_fround(Math_sqrt($0_1)));
  }
  
- function $32($0) {
-  $0 = +$0;
-  return +Math_sqrt($0);
+ function $31($0_1) {
+  $0_1 = +$0_1;
+  return +Math_sqrt($0_1);
  }
  
- function $35($0) {
-  $0 = $0 | 0;
-  return Math_fround(Math_fround($0 | 0));
+ function $32($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_fround(Math_fround($0_1 | 0));
  }
  
- function $36($0) {
-  $0 = $0 | 0;
-  return +($0 | 0);
+ function $33($0_1) {
+  $0_1 = $0_1 | 0;
+  return +($0_1 | 0);
  }
  
- function $37($0) {
-  $0 = $0 | 0;
-  return Math_fround(Math_fround($0 >>> 0));
+ function $34($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_fround(Math_fround($0_1 >>> 0));
  }
  
- function $38($0) {
-  $0 = $0 | 0;
-  return +($0 >>> 0);
+ function $35($0_1) {
+  $0_1 = $0_1 | 0;
+  return +($0_1 >>> 0);
  }
  
- function $39($0) {
-  $0 = Math_fround($0);
-  return ~~$0 | 0;
+ function $36($0_1) {
+  $0_1 = Math_fround($0_1);
+  return ~~$0_1 | 0;
  }
  
- function $40($0) {
-  $0 = +$0;
-  return ~~$0 | 0;
+ function $37($0_1) {
+  $0_1 = +$0_1;
+  return ~~$0_1 | 0;
  }
  
- function $41($0) {
-  $0 = Math_fround($0);
-  return ~~$0 >>> 0 | 0;
+ function $38($0_1) {
+  $0_1 = Math_fround($0_1);
+  return ~~$0_1 >>> 0 | 0;
  }
  
- function $42($0) {
-  $0 = +$0;
-  return ~~$0 >>> 0 | 0;
+ function $39($0_1) {
+  $0_1 = +$0_1;
+  return ~~$0_1 >>> 0 | 0;
  }
  
- function $47($0) {
-  $0 = Math_fround($0);
+ function $44($0_1) {
+  $0_1 = Math_fround($0_1);
   var $1_1 = 0;
-  if (Math_fround(Math_abs($0)) >= Math_fround(1.0)) {
-   $1_1 = ~~($0 > Math_fround(0.0) ? Math_fround(Math_min(Math_fround(Math_floor(Math_fround($0 * Math_fround(2.3283064365386963e-10)))), Math_fround(4294967296.0))) : Math_fround(Math_ceil(Math_fround(Math_fround($0 - Math_fround(~~$0 >>> 0 >>> 0)) * Math_fround(2.3283064365386963e-10))))) >>> 0
+  if (Math_fround(Math_abs($0_1)) >= Math_fround(1.0)) {
+   $1_1 = ~~($0_1 > Math_fround(0.0) ? Math_fround(Math_min(Math_fround(Math_floor(Math_fround($0_1 * Math_fround(2.3283064365386963e-10)))), Math_fround(4294967296.0))) : Math_fround(Math_ceil(Math_fround(Math_fround($0_1 - Math_fround(~~$0_1 >>> 0 >>> 0)) * Math_fround(2.3283064365386963e-10))))) >>> 0
   } else {
    $1_1 = 0
   }
-  return !($1_1 | ~~$0 >>> 0) | 0;
+  return !($1_1 | ~~$0_1 >>> 0) | 0;
  }
  
- function $48($0) {
-  $0 = +$0;
+ function $45($0_1) {
+  $0_1 = +$0_1;
   var $1_1 = 0;
-  if (Math_abs($0) >= 1.0) {
-   $1_1 = ~~($0 > 0.0 ? Math_min(Math_floor($0 * 2.3283064365386963e-10), 4294967295.0) : Math_ceil(($0 - +(~~$0 >>> 0 >>> 0)) * 2.3283064365386963e-10)) >>> 0
+  if (Math_abs($0_1) >= 1.0) {
+   $1_1 = ~~($0_1 > 0.0 ? Math_min(Math_floor($0_1 * 2.3283064365386963e-10), 4294967295.0) : Math_ceil(($0_1 - +(~~$0_1 >>> 0 >>> 0)) * 2.3283064365386963e-10)) >>> 0
   } else {
    $1_1 = 0
   }
-  return !($1_1 | ~~$0 >>> 0) | 0;
+  return !($1_1 | ~~$0_1 >>> 0) | 0;
  }
  
- function legalstub$43($0, $1_1) {
-  return Math_fround(+($0 >>> 0) + +($1_1 | 0) * 4294967296.0);
+ function legalstub$40($0_1, $1_1) {
+  return Math_fround(+($0_1 >>> 0) + +($1_1 | 0) * 4294967296.0);
  }
  
- function legalstub$44($0, $1_1) {
-  return +($0 >>> 0) + +($1_1 | 0) * 4294967296.0;
+ function legalstub$41($0_1, $1_1) {
+  return +($0_1 >>> 0) + +($1_1 | 0) * 4294967296.0;
  }
  
- function legalstub$45($0, $1_1) {
-  return Math_fround(+($0 >>> 0) + +($1_1 >>> 0) * 4294967296.0);
+ function legalstub$42($0_1, $1_1) {
+  return Math_fround(+($0_1 >>> 0) + +($1_1 >>> 0) * 4294967296.0);
  }
  
- function legalstub$46($0, $1_1) {
-  return +($0 >>> 0) + +($1_1 >>> 0) * 4294967296.0;
+ function legalstub$43($0_1, $1_1) {
+  return +($0_1 >>> 0) + +($1_1 >>> 0) * 4294967296.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_floor": $27, 
-  "f32_ceil": $28, 
-  "f64_floor": $29, 
-  "f64_ceil": $30, 
-  "f32_sqrt": $31, 
-  "f64_sqrt": $32, 
-  "i32_to_f32": $35, 
-  "i32_to_f64": $36, 
-  "u32_to_f32": $37, 
-  "u32_to_f64": $38, 
-  "f32_to_i32": $39, 
-  "f64_to_i32": $40, 
-  "f32_to_u32": $41, 
-  "f64_to_u32": $42, 
-  "i64_to_f32": legalstub$43, 
-  "i64_to_f64": legalstub$44, 
-  "u64_to_f32": legalstub$45, 
-  "u64_to_f64": legalstub$46, 
-  "f32_to_i64": $47, 
-  "f64_to_i64": $48, 
-  "f32_to_u64": $47, 
-  "f64_to_u64": $48
+  "f32_add": $0, 
+  "f32_sub": $1, 
+  "f32_mul": $2, 
+  "f32_div": $3, 
+  "f64_add": $4, 
+  "f64_sub": $5, 
+  "f64_mul": $6, 
+  "f64_div": $7, 
+  "f32_eq": $8, 
+  "f32_ne": $9, 
+  "f32_ge": $10, 
+  "f32_gt": $11, 
+  "f32_le": $12, 
+  "f32_lt": $13, 
+  "f64_eq": $14, 
+  "f64_ne": $15, 
+  "f64_ge": $16, 
+  "f64_gt": $17, 
+  "f64_le": $18, 
+  "f64_lt": $19, 
+  "f32_min": $20, 
+  "f32_max": $21, 
+  "f64_min": $22, 
+  "f64_max": $23, 
+  "f64_promote": $24, 
+  "f32_demote": $25, 
+  "f32_floor": $26, 
+  "f32_ceil": $27, 
+  "f64_floor": $28, 
+  "f64_ceil": $29, 
+  "f32_sqrt": $30, 
+  "f64_sqrt": $31, 
+  "i32_to_f32": $32, 
+  "i32_to_f64": $33, 
+  "u32_to_f32": $34, 
+  "u32_to_f64": $35, 
+  "f32_to_i32": $36, 
+  "f64_to_i32": $37, 
+  "f32_to_u32": $38, 
+  "f64_to_u32": $39, 
+  "i64_to_f32": legalstub$40, 
+  "i64_to_f64": legalstub$41, 
+  "u64_to_f32": legalstub$42, 
+  "u64_to_f64": legalstub$43, 
+  "f32_to_i64": $44, 
+  "f64_to_i64": $45, 
+  "f32_to_u64": $44, 
+  "f64_to_u64": $45
  };
 }
 
diff --git a/test/wasm2js/float_literals-modified.wast b/test/wasm2js/float_literals-modified.wast
index 7ffc0942d..f685ed0bf 100644
--- a/test/wasm2js/float_literals-modified.wast
+++ b/test/wasm2js/float_literals-modified.wast
@@ -11,9 +11,9 @@
   (func (export "f32.misc_nan") (result i32) (i32.reinterpret_f32 (f32.const nan:0x012345)))
   (func (export "f32.misc_positive_nan") (result i32) (i32.reinterpret_f32 (f32.const +nan:0x304050)))
   (func (export "f32.misc_negative_nan") (result i32) (i32.reinterpret_f32 (f32.const -nan:0x2abcde)))
-  (func (export "f32.infinity") (result i32) (i32.reinterpret_f32 (f32.const infinity)))
-  (func (export "f32.positive_infinity") (result i32) (i32.reinterpret_f32 (f32.const +infinity)))
-  (func (export "f32.negative_infinity") (result i32) (i32.reinterpret_f32 (f32.const -infinity)))
+  (func (export "f32.infinity") (result i32) (i32.reinterpret_f32 (f32.const inf)))
+  (func (export "f32.positive_infinity") (result i32) (i32.reinterpret_f32 (f32.const +inf)))
+  (func (export "f32.negative_infinity") (result i32) (i32.reinterpret_f32 (f32.const -inf)))
 
   ;; f32 numbers
   (func (export "f32.zero") (result i32) (i32.reinterpret_f32 (f32.const 0x0.0p0)))
@@ -47,9 +47,9 @@
   (func (export "f64.misc_nan") (result i64) (i64.reinterpret_f64 (f64.const nan:0x0123456789abc)))
   (func (export "f64.misc_positive_nan") (result i64) (i64.reinterpret_f64 (f64.const +nan:0x3040506070809)))
   (func (export "f64.misc_negative_nan") (result i64) (i64.reinterpret_f64 (f64.const -nan:0x2abcdef012345)))
-  (func (export "f64.infinity") (result i64) (i64.reinterpret_f64 (f64.const infinity)))
-  (func (export "f64.positive_infinity") (result i64) (i64.reinterpret_f64 (f64.const +infinity)))
-  (func (export "f64.negative_infinity") (result i64) (i64.reinterpret_f64 (f64.const -infinity)))
+  (func (export "f64.infinity") (result i64) (i64.reinterpret_f64 (f64.const inf)))
+  (func (export "f64.positive_infinity") (result i64) (i64.reinterpret_f64 (f64.const +inf)))
+  (func (export "f64.negative_infinity") (result i64) (i64.reinterpret_f64 (f64.const -inf)))
 
   ;; f64 numbers
   (func (export "f64.zero") (result i64) (i64.reinterpret_f64 (f64.const 0x0.0p0)))
diff --git a/test/wasm2js/func-ptr-offset.2asm.js b/test/wasm2js/func-ptr-offset.2asm.js
index e9179426a..dcac8386e 100644
--- a/test/wasm2js/func-ptr-offset.2asm.js
+++ b/test/wasm2js/func-ptr-offset.2asm.js
@@ -22,14 +22,14 @@ function asmFunc(imports) {
   return 3 | 0;
  }
  
- function $3($0) {
-  $0 = $0 | 0;
-  return FUNCTION_TABLE[$0 | 0]() | 0 | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return FUNCTION_TABLE[$0_1 | 0]() | 0 | 0;
  }
  
  var FUNCTION_TABLE = [null, t1, t2, t3];
  return {
-  "call": $3
+  "call": $0
  };
 }
 
diff --git a/test/wasm2js/func-ptr-offset.2asm.js.opt b/test/wasm2js/func-ptr-offset.2asm.js.opt
index 328afa2d5..e5ad86908 100644
--- a/test/wasm2js/func-ptr-offset.2asm.js.opt
+++ b/test/wasm2js/func-ptr-offset.2asm.js.opt
@@ -22,14 +22,14 @@ function asmFunc(imports) {
   return 3;
  }
  
- function $3($0) {
-  $0 = $0 | 0;
-  return FUNCTION_TABLE[$0 | 0]() | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return FUNCTION_TABLE[$0_1 | 0]() | 0;
  }
  
  var FUNCTION_TABLE = [null, t1, t2, t3];
  return {
-  "call": $3
+  "call": $0
  };
 }
 
diff --git a/test/wasm2js/func-ptr-offset.wast b/test/wasm2js/func-ptr-offset.wast
index 601cb67a4..61b6ab6f8 100644
--- a/test/wasm2js/func-ptr-offset.wast
+++ b/test/wasm2js/func-ptr-offset.wast
@@ -8,7 +8,7 @@
   (func $t3 (type $T) (i32.const 3))
 
   (func (export "call") (param i32) (result i32)
-    (call_indirect (type $T) (local.get $0))
+    (call_indirect (type $T) (local.get 0))
   )
 )
 
diff --git a/test/wasm2js/func_ptrs.2asm.js b/test/wasm2js/func_ptrs.2asm.js
index 4b7c4fd44..3e5c82e78 100644
--- a/test/wasm2js/func_ptrs.2asm.js
+++ b/test/wasm2js/func_ptrs.2asm.js
@@ -13,30 +13,30 @@ function asmFunc(imports) {
  var Math_sqrt = Math.sqrt;
  var spectest = imports.spectest;
  var print = spectest.print_i32;
- function $3() {
+ function $2() {
   return 13 | 0;
  }
  
- function $4($0) {
+ function $3($0) {
   $0 = $0 | 0;
   return $0 + 1 | 0 | 0;
  }
  
- function $5(a) {
+ function $4(a) {
   a = a | 0;
   return a - 2 | 0 | 0;
  }
  
- function $6($0) {
+ function $5($0) {
   $0 = $0 | 0;
   print($0 | 0);
  }
  
  return {
-  "one": $3, 
-  "two": $4, 
-  "three": $5, 
-  "four": $6
+  "one": $2, 
+  "two": $3, 
+  "three": $4, 
+  "four": $5
  };
 }
 
@@ -79,20 +79,20 @@ function asmFunc(imports) {
   return 5 | 0;
  }
  
- function $5(i) {
+ function $0(i) {
   i = i | 0;
   return FUNCTION_TABLE[i | 0]() | 0 | 0;
  }
  
- function $6(i) {
+ function $1(i) {
   i = i | 0;
   return FUNCTION_TABLE[i | 0]() | 0 | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2, t3, u1, u2, t1, t3];
  return {
-  "callt": $5, 
-  "callu": $6
+  "callt": $0, 
+  "callu": $1
  };
 }
 
@@ -120,14 +120,14 @@ function asmFunc(imports) {
   return 2 | 0;
  }
  
- function $2(i) {
+ function $0(i) {
   i = i | 0;
   return FUNCTION_TABLE[i | 0]() | 0 | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2];
  return {
-  "callt": $2
+  "callt": $0
  };
 }
 
diff --git a/test/wasm2js/get-set-local.2asm.js b/test/wasm2js/get-set-local.2asm.js
index 903321282..9712ee38e 100644
--- a/test/wasm2js/get-set-local.2asm.js
+++ b/test/wasm2js/get-set-local.2asm.js
@@ -10,8 +10,8 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, r, r$hi) {
-  $0 = $0 | 0;
+ function $0($0_1, r, r$hi) {
+  $0_1 = $0_1 | 0;
   r = r | 0;
   r$hi = r$hi | 0;
   var i64toi32_i32$0 = 0, $9$hi = 0;
@@ -20,17 +20,17 @@ function asmFunc(imports) {
   $9$hi = i64toi32_i32$0;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$0 = $9$hi;
-  return ($0 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (r$hi | 0) | 0 | 0;
+  return ($0_1 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (r$hi | 0) | 0 | 0;
  }
  
- function legalstub$1($0, $1_1, $2) {
-  $0 = $0 | 0;
-  $1_1 = $1_1 | 0;
+ function legalstub$0($0_1, $1, $2) {
+  $0_1 = $0_1 | 0;
+  $1 = $1 | 0;
   $2 = $2 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $12 = 0, $3 = 0, $5 = 0, $5$hi = 0, $8$hi = 0;
-  $3 = $0;
+  $3 = $0_1;
   i64toi32_i32$0 = 0;
-  $5 = $1_1;
+  $5 = $1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $2;
@@ -50,11 +50,11 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $1($3 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $0($3 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  return {
-  "check_extend_ui32": legalstub$1
+  "check_extend_ui32": legalstub$0
  };
 }
 
diff --git a/test/wasm2js/get-set-local.2asm.js.opt b/test/wasm2js/get-set-local.2asm.js.opt
index e6c9a2844..208f50343 100644
--- a/test/wasm2js/get-set-local.2asm.js.opt
+++ b/test/wasm2js/get-set-local.2asm.js.opt
@@ -10,12 +10,12 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function legalstub$1($0, $1, $2) {
+ function legalstub$0($0, $1, $2) {
   return !$2 & ($0 | 0) == ($1 | 0);
  }
  
  return {
-  "check_extend_ui32": legalstub$1
+  "check_extend_ui32": legalstub$0
  };
 }
 
diff --git a/test/wasm2js/i64-add-sub.2asm.js b/test/wasm2js/i64-add-sub.2asm.js
index a5654efcc..419b96e39 100644
--- a/test/wasm2js/i64-add-sub.2asm.js
+++ b/test/wasm2js/i64-add-sub.2asm.js
@@ -10,8 +10,8 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, $0$hi, $1_1, $1$hi, r, r$hi) {
-  $0 = $0 | 0;
+ function $0($0_1, $0$hi, $1_1, $1$hi, r, r$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -19,7 +19,7 @@ function asmFunc(imports) {
   r$hi = r$hi | 0;
   var i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, $5$hi = 0;
   i64toi32_i32$3 = $1_1;
-  i64toi32_i32$4 = $0 + i64toi32_i32$3 | 0;
+  i64toi32_i32$4 = $0_1 + i64toi32_i32$3 | 0;
   i64toi32_i32$5 = $0$hi + $1$hi | 0;
   if (i64toi32_i32$4 >>> 0 < i64toi32_i32$3 >>> 0) {
    i64toi32_i32$5 = i64toi32_i32$5 + 1 | 0
@@ -31,8 +31,8 @@ function asmFunc(imports) {
   return (i64toi32_i32$4 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$5 | 0) == (r$hi | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, $1_1, $1$hi, r, r$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi, $1_1, $1$hi, r, r$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -42,7 +42,7 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$3 = $1_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;
@@ -55,16 +55,16 @@ function asmFunc(imports) {
   return (i64toi32_i32$0 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$5 | 0) == (i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$1($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$0($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -87,7 +87,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -135,19 +135,19 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $0($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -170,7 +170,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -218,12 +218,12 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $2($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  return {
-  "check_add_i64": legalstub$1, 
-  "check_sub_i64": legalstub$2
+  "check_add_i64": legalstub$0, 
+  "check_sub_i64": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/i64-add-sub.2asm.js.opt b/test/wasm2js/i64-add-sub.2asm.js.opt
index 4c3f55617..f2e5367fb 100644
--- a/test/wasm2js/i64-add-sub.2asm.js.opt
+++ b/test/wasm2js/i64-add-sub.2asm.js.opt
@@ -10,20 +10,20 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function legalstub$1($0, $1, $2, $3, $4, $5) {
+ function legalstub$0($0, $1, $2, $3, $4, $5) {
   $1 = $1 + $3 | 0;
   $0 = $0 + $2 | 0;
   $1 = $2 >>> 0 > $0 >>> 0 ? $1 + 1 | 0 : $1;
   return ($0 | 0) == ($4 | 0) & ($1 | 0) == ($5 | 0);
  }
  
- function legalstub$2($0, $1, $2, $3, $4, $5) {
+ function legalstub$1($0, $1, $2, $3, $4, $5) {
   return ($4 | 0) == ($0 - $2 | 0) & ($5 | 0) == ($1 - (($0 >>> 0 < $2 >>> 0) + $3 | 0) | 0);
  }
  
  return {
-  "check_add_i64": legalstub$1, 
-  "check_sub_i64": legalstub$2
+  "check_add_i64": legalstub$0, 
+  "check_sub_i64": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/i64-lowering.2asm.js b/test/wasm2js/i64-lowering.2asm.js
index 2679293f9..3462a6dc9 100644
--- a/test/wasm2js/i64-lowering.2asm.js
+++ b/test/wasm2js/i64-lowering.2asm.js
@@ -10,8 +10,8 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $0($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -19,11 +19,11 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return ($0 | 0) == ($1_1 | 0) & (i64toi32_i32$0 | 0) == ($1$hi | 0) | 0 | 0;
+  return ($0_1 | 0) == ($1_1 | 0) & (i64toi32_i32$0 | 0) == ($1$hi | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -31,19 +31,19 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return ($0 | 0) != ($1_1 | 0) | (i64toi32_i32$0 | 0) != ($1$hi | 0) | 0 | 0;
+  return ($0_1 | 0) != ($1_1 | 0) | (i64toi32_i32$0 | 0) != ($1$hi | 0) | 0 | 0;
  }
  
- function $3($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $2($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
+  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) > ($1$hi | 0)) {
@@ -55,25 +55,25 @@ function asmFunc(imports) {
     } else {
      $9_1 = 1
     }
-    $10_1 = $9_1;
+    $10 = $9_1;
    } else {
-    $10_1 = 0
+    $10 = 0
    }
-   $8_1 = $10_1;
+   $8_1 = $10;
   }
   return $8_1 | 0;
  }
  
- function $4($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $3($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
+  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) > ($1$hi | 0)) {
@@ -85,25 +85,25 @@ function asmFunc(imports) {
     } else {
      $9_1 = 1
     }
-    $10_1 = $9_1;
+    $10 = $9_1;
    } else {
-    $10_1 = 0
+    $10 = 0
    }
-   $8_1 = $10_1;
+   $8_1 = $10;
   }
   return $8_1 | 0;
  }
  
- function $5($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $4($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
+  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) < ($1$hi | 0)) {
@@ -115,25 +115,25 @@ function asmFunc(imports) {
     } else {
      $9_1 = 1
     }
-    $10_1 = $9_1;
+    $10 = $9_1;
    } else {
-    $10_1 = 0
+    $10 = 0
    }
-   $8_1 = $10_1;
+   $8_1 = $10;
   }
   return $8_1 | 0;
  }
  
- function $6($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $5($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
+  var i64toi32_i32$0 = 0, $8_1 = 0, $9_1 = 0, $10 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) < ($1$hi | 0)) {
@@ -145,17 +145,17 @@ function asmFunc(imports) {
     } else {
      $9_1 = 1
     }
-    $10_1 = $9_1;
+    $10 = $9_1;
    } else {
-    $10_1 = 0
+    $10 = 0
    }
-   $8_1 = $10_1;
+   $8_1 = $10;
   }
   return $8_1 | 0;
  }
  
- function $7($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $6($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -163,11 +163,11 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 >= $1_1 >>> 0 | 0) | 0 | 0;
+  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0_1 >>> 0 >= $1_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $8($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $7($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -175,11 +175,11 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 > $1_1 >>> 0 | 0) | 0 | 0;
+  return i64toi32_i32$0 >>> 0 > $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0_1 >>> 0 > $1_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $9($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $8($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -187,11 +187,11 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 <= $1_1 >>> 0 | 0) | 0 | 0;
+  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0_1 >>> 0 <= $1_1 >>> 0 | 0) | 0 | 0;
  }
  
- function $10($0, $0$hi, $1_1, $1$hi) {
-  $0 = $0 | 0;
+ function $9($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
@@ -199,17 +199,17 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0 >>> 0 < $1_1 >>> 0 | 0) | 0 | 0;
+  return i64toi32_i32$0 >>> 0 < $1$hi >>> 0 | ((i64toi32_i32$0 | 0) == ($1$hi | 0) & $0_1 >>> 0 < $1_1 >>> 0 | 0) | 0 | 0;
  }
  
- function legalstub$1($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$0($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -256,17 +256,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $1($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $0($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -313,17 +313,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $2($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$3($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$2($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -370,17 +370,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $3($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $2($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$4($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$3($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -427,17 +427,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $4($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $3($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$5($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$4($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -484,17 +484,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $5($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $4($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$6($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$5($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -541,17 +541,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $6($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $5($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$7($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$6($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -598,17 +598,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $7($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $6($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$8($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$7($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -655,17 +655,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $8($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $7($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$9($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$8($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -712,17 +712,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $9($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $8($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$10($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$9($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -769,20 +769,20 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $10($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $9($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  return {
-  "eq_i64": legalstub$1, 
-  "ne_i64": legalstub$2, 
-  "ge_s_i64": legalstub$3, 
-  "gt_s_i64": legalstub$4, 
-  "le_s_i64": legalstub$5, 
-  "lt_s_i64": legalstub$6, 
-  "ge_u_i64": legalstub$7, 
-  "gt_u_i64": legalstub$8, 
-  "le_u_i64": legalstub$9, 
-  "lt_u_i64": legalstub$10
+  "eq_i64": legalstub$0, 
+  "ne_i64": legalstub$1, 
+  "ge_s_i64": legalstub$2, 
+  "gt_s_i64": legalstub$3, 
+  "le_s_i64": legalstub$4, 
+  "lt_s_i64": legalstub$5, 
+  "ge_u_i64": legalstub$6, 
+  "gt_u_i64": legalstub$7, 
+  "le_u_i64": legalstub$8, 
+  "lt_u_i64": legalstub$9
  };
 }
 
diff --git a/test/wasm2js/i64-lowering.2asm.js.opt b/test/wasm2js/i64-lowering.2asm.js.opt
index 9c8b6e38c..8deb524fc 100644
--- a/test/wasm2js/i64-lowering.2asm.js.opt
+++ b/test/wasm2js/i64-lowering.2asm.js.opt
@@ -10,57 +10,57 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function legalstub$1($0, $1, $2, $3) {
+ function legalstub$0($0, $1, $2, $3) {
   return ($0 | 0) == ($2 | 0) & ($1 | 0) == ($3 | 0);
  }
  
- function legalstub$2($0, $1, $2, $3) {
+ function legalstub$1($0, $1, $2, $3) {
   return ($0 | 0) != ($2 | 0) | ($1 | 0) != ($3 | 0);
  }
  
- function legalstub$3($0, $1, $2, $3) {
+ function legalstub$2($0, $1, $2, $3) {
   return ($1 | 0) >= ($3 | 0) & $0 >>> 0 >= $2 >>> 0 | ($1 | 0) > ($3 | 0);
  }
  
- function legalstub$4($0, $1, $2, $3) {
+ function legalstub$3($0, $1, $2, $3) {
   return $0 >>> 0 > $2 >>> 0 & ($1 | 0) >= ($3 | 0) | ($1 | 0) > ($3 | 0);
  }
  
- function legalstub$5($0, $1, $2, $3) {
+ function legalstub$4($0, $1, $2, $3) {
   return ($1 | 0) <= ($3 | 0) & $0 >>> 0 <= $2 >>> 0 | ($1 | 0) < ($3 | 0);
  }
  
- function legalstub$6($0, $1, $2, $3) {
+ function legalstub$5($0, $1, $2, $3) {
   return $0 >>> 0 < $2 >>> 0 & ($1 | 0) <= ($3 | 0) | ($1 | 0) < ($3 | 0);
  }
  
- function legalstub$7($0, $1, $2, $3) {
+ function legalstub$6($0, $1, $2, $3) {
   return ($1 | 0) == ($3 | 0) & $0 >>> 0 >= $2 >>> 0 | $1 >>> 0 > $3 >>> 0;
  }
  
- function legalstub$8($0, $1, $2, $3) {
+ function legalstub$7($0, $1, $2, $3) {
   return ($1 | 0) == ($3 | 0) & $0 >>> 0 > $2 >>> 0 | $1 >>> 0 > $3 >>> 0;
  }
  
- function legalstub$9($0, $1, $2, $3) {
+ function legalstub$8($0, $1, $2, $3) {
   return ($1 | 0) == ($3 | 0) & $0 >>> 0 <= $2 >>> 0 | $1 >>> 0 < $3 >>> 0;
  }
  
- function legalstub$10($0, $1, $2, $3) {
+ function legalstub$9($0, $1, $2, $3) {
   return ($1 | 0) == ($3 | 0) & $0 >>> 0 < $2 >>> 0 | $1 >>> 0 < $3 >>> 0;
  }
  
  return {
-  "eq_i64": legalstub$1, 
-  "ne_i64": legalstub$2, 
-  "ge_s_i64": legalstub$3, 
-  "gt_s_i64": legalstub$4, 
-  "le_s_i64": legalstub$5, 
-  "lt_s_i64": legalstub$6, 
-  "ge_u_i64": legalstub$7, 
-  "gt_u_i64": legalstub$8, 
-  "le_u_i64": legalstub$9, 
-  "lt_u_i64": legalstub$10
+  "eq_i64": legalstub$0, 
+  "ne_i64": legalstub$1, 
+  "ge_s_i64": legalstub$2, 
+  "gt_s_i64": legalstub$3, 
+  "le_s_i64": legalstub$4, 
+  "lt_s_i64": legalstub$5, 
+  "ge_u_i64": legalstub$6, 
+  "gt_u_i64": legalstub$7, 
+  "le_u_i64": legalstub$8, 
+  "lt_u_i64": legalstub$9
  };
 }
 
diff --git a/test/wasm2js/i64-rotate.2asm.js b/test/wasm2js/i64-rotate.2asm.js
index ccdb6497e..81f716e7d 100644
--- a/test/wasm2js/i64-rotate.2asm.js
+++ b/test/wasm2js/i64-rotate.2asm.js
@@ -11,60 +11,60 @@ function asmFunc(imports) {
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
  var i64toi32_i32$HIGH_BITS = 0;
- function $1($0, $0$hi, $1_1, $1$hi, $2_1, $2$hi) {
-  $0 = $0 | 0;
+ function $0($0_1, $0$hi, $1_1, $1$hi, $2, $2$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $2$hi = $2$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $5$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_rotl_i64($0 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_rotl_i64($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $2$hi;
   i64toi32_i32$0 = $5$hi;
   i64toi32_i32$2 = i64toi32_i32$1;
   i64toi32_i32$1 = $2$hi;
-  return (i64toi32_i32$2 | 0) == ($2_1 | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
+  return (i64toi32_i32$2 | 0) == ($2 | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, $1_1, $1$hi, $2_1, $2$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi, $1_1, $1$hi, $2, $2$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $2$hi = $2$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $5$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_rotr_i64($0 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_rotr_i64($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $2$hi;
   i64toi32_i32$0 = $5$hi;
   i64toi32_i32$2 = i64toi32_i32$1;
   i64toi32_i32$1 = $2$hi;
-  return (i64toi32_i32$2 | 0) == ($2_1 | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
+  return (i64toi32_i32$2 | 0) == ($2 | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
  }
  
- function legalstub$1($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$0($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -87,7 +87,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -135,19 +135,19 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $0($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -170,7 +170,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -218,7 +218,7 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $2($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  function __wasm_rotl_i64(var$0, var$0$hi, var$1, var$1$hi) {
@@ -434,8 +434,8 @@ function asmFunc(imports) {
  }
  
  return {
-  "rotl": legalstub$1, 
-  "rotr": legalstub$2
+  "rotl": legalstub$0, 
+  "rotr": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/i64-rotate.2asm.js.opt b/test/wasm2js/i64-rotate.2asm.js.opt
index 69069f0e5..c4023b900 100644
--- a/test/wasm2js/i64-rotate.2asm.js.opt
+++ b/test/wasm2js/i64-rotate.2asm.js.opt
@@ -11,7 +11,7 @@ function asmFunc(imports) {
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
  var i64toi32_i32$HIGH_BITS = 0;
- function legalstub$1($0, $1, $2, $3, $4, $5) {
+ function legalstub$0($0, $1, $2, $3, $4, $5) {
   var $6 = 0, $7 = 0, $8 = 0;
   $8 = $0;
   $0 = 0;
@@ -59,7 +59,7 @@ function asmFunc(imports) {
   return ($0 | 0) == ($4 | 0) & ($5 | 0) == (i64toi32_i32$HIGH_BITS | 0);
  }
  
- function legalstub$2($0, $1, $2, $3, $4, $5) {
+ function legalstub$1($0, $1, $2, $3, $4, $5) {
   var $6 = 0, $7 = 0, $8 = 0, $9 = 0;
   $8 = $0;
   $7 = $2 & 63;
@@ -108,8 +108,8 @@ function asmFunc(imports) {
  }
  
  return {
-  "rotl": legalstub$1, 
-  "rotr": legalstub$2
+  "rotl": legalstub$0, 
+  "rotr": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/i64-shifts.2asm.js b/test/wasm2js/i64-shifts.2asm.js
index 1a3a272be..82018a8e2 100644
--- a/test/wasm2js/i64-shifts.2asm.js
+++ b/test/wasm2js/i64-shifts.2asm.js
@@ -10,18 +10,18 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0, $0$hi, $1_1, $1$hi, $2_1, $2$hi) {
-  $0 = $0 | 0;
+ function $0($0_1, $0$hi, $1_1, $1$hi, $2, $2$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $2$hi = $2$hi | 0;
   var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $12 = 0, $5$hi = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -37,22 +37,22 @@ function asmFunc(imports) {
   i64toi32_i32$1 = $5$hi;
   i64toi32_i32$0 = $12;
   i64toi32_i32$2 = $2$hi;
-  i64toi32_i32$3 = $2_1;
+  i64toi32_i32$3 = $2;
   return (i64toi32_i32$0 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$1 | 0) == (i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, $1_1, $1$hi, $2_1, $2$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi, $1_1, $1$hi, $2, $2$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $2$hi = $2$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, i64toi32_i32$2 = 0, $12 = 0, $5$hi = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
   i64toi32_i32$3 = $1_1;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
@@ -68,20 +68,20 @@ function asmFunc(imports) {
   i64toi32_i32$1 = $5$hi;
   i64toi32_i32$0 = $12;
   i64toi32_i32$2 = $2$hi;
-  i64toi32_i32$3 = $2_1;
+  i64toi32_i32$3 = $2;
   return (i64toi32_i32$0 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$1 | 0) == ($2$hi | 0) | 0 | 0;
  }
  
- function legalstub$1($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$0($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -104,7 +104,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -152,19 +152,19 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $0($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1, $2_1, $3, $4, $5) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1, $2, $3, $4, $5) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
-  $2_1 = $2_1 | 0;
+  $2 = $2 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
   $5 = $5 | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $26 = 0, $27 = 0, $28 = 0, $7 = 0, $7$hi = 0, $10$hi = 0, $11 = 0, $11$hi = 0, $13 = 0, $13$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $19 = 0, $19$hi = 0, $22$hi = 0, $23 = 0, $23$hi = 0;
   i64toi32_i32$0 = 0;
-  $7 = $0;
+  $7 = $0_1;
   $7$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -187,7 +187,7 @@ function asmFunc(imports) {
   $11 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $11$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
-  $13 = $2_1;
+  $13 = $2;
   $13$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $3;
@@ -235,12 +235,12 @@ function asmFunc(imports) {
   i64toi32_i32$0 = $11$hi;
   i64toi32_i32$1 = $17$hi;
   i64toi32_i32$2 = $23$hi;
-  return $2($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1($11 | 0, i64toi32_i32$0 | 0, $17 | 0, i64toi32_i32$1 | 0, $23 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  return {
-  "shl_i64": legalstub$1, 
-  "shr_i64": legalstub$2
+  "shl_i64": legalstub$0, 
+  "shr_i64": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/i64-shifts.2asm.js.opt b/test/wasm2js/i64-shifts.2asm.js.opt
index d7224dd8c..1b6712a82 100644
--- a/test/wasm2js/i64-shifts.2asm.js.opt
+++ b/test/wasm2js/i64-shifts.2asm.js.opt
@@ -10,7 +10,7 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function legalstub$1($0, $1, $2, $3, $4, $5) {
+ function legalstub$0($0, $1, $2, $3, $4, $5) {
   $3 = $0;
   $0 = $2 & 31;
   if (($2 & 63) >>> 0 >= 32) {
@@ -23,7 +23,7 @@ function asmFunc(imports) {
   return ($0 | 0) == ($4 | 0) & ($1 | 0) == ($5 | 0);
  }
  
- function legalstub$2($0, $1, $2, $3, $4, $5) {
+ function legalstub$1($0, $1, $2, $3, $4, $5) {
   $3 = $0;
   $0 = $2 & 31;
   if (($2 & 63) >>> 0 >= 32) {
@@ -37,8 +37,8 @@ function asmFunc(imports) {
  }
  
  return {
-  "shl_i64": legalstub$1, 
-  "shr_i64": legalstub$2
+  "shl_i64": legalstub$0, 
+  "shr_i64": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/labels.2asm.js b/test/wasm2js/labels.2asm.js
index 3226a81a8..ac2978300 100644
--- a/test/wasm2js/labels.2asm.js
+++ b/test/wasm2js/labels.2asm.js
@@ -100,12 +100,12 @@ function asmFunc(imports) {
  
  function $6() {
   var $2_1 = 0;
-  loop_in : while (1) {
+  label : while (1) {
    if (0) {
-    continue loop_in
+    continue label
    }
    $2_1 = 3;
-   break loop_in;
+   break label;
   };
   return $2_1 | 0;
  }
@@ -117,6 +117,10 @@ function asmFunc(imports) {
    break l;
   }
   i = i + 1 | 0;
+  l0 : {
+   break l0;
+  }
+  i = i + 1 | 0;
   l1 : {
    break l1;
   }
@@ -129,34 +133,30 @@ function asmFunc(imports) {
    break l3;
   }
   i = i + 1 | 0;
-  l4 : {
-   break l4;
-  }
-  i = i + 1 | 0;
   return i | 0;
  }
  
  function $8() {
   var i = 0;
   i = 0;
-  if_ : {
-   break if_;
+  label : {
+   break label;
   }
   i = i + 1 | 0;
-  if5 : {
-   break if5;
+  label0 : {
+   break label0;
   }
   i = i + 1 | 0;
-  if6 : {
-   break if6;
+  label1 : {
+   break label1;
   }
   i = i + 1 | 0;
-  if7 : {
-   break if7;
+  label2 : {
+   break label2;
   }
   i = i + 1 | 0;
-  if8 : {
-   break if8;
+  label3 : {
+   break label3;
   }
   i = i + 1 | 0;
   return i | 0;
@@ -305,9 +305,9 @@ function asmFunc(imports) {
   var $1_1 = 0, $2_1 = 0;
   l1 : {
    $1_1 = 2;
-   l113 : {
+   l11 : {
     $2_1 = 3;
-    break l113;
+    break l11;
    }
   }
   return $1_1 + $2_1 | 0 | 0;
diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js
index 0ee715b2d..6553cbc11 100644
--- a/test/wasm2js/left-to-right.2asm.js
+++ b/test/wasm2js/left-to-right.2asm.js
@@ -49,55 +49,55 @@ function asmFunc(imports) {
  var __wasm_intrinsics_temp_i64 = 0;
  var __wasm_intrinsics_temp_i64$hi = 0;
  var i64toi32_i32$HIGH_BITS = 0;
- function i32_t0($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
+ function i32_t0($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
   return -1 | 0;
  }
  
- function i32_t1($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
+ function i32_t1($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
   return -2 | 0;
  }
  
- function i64_t0($0, $0$hi, $1, $1$hi) {
-  $0 = $0 | 0;
+ function i64_t0($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
-  $1 = $1 | 0;
+  $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
   return -1 | 0;
  }
  
- function i64_t1($0, $0$hi, $1, $1$hi) {
-  $0 = $0 | 0;
+ function i64_t1($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
-  $1 = $1 | 0;
+  $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
   return -2 | 0;
  }
  
- function f32_t0($0, $1) {
-  $0 = Math_fround($0);
-  $1 = Math_fround($1);
+ function f32_t0($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
+  $1_1 = Math_fround($1_1);
   return -1 | 0;
  }
  
- function f32_t1($0, $1) {
-  $0 = Math_fround($0);
-  $1 = Math_fround($1);
+ function f32_t1($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
+  $1_1 = Math_fround($1_1);
   return -2 | 0;
  }
  
- function f64_t0($0, $1) {
-  $0 = +$0;
-  $1 = +$1;
+ function f64_t0($0_1, $1_1) {
+  $0_1 = +$0_1;
+  $1_1 = +$1_1;
   return -1 | 0;
  }
  
- function f64_t1($0, $1) {
-  $0 = +$0;
-  $1 = +$1;
+ function f64_t1($0_1, $1_1) {
+  $0_1 = +$0_1;
+  $1_1 = +$1_1;
   return -2 | 0;
  }
  
@@ -218,220 +218,220 @@ function asmFunc(imports) {
   return 0 | 0;
  }
  
- function i32_dummy($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
+ function i32_dummy($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
+  $1_1 = $1_1 | 0;
  }
  
- function i64_dummy($0, $0$hi, $1, $1$hi) {
-  $0 = $0 | 0;
+ function i64_dummy($0_1, $0$hi, $1_1, $1$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
-  $1 = $1 | 0;
+  $1_1 = $1_1 | 0;
   $1$hi = $1$hi | 0;
  }
  
- function f32_dummy($0, $1) {
-  $0 = Math_fround($0);
-  $1 = Math_fround($1);
+ function f32_dummy($0_1, $1_1) {
+  $0_1 = Math_fround($0_1);
+  $1_1 = Math_fround($1_1);
  }
  
- function f64_dummy($0, $1) {
-  $0 = +$0;
-  $1 = +$1;
+ function f64_dummy($0_1, $1_1) {
+  $0_1 = +$0_1;
+  $1_1 = +$1_1;
  }
  
- function $35() {
+ function $0() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $36() {
+ function $1() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $37() {
+ function $2() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $38() {
+ function $3() {
   reset();
   (i32_left() | 0 | 0) / (i32_right() | 0 | 0) | 0;
   return get() | 0 | 0;
  }
  
- function $39() {
+ function $4() {
   reset();
   ((i32_left() | 0) >>> 0) / ((i32_right() | 0) >>> 0) | 0;
   return get() | 0 | 0;
  }
  
- function $40() {
+ function $5() {
   reset();
   (i32_left() | 0 | 0) % (i32_right() | 0 | 0) | 0;
   return get() | 0 | 0;
  }
  
- function $41() {
+ function $6() {
   reset();
   ((i32_left() | 0) >>> 0) % ((i32_right() | 0) >>> 0) | 0;
   return get() | 0 | 0;
  }
  
- function $42() {
+ function $7() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $43() {
+ function $8() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $44() {
+ function $9() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $45() {
+ function $10() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $46() {
+ function $11() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $47() {
+ function $12() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $48() {
+ function $13() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $49() {
+ function $14() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $50() {
+ function $15() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $51() {
+ function $16() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $52() {
+ function $17() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $53() {
+ function $18() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $54() {
+ function $19() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $55() {
+ function $20() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $56() {
+ function $21() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $57() {
+ function $22() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
   return get() | 0 | 0;
  }
  
- function $58() {
+ function $23() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i32_right() | 0), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $59() {
+ function $24() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i32_right() | 0), HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $60() {
+ function $25() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i32_right() | 0), HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $61() {
+ function $26() {
   reset();
   i32_dummy(i32_left() | 0 | 0, i32_right() | 0 | 0);
   return get() | 0 | 0;
  }
  
- function $62() {
+ function $27() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   reset();
   ((wasm2js_i32$1 = i32_left() | 0, wasm2js_i32$2 = i32_right() | 0), wasm2js_i32$0 = i32_callee() | 0 | 0), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0;
   return get() | 0 | 0;
  }
  
- function $63() {
+ function $28() {
   reset();
   i32_left() | 0;
   i32_right() | 0;
@@ -439,21 +439,21 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $64() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $29() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, i64toi32_i32$4 = 0, i64toi32_i32$5 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
-  i64toi32_i32$4 = $0 + i64toi32_i32$3 | 0;
+  i64toi32_i32$3 = $1_1;
+  i64toi32_i32$4 = $0_1 + i64toi32_i32$3 | 0;
   i64toi32_i32$5 = i64toi32_i32$0 + i64toi32_i32$1 | 0;
   if (i64toi32_i32$4 >>> 0 < i64toi32_i32$3 >>> 0) {
    i64toi32_i32$5 = i64toi32_i32$5 + 1 | 0
@@ -461,126 +461,126 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $65() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$5 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $30() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$5 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   i64toi32_i32$5 = (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) + i64toi32_i32$1 | 0;
   i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
   return get() | 0 | 0;
  }
  
- function $66() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $31() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_i64_mul($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_mul($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   return get() | 0 | 0;
  }
  
- function $67() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $32() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_i64_sdiv($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_sdiv($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   return get() | 0 | 0;
  }
  
- function $68() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $33() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_i64_udiv($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_udiv($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   return get() | 0 | 0;
  }
  
- function $69() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $34() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_i64_srem($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_srem($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   return get() | 0 | 0;
  }
  
- function $70() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $35() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$1 = __wasm_i64_urem($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_urem($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   return get() | 0 | 0;
  }
  
- function $71() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $36() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
@@ -588,16 +588,16 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $72() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $37() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
@@ -605,16 +605,16 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $73() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $38() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
@@ -622,390 +622,390 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $74() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $9 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $39() {
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $9_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-   $9 = 0;
+   $9_1 = 0;
   } else {
    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-   $9 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+   $9_1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
   }
   return get() | 0 | 0;
  }
  
- function $75() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
+ function $40() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = 0;
-   $9 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
+   $9_1 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
-   $9 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
+   $9_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
   return get() | 0 | 0;
  }
  
- function $76() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
+ function $41() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $9_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$0 >> 31 | 0;
-   $9 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
+   $9_1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
-   $9 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
+   $9_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
   return get() | 0 | 0;
  }
  
- function $77() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $42() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $78() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $43() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $79() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8 = 0, $9 = 0, $10 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
+ function $44() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) {
-   $8 = 1
+   $8_1 = 1
   } else {
    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
     if (i64toi32_i32$2 >>> 0 >= i64toi32_i32$3 >>> 0) {
-     $9 = 0
+     $9_1 = 0
     } else {
-     $9 = 1
+     $9_1 = 1
     }
-    $10 = $9;
+    $10_1 = $9_1;
    } else {
-    $10 = 0
+    $10_1 = 0
    }
-   $8 = $10;
+   $8_1 = $10_1;
   }
   return get() | 0 | 0;
  }
  
- function $80() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8 = 0, $9 = 0, $10 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
+ function $45() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) < (i64toi32_i32$1 | 0)) {
-   $8 = 1
+   $8_1 = 1
   } else {
    if ((i64toi32_i32$0 | 0) <= (i64toi32_i32$1 | 0)) {
     if (i64toi32_i32$2 >>> 0 > i64toi32_i32$3 >>> 0) {
-     $9 = 0
+     $9_1 = 0
     } else {
-     $9 = 1
+     $9_1 = 1
     }
-    $10 = $9;
+    $10_1 = $9_1;
    } else {
-    $10 = 0
+    $10_1 = 0
    }
-   $8 = $10;
+   $8_1 = $10_1;
   }
   return get() | 0 | 0;
  }
  
- function $81() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $46() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $82() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $47() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $83() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8 = 0, $9 = 0, $10 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
+ function $48() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) {
-   $8 = 1
+   $8_1 = 1
   } else {
    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
     if (i64toi32_i32$2 >>> 0 <= i64toi32_i32$3 >>> 0) {
-     $9 = 0
+     $9_1 = 0
     } else {
-     $9 = 1
+     $9_1 = 1
     }
-    $10 = $9;
+    $10_1 = $9_1;
    } else {
-    $10 = 0
+    $10_1 = 0
    }
-   $8 = $10;
+   $8_1 = $10_1;
   }
   return get() | 0 | 0;
  }
  
- function $84() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8 = 0, $9 = 0, $10 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
+ function $49() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $8_1 = 0, $9_1 = 0, $10_1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$2 = $0;
+  i64toi32_i32$2 = $0_1;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$3 = $1;
+  i64toi32_i32$3 = $1_1;
   if ((i64toi32_i32$0 | 0) > (i64toi32_i32$1 | 0)) {
-   $8 = 1
+   $8_1 = 1
   } else {
    if ((i64toi32_i32$0 | 0) >= (i64toi32_i32$1 | 0)) {
     if (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) {
-     $9 = 0
+     $9_1 = 0
     } else {
-     $9 = 1
+     $9_1 = 1
     }
-    $10 = $9;
+    $10_1 = $9_1;
    } else {
-    $10 = 0
+    $10_1 = 0
    }
-   $8 = $10;
+   $8_1 = $10_1;
   }
   return get() | 0 | 0;
  }
  
- function $85() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $50() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $86() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $51() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
   return get() | 0 | 0;
  }
  
- function $87() {
-  var i64toi32_i32$0 = 0, $0 = 0, i64toi32_i32$1 = 0, $1 = 0;
+ function $52() {
+  var i64toi32_i32$0 = 0, $0_1 = 0, i64toi32_i32$1 = 0, $1_1 = 0;
   reset();
-  $0 = i32_left() | 0;
+  $0_1 = i32_left() | 0;
   i64toi32_i32$0 = i64_right() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$0;
-  i64toi32_i32$0 = $0;
-  HEAP32[i64toi32_i32$0 >> 2] = $1;
+  $1_1 = i64toi32_i32$0;
+  i64toi32_i32$0 = $0_1;
+  HEAP32[i64toi32_i32$0 >> 2] = $1_1;
   HEAP32[(i64toi32_i32$0 + 4 | 0) >> 2] = i64toi32_i32$1;
   return get() | 0 | 0;
  }
  
- function $88() {
+ function $53() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i64_right() | 0), HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $89() {
+ function $54() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i64_right() | 0), HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $90() {
+ function $55() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i64_right() | 0), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
- function $91() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $56() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64_dummy($0 | 0, i64toi32_i32$0 | 0, $1 | 0, i64toi32_i32$1 | 0);
+  i64_dummy($0_1 | 0, i64toi32_i32$0 | 0, $1_1 | 0, i64toi32_i32$1 | 0);
   return get() | 0 | 0;
  }
  
- function $92() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+ function $57() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  FUNCTION_TABLE[i64_callee() | 0 | 0]($0, i64toi32_i32$0, $1, i64toi32_i32$1) | 0;
+  FUNCTION_TABLE[i64_callee() | 0 | 0]($0_1, i64toi32_i32$0, $1_1, i64toi32_i32$1) | 0;
   return get() | 0 | 0;
  }
  
- function $93() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0, i64toi32_i32$4 = 0;
+ function $58() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0_1 = 0, $0$hi = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$4 = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
-  $0 = i64toi32_i32$0;
+  $0_1 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = i64_right() | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  $1 = i64toi32_i32$1;
+  $1_1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$4 = i64_bool() | 0;
   i64toi32_i32$0 = $0$hi;
@@ -1013,118 +1013,118 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $94() {
+ function $59() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $95() {
+ function $60() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $96() {
+ function $61() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $97() {
+ function $62() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $98() {
+ function $63() {
   reset();
   (wasm2js_scratch_store_f32(Math_fround(f32_left())), wasm2js_scratch_load_i32(2)) & 2147483647 | 0;
   (wasm2js_scratch_store_f32(Math_fround(f32_right())), wasm2js_scratch_load_i32(2)) & -2147483648 | 0;
   return get() | 0 | 0;
  }
  
- function $99() {
+ function $64() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $100() {
+ function $65() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $101() {
+ function $66() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $102() {
+ function $67() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $103() {
+ function $68() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $104() {
+ function $69() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $105() {
+ function $70() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $106() {
+ function $71() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
   return get() | 0 | 0;
  }
  
- function $107() {
+ function $72() {
   var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0);
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_f32$0 = Math_fround(f32_right())), HEAPF32[wasm2js_i32$0 >> 2] = wasm2js_f32$0;
   return get() | 0 | 0;
  }
  
- function $108() {
+ function $73() {
   reset();
   f32_dummy(Math_fround(Math_fround(f32_left())), Math_fround(Math_fround(f32_right())));
   return get() | 0 | 0;
  }
  
- function $109() {
+ function $74() {
   var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0), wasm2js_f32$1 = Math_fround(0);
   reset();
   ((wasm2js_f32$0 = Math_fround(f32_left()), wasm2js_f32$1 = Math_fround(f32_right())), wasm2js_i32$0 = f32_callee() | 0 | 0), FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$0), Math_fround(wasm2js_f32$1)) | 0;
   return get() | 0 | 0;
  }
  
- function $110() {
+ function $75() {
   reset();
   Math_fround(f32_left());
   Math_fround(f32_right());
@@ -1132,36 +1132,36 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $111() {
+ function $76() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $112() {
+ function $77() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $113() {
+ function $78() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $114() {
+ function $79() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $115() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $2 = 0, $2$hi = 0, $5 = 0, $5$hi = 0;
+ function $80() {
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $2_1 = 0, $2$hi = 0, $5_1 = 0, $5$hi = 0;
   reset();
   wasm2js_scratch_store_f64(+(+f64_left()));
   i64toi32_i32$0 = wasm2js_scratch_load_i32(1 | 0) | 0;
@@ -1169,7 +1169,7 @@ function asmFunc(imports) {
   i64toi32_i32$1 = 2147483647;
   i64toi32_i32$3 = -1;
   i64toi32_i32$1 = i64toi32_i32$0 & i64toi32_i32$1 | 0;
-  $2 = i64toi32_i32$2 & i64toi32_i32$3 | 0;
+  $2_1 = i64toi32_i32$2 & i64toi32_i32$3 | 0;
   $2$hi = i64toi32_i32$1;
   wasm2js_scratch_store_f64(+(+f64_right()));
   i64toi32_i32$1 = wasm2js_scratch_load_i32(1 | 0) | 0;
@@ -1177,12 +1177,12 @@ function asmFunc(imports) {
   i64toi32_i32$2 = -2147483648;
   i64toi32_i32$3 = 0;
   i64toi32_i32$2 = i64toi32_i32$1 & i64toi32_i32$2 | 0;
-  $5 = i64toi32_i32$0 & i64toi32_i32$3 | 0;
+  $5_1 = i64toi32_i32$0 & i64toi32_i32$3 | 0;
   $5$hi = i64toi32_i32$2;
   i64toi32_i32$2 = $2$hi;
-  i64toi32_i32$1 = $2;
+  i64toi32_i32$1 = $2_1;
   i64toi32_i32$0 = $5$hi;
-  i64toi32_i32$3 = $5;
+  i64toi32_i32$3 = $5_1;
   i64toi32_i32$0 = i64toi32_i32$2 | i64toi32_i32$0 | 0;
   wasm2js_scratch_store_i32(0 | 0, i64toi32_i32$1 | i64toi32_i32$3 | 0 | 0);
   wasm2js_scratch_store_i32(1 | 0, i64toi32_i32$0 | 0);
@@ -1190,83 +1190,83 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $116() {
+ function $81() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $117() {
+ function $82() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $118() {
+ function $83() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $119() {
+ function $84() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $120() {
+ function $85() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $121() {
+ function $86() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $122() {
+ function $87() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $123() {
+ function $88() {
   reset();
   +f64_left();
   +f64_right();
   return get() | 0 | 0;
  }
  
- function $124() {
+ function $89() {
   var wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0;
   reset();
   (wasm2js_i32$0 = i32_left() | 0, wasm2js_f64$0 = +f64_right()), HEAPF64[wasm2js_i32$0 >> 3] = wasm2js_f64$0;
   return get() | 0 | 0;
  }
  
- function $125() {
+ function $90() {
   reset();
   f64_dummy(+(+f64_left()), +(+f64_right()));
   return get() | 0 | 0;
  }
  
- function $126() {
+ function $91() {
   var wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0, wasm2js_f64$1 = 0.0;
   reset();
   ((wasm2js_f64$0 = +f64_left(), wasm2js_f64$1 = +f64_right()), wasm2js_i32$0 = f64_callee() | 0 | 0), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, +wasm2js_f64$1) | 0;
   return get() | 0 | 0;
  }
  
- function $127() {
+ function $92() {
   reset();
   +f64_left();
   +f64_right();
@@ -1274,27 +1274,27 @@ function asmFunc(imports) {
   return get() | 0 | 0;
  }
  
- function $128() {
-  var $3 = 0;
+ function $93() {
+  var $3_1 = 0;
   block : {
    reset();
-   $3 = i32_left() | 0;
+   $3_1 = i32_left() | 0;
    if ((i32_right() | 0) & 0 | 0) {
     break block
    }
-   $3 = get() | 0;
+   $3_1 = get() | 0;
   }
-  return $3 | 0;
+  return $3_1 | 0;
  }
  
- function $129() {
-  var $2 = 0, $3 = 0, $4 = 0;
+ function $94() {
+  var $2_1 = 0, $3_1 = 0, $4_1 = 0;
   a : {
    reset();
    b : {
-    $2 = i32_left() | 0;
-    $3 = $2;
-    $4 = $2;
+    $2_1 = i32_left() | 0;
+    $3_1 = $2_1;
+    $4_1 = $2_1;
     switch (i32_right() | 0 | 0) {
     case 0:
      break a;
@@ -1302,9 +1302,9 @@ function asmFunc(imports) {
      break b;
     };
    }
-   $3 = get() | 0;
+   $3_1 = get() | 0;
   }
-  return $3 | 0;
+  return $3_1 | 0;
  }
  
  function _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0, var$0$hi, var$1, var$1$hi) {
@@ -1312,27 +1312,27 @@ function asmFunc(imports) {
   var$0$hi = var$0$hi | 0;
   var$1 = var$1 | 0;
   var$1$hi = var$1$hi | 0;
-  var i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, var$2 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21 = 0, $22 = 0, var$6 = 0, $24 = 0, $17 = 0, $18 = 0, $23 = 0, $29 = 0, $45_1 = 0, $56$hi = 0, $62$hi = 0;
+  var i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, var$2 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21_1 = 0, $22_1 = 0, var$6 = 0, $24_1 = 0, $17_1 = 0, $18_1 = 0, $23_1 = 0, $29_1 = 0, $45_1 = 0, $56$hi = 0, $62$hi = 0;
   i64toi32_i32$0 = var$1$hi;
   var$2 = var$1;
   var$4 = var$2 >>> 16 | 0;
   i64toi32_i32$0 = var$0$hi;
   var$3 = var$0;
   var$5 = var$3 >>> 16 | 0;
-  $17 = Math_imul(var$4, var$5);
-  $18 = var$2;
+  $17_1 = Math_imul(var$4, var$5);
+  $18_1 = var$2;
   i64toi32_i32$2 = var$3;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = 0;
-   $21 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
+   $21_1 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
-   $21 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
+   $21_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
-  $23 = $17 + Math_imul($18, $21) | 0;
+  $23_1 = $17_1 + Math_imul($18_1, $21_1) | 0;
   i64toi32_i32$1 = var$1$hi;
   i64toi32_i32$0 = var$1;
   i64toi32_i32$2 = 0;
@@ -1340,17 +1340,17 @@ function asmFunc(imports) {
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$2 = 0;
-   $22 = i64toi32_i32$1 >>> i64toi32_i32$4 | 0;
+   $22_1 = i64toi32_i32$1 >>> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$2 = i64toi32_i32$1 >>> i64toi32_i32$4 | 0;
-   $22 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$1 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$0 >>> i64toi32_i32$4 | 0) | 0;
+   $22_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$1 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$0 >>> i64toi32_i32$4 | 0) | 0;
   }
-  $29 = $23 + Math_imul($22, var$3) | 0;
+  $29_1 = $23_1 + Math_imul($22_1, var$3) | 0;
   var$2 = var$2 & 65535 | 0;
   var$3 = var$3 & 65535 | 0;
   var$6 = Math_imul(var$2, var$3);
   var$2 = (var$6 >>> 16 | 0) + Math_imul(var$2, var$5) | 0;
-  $45_1 = $29 + (var$2 >>> 16 | 0) | 0;
+  $45_1 = $29_1 + (var$2 >>> 16 | 0) | 0;
   var$2 = (var$2 & 65535 | 0) + Math_imul(var$4, var$3) | 0;
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $45_1 + (var$2 >>> 16 | 0) | 0;
@@ -1359,16 +1359,16 @@ function asmFunc(imports) {
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$0 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
-   $24 = 0;
+   $24_1 = 0;
   } else {
    i64toi32_i32$0 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$1 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$2 << i64toi32_i32$4 | 0) | 0;
-   $24 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
+   $24_1 = i64toi32_i32$1 << i64toi32_i32$4 | 0;
   }
   $56$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   $62$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $56$hi;
-  i64toi32_i32$2 = $24;
+  i64toi32_i32$2 = $24_1;
   i64toi32_i32$1 = $62$hi;
   i64toi32_i32$3 = var$2 << 16 | 0 | (var$6 & 65535 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
@@ -1382,7 +1382,7 @@ function asmFunc(imports) {
   var$0$hi = var$0$hi | 0;
   var$1 = var$1 | 0;
   var$1$hi = var$1$hi | 0;
-  var i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$5 = 0, var$2 = 0, var$2$hi = 0, i64toi32_i32$6 = 0, $21 = 0, $22 = 0, $23 = 0, $7$hi = 0, $9 = 0, $9$hi = 0, $14$hi = 0, $16$hi = 0, $17 = 0, $17$hi = 0, $23$hi = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$5 = 0, var$2 = 0, var$2$hi = 0, i64toi32_i32$6 = 0, $21_1 = 0, $22_1 = 0, $23_1 = 0, $7$hi = 0, $9_1 = 0, $9$hi = 0, $14$hi = 0, $16$hi = 0, $17_1 = 0, $17$hi = 0, $23$hi = 0;
   i64toi32_i32$0 = var$0$hi;
   i64toi32_i32$2 = var$0;
   i64toi32_i32$1 = 0;
@@ -1390,12 +1390,12 @@ function asmFunc(imports) {
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$0 >> 31 | 0;
-   $21 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
+   $21_1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
-   $21 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
+   $21_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
-  var$2 = $21;
+  var$2 = $21_1;
   var$2$hi = i64toi32_i32$1;
   i64toi32_i32$1 = var$0$hi;
   i64toi32_i32$1 = var$2$hi;
@@ -1413,7 +1413,7 @@ function asmFunc(imports) {
   i64toi32_i32$6 = i64toi32_i32$1 >>> 0 < i64toi32_i32$3 >>> 0;
   i64toi32_i32$5 = i64toi32_i32$6 + i64toi32_i32$0 | 0;
   i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-  $9 = i64toi32_i32$4;
+  $9_1 = i64toi32_i32$4;
   $9$hi = i64toi32_i32$5;
   i64toi32_i32$5 = var$1$hi;
   i64toi32_i32$2 = var$1;
@@ -1422,12 +1422,12 @@ function asmFunc(imports) {
   i64toi32_i32$0 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$5 >> 31 | 0;
-   $22 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
+   $22_1 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
-   $22 = (((1 << i64toi32_i32$0 | 0) - 1 | 0) & i64toi32_i32$5 | 0) << (32 - i64toi32_i32$0 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$0 | 0) | 0;
+   $22_1 = (((1 << i64toi32_i32$0 | 0) - 1 | 0) & i64toi32_i32$5 | 0) << (32 - i64toi32_i32$0 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$0 | 0) | 0;
   }
-  var$2 = $22;
+  var$2 = $22_1;
   var$2$hi = i64toi32_i32$1;
   i64toi32_i32$1 = var$1$hi;
   i64toi32_i32$1 = var$2$hi;
@@ -1448,9 +1448,9 @@ function asmFunc(imports) {
   $16$hi = i64toi32_i32$4;
   i64toi32_i32$4 = $9$hi;
   i64toi32_i32$1 = $16$hi;
-  i64toi32_i32$1 = __wasm_i64_udiv($9 | 0, i64toi32_i32$4 | 0, i64toi32_i32$0 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_udiv($9_1 | 0, i64toi32_i32$4 | 0, i64toi32_i32$0 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$4 = i64toi32_i32$HIGH_BITS;
-  $17 = i64toi32_i32$1;
+  $17_1 = i64toi32_i32$1;
   $17$hi = i64toi32_i32$4;
   i64toi32_i32$4 = var$1$hi;
   i64toi32_i32$4 = var$0$hi;
@@ -1465,15 +1465,15 @@ function asmFunc(imports) {
   i64toi32_i32$5 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$2 = i64toi32_i32$1 >> 31 | 0;
-   $23 = i64toi32_i32$1 >> i64toi32_i32$5 | 0;
+   $23_1 = i64toi32_i32$1 >> i64toi32_i32$5 | 0;
   } else {
    i64toi32_i32$2 = i64toi32_i32$1 >> i64toi32_i32$5 | 0;
-   $23 = (((1 << i64toi32_i32$5 | 0) - 1 | 0) & i64toi32_i32$1 | 0) << (32 - i64toi32_i32$5 | 0) | 0 | (i64toi32_i32$4 >>> i64toi32_i32$5 | 0) | 0;
+   $23_1 = (((1 << i64toi32_i32$5 | 0) - 1 | 0) & i64toi32_i32$1 | 0) << (32 - i64toi32_i32$5 | 0) | 0 | (i64toi32_i32$4 >>> i64toi32_i32$5 | 0) | 0;
   }
-  var$0 = $23;
+  var$0 = $23_1;
   var$0$hi = i64toi32_i32$2;
   i64toi32_i32$2 = $17$hi;
-  i64toi32_i32$1 = $17;
+  i64toi32_i32$1 = $17_1;
   i64toi32_i32$4 = var$0$hi;
   i64toi32_i32$3 = var$0;
   i64toi32_i32$4 = i64toi32_i32$2 ^ i64toi32_i32$4 | 0;
@@ -1496,7 +1496,7 @@ function asmFunc(imports) {
   var$0$hi = var$0$hi | 0;
   var$1 = var$1 | 0;
   var$1$hi = var$1$hi | 0;
-  var i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, i64toi32_i32$5 = 0, var$2$hi = 0, i64toi32_i32$6 = 0, var$2 = 0, $20 = 0, $21 = 0, $7$hi = 0, $9 = 0, $9$hi = 0, $14$hi = 0, $16$hi = 0, $17$hi = 0, $19$hi = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, i64toi32_i32$5 = 0, var$2$hi = 0, i64toi32_i32$6 = 0, var$2 = 0, $20_1 = 0, $21_1 = 0, $7$hi = 0, $9_1 = 0, $9$hi = 0, $14$hi = 0, $16$hi = 0, $17$hi = 0, $19$hi = 0;
   i64toi32_i32$0 = var$0$hi;
   i64toi32_i32$2 = var$0;
   i64toi32_i32$1 = 0;
@@ -1504,12 +1504,12 @@ function asmFunc(imports) {
   i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$0 >> 31 | 0;
-   $20 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
+   $20_1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$0 >> i64toi32_i32$4 | 0;
-   $20 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
+   $20_1 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
-  var$2 = $20;
+  var$2 = $20_1;
   var$2$hi = i64toi32_i32$1;
   i64toi32_i32$1 = var$0$hi;
   i64toi32_i32$1 = var$2$hi;
@@ -1527,7 +1527,7 @@ function asmFunc(imports) {
   i64toi32_i32$6 = i64toi32_i32$1 >>> 0 < i64toi32_i32$3 >>> 0;
   i64toi32_i32$5 = i64toi32_i32$6 + i64toi32_i32$0 | 0;
   i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-  $9 = i64toi32_i32$4;
+  $9_1 = i64toi32_i32$4;
   $9$hi = i64toi32_i32$5;
   i64toi32_i32$5 = var$1$hi;
   i64toi32_i32$2 = var$1;
@@ -1536,12 +1536,12 @@ function asmFunc(imports) {
   i64toi32_i32$0 = i64toi32_i32$3 & 31 | 0;
   if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
    i64toi32_i32$1 = i64toi32_i32$5 >> 31 | 0;
-   $21 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
+   $21_1 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
   } else {
    i64toi32_i32$1 = i64toi32_i32$5 >> i64toi32_i32$0 | 0;
-   $21 = (((1 << i64toi32_i32$0 | 0) - 1 | 0) & i64toi32_i32$5 | 0) << (32 - i64toi32_i32$0 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$0 | 0) | 0;
+   $21_1 = (((1 << i64toi32_i32$0 | 0) - 1 | 0) & i64toi32_i32$5 | 0) << (32 - i64toi32_i32$0 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$0 | 0) | 0;
   }
-  var$0 = $21;
+  var$0 = $21_1;
   var$0$hi = i64toi32_i32$1;
   i64toi32_i32$1 = var$1$hi;
   i64toi32_i32$1 = var$0$hi;
@@ -1562,7 +1562,7 @@ function asmFunc(imports) {
   $16$hi = i64toi32_i32$4;
   i64toi32_i32$4 = $9$hi;
   i64toi32_i32$1 = $16$hi;
-  i64toi32_i32$1 = __wasm_i64_urem($9 | 0, i64toi32_i32$4 | 0, i64toi32_i32$0 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = __wasm_i64_urem($9_1 | 0, i64toi32_i32$4 | 0, i64toi32_i32$0 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$4 = i64toi32_i32$HIGH_BITS;
   $17$hi = i64toi32_i32$4;
   i64toi32_i32$4 = var$2$hi;
@@ -2109,101 +2109,101 @@ function asmFunc(imports) {
  }
  
  return {
-  "i32_add": $35, 
-  "i32_sub": $36, 
-  "i32_mul": $37, 
-  "i32_div_s": $38, 
-  "i32_div_u": $39, 
-  "i32_rem_s": $40, 
-  "i32_rem_u": $41, 
-  "i32_and": $42, 
-  "i32_or": $43, 
-  "i32_xor": $44, 
-  "i32_shl": $45, 
-  "i32_shr_u": $46, 
-  "i32_shr_s": $47, 
-  "i32_eq": $48, 
-  "i32_ne": $49, 
-  "i32_lt_s": $50, 
-  "i32_le_s": $51, 
-  "i32_lt_u": $52, 
-  "i32_le_u": $53, 
-  "i32_gt_s": $54, 
-  "i32_ge_s": $55, 
-  "i32_gt_u": $56, 
-  "i32_ge_u": $57, 
-  "i32_store": $58, 
-  "i32_store8": $59, 
-  "i32_store16": $60, 
-  "i32_call": $61, 
-  "i32_call_indirect": $62, 
-  "i32_select": $63, 
-  "i64_add": $64, 
-  "i64_sub": $65, 
-  "i64_mul": $66, 
-  "i64_div_s": $67, 
-  "i64_div_u": $68, 
-  "i64_rem_s": $69, 
-  "i64_rem_u": $70, 
-  "i64_and": $71, 
-  "i64_or": $72, 
-  "i64_xor": $73, 
-  "i64_shl": $74, 
-  "i64_shr_u": $75, 
-  "i64_shr_s": $76, 
-  "i64_eq": $77, 
-  "i64_ne": $78, 
-  "i64_lt_s": $79, 
-  "i64_le_s": $80, 
-  "i64_lt_u": $81, 
-  "i64_le_u": $82, 
-  "i64_gt_s": $83, 
-  "i64_ge_s": $84, 
-  "i64_gt_u": $85, 
-  "i64_ge_u": $86, 
-  "i64_store": $87, 
-  "i64_store8": $88, 
-  "i64_store16": $89, 
-  "i64_store32": $90, 
-  "i64_call": $91, 
-  "i64_call_indirect": $92, 
-  "i64_select": $93, 
-  "f32_add": $94, 
-  "f32_sub": $95, 
-  "f32_mul": $96, 
-  "f32_div": $97, 
-  "f32_copysign": $98, 
-  "f32_eq": $99, 
-  "f32_ne": $100, 
-  "f32_lt": $101, 
-  "f32_le": $102, 
-  "f32_gt": $103, 
-  "f32_ge": $104, 
-  "f32_min": $105, 
-  "f32_max": $106, 
-  "f32_store": $107, 
-  "f32_call": $108, 
-  "f32_call_indirect": $109, 
-  "f32_select": $110, 
-  "f64_add": $111, 
-  "f64_sub": $112, 
-  "f64_mul": $113, 
-  "f64_div": $114, 
-  "f64_copysign": $115, 
-  "f64_eq": $116, 
-  "f64_ne": $117, 
-  "f64_lt": $118, 
-  "f64_le": $119, 
-  "f64_gt": $120, 
-  "f64_ge": $121, 
-  "f64_min": $122, 
-  "f64_max": $123, 
-  "f64_store": $124, 
-  "f64_call": $125, 
-  "f64_call_indirect": $126, 
-  "f64_select": $127, 
-  "br_if": $128, 
-  "br_table": $129
+  "i32_add": $0, 
+  "i32_sub": $1, 
+  "i32_mul": $2, 
+  "i32_div_s": $3, 
+  "i32_div_u": $4, 
+  "i32_rem_s": $5, 
+  "i32_rem_u": $6, 
+  "i32_and": $7, 
+  "i32_or": $8, 
+  "i32_xor": $9, 
+  "i32_shl": $10, 
+  "i32_shr_u": $11, 
+  "i32_shr_s": $12, 
+  "i32_eq": $13, 
+  "i32_ne": $14, 
+  "i32_lt_s": $15, 
+  "i32_le_s": $16, 
+  "i32_lt_u": $17, 
+  "i32_le_u": $18, 
+  "i32_gt_s": $19, 
+  "i32_ge_s": $20, 
+  "i32_gt_u": $21, 
+  "i32_ge_u": $22, 
+  "i32_store": $23, 
+  "i32_store8": $24, 
+  "i32_store16": $25, 
+  "i32_call": $26, 
+  "i32_call_indirect": $27, 
+  "i32_select": $28, 
+  "i64_add": $29, 
+  "i64_sub": $30, 
+  "i64_mul": $31, 
+  "i64_div_s": $32, 
+  "i64_div_u": $33, 
+  "i64_rem_s": $34, 
+  "i64_rem_u": $35, 
+  "i64_and": $36, 
+  "i64_or": $37, 
+  "i64_xor": $38, 
+  "i64_shl": $39, 
+  "i64_shr_u": $40, 
+  "i64_shr_s": $41, 
+  "i64_eq": $42, 
+  "i64_ne": $43, 
+  "i64_lt_s": $44, 
+  "i64_le_s": $45, 
+  "i64_lt_u": $46, 
+  "i64_le_u": $47, 
+  "i64_gt_s": $48, 
+  "i64_ge_s": $49, 
+  "i64_gt_u": $50, 
+  "i64_ge_u": $51, 
+  "i64_store": $52, 
+  "i64_store8": $53, 
+  "i64_store16": $54, 
+  "i64_store32": $55, 
+  "i64_call": $56, 
+  "i64_call_indirect": $57, 
+  "i64_select": $58, 
+  "f32_add": $59, 
+  "f32_sub": $60, 
+  "f32_mul": $61, 
+  "f32_div": $62, 
+  "f32_copysign": $63, 
+  "f32_eq": $64, 
+  "f32_ne": $65, 
+  "f32_lt": $66, 
+  "f32_le": $67, 
+  "f32_gt": $68, 
+  "f32_ge": $69, 
+  "f32_min": $70, 
+  "f32_max": $71, 
+  "f32_store": $72, 
+  "f32_call": $73, 
+  "f32_call_indirect": $74, 
+  "f32_select": $75, 
+  "f64_add": $76, 
+  "f64_sub": $77, 
+  "f64_mul": $78, 
+  "f64_div": $79, 
+  "f64_copysign": $80, 
+  "f64_eq": $81, 
+  "f64_ne": $82, 
+  "f64_lt": $83, 
+  "f64_le": $84, 
+  "f64_gt": $85, 
+  "f64_ge": $86, 
+  "f64_min": $87, 
+  "f64_max": $88, 
+  "f64_store": $89, 
+  "f64_call": $90, 
+  "f64_call_indirect": $91, 
+  "f64_select": $92, 
+  "br_if": $93, 
+  "br_table": $94
  };
 }
 
diff --git a/test/wasm2js/nested-selects.2asm.js b/test/wasm2js/nested-selects.2asm.js
index 3cbb81b46..b8eabb024 100644
--- a/test/wasm2js/nested-selects.2asm.js
+++ b/test/wasm2js/nested-selects.2asm.js
@@ -10,13 +10,13 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0) {
-  $0 = $0 | 0;
-  return (($0 | 0) < (0 | 0) ? -1 : ($0 | 0) > (0 | 0) ? 1 : 0) | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return (($0_1 | 0) < (0 | 0) ? -1 : ($0_1 | 0) > (0 | 0) ? 1 : 0) | 0;
  }
  
  return {
-  "sign": $1
+  "sign": $0
  };
 }
 
diff --git a/test/wasm2js/nested-selects.2asm.js.opt b/test/wasm2js/nested-selects.2asm.js.opt
index f66fd391f..49913e99e 100644
--- a/test/wasm2js/nested-selects.2asm.js.opt
+++ b/test/wasm2js/nested-selects.2asm.js.opt
@@ -10,13 +10,13 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0) {
-  $0 = $0 | 0;
-  return (($0 | 0) < 0 ? -1 : ($0 | 0) > 0) | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return (($0_1 | 0) < 0 ? -1 : ($0_1 | 0) > 0) | 0;
  }
  
  return {
-  "sign": $1
+  "sign": $0
  };
 }
 
diff --git a/test/wasm2js/reinterpret.2asm.js b/test/wasm2js/reinterpret.2asm.js
index 3ed871fbb..1e6339fb4 100644
--- a/test/wasm2js/reinterpret.2asm.js
+++ b/test/wasm2js/reinterpret.2asm.js
@@ -40,32 +40,32 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0) {
-  $0 = $0 | 0;
-  return ((wasm2js_scratch_store_f32((wasm2js_scratch_store_i32(2, $0), wasm2js_scratch_load_f32())), wasm2js_scratch_load_i32(2)) | 0) == ($0 | 0) | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return ((wasm2js_scratch_store_f32((wasm2js_scratch_store_i32(2, $0_1), wasm2js_scratch_load_f32())), wasm2js_scratch_load_i32(2)) | 0) == ($0_1 | 0) | 0;
  }
  
- function $2($0, $0$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0, $3$hi = 0;
   i64toi32_i32$0 = $0$hi;
-  wasm2js_scratch_store_i32(0 | 0, $0 | 0);
+  wasm2js_scratch_store_i32(0 | 0, $0_1 | 0);
   wasm2js_scratch_store_i32(1 | 0, i64toi32_i32$0 | 0);
   wasm2js_scratch_store_f64(+(+wasm2js_scratch_load_f64()));
   i64toi32_i32$0 = wasm2js_scratch_load_i32(1 | 0) | 0;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$0 = $3$hi;
-  return (wasm2js_scratch_load_i32(0 | 0) | 0 | 0) == ($0 | 0) & (i64toi32_i32$0 | 0) == ($0$hi | 0) | 0 | 0;
+  return (wasm2js_scratch_load_i32(0 | 0) | 0 | 0) == ($0_1 | 0) & (i64toi32_i32$0 | 0) == ($0$hi | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10 = 0, $3 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3 = $0;
+  $3 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -85,12 +85,12 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $2(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  return {
-  "i32_roundtrip": $1, 
-  "i64_roundtrip": legalstub$2
+  "i32_roundtrip": $0, 
+  "i64_roundtrip": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/reinterpret.2asm.js.opt b/test/wasm2js/reinterpret.2asm.js.opt
index e42dcf321..20235972c 100644
--- a/test/wasm2js/reinterpret.2asm.js.opt
+++ b/test/wasm2js/reinterpret.2asm.js.opt
@@ -32,23 +32,23 @@ function asmFunc(imports) {
  var Math_ceil = Math.ceil;
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
- function $1($0) {
-  $0 = $0 | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
   return 1;
  }
  
- function legalstub$2($0, $1_1) {
+ function legalstub$1($0_1, $1) {
   var $2 = 0;
-  wasm2js_scratch_store_i32(0, $0 | 0);
-  wasm2js_scratch_store_i32(1, $1_1 | 0);
+  wasm2js_scratch_store_i32(0, $0_1 | 0);
+  wasm2js_scratch_store_i32(1, $1 | 0);
   wasm2js_scratch_store_f64(+wasm2js_scratch_load_f64());
   $2 = wasm2js_scratch_load_i32(1) | 0;
-  return (wasm2js_scratch_load_i32(0) | 0) == ($0 | 0) & ($1_1 | 0) == ($2 | 0);
+  return (wasm2js_scratch_load_i32(0) | 0) == ($0_1 | 0) & ($1 | 0) == ($2 | 0);
  }
  
  return {
-  "i32_roundtrip": $1, 
-  "i64_roundtrip": legalstub$2
+  "i32_roundtrip": $0, 
+  "i64_roundtrip": legalstub$1
  };
 }
 
diff --git a/test/wasm2js/unary-ops.2asm.js b/test/wasm2js/unary-ops.2asm.js
index 9adfe581b..b415f2186 100644
--- a/test/wasm2js/unary-ops.2asm.js
+++ b/test/wasm2js/unary-ops.2asm.js
@@ -11,19 +11,19 @@ function asmFunc(imports) {
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
  var i64toi32_i32$HIGH_BITS = 0;
- function $1($0) {
-  $0 = $0 | 0;
-  return __wasm_popcnt_i32($0 | 0) | 0 | 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  return __wasm_popcnt_i32($0_1 | 0) | 0 | 0;
  }
  
- function $2($0, $0$hi, r, r$hi) {
-  $0 = $0 | 0;
+ function $1($0_1, $0$hi, r, r$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $3$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = __wasm_popcnt_i64($0 | 0, i64toi32_i32$0 | 0) | 0;
+  i64toi32_i32$0 = __wasm_popcnt_i64($0_1 | 0, i64toi32_i32$0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $3$hi = i64toi32_i32$1;
   i64toi32_i32$1 = r$hi;
@@ -33,8 +33,8 @@ function asmFunc(imports) {
   return (i64toi32_i32$2 | 0) == (r | 0) & (i64toi32_i32$1 | 0) == (i64toi32_i32$0 | 0) | 0 | 0;
  }
  
- function $3($0, r, r$hi) {
-  $0 = $0 | 0;
+ function $2($0_1, r, r$hi) {
+  $0_1 = $0_1 | 0;
   r = r | 0;
   r$hi = r$hi | 0;
   var i64toi32_i32$0 = 0, $3$hi = 0;
@@ -42,73 +42,73 @@ function asmFunc(imports) {
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$0 = $3$hi;
-  return ($0 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (r$hi | 0) | 0 | 0;
+  return ($0_1 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (r$hi | 0) | 0 | 0;
  }
  
- function $4($0, r, r$hi) {
-  $0 = $0 | 0;
+ function $3($0_1, r, r$hi) {
+  $0_1 = $0_1 | 0;
   r = r | 0;
   r$hi = r$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $3$hi = 0;
-  i64toi32_i32$1 = $0;
+  i64toi32_i32$1 = $0_1;
   i64toi32_i32$0 = i64toi32_i32$1 >> 31 | 0;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$0 = $3$hi;
   i64toi32_i32$1 = r$hi;
-  return ($0 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
+  return ($0_1 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (i64toi32_i32$1 | 0) | 0 | 0;
  }
  
- function $5($0, $0$hi) {
-  $0 = $0 | 0;
+ function $4($0_1, $0$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
-  return !($0 | i64toi32_i32$0 | 0) | 0;
+  return !($0_1 | i64toi32_i32$0 | 0) | 0;
  }
  
- function $6($0) {
-  $0 = $0 | 0;
-  return Math_clz32($0) | 0;
+ function $5($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_clz32($0_1) | 0;
  }
  
- function $7($0) {
-  $0 = $0 | 0;
-  return __wasm_ctz_i32($0 | 0) | 0 | 0;
+ function $6($0_1) {
+  $0_1 = $0_1 | 0;
+  return __wasm_ctz_i32($0_1 | 0) | 0 | 0;
  }
  
- function $8($0, $0$hi, r, r$hi) {
-  $0 = $0 | 0;
+ function $7($0_1, $0$hi, r, r$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$3 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $9_1 = 0, $3$hi = 0;
+  var i64toi32_i32$3 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $9 = 0, $3$hi = 0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$1 = $0;
+  i64toi32_i32$1 = $0_1;
   i64toi32_i32$3 = Math_clz32(i64toi32_i32$0);
   i64toi32_i32$2 = 0;
   if ((i64toi32_i32$3 | 0) == (32 | 0)) {
-   $9_1 = Math_clz32(i64toi32_i32$1) + 32 | 0
+   $9 = Math_clz32(i64toi32_i32$1) + 32 | 0
   } else {
-   $9_1 = i64toi32_i32$3
+   $9 = i64toi32_i32$3
   }
   $3$hi = i64toi32_i32$2;
   i64toi32_i32$2 = r$hi;
   i64toi32_i32$2 = $3$hi;
-  i64toi32_i32$1 = $9_1;
+  i64toi32_i32$1 = $9;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$3 = r;
   return (i64toi32_i32$1 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$2 | 0) == (i64toi32_i32$0 | 0) | 0 | 0;
  }
  
- function $9($0, $0$hi, r, r$hi) {
-  $0 = $0 | 0;
+ function $8($0_1, $0$hi, r, r$hi) {
+  $0_1 = $0_1 | 0;
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $3$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
-  i64toi32_i32$0 = __wasm_ctz_i64($0 | 0, i64toi32_i32$0 | 0) | 0;
+  i64toi32_i32$0 = __wasm_ctz_i64($0_1 | 0, i64toi32_i32$0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $3$hi = i64toi32_i32$1;
   i64toi32_i32$1 = r$hi;
@@ -118,14 +118,14 @@ function asmFunc(imports) {
   return (i64toi32_i32$2 | 0) == (r | 0) & (i64toi32_i32$1 | 0) == (i64toi32_i32$0 | 0) | 0 | 0;
  }
  
- function legalstub$2($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$1($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -145,7 +145,7 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $19;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
+  $9 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $9$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   $11 = $2_1;
@@ -172,15 +172,15 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $2($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $1($9 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$3($0, $1_1, $2_1) {
-  $0 = $0 | 0;
+ function legalstub$2($0_1, $1_1, $2_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $12 = 0, $3_1 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   i64toi32_i32$0 = 0;
   $5_1 = $1_1;
   $5$hi = i64toi32_i32$0;
@@ -202,15 +202,15 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $3($3_1 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $2($3_1 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$4($0, $1_1, $2_1) {
-  $0 = $0 | 0;
+ function legalstub$3($0_1, $1_1, $2_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $12 = 0, $3_1 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   i64toi32_i32$0 = 0;
   $5_1 = $1_1;
   $5$hi = i64toi32_i32$0;
@@ -232,15 +232,15 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $12;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $4($3_1 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $3($3_1 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$5($0, $1_1) {
-  $0 = $0 | 0;
+ function legalstub$4($0_1, $1_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
-  $3_1 = $0;
+  $3_1 = $0_1;
   $3$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -260,17 +260,17 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $5(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $4(i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$8($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$7($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -290,7 +290,7 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $19;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
+  $9 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $9$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   $11 = $2_1;
@@ -317,17 +317,17 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $8($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $7($9 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
- function legalstub$9($0, $1_1, $2_1, $3_1) {
-  $0 = $0 | 0;
+ function legalstub$8($0_1, $1_1, $2_1, $3_1) {
+  $0_1 = $0_1 | 0;
   $1_1 = $1_1 | 0;
   $2_1 = $2_1 | 0;
   $3_1 = $3_1 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9_1 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $19 = 0, $20 = 0, $5_1 = 0, $5$hi = 0, $8$hi = 0, $9 = 0, $9$hi = 0, $11 = 0, $11$hi = 0, $14$hi = 0, $15 = 0, $15$hi = 0;
   i64toi32_i32$0 = 0;
-  $5_1 = $0;
+  $5_1 = $0_1;
   $5$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $1_1;
@@ -347,7 +347,7 @@ function asmFunc(imports) {
   i64toi32_i32$2 = $8$hi;
   i64toi32_i32$3 = $19;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  $9_1 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
+  $9 = i64toi32_i32$0 | i64toi32_i32$3 | 0;
   $9$hi = i64toi32_i32$2;
   i64toi32_i32$2 = 0;
   $11 = $2_1;
@@ -374,7 +374,7 @@ function asmFunc(imports) {
   $15$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $9$hi;
   i64toi32_i32$2 = $15$hi;
-  return $9($9_1 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  return $8($9 | 0, i64toi32_i32$1 | 0, $15 | 0, i64toi32_i32$2 | 0) | 0 | 0;
  }
  
  function __wasm_ctz_i32(var$0) {
@@ -500,15 +500,15 @@ function asmFunc(imports) {
  }
  
  return {
-  "i32_popcnt": $1, 
-  "check_popcnt_i64": legalstub$2, 
-  "check_extend_ui32": legalstub$3, 
-  "check_extend_si32": legalstub$4, 
-  "check_eqz_i64": legalstub$5, 
-  "i32_clz": $6, 
-  "i32_ctz": $7, 
-  "check_clz_i64": legalstub$8, 
-  "check_ctz_i64": legalstub$9
+  "i32_popcnt": $0, 
+  "check_popcnt_i64": legalstub$1, 
+  "check_extend_ui32": legalstub$2, 
+  "check_extend_si32": legalstub$3, 
+  "check_eqz_i64": legalstub$4, 
+  "i32_clz": $5, 
+  "i32_ctz": $6, 
+  "check_clz_i64": legalstub$7, 
+  "check_ctz_i64": legalstub$8
  };
 }
 
diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt
index 681891f81..f5d49d3f6 100644
--- a/test/wasm2js/unary-ops.2asm.js.opt
+++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -11,103 +11,103 @@ function asmFunc(imports) {
  var Math_trunc = Math.trunc;
  var Math_sqrt = Math.sqrt;
  var i64toi32_i32$HIGH_BITS = 0;
- function $1($0) {
-  $0 = $0 | 0;
-  var $1_1 = 0;
+ function $0($0_1) {
+  $0_1 = $0_1 | 0;
+  var $1 = 0;
   while (1) {
-   if ($0) {
-    $0 = $0 - 1 & $0;
-    $1_1 = $1_1 + 1 | 0;
+   if ($0_1) {
+    $0_1 = $0_1 - 1 & $0_1;
+    $1 = $1 + 1 | 0;
     continue;
    }
    break;
   };
-  return $1_1 | 0;
+  return $1 | 0;
  }
  
- function $6($0) {
-  $0 = $0 | 0;
-  return Math_clz32($0) | 0;
+ function $5($0_1) {
+  $0_1 = $0_1 | 0;
+  return Math_clz32($0_1) | 0;
  }
  
- function $7($0) {
-  $0 = $0 | 0;
-  if ($0) {
-   $0 = 31 - Math_clz32($0 - 1 ^ $0) | 0
+ function $6($0_1) {
+  $0_1 = $0_1 | 0;
+  if ($0_1) {
+   $0_1 = 31 - Math_clz32($0_1 - 1 ^ $0_1) | 0
   } else {
-   $0 = 32
+   $0_1 = 32
   }
-  return $0 | 0;
+  return $0_1 | 0;
  }
  
- function legalstub$2($0, $1_1, $2, $3) {
-  var $4 = 0, $5 = 0, $6_1 = 0;
-  $4 = $0;
+ function legalstub$1($0_1, $1, $2, $3) {
+  var $4 = 0, $5_1 = 0, $6_1 = 0;
+  $4 = $0_1;
   while (1) {
-   if ($1_1 | $4) {
-    $0 = $4;
-    $4 = $0 & $0 - 1;
-    $1_1 = $1_1 - !$0 & $1_1;
-    $5 = $5 + 1 | 0;
-    $6_1 = $5 ? $6_1 : $6_1 + 1 | 0;
+   if ($1 | $4) {
+    $0_1 = $4;
+    $4 = $0_1 & $0_1 - 1;
+    $1 = $1 - !$0_1 & $1;
+    $5_1 = $5_1 + 1 | 0;
+    $6_1 = $5_1 ? $6_1 : $6_1 + 1 | 0;
     continue;
    }
    break;
   };
   i64toi32_i32$HIGH_BITS = $6_1;
-  return ($2 | 0) == ($5 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
+  return ($2 | 0) == ($5_1 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
  }
  
- function legalstub$3($0, $1_1, $2) {
-  return !$2 & ($0 | 0) == ($1_1 | 0);
+ function legalstub$2($0_1, $1, $2) {
+  return !$2 & ($0_1 | 0) == ($1 | 0);
  }
  
- function legalstub$4($0, $1_1, $2) {
-  return ($0 | 0) == ($1_1 | 0) & ($2 | 0) == $0 >> 31;
+ function legalstub$3($0_1, $1, $2) {
+  return ($0_1 | 0) == ($1 | 0) & ($2 | 0) == $0_1 >> 31;
  }
  
- function legalstub$5($0, $1_1) {
-  return !($0 | $1_1);
+ function legalstub$4($0_1, $1) {
+  return !($0_1 | $1);
  }
  
- function legalstub$8($0, $1_1, $2, $3) {
+ function legalstub$7($0_1, $1, $2, $3) {
   var $4 = 0;
-  $4 = Math_clz32($0) + 32 | 0;
-  $0 = Math_clz32($1_1);
-  return !$3 & ($2 | 0) == ((($0 | 0) == 32 ? $4 : $0) | 0);
+  $4 = Math_clz32($0_1) + 32 | 0;
+  $0_1 = Math_clz32($1);
+  return !$3 & ($2 | 0) == ((($0_1 | 0) == 32 ? $4 : $0_1) | 0);
  }
  
- function legalstub$9($0, $1_1, $2, $3) {
-  var $4 = 0, $5 = 0, $6_1 = 0, $7_1 = 0;
+ function legalstub$8($0_1, $1, $2, $3) {
+  var $4 = 0, $5_1 = 0, $6_1 = 0, $7 = 0;
   __inlined_func$__wasm_ctz_i64$3 : {
-   if ($1_1 | $0) {
-    $4 = $1_1 - 1 | 0;
-    $5 = $4 + 1 | 0;
+   if ($1 | $0_1) {
+    $4 = $1 - 1 | 0;
+    $5_1 = $4 + 1 | 0;
     $6_1 = $4;
-    $4 = $0 - 1 | 0;
-    $7_1 = Math_clz32($0 ^ $4) + 32 | 0;
-    $0 = Math_clz32($1_1 ^ (($4 | 0) != -1 ? $5 : $6_1));
-    $0 = ($0 | 0) == 32 ? $7_1 : $0;
-    $1_1 = 63 - $0 | 0;
-    i64toi32_i32$HIGH_BITS = 0 - ($0 >>> 0 > 63) | 0;
+    $4 = $0_1 - 1 | 0;
+    $7 = Math_clz32($0_1 ^ $4) + 32 | 0;
+    $0_1 = Math_clz32($1 ^ (($4 | 0) != -1 ? $5_1 : $6_1));
+    $0_1 = ($0_1 | 0) == 32 ? $7 : $0_1;
+    $1 = 63 - $0_1 | 0;
+    i64toi32_i32$HIGH_BITS = 0 - ($0_1 >>> 0 > 63) | 0;
     break __inlined_func$__wasm_ctz_i64$3;
    }
    i64toi32_i32$HIGH_BITS = 0;
-   $1_1 = 64;
+   $1 = 64;
   }
-  return ($1_1 | 0) == ($2 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
+  return ($1 | 0) == ($2 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
  }
  
  return {
-  "i32_popcnt": $1, 
-  "check_popcnt_i64": legalstub$2, 
-  "check_extend_ui32": legalstub$3, 
-  "check_extend_si32": legalstub$4, 
-  "check_eqz_i64": legalstub$5, 
-  "i32_clz": $6, 
-  "i32_ctz": $7, 
-  "check_clz_i64": legalstub$8, 
-  "check_ctz_i64": legalstub$9
+  "i32_popcnt": $0, 
+  "check_popcnt_i64": legalstub$1, 
+  "check_extend_ui32": legalstub$2, 
+  "check_extend_si32": legalstub$3, 
+  "check_eqz_i64": legalstub$4, 
+  "i32_clz": $5, 
+  "i32_ctz": $6, 
+  "check_clz_i64": legalstub$7, 
+  "check_ctz_i64": legalstub$8
  };
 }
 
diff --git a/test/wasm2js/wasm2js.asserts.js b/test/wasm2js/wasm2js.asserts.js
index fb6516106..19b97844e 100644
--- a/test/wasm2js/wasm2js.asserts.js
+++ b/test/wasm2js/wasm2js.asserts.js
@@ -68,9 +68,9 @@ function check1() {
  return 1 | 0;
 }
 
-if (!check1()) throw 'assertion failed: ( assert_return ( invoke empty ) )';
+if (!check1()) throw 'assertion failed on line 9';
 function check2() {
  return (retasmFunc0.add(1 | 0, 1 | 0) | 0 | 0) == (2 | 0) | 0;
 }
 
-if (!check2()) throw 'assertion failed: ( assert_return ( invoke add ( i32.const 1 ) ( i32.const 1 ) ) ( i32.const 2 ) )';
+if (!check2()) throw 'assertion failed on line 10';
diff --git a/test/wasm2js/wasm2js.traps.js b/test/wasm2js/wasm2js.traps.js
index 8f87e2423..307827362 100644
--- a/test/wasm2js/wasm2js.traps.js
+++ b/test/wasm2js/wasm2js.traps.js
@@ -68,12 +68,12 @@ function check1() {
  return 1 | 0;
 }
 
-if (!check1()) throw 'assertion failed: ( assert_return ( invoke empty ) )';
+if (!check1()) throw 'assertion failed on line 9';
 function check2() {
  return (retasmFunc0.add(1 | 0, 1 | 0) | 0 | 0) == (2 | 0) | 0;
 }
 
-if (!check2()) throw 'assertion failed: ( assert_return ( invoke add ( i32.const 1 ) ( i32.const 1 ) ) ( i32.const 2 ) )';
+if (!check2()) throw 'assertion failed on line 10';
 function check3() {
  function f() {
   return retasmFunc0.div_s(0 | 0, 0 | 0) | 0 | 0;
@@ -82,12 +82,12 @@ function check3() {
  try {
   f();
  } catch (e) {
-  return e.message.includes("integer divide by zero");
+  return 1;
  };
  return 0;
 }
 
-if (!check3()) throw 'assertion failed: ( assert_trap ( invoke div_s ( i32.const 0 ) ( i32.const 0 ) ) integer divide by zero )';
+if (!check3()) throw 'assertion failed on line 11';
 function check4() {
  function f() {
   return retasmFunc0.div_s(-2147483648 | 0, -1 | 0) | 0 | 0;
@@ -96,9 +96,9 @@ function check4() {
  try {
   f();
  } catch (e) {
-  return e.message.includes("integer overflow");
+  return 1;
  };
  return 0;
 }
 
-if (!check4()) throw 'assertion failed: ( assert_trap ( invoke div_s ( i32.const 0x80000000 ) ( i32.const -1 ) ) integer overflow )';
+if (!check4()) throw 'assertion failed on line 12';