1 files changed, 42 insertions, 42 deletions
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index 846ef21a0..faaa013e9 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -158,12 +158,12 @@
     (local $d f64)
     (local $f f32)
     (set_local $i
-      (call_import $f64-to-int
+      (call $f64-to-int
         (get_local $d)
       )
     )
     (set_local $i
-      (call_import $f64-to-int
+      (call $f64-to-int
         (f64.promote/f32
           (get_local $f)
         )
@@ -319,7 +319,7 @@
             (br $label$continue$L3)
           )
         )
-        (call_import $h
+        (call $h
           (i32.const 120)
         )
         (br $label$continue$L1)
@@ -336,7 +336,7 @@
   )
   (func $frem (result f64)
     (return
-      (call_import $f64-rem
+      (call $f64-rem
         (f64.const 5.5)
         (f64.const 1.2)
       )
@@ -346,7 +346,7 @@
     (local $x i32)
     (set_local $x
       (i32.and
-        (call_import $i32u-div
+        (call $i32u-div
           (i32.const -1)
           (i32.const 2)
         )
@@ -518,7 +518,7 @@
           )
           (br $for-out$0)
         )
-        (call_import $h
+        (call $h
           (get_local $i)
         )
         (set_local $i
@@ -553,29 +553,29 @@
   )
   (func $aborts
     (drop
-      (call_import $abort
+      (call $abort
         (f64.const 0)
       )
     )
     (drop
-      (call_import $abort
+      (call $abort
         (f64.convert_s/i32
           (i32.const 55)
         )
       )
     )
     (drop
-      (call_import $abort
+      (call $abort
         (f64.const 0)
       )
     )
     (drop
-      (call_import $abort
+      (call $abort
         (f64.const 12.34)
       )
     )
     (drop
-      (call_import $abort
+      (call $abort
         (f64.promote/f32
           (f32.const 56.779998779296875)
         )
@@ -585,12 +585,12 @@
   (func $continues
     (loop $while-in$1
       (block $while-out$0
-        (call_import $print
+        (call $print
           (i32.const 1)
         )
         (block $do-once$2
           (loop $unlikely-continue$3
-            (call_import $print
+            (call $print
               (i32.const 5)
             )
             (if
@@ -599,7 +599,7 @@
             )
           )
         )
-        (call_import $print
+        (call $print
           (i32.const 2)
         )
         (br $while-in$1)
@@ -879,12 +879,12 @@
           (call $phi)
         )
         (drop
-          (call_import $setTempRet0
+          (call $setTempRet0
             (i32.const 10)
           )
         )
         (call $zeroInit
-          (call_import $setTempRet0
+          (call $setTempRet0
             (i32.const 10)
           )
         )
@@ -991,7 +991,7 @@
       (if
         (i32.const 1)
         (i32.trunc_s/f64
-          (call_import $abort
+          (call $abort
             (f64.convert_s/i32
               (i32.const 5)
             )
@@ -1003,7 +1003,7 @@
     (set_local $y
       (if
         (i32.const 3)
-        (call_import $abort
+        (call $abort
           (f64.convert_s/i32
             (i32.const 7)
           )
@@ -1155,7 +1155,7 @@
     (if
       (i32.const 1)
       (drop
-        (call_import $return_int)
+        (call $return_int)
       )
     )
   )
@@ -1261,7 +1261,7 @@
     (if
       (get_local $x)
       (block
-        (call_import $h
+        (call $h
           (i32.const 0)
         )
         (set_local $label
@@ -1274,11 +1274,11 @@
         (get_local $label)
         (i32.const 1)
       )
-      (call_import $h
+      (call $h
         (i32.const 1)
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -1)
     )
     (loop $while-in$1
@@ -1292,7 +1292,7 @@
         (if
           (get_local $x)
           (block
-            (call_import $h
+            (call $h
               (i32.const 2)
             )
             (set_local $label
@@ -1309,17 +1309,17 @@
         (get_local $label)
         (i32.const 2)
       )
-      (call_import $h
+      (call $h
         (i32.const 3)
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -2)
     )
     (if
       (get_local $x)
       (block
-        (call_import $h
+        (call $h
           (i32.const 4)
         )
         (if
@@ -1341,7 +1341,7 @@
         (get_local $label)
         (i32.const 3)
       )
-      (call_import $h
+      (call $h
         (i32.const 5)
       )
       (if
@@ -1349,18 +1349,18 @@
           (get_local $label)
           (i32.const 4)
         )
-        (call_import $h
+        (call $h
           (i32.const 6)
         )
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -3)
     )
     (if
       (get_local $x)
       (block
-        (call_import $h
+        (call $h
           (i32.const 7)
         )
         (if
@@ -1383,7 +1383,7 @@
         (i32.const 5)
       )
       (block
-        (call_import $h
+        (call $h
           (i32.const 8)
         )
         (if
@@ -1402,17 +1402,17 @@
         (get_local $label)
         (i32.const 6)
       )
-      (call_import $h
+      (call $h
         (i32.const 9)
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -4)
     )
     (if
       (get_local $x)
       (block
-        (call_import $h
+        (call $h
           (i32.const 10)
         )
         (set_local $label
@@ -1427,20 +1427,20 @@
           (i32.const 7)
         )
         (block
-          (call_import $h
+          (call $h
             (i32.const 11)
           )
           (br $label$break$L1)
         )
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -5)
     )
     (if
       (get_local $x)
       (block
-        (call_import $h
+        (call $h
           (i32.const 12)
         )
         (if
@@ -1463,7 +1463,7 @@
         (i32.const 8)
       )
       (block
-        (call_import $h
+        (call $h
           (i32.const 13)
         )
         (if
@@ -1481,14 +1481,14 @@
           (i32.const 9)
         )
         (block
-          (call_import $h
+          (call $h
             (i32.const 14)
           )
           (br $label$break$L1)
         )
       )
     )
-    (call_import $h
+    (call $h
       (i32.const -6)
     )
     (return
@@ -1589,7 +1589,7 @@
     (local $label i32)
     (local $temp i32)
     (set_local $temp
-      (call_import $return_int)
+      (call $return_int)
     )
     (loop $while-in$1
       (block $while-out$0
@@ -1612,7 +1612,7 @@
           (i32.const 12)
         )
         (drop
-          (call_import $return_int)
+          (call $return_int)
         )
         (if
           (i32.eq