diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/wasm/ExpressionTranspiler.java b/transpiler/java/com/google/j2cl/transpiler/backend/wasm/ExpressionTranspiler.java
index b9b3c1aa00..e9a7c5b3fb 100644
--- a/transpiler/java/com/google/j2cl/transpiler/backend/wasm/ExpressionTranspiler.java
+++ b/transpiler/java/com/google/j2cl/transpiler/backend/wasm/ExpressionTranspiler.java
@@ -345,6 +345,14 @@ public boolean enterEmbeddedStatement(EmbeddedStatement embeddedStatement) {
             " (result " + environment.getWasmType(embeddedStatement.getTypeDescriptor()) + ")");
 
         StatementTranspiler.render(statement, sourceBuilder, environment);
+        if (!TypeDescriptors.isPrimitiveVoid(embeddedStatement.getTypeDescriptor())) {
+          // If the embedded statement returns a value, it should have an explicit yield and never
+          // reach the end; we add an unreachable instruction at the end to make the code
+          // verifiable. This prevents wasm from rejecting exhaustive switch expressions that will
+          // never reach this point but wouldn't be verifiable in the resulting wasm.
+          sourceBuilder.newLine();
+          sourceBuilder.append("(unreachable)");
+        }
         sourceBuilder.closeParens();
         return false;
       }
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/Main.java b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/Main.java
index 2526e00e03..5ff1343e5b 100644
--- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/Main.java
+++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/Main.java
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import javaemul.internal.annotations.Wasm;
 import jsinterop.annotations.JsEnum;
 import jsinterop.annotations.JsFunction;
 import jsinterop.annotations.JsMethod;
@@ -146,8 +145,6 @@ public static void testJsEnumSwitch() {
     acceptsSupplierOfSupplier(() -> (() -> ComparableJsEnum.ONE));
   }
 
-  // TODO(b/395108282): Remove nop once the bug is fixed.
-  @Wasm("nop")
   private static void testExhaustiveJsEnumSwitchExpression() {
     ComparableJsEnum comparableJsEnum =
         ComparableJsEnum.ONE.getValue() == 1 ? ComparableJsEnum.TWO : null;
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_wasm/module.wat.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_wasm/module.wat.txt
index 7b6542ad1a..36a21268a0 100644
--- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_wasm/module.wat.txt
+++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_wasm/module.wat.txt
@@ -1191,16 +1191,16 @@
 
 ;;; void Supplier.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.Supplier
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (if (global.get $$class-initialized@jsenum.Main.Supplier)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (global.set $$class-initialized@jsenum.Main.Supplier (i32.const 1))
  )
 )
@@ -1223,16 +1223,16 @@
 
 ;;; void Consumer.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.Consumer
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (if (global.get $$class-initialized@jsenum.Main.Consumer)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (global.set $$class-initialized@jsenum.Main.Consumer (i32.const 1))
  )
 )
@@ -1255,16 +1255,16 @@
 
 ;;; void JsFunctionSuppiler.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.JsFunctionSuppiler
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (if (global.get $$class-initialized@jsenum.Main.JsFunctionSuppiler)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (global.set $$class-initialized@jsenum.Main.JsFunctionSuppiler (i32.const 1))
  )
 )
@@ -1288,16 +1288,16 @@
 ;;; Main Main.$create()
 (func $$create__@jsenum.Main
  (result (ref null $jsenum.Main))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
  (local $$instance (ref null $jsenum.Main))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (call $$clinit__void_<once>_@jsenum.Main )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (local.set $$instance (struct.new $jsenum.Main (ref.as_non_null (global.get $jsenum.Main.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (call $$ctor__void_$p_jsenum_Main@jsenum.Main (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (return (local.get $$instance))
  )
 )
@@ -1305,16 +1305,16 @@
 ;;; void Main.$ctor()
 (func $$ctor__void_$p_jsenum_Main@jsenum.Main
  (param $this (ref null $jsenum.Main))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void Main.testJsEnumSwitch()
 (func $m_testJsEnumSwitch__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:104:21
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:103:21
  (local $comparableJsEnum (ref null $jsenum.Main.ComparableJsEnum))
  (local $$expression i32)
  (local $comparable (ref null $java.lang.Object))
@@ -1328,9 +1328,9 @@
  (local $supplier (ref null $java.lang.Object))
  (local $consummer (ref null $java.lang.Object))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:104:40
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:103:40
   (call $$clinit__void_<once>_@jsenum.Main )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:105:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:104:4
   (local.set $comparableJsEnum (if (result (ref null $jsenum.Main.ComparableJsEnum)) (i32.eq (call $m_getValue__int@jsenum.Main.ComparableJsEnum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1338,30 +1338,30 @@
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $TWO@jsenum.Main.ComparableJsEnum)
   )) (else (ref.null $jsenum.Main.ComparableJsEnum))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:107:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:106:4
   (block $SWITCH.BREAK
    (block
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:107:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:106:4
     (local.set $$expression (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $comparableJsEnum))))
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:107:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:106:4
     (block
      (block
       (block ;; evaluate expression and jump
        (br_table 0 1 (i32.sub (local.get $$expression) (i32.const 2)))
       )
       ;; case 2:
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:109:8
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:108:8
       (br $SWITCH.BREAK)
      )
      ;; default:
     )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:113:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:112:4
   (local.set $comparable (local.get $comparableJsEnum))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:114:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:113:4
   (local.set $comparableJsEnum (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (local.get $comparable)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:116:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:115:4
   (local.set $intJsEnum (if (result (ref null $jsenum.Main.IntJsEnum)) (i32.eq (call $m_getValue__int@jsenum.Main.IntJsEnum (ref.as_non_null (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $ELEVEN@jsenum.Main.IntJsEnum)
@@ -1369,44 +1369,44 @@
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $ELEVEN@jsenum.Main.IntJsEnum)
   )) (else (ref.null $jsenum.Main.IntJsEnum))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:117:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:116:4
   (block $SWITCH_1.BREAK
    (block
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:117:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:116:4
     (local.set $$expression_1 (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $intJsEnum))))
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:117:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:116:4
     (block
      (block
       (block ;; evaluate expression and jump
        (br_table 0 1 (i32.sub (local.get $$expression_1) (i32.const 1)))
       )
       ;; case 1:
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:119:8
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:118:8
       (br $SWITCH_1.BREAK)
      )
      ;; default:
     )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:123:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:122:4
   (local.set $o (local.get $intJsEnum))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:124:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:123:4
   (local.set $intJsEnum (ref.cast (ref null $jsenum.Main.IntJsEnum) (local.get $o)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:127:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:126:4
   (local.set $equal (ref.eq (local.get $intJsEnum) (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:128:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:127:4
   (local.set $isInstance (ref.test (ref $jsenum.Main.IntJsEnum) (local.get $intJsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:130:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:129:4
   (local.set $isInstance (if (result i32) (ref.is_null (local.get $intJsEnum))
    (then (i32.const 0))
    (else 
     (ref.test (ref $java.lang.Comparable.vtable) (call $get.itable.$java.lang.Comparable (local.get $intJsEnum) ))
    )
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:132:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:131:4
   (local.set $stringJsEnum (if (result (ref null $jsenum.Main.StringJsEnum)) (ref.eq (call $m_getValue__java_lang_String@jsenum.Main.StringJsEnum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
@@ -1414,26 +1414,26 @@
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $THREE@jsenum.Main.StringJsEnum)
   )) (else (ref.null $jsenum.Main.StringJsEnum))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:133:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:132:4
   (block $SWITCH_2.BREAK
    (block
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:133:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:132:4
     (local.set $$expression_2 (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $stringJsEnum))))
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:133:4
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:132:4
     (block
      (block
       (block ;; evaluate expression and jump
        (br_table 0 1 (local.get $$expression_2))
       )
       ;; case 0:
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:135:8
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:134:8
       (br $SWITCH_2.BREAK)
      )
      ;; default:
     )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:139:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:138:4
   (drop (call $m_compareTo__java_lang_Enum__int@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
@@ -1441,7 +1441,7 @@
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $THREE@jsenum.Main.NativeStringEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:140:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:139:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
@@ -1449,46 +1449,95 @@
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $THREE@jsenum.Main.NativeStringEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:4
   (local.set $supplier (call $$create__@jsenum.Main.$LambdaImplementor$1 ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:4
   (local.set $consummer (call $$create__@jsenum.Main.$LambdaImplementor$2 ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:4
   (call $m_acceptsJsFunctionSupplier__jsenum_Main_JsFunctionSuppiler__void@jsenum.Main (call $$create__@jsenum.Main.$LambdaImplementor$3 ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:4
   (call $m_acceptsSupplierOfSupplier__jsenum_Main_Supplier__void@jsenum.Main (call $$create__@jsenum.Main.$LambdaImplementor$5 ))
  )
 )
 
+;;; void Main.testExhaustiveJsEnumSwitchExpression()
+(func $m_testExhaustiveJsEnumSwitchExpression__void@jsenum.Main
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:148:22
+ (local $comparableJsEnum (ref null $jsenum.Main.ComparableJsEnum))
+ (local $i i32)
+ (local $$expression i32)
+ (block
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:149:4
+  (local.set $comparableJsEnum (if (result (ref null $jsenum.Main.ComparableJsEnum)) (i32.eq (call $m_getValue__int@jsenum.Main.ComparableJsEnum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
+   (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
+   (global.get $ONE@jsenum.Main.ComparableJsEnum)
+  ))) (i32.const 1)) (then (block (result (ref null $jsenum.Main.ComparableJsEnum))
+   (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
+   (global.get $TWO@jsenum.Main.ComparableJsEnum)
+  )) (else (ref.null $jsenum.Main.ComparableJsEnum))))
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:151:4
+  (local.set $i 
+  (block $SWITCH (result i32)
+   (block
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:152:8
+    (local.set $$expression (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $comparableJsEnum))))
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:152:8
+    (block
+     (block
+      (block
+       (block ;; evaluate expression and jump
+        (br_table 2 1 0 3 (local.get $$expression))
+       )
+       ;; case 2:
+       ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:153:22
+       (i32.const 2)
+       (br $SWITCH)
+      )
+      ;; case 1:
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:154:22
+      (i32.const 1)
+      (br $SWITCH)
+     )
+     ;; case 0:
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:155:23
+     (i32.const 0)
+     (br $SWITCH)
+    )
+   )
+   (unreachable)
+  ))
+ )
+)
+
 ;;; void Main.testJsEnumAutoboxingSpecialMethods()
 (func $m_testJsEnumAutoboxingSpecialMethods__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:162:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:159:22
  (local $stringJsEnum (ref null $jsenum.Main.StringJsEnum))
  (local $nullStringJsEnum (ref null $jsenum.Main.StringJsEnum))
  (local $jsEnum (ref null $jsenum.Main.ComparableJsEnum))
  (local $nullJsEnum (ref null $jsenum.Main.ComparableJsEnum))
  (local $o (ref null $java.lang.Object))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:163:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:160:4
   (local.set $stringJsEnum (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:164:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:161:4
   (local.set $nullStringJsEnum (ref.null $jsenum.Main.StringJsEnum))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:165:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:162:4
   (local.set $jsEnum (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:166:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:163:4
   (local.set $nullJsEnum (ref.null $jsenum.Main.ComparableJsEnum))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:167:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:164:4
   (local.set $o (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:169:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:166:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
@@ -1496,32 +1545,32 @@
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $THREE@jsenum.Main.StringJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:170:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:167:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))(local.get $stringJsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:171:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:168:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))(local.get $nullStringJsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:172:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:169:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))(ref.null $java.lang.Object)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:173:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:170:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))(local.get $o)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:174:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:171:4
   (drop (call_ref $function.m_equals__java_lang_Object__boolean (ref.as_non_null (local.get $o))(block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $THREE@jsenum.Main.StringJsEnum)
   )(struct.get $java.lang.Object.vtable $m_equals__java_lang_Object__boolean (struct.get $java.lang.Object $vtable(local.get $o)))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:176:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:173:4
   (drop (call $m_compareTo__java_lang_Enum__int@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1529,12 +1578,12 @@
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ZERO@jsenum.Main.ComparableJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:177:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:174:4
   (drop (call $m_compareTo__java_lang_Enum__int@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))(ref.null $jsenum.Main.ComparableJsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:178:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:175:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1542,37 +1591,37 @@
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ZERO@jsenum.Main.ComparableJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:179:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:176:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))(local.get $jsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:180:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:177:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))(local.get $nullJsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:181:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:178:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))(ref.null $java.lang.Object)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:182:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:179:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))(local.get $o)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:183:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:180:4
   (drop (call_ref $function.m_equals__java_lang_Object__boolean (ref.as_non_null (local.get $o))(block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ZERO@jsenum.Main.ComparableJsEnum)
   )(struct.get $java.lang.Object.vtable $m_equals__java_lang_Object__boolean (struct.get $java.lang.Object $vtable(local.get $o)))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:185:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:182:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))(local.get $jsEnum)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:187:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:184:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (call $m_boxingPassthrough__java_lang_Object__java_lang_Object@jsenum.Main (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1580,7 +1629,7 @@
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   )))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:188:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:185:4
   (drop (call $m_equals__java_lang_Object__boolean@java.lang.Enum (ref.as_non_null (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (call $m_boxingPassthrough__java_lang_Object__java_lang_Object@jsenum.Main (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1594,7 +1643,7 @@
 ;;; void Main.acceptsJsFunctionSupplier(JsFunctionSuppiler<ComparableJsEnum> supplier)
 (func $m_acceptsJsFunctionSupplier__jsenum_Main_JsFunctionSuppiler__void@jsenum.Main
  (param $supplier (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:196:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:193:22
  (block
  )
 )
@@ -1602,22 +1651,22 @@
 ;;; void Main.acceptsSupplierOfSupplier(Supplier<Supplier<ComparableJsEnum>> supplier)
 (func $m_acceptsSupplierOfSupplier__jsenum_Main_Supplier__void@jsenum.Main
  (param $supplier (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:198:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:195:22
  (block
  )
 )
 
 ;;; void Main.testReturnsAndParameters()
 (func $m_testReturnsAndParameters__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:200:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:197:22
  (local $returnedValue (ref null $jsenum.Main.ComparableJsEnum))
  (local $returnedNullValue (ref null $jsenum.Main.ComparableJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:201:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:198:4
   (local.set $returnedValue (call $m_returnsJsEnum__jsenum_Main_ComparableJsEnum@jsenum.Main ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:202:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:199:4
   (local.set $returnedNullValue (call $m_returnsNullJsEnum__jsenum_Main_ComparableJsEnum@jsenum.Main ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:203:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:200:4
   (call $m_takesJsEnum__jsenum_Main_ComparableJsEnum__void@jsenum.Main (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1628,9 +1677,9 @@
 ;;; ComparableJsEnum Main.returnsJsEnum()
 (func $m_returnsJsEnum__jsenum_Main_ComparableJsEnum@jsenum.Main
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:206:34
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:203:34
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:207:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:204:4
   (return (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1641,9 +1690,9 @@
 ;;; ComparableJsEnum Main.returnsNullJsEnum()
 (func $m_returnsNullJsEnum__jsenum_Main_ComparableJsEnum@jsenum.Main
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:210:34
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:207:34
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:211:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:208:4
   (return (ref.null $jsenum.Main.ComparableJsEnum))
  )
 )
@@ -1651,40 +1700,40 @@
 ;;; void Main.takesJsEnum(ComparableJsEnum value)
 (func $m_takesJsEnum__jsenum_Main_ComparableJsEnum__void@jsenum.Main
  (param $value (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:214:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:211:22
  (block
  )
 )
 
 ;;; void Main.testBoxUnboxWithTypeInference()
 (func $m_testBoxUnboxWithTypeInference__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:216:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:213:22
  (local $templatedField (ref null $jsenum.Main.TemplatedField))
  (local $unboxed (ref null $jsenum.Main.ComparableJsEnum))
  (local $b i32)
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:218:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:215:4
   (local.set $templatedField (call $$create__java_lang_Object@jsenum.Main.TemplatedField (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:220:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:217:4
   (local.set $unboxed (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (call_ref $function.m_getValue__java_lang_Object_$pp_jsenum (ref.as_non_null (local.get $templatedField))(struct.get $jsenum.Main.TemplatedField.vtable $m_getValue__java_lang_Object_$pp_jsenum (struct.get $jsenum.Main.TemplatedField $vtable(local.get $templatedField))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:221:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:218:4
   (local.set $unboxed (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (struct.get $jsenum.Main.TemplatedField $value@jsenum.Main.TemplatedField (local.get $templatedField))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:222:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:219:4
   (struct.set $jsenum.Main.TemplatedField $value@jsenum.Main.TemplatedField (local.get $templatedField) (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:223:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:220:4
   (drop (call $m_asList__arrayOf_java_lang_Object__java_util_List@java.util.Arrays (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
   )))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:224:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:221:4
   (drop (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (call_ref $function.m_getValue__java_lang_Object_$pp_jsenum (ref.as_non_null (local.get $templatedField))(struct.get $jsenum.Main.TemplatedField.vtable $m_getValue__java_lang_Object_$pp_jsenum (struct.get $jsenum.Main.TemplatedField $vtable(local.get $templatedField))))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:222:4
   (local.set $b (ref.eq (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -1699,20 +1748,20 @@
 (func $m_boxingPassthrough__java_lang_Object__java_lang_Object@jsenum.Main
  (param $t (ref null $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:240:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:237:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:241:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:238:4
   (return (local.get $t))
  )
 )
 
 ;;; void Main.boxingWithGenerics()
 (func $m_boxingWithGenerics__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:244:14
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:241:14
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:244:35
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:241:35
   (call $$clinit__void_<once>_@jsenum.Main )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:242:4
   (drop (call $$create__java_util_Optional@jsenum.Main.Foo (call $m_of__java_lang_Object__java_util_Optional@java.util.Optional (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
@@ -1724,11 +1773,11 @@
 (func $m_varargsConsumer__arrayOf_java_lang_Object__java_lang_Object@jsenum.Main
  (param $arg0 (ref null $javaemul.internal.WasmArray.OfObject))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:302:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:299:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:302:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:299:23
   (call $$clinit__void_<once>_@jsenum.Main )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:302:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:299:23
   (return (call $m_varargsConsumer_$private__arrayOf_java_lang_Object__java_lang_Object@jsenum.Main (local.get $arg0)))
  )
 )
@@ -1737,19 +1786,19 @@
 (func $m_varargsConsumer_$private__arrayOf_java_lang_Object__java_lang_Object@jsenum.Main
  (param $args (ref null $javaemul.internal.WasmArray.OfObject))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:302:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:299:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:300:4
   (return (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $args)) (i32.const 0)))
  )
 )
 
 ;;; void Main.testVarargs()
 (func $m_testVarargs__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:318:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:315:22
  (local $consumer (ref null $java.lang.Object))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:319:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:4
   (drop (call $m_varargsConsumer_$private__arrayOf_java_lang_Object__java_lang_Object@jsenum.Main (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.SomeJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.SomeJsEnum )
    (global.get $A@jsenum.Main.SomeJsEnum)
@@ -1757,14 +1806,14 @@
    (call $$clinit__void_<once>_@jsenum.Main.SomeJsEnum )
    (global.get $A@jsenum.Main.SomeJsEnum)
   )))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:4
   (local.set $consumer (call $$create__@jsenum.Main.$LambdaImplementor$6 ))
  )
 )
 
 ;;; void Main.testNonNativeJsEnumArrays()
 (func $m_testNonNativeJsEnumArrays__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:323:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:22
  (local $arr (ref null $javaemul.internal.WasmArray.OfObject))
  (local $b1 i32)
  (local $b2 i32)
@@ -1775,7 +1824,7 @@
  (local $arrayWithNull (ref null $javaemul.internal.WasmArray.OfObject))
  (local $list (ref null $java.lang.Object))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:324:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:321:4
   (local.set $arr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
@@ -1783,51 +1832,51 @@
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:325:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:322:4
   (local.set $b1 (ref.eq (ref.cast (ref null $jsenum.Main.IntJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))) (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:326:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:323:4
   (local.set $b2 (ref.eq (ref.cast (ref null $jsenum.Main.IntJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 1))) (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:327:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:324:4
   (local.set $obj (ref.cast (ref null $jsenum.Main.IntJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:328:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:325:4
   (local.set $v (ref.cast (ref null $jsenum.Main.IntJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:330:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:327:4
   (local.set $arr2 (call $m_newWithLength__int__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (i32.const 2)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:331:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:328:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr2)) (i32.const 0) (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:332:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:329:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr2)) (i32.const 1) (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:334:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:331:4
   (local.set $nestedArr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
   ))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:335:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:332:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $nestedArr)) (i32.const 0) (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:337:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:334:4
   (local.set $arrayWithNull (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (ref.null $java.lang.Object))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:338:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:335:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arrayWithNull)) (i32.const 0) (ref.null $java.lang.Object))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:340:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:337:4
   (local.set $list (call $$create__@java.util.ArrayList ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:341:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:338:4
   (local.set $obj (call_ref $function.m_toArray__arrayOf_java_lang_Object (ref.as_non_null (local.get $list))(struct.get $java.util.List.vtable $m_toArray__arrayOf_java_lang_Object (ref.cast (ref $java.util.List.vtable) (call $get.itable.$java.util.List (local.get $list))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:343:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:340:4
   (call $m_nonNativeJsEnumVarargs__arrayOf_jsenum_Main_IntJsEnum__void@jsenum.Main (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
@@ -1835,7 +1884,7 @@
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:344:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:341:4
   (call $m_nonNativeJsEnumArrayVarargs__arrayOf_arrayOf_jsenum_Main_IntJsEnum__void@jsenum.Main (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
@@ -1843,7 +1892,7 @@
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $TWENTY@jsenum.Main.IntJsEnum)
   ))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:347:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:344:4
   (call $m_tVarargs__arrayOf_java_lang_Object__void@jsenum.Main (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.IntJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.IntJsEnum )
    (global.get $MINUSONE@jsenum.Main.IntJsEnum)
@@ -1857,10 +1906,10 @@
 ;;; void Main.nonNativeJsEnumVarargs(IntJsEnum... values)
 (func $m_nonNativeJsEnumVarargs__arrayOf_jsenum_Main_IntJsEnum__void@jsenum.Main
  (param $values (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:350:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:347:22
  (local $v (ref null $jsenum.Main.IntJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:351:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:348:4
   (local.set $v (ref.cast (ref null $jsenum.Main.IntJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $values)) (i32.const 0))))
  )
 )
@@ -1868,10 +1917,10 @@
 ;;; void Main.nonNativeJsEnumArrayVarargs(IntJsEnum[]... values)
 (func $m_nonNativeJsEnumArrayVarargs__arrayOf_arrayOf_jsenum_Main_IntJsEnum__void@jsenum.Main
  (param $values (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:354:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:351:22
  (local $v (ref null $javaemul.internal.WasmArray.OfObject))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:355:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:352:4
   (local.set $v (ref.cast (ref null $javaemul.internal.WasmArray.OfObject) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $values)) (i32.const 0))))
  )
 )
@@ -1879,17 +1928,17 @@
 ;;; void Main.tVarargs(T... values)
 (func $m_tVarargs__arrayOf_java_lang_Object__void@jsenum.Main
  (param $values (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:358:26
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:355:26
  (local $v (ref null $java.lang.Object))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:359:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:356:4
   (local.set $v (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $values)) (i32.const 0)))
  )
 )
 
 ;;; void Main.testNonNativeStringJsEnumArrays()
 (func $m_testNonNativeStringJsEnumArrays__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:362:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:359:22
  (local $arr (ref null $javaemul.internal.WasmArray.OfObject))
  (local $b1 i32)
  (local $obj (ref null $java.lang.Object))
@@ -1898,7 +1947,7 @@
  (local $nestedArr (ref null $javaemul.internal.WasmArray.OfObject))
  (local $arrayWithNull (ref null $javaemul.internal.WasmArray.OfObject))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:363:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:360:4
   (local.set $arr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
@@ -1906,44 +1955,44 @@
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $THREE@jsenum.Main.StringJsEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:364:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:361:4
   (local.set $b1 (ref.eq (ref.cast (ref null $jsenum.Main.StringJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))) (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:365:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:362:4
   (local.set $obj (ref.cast (ref null $jsenum.Main.StringJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:366:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:363:4
   (local.set $v (ref.cast (ref null $jsenum.Main.StringJsEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:368:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:365:4
   (local.set $arr2 (call $m_newWithLength__int__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (i32.const 2)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:369:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:366:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr2)) (i32.const 0) (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:371:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:368:4
   (local.set $nestedArr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.StringJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.StringJsEnum )
    (global.get $ONE@jsenum.Main.StringJsEnum)
   ))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:373:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:370:4
   (local.set $arrayWithNull (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (ref.null $java.lang.Object))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:374:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:371:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arrayWithNull)) (i32.const 0) (ref.null $java.lang.Object))
  )
 )
 
 ;;; void Main.testNativeJsEnumArrays()
 (func $m_testNativeJsEnumArrays__void@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:377:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:374:22
  (local $arr (ref null $javaemul.internal.WasmArray.OfObject))
  (local $b1 i32)
  (local $arr2 (ref null $javaemul.internal.WasmArray.OfObject))
  (local $nestedArr (ref null $javaemul.internal.WasmArray.OfObject))
  (local $arrayWithNull (ref null $javaemul.internal.WasmArray.OfObject))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:378:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:375:4
   (local.set $arr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
@@ -1951,49 +2000,49 @@
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $THREE@jsenum.Main.NativeStringEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:379:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:376:4
   (local.set $b1 (ref.eq (ref.cast (ref null $jsenum.Main.NativeStringEnum) (array.get $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr)) (i32.const 0))) (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
   )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:381:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:378:4
   (local.set $arr2 (call $m_newWithLength__int__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (i32.const 2)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:382:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:379:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arr2)) (i32.const 0) (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
   ))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:384:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:381:4
   (local.set $nestedArr (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $ONE@jsenum.Main.NativeStringEnum)
   ))))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:385:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:382:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $nestedArr)) (i32.const 0) (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (block (result (ref null $jsenum.Main.NativeStringEnum))
    (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
    (global.get $THREE@jsenum.Main.NativeStringEnum)
   ))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:387:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:384:4
   (local.set $arrayWithNull (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (ref.null $java.lang.Object))))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:388:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:385:4
   (array.set $java.lang.Object.array (struct.get $javaemul.internal.WasmArray.OfObject $elements@javaemul.internal.WasmArray.OfObject (local.get $arrayWithNull)) (i32.const 0) (ref.null $java.lang.Object))
  )
 )
 
 ;;; void Main.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (if (global.get $$class-initialized@jsenum.Main)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (global.set $$class-initialized@jsenum.Main (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:28:13
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2030,27 +2079,27 @@
 ;;; void $LambdaAdaptor.$ctor()
 (func $$ctor__void_$p_jsenum_Main_Supplier_$LambdaAdaptor@jsenum.Main.Supplier.$LambdaAdaptor
  (param $this (ref null $jsenum.Main.Supplier.$LambdaAdaptor))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void $LambdaAdaptor.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.Supplier.$LambdaAdaptor
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (if (global.get $$class-initialized@jsenum.Main.Supplier.$LambdaAdaptor)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (global.set $$class-initialized@jsenum.Main.Supplier.$LambdaAdaptor (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:30:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:29:12
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2087,27 +2136,27 @@
 ;;; void $LambdaAdaptor.$ctor()
 (func $$ctor__void_$p_jsenum_Main_Consumer_$LambdaAdaptor@jsenum.Main.Consumer.$LambdaAdaptor
  (param $this (ref null $jsenum.Main.Consumer.$LambdaAdaptor))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void $LambdaAdaptor.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.Consumer.$LambdaAdaptor
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (if (global.get $$class-initialized@jsenum.Main.Consumer.$LambdaAdaptor)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (global.set $$class-initialized@jsenum.Main.Consumer.$LambdaAdaptor (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:34:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:33:12
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2144,27 +2193,27 @@
 ;;; void $LambdaAdaptor.$ctor()
 (func $$ctor__void_$p_jsenum_Main_JsFunctionSuppiler_$LambdaAdaptor@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor
  (param $this (ref null $jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void $LambdaAdaptor.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (if (global.get $$class-initialized@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (global.set $$class-initialized@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:192:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:189:12
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2202,16 +2251,16 @@
 (func $$create__java_lang_Object@jsenum.Main.TemplatedField
  (param $value (ref null $java.lang.Object))
  (result (ref null $jsenum.Main.TemplatedField))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
  (local $$instance (ref null $jsenum.Main.TemplatedField))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
   (call $$clinit__void_<once>_@jsenum.Main.TemplatedField )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
   (local.set $$instance (struct.new $jsenum.Main.TemplatedField (ref.as_non_null (global.get $jsenum.Main.TemplatedField.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0) (ref.null $java.lang.Object)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
   (call $$ctor__java_lang_Object__void_$p_jsenum_Main_TemplatedField@jsenum.Main.TemplatedField (ref.as_non_null (local.get $$instance))(local.get $value))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
   (return (local.get $$instance))
  )
 )
@@ -2220,11 +2269,11 @@
 (func $$ctor__java_lang_Object__void_$p_jsenum_Main_TemplatedField@jsenum.Main.TemplatedField
  (param $this (ref null $jsenum.Main.TemplatedField))
  (param $value (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:231:28
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:28
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:232:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:229:6
   (struct.set $jsenum.Main.TemplatedField $value@jsenum.Main.TemplatedField (local.get $this) (local.get $value))
  )
 )
@@ -2234,11 +2283,11 @@
  (type $function.m_getValue__java_lang_Object_$pp_jsenum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:235:6
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:232:6
  (local $this (ref null $jsenum.Main.TemplatedField))
  (local.set $this (ref.cast (ref $jsenum.Main.TemplatedField) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:236:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:233:6
   (return (struct.get $jsenum.Main.TemplatedField $value@jsenum.Main.TemplatedField (local.get $this)))
  )
 )
@@ -2246,18 +2295,18 @@
 
 ;;; void TemplatedField.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.TemplatedField
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:23
   (if (global.get $$class-initialized@jsenum.Main.TemplatedField)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:23
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:23
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:23
   (global.set $$class-initialized@jsenum.Main.TemplatedField (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:228:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:225:23
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2295,16 +2344,16 @@
 (func $$create__java_util_Optional@jsenum.Main.Foo
  (param $c (ref null $java.util.Optional))
  (result (ref null $jsenum.Main.Foo))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
  (local $$instance (ref null $jsenum.Main.Foo))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
   (call $$clinit__void_<once>_@jsenum.Main.Foo )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
   (local.set $$instance (struct.new $jsenum.Main.Foo (ref.as_non_null (global.get $jsenum.Main.Foo.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
   (call $$ctor__java_util_Optional__void_$p_jsenum_Main_Foo@jsenum.Main.Foo (ref.as_non_null (local.get $$instance))(local.get $c))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
   (return (local.get $$instance))
  )
 )
@@ -2313,27 +2362,27 @@
 (func $$ctor__java_util_Optional__void_$p_jsenum_Main_Foo@jsenum.Main.Foo
  (param $this (ref null $jsenum.Main.Foo))
  (param $c (ref null $java.util.Optional))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:249:31
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:246:31
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void Foo.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.Foo
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:248:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:248:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:15
   (if (global.get $$class-initialized@jsenum.Main.Foo)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:248:15
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:15
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:248:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:15
   (global.set $$class-initialized@jsenum.Main.Foo (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:248:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:245:15
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2370,16 +2419,16 @@
 ;;; SupplierConsumerImpl<T> SupplierConsumerImpl.$create()
 (func $$create__@jsenum.Main.SupplierConsumerImpl
  (result (ref null $jsenum.Main.SupplierConsumerImpl))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
  (local $$instance (ref null $jsenum.Main.SupplierConsumerImpl))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (call $$clinit__void_<once>_@jsenum.Main.SupplierConsumerImpl )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (local.set $$instance (struct.new $jsenum.Main.SupplierConsumerImpl (ref.as_non_null (global.get $jsenum.Main.SupplierConsumerImpl.vtable)) (ref.as_non_null (global.get $jsenum.Main.SupplierConsumerImpl.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (call $$ctor__void_$p_jsenum_Main_SupplierConsumerImpl@jsenum.Main.SupplierConsumerImpl (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (return (local.get $$instance))
  )
 )
@@ -2387,9 +2436,9 @@
 ;;; void SupplierConsumerImpl.$ctor()
 (func $$ctor__void_$p_jsenum_Main_SupplierConsumerImpl@jsenum.Main.SupplierConsumerImpl
  (param $this (ref null $jsenum.Main.SupplierConsumerImpl))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
@@ -2399,7 +2448,7 @@
  (type $function.m_accept__java_lang_Object__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $t (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:267:16
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:16
  (local $this (ref null $jsenum.Main.SupplierConsumerImpl))
  (local.set $this (ref.cast (ref $jsenum.Main.SupplierConsumerImpl) (local.get $this.untyped)))
  (block
@@ -2412,11 +2461,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:270:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:267:13
  (local $this (ref null $jsenum.Main.SupplierConsumerImpl))
  (local.set $this (ref.cast (ref $jsenum.Main.SupplierConsumerImpl) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:271:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:268:6
   (return (ref.null $java.lang.Object))
  )
 )
@@ -2424,18 +2473,18 @@
 
 ;;; void SupplierConsumerImpl.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.SupplierConsumerImpl
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (if (global.get $$class-initialized@jsenum.Main.SupplierConsumerImpl)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (global.set $$class-initialized@jsenum.Main.SupplierConsumerImpl (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:264:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:261:15
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2471,16 +2520,16 @@
 
 ;;; void ComparableJsEnumSupplierConsumer.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.ComparableJsEnumSupplierConsumer
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:275:12
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:272:12
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:275:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:272:12
   (if (global.get $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumer)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:275:12
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:272:12
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:275:12
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:272:12
   (global.set $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumer (i32.const 1))
  )
 )
@@ -2505,14 +2554,14 @@
 (func $$create__arrayOf_java_lang_Object@jsenum.Main.BaseVarargs
  (param $args (ref null $javaemul.internal.WasmArray.OfObject))
  (result (ref null $jsenum.Main.BaseVarargs))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:4
  (local $$instance (ref null $jsenum.Main.BaseVarargs))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:4
   (local.set $$instance (struct.new $jsenum.Main.BaseVarargs (ref.as_non_null (global.get $jsenum.Main.BaseVarargs.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:4
   (call $$ctor__arrayOf_java_lang_Object__void_$p_jsenum_Main_BaseVarargs@jsenum.Main.BaseVarargs (ref.as_non_null (local.get $$instance))(local.get $args))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:4
   (return (local.get $$instance))
  )
 )
@@ -2521,27 +2570,27 @@
 (func $$ctor__arrayOf_java_lang_Object__void_$p_jsenum_Main_BaseVarargs@jsenum.Main.BaseVarargs
  (param $this (ref null $jsenum.Main.BaseVarargs))
  (param $args (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:27
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:304:27
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void BaseVarargs.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.BaseVarargs
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:306:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:306:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:23
   (if (global.get $$class-initialized@jsenum.Main.BaseVarargs)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:306:23
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:23
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:306:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:23
   (global.set $$class-initialized@jsenum.Main.BaseVarargs (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:306:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:303:23
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -2578,16 +2627,16 @@
 ;;; <anonymous> implements Supplier<ComparableJsEnum> <anonymous> implements Supplier<ComparableJsEnum>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$1
  (result (ref null $jsenum.Main.$LambdaImplementor$1))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$1))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$1 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$1 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$1.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$1.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$1@jsenum.Main.$LambdaImplementor$1 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (return (local.get $$instance))
  )
 )
@@ -2595,9 +2644,9 @@
 ;;; void <anonymous> implements Supplier<ComparableJsEnum>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$1@jsenum.Main.$LambdaImplementor$1
  (param $this (ref null $jsenum.Main.$LambdaImplementor$1))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (call $$ctor__void_$p_jsenum_Main_Supplier_$LambdaAdaptor@jsenum.Main.Supplier.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -2607,11 +2656,11 @@
  (type $function.m_get__jsenum_Main_ComparableJsEnum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
  (local $this (ref null $jsenum.Main.$LambdaImplementor$1))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$1) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:48
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:48
   (return (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -2625,11 +2674,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
  (local $this (ref null $jsenum.Main.$LambdaImplementor$1))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$1) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (return (call_ref $function.m_get__jsenum_Main_ComparableJsEnum (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.$LambdaImplementor$1.vtable $m_get__jsenum_Main_ComparableJsEnum (struct.get $jsenum.Main.$LambdaImplementor$1 $vtable(local.get $this)))))
  )
 )
@@ -2637,18 +2686,18 @@
 
 ;;; void <anonymous> implements Supplier<ComparableJsEnum>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$1
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$1)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$1 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:141:42
   (call $$clinit__void_<once>_@jsenum.Main.Supplier.$LambdaAdaptor )
  )
 )
@@ -2672,16 +2721,16 @@
 ;;; <anonymous> implements Consumer<ComparableJsEnum> <anonymous> implements Consumer<ComparableJsEnum>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$2
  (result (ref null $jsenum.Main.$LambdaImplementor$2))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$2))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$2 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$2 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$2.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$2.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$2@jsenum.Main.$LambdaImplementor$2 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (return (local.get $$instance))
  )
 )
@@ -2689,9 +2738,9 @@
 ;;; void <anonymous> implements Consumer<ComparableJsEnum>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$2@jsenum.Main.$LambdaImplementor$2
  (param $this (ref null $jsenum.Main.$LambdaImplementor$2))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (call $$ctor__void_$p_jsenum_Main_Consumer_$LambdaAdaptor@jsenum.Main.Consumer.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -2701,11 +2750,11 @@
  (type $function.m_accept__jsenum_Main_ComparableJsEnum__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $e (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
  (local $this (ref null $jsenum.Main.$LambdaImplementor$2))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$2) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:48
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:48
   (drop (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $e))))
  )
 )
@@ -2716,11 +2765,11 @@
  (type $function.m_accept__java_lang_Object__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $arg0 (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
  (local $this (ref null $jsenum.Main.$LambdaImplementor$2))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$2) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (call_ref $function.m_accept__jsenum_Main_ComparableJsEnum__void (ref.as_non_null (local.get $this))(ref.cast (ref null $jsenum.Main.ComparableJsEnum) (local.get $arg0))(struct.get $jsenum.Main.$LambdaImplementor$2.vtable $m_accept__jsenum_Main_ComparableJsEnum__void (struct.get $jsenum.Main.$LambdaImplementor$2 $vtable(local.get $this))))
  )
 )
@@ -2728,18 +2777,18 @@
 
 ;;; void <anonymous> implements Consumer<ComparableJsEnum>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$2
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$2)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$2 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:143:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:142:43
   (call $$clinit__void_<once>_@jsenum.Main.Consumer.$LambdaAdaptor )
  )
 )
@@ -2763,16 +2812,16 @@
 ;;; <anonymous> implements JsFunctionSuppiler<ComparableJsEnum> <anonymous> implements JsFunctionSuppiler<ComparableJsEnum>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$3
  (result (ref null $jsenum.Main.$LambdaImplementor$3))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$3))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$3 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$3 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$3.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$3.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$3@jsenum.Main.$LambdaImplementor$3 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (return (local.get $$instance))
  )
 )
@@ -2780,9 +2829,9 @@
 ;;; void <anonymous> implements JsFunctionSuppiler<ComparableJsEnum>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$3@jsenum.Main.$LambdaImplementor$3
  (param $this (ref null $jsenum.Main.$LambdaImplementor$3))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (call $$ctor__void_$p_jsenum_Main_JsFunctionSuppiler_$LambdaAdaptor@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -2792,11 +2841,11 @@
  (type $function.m_get__jsenum_Main_ComparableJsEnum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
  (local $this (ref null $jsenum.Main.$LambdaImplementor$3))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$3) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:36
   (return (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -2810,11 +2859,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
  (local $this (ref null $jsenum.Main.$LambdaImplementor$3))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$3) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (return (call_ref $function.m_get__jsenum_Main_ComparableJsEnum (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.$LambdaImplementor$3.vtable $m_get__jsenum_Main_ComparableJsEnum (struct.get $jsenum.Main.$LambdaImplementor$3 $vtable(local.get $this)))))
  )
 )
@@ -2822,18 +2871,18 @@
 
 ;;; void <anonymous> implements JsFunctionSuppiler<ComparableJsEnum>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$3
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$3)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$3 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:144:30
   (call $$clinit__void_<once>_@jsenum.Main.JsFunctionSuppiler.$LambdaAdaptor )
  )
 )
@@ -2857,16 +2906,16 @@
 ;;; <anonymous> implements Supplier<ComparableJsEnum> <anonymous> implements Supplier<ComparableJsEnum>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$4
  (result (ref null $jsenum.Main.$LambdaImplementor$4))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$4))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$4 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$4 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$4.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$4.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$4@jsenum.Main.$LambdaImplementor$4 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (return (local.get $$instance))
  )
 )
@@ -2874,9 +2923,9 @@
 ;;; void <anonymous> implements Supplier<ComparableJsEnum>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$4@jsenum.Main.$LambdaImplementor$4
  (param $this (ref null $jsenum.Main.$LambdaImplementor$4))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (call $$ctor__void_$p_jsenum_Main_Supplier_$LambdaAdaptor@jsenum.Main.Supplier.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -2886,11 +2935,11 @@
  (type $function.m_get__jsenum_Main_ComparableJsEnum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
  (local $this (ref null $jsenum.Main.$LambdaImplementor$4))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$4) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:43
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:43
   (return (block (result (ref null $jsenum.Main.ComparableJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum )
    (global.get $ONE@jsenum.Main.ComparableJsEnum)
@@ -2904,11 +2953,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
  (local $this (ref null $jsenum.Main.$LambdaImplementor$4))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$4) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (return (call_ref $function.m_get__jsenum_Main_ComparableJsEnum (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.$LambdaImplementor$4.vtable $m_get__jsenum_Main_ComparableJsEnum (struct.get $jsenum.Main.$LambdaImplementor$4 $vtable(local.get $this)))))
  )
 )
@@ -2916,18 +2965,18 @@
 
 ;;; void <anonymous> implements Supplier<ComparableJsEnum>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$4
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$4)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$4 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:37
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:37
   (call $$clinit__void_<once>_@jsenum.Main.Supplier.$LambdaAdaptor )
  )
 )
@@ -2951,16 +3000,16 @@
 ;;; <anonymous> implements Supplier<Supplier<ComparableJsEnum>> <anonymous> implements Supplier<Supplier<ComparableJsEnum>>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$5
  (result (ref null $jsenum.Main.$LambdaImplementor$5))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$5))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$5 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$5 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$5.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$5.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$5@jsenum.Main.$LambdaImplementor$5 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (return (local.get $$instance))
  )
 )
@@ -2968,9 +3017,9 @@
 ;;; void <anonymous> implements Supplier<Supplier<ComparableJsEnum>>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$5@jsenum.Main.$LambdaImplementor$5
  (param $this (ref null $jsenum.Main.$LambdaImplementor$5))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (call $$ctor__void_$p_jsenum_Main_Supplier_$LambdaAdaptor@jsenum.Main.Supplier.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -2980,11 +3029,11 @@
  (type $function.m_get__jsenum_Main_Supplier)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
  (local $this (ref null $jsenum.Main.$LambdaImplementor$5))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$5) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:36
   (return (call $$create__@jsenum.Main.$LambdaImplementor$4 ))
  )
 )
@@ -2995,11 +3044,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
  (local $this (ref null $jsenum.Main.$LambdaImplementor$5))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$5) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (return (call_ref $function.m_get__jsenum_Main_Supplier (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.$LambdaImplementor$5.vtable $m_get__jsenum_Main_Supplier (struct.get $jsenum.Main.$LambdaImplementor$5 $vtable(local.get $this)))))
  )
 )
@@ -3007,18 +3056,18 @@
 
 ;;; void <anonymous> implements Supplier<Supplier<ComparableJsEnum>>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$5
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$5)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$5 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:146:30
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:145:30
   (call $$clinit__void_<once>_@jsenum.Main.Supplier.$LambdaAdaptor )
  )
 )
@@ -3042,16 +3091,16 @@
 ;;; <anonymous> implements Consumer<SomeJsEnum> <anonymous> implements Consumer<SomeJsEnum>.$create()
 (func $$create__@jsenum.Main.$LambdaImplementor$6
  (result (ref null $jsenum.Main.$LambdaImplementor$6))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
  (local $$instance (ref null $jsenum.Main.$LambdaImplementor$6))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (call $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$6 )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (local.set $$instance (struct.new $jsenum.Main.$LambdaImplementor$6 (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$6.vtable)) (ref.as_non_null (global.get $jsenum.Main.$LambdaImplementor$6.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (call $$ctor__void_$p_jsenum_Main_$LambdaImplementor$6@jsenum.Main.$LambdaImplementor$6 (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (return (local.get $$instance))
  )
 )
@@ -3059,9 +3108,9 @@
 ;;; void <anonymous> implements Consumer<SomeJsEnum>.$ctor()
 (func $$ctor__void_$p_jsenum_Main_$LambdaImplementor$6@jsenum.Main.$LambdaImplementor$6
  (param $this (ref null $jsenum.Main.$LambdaImplementor$6))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (call $$ctor__void_$p_jsenum_Main_Consumer_$LambdaAdaptor@jsenum.Main.Consumer.$LambdaAdaptor (ref.as_non_null (local.get $this)))
  )
 )
@@ -3071,11 +3120,11 @@
  (type $function.m_accept__jsenum_Main_SomeJsEnum__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $arg0 (ref null $jsenum.Main.SomeJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
  (local $this (ref null $jsenum.Main.$LambdaImplementor$6))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$6) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (drop (call $m_varargsConsumer__arrayOf_java_lang_Object__java_lang_Object@jsenum.Main (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 1 (local.get $arg0)))))
  )
 )
@@ -3086,11 +3135,11 @@
  (type $function.m_accept__java_lang_Object__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $arg0 (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
  (local $this (ref null $jsenum.Main.$LambdaImplementor$6))
  (local.set $this (ref.cast (ref $jsenum.Main.$LambdaImplementor$6) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (call_ref $function.m_accept__jsenum_Main_SomeJsEnum__void (ref.as_non_null (local.get $this))(ref.cast (ref null $jsenum.Main.SomeJsEnum) (local.get $arg0))(struct.get $jsenum.Main.$LambdaImplementor$6.vtable $m_accept__jsenum_Main_SomeJsEnum__void (struct.get $jsenum.Main.$LambdaImplementor$6 $vtable(local.get $this))))
  )
 )
@@ -3098,18 +3147,18 @@
 
 ;;; void <anonymous> implements Consumer<SomeJsEnum>.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.$LambdaImplementor$6
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (if (global.get $$class-initialized@jsenum.Main.$LambdaImplementor$6)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (global.set $$class-initialized@jsenum.Main.$LambdaImplementor$6 (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:320:36
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:317:36
   (call $$clinit__void_<once>_@jsenum.Main.Consumer.$LambdaAdaptor )
  )
 )
@@ -3135,14 +3184,14 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
  (local $$instance (ref null $jsenum.Main.ComparableJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (local.set $$instance (struct.new $jsenum.Main.ComparableJsEnum (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (call $$ctor__java_lang_String__int__void_$p_jsenum_Main_ComparableJsEnum@jsenum.Main.ComparableJsEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (return (local.get $$instance))
  )
 )
@@ -3152,13 +3201,13 @@
  (param $this (ref null $jsenum.Main.ComparableJsEnum))
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
  )
 )
@@ -3168,11 +3217,11 @@
  (type $function.m_getValue__int)
  (param $this.untyped (ref $java.lang.Object))
  (result i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:44:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:43:15
  (local $this (ref null $jsenum.Main.ComparableJsEnum))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnum) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:45:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:44:6
   (return (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $this))))
  )
 )
@@ -3180,24 +3229,24 @@
 
 ;;; void ComparableJsEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.ComparableJsEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (if (global.get $$class-initialized@jsenum.Main.ComparableJsEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (global.set $$class-initialized@jsenum.Main.ComparableJsEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:38:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:40:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:39:4
   (global.set $ZERO@jsenum.Main.ComparableJsEnum (call $$create__java_lang_String__int@jsenum.Main.ComparableJsEnum (ref.null $java.lang.String)(i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:41:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:40:4
   (global.set $ONE@jsenum.Main.ComparableJsEnum (call $$create__java_lang_String__int@jsenum.Main.ComparableJsEnum (ref.null $java.lang.String)(i32.const 1)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:42:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:41:4
   (global.set $TWO@jsenum.Main.ComparableJsEnum (call $$create__java_lang_String__int@jsenum.Main.ComparableJsEnum (ref.null $java.lang.String)(i32.const 2)))
  )
 )
@@ -3236,11 +3285,11 @@
  (type $function.m_getValue__int)
  (param $this.untyped (ref $java.lang.Object))
  (result i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:57:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:56:15
  (local $this (ref null $jsenum.Main.IntJsEnum))
  (local.set $this (ref.cast (ref $jsenum.Main.IntJsEnum) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:58:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:57:6
   (return (struct.get $jsenum.Main.IntJsEnum $value@jsenum.Main.IntJsEnum (local.get $this)))
  )
 )
@@ -3252,14 +3301,14 @@
  (param $$ordinal i32)
  (param $value i32)
  (result (ref null $jsenum.Main.IntJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
  (local $$instance (ref null $jsenum.Main.IntJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
   (local.set $$instance (struct.new $jsenum.Main.IntJsEnum (ref.as_non_null (global.get $jsenum.Main.IntJsEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.IntJsEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
   (call $$ctor__java_lang_String__int__int__void_$p_jsenum_Main_IntJsEnum@jsenum.Main.IntJsEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal)(local.get $value))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
   (return (local.get $$instance))
  )
 )
@@ -3270,39 +3319,39 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (param $value i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:4
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:25
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:60:25
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:62:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:61:6
   (struct.set $jsenum.Main.IntJsEnum $value@jsenum.Main.IntJsEnum (local.get $this) (local.get $value))
  )
 )
 
 ;;; void IntJsEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.IntJsEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:49:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:49:7
   (if (global.get $$class-initialized@jsenum.Main.IntJsEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:49:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:49:7
   (global.set $$class-initialized@jsenum.Main.IntJsEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:49:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:51:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:50:4
   (global.set $MINUSONE@jsenum.Main.IntJsEnum (call $$create__java_lang_String__int__int@jsenum.Main.IntJsEnum (ref.null $java.lang.String)(i32.const 0)(i32.const -1)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:52:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:51:4
   (global.set $TWENTY@jsenum.Main.IntJsEnum (call $$create__java_lang_String__int__int@jsenum.Main.IntJsEnum (ref.null $java.lang.String)(i32.const 1)(i32.const 20)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:53:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:52:4
   (global.set $ELEVEN@jsenum.Main.IntJsEnum (call $$create__java_lang_String__int__int@jsenum.Main.IntJsEnum (ref.null $java.lang.String)(i32.const 2)(i32.const 11)))
  )
 )
@@ -3341,11 +3390,11 @@
  (type $function.m_getValue__java_lang_String)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.String))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:73:18
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:72:18
  (local $this (ref null $jsenum.Main.StringJsEnum))
  (local.set $this (ref.cast (ref $jsenum.Main.StringJsEnum) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:74:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:73:6
   (return (struct.get $jsenum.Main.StringJsEnum $value@jsenum.Main.StringJsEnum (local.get $this)))
  )
 )
@@ -3357,14 +3406,14 @@
  (param $$ordinal i32)
  (param $value (ref null $java.lang.String))
  (result (ref null $jsenum.Main.StringJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
  (local $$instance (ref null $jsenum.Main.StringJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
   (local.set $$instance (struct.new $jsenum.Main.StringJsEnum (ref.as_non_null (global.get $jsenum.Main.StringJsEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.StringJsEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0) (ref.null $java.lang.String)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
   (call $$ctor__java_lang_String__int__java_lang_String__void_$p_jsenum_Main_StringJsEnum@jsenum.Main.StringJsEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal)(local.get $value))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
   (return (local.get $$instance))
  )
 )
@@ -3375,37 +3424,37 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (param $value (ref null $java.lang.String))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:4
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:31
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:76:31
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:78:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:77:6
   (struct.set $jsenum.Main.StringJsEnum $value@jsenum.Main.StringJsEnum (local.get $this) (local.get $value))
  )
 )
 
 ;;; void StringJsEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.StringJsEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:66:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:66:7
   (if (global.get $$class-initialized@jsenum.Main.StringJsEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:66:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:66:7
   (global.set $$class-initialized@jsenum.Main.StringJsEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:66:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:68:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:67:4
   (global.set $ONE@jsenum.Main.StringJsEnum (call $$create__java_lang_String__int__java_lang_String@jsenum.Main.StringJsEnum (ref.null $java.lang.String)(i32.const 0)(call $$getString_|ONE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:69:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:68:4
   (global.set $THREE@jsenum.Main.StringJsEnum (call $$create__java_lang_String__int__java_lang_String@jsenum.Main.StringJsEnum (ref.null $java.lang.String)(i32.const 1)(call $$getString_|THREE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )))
  )
 )
@@ -3444,11 +3493,11 @@
  (type $function.m_getValue__java_lang_String)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.String))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:89:18
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:88:18
  (local $this (ref null $jsenum.Main.NonNullableStringJsEnum))
  (local.set $this (ref.cast (ref $jsenum.Main.NonNullableStringJsEnum) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:90:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:89:6
   (return (struct.get $jsenum.Main.NonNullableStringJsEnum $value@jsenum.Main.NonNullableStringJsEnum (local.get $this)))
  )
 )
@@ -3460,14 +3509,14 @@
  (param $$ordinal i32)
  (param $value (ref null $java.lang.String))
  (result (ref null $jsenum.Main.NonNullableStringJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
  (local $$instance (ref null $jsenum.Main.NonNullableStringJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
   (local.set $$instance (struct.new $jsenum.Main.NonNullableStringJsEnum (ref.as_non_null (global.get $jsenum.Main.NonNullableStringJsEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.NonNullableStringJsEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0) (ref.null $java.lang.String)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
   (call $$ctor__java_lang_String__int__java_lang_String__void_$p_jsenum_Main_NonNullableStringJsEnum@jsenum.Main.NonNullableStringJsEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal)(local.get $value))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
   (return (local.get $$instance))
  )
 )
@@ -3478,37 +3527,37 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (param $value (ref null $java.lang.String))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:4
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:42
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:92:42
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:94:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:93:6
   (struct.set $jsenum.Main.NonNullableStringJsEnum $value@jsenum.Main.NonNullableStringJsEnum (local.get $this) (local.get $value))
  )
 )
 
 ;;; void NonNullableStringJsEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.NonNullableStringJsEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:82:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:82:7
   (if (global.get $$class-initialized@jsenum.Main.NonNullableStringJsEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:82:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:82:7
   (global.set $$class-initialized@jsenum.Main.NonNullableStringJsEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:82:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:84:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:83:4
   (global.set $ONE@jsenum.Main.NonNullableStringJsEnum (call $$create__java_lang_String__int__java_lang_String@jsenum.Main.NonNullableStringJsEnum (ref.null $java.lang.String)(i32.const 0)(call $$getString_|ONE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:85:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:84:4
   (global.set $THREE@jsenum.Main.NonNullableStringJsEnum (call $$create__java_lang_String__int__java_lang_String@jsenum.Main.NonNullableStringJsEnum (ref.null $java.lang.String)(i32.const 1)(call $$getString_|THREE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )))
  )
 )
@@ -3547,14 +3596,14 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (result (ref null $jsenum.Main.NativeStringEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (local $$instance (ref null $jsenum.Main.NativeStringEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (local.set $$instance (struct.new $jsenum.Main.NativeStringEnum (ref.as_non_null (global.get $jsenum.Main.NativeStringEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.NativeStringEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (call $$ctor__java_lang_String__int__void_$p_jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (return (local.get $$instance))
  )
 )
@@ -3564,13 +3613,13 @@
  (param $this (ref null $jsenum.Main.NativeStringEnum))
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
  )
 )
@@ -3579,20 +3628,20 @@
 (func $m_valueOf__java_lang_String__jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum
  (param $name (ref null $java.lang.String))
  (result (ref null $jsenum.Main.NativeStringEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (if (ref.is_null (global.get $namesToValuesMap@jsenum.Main.NativeStringEnum))
    (then
     (block
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
      (global.set $namesToValuesMap@jsenum.Main.NativeStringEnum (call $m_createMapFromValues__arrayOf_java_lang_Enum__java_util_Map@javaemul.internal.Enums (call $m_values_$private__arrayOf_jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum )))
     )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (return (ref.cast (ref null $jsenum.Main.NativeStringEnum) (call $m_getValueFromNameAndMap__java_lang_String__java_util_Map__java_lang_Object@javaemul.internal.Enums (local.get $name)(global.get $namesToValuesMap@jsenum.Main.NativeStringEnum))))
  )
 )
@@ -3600,11 +3649,11 @@
 ;;; NativeStringEnum[] NativeStringEnum.values()
 (func $m_values__arrayOf_jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum
  (result (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (call $$clinit__void_<once>_@jsenum.Main.NativeStringEnum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (return (call $m_values_$private__arrayOf_jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum ))
  )
 )
@@ -3612,31 +3661,31 @@
 ;;; NativeStringEnum[] NativeStringEnum.values_$private()
 (func $m_values_$private__arrayOf_jsenum_Main_NativeStringEnum@jsenum.Main.NativeStringEnum
  (result (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (return (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (global.get $ONE@jsenum.Main.NativeStringEnum)(global.get $THREE@jsenum.Main.NativeStringEnum))))
  )
 )
 
 ;;; void NativeStringEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.NativeStringEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (if (global.get $$class-initialized@jsenum.Main.NativeStringEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (global.set $$class-initialized@jsenum.Main.NativeStringEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:98:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:100:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:99:4
   (global.set $ONE@jsenum.Main.NativeStringEnum (call $$create__java_lang_String__int@jsenum.Main.NativeStringEnum (call $$getString_|ONE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )(i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:101:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:100:4
   (global.set $THREE@jsenum.Main.NativeStringEnum (call $$create__java_lang_String__int@jsenum.Main.NativeStringEnum (call $$getString_|THREE|__java_lang_String_<once>_@jsenum.Main.StringJsEnum )(i32.const 1)))
  )
 )
@@ -3675,14 +3724,14 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (result (ref null $jsenum.Main.JsEnumWithRenamedProperties))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
  (local $$instance (ref null $jsenum.Main.JsEnumWithRenamedProperties))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (local.set $$instance (struct.new $jsenum.Main.JsEnumWithRenamedProperties (ref.as_non_null (global.get $jsenum.Main.JsEnumWithRenamedProperties.vtable)) (ref.as_non_null (global.get $jsenum.Main.JsEnumWithRenamedProperties.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (call $$ctor__java_lang_String__int__void_$p_jsenum_Main_JsEnumWithRenamedProperties@jsenum.Main.JsEnumWithRenamedProperties (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (return (local.get $$instance))
  )
 )
@@ -3692,13 +3741,13 @@
  (param $this (ref null $jsenum.Main.JsEnumWithRenamedProperties))
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
  )
 )
@@ -3708,11 +3757,11 @@
  (type $function.m_getValue__int)
  (param $this.untyped (ref $java.lang.Object))
  (result i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:259:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:256:15
  (local $this (ref null $jsenum.Main.JsEnumWithRenamedProperties))
  (local.set $this (ref.cast (ref $jsenum.Main.JsEnumWithRenamedProperties) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:260:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:257:6
   (return (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (local.get $this))))
  )
 )
@@ -3720,24 +3769,24 @@
 
 ;;; void JsEnumWithRenamedProperties.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.JsEnumWithRenamedProperties
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (if (global.get $$class-initialized@jsenum.Main.JsEnumWithRenamedProperties)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (global.set $$class-initialized@jsenum.Main.JsEnumWithRenamedProperties (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:250:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:254:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:251:4
   (global.set $ZERO@jsenum.Main.JsEnumWithRenamedProperties (call $$create__java_lang_String__int@jsenum.Main.JsEnumWithRenamedProperties (ref.null $java.lang.String)(i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:256:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:253:4
   (global.set $ONE@jsenum.Main.JsEnumWithRenamedProperties (call $$create__java_lang_String__int@jsenum.Main.JsEnumWithRenamedProperties (ref.null $java.lang.String)(i32.const 1)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:257:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:254:4
   (global.set $TWO@jsenum.Main.JsEnumWithRenamedProperties (call $$create__java_lang_String__int@jsenum.Main.JsEnumWithRenamedProperties (ref.null $java.lang.String)(i32.const 2)))
  )
 )
@@ -3774,16 +3823,16 @@
 ;;; ComparableJsEnumSupplierConsumerImpl ComparableJsEnumSupplierConsumerImpl.$create()
 (func $$create__@jsenum.Main.ComparableJsEnumSupplierConsumerImpl
  (result (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImpl))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
  (local $$instance (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImpl))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnumSupplierConsumerImpl )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (local.set $$instance (struct.new $jsenum.Main.ComparableJsEnumSupplierConsumerImpl (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnumSupplierConsumerImpl.vtable)) (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnumSupplierConsumerImpl.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (call $$ctor__void_$p_jsenum_Main_ComparableJsEnumSupplierConsumerImpl@jsenum.Main.ComparableJsEnumSupplierConsumerImpl (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (return (local.get $$instance))
  )
 )
@@ -3791,9 +3840,9 @@
 ;;; void ComparableJsEnumSupplierConsumerImpl.$ctor()
 (func $$ctor__void_$p_jsenum_Main_ComparableJsEnumSupplierConsumerImpl@jsenum.Main.ComparableJsEnumSupplierConsumerImpl
  (param $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImpl))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (call $$ctor__void_$p_jsenum_Main_SupplierConsumerImpl@jsenum.Main.SupplierConsumerImpl (ref.as_non_null (local.get $this)))
  )
 )
@@ -3803,11 +3852,11 @@
  (type $function.m_accept__jsenum_Main_ComparableJsEnum__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $arg0 (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImpl))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImpl) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (call $m_accept__java_lang_Object__void@jsenum.Main.SupplierConsumerImpl (ref.as_non_null (local.get $this))(local.get $arg0))
  )
 )
@@ -3818,11 +3867,11 @@
  (type $function.m_get__jsenum_Main_ComparableJsEnum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImpl))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImpl) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (return (ref.cast (ref null $jsenum.Main.ComparableJsEnum) (call_ref $function.m_get__java_lang_Object (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImpl.vtable $m_get__java_lang_Object (struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImpl $vtable(local.get $this))))))
  )
 )
@@ -3830,18 +3879,18 @@
 
 ;;; void ComparableJsEnumSupplierConsumerImpl.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.ComparableJsEnumSupplierConsumerImpl
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (if (global.get $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumerImpl)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (global.set $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumerImpl (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:280:15
   (call $$clinit__void_<once>_@jsenum.Main.SupplierConsumerImpl )
  )
 )
@@ -3878,16 +3927,16 @@
 ;;; ComparableJsEnumSupplierConsumerImplWithOverrides ComparableJsEnumSupplierConsumerImplWithOverrides.$create()
 (func $$create__@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides
  (result (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
  (local $$instance (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (call $$clinit__void_<once>_@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (local.set $$instance (struct.new $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides.vtable)) (ref.as_non_null (global.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides.itable)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (call $$ctor__void_$p_jsenum_Main_ComparableJsEnumSupplierConsumerImplWithOverrides@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (return (local.get $$instance))
  )
 )
@@ -3895,9 +3944,9 @@
 ;;; void ComparableJsEnumSupplierConsumerImplWithOverrides.$ctor()
 (func $$ctor__void_$p_jsenum_Main_ComparableJsEnumSupplierConsumerImplWithOverrides@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides
  (param $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (call $$ctor__void_$p_jsenum_Main_SupplierConsumerImpl@jsenum.Main.SupplierConsumerImpl (ref.as_non_null (local.get $this)))
  )
 )
@@ -3907,7 +3956,7 @@
  (type $function.m_accept__jsenum_Main_ComparableJsEnum__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $t (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:289:16
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:16
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides) (local.get $this.untyped)))
  (block
@@ -3920,11 +3969,11 @@
  (type $function.m_get__jsenum_Main_ComparableJsEnum)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $jsenum.Main.ComparableJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:292:28
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:289:28
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:293:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:290:6
   (return (ref.null $jsenum.Main.ComparableJsEnum))
  )
 )
@@ -3935,11 +3984,11 @@
  (type $function.m_get__java_lang_Object)
  (param $this.untyped (ref $java.lang.Object))
  (result (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (return (call_ref $function.m_get__jsenum_Main_ComparableJsEnum (ref.as_non_null (local.get $this))(struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides.vtable $m_get__jsenum_Main_ComparableJsEnum (struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides $vtable(local.get $this)))))
  )
 )
@@ -3950,11 +3999,11 @@
  (type $function.m_accept__java_lang_Object__void)
  (param $this.untyped (ref $java.lang.Object))
  (param $arg0 (ref null $java.lang.Object))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
  (local $this (ref null $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides))
  (local.set $this (ref.cast (ref $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides) (local.get $this.untyped)))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (call_ref $function.m_accept__jsenum_Main_ComparableJsEnum__void (ref.as_non_null (local.get $this))(ref.cast (ref null $jsenum.Main.ComparableJsEnum) (local.get $arg0))(struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides.vtable $m_accept__jsenum_Main_ComparableJsEnum__void (struct.get $jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides $vtable(local.get $this))))
  )
 )
@@ -3962,18 +4011,18 @@
 
 ;;; void ComparableJsEnumSupplierConsumerImplWithOverrides.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (if (global.get $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (global.set $$class-initialized@jsenum.Main.ComparableJsEnumSupplierConsumerImplWithOverrides (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:286:15
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:283:15
   (call $$clinit__void_<once>_@jsenum.Main.SupplierConsumerImpl )
  )
 )
@@ -4012,14 +4061,14 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (result (ref null $jsenum.Main.SomeJsEnum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
  (local $$instance (ref null $jsenum.Main.SomeJsEnum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (local.set $$instance (struct.new $jsenum.Main.SomeJsEnum (ref.as_non_null (global.get $jsenum.Main.SomeJsEnum.vtable)) (ref.as_non_null (global.get $jsenum.Main.SomeJsEnum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (call $$ctor__java_lang_String__int__void_$p_jsenum_Main_SomeJsEnum@jsenum.Main.SomeJsEnum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (return (local.get $$instance))
  )
 )
@@ -4029,33 +4078,33 @@
  (param $this (ref null $jsenum.Main.SomeJsEnum))
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
  )
 )
 
 ;;; void SomeJsEnum.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.SomeJsEnum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (if (global.get $$class-initialized@jsenum.Main.SomeJsEnum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (global.set $$class-initialized@jsenum.Main.SomeJsEnum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:298:14
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:295:14
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:299:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:296:4
   (global.set $A@jsenum.Main.SomeJsEnum (call $$create__java_lang_String__int@jsenum.Main.SomeJsEnum (ref.null $java.lang.String)(i32.const 0)))
  )
 )
@@ -4092,14 +4141,14 @@
 ;;; SubtypeVarargs SubtypeVarargs.$create()
 (func $$create__@jsenum.Main.SubtypeVarargs
  (result (ref null $jsenum.Main.SubtypeVarargs))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:311:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:308:4
  (local $$instance (ref null $jsenum.Main.SubtypeVarargs))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:311:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:308:4
   (local.set $$instance (struct.new $jsenum.Main.SubtypeVarargs (ref.as_non_null (global.get $jsenum.Main.SubtypeVarargs.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:311:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:308:4
   (call $$ctor__void_$p_jsenum_Main_SubtypeVarargs@jsenum.Main.SubtypeVarargs (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:311:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:308:4
   (return (local.get $$instance))
  )
 )
@@ -4107,9 +4156,9 @@
 ;;; void SubtypeVarargs.$ctor()
 (func $$ctor__void_$p_jsenum_Main_SubtypeVarargs@jsenum.Main.SubtypeVarargs
  (param $this (ref null $jsenum.Main.SubtypeVarargs))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:311:4
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:308:4
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:312:6
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:309:6
   (call $$ctor__arrayOf_java_lang_Object__void_$p_jsenum_Main_BaseVarargs@jsenum.Main.BaseVarargs (ref.as_non_null (local.get $this))(call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (block (result (ref null $jsenum.Main.SomeJsEnum))
    (call $$clinit__void_<once>_@jsenum.Main.SomeJsEnum )
    (global.get $A@jsenum.Main.SomeJsEnum)
@@ -4122,18 +4171,18 @@
 
 ;;; void SubtypeVarargs.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.SubtypeVarargs
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:310:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:310:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:23
   (if (global.get $$class-initialized@jsenum.Main.SubtypeVarargs)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:310:23
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:23
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:310:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:23
   (global.set $$class-initialized@jsenum.Main.SubtypeVarargs (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:310:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:307:23
   (call $$clinit__void_<once>_@jsenum.Main.BaseVarargs )
  )
 )
@@ -4170,14 +4219,14 @@
 ;;; SubtypeImplicitVarargs SubtypeImplicitVarargs.$create()
 (func $$create__@jsenum.Main.SubtypeImplicitVarargs
  (result (ref null $jsenum.Main.SubtypeImplicitVarargs))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
  (local $$instance (ref null $jsenum.Main.SubtypeImplicitVarargs))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (local.set $$instance (struct.new $jsenum.Main.SubtypeImplicitVarargs (ref.as_non_null (global.get $jsenum.Main.SubtypeImplicitVarargs.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (call $$ctor__void_$p_jsenum_Main_SubtypeImplicitVarargs@jsenum.Main.SubtypeImplicitVarargs (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (return (local.get $$instance))
  )
 )
@@ -4185,27 +4234,27 @@
 ;;; void SubtypeImplicitVarargs.$ctor()
 (func $$ctor__void_$p_jsenum_Main_SubtypeImplicitVarargs@jsenum.Main.SubtypeImplicitVarargs
  (param $this (ref null $jsenum.Main.SubtypeImplicitVarargs))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (call $$ctor__arrayOf_java_lang_Object__void_$p_jsenum_Main_BaseVarargs@jsenum.Main.BaseVarargs (ref.as_non_null (local.get $this))(call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 0 )))
  )
 )
 
 ;;; void SubtypeImplicitVarargs.$clinit()
 (func $$clinit__void_<once>_@jsenum.Main.SubtypeImplicitVarargs
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (if (global.get $$class-initialized@jsenum.Main.SubtypeImplicitVarargs)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (global.set $$class-initialized@jsenum.Main.SubtypeImplicitVarargs (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:316:23
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/jsenum/readable-j2wasm.js/jsenum/Main.java:313:23
   (call $$clinit__void_<once>_@jsenum.Main.BaseVarargs )
  )
 )
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/SwitchExpression.java b/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/SwitchExpression.java
index 62562fbbfc..0d5e35db67 100644
--- a/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/SwitchExpression.java
+++ b/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/SwitchExpression.java
@@ -15,8 +15,6 @@
  */
 package switchexpression;
 
-import javaemul.internal.annotations.Wasm;
-
 public class SwitchExpression {
   @SuppressWarnings("unused")
   private static void testBasicSwitchExpressions() {
@@ -79,8 +77,6 @@ enum Enum {
     B;
   }
 
-  // TODO(b/395108282): Remove nop once the bug is fixed.
-  @Wasm("nop")
   private static void testExhaustiveSwitchExpression() {
     long i =
         switch (Enum.A) {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/output_wasm/module.wat.txt b/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/output_wasm/module.wat.txt
index 06b311170b..320158dd53 100644
--- a/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/output_wasm/module.wat.txt
+++ b/transpiler/javatests/com/google/j2cl/readable/java/switchexpression/output_wasm/module.wat.txt
@@ -97,16 +97,16 @@
 ;;; SwitchExpression SwitchExpression.$create()
 (func $$create__@switchexpression.SwitchExpression
  (result (ref null $switchexpression.SwitchExpression))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
  (local $$instance (ref null $switchexpression.SwitchExpression))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (call $$clinit__void_<once>_@switchexpression.SwitchExpression )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (local.set $$instance (struct.new $switchexpression.SwitchExpression (ref.as_non_null (global.get $switchexpression.SwitchExpression.vtable)) (ref.as_non_null (global.get $itable.empty)) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (call $$ctor__void_$p_switchexpression_SwitchExpression@switchexpression.SwitchExpression (ref.as_non_null (local.get $$instance)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (return (local.get $$instance))
  )
 )
@@ -114,27 +114,27 @@
 ;;; void SwitchExpression.$ctor()
 (func $$ctor__void_$p_switchexpression_SwitchExpression@switchexpression.SwitchExpression
  (param $this (ref null $switchexpression.SwitchExpression))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (call $$ctor__void_$p_java_lang_Object@java.lang.Object (ref.as_non_null (local.get $this)))
  )
 )
 
 ;;; void SwitchExpression.testBasicSwitchExpressions()
 (func $m_testBasicSwitchExpressions__void@switchexpression.SwitchExpression
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:22:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:22
  (local $a i32)
  (local $i i64)
  (local $j (ref null $java.lang.Short))
  (local $$value i32)
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:23:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:21:4
   (local.set $a (i32.const 0))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:27:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:25:4
   (local.set $i 
   (block $SWITCH (result i64)
-   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:28:8
+   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:26:8
    (block
     (block
      (block
@@ -142,45 +142,46 @@
        (br_table 0 2 1 1 2 (i32.sub (i32.const 3) (i32.const 1)))
       )
       ;; case 1:
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:30:20
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:28:20
       (i64.const 5)
       (br $SWITCH)
      )
      ;; case 3,4:
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:32:23
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:30:23
      (throw $exception.event (call $m_toJs__java_lang_Throwable__javaemul_internal_ThrowableUtils_JsObject@javaemul.internal.Exceptions (call $$create__@java.lang.RuntimeException )))
     )
     ;; default:
     (block
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:35:12
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:33:12
      (local.set $j (call $m_valueOf__short__java_lang_Short@java.lang.Short (i32.extend16_s (block (result i32)
       (local.set $$value (local.get $a))
       (local.set $a (i32.add (local.get $a) (i32.const 1)))
       (local.get $$value)
      ))))
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:36:12
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:34:12
      (i64.extend_i32_s (call $m_shortValue__short@java.lang.Short (ref.as_non_null (local.get $j))))
      (br $SWITCH)
     )
    )
+   (unreachable)
   ))
  )
 )
 
 ;;; void SwitchExpression.testSwitchExpressionsWithComplexControlFlow()
 (func $m_testSwitchExpressionsWithComplexControlFlow__void@switchexpression.SwitchExpression
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:41:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:39:22
  (local $a i32)
  (local $i i64)
  (local $j (ref null $java.lang.Short))
  (local $$value i32)
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:42:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:40:4
   (local.set $a (i32.const 0))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:43:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:41:4
   (local.set $i 
   (block $SWITCH (result i64)
-   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:44:8
+   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:42:8
    (block
     (block
      (block
@@ -188,33 +189,33 @@
        (br_table 0 2 1 1 2 (i32.sub (i32.const 3) (i32.const 1)))
       )
       ;; case 1:
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:45:20
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:43:20
       (i64.const 5)
       (br $SWITCH)
      )
      ;; case 3,4:
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:46:23
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:44:23
      (throw $exception.event (call $m_toJs__java_lang_Throwable__javaemul_internal_ThrowableUtils_JsObject@javaemul.internal.Exceptions (call $$create__@java.lang.RuntimeException )))
     )
     ;; default:
     (block
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:48:12
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:46:12
      (local.set $j (call $m_valueOf__short__java_lang_Short@java.lang.Short (i32.extend16_s (block (result i32)
       (local.set $$value (local.get $a))
       (local.set $a (i32.add (local.get $a) (i32.const 1)))
       (local.get $$value)
      ))))
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:49:12
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:47:12
      (block $LOOP.BREAK
       (loop
        (br_if 1 (i32.eqz (i32.lt_s (call $m_shortValue__short@java.lang.Short (ref.as_non_null (local.get $j))) (i32.const 3))))
        (block $LOOP.CONTINUE
         (block
-         ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:50:14
+         ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:48:14
          (if (i32.eq (call $m_shortValue__short@java.lang.Short (ref.as_non_null (local.get $j))) (i32.const 2))
           (then
            (block
-            ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:51:16
+            ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:49:16
             (i64.const 2)
             (br $SWITCH)
            )
@@ -225,95 +226,136 @@
        (br 0)
       )
      )
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:54:12
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:52:12
      (i64.extend_i32_s (call $m_shortValue__short@java.lang.Short (ref.as_non_null (local.get $j))))
      (br $SWITCH)
     )
    )
+   (unreachable)
   ))
  )
 )
 
 ;;; void SwitchExpression.testNestedSwitchExpressions()
 (func $m_testNestedSwitchExpressions__void@switchexpression.SwitchExpression
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:59:22
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:57:22
  (local $a i32)
  (local $i i64)
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:60:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:58:4
   (local.set $a (i32.const 0))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:61:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:59:4
   (local.set $i 
   (block $SWITCH (result i64)
-   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:62:8
+   ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:60:8
    (block
     (block
      (block ;; evaluate expression and jump
       (br_table 0 1 (i32.sub (i32.const 3) (i32.const 1)))
      )
      ;; case 1:
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:65:14
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:63:14
      
      (block $SWITCH_1 (result i64)
-      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:65:14
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:63:14
       (block
        (block
         (block ;; evaluate expression and jump
          (br_table 0 1 (i32.sub (i32.const 5) (i32.const 1)))
         )
         ;; case 1:
-        ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:66:26
+        ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:64:26
         (i64.const 10)
         (br $SWITCH_1)
        )
        ;; default:
-       ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:68:20
+       ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:66:20
        
        (block $SWITCH_2 (result i64)
-        ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:68:20
+        ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:66:20
         (block
          (block
           (block ;; evaluate expression and jump
            (br_table 0 1 (i32.sub (i32.const 6) (i32.const 1)))
           )
           ;; case 1:
-          ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:69:32
+          ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:67:32
           (throw $exception.event (call $m_toJs__java_lang_Throwable__javaemul_internal_ThrowableUtils_JsObject@javaemul.internal.Exceptions (call $$create__@java.lang.RuntimeException )))
          )
          ;; default:
-         ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:70:33
+         ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:68:33
          (i64.const 5)
          (br $SWITCH_2)
         )
+        (unreachable)
        )
        (br $SWITCH_1)
       )
+      (unreachable)
      )
      (br $SWITCH)
     )
     ;; default:
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:73:21
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:71:21
     (i64.extend_i32_s (local.get $a))
     (br $SWITCH)
    )
+   (unreachable)
+  ))
+ )
+)
+
+;;; void SwitchExpression.testExhaustiveSwitchExpression()
+(func $m_testExhaustiveSwitchExpression__void@switchexpression.SwitchExpression
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:80:22
+ (local $i i64)
+ (local $$expression i32)
+ (block
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:81:4
+  (local.set $i 
+  (block $SWITCH (result i64)
+   (block
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:82:8
+    (local.set $$expression (call $m_ordinal__int@java.lang.Enum (ref.as_non_null (block (result (ref null $switchexpression.SwitchExpression.Enum))
+     (call $$clinit__void_<once>_@switchexpression.SwitchExpression.Enum )
+     (global.get $A@switchexpression.SwitchExpression.Enum)
+    ))))
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:82:8
+    (block
+     (block
+      (block ;; evaluate expression and jump
+       (br_table 0 1 2 (local.get $$expression))
+      )
+      ;; case 0:
+      ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:83:20
+      (i64.const 0)
+      (br $SWITCH)
+     )
+     ;; case 1:
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:84:20
+     (i64.const 1)
+     (br $SWITCH)
+    )
+   )
+   (unreachable)
   ))
  )
 )
 
 ;;; void SwitchExpression.$clinit()
 (func $$clinit__void_<once>_@switchexpression.SwitchExpression
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (if (global.get $$class-initialized@switchexpression.SwitchExpression)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (global.set $$class-initialized@switchexpression.SwitchExpression (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:20:13
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:18:13
   (call $$clinit__void_<once>_@java.lang.Object )
  )
 )
@@ -352,14 +394,14 @@
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
  (result (ref null $switchexpression.SwitchExpression.Enum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (local $$instance (ref null $switchexpression.SwitchExpression.Enum))
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (local.set $$instance (struct.new $switchexpression.SwitchExpression.Enum (ref.as_non_null (global.get $switchexpression.SwitchExpression.Enum.vtable)) (ref.as_non_null (global.get $switchexpression.SwitchExpression.Enum.itable)) (i32.const 0) (ref.null $java.lang.String) (i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (call $$ctor__java_lang_String__int__void_$p_switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum (ref.as_non_null (local.get $$instance))(local.get $$name)(local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (return (local.get $$instance))
  )
 )
@@ -369,13 +411,13 @@
  (param $this (ref null $switchexpression.SwitchExpression.Enum))
  (param $$name (ref null $java.lang.String))
  (param $$ordinal i32)
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (struct.set $java.lang.Enum $name@java.lang.Enum (local.get $this) (local.get $$name))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (struct.set $java.lang.Enum $ordinal@java.lang.Enum (local.get $this) (local.get $$ordinal))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (call $$ctor__java_lang_String__int__void_$p_java_lang_Enum@java.lang.Enum (ref.as_non_null (local.get $this))(local.get $$name)(local.get $$ordinal))
  )
 )
@@ -384,20 +426,20 @@
 (func $m_valueOf__java_lang_String__switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum
  (param $name (ref null $java.lang.String))
  (result (ref null $switchexpression.SwitchExpression.Enum))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (call $$clinit__void_<once>_@switchexpression.SwitchExpression.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (if (ref.is_null (global.get $namesToValuesMap@switchexpression.SwitchExpression.Enum))
    (then
     (block
-     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+     ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
      (global.set $namesToValuesMap@switchexpression.SwitchExpression.Enum (call $m_createMapFromValues__arrayOf_java_lang_Enum__java_util_Map@javaemul.internal.Enums (call $m_values_$private__arrayOf_switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum )))
     )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (return (ref.cast (ref null $switchexpression.SwitchExpression.Enum) (call $m_getValueFromNameAndMap__java_lang_String__java_util_Map__java_lang_Object@javaemul.internal.Enums (local.get $name)(global.get $namesToValuesMap@switchexpression.SwitchExpression.Enum))))
  )
 )
@@ -405,11 +447,11 @@
 ;;; Enum[] Enum.values()
 (func $m_values__arrayOf_switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum
  (result (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (call $$clinit__void_<once>_@switchexpression.SwitchExpression.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (return (call $m_values_$private__arrayOf_switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum ))
  )
 )
@@ -417,31 +459,31 @@
 ;;; Enum[] Enum.values_$private()
 (func $m_values_$private__arrayOf_switchexpression_SwitchExpression_Enum@switchexpression.SwitchExpression.Enum
  (result (ref null $javaemul.internal.WasmArray.OfObject))
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (return (call $m_newWithLiteral__arrayOf_java_lang_Object__javaemul_internal_WasmArray_OfObject@javaemul.internal.WasmArray.OfObject (array.new_fixed $java.lang.Object.array 2 (global.get $A@switchexpression.SwitchExpression.Enum)(global.get $B@switchexpression.SwitchExpression.Enum))))
  )
 )
 
 ;;; void Enum.$clinit()
 (func $$clinit__void_<once>_@switchexpression.SwitchExpression.Enum
- ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+ ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
  (block
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (if (global.get $$class-initialized@switchexpression.SwitchExpression.Enum)
    (then
-    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+    ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
     (return )
    )
   )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (global.set $$class-initialized@switchexpression.SwitchExpression.Enum (i32.const 1))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:7
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:75:7
   (call $$clinit__void_<once>_@java.lang.Enum )
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:78:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:76:4
   (global.set $A@switchexpression.SwitchExpression.Enum (call $$create__java_lang_String__int@switchexpression.SwitchExpression.Enum (call $$getString_|A|__java_lang_String_<once>_@switchexpression.SwitchExpression.Enum )(i32.const 0)))
-  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:79:4
+  ;;@ transpiler/javatests/com/google/j2cl/readable/java/switchexpression/readable-j2wasm.js/switchexpression/SwitchExpression.java:77:4
   (global.set $B@switchexpression.SwitchExpression.Enum (call $$create__java_lang_String__int@switchexpression.SwitchExpression.Enum (call $$getString_|B|__java_lang_String_<once>_@switchexpression.SwitchExpression.Enum )(i32.const 1)))
  )
 )