wasm2js: get rid of some non-flat code assumptions (#2036)

We run flatten there, which lets us simplify things a lot. Turns out that for assertions we didn't run it, which is why we still needed the old non-flat code paths. This adds flatten there and removes that old code and assumptions.

12 files changed, 161 insertions, 439 deletions

diff --git a/test/wasm2js/call_indirect.2asm.js b/test/wasm2js/call_indirect.2asm.js
index 070ae836a..ae5792dd1 100644
--- a/test/wasm2js/call_indirect.2asm.js
+++ b/test/wasm2js/call_indirect.2asm.js
@@ -119,139 +119,92 @@ function asmFunc(global, env, buffer) {
  }
  
  function $16() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = 0, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  function $17() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = 1;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0;
+  i64toi32_i32$0 = (wasm2js_i32$0 = 1, FUNCTION_TABLE[wasm2js_i32$0]() | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $18() {
-  var wasm2js_f32$0 = Math_fround(0), wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 2;
-  wasm2js_f32$0 = Math_fround(FUNCTION_TABLE[wasm2js_i32$0]());
-  return Math_fround(wasm2js_f32$0);
+  var wasm2js_i32$0 = 0;
+  return Math_fround((wasm2js_i32$0 = 2, Math_fround(FUNCTION_TABLE[wasm2js_i32$0]())));
  }
  
  function $19() {
-  var wasm2js_f64$0 = 0.0, wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 3;
-  wasm2js_f64$0 = +FUNCTION_TABLE[wasm2js_i32$0]();
-  return +wasm2js_f64$0;
+  var wasm2js_i32$0 = 0;
+  return +(wasm2js_i32$0 = 3, +FUNCTION_TABLE[wasm2js_i32$0]());
  }
  
  function $20() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = 0;
-  wasm2js_i32$2 = 100;
-  wasm2js_i32$3 = i64toi32_i32$0;
-  wasm2js_i32$1 = 5;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  i64toi32_i32$0 = (((wasm2js_i32$1 = 100, wasm2js_i32$2 = i64toi32_i32$0), wasm2js_i32$0 = 5), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $21() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
-  wasm2js_i32$2 = 32;
-  wasm2js_i32$1 = 4;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0) | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  return ((wasm2js_i32$1 = 32, wasm2js_i32$0 = 4), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0) | 0) | 0;
  }
  
  function $22() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = 0;
-  wasm2js_i32$2 = 64;
-  wasm2js_i32$3 = i64toi32_i32$0;
-  wasm2js_i32$1 = 5;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  i64toi32_i32$0 = (((wasm2js_i32$1 = 64, wasm2js_i32$2 = i64toi32_i32$0), wasm2js_i32$0 = 5), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $23() {
-  var wasm2js_f32$0 = Math_fround(0), wasm2js_i32$0 = 0, wasm2js_f32$1 = Math_fround(0);
-  wasm2js_f32$1 = Math_fround(1.3200000524520874);
-  wasm2js_i32$0 = 6;
-  wasm2js_f32$0 = Math_fround(FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$1)));
-  return Math_fround(wasm2js_f32$0);
+  var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0);
+  return Math_fround(((wasm2js_f32$0 = Math_fround(1.3200000524520874), wasm2js_i32$0 = 6), Math_fround(FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$0)))));
  }
  
  function $24() {
-  var wasm2js_f64$0 = 0.0, wasm2js_i32$0 = 0, wasm2js_f64$1 = 0.0;
-  wasm2js_f64$1 = 1.64;
-  wasm2js_i32$0 = 7;
-  wasm2js_f64$0 = +FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$1);
-  return +wasm2js_f64$0;
+  var wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0;
+  return +((wasm2js_f64$0 = 1.64, wasm2js_i32$0 = 7), +FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0));
  }
  
  function $25() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_f32$0 = Math_fround(0), wasm2js_i32$2 = 0;
-  wasm2js_f32$0 = Math_fround(32.099998474121094);
-  wasm2js_i32$2 = 32;
-  wasm2js_i32$1 = 8;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](Math_fround(wasm2js_f32$0), wasm2js_i32$2 | 0) | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0), wasm2js_i32$1 = 0;
+  return (((wasm2js_f32$0 = Math_fround(32.099998474121094), wasm2js_i32$1 = 32), wasm2js_i32$0 = 8), FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$0), wasm2js_i32$1 | 0) | 0) | 0;
  }
  
  function $26() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0, wasm2js_i32$4 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
   i64toi32_i32$0 = 0;
-  wasm2js_i32$2 = 32;
-  wasm2js_i32$3 = 64;
-  wasm2js_i32$4 = i64toi32_i32$0;
-  wasm2js_i32$1 = 9;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0) | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  i64toi32_i32$0 = ((((wasm2js_i32$1 = 32, wasm2js_i32$2 = 64), wasm2js_i32$3 = i64toi32_i32$0), wasm2js_i32$0 = 9), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $27() {
-  var wasm2js_f32$0 = Math_fround(0), wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0, wasm2js_f32$1 = Math_fround(0);
-  wasm2js_f64$0 = 64.0;
-  wasm2js_f32$1 = Math_fround(32.0);
-  wasm2js_i32$0 = 10;
-  wasm2js_f32$0 = Math_fround(FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, Math_fround(wasm2js_f32$1)));
-  return Math_fround(wasm2js_f32$0);
+  var wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0, wasm2js_f32$0 = Math_fround(0);
+  return Math_fround((((wasm2js_f64$0 = 64.0, wasm2js_f32$0 = Math_fround(32.0)), wasm2js_i32$0 = 10), Math_fround(FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, Math_fround(wasm2js_f32$0)))));
  }
  
  function $28() {
-  var wasm2js_f64$0 = 0.0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_f64$1 = 0.0;
-  wasm2js_i32$1 = 64;
-  wasm2js_i32$2 = 0;
-  wasm2js_f64$1 = 64.1;
-  wasm2js_i32$0 = 11;
-  wasm2js_f64$0 = +FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1);
-  return +wasm2js_f64$0;
+  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_f64$0 = 0.0;
+  return +((((wasm2js_i32$1 = 64, wasm2js_i32$2 = 0), wasm2js_f64$0 = 64.1), wasm2js_i32$0 = 11), +FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$0));
  }
  
  function $29($0, $1, $1$hi) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   $1$hi = $1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = $1$hi;
-  wasm2js_i32$2 = $1;
-  wasm2js_i32$3 = i64toi32_i32$0;
-  wasm2js_i32$1 = $0;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  i64toi32_i32$0 = (((wasm2js_i32$1 = $1, wasm2js_i32$2 = i64toi32_i32$0), wasm2js_i32$0 = $0), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
@@ -259,13 +212,9 @@ function asmFunc(global, env, buffer) {
  
  function $30($0) {
   $0 = $0 | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = 0;
-  wasm2js_i32$2 = 9;
-  wasm2js_i32$3 = i64toi32_i32$0;
-  wasm2js_i32$1 = $0;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-  i64toi32_i32$0 = wasm2js_i32$0;
+  i64toi32_i32$0 = (((wasm2js_i32$1 = 9, wasm2js_i32$2 = i64toi32_i32$0), wasm2js_i32$0 = $0), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
@@ -274,7 +223,7 @@ function asmFunc(global, env, buffer) {
  function fac($0, $0$hi) {
   $0 = $0 | 0;
   $0$hi = $0$hi | 0;
-  var i64toi32_i32$5 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, $8 = 0, $8$hi = 0, i64toi32_i32$3 = 0, $6 = 0, $6$hi = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$5 = 0, i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, $8 = 0, $8$hi = 0, i64toi32_i32$3 = 0, $6 = 0, $6$hi = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   if (($0 | i64toi32_i32$0 | 0 | 0) == (0 | 0)) {
    {
@@ -289,11 +238,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = 1;
     i64toi32_i32$5 = (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) + 0 | 0;
     i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
-    wasm2js_i32$2 = i64toi32_i32$2 - i64toi32_i32$3 | 0;
-    wasm2js_i32$3 = i64toi32_i32$5;
-    wasm2js_i32$1 = 12;
-    wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-    i64toi32_i32$5 = wasm2js_i32$0;
+    i64toi32_i32$5 = (((wasm2js_i32$1 = i64toi32_i32$2 - i64toi32_i32$3 | 0, wasm2js_i32$2 = i64toi32_i32$5), wasm2js_i32$0 = 12), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
     $6 = i64toi32_i32$5;
     $6$hi = i64toi32_i32$2;
@@ -314,7 +259,7 @@ function asmFunc(global, env, buffer) {
  function fib($0, $0$hi) {
   $0 = $0 | 0;
   $0$hi = $0$hi | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$5 = 0, i64toi32_i32$4 = 0, i64toi32_i32$6 = 0, $10 = 0, $10$hi = 0, $5 = 0, $5$hi = 0, $8 = 0, $8$hi = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$5 = 0, i64toi32_i32$4 = 0, i64toi32_i32$6 = 0, $10 = 0, $10$hi = 0, $5 = 0, $5$hi = 0, $8 = 0, $8$hi = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$2 = $0;
   i64toi32_i32$1 = 0;
@@ -335,11 +280,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$6 = i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0;
     i64toi32_i32$5 = i64toi32_i32$6 + i64toi32_i32$0 | 0;
     i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-    wasm2js_i32$2 = i64toi32_i32$4;
-    wasm2js_i32$3 = i64toi32_i32$5;
-    wasm2js_i32$1 = 13;
-    wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0, wasm2js_i32$3 | 0) | 0;
-    i64toi32_i32$5 = wasm2js_i32$0;
+    i64toi32_i32$5 = (((wasm2js_i32$1 = i64toi32_i32$4, wasm2js_i32$2 = i64toi32_i32$5), wasm2js_i32$0 = 13), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0);
     i64toi32_i32$3 = i64toi32_i32$HIGH_BITS;
     $5 = i64toi32_i32$5;
     $5$hi = i64toi32_i32$3;
@@ -352,11 +293,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$6 = i64toi32_i32$2 >>> 0 < i64toi32_i32$1 >>> 0;
     i64toi32_i32$4 = i64toi32_i32$6 + i64toi32_i32$5 | 0;
     i64toi32_i32$4 = i64toi32_i32$3 - i64toi32_i32$4 | 0;
-    wasm2js_i32$3 = i64toi32_i32$0;
-    wasm2js_i32$2 = i64toi32_i32$4;
-    wasm2js_i32$1 = 13;
-    wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$3 | 0, wasm2js_i32$2 | 0) | 0;
-    i64toi32_i32$4 = wasm2js_i32$0;
+    i64toi32_i32$4 = (((wasm2js_i32$2 = i64toi32_i32$0, wasm2js_i32$1 = i64toi32_i32$4), wasm2js_i32$0 = 13), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$2 | 0, wasm2js_i32$1 | 0) | 0);
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
     $8 = i64toi32_i32$4;
     $8$hi = i64toi32_i32$2;
@@ -381,52 +318,39 @@ function asmFunc(global, env, buffer) {
  
  function even($0) {
   $0 = $0 | 0;
-  var $6 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
+  var $6 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   if (($0 | 0) == (0 | 0)) {
    $6 = 44
   } else {
-   {
-    wasm2js_i32$2 = $0 - 1 | 0;
-    wasm2js_i32$1 = 15;
-    wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0) | 0;
-    $6 = wasm2js_i32$0;
-   }
+   $6 = ((wasm2js_i32$1 = $0 - 1 | 0, wasm2js_i32$0 = 15), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0) | 0)
   }
   return $6 | 0;
  }
  
  function odd($0) {
   $0 = $0 | 0;
-  var $6 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
+  var $6 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   if (($0 | 0) == (0 | 0)) {
    $6 = 99
   } else {
-   {
-    wasm2js_i32$2 = $0 - 1 | 0;
-    wasm2js_i32$1 = 14;
-    wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1](wasm2js_i32$2 | 0) | 0;
-    $6 = wasm2js_i32$0;
-   }
+   $6 = ((wasm2js_i32$1 = $0 - 1 | 0, wasm2js_i32$0 = 14), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0) | 0)
   }
   return $6 | 0;
  }
  
  function runaway() {
   var wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 16;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 16, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function mutual_runaway1() {
   var wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 18;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 18, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function mutual_runaway2() {
   var wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 17;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 17, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function legalstub$17() {
diff --git a/test/wasm2js/emscripten.2asm.js b/test/wasm2js/emscripten.2asm.js
index b0509ebb6..a0639aad0 100644
--- a/test/wasm2js/emscripten.2asm.js
+++ b/test/wasm2js/emscripten.2asm.js
@@ -30,8 +30,7 @@ function asmFunc(global, env, buffer) {
   var wasm2js_i32$0 = 0;
   syscall$6(1 | 0, 2 | 0) | 0;
   syscall$54(3 | 0, 4 | 0) | 0;
-  wasm2js_i32$0 = HEAP32[(0 + 1030 | 0) >> 2] | 0;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = HEAP32[(0 + 1030 | 0) >> 2] | 0, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function other() {
diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js
index 9696bc3dd..257d62eeb 100644
--- a/test/wasm2js/endianness.2asm.js
+++ b/test/wasm2js/endianness.2asm.js
@@ -57,13 +57,8 @@ function asmFunc(global, env, buffer) {
  function i16_store_little(address, value) {
   address = address | 0;
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = address;
-  wasm2js_i32$1 = value;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
-  wasm2js_i32$0 = address + 1 | 0;
-  wasm2js_i32$1 = value >>> 8 | 0;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[address >> 0] = value;
+  HEAP8[(address + 1 | 0) >> 0] = value >>> 8 | 0;
  }
  
  function i32_store_little(address, value) {
@@ -238,30 +233,22 @@ function asmFunc(global, env, buffer) {
  
  function $16(value) {
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
+  HEAP16[0 >> 1] = value;
   return i16_load_little(0 | 0) | 0 | 0;
  }
  
  function $17(value) {
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  HEAP32[0 >> 2] = value;
   return i32_load_little(0 | 0) | 0 | 0;
  }
  
  function $18(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
+  HEAP16[0 >> 1] = value;
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = i16_load_little(0 | 0) | 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
@@ -271,11 +258,9 @@ function asmFunc(global, env, buffer) {
  function $19(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  HEAP32[0 >> 2] = value;
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = i32_load_little(0 | 0) | 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
@@ -285,15 +270,11 @@ function asmFunc(global, env, buffer) {
  function $20(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
   i64toi32_i32$1 = 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = i64toi32_i32$0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[(wasm2js_i32$2 + 4 | 0) >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 5 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 6 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 7 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  HEAP32[i64toi32_i32$1 >> 2] = value;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = i64toi32_i32$0), ((HEAP8[(wasm2js_i32$0 + 4 | 0) >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 5 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 6 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 7 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
   i64toi32_i32$0 = i64_load_little(0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
@@ -302,19 +283,14 @@ function asmFunc(global, env, buffer) {
  
  function $21(value) {
   value = Math_fround(value);
-  var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0);
-  wasm2js_i32$0 = 0;
-  wasm2js_f32$0 = value;
-  HEAPF32[wasm2js_i32$0 >> 2] = wasm2js_f32$0;
+  HEAPF32[0 >> 2] = value;
   return Math_fround((wasm2js_scratch_store_i32(0, i32_load_little(0 | 0) | 0), wasm2js_scratch_load_f32()));
  }
  
  function $22(value) {
   value = +value;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0;
-  wasm2js_i32$0 = 0;
-  wasm2js_f64$0 = value;
-  HEAPF64[wasm2js_i32$0 >> 3] = wasm2js_f64$0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
+  HEAPF64[0 >> 3] = value;
   i64toi32_i32$0 = i64_load_little(0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   wasm2js_scratch_store_i32(0 | 0, i64toi32_i32$0 | 0);
diff --git a/test/wasm2js/func-ptr-offset.2asm.js b/test/wasm2js/func-ptr-offset.2asm.js
index 3e1865dae..b90f12008 100644
--- a/test/wasm2js/func-ptr-offset.2asm.js
+++ b/test/wasm2js/func-ptr-offset.2asm.js
@@ -35,10 +35,8 @@ function asmFunc(global, env, buffer) {
  
  function $3($0) {
   $0 = $0 | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = $0;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = $0, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  var FUNCTION_TABLE = [null, t1, t2, t3];
diff --git a/test/wasm2js/func.2asm.js b/test/wasm2js/func.2asm.js
index 81a4682bc..d40854bb6 100644
--- a/test/wasm2js/func.2asm.js
+++ b/test/wasm2js/func.2asm.js
@@ -396,10 +396,8 @@ function asmFunc(global, env, buffer) {
  
  function $76() {
   var wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 1;
-  FUNCTION_TABLE[wasm2js_i32$0]();
-  wasm2js_i32$0 = 4;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 1, FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 4, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function $77() {
@@ -407,74 +405,25 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = 0;
   i64toi32_i32$2 = 0;
-  wasm2js_f64$0 = 0.0;
-  wasm2js_i32$1 = 0;
-  wasm2js_i32$2 = i64toi32_i32$0;
-  wasm2js_f64$1 = 0.0;
-  wasm2js_i32$3 = 0;
-  wasm2js_i32$4 = i64toi32_i32$1;
-  wasm2js_f64$2 = 0.0;
-  wasm2js_i32$5 = 0;
-  wasm2js_i32$6 = i64toi32_i32$2;
-  wasm2js_f32$0 = Math_fround(0.0);
-  wasm2js_i32$7 = 0;
-  wasm2js_i32$0 = 0;
-  FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
+  (((((((((((wasm2js_f64$0 = 0.0, wasm2js_i32$1 = 0), wasm2js_i32$2 = i64toi32_i32$0), wasm2js_f64$1 = 0.0), wasm2js_i32$3 = 0), wasm2js_i32$4 = i64toi32_i32$1), wasm2js_f64$2 = 0.0), wasm2js_i32$5 = 0), wasm2js_i32$6 = i64toi32_i32$2), wasm2js_f32$0 = Math_fround(0.0)), wasm2js_i32$7 = 0), wasm2js_i32$0 = 0), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
   i64toi32_i32$2 = 0;
   i64toi32_i32$1 = 0;
   i64toi32_i32$0 = 0;
-  wasm2js_f64$2 = 0.0;
-  wasm2js_i32$7 = 0;
-  wasm2js_i32$6 = i64toi32_i32$2;
-  wasm2js_f64$1 = 0.0;
-  wasm2js_i32$5 = 0;
-  wasm2js_i32$4 = i64toi32_i32$1;
-  wasm2js_f64$0 = 0.0;
-  wasm2js_i32$3 = 0;
-  wasm2js_i32$2 = i64toi32_i32$0;
-  wasm2js_f32$0 = Math_fround(0.0);
-  wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 2;
-  FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$2, wasm2js_i32$7 | 0, wasm2js_i32$6 | 0, +wasm2js_f64$1, wasm2js_i32$5 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$0, wasm2js_i32$3 | 0, wasm2js_i32$2 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$1 | 0);
+  (((((((((((wasm2js_f64$2 = 0.0, wasm2js_i32$7 = 0), wasm2js_i32$6 = i64toi32_i32$2), wasm2js_f64$1 = 0.0), wasm2js_i32$5 = 0), wasm2js_i32$4 = i64toi32_i32$1), wasm2js_f64$0 = 0.0), wasm2js_i32$3 = 0), wasm2js_i32$2 = i64toi32_i32$0), wasm2js_f32$0 = Math_fround(0.0)), wasm2js_i32$1 = 0), wasm2js_i32$0 = 2), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$2, wasm2js_i32$7 | 0, wasm2js_i32$6 | 0, +wasm2js_f64$1, wasm2js_i32$5 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$0, wasm2js_i32$3 | 0, wasm2js_i32$2 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$1 | 0);
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = 0;
   i64toi32_i32$2 = 0;
-  wasm2js_f64$0 = 0.0;
-  wasm2js_i32$1 = 0;
-  wasm2js_i32$2 = i64toi32_i32$0;
-  wasm2js_f64$1 = 0.0;
-  wasm2js_i32$3 = 0;
-  wasm2js_i32$4 = i64toi32_i32$1;
-  wasm2js_f64$2 = 0.0;
-  wasm2js_i32$5 = 0;
-  wasm2js_i32$6 = i64toi32_i32$2;
-  wasm2js_f32$0 = Math_fround(0.0);
-  wasm2js_i32$7 = 0;
-  wasm2js_i32$0 = 3;
-  FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
+  (((((((((((wasm2js_f64$0 = 0.0, wasm2js_i32$1 = 0), wasm2js_i32$2 = i64toi32_i32$0), wasm2js_f64$1 = 0.0), wasm2js_i32$3 = 0), wasm2js_i32$4 = i64toi32_i32$1), wasm2js_f64$2 = 0.0), wasm2js_i32$5 = 0), wasm2js_i32$6 = i64toi32_i32$2), wasm2js_f32$0 = Math_fround(0.0)), wasm2js_i32$7 = 0), wasm2js_i32$0 = 3), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
  }
  
  function $78() {
   var wasm2js_i32$0 = 0;
-  wasm2js_i32$0 = 1;
-  FUNCTION_TABLE[wasm2js_i32$0]();
+  wasm2js_i32$0 = 1, FUNCTION_TABLE[wasm2js_i32$0]();
  }
  
  function $79() {
   var wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_f64$1 = 0.0, wasm2js_i32$3 = 0, wasm2js_i32$4 = 0, wasm2js_f64$2 = 0.0, wasm2js_i32$5 = 0, wasm2js_i32$6 = 0, wasm2js_f32$0 = Math_fround(0), wasm2js_i32$7 = 0;
-  wasm2js_f64$0 = 0.0;
-  wasm2js_i32$1 = 0;
-  wasm2js_i32$2 = 0;
-  wasm2js_f64$1 = 0.0;
-  wasm2js_i32$3 = 0;
-  wasm2js_i32$4 = 0;
-  wasm2js_f64$2 = 0.0;
-  wasm2js_i32$5 = 0;
-  wasm2js_i32$6 = 0;
-  wasm2js_f32$0 = Math_fround(0.0);
-  wasm2js_i32$7 = 0;
-  wasm2js_i32$0 = 0;
-  FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
+  (((((((((((wasm2js_f64$0 = 0.0, wasm2js_i32$1 = 0), wasm2js_i32$2 = 0), wasm2js_f64$1 = 0.0), wasm2js_i32$3 = 0), wasm2js_i32$4 = 0), wasm2js_f64$2 = 0.0), wasm2js_i32$5 = 0), wasm2js_i32$6 = 0), wasm2js_f32$0 = Math_fround(0.0)), wasm2js_i32$7 = 0), wasm2js_i32$0 = 0), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, +wasm2js_f64$1, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0, +wasm2js_f64$2, wasm2js_i32$5 | 0, wasm2js_i32$6 | 0, Math_fround(wasm2js_f32$0), wasm2js_i32$7 | 0);
  }
  
  function legalstub$24() {
diff --git a/test/wasm2js/func_ptrs.2asm.js b/test/wasm2js/func_ptrs.2asm.js
index 9798a0622..09515b006 100644
--- a/test/wasm2js/func_ptrs.2asm.js
+++ b/test/wasm2js/func_ptrs.2asm.js
@@ -102,18 +102,14 @@ function asmFunc(global, env, buffer) {
  
  function $5(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  function $6(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2, t3, u1, u2, t1, t3];
@@ -160,10 +156,8 @@ function asmFunc(global, env, buffer) {
  
  function $2(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2];
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js
index 1775db6d4..b3f2408c3 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js
+++ b/test/wasm2js/grow-memory-tricky.2asm.js
@@ -23,17 +23,13 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = __wasm_grow_memory(1 | 0);
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return HEAP32[0 >> 2] | 0 | 0;
  }
  
  function $1() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = grow() | 0;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = grow() | 0), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return HEAP32[0 >> 2] | 0 | 0;
  }
  
diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js
index 2b669abf7..90e3813ab 100644
--- a/test/wasm2js/left-to-right.2asm.js
+++ b/test/wasm2js/left-to-right.2asm.js
@@ -113,26 +113,14 @@ function asmFunc(global, env, buffer) {
  }
  
  function reset() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 0;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  HEAP32[8 >> 2] = 0;
  }
  
  function bump() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 11;
-  wasm2js_i32$1 = HEAPU8[10 >> 0] | 0;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
-  wasm2js_i32$0 = 10;
-  wasm2js_i32$1 = HEAPU8[9 >> 0] | 0;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
-  wasm2js_i32$0 = 9;
-  wasm2js_i32$1 = HEAPU8[8 >> 0] | 0;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 4294967293;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[11 >> 0] = HEAPU8[10 >> 0] | 0;
+  HEAP8[10 >> 0] = HEAPU8[9 >> 0] | 0;
+  HEAP8[9 >> 0] = HEAPU8[8 >> 0] | 0;
+  HEAP8[8 >> 0] = 4294967293;
  }
  
  function get() {
@@ -140,150 +128,104 @@ function asmFunc(global, env, buffer) {
  }
  
  function i32_left() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 1;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 1;
   return 0 | 0;
  }
  
  function i32_right() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 2;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 2;
   return 1 | 0;
  }
  
  function i32_callee() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 4;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 4;
   return 0 | 0;
  }
  
  function i32_bool() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 5;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 5;
   return 0 | 0;
  }
  
  function i64_left() {
-  var i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 1;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 1;
   i64toi32_i32$0 = 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
   return 0 | 0;
  }
  
  function i64_right() {
-  var i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 2;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 2;
   i64toi32_i32$0 = 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
   return 1 | 0;
  }
  
  function i64_callee() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 4;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 4;
   return 2 | 0;
  }
  
  function i64_bool() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 5;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 5;
   return 0 | 0;
  }
  
  function f32_left() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 1;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 1;
   return Math_fround(Math_fround(0.0));
  }
  
  function f32_right() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 2;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 2;
   return Math_fround(Math_fround(1.0));
  }
  
  function f32_callee() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 4;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 4;
   return 4 | 0;
  }
  
  function f32_bool() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 5;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 5;
   return 0 | 0;
  }
  
  function f64_left() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 1;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 1;
   return +(0.0);
  }
  
  function f64_right() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 2;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 2;
   return +(1.0);
  }
  
  function f64_callee() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 4;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 4;
   return 6 | 0;
  }
  
  function f64_bool() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   bump();
-  wasm2js_i32$0 = 8;
-  wasm2js_i32$1 = 5;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[8 >> 0] = 5;
   return 0 | 0;
  }
  
@@ -450,27 +392,21 @@ function asmFunc(global, env, buffer) {
  function $58() {
   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;
+  (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() {
   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;
+  (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() {
   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;
+  (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i32_right() | 0), HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
@@ -483,10 +419,7 @@ function asmFunc(global, env, buffer) {
  function $62() {
   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;
-  FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0;
+  ((wasm2js_i32$1 = i32_left() | 0, wasm2js_i32$2 = i32_right() | 0), wasm2js_i32$0 = i32_callee() | 0), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0) | 0;
   return get() | 0 | 0;
  }
  
@@ -1015,46 +948,36 @@ function asmFunc(global, env, buffer) {
  }
  
  function $87() {
-  var i64toi32_i32$0 = 0, $0 = 0, i64toi32_i32$1 = 0, $1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$0 = 0, $0 = 0, i64toi32_i32$1 = 0, $1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   reset();
   $0 = i32_left() | 0;
   i64toi32_i32$0 = i64_right() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $1 = i64toi32_i32$0;
   i64toi32_i32$0 = $0;
-  wasm2js_i32$0 = i64toi32_i32$0;
-  wasm2js_i32$1 = $1;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
-  wasm2js_i32$0 = i64toi32_i32$0;
-  wasm2js_i32$1 = i64toi32_i32$1;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[(wasm2js_i32$2 + 4 | 0) >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 5 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 6 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 7 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  HEAP32[i64toi32_i32$0 >> 2] = $1;
+  (wasm2js_i32$0 = i64toi32_i32$0, wasm2js_i32$1 = i64toi32_i32$1), ((HEAP8[(wasm2js_i32$0 + 4 | 0) >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 5 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 6 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 7 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
   return get() | 0 | 0;
  }
  
  function $88() {
   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;
+  (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() {
   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;
+  (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() {
   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;
+  (wasm2js_i32$0 = i32_left() | 0, wasm2js_i32$1 = i64_right() | 0), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return get() | 0 | 0;
  }
  
@@ -1088,12 +1011,7 @@ function asmFunc(global, env, buffer) {
   $1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  wasm2js_i32$1 = $0;
-  wasm2js_i32$2 = i64toi32_i32$0;
-  wasm2js_i32$3 = $1;
-  wasm2js_i32$4 = i64toi32_i32$1;
-  wasm2js_i32$0 = i64_callee() | 0;
-  FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0) | 0;
+  ((((wasm2js_i32$1 = $0, wasm2js_i32$2 = i64toi32_i32$0), wasm2js_i32$3 = $1), wasm2js_i32$4 = i64toi32_i32$1), wasm2js_i32$0 = i64_callee() | 0), FUNCTION_TABLE[wasm2js_i32$0](wasm2js_i32$1 | 0, wasm2js_i32$2 | 0, wasm2js_i32$3 | 0, wasm2js_i32$4 | 0) | 0;
   return get() | 0 | 0;
  }
  
@@ -1195,9 +1113,7 @@ function asmFunc(global, env, buffer) {
  function $107() {
   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;
+  (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;
  }
  
@@ -1210,10 +1126,7 @@ function asmFunc(global, env, buffer) {
  function $109() {
   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;
-  FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$0), Math_fround(wasm2js_f32$1)) | 0;
+  ((wasm2js_f32$0 = Math_fround(f32_left()), wasm2js_f32$1 = Math_fround(f32_right())), wasm2js_i32$0 = f32_callee() | 0), FUNCTION_TABLE[wasm2js_i32$0](Math_fround(wasm2js_f32$0), Math_fround(wasm2js_f32$1)) | 0;
   return get() | 0 | 0;
  }
  
@@ -1329,9 +1242,7 @@ function asmFunc(global, env, buffer) {
  function $124() {
   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;
+  (wasm2js_i32$0 = i32_left() | 0, wasm2js_f64$0 = +f64_right()), HEAPF64[wasm2js_i32$0 >> 3] = wasm2js_f64$0;
   return get() | 0 | 0;
  }
  
@@ -1344,10 +1255,7 @@ function asmFunc(global, env, buffer) {
  function $126() {
   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;
-  FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, +wasm2js_f64$1) | 0;
+  ((wasm2js_f64$0 = +f64_left(), wasm2js_f64$1 = +f64_right()), wasm2js_i32$0 = f64_callee() | 0), FUNCTION_TABLE[wasm2js_i32$0](+wasm2js_f64$0, +wasm2js_f64$1) | 0;
   return get() | 0 | 0;
  }
  
diff --git a/test/wasm2js/loop.2asm.js b/test/wasm2js/loop.2asm.js
index eb891c8b4..0a540328f 100644
--- a/test/wasm2js/loop.2asm.js
+++ b/test/wasm2js/loop.2asm.js
@@ -349,7 +349,7 @@ function asmFunc(global, env, buffer) {
  }
  
  function $14() {
-  var $0 = 0, $1_1 = 0, $2_1 = 0, $3_1 = 0, $5_1 = 0, wasm2js_i32$0 = 0;
+  var $0 = 0, $1_1 = 0, $2_1 = 0, $3_1 = 0, $5_1 = 0;
   $0 = 0;
   $1_1 = $0;
   loop_in : do {
@@ -359,7 +359,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
    break loop_in;
   } while (1);
-  return wasm2js_i32$0 | 0;
  }
  
  function fx() {
diff --git a/test/wasm2js/select.2asm.js b/test/wasm2js/select.2asm.js
index fdc12ba92..264ebb071 100644
--- a/test/wasm2js/select.2asm.js
+++ b/test/wasm2js/select.2asm.js
@@ -68,13 +68,13 @@ function asmFunc(global, env, buffer) {
  function $4(cond) {
   cond = cond | 0;
   var $1_1 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $5(cond) {
   cond = cond | 0;
   var $1_1 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function legalstub$1($0_1, $1_1, $2_1, $3_1, $4_1) {
diff --git a/test/wasm2js/unaligned.2asm.js b/test/wasm2js/unaligned.2asm.js
index e5da51632..fbcc8796e 100644
--- a/test/wasm2js/unaligned.2asm.js
+++ b/test/wasm2js/unaligned.2asm.js
@@ -83,41 +83,29 @@ function asmFunc(global, env, buffer) {
  }
  
  function $4() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = 0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[wasm2js_i32$2 >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 1 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 2 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 3 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = 0), ((HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 1 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 2 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 3 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
  }
  
  function $5() {
-  var i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   i64toi32_i32$1 = 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = 0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[wasm2js_i32$2 >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 1 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 2 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 3 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = 0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[(wasm2js_i32$2 + 4 | 0) >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 5 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 6 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 7 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = 0), ((HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 1 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 2 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 3 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = 0), ((HEAP8[(wasm2js_i32$0 + 4 | 0) >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 5 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 6 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 7 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
  }
  
  function $6() {
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = (wasm2js_scratch_store_f32(Math_fround(0.0)), wasm2js_scratch_load_i32(0));
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[wasm2js_i32$2 >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 1 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 2 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 3 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = (wasm2js_scratch_store_f32(Math_fround(0.0)), wasm2js_scratch_load_i32(0))), ((HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 1 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 2 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 3 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
  }
  
  function $7() {
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   wasm2js_scratch_store_f64(+(0.0));
   i64toi32_i32$0 = wasm2js_scratch_load_i32(1 | 0) | 0;
   i64toi32_i32$1 = 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = wasm2js_scratch_load_i32(0 | 0) | 0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[wasm2js_i32$2 >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 1 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 2 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 3 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = i64toi32_i32$0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[(wasm2js_i32$2 + 4 | 0) >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 5 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 6 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 7 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = wasm2js_scratch_load_i32(0 | 0) | 0), ((HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 1 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 2 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 3 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = i64toi32_i32$0), ((HEAP8[(wasm2js_i32$0 + 4 | 0) >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 5 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 6 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 7 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
  }
  
  function legalstub$1() {
diff --git a/test/wasm2js/unreachable.2asm.js b/test/wasm2js/unreachable.2asm.js
index 0f4aef7a6..2f5e007b7 100644
--- a/test/wasm2js/unreachable.2asm.js
+++ b/test/wasm2js/unreachable.2asm.js
@@ -35,31 +35,30 @@ function asmFunc(global, env, buffer) {
  }
  
  function $2() {
-  return abort() | 0;
+  abort();
  }
  
  function $3() {
-  return abort() | 0;
+  abort();
  }
  
  function $4() {
-  return +abort();
+  abort();
  }
  
  function $5() {
-  return +abort();
+  abort();
  }
  
  function $6() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $7() {
-  var $0 = 0, wasm2js_i32$0 = 0;
+  var $0 = 0;
   dummy();
-  wasm2js_i32$0 = abort();
-  return wasm2js_i32$0 | 0;
+  abort();
  }
  
  function $8() {
@@ -68,22 +67,19 @@ function asmFunc(global, env, buffer) {
  }
  
  function $9() {
-  var wasm2js_i32$0 = 0;
   dummy();
-  wasm2js_i32$0 = abort();
-  return wasm2js_i32$0 | 0;
+  abort();
  }
  
  function $10() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $11() {
-  var $0 = 0, wasm2js_i32$0 = 0;
+  var $0 = 0;
   dummy();
-  wasm2js_i32$0 = abort();
-  return wasm2js_i32$0 | 0;
+  abort();
  }
  
  function $12() {
@@ -92,10 +88,8 @@ function asmFunc(global, env, buffer) {
  }
  
  function $13() {
-  var wasm2js_i32$0 = 0;
   dummy();
-  wasm2js_i32$0 = abort();
-  return wasm2js_i32$0 | 0;
+  abort();
  }
  
  function $14() {
@@ -109,22 +103,20 @@ function asmFunc(global, env, buffer) {
  }
  
  function $15() {
-  var $0 = 0, $2_1 = 0, wasm2js_i32$0 = 0;
+  var $0 = 0, $2_1 = 0;
   loop_in : do {
    abort();
    break loop_in;
   } while (1);
-  return wasm2js_i32$0 | 0;
  }
  
  function $16() {
-  var $0 = 0, $2_1 = 0, wasm2js_i32$0 = 0;
+  var $0 = 0, $2_1 = 0;
   loop_in : do {
    dummy();
-   wasm2js_i32$0 = abort();
+   abort();
    break loop_in;
   } while (1);
-  return wasm2js_i32$0 | 0;
  }
  
  function $17() {
@@ -149,7 +141,7 @@ function asmFunc(global, env, buffer) {
  }
  
  function $19() {
-  return abort() | 0;
+  abort();
  }
  
  function $20() {
@@ -158,12 +150,12 @@ function asmFunc(global, env, buffer) {
  
  function $21() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $22() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $23() {
@@ -172,21 +164,21 @@ function asmFunc(global, env, buffer) {
  
  function $24() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $25() {
   var $1 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $26() {
-  return abort() | 0;
+  abort();
  }
  
  function $27() {
   var $0 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $28($0, $1) {
@@ -217,20 +209,19 @@ function asmFunc(global, env, buffer) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   var $2_1 = 0, $3_1 = 0;
-  return abort() | 0;
+  abort();
  }
  
  function $31($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
-  var $2_1 = 0, $3_1 = 0, wasm2js_i32$0 = 0;
+  var $2_1 = 0, $3_1 = 0;
   $2_1 = $0;
-  wasm2js_i32$0 = abort();
-  return wasm2js_i32$0 | 0;
+  abort();
  }
  
  function $32() {
-  return abort() | 0;
+  abort();
  }
  
  function $33() {
@@ -266,11 +257,11 @@ function asmFunc(global, env, buffer) {
  }
  
  function $41() {
-  return Math_fround(abort());
+  abort();
  }
  
  function $42() {
-  return abort() | 0;
+  abort();
  }
  
  function $43() {
@@ -290,35 +281,35 @@ function asmFunc(global, env, buffer) {
  }
  
  function $47() {
-  return Math_fround(abort());
+  abort();
  }
  
  function $48() {
-  return abort() | 0;
+  abort();
  }
  
  function $49() {
-  return abort() | 0;
+  abort();
  }
  
  function $50() {
-  return abort() | 0;
+  abort();
  }
  
  function $51() {
-  return abort() | 0;
+  abort();
  }
  
  function $52() {
-  return abort() | 0;
+  abort();
  }
  
  function $53() {
-  return abort() | 0;
+  abort();
  }
  
  function $54() {
-  return abort() | 0;
+  abort();
  }
  
  function legalstub$26() {