4 files changed, 256 insertions, 256 deletions
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 9f1021b30..8f8837c4c 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -453,7 +453,7 @@ BinaryenFloat64: 4
             (drop
               (i32.eqz
                 (i32.trunc_s/f32
-                  (call_import $an-imported
+                  (call $an-imported
                     (i32.const 13)
                     (f64.const 3.7)
                   )
@@ -541,14 +541,14 @@ raw:
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -556,7 +556,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -564,7 +564,7 @@ raw:
   (func $two-blocks-plus-code (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -575,7 +575,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -584,7 +584,7 @@ raw:
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -592,7 +592,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -605,7 +605,7 @@ raw:
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -616,7 +616,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -630,18 +630,18 @@ raw:
   )
   (func $split (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
       )
@@ -649,7 +649,7 @@ raw:
   )
   (func $split-plus-code (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
@@ -659,7 +659,7 @@ raw:
           (i32.const 10)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
         )
@@ -669,7 +669,7 @@ raw:
           (i32.const 20)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
         )
@@ -679,13 +679,13 @@ raw:
   (func $if (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -696,7 +696,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -704,7 +704,7 @@ raw:
   (func $if-plus-code (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
@@ -714,7 +714,7 @@ raw:
             (i32.const -1)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 1)
             )
             (block
@@ -734,7 +734,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -742,13 +742,13 @@ raw:
   (func $if-else (type $v)
     (local $0 i32)
     (block $block$4$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -756,7 +756,7 @@ raw:
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (block
@@ -766,7 +766,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
@@ -776,7 +776,7 @@ raw:
     (block $block$3$break
       (loop $shape$0$continue
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (block
@@ -784,7 +784,7 @@ raw:
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (if
@@ -796,7 +796,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -804,7 +804,7 @@ raw:
   (func $nontrivial-loop-plus-phi-to-head (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -819,7 +819,7 @@ raw:
         (block $block$4$break
           (loop $shape$1$continue
             (block $block$3$break
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
               (if
@@ -834,7 +834,7 @@ raw:
               )
             )
             (block
-              (call_import $check
+              (call $check
                 (i32.const 2)
               )
               (if
@@ -852,13 +852,13 @@ raw:
         )
         (block
           (block $block$6$break
-            (call_import $check
+            (call $check
               (i32.const 3)
             )
             (if
               (i32.const -10)
               (block
-                (call_import $check
+                (call $check
                   (i32.const 4)
                 )
                 (block
@@ -869,7 +869,7 @@ raw:
             )
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 5)
             )
             (block
@@ -882,7 +882,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 6)
         )
       )
@@ -890,7 +890,7 @@ raw:
   )
   (func $switch (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -903,7 +903,7 @@ raw:
           )
           (block
             (block
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
             )
@@ -915,7 +915,7 @@ raw:
             (i32.const 55)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
           )
@@ -924,7 +924,7 @@ raw:
       )
       (block
         (block
-          (call_import $check
+          (call $check
             (i32.const 3)
           )
         )
@@ -943,7 +943,7 @@ raw:
     (block
       (block $block$3$break
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (if
@@ -974,7 +974,7 @@ raw:
           (set_local $3
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -993,7 +993,7 @@ raw:
             (set_local $3
               (i32.const 0)
             )
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (block
@@ -1010,7 +1010,7 @@ raw:
   (func $return (type $i) (result i32)
     (local $0 i32)
     (block $the-list
-      (call_import $check
+      (call $check
         (i32.const 42)
       )
       (return
@@ -1027,81 +1027,81 @@ optimized:
   (type $i (func (result i32)))
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
-    (call_import $check
+    (call $check
       (i32.const 1)
     )
   )
   (func $loop (type $v)
     (loop $shape$0$continue
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
       (br $shape$0$continue)
     )
   )
   (func $split (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
   )
   (func $if (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $if-else (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 3)
     )
   )
   (func $loop-tail (type $v)
     (block $block$3$break
       (loop $shape$0$continue
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (br_if $shape$0$continue
@@ -1110,24 +1110,24 @@ optimized:
         (br $block$3$break)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $nontrivial-loop-plus-phi-to-head (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $block$7$break
       (block $block$4$break
         (loop $shape$1$continue
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br_if $block$7$break
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (br_if $block$4$break
@@ -1136,25 +1136,25 @@ optimized:
           (br $shape$1$continue)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
       (if
         (i32.const -10)
-        (call_import $check
+        (call $check
           (i32.const 4)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 5)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 6)
     )
   )
   (func $switch (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -1165,24 +1165,24 @@ optimized:
               (i32.const -99)
             )
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br $switch$1$leave)
         )
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
         (br $switch$1$leave)
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
   )
   (func $duffs-device (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (set_local $0
@@ -1195,7 +1195,7 @@ optimized:
           (i32.const 2)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (set_local $0
@@ -1209,7 +1209,7 @@ optimized:
             (i32.const 3)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (set_local $0
@@ -1222,7 +1222,7 @@ optimized:
     )
   )
   (func $return (type $i) (result i32)
-    (call_import $check
+    (call $check
       (i32.const 42)
     )
     (i32.const 1337)
@@ -1246,7 +1246,7 @@ module loaded from binary form:
   (type $v (func))
   (import "spectest" "print" (func $print-i32 (param i32)))
   (func $starter (type $v)
-    (call_import $print-i32
+    (call $print-i32
       (i32.const 1234)
     )
   )
@@ -2044,7 +2044,7 @@ int main() {
             (drop
               (i32.eqz
                 (i32.trunc_s/f32
-                  (call_import $an-imported
+                  (call $an-imported
                     (i32.const 13)
                     (f64.const 3.7)
                   )
@@ -2592,14 +2592,14 @@ raw:
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -2607,7 +2607,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -2615,7 +2615,7 @@ raw:
   (func $two-blocks-plus-code (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -2626,7 +2626,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -2635,7 +2635,7 @@ raw:
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -2643,7 +2643,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -2656,7 +2656,7 @@ raw:
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -2667,7 +2667,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -2681,18 +2681,18 @@ raw:
   )
   (func $split (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
       )
@@ -2700,7 +2700,7 @@ raw:
   )
   (func $split-plus-code (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
@@ -2710,7 +2710,7 @@ raw:
           (i32.const 10)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
         )
@@ -2720,7 +2720,7 @@ raw:
           (i32.const 20)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
         )
@@ -2730,13 +2730,13 @@ raw:
   (func $if (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -2747,7 +2747,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -2755,7 +2755,7 @@ raw:
   (func $if-plus-code (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
@@ -2765,7 +2765,7 @@ raw:
             (i32.const -1)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 1)
             )
             (block
@@ -2785,7 +2785,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -2793,13 +2793,13 @@ raw:
   (func $if-else (type $v)
     (local $0 i32)
     (block $block$4$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -2807,7 +2807,7 @@ raw:
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (block
@@ -2817,7 +2817,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
@@ -2827,7 +2827,7 @@ raw:
     (block $block$3$break
       (loop $shape$0$continue
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (block
@@ -2835,7 +2835,7 @@ raw:
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (if
@@ -2847,7 +2847,7 @@ raw:
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -2855,7 +2855,7 @@ raw:
   (func $nontrivial-loop-plus-phi-to-head (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -2870,7 +2870,7 @@ raw:
         (block $block$4$break
           (loop $shape$1$continue
             (block $block$3$break
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
               (if
@@ -2885,7 +2885,7 @@ raw:
               )
             )
             (block
-              (call_import $check
+              (call $check
                 (i32.const 2)
               )
               (if
@@ -2903,13 +2903,13 @@ raw:
         )
         (block
           (block $block$6$break
-            (call_import $check
+            (call $check
               (i32.const 3)
             )
             (if
               (i32.const -10)
               (block
-                (call_import $check
+                (call $check
                   (i32.const 4)
                 )
                 (block
@@ -2920,7 +2920,7 @@ raw:
             )
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 5)
             )
             (block
@@ -2933,7 +2933,7 @@ raw:
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 6)
         )
       )
@@ -2941,7 +2941,7 @@ raw:
   )
   (func $switch (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -2954,7 +2954,7 @@ raw:
           )
           (block
             (block
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
             )
@@ -2966,7 +2966,7 @@ raw:
             (i32.const 55)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
           )
@@ -2975,7 +2975,7 @@ raw:
       )
       (block
         (block
-          (call_import $check
+          (call $check
             (i32.const 3)
           )
         )
@@ -2994,7 +2994,7 @@ raw:
     (block
       (block $block$3$break
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (if
@@ -3025,7 +3025,7 @@ raw:
           (set_local $3
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -3044,7 +3044,7 @@ raw:
             (set_local $3
               (i32.const 0)
             )
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (block
@@ -3061,7 +3061,7 @@ raw:
   (func $return (type $i) (result i32)
     (local $0 i32)
     (block $the-list
-      (call_import $check
+      (call $check
         (i32.const 42)
       )
       (return
@@ -3082,81 +3082,81 @@ optimized:
   (type $i (func (result i32)))
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
-    (call_import $check
+    (call $check
       (i32.const 1)
     )
   )
   (func $loop (type $v)
     (loop $shape$0$continue
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
       (br $shape$0$continue)
     )
   )
   (func $split (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
   )
   (func $if (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $if-else (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 3)
     )
   )
   (func $loop-tail (type $v)
     (block $block$3$break
       (loop $shape$0$continue
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (br_if $shape$0$continue
@@ -3165,24 +3165,24 @@ optimized:
         (br $block$3$break)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $nontrivial-loop-plus-phi-to-head (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $block$7$break
       (block $block$4$break
         (loop $shape$1$continue
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br_if $block$7$break
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (br_if $block$4$break
@@ -3191,25 +3191,25 @@ optimized:
           (br $shape$1$continue)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
       (if
         (i32.const -10)
-        (call_import $check
+        (call $check
           (i32.const 4)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 5)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 6)
     )
   )
   (func $switch (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -3220,24 +3220,24 @@ optimized:
               (i32.const -99)
             )
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br $switch$1$leave)
         )
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
         (br $switch$1$leave)
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
   )
   (func $duffs-device (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (set_local $0
@@ -3250,7 +3250,7 @@ optimized:
           (i32.const 2)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (set_local $0
@@ -3264,7 +3264,7 @@ optimized:
             (i32.const 3)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (set_local $0
@@ -3277,7 +3277,7 @@ optimized:
     )
   )
   (func $return (type $i) (result i32)
-    (call_import $check
+    (call $check
       (i32.const 42)
     )
     (i32.const 1337)
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
index 022bcc2e3..abe64601c 100644
--- a/test/example/c-api-kitchen-sink.txt.txt
+++ b/test/example/c-api-kitchen-sink.txt.txt
@@ -448,7 +448,7 @@
             (drop
               (i32.eqz
                 (i32.trunc_s/f32
-                  (call_import $an-imported
+                  (call $an-imported
                     (i32.const 13)
                     (f64.const 3.7)
                   )
@@ -535,14 +535,14 @@
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -550,7 +550,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -558,7 +558,7 @@
   (func $two-blocks-plus-code (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -569,7 +569,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
@@ -578,7 +578,7 @@
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -586,7 +586,7 @@
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -599,7 +599,7 @@
     (local $0 i32)
     (loop $shape$0$continue
       (block $block$2$break
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
         (block
@@ -610,7 +610,7 @@
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (block
@@ -624,18 +624,18 @@
   )
   (func $split (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
       (block
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
       )
@@ -643,7 +643,7 @@
   )
   (func $split-plus-code (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
@@ -653,7 +653,7 @@
           (i32.const 10)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
         )
@@ -663,7 +663,7 @@
           (i32.const 20)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
         )
@@ -673,13 +673,13 @@
   (func $if (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -690,7 +690,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -698,7 +698,7 @@
   (func $if-plus-code (type $v)
     (local $0 i32)
     (block $block$3$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
@@ -708,7 +708,7 @@
             (i32.const -1)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 1)
             )
             (block
@@ -728,7 +728,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -736,13 +736,13 @@
   (func $if-else (type $v)
     (local $0 i32)
     (block $block$4$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (if
         (i32.const 55)
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -750,7 +750,7 @@
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (block
@@ -760,7 +760,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
@@ -770,7 +770,7 @@
     (block $block$3$break
       (loop $shape$0$continue
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (block
@@ -778,7 +778,7 @@
           )
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (if
@@ -790,7 +790,7 @@
       )
     )
     (block
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
@@ -798,7 +798,7 @@
   (func $nontrivial-loop-plus-phi-to-head (type $v)
     (local $0 i32)
     (block $block$2$break
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
       (block
@@ -813,7 +813,7 @@
         (block $block$4$break
           (loop $shape$1$continue
             (block $block$3$break
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
               (if
@@ -828,7 +828,7 @@
               )
             )
             (block
-              (call_import $check
+              (call $check
                 (i32.const 2)
               )
               (if
@@ -846,13 +846,13 @@
         )
         (block
           (block $block$6$break
-            (call_import $check
+            (call $check
               (i32.const 3)
             )
             (if
               (i32.const -10)
               (block
-                (call_import $check
+                (call $check
                   (i32.const 4)
                 )
                 (block
@@ -863,7 +863,7 @@
             )
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 5)
             )
             (block
@@ -876,7 +876,7 @@
         )
       )
       (block
-        (call_import $check
+        (call $check
           (i32.const 6)
         )
       )
@@ -884,7 +884,7 @@
   )
   (func $switch (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -897,7 +897,7 @@
           )
           (block
             (block
-              (call_import $check
+              (call $check
                 (i32.const 1)
               )
             )
@@ -909,7 +909,7 @@
             (i32.const 55)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
           )
@@ -918,7 +918,7 @@
       )
       (block
         (block
-          (call_import $check
+          (call $check
             (i32.const 3)
           )
         )
@@ -937,7 +937,7 @@
     (block
       (block $block$3$break
         (block $block$2$break
-          (call_import $check
+          (call $check
             (i32.const 0)
           )
           (if
@@ -968,7 +968,7 @@
           (set_local $3
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (block
@@ -987,7 +987,7 @@
             (set_local $3
               (i32.const 0)
             )
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (block
@@ -1004,7 +1004,7 @@
   (func $return (type $i) (result i32)
     (local $0 i32)
     (block $the-list
-      (call_import $check
+      (call $check
         (i32.const 42)
       )
       (return
@@ -1020,81 +1020,81 @@
   (type $i (func (result i32)))
   (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
-    (call_import $check
+    (call $check
       (i32.const 1337)
     )
   )
   (func $two-blocks (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
-    (call_import $check
+    (call $check
       (i32.const 1)
     )
   )
   (func $loop (type $v)
     (loop $shape$0$continue
-      (call_import $check
+      (call $check
         (i32.const 0)
       )
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
       (br $shape$0$continue)
     )
   )
   (func $split (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
   )
   (func $if (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $if-else (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (if
       (i32.const 55)
-      (call_import $check
+      (call $check
         (i32.const 1)
       )
-      (call_import $check
+      (call $check
         (i32.const 2)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 3)
     )
   )
   (func $loop-tail (type $v)
     (block $block$3$break
       (loop $shape$0$continue
-        (call_import $check
+        (call $check
           (i32.const 0)
         )
-        (call_import $check
+        (call $check
           (i32.const 1)
         )
         (br_if $shape$0$continue
@@ -1103,24 +1103,24 @@
         (br $block$3$break)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 2)
     )
   )
   (func $nontrivial-loop-plus-phi-to-head (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $block$7$break
       (block $block$4$break
         (loop $shape$1$continue
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br_if $block$7$break
             (i32.const 0)
           )
-          (call_import $check
+          (call $check
             (i32.const 2)
           )
           (br_if $block$4$break
@@ -1129,25 +1129,25 @@
           (br $shape$1$continue)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
       (if
         (i32.const -10)
-        (call_import $check
+        (call $check
           (i32.const 4)
         )
       )
-      (call_import $check
+      (call $check
         (i32.const 5)
       )
     )
-    (call_import $check
+    (call $check
       (i32.const 6)
     )
   )
   (func $switch (type $v)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (block $switch$1$leave
@@ -1158,24 +1158,24 @@
               (i32.const -99)
             )
           )
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (br $switch$1$leave)
         )
-        (call_import $check
+        (call $check
           (i32.const 2)
         )
         (br $switch$1$leave)
       )
-      (call_import $check
+      (call $check
         (i32.const 3)
       )
     )
   )
   (func $duffs-device (type $v)
     (local $0 i32)
-    (call_import $check
+    (call $check
       (i32.const 0)
     )
     (set_local $0
@@ -1188,7 +1188,7 @@
           (i32.const 2)
         )
         (block
-          (call_import $check
+          (call $check
             (i32.const 1)
           )
           (set_local $0
@@ -1202,7 +1202,7 @@
             (i32.const 3)
           )
           (block
-            (call_import $check
+            (call $check
               (i32.const 2)
             )
             (set_local $0
@@ -1215,7 +1215,7 @@
     )
   )
   (func $return (type $i) (result i32)
-    (call_import $check
+    (call $check
       (i32.const 42)
     )
     (i32.const 1337)
diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt
index 5db33f21e..a5a098b32 100644
--- a/test/example/relooper-fuzz.txt
+++ b/test/example/relooper-fuzz.txt
@@ -25,7 +25,7 @@
         (i32.const 4)
       )
     )
-    (call_import $print
+    (call $print
       (i32.sub
         (i32.const 0)
         (i32.load offset=4
@@ -157,7 +157,7 @@
         (block $block$6$break
           (block $block$5$break
             (block
-              (call_import $print
+              (call $print
                 (i32.const 0)
               )
               (set_local $0
@@ -180,7 +180,7 @@
               )
               (block
                 (block
-                  (call_import $print
+                  (call $print
                     (i32.const 8)
                   )
                   (set_local $0
@@ -207,7 +207,7 @@
                 (i32.const 0)
               )
               (block
-                (call_import $print
+                (call $print
                   (i32.const 5)
                 )
                 (set_local $0
@@ -236,7 +236,7 @@
         (block
           (block $block$3$break
             (block
-              (call_import $print
+              (call $print
                 (i32.const 4)
               )
               (set_local $0
@@ -272,7 +272,7 @@
           )
           (block
             (block
-              (call_import $print
+              (call $print
                 (i32.const 2)
               )
               (set_local $0
@@ -318,7 +318,7 @@
         (i32.const 4)
       )
     )
-    (call_import $print
+    (call $print
       (i32.sub
         (i32.const 0)
         (i32.load offset=4
@@ -445,7 +445,7 @@
       (i32.const 112)
       (i32.const 34)
     )
-    (call_import $print
+    (call $print
       (i32.const 0)
     )
     (if
@@ -454,7 +454,7 @@
         (i32.const 2)
       )
       (block
-        (call_import $print
+        (call $print
           (i32.const 8)
         )
         (drop
@@ -475,7 +475,7 @@
           (set_local $0
             (i32.const 0)
           )
-          (call_import $print
+          (call $print
             (i32.const 5)
           )
           (br_if $shape$3$continue
@@ -492,7 +492,7 @@
           (br $shape$3$continue)
         )
       )
-      (call_import $print
+      (call $print
         (i32.const 4)
       )
       (br_if $shape$3$continue
@@ -520,7 +520,7 @@
           (br $shape$3$continue)
         )
       )
-      (call_import $print
+      (call $print
         (i32.const 2)
       )
       (drop
diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt
index b4ad8b5a1..9424160e3 100644
--- a/test/example/relooper-fuzz1.txt
+++ b/test/example/relooper-fuzz1.txt
@@ -25,7 +25,7 @@
         (i32.const 4)
       )
     )
-    (call_import $print
+    (call $print
       (i32.sub
         (i32.const 0)
         (i32.load offset=4
@@ -169,7 +169,7 @@
         (block $block$4$break
           (block $block$3$break
             (block
-              (call_import $print
+              (call $print
                 (i32.const 0)
               )
               (set_local $0
@@ -195,7 +195,7 @@
                 )
                 (block
                   (block
-                    (call_import $print
+                    (call $print
                       (i32.const 7)
                     )
                     (set_local $0
@@ -220,7 +220,7 @@
           )
           (block
             (block
-              (call_import $print
+              (call $print
                 (i32.const 2)
               )
               (set_local $0
@@ -242,7 +242,7 @@
         )
         (loop $shape$6$continue
           (block
-            (call_import $print
+            (call $print
               (i32.const 3)
             )
             (set_local $0
@@ -256,7 +256,7 @@
       )
       (block
         (block
-          (call_import $print
+          (call $print
             (i32.const 9)
           )
           (set_local $0
@@ -294,7 +294,7 @@
         (i32.const 4)
       )
     )
-    (call_import $print
+    (call $print
       (i32.sub
         (i32.const 0)
         (i32.load offset=4
@@ -434,7 +434,7 @@
     )
     (block $block$10$break
       (block $block$4$break
-        (call_import $print
+        (call $print
           (i32.const 0)
         )
         (if
@@ -453,7 +453,7 @@
               (i32.const 2)
             )
             (block
-              (call_import $print
+              (call $print
                 (i32.const 7)
               )
               (br_if $block$10$break
@@ -466,7 +466,7 @@
             (br $block$4$break)
           )
         )
-        (call_import $print
+        (call $print
           (i32.const 2)
         )
         (br_if $block$10$break
@@ -477,7 +477,7 @@
         )
       )
       (loop $shape$6$continue
-        (call_import $print
+        (call $print
           (i32.const 3)
         )
         (drop
@@ -486,7 +486,7 @@
         (br $shape$6$continue)
       )
     )
-    (call_import $print
+    (call $print
       (i32.const 9)
     )
     (drop