diff --git a/crates/wasm-encoder/src/reencode.rs b/crates/wasm-encoder/src/reencode.rs
index e7cc95a788..d536a1adee 100644
--- a/crates/wasm-encoder/src/reencode.rs
+++ b/crates/wasm-encoder/src/reencode.rs
@@ -1408,14 +1408,13 @@ pub mod utils {
                 // example which wants to track uses to know when it's ok to
                 // remove a table.
                 //
-                // If the table index is still zero though go ahead and pass
-                // `None` here since that implicitly references table 0. Note
-                // that this means that this does not round-trip the encoding of
-                // `Some(0)` since that reencodes to `None`, but that's seen as
-                // hopefully ok.
-                match reencoder.table_index(table_index.unwrap_or(0)) {
-                    0 => None,
-                    i => Some(i),
+                // If the table index started at `None` and is still zero then
+                // preserve this encoding and keep it at `None`. Otherwise if
+                // the result is nonzero or it was previously nonzero then keep
+                // that encoding too.
+                match (table_index, reencoder.table_index(table_index.unwrap_or(0))) {
+                    (None, 0) => None,
+                    (_, n) => Some(n),
                 },
                 &reencoder.const_expr(offset_expr)?,
                 elems,
diff --git a/crates/wasmprinter/src/lib.rs b/crates/wasmprinter/src/lib.rs
index 15b34e7812..5738ad7bf5 100644
--- a/crates/wasmprinter/src/lib.rs
+++ b/crates/wasmprinter/src/lib.rs
@@ -1531,8 +1531,7 @@ impl Printer<'_, '_> {
                     table_index,
                     offset_expr,
                 } => {
-                    let table_index = table_index.unwrap_or(0);
-                    if table_index != 0 {
+                    if let Some(table_index) = *table_index {
                         self.result.write_str(" ")?;
                         self.start_group("table ")?;
                         self.print_idx(&state.core.table_names, table_index)?;
diff --git a/crates/wast/src/core/binary.rs b/crates/wast/src/core/binary.rs
index 4466018ddb..fa14655981 100644
--- a/crates/wast/src/core/binary.rs
+++ b/crates/wast/src/core/binary.rs
@@ -703,7 +703,7 @@ impl Encode for Elem<'_> {
         match (&self.kind, &self.payload) {
             (
                 ElemKind::Active {
-                    table: Index::Num(0, _),
+                    table: None,
                     offset,
                 },
                 ElemPayload::Indices(_),
@@ -715,7 +715,13 @@ impl Encode for Elem<'_> {
                 e.push(0x01); // flags
                 e.push(0x00); // extern_kind
             }
-            (ElemKind::Active { table, offset }, ElemPayload::Indices(_)) => {
+            (
+                ElemKind::Active {
+                    table: Some(table),
+                    offset,
+                },
+                ElemPayload::Indices(_),
+            ) => {
                 e.push(0x02); // flags
                 table.encode(e);
                 offset.encode(e, None);
@@ -727,7 +733,7 @@ impl Encode for Elem<'_> {
             }
             (
                 ElemKind::Active {
-                    table: Index::Num(0, _),
+                    table: None,
                     offset,
                 },
                 ElemPayload::Exprs {
@@ -752,7 +758,7 @@ impl Encode for Elem<'_> {
             }
             (ElemKind::Active { table, offset }, ElemPayload::Exprs { ty, .. }) => {
                 e.push(0x06);
-                table.encode(e);
+                table.map(|t| t.unwrap_u32()).unwrap_or(0).encode(e);
                 offset.encode(e, None);
                 ty.encode(e);
             }
diff --git a/crates/wast/src/core/resolve/deinline_import_export.rs b/crates/wast/src/core/resolve/deinline_import_export.rs
index 06cb870b39..8ed28b751e 100644
--- a/crates/wast/src/core/resolve/deinline_import_export.rs
+++ b/crates/wast/src/core/resolve/deinline_import_export.rs
@@ -139,7 +139,7 @@ pub fn run(fields: &mut Vec<ModuleField>) {
                             id: None,
                             name: None,
                             kind: ElemKind::Active {
-                                table: Index::Id(id),
+                                table: Some(Index::Id(id)),
                                 offset: Expression::one(if is64 {
                                     Instruction::I64Const(0)
                                 } else {
diff --git a/crates/wast/src/core/resolve/names.rs b/crates/wast/src/core/resolve/names.rs
index e1ec617a31..011e93635f 100644
--- a/crates/wast/src/core/resolve/names.rs
+++ b/crates/wast/src/core/resolve/names.rs
@@ -184,7 +184,9 @@ impl<'a> Resolver<'a> {
             ModuleField::Elem(e) => {
                 match &mut e.kind {
                     ElemKind::Active { table, offset } => {
-                        self.resolve(table, Ns::Table)?;
+                        if let Some(table) = table {
+                            self.resolve(table, Ns::Table)?;
+                        }
                         self.resolve_expr(offset)?;
                     }
                     ElemKind::Passive { .. } | ElemKind::Declared { .. } => {}
diff --git a/crates/wast/src/core/table.rs b/crates/wast/src/core/table.rs
index 80875df650..de2970f196 100644
--- a/crates/wast/src/core/table.rs
+++ b/crates/wast/src/core/table.rs
@@ -149,7 +149,7 @@ pub enum ElemKind<'a> {
     /// An active segment associated with a table.
     Active {
         /// The table this `elem` is initializing.
-        table: Index<'a>,
+        table: Option<Index<'a>>,
         /// The offset within `table` that we'll initialize at.
         offset: Expression<'a>,
     },
@@ -197,15 +197,15 @@ impl<'a> Parse<'a> for Elem<'a> {
                 // time, this probably should get removed when the threads
                 // proposal is rebased on the current spec.
                 table_omitted = true;
-                Index::Num(parser.parse()?, span)
+                Some(Index::Num(parser.parse()?, span))
             } else if parser.peek2::<kw::table>()? {
-                parser.parens(|p| {
+                Some(parser.parens(|p| {
                     p.parse::<kw::table>()?;
                     p.parse()
-                })?
+                })?)
             } else {
                 table_omitted = true;
-                Index::Num(0, span)
+                None
             };
 
             let offset = parse_expr_or_single_instr::<kw::offset>(parser)?;
diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs
index 72219d10ab..8244bb9c18 100644
--- a/fuzz/src/lib.rs
+++ b/fuzz/src/lib.rs
@@ -1,5 +1,6 @@
 use libfuzzer_sys::arbitrary::{Result, Unstructured};
 use std::fmt::Debug;
+use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use wasm_smith::{Component, Config, Module};
 use wasmparser::WasmFeatures;
 
@@ -120,15 +121,25 @@ pub fn validator_for_config(config: &Config) -> wasmparser::Validator {
 pub fn log_wasm(wasm: &[u8], config: impl Debug) {
     drop(env_logger::try_init());
 
-    if log::log_enabled!(log::Level::Debug) {
-        log::debug!("writing test case to `test.wasm` ...");
-        std::fs::write("test.wasm", wasm).unwrap();
-        std::fs::write("test.config", format!("{:#?}", config)).unwrap();
-        if let Ok(wat) = wasmprinter::print_bytes(wasm) {
-            log::debug!("writing text format to `test.wat` ...");
-            std::fs::write("test.wat", wat).unwrap();
-        } else {
-            drop(std::fs::remove_file("test.wat"));
-        }
+    if !log::log_enabled!(log::Level::Debug) {
+        return;
+    }
+
+    static CNT: AtomicUsize = AtomicUsize::new(0);
+
+    let i = CNT.fetch_add(1, SeqCst);
+
+    let wasm_file = format!("test{i}.wasm");
+    let config_file = format!("test{i}.config");
+    let wat_file = format!("test{i}.wat");
+
+    log::debug!("writing test case to `{wasm_file}` ...");
+    std::fs::write(&wasm_file, wasm).unwrap();
+    std::fs::write(&config_file, format!("{:#?}", config)).unwrap();
+    if let Ok(wat) = wasmprinter::print_bytes(wasm) {
+        log::debug!("writing text format to `{wat_file}` ...");
+        std::fs::write(&wat_file, wat).unwrap();
+    } else {
+        drop(std::fs::remove_file(&wat_file));
     }
 }
diff --git a/fuzz/src/reencode.rs b/fuzz/src/reencode.rs
index fef897bf31..7e27dbb30d 100644
--- a/fuzz/src/reencode.rs
+++ b/fuzz/src/reencode.rs
@@ -2,7 +2,7 @@ use arbitrary::{Result, Unstructured};
 use wasm_encoder::reencode::{Reencode, RoundtripReencoder};
 
 pub fn run(u: &mut Unstructured<'_>) -> Result<()> {
-    let (module1, _) = super::generate_valid_module(u, |_, _| Ok(()))?;
+    let (module1, config) = super::generate_valid_module(u, |_, _| Ok(()))?;
 
     let mut module2 = Default::default();
     RoundtripReencoder
@@ -10,6 +10,11 @@ pub fn run(u: &mut Unstructured<'_>) -> Result<()> {
         .unwrap();
 
     let module2 = module2.finish();
+    if module1 == module2 {
+        return Ok(());
+    }
+    crate::log_wasm(&module1, &config);
+    crate::log_wasm(&module2, &config);
     assert_eq!(module1, module2);
 
     Ok(())
diff --git a/tests/cli/dump-elem-segments.wat b/tests/cli/dump-elem-segments.wat
new file mode 100644
index 0000000000..847d39fb54
--- /dev/null
+++ b/tests/cli/dump-elem-segments.wat
@@ -0,0 +1,18 @@
+;; RUN: print % | dump
+
+;; test that all forms of element segments can be round-tripped from
+;; text-to-binary.
+(module
+  (table 1 1 funcref)
+
+  (func $f)
+
+  (elem (i32.const 0) func)                   ;; 0x00
+  (elem func)                                 ;; 0x01
+  (elem (table 0) (i32.const 0) func)         ;; 0x02
+  (elem declare func)                         ;; 0x03
+  (elem (i32.const 0) funcref)                ;; 0x04
+  (elem funcref)                              ;; 0x05
+  (elem (table 0) (i32.const 0) funcref)      ;; 0x06
+  (elem declare funcref)                      ;; 0x07
+)
diff --git a/tests/cli/dump-elem-segments.wat.stdout b/tests/cli/dump-elem-segments.wat.stdout
new file mode 100644
index 0000000000..7228f869bf
--- /dev/null
+++ b/tests/cli/dump-elem-segments.wat.stdout
@@ -0,0 +1,46 @@
+  0x0 | 00 61 73 6d | version 1 (Module)
+      | 01 00 00 00
+  0x8 | 01 04       | type section
+  0xa | 01          | 1 count
+--- rec group 0 (implicit) ---
+  0xb | 60 00 00    | [type 0] SubType { is_final: true, supertype_idx: None, composite_type: CompositeType { inner: Func(FuncType { params: [], results: [] }), shared: false } }
+  0xe | 03 02       | func section
+ 0x10 | 01          | 1 count
+ 0x11 | 00          | [func 0] type 0
+ 0x12 | 04 05       | table section
+ 0x14 | 01          | 1 count
+ 0x15 | 70 01 01 01 | [table 0] Table { ty: TableType { element_type: funcref, table64: false, initial: 1, maximum: Some(1), shared: false }, init: RefNull }
+ 0x19 | 09 25       | element section
+ 0x1b | 08          | 8 count
+ 0x1c | 00          | element table[None]
+ 0x1d | 41 00       | i32_const value:0
+ 0x1f | 0b          | end
+ 0x20 | 00          | 0 items [indices]
+ 0x21 | 01 00 00    | element passive, 0 items [indices]
+ 0x24 | 02 00       | element table[Some(0)]
+ 0x26 | 41 00       | i32_const value:0
+ 0x28 | 0b          | end
+ 0x29 | 00 00       | 0 items [indices]
+ 0x2b | 03 00 00    | element declared 0 items [indices]
+ 0x2e | 04          | element table[None]
+ 0x2f | 41 00       | i32_const value:0
+ 0x31 | 0b          | end
+ 0x32 | 00          | 0 items [exprs funcref]
+ 0x33 | 05 70 00    | element passive, 0 items [exprs funcref]
+ 0x36 | 06 00       | element table[Some(0)]
+ 0x38 | 41 00       | i32_const value:0
+ 0x3a | 0b          | end
+ 0x3b | 70 00       | 0 items [exprs funcref]
+ 0x3d | 07 70 00    | element declared 0 items [exprs funcref]
+ 0x40 | 0a 04       | code section
+ 0x42 | 01          | 1 count
+============== func 0 ====================
+ 0x43 | 02          | size of function
+ 0x44 | 00          | 0 local blocks
+ 0x45 | 0b          | end
+ 0x46 | 00 0b       | custom section
+ 0x48 | 04 6e 61 6d | name: "name"
+      | 65         
+ 0x4d | 01 04       | function name section
+ 0x4f | 01          | 1 count
+ 0x50 | 00 01 66    | Naming { index: 0, name: "f" }
diff --git a/tests/snapshots/local/gc/type-equivalence.wast/4.print b/tests/snapshots/local/gc/type-equivalence.wast/4.print
index ecb7350560..bd7d7239d0 100644
--- a/tests/snapshots/local/gc/type-equivalence.wast/4.print
+++ b/tests/snapshots/local/gc/type-equivalence.wast/4.print
@@ -4,7 +4,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (param f32 f32))
   (func $f2 (;1;) (type $t2) (param f32 f32))
   (func (;2;) (type 2)
diff --git a/tests/snapshots/local/gc/type-equivalence.wast/6.print b/tests/snapshots/local/gc/type-equivalence.wast/6.print
index a9fed0f084..d764874534 100644
--- a/tests/snapshots/local/gc/type-equivalence.wast/6.print
+++ b/tests/snapshots/local/gc/type-equivalence.wast/6.print
@@ -7,7 +7,7 @@
   (type (;5;) (func))
   (table (;0;) 4 4 funcref)
   (export "run" (func 4))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $s1 $s2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $s1 $s2)
   (func $s1 (;0;) (type $s1) (param i32 (ref $s0)))
   (func $s2 (;1;) (type $s2) (param i32 (ref $s0)))
   (func $f1 (;2;) (type $t1) (param (ref $s1)))
diff --git a/tests/snapshots/local/gc/type-subtyping.wast/17.print b/tests/snapshots/local/gc/type-subtyping.wast/17.print
index 068b22b0cf..54506e291b 100644
--- a/tests/snapshots/local/gc/type-subtyping.wast/17.print
+++ b/tests/snapshots/local/gc/type-subtyping.wast/17.print
@@ -15,7 +15,7 @@
   (export "fail4" (func 7))
   (export "fail5" (func 8))
   (export "fail6" (func 9))
-  (elem (;0;) (i32.const 0) func $f0 $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f0 $f1 $f2)
   (func $f0 (;0;) (type $t0) (result funcref)
     ref.null func
   )
diff --git a/tests/snapshots/local/gc/type-subtyping.wast/25.print b/tests/snapshots/local/gc/type-subtyping.wast/25.print
index 5ba9c153d9..817e526ddc 100644
--- a/tests/snapshots/local/gc/type-subtyping.wast/25.print
+++ b/tests/snapshots/local/gc/type-subtyping.wast/25.print
@@ -6,7 +6,7 @@
   (export "fail2" (func 3))
   (export "fail3" (func 4))
   (export "fail4" (func 5))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1))
   (func $f2 (;1;) (type $t2))
   (func (;2;) (type $t1)
diff --git a/tests/snapshots/local/legacy-exceptions/try_catch.wast/2.print b/tests/snapshots/local/legacy-exceptions/try_catch.wast/2.print
index 41d02947da..3227f835d7 100644
--- a/tests/snapshots/local/legacy-exceptions/try_catch.wast/2.print
+++ b/tests/snapshots/local/legacy-exceptions/try_catch.wast/2.print
@@ -37,7 +37,7 @@
   (export "return-call-indirect-in-try-catch" (func 19))
   (export "break-try-catch" (func 20))
   (export "break-try-catch_all" (func 21))
-  (elem (;0;) (i32.const 0) func $throw-void)
+  (elem (;0;) (table 0) (i32.const 0) func $throw-void)
   (func $throw-if (;1;) (type 5) (param i32) (result i32)
     local.get 0
     i32.const 0
diff --git a/tests/snapshots/local/legacy-exceptions/try_delegate.wast/0.print b/tests/snapshots/local/legacy-exceptions/try_delegate.wast/0.print
index 35e071a8bb..0c77c7b193 100644
--- a/tests/snapshots/local/legacy-exceptions/try_delegate.wast/0.print
+++ b/tests/snapshots/local/legacy-exceptions/try_delegate.wast/0.print
@@ -22,7 +22,7 @@
   (export "break-try-delegate" (func 15))
   (export "break-and-call-throw" (func 16))
   (export "break-and-throw" (func 17))
-  (elem (;0;) (i32.const 0) func $throw-void)
+  (elem (;0;) (table 0) (i32.const 0) func $throw-void)
   (func (;0;) (type 1) (result i32)
     try (result i32) ;; label = @1
       try (result i32) ;; label = @2
diff --git a/tests/snapshots/local/memory64.wast/3.print b/tests/snapshots/local/memory64.wast/3.print
index af3c8eaadb..8fc39a5566 100644
--- a/tests/snapshots/local/memory64.wast/3.print
+++ b/tests/snapshots/local/memory64.wast/3.print
@@ -1,4 +1,4 @@
 (module $table64
   (table $t0 (;0;) i64 1 1 funcref)
-  (elem (;0;) (i64.const 0) func)
+  (elem (;0;) (table $t0) (i64.const 0) func)
 )
diff --git a/tests/snapshots/local/missing-features/issue540.wast/2.print b/tests/snapshots/local/missing-features/issue540.wast/2.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/local/missing-features/issue540.wast/2.print
+++ b/tests/snapshots/local/missing-features/issue540.wast/2.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/local/shared-everything-threads/i31.wast/23.print b/tests/snapshots/local/shared-everything-threads/i31.wast/23.print
index 57369cc427..bce21e5625 100644
--- a/tests/snapshots/local/shared-everything-threads/i31.wast/23.print
+++ b/tests/snapshots/local/shared-everything-threads/i31.wast/23.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) (ref null (shared i31)) (item i32.const 999 ref.i31_shared) (item i32.const 888 ref.i31_shared) (item i32.const 777 ref.i31_shared))
+  (elem (;0;) (table $table) (i32.const 0) (ref null (shared i31)) (item i32.const 999 ref.i31_shared) (item i32.const 888 ref.i31_shared) (item i32.const 777 ref.i31_shared))
   (elem $elem (;1;) (ref null (shared i31)) (item i32.const 123 ref.i31_shared) (item i32.const 456 ref.i31_shared) (item i32.const 789 ref.i31_shared))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/local/shared-everything-threads/i31.wast/54.print b/tests/snapshots/local/shared-everything-threads/i31.wast/54.print
index ea29708b9c..514fce7e30 100644
--- a/tests/snapshots/local/shared-everything-threads/i31.wast/54.print
+++ b/tests/snapshots/local/shared-everything-threads/i31.wast/54.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) (ref null (shared i31)) (item i32.const 999 ref.i31_shared) (item i32.const 888 ref.i31_shared) (item i32.const 777 ref.i31_shared))
+  (elem (;0;) (table $table) (i32.const 0) (ref null (shared i31)) (item i32.const 999 ref.i31_shared) (item i32.const 888 ref.i31_shared) (item i32.const 777 ref.i31_shared))
   (elem $elem (;1;) (ref null (shared i31)) (item i32.const 123 ref.i31_shared) (item i32.const 456 ref.i31_shared) (item i32.const 789 ref.i31_shared))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/testsuite/binary-leb128.wast/5.print b/tests/snapshots/testsuite/binary-leb128.wast/5.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/binary-leb128.wast/5.print
+++ b/tests/snapshots/testsuite/binary-leb128.wast/5.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/binary-leb128.wast/87.print b/tests/snapshots/testsuite/binary-leb128.wast/87.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/binary-leb128.wast/87.print
+++ b/tests/snapshots/testsuite/binary-leb128.wast/87.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/binary-leb128.wast/88.print b/tests/snapshots/testsuite/binary-leb128.wast/88.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/binary-leb128.wast/88.print
+++ b/tests/snapshots/testsuite/binary-leb128.wast/88.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/binary-leb128.wast/89.print b/tests/snapshots/testsuite/binary-leb128.wast/89.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/binary-leb128.wast/89.print
+++ b/tests/snapshots/testsuite/binary-leb128.wast/89.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/block.wast/0.print b/tests/snapshots/testsuite/block.wast/0.print
index ca1d0b46f6..86656c01e2 100644
--- a/tests/snapshots/testsuite/block.wast/0.print
+++ b/tests/snapshots/testsuite/block.wast/0.print
@@ -65,7 +65,7 @@
   (export "params-id-break" (func 52))
   (export "effects" (func 53))
   (export "type-use" (func 54))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/br.wast/0.print b/tests/snapshots/testsuite/br.wast/0.print
index 74ab321b24..d332c98f4e 100644
--- a/tests/snapshots/testsuite/br.wast/0.print
+++ b/tests/snapshots/testsuite/br.wast/0.print
@@ -83,7 +83,7 @@
   (export "nested-br_if-value-cond" (func 71))
   (export "nested-br_table-value" (func 72))
   (export "nested-br_table-value-index" (func 73))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/br_if.wast/0.print b/tests/snapshots/testsuite/br_if.wast/0.print
index 7f0cd64211..7b5fbefe23 100644
--- a/tests/snapshots/testsuite/br_if.wast/0.print
+++ b/tests/snapshots/testsuite/br_if.wast/0.print
@@ -71,7 +71,7 @@
   (export "nested-br_if-value-cond" (func 60))
   (export "nested-br_table-value" (func 61))
   (export "nested-br_table-value-index" (func 62))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/br_table.wast/0.print b/tests/snapshots/testsuite/br_table.wast/0.print
index f65ae8f69a..ebb138f787 100644
--- a/tests/snapshots/testsuite/br_table.wast/0.print
+++ b/tests/snapshots/testsuite/br_table.wast/0.print
@@ -79,7 +79,7 @@
   (export "nested-br_table-value-index" (func 67))
   (export "nested-br_table-loop-block" (func 68))
   (export "meet-externref" (func 69))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/bulk.wast/85.print b/tests/snapshots/testsuite/bulk.wast/85.print
index 3a4cd0a28f..a534032669 100644
--- a/tests/snapshots/testsuite/bulk.wast/85.print
+++ b/tests/snapshots/testsuite/bulk.wast/85.print
@@ -7,7 +7,7 @@
   (export "drop_active" (func 3))
   (export "init_active" (func 4))
   (elem $p (;0;) funcref (ref.func $f))
-  (elem $a (;1;) (i32.const 0) func $f)
+  (elem $a (;1;) (table 0) (i32.const 0) func $f)
   (func $f (;0;) (type 0))
   (func (;1;) (type 0)
     elem.drop $p
diff --git a/tests/snapshots/testsuite/call.wast/0.print b/tests/snapshots/testsuite/call.wast/0.print
index 3636adb5b4..080688e584 100644
--- a/tests/snapshots/testsuite/call.wast/0.print
+++ b/tests/snapshots/testsuite/call.wast/0.print
@@ -83,7 +83,7 @@
   (export "as-compare-right" (func 74))
   (export "as-convert-operand" (func 75))
   (export "return-from-long-argument-list" (func 77))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $const-i32 (;0;) (type 1) (result i32)
     i32.const 306
   )
diff --git a/tests/snapshots/testsuite/call_indirect.wast/0.print b/tests/snapshots/testsuite/call_indirect.wast/0.print
index 74eb6af73c..9481143d1f 100644
--- a/tests/snapshots/testsuite/call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/call_indirect.wast/0.print
@@ -90,7 +90,7 @@
   (export "as-compare-left" (func 77))
   (export "as-compare-right" (func 78))
   (export "as-convert-operand" (func 79))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac-i64 $fib-i64 $even $odd $runaway $mutual-runaway1 $mutual-runaway2 $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate $fac-i32 $fac-f32 $fac-f64 $fib-i32 $fib-f32 $fib-f64 $const-f64-i32 $id-i32-f64 $swap-i32-i64)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac-i64 $fib-i64 $even $odd $runaway $mutual-runaway1 $mutual-runaway2 $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate $fac-i32 $fac-f32 $fac-f64 $fib-i32 $fib-f32 $fib-f64 $const-f64-i32 $id-i32-f64 $swap-i32-i64)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
     i32.const 306
   )
diff --git a/tests/snapshots/testsuite/call_indirect.wast/123.print b/tests/snapshots/testsuite/call_indirect.wast/123.print
index bfcc0d1bdb..e167ce0721 100644
--- a/tests/snapshots/testsuite/call_indirect.wast/123.print
+++ b/tests/snapshots/testsuite/call_indirect.wast/123.print
@@ -8,7 +8,7 @@
   (export "call-1" (func 6))
   (export "call-2" (func 7))
   (export "call-3" (func 8))
-  (elem (;0;) (i32.const 0) func $f $g)
+  (elem (;0;) (table $t1) (i32.const 0) func $f $g)
   (elem (;1;) (table $t2) (i32.const 0) func $h $i $j)
   (elem (;2;) (table $t3) (i32.const 0) func $g $h)
   (elem (;3;) (table $t3) (i32.const 3) func $z)
diff --git a/tests/snapshots/testsuite/elem.wast/0.print b/tests/snapshots/testsuite/elem.wast/0.print
index 3e45036cd8..4d1a910432 100644
--- a/tests/snapshots/testsuite/elem.wast/0.print
+++ b/tests/snapshots/testsuite/elem.wast/0.print
@@ -9,20 +9,20 @@
   (elem $p2 (;5;) funcref (ref.func $f) (ref.func $f) (ref.null func) (ref.func $g))
   (elem $p3 (;6;) func)
   (elem $p4 (;7;) func $f $f $g $g)
-  (elem (;8;) (i32.const 0) funcref)
-  (elem (;9;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem (;10;) (i32.const 0) func)
-  (elem (;11;) (i32.const 0) func $f $g)
-  (elem (;12;) (i32.const 0) funcref)
-  (elem (;13;) (i32.const 0) func $f $g)
-  (elem (;14;) (i32.const 0) func)
-  (elem (;15;) (i32.const 0) func $f $f)
-  (elem (;16;) (i32.const 0) func)
-  (elem (;17;) (i32.const 0) func $f $f)
-  (elem (;18;) (i32.const 0) func)
-  (elem (;19;) (i32.const 0) func $f $f)
-  (elem (;20;) (i32.const 0) func)
-  (elem (;21;) (i32.const 0) func $f $f)
+  (elem (;8;) (table $t) (i32.const 0) funcref)
+  (elem (;9;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem (;10;) (table $t) (i32.const 0) func)
+  (elem (;11;) (table $t) (i32.const 0) func $f $g)
+  (elem (;12;) (table $t) (i32.const 0) funcref)
+  (elem (;13;) (table $t) (i32.const 0) func $f $g)
+  (elem (;14;) (table $t) (i32.const 0) func)
+  (elem (;15;) (table $t) (i32.const 0) func $f $f)
+  (elem (;16;) (table $t) (i32.const 0) func)
+  (elem (;17;) (table $t) (i32.const 0) func $f $f)
+  (elem (;18;) (table $t) (i32.const 0) func)
+  (elem (;19;) (table $t) (i32.const 0) func $f $f)
+  (elem (;20;) (table $t) (i32.const 0) func)
+  (elem (;21;) (table $t) (i32.const 0) func $f $f)
   (elem (;22;) (i32.const 0) func)
   (elem (;23;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem (;24;) (i32.const 0) func $f $f)
@@ -32,20 +32,20 @@
   (elem (;28;) (i32.const 0) func $f $f)
   (elem (;29;) (i32.const 0) func $f $f)
   (elem (;30;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a1 (;31;) (i32.const 0) funcref)
-  (elem $a2 (;32;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a3 (;33;) (i32.const 0) func)
-  (elem $a4 (;34;) (i32.const 0) func $f $g)
-  (elem $a9 (;35;) (i32.const 0) funcref)
-  (elem $a10 (;36;) (i32.const 0) func $f $g)
-  (elem $a11 (;37;) (i32.const 0) func)
-  (elem $a12 (;38;) (i32.const 0) func $f $f)
-  (elem $a13 (;39;) (i32.const 0) func)
-  (elem $a14 (;40;) (i32.const 0) func $f $f)
-  (elem $a15 (;41;) (i32.const 0) func)
-  (elem $a16 (;42;) (i32.const 0) func $f $f)
-  (elem $a17 (;43;) (i32.const 0) func)
-  (elem $a18 (;44;) (i32.const 0) func $f $f)
+  (elem $a1 (;31;) (table $t) (i32.const 0) funcref)
+  (elem $a2 (;32;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem $a3 (;33;) (table $t) (i32.const 0) func)
+  (elem $a4 (;34;) (table $t) (i32.const 0) func $f $g)
+  (elem $a9 (;35;) (table $t) (i32.const 0) funcref)
+  (elem $a10 (;36;) (table $t) (i32.const 0) func $f $g)
+  (elem $a11 (;37;) (table $t) (i32.const 0) func)
+  (elem $a12 (;38;) (table $t) (i32.const 0) func $f $f)
+  (elem $a13 (;39;) (table $t) (i32.const 0) func)
+  (elem $a14 (;40;) (table $t) (i32.const 0) func $f $f)
+  (elem $a15 (;41;) (table $t) (i32.const 0) func)
+  (elem $a16 (;42;) (table $t) (i32.const 0) func $f $f)
+  (elem $a17 (;43;) (table $t) (i32.const 0) func)
+  (elem $a18 (;44;) (table $t) (i32.const 0) func $f $f)
   (elem $a19 (;45;) (i32.const 0) func)
   (elem $a20 (;46;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem $a21 (;47;) (i32.const 0) func $f $f)
diff --git a/tests/snapshots/testsuite/elem.wast/1.print b/tests/snapshots/testsuite/elem.wast/1.print
index 21462afadc..32d94a78b7 100644
--- a/tests/snapshots/testsuite/elem.wast/1.print
+++ b/tests/snapshots/testsuite/elem.wast/1.print
@@ -1,7 +1,7 @@
 (module
   (type (;0;) (func))
   (table $t (;0;) 3 3 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
+  (elem (;0;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
   (func $f (;0;) (type 0))
   (func $g (;1;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/elem.wast/91.print b/tests/snapshots/testsuite/elem.wast/91.print
index 2610a85f32..ab152176bc 100644
--- a/tests/snapshots/testsuite/elem.wast/91.print
+++ b/tests/snapshots/testsuite/elem.wast/91.print
@@ -1,4 +1,4 @@
 (module
   (import "exporter" "table" (table $t (;0;) 2 externref))
-  (elem (;0;) (i32.const 0) externref (ref.null extern))
+  (elem (;0;) (table $t) (i32.const 0) externref (ref.null extern))
 )
diff --git a/tests/snapshots/testsuite/func.wast/97.print b/tests/snapshots/testsuite/func.wast/97.print
index 65433cdaf1..4db9b3519f 100644
--- a/tests/snapshots/testsuite/func.wast/97.print
+++ b/tests/snapshots/testsuite/func.wast/97.print
@@ -8,7 +8,7 @@
   (export "signature-implicit-reused" (func 8))
   (export "signature-explicit-duplicate" (func 9))
   (export "signature-implicit-duplicate" (func 10))
-  (elem (;0;) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
+  (elem (;0;) (table 0) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
   (func $empty-sig-1 (;0;) (type $sig))
   (func $complex-sig-1 (;1;) (type 3) (param f64 i64 f64 i64 f64 i64 f32 i32))
   (func $empty-sig-2 (;2;) (type $sig))
diff --git a/tests/snapshots/testsuite/func_ptrs.wast/12.print b/tests/snapshots/testsuite/func_ptrs.wast/12.print
index 0447930d7f..8360bb6567 100644
--- a/tests/snapshots/testsuite/func_ptrs.wast/12.print
+++ b/tests/snapshots/testsuite/func_ptrs.wast/12.print
@@ -5,7 +5,7 @@
   (table (;0;) 7 7 funcref)
   (export "callt" (func 5))
   (export "callu" (func 6))
-  (elem (;0;) (i32.const 0) func $t1 $t2 $t3 $u1 $u2 $t1 $t3)
+  (elem (;0;) (table 0) (i32.const 0) func $t1 $t2 $t3 $u1 $u2 $t1 $t3)
   (func $t1 (;0;) (type $T) (result i32)
     i32.const 1
   )
diff --git a/tests/snapshots/testsuite/func_ptrs.wast/33.print b/tests/snapshots/testsuite/func_ptrs.wast/33.print
index 708dfd40e3..06ef805810 100644
--- a/tests/snapshots/testsuite/func_ptrs.wast/33.print
+++ b/tests/snapshots/testsuite/func_ptrs.wast/33.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 2 2 funcref)
   (export "callt" (func 2))
-  (elem (;0;) (i32.const 0) func $t1 $t2)
+  (elem (;0;) (table 0) (i32.const 0) func $t1 $t2)
   (func $t1 (;0;) (type $T) (result i32)
     i32.const 1
   )
diff --git a/tests/snapshots/testsuite/global.wast/0.print b/tests/snapshots/testsuite/global.wast/0.print
index 95bc129c4c..b658a7f2f2 100644
--- a/tests/snapshots/testsuite/global.wast/0.print
+++ b/tests/snapshots/testsuite/global.wast/0.print
@@ -76,7 +76,7 @@
   (export "as-unary-operand" (func 47))
   (export "as-binary-operand" (func 48))
   (export "as-compare-operand" (func 49))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func (;0;) (type 1) (result i32)
     global.get $a
   )
diff --git a/tests/snapshots/testsuite/if.wast/0.print b/tests/snapshots/testsuite/if.wast/0.print
index 57caff7d3a..95b359a350 100644
--- a/tests/snapshots/testsuite/if.wast/0.print
+++ b/tests/snapshots/testsuite/if.wast/0.print
@@ -68,7 +68,7 @@
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
   (export "atypical-condition" (func 52))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-3) (param i32)
     local.get 0
diff --git a/tests/snapshots/testsuite/imports.wast/2.print b/tests/snapshots/testsuite/imports.wast/2.print
index 35db23c0e6..a63ee42c53 100644
--- a/tests/snapshots/testsuite/imports.wast/2.print
+++ b/tests/snapshots/testsuite/imports.wast/2.print
@@ -34,7 +34,7 @@
   (export "p6" (func 15))
   (export "print32" (func 18))
   (export "print64" (func 19))
-  (elem (;0;) (i32.const 0) func $print_i32 $print_f64)
+  (elem (;0;) (table 0) (i32.const 0) func $print_i32 $print_f64)
   (func (;18;) (type $func_i32) (param $i i32)
     (local $x f32)
     local.get $i
diff --git a/tests/snapshots/testsuite/imports.wast/72.print b/tests/snapshots/testsuite/imports.wast/72.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/imports.wast/72.print
+++ b/tests/snapshots/testsuite/imports.wast/72.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/imports.wast/78.print b/tests/snapshots/testsuite/imports.wast/78.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/imports.wast/78.print
+++ b/tests/snapshots/testsuite/imports.wast/78.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/left-to-right.wast/0.print b/tests/snapshots/testsuite/left-to-right.wast/0.print
index 0bd5087a82..3bc3368491 100644
--- a/tests/snapshots/testsuite/left-to-right.wast/0.print
+++ b/tests/snapshots/testsuite/left-to-right.wast/0.print
@@ -109,7 +109,7 @@
   (export "f64_select" (func 127))
   (export "br_if" (func 128))
   (export "br_table" (func 129))
-  (elem (;0;) (i32.const 0) func $i32_t0 $i32_t1 $i64_t0 $i64_t1 $f32_t0 $f32_t1 $f64_t0 $f64_t1)
+  (elem (;0;) (table 0) (i32.const 0) func $i32_t0 $i32_t1 $i64_t0 $i64_t1 $f32_t0 $f32_t1 $f64_t0 $f64_t1)
   (func $i32_t0 (;0;) (type $i32_T) (param i32 i32) (result i32)
     i32.const -1
   )
diff --git a/tests/snapshots/testsuite/linking.wast/40.print b/tests/snapshots/testsuite/linking.wast/40.print
index 282b723860..c75be49f71 100644
--- a/tests/snapshots/testsuite/linking.wast/40.print
+++ b/tests/snapshots/testsuite/linking.wast/40.print
@@ -8,7 +8,7 @@
   (export "Mt.call" (func $f))
   (export "call Mt.call" (func 3))
   (export "call" (func 4))
-  (elem (;0;) (i32.const 0) func $g $g $g $h $f)
+  (elem (;0;) (table 0) (i32.const 0) func $g $g $g $h $f)
   (func $g (;2;) (type 1) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/load.wast/0.print b/tests/snapshots/testsuite/load.wast/0.print
index 68c0af17ee..8cfca9e2c0 100644
--- a/tests/snapshots/testsuite/load.wast/0.print
+++ b/tests/snapshots/testsuite/load.wast/0.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/local_tee.wast/0.print b/tests/snapshots/testsuite/local_tee.wast/0.print
index b4455f3cb7..faf50dbb8c 100644
--- a/tests/snapshots/testsuite/local_tee.wast/0.print
+++ b/tests/snapshots/testsuite/local_tee.wast/0.print
@@ -73,7 +73,7 @@
   (export "as-compare-right" (func 54))
   (export "as-convert-operand" (func 55))
   (export "as-memory.grow-size" (func 56))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     (local i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/loop.wast/0.print b/tests/snapshots/testsuite/loop.wast/0.print
index bbba1df0ea..1b9eb5a9f7 100644
--- a/tests/snapshots/testsuite/loop.wast/0.print
+++ b/tests/snapshots/testsuite/loop.wast/0.print
@@ -69,7 +69,7 @@
   (export "for" (func 53))
   (export "nesting" (func 54))
   (export "type-use" (func 55))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-1)
     loop ;; label = @1
diff --git a/tests/snapshots/testsuite/memory_grow.wast/51.print b/tests/snapshots/testsuite/memory_grow.wast/51.print
index e6fac4087c..695004dda2 100644
--- a/tests/snapshots/testsuite/memory_grow.wast/51.print
+++ b/tests/snapshots/testsuite/memory_grow.wast/51.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/nop.wast/0.print b/tests/snapshots/testsuite/nop.wast/0.print
index ee1112c9a8..ef50f936f3 100644
--- a/tests/snapshots/testsuite/nop.wast/0.print
+++ b/tests/snapshots/testsuite/nop.wast/0.print
@@ -89,7 +89,7 @@
   (export "as-store-mid" (func 80))
   (export "as-store-last" (func 81))
   (export "as-store-everywhere" (func 82))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type 1))
   (func $3-ary (;1;) (type 2) (param i32 i32 i32) (result i32)
     local.get 0
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/2.print b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/2.print
index e60965f3b9..f4ec4da011 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/2.print
@@ -36,7 +36,7 @@
   (export "p6" (func 15))
   (export "print32" (func 18))
   (export "print64" (func 19))
-  (elem (;0;) (i32.const 0) func $print_i32 $print_f64)
+  (elem (;0;) (table 0) (i32.const 0) func $print_i32 $print_f64)
   (func (;18;) (type $func_i32) (param $i i32)
     (local $x f32)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/78.print b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/78.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/78.print
+++ b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/78.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/84.print b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/84.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/84.print
+++ b/tests/snapshots/testsuite/proposals/exception-handling/imports.wast/84.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
index 298bc9120b..e1899dcb53 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
@@ -43,7 +43,7 @@
   (export "return-call-in-try-catch" (func 21))
   (export "return-call-indirect-in-try-catch" (func 22))
   (export "try-with-param" (func 23))
-  (elem (;0;) (i32.const 0) func $throw-void)
+  (elem (;0;) (table 0) (i32.const 0) func $throw-void)
   (func $throw-if (;1;) (type 5) (param i32) (result i32)
     local.get 0
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/0.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/0.print
index 3e45036cd8..4d1a910432 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/0.print
@@ -9,20 +9,20 @@
   (elem $p2 (;5;) funcref (ref.func $f) (ref.func $f) (ref.null func) (ref.func $g))
   (elem $p3 (;6;) func)
   (elem $p4 (;7;) func $f $f $g $g)
-  (elem (;8;) (i32.const 0) funcref)
-  (elem (;9;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem (;10;) (i32.const 0) func)
-  (elem (;11;) (i32.const 0) func $f $g)
-  (elem (;12;) (i32.const 0) funcref)
-  (elem (;13;) (i32.const 0) func $f $g)
-  (elem (;14;) (i32.const 0) func)
-  (elem (;15;) (i32.const 0) func $f $f)
-  (elem (;16;) (i32.const 0) func)
-  (elem (;17;) (i32.const 0) func $f $f)
-  (elem (;18;) (i32.const 0) func)
-  (elem (;19;) (i32.const 0) func $f $f)
-  (elem (;20;) (i32.const 0) func)
-  (elem (;21;) (i32.const 0) func $f $f)
+  (elem (;8;) (table $t) (i32.const 0) funcref)
+  (elem (;9;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem (;10;) (table $t) (i32.const 0) func)
+  (elem (;11;) (table $t) (i32.const 0) func $f $g)
+  (elem (;12;) (table $t) (i32.const 0) funcref)
+  (elem (;13;) (table $t) (i32.const 0) func $f $g)
+  (elem (;14;) (table $t) (i32.const 0) func)
+  (elem (;15;) (table $t) (i32.const 0) func $f $f)
+  (elem (;16;) (table $t) (i32.const 0) func)
+  (elem (;17;) (table $t) (i32.const 0) func $f $f)
+  (elem (;18;) (table $t) (i32.const 0) func)
+  (elem (;19;) (table $t) (i32.const 0) func $f $f)
+  (elem (;20;) (table $t) (i32.const 0) func)
+  (elem (;21;) (table $t) (i32.const 0) func $f $f)
   (elem (;22;) (i32.const 0) func)
   (elem (;23;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem (;24;) (i32.const 0) func $f $f)
@@ -32,20 +32,20 @@
   (elem (;28;) (i32.const 0) func $f $f)
   (elem (;29;) (i32.const 0) func $f $f)
   (elem (;30;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a1 (;31;) (i32.const 0) funcref)
-  (elem $a2 (;32;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a3 (;33;) (i32.const 0) func)
-  (elem $a4 (;34;) (i32.const 0) func $f $g)
-  (elem $a9 (;35;) (i32.const 0) funcref)
-  (elem $a10 (;36;) (i32.const 0) func $f $g)
-  (elem $a11 (;37;) (i32.const 0) func)
-  (elem $a12 (;38;) (i32.const 0) func $f $f)
-  (elem $a13 (;39;) (i32.const 0) func)
-  (elem $a14 (;40;) (i32.const 0) func $f $f)
-  (elem $a15 (;41;) (i32.const 0) func)
-  (elem $a16 (;42;) (i32.const 0) func $f $f)
-  (elem $a17 (;43;) (i32.const 0) func)
-  (elem $a18 (;44;) (i32.const 0) func $f $f)
+  (elem $a1 (;31;) (table $t) (i32.const 0) funcref)
+  (elem $a2 (;32;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem $a3 (;33;) (table $t) (i32.const 0) func)
+  (elem $a4 (;34;) (table $t) (i32.const 0) func $f $g)
+  (elem $a9 (;35;) (table $t) (i32.const 0) funcref)
+  (elem $a10 (;36;) (table $t) (i32.const 0) func $f $g)
+  (elem $a11 (;37;) (table $t) (i32.const 0) func)
+  (elem $a12 (;38;) (table $t) (i32.const 0) func $f $f)
+  (elem $a13 (;39;) (table $t) (i32.const 0) func)
+  (elem $a14 (;40;) (table $t) (i32.const 0) func $f $f)
+  (elem $a15 (;41;) (table $t) (i32.const 0) func)
+  (elem $a16 (;42;) (table $t) (i32.const 0) func $f $f)
+  (elem $a17 (;43;) (table $t) (i32.const 0) func)
+  (elem $a18 (;44;) (table $t) (i32.const 0) func $f $f)
   (elem $a19 (;45;) (i32.const 0) func)
   (elem $a20 (;46;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem $a21 (;47;) (i32.const 0) func $f $f)
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/1.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/1.print
index 21462afadc..32d94a78b7 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/1.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/1.print
@@ -1,7 +1,7 @@
 (module
   (type (;0;) (func))
   (table $t (;0;) 3 3 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
+  (elem (;0;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
   (func $f (;0;) (type 0))
   (func $g (;1;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/102.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/102.print
index d98aefd8d1..affcd32ff7 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/102.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/102.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 i32.const 1 i32.sub) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 i32.const 1 i32.sub) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/105.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/105.print
index 5e0e75bb50..f53c66ab4d 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/105.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/105.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 i32.const 2 i32.mul) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 i32.const 2 i32.mul) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/108.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/108.print
index f7607d0855..656634cd29 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/108.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/108.print
@@ -4,7 +4,7 @@
   (import "spectest" "global_i32" (global (;0;) i32))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 global.get 0 i32.const 665 i32.sub i32.const 2 i32.add i32.mul) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 global.get 0 i32.const 665 i32.sub i32.const 2 i32.add i32.mul) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/92.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/92.print
index 2610a85f32..ab152176bc 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/92.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/92.print
@@ -1,4 +1,4 @@
 (module
   (import "exporter" "table" (table $t (;0;) 2 externref))
-  (elem (;0;) (i32.const 0) externref (ref.null extern))
+  (elem (;0;) (table $t) (i32.const 0) externref (ref.null extern))
 )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/99.print b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/99.print
index 20ebe6fdfe..92e8132327 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/elem.wast/99.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/elem.wast/99.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 1 i32.const 2 i32.add) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 1 i32.const 2 i32.add) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/extended-const/global.wast/0.print b/tests/snapshots/testsuite/proposals/extended-const/global.wast/0.print
index eea13ad468..1c92c02bd2 100644
--- a/tests/snapshots/testsuite/proposals/extended-const/global.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/extended-const/global.wast/0.print
@@ -84,7 +84,7 @@
   (export "as-unary-operand" (func 51))
   (export "as-binary-operand" (func 52))
   (export "as-compare-operand" (func 53))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func (;0;) (type 1) (result i32)
     global.get $a
   )
diff --git a/tests/snapshots/testsuite/proposals/function-references/br_table.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/br_table.wast/0.print
index 7f30574d1a..e19c67a10a 100644
--- a/tests/snapshots/testsuite/proposals/function-references/br_table.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/br_table.wast/0.print
@@ -88,7 +88,7 @@
   (export "meet-funcref-4" (func 75))
   (export "meet-nullref" (func 76))
   (export "meet-multi-ref" (func 77))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (elem (;1;) (table $t) (i32.const 0) (ref null $t) (ref.func $tf))
   (func $dummy (;0;) (type $t))
   (func (;1;) (type $t)
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/0.print
index 3e45036cd8..4d1a910432 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/0.print
@@ -9,20 +9,20 @@
   (elem $p2 (;5;) funcref (ref.func $f) (ref.func $f) (ref.null func) (ref.func $g))
   (elem $p3 (;6;) func)
   (elem $p4 (;7;) func $f $f $g $g)
-  (elem (;8;) (i32.const 0) funcref)
-  (elem (;9;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem (;10;) (i32.const 0) func)
-  (elem (;11;) (i32.const 0) func $f $g)
-  (elem (;12;) (i32.const 0) funcref)
-  (elem (;13;) (i32.const 0) func $f $g)
-  (elem (;14;) (i32.const 0) func)
-  (elem (;15;) (i32.const 0) func $f $f)
-  (elem (;16;) (i32.const 0) func)
-  (elem (;17;) (i32.const 0) func $f $f)
-  (elem (;18;) (i32.const 0) func)
-  (elem (;19;) (i32.const 0) func $f $f)
-  (elem (;20;) (i32.const 0) func)
-  (elem (;21;) (i32.const 0) func $f $f)
+  (elem (;8;) (table $t) (i32.const 0) funcref)
+  (elem (;9;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem (;10;) (table $t) (i32.const 0) func)
+  (elem (;11;) (table $t) (i32.const 0) func $f $g)
+  (elem (;12;) (table $t) (i32.const 0) funcref)
+  (elem (;13;) (table $t) (i32.const 0) func $f $g)
+  (elem (;14;) (table $t) (i32.const 0) func)
+  (elem (;15;) (table $t) (i32.const 0) func $f $f)
+  (elem (;16;) (table $t) (i32.const 0) func)
+  (elem (;17;) (table $t) (i32.const 0) func $f $f)
+  (elem (;18;) (table $t) (i32.const 0) func)
+  (elem (;19;) (table $t) (i32.const 0) func $f $f)
+  (elem (;20;) (table $t) (i32.const 0) func)
+  (elem (;21;) (table $t) (i32.const 0) func $f $f)
   (elem (;22;) (i32.const 0) func)
   (elem (;23;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem (;24;) (i32.const 0) func $f $f)
@@ -32,20 +32,20 @@
   (elem (;28;) (i32.const 0) func $f $f)
   (elem (;29;) (i32.const 0) func $f $f)
   (elem (;30;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a1 (;31;) (i32.const 0) funcref)
-  (elem $a2 (;32;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a3 (;33;) (i32.const 0) func)
-  (elem $a4 (;34;) (i32.const 0) func $f $g)
-  (elem $a9 (;35;) (i32.const 0) funcref)
-  (elem $a10 (;36;) (i32.const 0) func $f $g)
-  (elem $a11 (;37;) (i32.const 0) func)
-  (elem $a12 (;38;) (i32.const 0) func $f $f)
-  (elem $a13 (;39;) (i32.const 0) func)
-  (elem $a14 (;40;) (i32.const 0) func $f $f)
-  (elem $a15 (;41;) (i32.const 0) func)
-  (elem $a16 (;42;) (i32.const 0) func $f $f)
-  (elem $a17 (;43;) (i32.const 0) func)
-  (elem $a18 (;44;) (i32.const 0) func $f $f)
+  (elem $a1 (;31;) (table $t) (i32.const 0) funcref)
+  (elem $a2 (;32;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem $a3 (;33;) (table $t) (i32.const 0) func)
+  (elem $a4 (;34;) (table $t) (i32.const 0) func $f $g)
+  (elem $a9 (;35;) (table $t) (i32.const 0) funcref)
+  (elem $a10 (;36;) (table $t) (i32.const 0) func $f $g)
+  (elem $a11 (;37;) (table $t) (i32.const 0) func)
+  (elem $a12 (;38;) (table $t) (i32.const 0) func $f $f)
+  (elem $a13 (;39;) (table $t) (i32.const 0) func)
+  (elem $a14 (;40;) (table $t) (i32.const 0) func $f $f)
+  (elem $a15 (;41;) (table $t) (i32.const 0) func)
+  (elem $a16 (;42;) (table $t) (i32.const 0) func $f $f)
+  (elem $a17 (;43;) (table $t) (i32.const 0) func)
+  (elem $a18 (;44;) (table $t) (i32.const 0) func $f $f)
   (elem $a19 (;45;) (i32.const 0) func)
   (elem $a20 (;46;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem $a21 (;47;) (i32.const 0) func $f $f)
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/1.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/1.print
index 21462afadc..32d94a78b7 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/1.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/1.print
@@ -1,7 +1,7 @@
 (module
   (type (;0;) (func))
   (table $t (;0;) 3 3 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
+  (elem (;0;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
   (func $f (;0;) (type 0))
   (func $g (;1;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/131.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/131.print
index 2610a85f32..ab152176bc 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/131.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/131.print
@@ -1,4 +1,4 @@
 (module
   (import "exporter" "table" (table $t (;0;) 2 externref))
-  (elem (;0;) (i32.const 0) externref (ref.null extern))
+  (elem (;0;) (table $t) (i32.const 0) externref (ref.null extern))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/29.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/29.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/29.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/29.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/30.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/30.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/30.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/30.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/33.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/33.print
index 4913137806..834263d5d6 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/33.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/33.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/41.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/41.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/41.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/41.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/42.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/42.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/42.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/42.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/43.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/43.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/43.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/43.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/44.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/44.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/44.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/44.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/53.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/53.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/53.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/53.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/54.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/54.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/54.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/54.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/61.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/61.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/61.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/61.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/elem.wast/62.print b/tests/snapshots/testsuite/proposals/function-references/elem.wast/62.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/function-references/elem.wast/62.print
+++ b/tests/snapshots/testsuite/proposals/function-references/elem.wast/62.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/function-references/func.wast/97.print b/tests/snapshots/testsuite/proposals/function-references/func.wast/97.print
index 65433cdaf1..4db9b3519f 100644
--- a/tests/snapshots/testsuite/proposals/function-references/func.wast/97.print
+++ b/tests/snapshots/testsuite/proposals/function-references/func.wast/97.print
@@ -8,7 +8,7 @@
   (export "signature-implicit-reused" (func 8))
   (export "signature-explicit-duplicate" (func 9))
   (export "signature-implicit-duplicate" (func 10))
-  (elem (;0;) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
+  (elem (;0;) (table 0) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
   (func $empty-sig-1 (;0;) (type $sig))
   (func $complex-sig-1 (;1;) (type 3) (param f64 i64 f64 i64 f64 i64 f32 i32))
   (func $empty-sig-2 (;2;) (type $sig))
diff --git a/tests/snapshots/testsuite/proposals/function-references/global.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/global.wast/0.print
index 95bc129c4c..b658a7f2f2 100644
--- a/tests/snapshots/testsuite/proposals/function-references/global.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/global.wast/0.print
@@ -76,7 +76,7 @@
   (export "as-unary-operand" (func 47))
   (export "as-binary-operand" (func 48))
   (export "as-compare-operand" (func 49))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func (;0;) (type 1) (result i32)
     global.get $a
   )
diff --git a/tests/snapshots/testsuite/proposals/function-references/if.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/if.wast/0.print
index 57caff7d3a..95b359a350 100644
--- a/tests/snapshots/testsuite/proposals/function-references/if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/if.wast/0.print
@@ -68,7 +68,7 @@
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
   (export "atypical-condition" (func 52))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-3) (param i32)
     local.get 0
diff --git a/tests/snapshots/testsuite/proposals/function-references/linking.wast/71.print b/tests/snapshots/testsuite/proposals/function-references/linking.wast/71.print
index 282b723860..c75be49f71 100644
--- a/tests/snapshots/testsuite/proposals/function-references/linking.wast/71.print
+++ b/tests/snapshots/testsuite/proposals/function-references/linking.wast/71.print
@@ -8,7 +8,7 @@
   (export "Mt.call" (func $f))
   (export "call Mt.call" (func 3))
   (export "call" (func 4))
-  (elem (;0;) (i32.const 0) func $g $g $g $h $f)
+  (elem (;0;) (table 0) (i32.const 0) func $g $g $g $h $f)
   (func $g (;2;) (type 1) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/function-references/ref_func.wast/14.print b/tests/snapshots/testsuite/proposals/function-references/ref_func.wast/14.print
index b934427fb1..bfc85602fb 100644
--- a/tests/snapshots/testsuite/proposals/function-references/ref_func.wast/14.print
+++ b/tests/snapshots/testsuite/proposals/function-references/ref_func.wast/14.print
@@ -3,8 +3,8 @@
   (table $t (;0;) 1 funcref)
   (global (;0;) funcref ref.func $f1)
   (export "f" (func $f2))
-  (elem (;0;) (i32.const 0) func $f3)
-  (elem (;1;) (i32.const 0) funcref (ref.func $f4))
+  (elem (;0;) (table $t) (i32.const 0) func $f3)
+  (elem (;1;) (table $t) (i32.const 0) funcref (ref.func $f4))
   (elem (;2;) func $f5)
   (elem (;3;) funcref (ref.func $f6))
   (func $f1 (;0;) (type 0))
diff --git a/tests/snapshots/testsuite/proposals/function-references/ref_is_null.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/ref_is_null.wast/0.print
index 1097f20712..c677f3a4a0 100644
--- a/tests/snapshots/testsuite/proposals/function-references/ref_is_null.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/ref_is_null.wast/0.print
@@ -17,7 +17,7 @@
   (export "funcref-elem" (func 7))
   (export "externref-elem" (func 8))
   (export "ref-elem" (func 9))
-  (elem (;0;) (i32.const 1) func $dummy)
+  (elem (;0;) (table $t1) (i32.const 1) func $dummy)
   (elem (;1;) (table $t3) (i32.const 1) (ref $t) (ref.func $dummy))
   (func $dummy (;0;) (type $t))
   (func $f1 (;1;) (type 1) (param $x funcref) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast/0.print
index be0799bf90..5a437ac5bb 100644
--- a/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast/0.print
@@ -44,7 +44,7 @@
   (export "fac" (func $fac))
   (export "even" (func $even))
   (export "odd" (func $odd))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
   (elem (;1;) (table $tab2) (i32.const 0) func $tab-f1)
   (elem (;2;) (table $tab3) (i32.const 0) func $tab-f2)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/function-references/select.wast/0.print b/tests/snapshots/testsuite/proposals/function-references/select.wast/0.print
index 70dfa7ea6c..a2b9a32e12 100644
--- a/tests/snapshots/testsuite/proposals/function-references/select.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/function-references/select.wast/0.print
@@ -65,7 +65,7 @@
   (export "as-compare-left" (func 50))
   (export "as-compare-right" (func 51))
   (export "as-convert-operand" (func 52))
-  (elem (;0;) (i32.const 0) func $dummy)
+  (elem (;0;) (table $tab) (i32.const 0) func $dummy)
   (elem (;1;) declare func $tf)
   (elem (;2;) (table $t) (i32.const 0) func $func)
   (func $dummy (;0;) (type $t))
diff --git a/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/4.print b/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/4.print
index ecb7350560..bd7d7239d0 100644
--- a/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/4.print
+++ b/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/4.print
@@ -4,7 +4,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (param f32 f32))
   (func $f2 (;1;) (type $t2) (param f32 f32))
   (func (;2;) (type 2)
diff --git a/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/6.print b/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/6.print
index a9fed0f084..d764874534 100644
--- a/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/6.print
+++ b/tests/snapshots/testsuite/proposals/function-references/type-equivalence.wast/6.print
@@ -7,7 +7,7 @@
   (type (;5;) (func))
   (table (;0;) 4 4 funcref)
   (export "run" (func 4))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $s1 $s2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $s1 $s2)
   (func $s1 (;0;) (type $s1) (param i32 (ref $s0)))
   (func $s2 (;1;) (type $s2) (param i32 (ref $s0)))
   (func $f1 (;2;) (type $t1) (param (ref $s1)))
diff --git a/tests/snapshots/testsuite/proposals/gc/br_if.wast/0.print b/tests/snapshots/testsuite/proposals/gc/br_if.wast/0.print
index 7f0cd64211..7b5fbefe23 100644
--- a/tests/snapshots/testsuite/proposals/gc/br_if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/br_if.wast/0.print
@@ -71,7 +71,7 @@
   (export "nested-br_if-value-cond" (func 60))
   (export "nested-br_table-value" (func 61))
   (export "nested-br_table-value-index" (func 62))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/proposals/gc/br_table.wast/0.print b/tests/snapshots/testsuite/proposals/gc/br_table.wast/0.print
index 7f30574d1a..e19c67a10a 100644
--- a/tests/snapshots/testsuite/proposals/gc/br_table.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/br_table.wast/0.print
@@ -88,7 +88,7 @@
   (export "meet-funcref-4" (func 75))
   (export "meet-nullref" (func 76))
   (export "meet-multi-ref" (func 77))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (elem (;1;) (table $t) (i32.const 0) (ref null $t) (ref.func $tf))
   (func $dummy (;0;) (type $t))
   (func (;1;) (type $t)
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/0.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/0.print
index 3e45036cd8..4d1a910432 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/0.print
@@ -9,20 +9,20 @@
   (elem $p2 (;5;) funcref (ref.func $f) (ref.func $f) (ref.null func) (ref.func $g))
   (elem $p3 (;6;) func)
   (elem $p4 (;7;) func $f $f $g $g)
-  (elem (;8;) (i32.const 0) funcref)
-  (elem (;9;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem (;10;) (i32.const 0) func)
-  (elem (;11;) (i32.const 0) func $f $g)
-  (elem (;12;) (i32.const 0) funcref)
-  (elem (;13;) (i32.const 0) func $f $g)
-  (elem (;14;) (i32.const 0) func)
-  (elem (;15;) (i32.const 0) func $f $f)
-  (elem (;16;) (i32.const 0) func)
-  (elem (;17;) (i32.const 0) func $f $f)
-  (elem (;18;) (i32.const 0) func)
-  (elem (;19;) (i32.const 0) func $f $f)
-  (elem (;20;) (i32.const 0) func)
-  (elem (;21;) (i32.const 0) func $f $f)
+  (elem (;8;) (table $t) (i32.const 0) funcref)
+  (elem (;9;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem (;10;) (table $t) (i32.const 0) func)
+  (elem (;11;) (table $t) (i32.const 0) func $f $g)
+  (elem (;12;) (table $t) (i32.const 0) funcref)
+  (elem (;13;) (table $t) (i32.const 0) func $f $g)
+  (elem (;14;) (table $t) (i32.const 0) func)
+  (elem (;15;) (table $t) (i32.const 0) func $f $f)
+  (elem (;16;) (table $t) (i32.const 0) func)
+  (elem (;17;) (table $t) (i32.const 0) func $f $f)
+  (elem (;18;) (table $t) (i32.const 0) func)
+  (elem (;19;) (table $t) (i32.const 0) func $f $f)
+  (elem (;20;) (table $t) (i32.const 0) func)
+  (elem (;21;) (table $t) (i32.const 0) func $f $f)
   (elem (;22;) (i32.const 0) func)
   (elem (;23;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem (;24;) (i32.const 0) func $f $f)
@@ -32,20 +32,20 @@
   (elem (;28;) (i32.const 0) func $f $f)
   (elem (;29;) (i32.const 0) func $f $f)
   (elem (;30;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a1 (;31;) (i32.const 0) funcref)
-  (elem $a2 (;32;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a3 (;33;) (i32.const 0) func)
-  (elem $a4 (;34;) (i32.const 0) func $f $g)
-  (elem $a9 (;35;) (i32.const 0) funcref)
-  (elem $a10 (;36;) (i32.const 0) func $f $g)
-  (elem $a11 (;37;) (i32.const 0) func)
-  (elem $a12 (;38;) (i32.const 0) func $f $f)
-  (elem $a13 (;39;) (i32.const 0) func)
-  (elem $a14 (;40;) (i32.const 0) func $f $f)
-  (elem $a15 (;41;) (i32.const 0) func)
-  (elem $a16 (;42;) (i32.const 0) func $f $f)
-  (elem $a17 (;43;) (i32.const 0) func)
-  (elem $a18 (;44;) (i32.const 0) func $f $f)
+  (elem $a1 (;31;) (table $t) (i32.const 0) funcref)
+  (elem $a2 (;32;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem $a3 (;33;) (table $t) (i32.const 0) func)
+  (elem $a4 (;34;) (table $t) (i32.const 0) func $f $g)
+  (elem $a9 (;35;) (table $t) (i32.const 0) funcref)
+  (elem $a10 (;36;) (table $t) (i32.const 0) func $f $g)
+  (elem $a11 (;37;) (table $t) (i32.const 0) func)
+  (elem $a12 (;38;) (table $t) (i32.const 0) func $f $f)
+  (elem $a13 (;39;) (table $t) (i32.const 0) func)
+  (elem $a14 (;40;) (table $t) (i32.const 0) func $f $f)
+  (elem $a15 (;41;) (table $t) (i32.const 0) func)
+  (elem $a16 (;42;) (table $t) (i32.const 0) func $f $f)
+  (elem $a17 (;43;) (table $t) (i32.const 0) func)
+  (elem $a18 (;44;) (table $t) (i32.const 0) func $f $f)
   (elem $a19 (;45;) (i32.const 0) func)
   (elem $a20 (;46;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem $a21 (;47;) (i32.const 0) func $f $f)
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/1.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/1.print
index 21462afadc..32d94a78b7 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/1.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/1.print
@@ -1,7 +1,7 @@
 (module
   (type (;0;) (func))
   (table $t (;0;) 3 3 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
+  (elem (;0;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
   (func $f (;0;) (type 0))
   (func $g (;1;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/133.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/133.print
index 2610a85f32..ab152176bc 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/133.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/133.print
@@ -1,4 +1,4 @@
 (module
   (import "exporter" "table" (table $t (;0;) 2 externref))
-  (elem (;0;) (i32.const 0) externref (ref.null extern))
+  (elem (;0;) (table $t) (i32.const 0) externref (ref.null extern))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/31.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/31.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/31.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/31.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/32.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/32.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/32.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/32.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/35.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/35.print
index 4913137806..834263d5d6 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/35.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/35.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/43.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/43.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/43.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/43.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/44.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/44.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/44.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/44.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/45.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/45.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/45.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/45.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/46.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/46.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/46.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/46.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/55.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/55.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/55.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/55.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/56.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/56.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/56.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/56.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/63.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/63.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/63.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/63.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/elem.wast/64.print b/tests/snapshots/testsuite/proposals/gc/elem.wast/64.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/gc/elem.wast/64.print
+++ b/tests/snapshots/testsuite/proposals/gc/elem.wast/64.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/gc/func.wast/97.print b/tests/snapshots/testsuite/proposals/gc/func.wast/97.print
index 65433cdaf1..4db9b3519f 100644
--- a/tests/snapshots/testsuite/proposals/gc/func.wast/97.print
+++ b/tests/snapshots/testsuite/proposals/gc/func.wast/97.print
@@ -8,7 +8,7 @@
   (export "signature-implicit-reused" (func 8))
   (export "signature-explicit-duplicate" (func 9))
   (export "signature-implicit-duplicate" (func 10))
-  (elem (;0;) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
+  (elem (;0;) (table 0) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
   (func $empty-sig-1 (;0;) (type $sig))
   (func $complex-sig-1 (;1;) (type 3) (param f64 i64 f64 i64 f64 i64 f32 i32))
   (func $empty-sig-2 (;2;) (type $sig))
diff --git a/tests/snapshots/testsuite/proposals/gc/global.wast/0.print b/tests/snapshots/testsuite/proposals/gc/global.wast/0.print
index 95bc129c4c..b658a7f2f2 100644
--- a/tests/snapshots/testsuite/proposals/gc/global.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/global.wast/0.print
@@ -76,7 +76,7 @@
   (export "as-unary-operand" (func 47))
   (export "as-binary-operand" (func 48))
   (export "as-compare-operand" (func 49))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func (;0;) (type 1) (result i32)
     global.get $a
   )
diff --git a/tests/snapshots/testsuite/proposals/gc/global.wast/109.print b/tests/snapshots/testsuite/proposals/gc/global.wast/109.print
index 823cc2fd34..effa7eca7d 100644
--- a/tests/snapshots/testsuite/proposals/gc/global.wast/109.print
+++ b/tests/snapshots/testsuite/proposals/gc/global.wast/109.print
@@ -11,8 +11,8 @@
   (global $gf (;4;) funcref ref.func $f)
   (export "get-elem" (func 1))
   (export "get-data" (func 2))
-  (elem (;0;) (global.get $g2) funcref (ref.func $f))
-  (elem (;1;) (global.get $g3) funcref (global.get $gf))
+  (elem (;0;) (table $t) (global.get $g2) funcref (ref.func $f))
+  (elem (;1;) (table $t) (global.get $g3) funcref (global.get $gf))
   (func $f (;0;) (type 0))
   (func (;1;) (type 1) (param $i i32) (result funcref)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/gc/i31.wast/23.print b/tests/snapshots/testsuite/proposals/gc/i31.wast/23.print
index 70b4717eb2..952d2e9d0e 100644
--- a/tests/snapshots/testsuite/proposals/gc/i31.wast/23.print
+++ b/tests/snapshots/testsuite/proposals/gc/i31.wast/23.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
+  (elem (;0;) (table $table) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
   (elem $elem (;1;) i31ref (item i32.const 123 ref.i31) (item i32.const 456 ref.i31) (item i32.const 789 ref.i31))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/testsuite/proposals/gc/i31.wast/54.print b/tests/snapshots/testsuite/proposals/gc/i31.wast/54.print
index b8065640f2..19ebe078ba 100644
--- a/tests/snapshots/testsuite/proposals/gc/i31.wast/54.print
+++ b/tests/snapshots/testsuite/proposals/gc/i31.wast/54.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
+  (elem (;0;) (table $table) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
   (elem $elem (;1;) i31ref (item i32.const 123 ref.i31) (item i32.const 456 ref.i31) (item i32.const 789 ref.i31))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/testsuite/proposals/gc/if.wast/0.print b/tests/snapshots/testsuite/proposals/gc/if.wast/0.print
index 57caff7d3a..95b359a350 100644
--- a/tests/snapshots/testsuite/proposals/gc/if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/if.wast/0.print
@@ -68,7 +68,7 @@
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
   (export "atypical-condition" (func 52))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-3) (param i32)
     local.get 0
diff --git a/tests/snapshots/testsuite/proposals/gc/linking.wast/67.print b/tests/snapshots/testsuite/proposals/gc/linking.wast/67.print
index 282b723860..c75be49f71 100644
--- a/tests/snapshots/testsuite/proposals/gc/linking.wast/67.print
+++ b/tests/snapshots/testsuite/proposals/gc/linking.wast/67.print
@@ -8,7 +8,7 @@
   (export "Mt.call" (func $f))
   (export "call Mt.call" (func 3))
   (export "call" (func 4))
-  (elem (;0;) (i32.const 0) func $g $g $g $h $f)
+  (elem (;0;) (table 0) (i32.const 0) func $g $g $g $h $f)
   (func $g (;2;) (type 1) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/gc/local_tee.wast/0.print b/tests/snapshots/testsuite/proposals/gc/local_tee.wast/0.print
index b4455f3cb7..faf50dbb8c 100644
--- a/tests/snapshots/testsuite/proposals/gc/local_tee.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/local_tee.wast/0.print
@@ -73,7 +73,7 @@
   (export "as-compare-right" (func 54))
   (export "as-convert-operand" (func 55))
   (export "as-memory.grow-size" (func 56))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     (local i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/gc/ref_is_null.wast/0.print b/tests/snapshots/testsuite/proposals/gc/ref_is_null.wast/0.print
index 1097f20712..c677f3a4a0 100644
--- a/tests/snapshots/testsuite/proposals/gc/ref_is_null.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/ref_is_null.wast/0.print
@@ -17,7 +17,7 @@
   (export "funcref-elem" (func 7))
   (export "externref-elem" (func 8))
   (export "ref-elem" (func 9))
-  (elem (;0;) (i32.const 1) func $dummy)
+  (elem (;0;) (table $t1) (i32.const 1) func $dummy)
   (elem (;1;) (table $t3) (i32.const 1) (ref $t) (ref.func $dummy))
   (func $dummy (;0;) (type $t))
   (func $f1 (;1;) (type 1) (param $x funcref) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast/0.print b/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast/0.print
index be0799bf90..5a437ac5bb 100644
--- a/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast/0.print
@@ -44,7 +44,7 @@
   (export "fac" (func $fac))
   (export "even" (func $even))
   (export "odd" (func $odd))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
   (elem (;1;) (table $tab2) (i32.const 0) func $tab-f1)
   (elem (;2;) (table $tab3) (i32.const 0) func $tab-f2)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/gc/select.wast/0.print b/tests/snapshots/testsuite/proposals/gc/select.wast/0.print
index 70dfa7ea6c..a2b9a32e12 100644
--- a/tests/snapshots/testsuite/proposals/gc/select.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/select.wast/0.print
@@ -65,7 +65,7 @@
   (export "as-compare-left" (func 50))
   (export "as-compare-right" (func 51))
   (export "as-convert-operand" (func 52))
-  (elem (;0;) (i32.const 0) func $dummy)
+  (elem (;0;) (table $tab) (i32.const 0) func $dummy)
   (elem (;1;) declare func $tf)
   (elem (;2;) (table $t) (i32.const 0) func $func)
   (func $dummy (;0;) (type $t))
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/10.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/10.print
index 66ce7e5f75..7c27c73b98 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/10.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/10.print
@@ -8,7 +8,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (result (ref null $t1))
     ref.null $t1
   )
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/12.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/12.print
index 7bd1275c19..3971fa2932 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/12.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/12.print
@@ -12,7 +12,7 @@
   (type (;6;) (func))
   (table (;0;) 3 3 funcref)
   (export "run" (func 3))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $f3)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $f3)
   (func $f1 (;0;) (type $t1) (param i32 (ref $t1)))
   (func $f2 (;1;) (type $t2) (param i32 (ref $t3)))
   (func $f3 (;2;) (type $t3) (param i32 (ref $t2)))
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/6.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/6.print
index ecb7350560..bd7d7239d0 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/6.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/6.print
@@ -4,7 +4,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (param f32 f32))
   (func $f2 (;1;) (type $t2) (param f32 f32))
   (func (;2;) (type 2)
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/8.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/8.print
index a9fed0f084..d764874534 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/8.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/8.print
@@ -7,7 +7,7 @@
   (type (;5;) (func))
   (table (;0;) 4 4 funcref)
   (export "run" (func 4))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $s1 $s2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $s1 $s2)
   (func $s1 (;0;) (type $s1) (param i32 (ref $s0)))
   (func $s2 (;1;) (type $s2) (param i32 (ref $s0)))
   (func $f1 (;2;) (type $t1) (param (ref $s1)))
diff --git a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/11.print b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/11.print
index fa24131869..fef5a8e337 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/11.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/11.print
@@ -10,7 +10,7 @@
   (type (;4;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 4)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/13.print b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/13.print
index 23a9cac4bb..700b27ffe1 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/13.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/13.print
@@ -10,7 +10,7 @@
   (type (;4;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 4)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/15.print b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/15.print
index 4db56d4062..54b5923c7d 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-rec.wast/15.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-rec.wast/15.print
@@ -9,7 +9,7 @@
   (type (;3;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 3)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/17.print b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/17.print
index 068b22b0cf..54506e291b 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/17.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/17.print
@@ -15,7 +15,7 @@
   (export "fail4" (func 7))
   (export "fail5" (func 8))
   (export "fail6" (func 9))
-  (elem (;0;) (i32.const 0) func $f0 $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f0 $f1 $f2)
   (func $f0 (;0;) (type $t0) (result funcref)
     ref.null func
   )
diff --git a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/25.print b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/25.print
index 5ba9c153d9..817e526ddc 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/25.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/25.print
@@ -6,7 +6,7 @@
   (export "fail2" (func 3))
   (export "fail3" (func 4))
   (export "fail4" (func 5))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1))
   (func $f2 (;1;) (type $t2))
   (func (;2;) (type $t1)
diff --git a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/30.print b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/30.print
index 1090685677..cc5e46482c 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/30.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-subtyping.wast/30.print
@@ -7,7 +7,7 @@
   (export "run" (func 2))
   (export "fail1" (func 3))
   (export "fail2" (func 4))
-  (elem (;0;) (i32.const 0) (ref null $t2) (ref.func $f2) (ref.func $f3))
+  (elem (;0;) (table 0) (i32.const 0) (ref null $t2) (ref.func $f2) (ref.func $f3))
   (func $f2 (;0;) (type $t2))
   (func $f3 (;1;) (type $t3))
   (func (;2;) (type $t1)
diff --git a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/5.print b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/5.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/5.print
+++ b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/5.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/89.print b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/89.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/89.print
+++ b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/89.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/90.print b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/90.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/90.print
+++ b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/90.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/91.print b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/91.print
index 1ef11a57da..5b91a712fa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/91.print
+++ b/tests/snapshots/testsuite/proposals/memory64/binary-leb128.wast/91.print
@@ -1,4 +1,4 @@
 (module
   (table (;0;) 0 funcref)
-  (elem (;0;) (i32.const 0) func)
+  (elem (;0;) (table 0) (i32.const 0) func)
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/br_if.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/br_if.wast/0.print
index 7f0cd64211..7b5fbefe23 100644
--- a/tests/snapshots/testsuite/proposals/memory64/br_if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/br_if.wast/0.print
@@ -71,7 +71,7 @@
   (export "nested-br_if-value-cond" (func 60))
   (export "nested-br_table-value" (func 61))
   (export "nested-br_table-value-index" (func 62))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     block ;; label = @1
diff --git a/tests/snapshots/testsuite/proposals/memory64/br_table.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/br_table.wast/0.print
index 7f30574d1a..e19c67a10a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/br_table.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/br_table.wast/0.print
@@ -88,7 +88,7 @@
   (export "meet-funcref-4" (func 75))
   (export "meet-nullref" (func 76))
   (export "meet-multi-ref" (func 77))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (elem (;1;) (table $t) (i32.const 0) (ref null $t) (ref.func $tf))
   (func $dummy (;0;) (type $t))
   (func (;1;) (type $t)
diff --git a/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/0.print
index 2fb1aaeb3d..b5c27ccaf8 100644
--- a/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/0.print
@@ -92,7 +92,7 @@
   (export "as-compare-left" (func 78))
   (export "as-compare-right" (func 79))
   (export "as-convert-operand" (func 80))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac-i64 $fib-i64 $even $odd $runaway $mutual-runaway1 $mutual-runaway2 $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate $fac-i32 $fac-f32 $fac-f64 $fib-i32 $fib-f32 $fib-f64 $const-f64-i32 $id-i32-f64 $swap-i32-i64)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac-i64 $fib-i64 $even $odd $runaway $mutual-runaway1 $mutual-runaway2 $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate $fac-i32 $fac-f32 $fac-f64 $fib-i32 $fib-f32 $fib-f64 $const-f64-i32 $id-i32-f64 $swap-i32-i64)
   (elem (;1;) (table $t64) (i64.const 0) func $const-i32)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
     i32.const 306
diff --git a/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/124.print b/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/124.print
index bfcc0d1bdb..e167ce0721 100644
--- a/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/124.print
+++ b/tests/snapshots/testsuite/proposals/memory64/call_indirect.wast/124.print
@@ -8,7 +8,7 @@
   (export "call-1" (func 6))
   (export "call-2" (func 7))
   (export "call-3" (func 8))
-  (elem (;0;) (i32.const 0) func $f $g)
+  (elem (;0;) (table $t1) (i32.const 0) func $f $g)
   (elem (;1;) (table $t2) (i32.const 0) func $h $i $j)
   (elem (;2;) (table $t3) (i32.const 0) func $g $h)
   (elem (;3;) (table $t3) (i32.const 3) func $z)
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/0.print
index 3e45036cd8..4d1a910432 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/0.print
@@ -9,20 +9,20 @@
   (elem $p2 (;5;) funcref (ref.func $f) (ref.func $f) (ref.null func) (ref.func $g))
   (elem $p3 (;6;) func)
   (elem $p4 (;7;) func $f $f $g $g)
-  (elem (;8;) (i32.const 0) funcref)
-  (elem (;9;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem (;10;) (i32.const 0) func)
-  (elem (;11;) (i32.const 0) func $f $g)
-  (elem (;12;) (i32.const 0) funcref)
-  (elem (;13;) (i32.const 0) func $f $g)
-  (elem (;14;) (i32.const 0) func)
-  (elem (;15;) (i32.const 0) func $f $f)
-  (elem (;16;) (i32.const 0) func)
-  (elem (;17;) (i32.const 0) func $f $f)
-  (elem (;18;) (i32.const 0) func)
-  (elem (;19;) (i32.const 0) func $f $f)
-  (elem (;20;) (i32.const 0) func)
-  (elem (;21;) (i32.const 0) func $f $f)
+  (elem (;8;) (table $t) (i32.const 0) funcref)
+  (elem (;9;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem (;10;) (table $t) (i32.const 0) func)
+  (elem (;11;) (table $t) (i32.const 0) func $f $g)
+  (elem (;12;) (table $t) (i32.const 0) funcref)
+  (elem (;13;) (table $t) (i32.const 0) func $f $g)
+  (elem (;14;) (table $t) (i32.const 0) func)
+  (elem (;15;) (table $t) (i32.const 0) func $f $f)
+  (elem (;16;) (table $t) (i32.const 0) func)
+  (elem (;17;) (table $t) (i32.const 0) func $f $f)
+  (elem (;18;) (table $t) (i32.const 0) func)
+  (elem (;19;) (table $t) (i32.const 0) func $f $f)
+  (elem (;20;) (table $t) (i32.const 0) func)
+  (elem (;21;) (table $t) (i32.const 0) func $f $f)
   (elem (;22;) (i32.const 0) func)
   (elem (;23;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem (;24;) (i32.const 0) func $f $f)
@@ -32,20 +32,20 @@
   (elem (;28;) (i32.const 0) func $f $f)
   (elem (;29;) (i32.const 0) func $f $f)
   (elem (;30;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a1 (;31;) (i32.const 0) funcref)
-  (elem $a2 (;32;) (i32.const 0) funcref (ref.func $f) (ref.null func))
-  (elem $a3 (;33;) (i32.const 0) func)
-  (elem $a4 (;34;) (i32.const 0) func $f $g)
-  (elem $a9 (;35;) (i32.const 0) funcref)
-  (elem $a10 (;36;) (i32.const 0) func $f $g)
-  (elem $a11 (;37;) (i32.const 0) func)
-  (elem $a12 (;38;) (i32.const 0) func $f $f)
-  (elem $a13 (;39;) (i32.const 0) func)
-  (elem $a14 (;40;) (i32.const 0) func $f $f)
-  (elem $a15 (;41;) (i32.const 0) func)
-  (elem $a16 (;42;) (i32.const 0) func $f $f)
-  (elem $a17 (;43;) (i32.const 0) func)
-  (elem $a18 (;44;) (i32.const 0) func $f $f)
+  (elem $a1 (;31;) (table $t) (i32.const 0) funcref)
+  (elem $a2 (;32;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func))
+  (elem $a3 (;33;) (table $t) (i32.const 0) func)
+  (elem $a4 (;34;) (table $t) (i32.const 0) func $f $g)
+  (elem $a9 (;35;) (table $t) (i32.const 0) funcref)
+  (elem $a10 (;36;) (table $t) (i32.const 0) func $f $g)
+  (elem $a11 (;37;) (table $t) (i32.const 0) func)
+  (elem $a12 (;38;) (table $t) (i32.const 0) func $f $f)
+  (elem $a13 (;39;) (table $t) (i32.const 0) func)
+  (elem $a14 (;40;) (table $t) (i32.const 0) func $f $f)
+  (elem $a15 (;41;) (table $t) (i32.const 0) func)
+  (elem $a16 (;42;) (table $t) (i32.const 0) func $f $f)
+  (elem $a17 (;43;) (table $t) (i32.const 0) func)
+  (elem $a18 (;44;) (table $t) (i32.const 0) func $f $f)
   (elem $a19 (;45;) (i32.const 0) func)
   (elem $a20 (;46;) (i32.const 0) funcref (ref.func $f) (ref.null func))
   (elem $a21 (;47;) (i32.const 0) func $f $f)
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/1.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/1.print
index 21462afadc..32d94a78b7 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/1.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/1.print
@@ -1,7 +1,7 @@
 (module
   (type (;0;) (func))
   (table $t (;0;) 3 3 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
+  (elem (;0;) (table $t) (i32.const 0) funcref (ref.func $f) (ref.null func) (ref.func $g))
   (func $f (;0;) (type 0))
   (func $g (;1;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/132.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/132.print
index 2610a85f32..ab152176bc 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/132.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/132.print
@@ -1,4 +1,4 @@
 (module
   (import "exporter" "table" (table $t (;0;) 2 externref))
-  (elem (;0;) (i32.const 0) externref (ref.null extern))
+  (elem (;0;) (table $t) (i32.const 0) externref (ref.null extern))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/139.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/139.print
index 20ebe6fdfe..92e8132327 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/139.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/139.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 1 i32.const 2 i32.add) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 1 i32.const 2 i32.add) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/142.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/142.print
index d98aefd8d1..affcd32ff7 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/142.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/142.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 i32.const 1 i32.sub) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 i32.const 1 i32.sub) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/145.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/145.print
index 5e0e75bb50..f53c66ab4d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/145.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/145.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 i32.const 2 i32.mul) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 i32.const 2 i32.mul) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/148.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/148.print
index f7607d0855..656634cd29 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/148.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/148.print
@@ -4,7 +4,7 @@
   (import "spectest" "global_i32" (global (;0;) i32))
   (table (;0;) 10 funcref)
   (export "call_in_table" (func 1))
-  (elem (;0;) (offset i32.const 2 global.get 0 i32.const 665 i32.sub i32.const 2 i32.add i32.mul) funcref (ref.func 0))
+  (elem (;0;) (table 0) (offset i32.const 2 global.get 0 i32.const 665 i32.sub i32.const 2 i32.add i32.mul) funcref (ref.func 0))
   (func (;0;) (type 0) (result i32)
     i32.const 42
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/31.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/31.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/31.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/31.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/32.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/32.print
index b0d086b029..b1c0092a39 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/32.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/32.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/35.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/35.print
index 4913137806..834263d5d6 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/35.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/35.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/43.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/43.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/43.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/43.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/44.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/44.print
index 269c4e483b..42e898c0d0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/44.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/44.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/45.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/45.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/45.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/45.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/46.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/46.print
index 8f71460bb1..c7aa140e59 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/46.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/46.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 funcref)
-  (elem (;0;) (i32.const 0) funcref (ref.null func))
+  (elem (;0;) (table 0) (i32.const 0) funcref (ref.null func))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/55.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/55.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/55.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/55.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/56.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/56.print
index 91e5bceadc..59acd3ac7a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/56.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/56.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) func 0)
+  (elem (;0;) (table 0) (i32.const 0) func 0)
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/63.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/63.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/63.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/63.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/elem.wast/64.print b/tests/snapshots/testsuite/proposals/memory64/elem.wast/64.print
index c304de3a38..75d0412354 100644
--- a/tests/snapshots/testsuite/proposals/memory64/elem.wast/64.print
+++ b/tests/snapshots/testsuite/proposals/memory64/elem.wast/64.print
@@ -1,6 +1,6 @@
 (module
   (type (;0;) (func))
   (table (;0;) 1 (ref func) ref.func 0)
-  (elem (;0;) (i32.const 0) (ref func) (ref.func 0))
+  (elem (;0;) (table 0) (i32.const 0) (ref func) (ref.func 0))
   (func (;0;) (type 0))
 )
diff --git a/tests/snapshots/testsuite/proposals/memory64/func.wast/97.print b/tests/snapshots/testsuite/proposals/memory64/func.wast/97.print
index 65433cdaf1..4db9b3519f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/func.wast/97.print
+++ b/tests/snapshots/testsuite/proposals/memory64/func.wast/97.print
@@ -8,7 +8,7 @@
   (export "signature-implicit-reused" (func 8))
   (export "signature-explicit-duplicate" (func 9))
   (export "signature-implicit-duplicate" (func 10))
-  (elem (;0;) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
+  (elem (;0;) (table 0) (i32.const 0) func $complex-sig-3 $empty-sig-2 $complex-sig-1 $complex-sig-3 $empty-sig-1 $complex-sig-4 $complex-sig-5)
   (func $empty-sig-1 (;0;) (type $sig))
   (func $complex-sig-1 (;1;) (type 3) (param f64 i64 f64 i64 f64 i64 f32 i32))
   (func $empty-sig-2 (;2;) (type $sig))
diff --git a/tests/snapshots/testsuite/proposals/memory64/global.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/global.wast/0.print
index eea13ad468..1c92c02bd2 100644
--- a/tests/snapshots/testsuite/proposals/memory64/global.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/global.wast/0.print
@@ -84,7 +84,7 @@
   (export "as-unary-operand" (func 51))
   (export "as-binary-operand" (func 52))
   (export "as-compare-operand" (func 53))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func (;0;) (type 1) (result i32)
     global.get $a
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/global.wast/113.print b/tests/snapshots/testsuite/proposals/memory64/global.wast/113.print
index 823cc2fd34..effa7eca7d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/global.wast/113.print
+++ b/tests/snapshots/testsuite/proposals/memory64/global.wast/113.print
@@ -11,8 +11,8 @@
   (global $gf (;4;) funcref ref.func $f)
   (export "get-elem" (func 1))
   (export "get-data" (func 2))
-  (elem (;0;) (global.get $g2) funcref (ref.func $f))
-  (elem (;1;) (global.get $g3) funcref (global.get $gf))
+  (elem (;0;) (table $t) (global.get $g2) funcref (ref.func $f))
+  (elem (;1;) (table $t) (global.get $g3) funcref (global.get $gf))
   (func $f (;0;) (type 0))
   (func (;1;) (type 1) (param $i i32) (result funcref)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/memory64/i31.wast/23.print b/tests/snapshots/testsuite/proposals/memory64/i31.wast/23.print
index 70b4717eb2..952d2e9d0e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/i31.wast/23.print
+++ b/tests/snapshots/testsuite/proposals/memory64/i31.wast/23.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
+  (elem (;0;) (table $table) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
   (elem $elem (;1;) i31ref (item i32.const 123 ref.i31) (item i32.const 456 ref.i31) (item i32.const 789 ref.i31))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/testsuite/proposals/memory64/i31.wast/54.print b/tests/snapshots/testsuite/proposals/memory64/i31.wast/54.print
index b8065640f2..19ebe078ba 100644
--- a/tests/snapshots/testsuite/proposals/memory64/i31.wast/54.print
+++ b/tests/snapshots/testsuite/proposals/memory64/i31.wast/54.print
@@ -10,7 +10,7 @@
   (export "fill" (func 3))
   (export "copy" (func 4))
   (export "init" (func 5))
-  (elem (;0;) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
+  (elem (;0;) (table $table) (i32.const 0) i31ref (item i32.const 999 ref.i31) (item i32.const 888 ref.i31) (item i32.const 777 ref.i31))
   (elem $elem (;1;) i31ref (item i32.const 123 ref.i31) (item i32.const 456 ref.i31) (item i32.const 789 ref.i31))
   (func (;0;) (type 0) (result i32)
     table.size $table
diff --git a/tests/snapshots/testsuite/proposals/memory64/if.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/if.wast/0.print
index 57caff7d3a..95b359a350 100644
--- a/tests/snapshots/testsuite/proposals/memory64/if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/if.wast/0.print
@@ -68,7 +68,7 @@
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
   (export "atypical-condition" (func 52))
-  (elem (;0;) (i32.const 0) func $func)
+  (elem (;0;) (table 0) (i32.const 0) func $func)
   (func $dummy (;0;) (type $block-sig-1))
   (func (;1;) (type $block-sig-3) (param i32)
     local.get 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/imports.wast/2.print b/tests/snapshots/testsuite/proposals/memory64/imports.wast/2.print
index e60965f3b9..f4ec4da011 100644
--- a/tests/snapshots/testsuite/proposals/memory64/imports.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/memory64/imports.wast/2.print
@@ -36,7 +36,7 @@
   (export "p6" (func 15))
   (export "print32" (func 18))
   (export "print64" (func 19))
-  (elem (;0;) (i32.const 0) func $print_i32 $print_f64)
+  (elem (;0;) (table 0) (i32.const 0) func $print_i32 $print_f64)
   (func (;18;) (type $func_i32) (param $i i32)
     (local $x f32)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/memory64/imports.wast/78.print b/tests/snapshots/testsuite/proposals/memory64/imports.wast/78.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/memory64/imports.wast/78.print
+++ b/tests/snapshots/testsuite/proposals/memory64/imports.wast/78.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/memory64/imports.wast/84.print b/tests/snapshots/testsuite/proposals/memory64/imports.wast/84.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/memory64/imports.wast/84.print
+++ b/tests/snapshots/testsuite/proposals/memory64/imports.wast/84.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/memory64/linking.wast/67.print b/tests/snapshots/testsuite/proposals/memory64/linking.wast/67.print
index 282b723860..c75be49f71 100644
--- a/tests/snapshots/testsuite/proposals/memory64/linking.wast/67.print
+++ b/tests/snapshots/testsuite/proposals/memory64/linking.wast/67.print
@@ -8,7 +8,7 @@
   (export "Mt.call" (func $f))
   (export "call Mt.call" (func 3))
   (export "call" (func 4))
-  (elem (;0;) (i32.const 0) func $g $g $g $h $f)
+  (elem (;0;) (table 0) (i32.const 0) func $g $g $g $h $f)
   (func $g (;2;) (type 1) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/load.wast/21.print b/tests/snapshots/testsuite/proposals/memory64/load.wast/21.print
index 68c0af17ee..8cfca9e2c0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/load.wast/21.print
+++ b/tests/snapshots/testsuite/proposals/memory64/load.wast/21.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/load2.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/load2.wast/0.print
index 111401ba5e..de3cf455fa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/load2.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/load2.wast/0.print
@@ -46,7 +46,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/load64.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/load64.wast/0.print
index ced67babef..7e38a85454 100644
--- a/tests/snapshots/testsuite/proposals/memory64/load64.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/load64.wast/0.print
@@ -44,7 +44,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i64.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/local_tee.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/local_tee.wast/0.print
index b4455f3cb7..faf50dbb8c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/local_tee.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/local_tee.wast/0.print
@@ -73,7 +73,7 @@
   (export "as-compare-right" (func 54))
   (export "as-convert-operand" (func 55))
   (export "as-memory.grow-size" (func 56))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     (local i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/memory_grow.wast/94.print b/tests/snapshots/testsuite/proposals/memory64/memory_grow.wast/94.print
index e6fac4087c..695004dda2 100644
--- a/tests/snapshots/testsuite/proposals/memory64/memory_grow.wast/94.print
+++ b/tests/snapshots/testsuite/proposals/memory64/memory_grow.wast/94.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/ref_is_null.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/ref_is_null.wast/0.print
index 1097f20712..c677f3a4a0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/ref_is_null.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/ref_is_null.wast/0.print
@@ -17,7 +17,7 @@
   (export "funcref-elem" (func 7))
   (export "externref-elem" (func 8))
   (export "ref-elem" (func 9))
-  (elem (;0;) (i32.const 1) func $dummy)
+  (elem (;0;) (table $t1) (i32.const 1) func $dummy)
   (elem (;1;) (table $t3) (i32.const 1) (ref $t) (ref.func $dummy))
   (func $dummy (;0;) (type $t))
   (func $f1 (;1;) (type 1) (param $x funcref) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/memory64/return_call_indirect.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/return_call_indirect.wast/0.print
index be0799bf90..5a437ac5bb 100644
--- a/tests/snapshots/testsuite/proposals/memory64/return_call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/return_call_indirect.wast/0.print
@@ -44,7 +44,7 @@
   (export "fac" (func $fac))
   (export "even" (func $even))
   (export "odd" (func $odd))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
   (elem (;1;) (table $tab2) (i32.const 0) func $tab-f1)
   (elem (;2;) (table $tab3) (i32.const 0) func $tab-f2)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/memory64/select.wast/0.print b/tests/snapshots/testsuite/proposals/memory64/select.wast/0.print
index 70dfa7ea6c..a2b9a32e12 100644
--- a/tests/snapshots/testsuite/proposals/memory64/select.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/memory64/select.wast/0.print
@@ -65,7 +65,7 @@
   (export "as-compare-left" (func 50))
   (export "as-compare-right" (func 51))
   (export "as-convert-operand" (func 52))
-  (elem (;0;) (i32.const 0) func $dummy)
+  (elem (;0;) (table $tab) (i32.const 0) func $dummy)
   (elem (;1;) declare func $tf)
   (elem (;2;) (table $t) (i32.const 0) func $func)
   (func $dummy (;0;) (type $t))
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1056.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1056.print
index 0f5db861c7..7bf1f98163 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1056.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1056.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1118.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1118.print
index 87eee7c116..c77c2fc6e7 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1118.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1118.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1120.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1120.print
index c10e333c4a..a13178321c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1120.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1120.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1122.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1122.print
index 676bd13829..36f920bafa 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1122.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1122.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1124.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1124.print
index 2ad0c123f4..4463265e5c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1124.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1124.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1126.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1126.print
index f2532bb171..cacdb0f90e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1126.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1126.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1128.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1128.print
index 858c0c8330..ad317f54d0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1128.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1128.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1130.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1130.print
index 76f5f879d6..89c534519c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1130.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1130.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1132.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1132.print
index 50ee553820..8b00a83f1e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1132.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1132.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1134.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1134.print
index b28b518d32..140fbfa39a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1134.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1134.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1136.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1136.print
index 799950a487..5e1f5c9eae 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1136.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1136.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1138.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1138.print
index b3126b36b5..e76846458e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1138.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1138.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1140.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1140.print
index 4653f529de..f3cb993eca 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1140.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1140.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1142.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1142.print
index 910de4ec2b..28e50735b9 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1142.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1142.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1144.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1144.print
index 77e0d8b687..4c1a91e983 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1144.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1144.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1146.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1146.print
index 32e06b6904..3efb07777b 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1146.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1146.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1148.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1148.print
index 35e7dc485b..5e99e83298 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1148.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1148.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1150.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1150.print
index fe67a4fbf0..85d56d535a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1150.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1150.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1152.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1152.print
index 914158292d..3f95f9158f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1152.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1152.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1154.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1154.print
index 67bb0b2ad6..e1fa6d7e9e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1154.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1154.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1156.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1156.print
index 77495d98fc..63b8f2aaba 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1156.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1156.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1158.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1158.print
index f09f48d980..94e85d166f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1158.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1158.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1160.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1160.print
index 5716542ed0..1807fc66da 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1160.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1160.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1162.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1162.print
index 41465b6967..566f831fc8 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1162.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1162.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1164.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1164.print
index 44d6941a18..21991cd5dd 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1164.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1164.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1166.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1166.print
index 11ebae44c7..5f1b7b3f5a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1166.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1166.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1168.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1168.print
index 338b3b4cf3..4cb5546a21 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1168.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1168.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1170.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1170.print
index f0f84adc8c..0c65c00cf9 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1170.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1170.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1172.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1172.print
index f4062a8b53..d53fab4ef0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1172.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1172.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1174.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1174.print
index fd282ddab8..ef3968db9e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1174.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1174.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1176.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1176.print
index de0ad22123..f76ee8a6c2 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1176.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1176.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1178.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1178.print
index 8b54c92efe..a1adcb4c52 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1178.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1178.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1180.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1180.print
index 70b779ee00..43c8e22fa9 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1180.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1180.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1182.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1182.print
index 0743db09e3..05b23542ef 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1182.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1182.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1184.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1184.print
index 44d69a2e39..a2eac92d4c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1184.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1184.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1186.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1186.print
index d4ca85ad98..3f7cf3029a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1186.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1186.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1188.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1188.print
index 11fe0204c3..28efc0f950 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1188.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1188.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1190.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1190.print
index 16f71eef73..799b21743a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1190.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1190.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1192.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1192.print
index d003fc8567..ef51d49585 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1192.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1192.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1194.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1194.print
index 11a0a9bbc0..8339a7828f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1194.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1194.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1196.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1196.print
index 1409a26b22..c07cfb7047 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1196.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1196.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1198.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1198.print
index ba2a3d09ba..ad7df67135 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1198.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1198.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1200.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1200.print
index b10e53060e..896a177c6f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1200.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1200.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1202.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1202.print
index 5b5d72f67e..214219cd9d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1202.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1202.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1204.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1204.print
index 7d8762f15a..83c28a6878 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1204.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/1204.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) i64 30 30 funcref)
   (table $t1 (;1;) i64 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i64.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i64.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i64.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i64.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/126.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/126.print
index 3468438033..e6a7eb23f1 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/126.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/126.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/188.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/188.print
index 20a6e92772..1c4021228d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/188.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/188.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/2.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/2.print
index ff26fa30df..e6e2a45b3d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/2.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/250.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/250.print
index 5f30ba0407..1b032763f1 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/250.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/250.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/312.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/312.print
index df4bf241b5..68e6608b8f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/312.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/312.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/374.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/374.print
index 65e074706e..fe32805c00 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/374.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/374.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/436.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/436.print
index 74b7eea2ea..b846cf3251 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/436.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/436.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/498.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/498.print
index c75e10c494..dc13a43ba9 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/498.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/498.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/560.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/560.print
index 760a2dbe78..01d336d155 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/560.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/560.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/622.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/622.print
index c13ffceb7b..344479868d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/622.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/622.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/64.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/64.print
index dfe7294611..494f9f6c37 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/64.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/64.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/684.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/684.print
index 5cb59bc827..6e35fdd3a3 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/684.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/684.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/746.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/746.print
index da840f245b..7b6bb4583b 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/746.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/746.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/808.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/808.print
index 43b1e4d804..2fed9ed981 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/808.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/808.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/870.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/870.print
index 01f701a496..1502d51c6a 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/870.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/870.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/932.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/932.print
index cb3c7d566e..4d3b4d138d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/932.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/932.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/994.print b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/994.print
index 88b397fd58..c15f308963 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/994.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_copy.wast/994.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/2.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/2.print
index f55fd66ea9..cb701e4dcf 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/2.print
@@ -12,9 +12,9 @@
   (table $t2 (;2;) i64 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/294.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/294.print
index 8fb2fa1264..7db893a928 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/294.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/294.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/296.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/296.print
index b9794c2e75..56fd971311 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/296.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/296.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/298.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/298.print
index e06cc26c40..a0368cda9e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/298.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/298.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/300.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/300.print
index e4ebfa43a3..fe9effea44 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/300.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/300.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/302.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/302.print
index 087e93f01e..f29f1fb07e 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/302.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/302.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/304.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/304.print
index ba5189ed91..e2b7abf72f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/304.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/304.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/306.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/306.print
index a2d8a752da..b2b48976f2 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/306.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/306.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/308.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/308.print
index b85be8a13e..fa41a6c1cb 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/308.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/308.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/310.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/310.print
index e27ce74459..1267eb0364 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/310.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/310.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/312.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/312.print
index d785928890..17bbe6348f 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/312.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/312.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/314.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/314.print
index a77c58270b..d4ad2c460c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/314.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/314.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/316.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/316.print
index 98fe33ff53..9f1d86cff1 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/316.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/316.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/318.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/318.print
index a5c59d549f..8836e1d9c5 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/318.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/318.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/320.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/320.print
index de8a52e37b..c42e8193be 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/320.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/320.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/34.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/34.print
index d717327c3b..a7b632957d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/34.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/34.print
@@ -12,9 +12,9 @@
   (table $t2 (;2;) i64 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/66.print b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/66.print
index d7d86fa02b..71cb49fff7 100644
--- a/tests/snapshots/testsuite/proposals/memory64/table_init.wast/66.print
+++ b/tests/snapshots/testsuite/proposals/memory64/table_init.wast/66.print
@@ -12,9 +12,9 @@
   (table $t2 (;2;) i64 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/proposals/memory64/try_table.wast/2.print b/tests/snapshots/testsuite/proposals/memory64/try_table.wast/2.print
index 298bc9120b..e1899dcb53 100644
--- a/tests/snapshots/testsuite/proposals/memory64/try_table.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/memory64/try_table.wast/2.print
@@ -43,7 +43,7 @@
   (export "return-call-in-try-catch" (func 21))
   (export "return-call-indirect-in-try-catch" (func 22))
   (export "try-with-param" (func 23))
-  (elem (;0;) (i32.const 0) func $throw-void)
+  (elem (;0;) (table 0) (i32.const 0) func $throw-void)
   (func $throw-if (;1;) (type 5) (param i32) (result i32)
     local.get 0
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/10.print b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/10.print
index 66ce7e5f75..7c27c73b98 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/10.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/10.print
@@ -8,7 +8,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (result (ref null $t1))
     ref.null $t1
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/12.print b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/12.print
index 7bd1275c19..3971fa2932 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/12.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/12.print
@@ -12,7 +12,7 @@
   (type (;6;) (func))
   (table (;0;) 3 3 funcref)
   (export "run" (func 3))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $f3)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $f3)
   (func $f1 (;0;) (type $t1) (param i32 (ref $t1)))
   (func $f2 (;1;) (type $t2) (param i32 (ref $t3)))
   (func $f3 (;2;) (type $t3) (param i32 (ref $t2)))
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/6.print b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/6.print
index ecb7350560..bd7d7239d0 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/6.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/6.print
@@ -4,7 +4,7 @@
   (type (;2;) (func))
   (table (;0;) 2 2 funcref)
   (export "run" (func 2))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1) (param f32 f32))
   (func $f2 (;1;) (type $t2) (param f32 f32))
   (func (;2;) (type 2)
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/8.print b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/8.print
index a9fed0f084..d764874534 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/8.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-equivalence.wast/8.print
@@ -7,7 +7,7 @@
   (type (;5;) (func))
   (table (;0;) 4 4 funcref)
   (export "run" (func 4))
-  (elem (;0;) (i32.const 0) func $f1 $f2 $s1 $s2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2 $s1 $s2)
   (func $s1 (;0;) (type $s1) (param i32 (ref $s0)))
   (func $s2 (;1;) (type $s2) (param i32 (ref $s0)))
   (func $f1 (;2;) (type $t1) (param (ref $s1)))
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/11.print b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/11.print
index fa24131869..fef5a8e337 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/11.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/11.print
@@ -10,7 +10,7 @@
   (type (;4;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 4)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/13.print b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/13.print
index 23a9cac4bb..700b27ffe1 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/13.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/13.print
@@ -10,7 +10,7 @@
   (type (;4;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 4)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/15.print b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/15.print
index 4db56d4062..54b5923c7d 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/15.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-rec.wast/15.print
@@ -9,7 +9,7 @@
   (type (;3;) (func))
   (table (;0;) 1 1 funcref)
   (export "run" (func 1))
-  (elem (;0;) (i32.const 0) func $f1)
+  (elem (;0;) (table 0) (i32.const 0) func $f1)
   (func $f1 (;0;) (type $f1))
   (func (;1;) (type 3)
     i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/17.print b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/17.print
index 068b22b0cf..54506e291b 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/17.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/17.print
@@ -15,7 +15,7 @@
   (export "fail4" (func 7))
   (export "fail5" (func 8))
   (export "fail6" (func 9))
-  (elem (;0;) (i32.const 0) func $f0 $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f0 $f1 $f2)
   (func $f0 (;0;) (type $t0) (result funcref)
     ref.null func
   )
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/25.print b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/25.print
index 5ba9c153d9..817e526ddc 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/25.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/25.print
@@ -6,7 +6,7 @@
   (export "fail2" (func 3))
   (export "fail3" (func 4))
   (export "fail4" (func 5))
-  (elem (;0;) (i32.const 0) func $f1 $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f1 $f2)
   (func $f1 (;0;) (type $t1))
   (func $f2 (;1;) (type $t2))
   (func (;2;) (type $t1)
diff --git a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/30.print b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/30.print
index 1090685677..cc5e46482c 100644
--- a/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/30.print
+++ b/tests/snapshots/testsuite/proposals/memory64/type-subtyping.wast/30.print
@@ -7,7 +7,7 @@
   (export "run" (func 2))
   (export "fail1" (func 3))
   (export "fail2" (func 4))
-  (elem (;0;) (i32.const 0) (ref null $t2) (ref.func $f2) (ref.func $f3))
+  (elem (;0;) (table 0) (i32.const 0) (ref null $t2) (ref.func $f2) (ref.func $f3))
   (func $f2 (;0;) (type $t2))
   (func $f3 (;1;) (type $t3))
   (func (;2;) (type $t1)
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/2.print b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/2.print
index 35db23c0e6..a63ee42c53 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/2.print
@@ -34,7 +34,7 @@
   (export "p6" (func 15))
   (export "print32" (func 18))
   (export "print64" (func 19))
-  (elem (;0;) (i32.const 0) func $print_i32 $print_f64)
+  (elem (;0;) (table 0) (i32.const 0) func $print_i32 $print_f64)
   (func (;18;) (type $func_i32) (param $i i32)
     (local $x f32)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/72.print b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/72.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/72.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/72.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/78.print b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/78.print
index 9001a9b066..b874f30663 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/78.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/imports.wast/78.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table $tab (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table $tab) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/load.wast/21.print b/tests/snapshots/testsuite/proposals/multi-memory/load.wast/21.print
index 68c0af17ee..8cfca9e2c0 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/load.wast/21.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/load.wast/21.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/load2.wast/0.print b/tests/snapshots/testsuite/proposals/multi-memory/load2.wast/0.print
index 111401ba5e..de3cf455fa 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/load2.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/load2.wast/0.print
@@ -46,7 +46,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/memory_grow.wast/94.print b/tests/snapshots/testsuite/proposals/multi-memory/memory_grow.wast/94.print
index e6fac4087c..695004dda2 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/memory_grow.wast/94.print
+++ b/tests/snapshots/testsuite/proposals/multi-memory/memory_grow.wast/94.print
@@ -43,7 +43,7 @@
   (export "as-compare-left" (func 35))
   (export "as-compare-right" (func 36))
   (export "as-memory.grow-size" (func 37))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func (;0;) (type 1) (result i32)
     block (result i32) ;; label = @1
       i32.const 0
diff --git a/tests/snapshots/testsuite/proposals/tail-call/return_call_indirect.wast/0.print b/tests/snapshots/testsuite/proposals/tail-call/return_call_indirect.wast/0.print
index be0799bf90..5a437ac5bb 100644
--- a/tests/snapshots/testsuite/proposals/tail-call/return_call_indirect.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/tail-call/return_call_indirect.wast/0.print
@@ -44,7 +44,7 @@
   (export "fac" (func $fac))
   (export "even" (func $even))
   (export "odd" (func $odd))
-  (elem (;0;) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
+  (elem (;0;) (table 0) (i32.const 0) func $const-i32 $const-i64 $const-f32 $const-f64 $id-i32 $id-i64 $id-f32 $id-f64 $f32-i32 $i32-i64 $f64-f32 $i64-f64 $fac $fac-acc $even $odd $over-i32-duplicate $over-i64-duplicate $over-f32-duplicate $over-f64-duplicate)
   (elem (;1;) (table $tab2) (i32.const 0) func $tab-f1)
   (elem (;2;) (table $tab3) (i32.const 0) func $tab-f2)
   (func $const-i32 (;0;) (type $out-i32) (result i32)
diff --git a/tests/snapshots/testsuite/proposals/threads/imports.wast/2.print b/tests/snapshots/testsuite/proposals/threads/imports.wast/2.print
index a42daa6779..a3a3b66acb 100644
--- a/tests/snapshots/testsuite/proposals/threads/imports.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/threads/imports.wast/2.print
@@ -32,7 +32,7 @@
   (export "p6" (func 13))
   (export "print32" (func 16))
   (export "print64" (func 17))
-  (elem (;0;) (i32.const 0) func $print_i32 $print_f64)
+  (elem (;0;) (table 0) (i32.const 0) func $print_i32 $print_f64)
   (func (;16;) (type $func_i32) (param $i i32)
     (local $x f32)
     local.get $i
diff --git a/tests/snapshots/testsuite/proposals/threads/imports.wast/52.print b/tests/snapshots/testsuite/proposals/threads/imports.wast/52.print
index e8cfbd08fe..6bb31979d7 100644
--- a/tests/snapshots/testsuite/proposals/threads/imports.wast/52.print
+++ b/tests/snapshots/testsuite/proposals/threads/imports.wast/52.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table 0) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/proposals/threads/imports.wast/58.print b/tests/snapshots/testsuite/proposals/threads/imports.wast/58.print
index e8cfbd08fe..6bb31979d7 100644
--- a/tests/snapshots/testsuite/proposals/threads/imports.wast/58.print
+++ b/tests/snapshots/testsuite/proposals/threads/imports.wast/58.print
@@ -3,7 +3,7 @@
   (type (;1;) (func (param i32) (result i32)))
   (import "spectest" "table" (table (;0;) 10 20 funcref))
   (export "call" (func 0))
-  (elem (;0;) (i32.const 1) func $f $g)
+  (elem (;0;) (table 0) (i32.const 1) func $f $g)
   (func (;0;) (type 1) (param i32) (result i32)
     local.get 0
     call_indirect (type 0)
diff --git a/tests/snapshots/testsuite/ref_func.wast/14.print b/tests/snapshots/testsuite/ref_func.wast/14.print
index b934427fb1..bfc85602fb 100644
--- a/tests/snapshots/testsuite/ref_func.wast/14.print
+++ b/tests/snapshots/testsuite/ref_func.wast/14.print
@@ -3,8 +3,8 @@
   (table $t (;0;) 1 funcref)
   (global (;0;) funcref ref.func $f1)
   (export "f" (func $f2))
-  (elem (;0;) (i32.const 0) func $f3)
-  (elem (;1;) (i32.const 0) funcref (ref.func $f4))
+  (elem (;0;) (table $t) (i32.const 0) func $f3)
+  (elem (;1;) (table $t) (i32.const 0) funcref (ref.func $f4))
   (elem (;2;) func $f5)
   (elem (;3;) funcref (ref.func $f6))
   (func $f1 (;0;) (type 0))
diff --git a/tests/snapshots/testsuite/ref_is_null.wast/0.print b/tests/snapshots/testsuite/ref_is_null.wast/0.print
index 7070c1059e..fbab2b4730 100644
--- a/tests/snapshots/testsuite/ref_is_null.wast/0.print
+++ b/tests/snapshots/testsuite/ref_is_null.wast/0.print
@@ -12,7 +12,7 @@
   (export "deinit" (func 4))
   (export "funcref-elem" (func 5))
   (export "externref-elem" (func 6))
-  (elem (;0;) (i32.const 1) func $dummy)
+  (elem (;0;) (table $t1) (i32.const 1) func $dummy)
   (func $f1 (;0;) (type 0) (param $x funcref) (result i32)
     local.get $x
     ref.is_null
diff --git a/tests/snapshots/testsuite/return.wast/0.print b/tests/snapshots/testsuite/return.wast/0.print
index 3e6efdeb60..32fd13734a 100644
--- a/tests/snapshots/testsuite/return.wast/0.print
+++ b/tests/snapshots/testsuite/return.wast/0.print
@@ -68,7 +68,7 @@
   (export "as-compare-right" (func 58))
   (export "as-convert-operand" (func 59))
   (export "as-memory.grow-size" (func 60))
-  (elem (;0;) (i32.const 0) func $f)
+  (elem (;0;) (table 0) (i32.const 0) func $f)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 1)
     return
diff --git a/tests/snapshots/testsuite/select.wast/0.print b/tests/snapshots/testsuite/select.wast/0.print
index 644e41cfac..bc4eed2b13 100644
--- a/tests/snapshots/testsuite/select.wast/0.print
+++ b/tests/snapshots/testsuite/select.wast/0.print
@@ -56,7 +56,7 @@
   (export "as-compare-left" (func 43))
   (export "as-compare-right" (func 44))
   (export "as-convert-operand" (func 45))
-  (elem (;0;) (i32.const 0) func $dummy)
+  (elem (;0;) (table $tab) (i32.const 0) func $dummy)
   (elem (;1;) (table $t) (i32.const 0) func $func)
   (func $dummy (;0;) (type 1))
   (func (;1;) (type 2) (param i32 i32 i32) (result i32)
diff --git a/tests/snapshots/testsuite/simd_const.wast/573.print b/tests/snapshots/testsuite/simd_const.wast/573.print
index 6326655a69..6793cb6fcc 100644
--- a/tests/snapshots/testsuite/simd_const.wast/573.print
+++ b/tests/snapshots/testsuite/simd_const.wast/573.print
@@ -24,7 +24,7 @@
   (export "as-block-retval2" (func 19))
   (export "as-loop-retval2" (func 20))
   (export "as-drop-operand2" (func 21))
-  (elem (;0;) (i32.const 0) func $f $f2)
+  (elem (;0;) (table 0) (i32.const 0) func $f $f2)
   (func (;0;) (type 1) (result v128)
     block (result v128) ;; label = @1
       v128.const i32x4 0x03020100 0x07060504 0x0b0a0908 0x0f0e0d0c
diff --git a/tests/snapshots/testsuite/table_copy.wast/1056.print b/tests/snapshots/testsuite/table_copy.wast/1056.print
index 0f5db861c7..7bf1f98163 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1056.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1056.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/1118.print b/tests/snapshots/testsuite/table_copy.wast/1118.print
index 87eee7c116..c77c2fc6e7 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1118.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1118.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1120.print b/tests/snapshots/testsuite/table_copy.wast/1120.print
index c10e333c4a..a13178321c 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1120.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1120.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1122.print b/tests/snapshots/testsuite/table_copy.wast/1122.print
index 676bd13829..36f920bafa 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1122.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1122.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1124.print b/tests/snapshots/testsuite/table_copy.wast/1124.print
index 2ad0c123f4..4463265e5c 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1124.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1124.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1126.print b/tests/snapshots/testsuite/table_copy.wast/1126.print
index f2532bb171..cacdb0f90e 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1126.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1126.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1128.print b/tests/snapshots/testsuite/table_copy.wast/1128.print
index 858c0c8330..ad317f54d0 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1128.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1128.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1130.print b/tests/snapshots/testsuite/table_copy.wast/1130.print
index 76f5f879d6..89c534519c 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1130.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1130.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1132.print b/tests/snapshots/testsuite/table_copy.wast/1132.print
index 50ee553820..8b00a83f1e 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1132.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1132.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1134.print b/tests/snapshots/testsuite/table_copy.wast/1134.print
index b28b518d32..140fbfa39a 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1134.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1134.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1136.print b/tests/snapshots/testsuite/table_copy.wast/1136.print
index 799950a487..5e1f5c9eae 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1136.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1136.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1138.print b/tests/snapshots/testsuite/table_copy.wast/1138.print
index b3126b36b5..e76846458e 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1138.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1138.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1140.print b/tests/snapshots/testsuite/table_copy.wast/1140.print
index 4653f529de..f3cb993eca 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1140.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1140.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1142.print b/tests/snapshots/testsuite/table_copy.wast/1142.print
index 910de4ec2b..28e50735b9 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1142.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1142.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1144.print b/tests/snapshots/testsuite/table_copy.wast/1144.print
index 77e0d8b687..4c1a91e983 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1144.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1144.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1146.print b/tests/snapshots/testsuite/table_copy.wast/1146.print
index 32e06b6904..3efb07777b 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1146.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1146.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1148.print b/tests/snapshots/testsuite/table_copy.wast/1148.print
index 35e7dc485b..5e99e83298 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1148.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1148.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1150.print b/tests/snapshots/testsuite/table_copy.wast/1150.print
index fe67a4fbf0..85d56d535a 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1150.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1150.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1152.print b/tests/snapshots/testsuite/table_copy.wast/1152.print
index 914158292d..3f95f9158f 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1152.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1152.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1154.print b/tests/snapshots/testsuite/table_copy.wast/1154.print
index 67bb0b2ad6..e1fa6d7e9e 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1154.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1154.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1156.print b/tests/snapshots/testsuite/table_copy.wast/1156.print
index 77495d98fc..63b8f2aaba 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1156.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1156.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1158.print b/tests/snapshots/testsuite/table_copy.wast/1158.print
index f09f48d980..94e85d166f 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1158.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1158.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/1160.print b/tests/snapshots/testsuite/table_copy.wast/1160.print
index 5716542ed0..1807fc66da 100644
--- a/tests/snapshots/testsuite/table_copy.wast/1160.print
+++ b/tests/snapshots/testsuite/table_copy.wast/1160.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_copy.wast/126.print b/tests/snapshots/testsuite/table_copy.wast/126.print
index 3468438033..e6a7eb23f1 100644
--- a/tests/snapshots/testsuite/table_copy.wast/126.print
+++ b/tests/snapshots/testsuite/table_copy.wast/126.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/188.print b/tests/snapshots/testsuite/table_copy.wast/188.print
index 20a6e92772..1c4021228d 100644
--- a/tests/snapshots/testsuite/table_copy.wast/188.print
+++ b/tests/snapshots/testsuite/table_copy.wast/188.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/2.print b/tests/snapshots/testsuite/table_copy.wast/2.print
index ff26fa30df..e6e2a45b3d 100644
--- a/tests/snapshots/testsuite/table_copy.wast/2.print
+++ b/tests/snapshots/testsuite/table_copy.wast/2.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/250.print b/tests/snapshots/testsuite/table_copy.wast/250.print
index 5f30ba0407..1b032763f1 100644
--- a/tests/snapshots/testsuite/table_copy.wast/250.print
+++ b/tests/snapshots/testsuite/table_copy.wast/250.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/312.print b/tests/snapshots/testsuite/table_copy.wast/312.print
index df4bf241b5..68e6608b8f 100644
--- a/tests/snapshots/testsuite/table_copy.wast/312.print
+++ b/tests/snapshots/testsuite/table_copy.wast/312.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/374.print b/tests/snapshots/testsuite/table_copy.wast/374.print
index 65e074706e..fe32805c00 100644
--- a/tests/snapshots/testsuite/table_copy.wast/374.print
+++ b/tests/snapshots/testsuite/table_copy.wast/374.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/436.print b/tests/snapshots/testsuite/table_copy.wast/436.print
index 74b7eea2ea..b846cf3251 100644
--- a/tests/snapshots/testsuite/table_copy.wast/436.print
+++ b/tests/snapshots/testsuite/table_copy.wast/436.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/498.print b/tests/snapshots/testsuite/table_copy.wast/498.print
index c75e10c494..dc13a43ba9 100644
--- a/tests/snapshots/testsuite/table_copy.wast/498.print
+++ b/tests/snapshots/testsuite/table_copy.wast/498.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/560.print b/tests/snapshots/testsuite/table_copy.wast/560.print
index 760a2dbe78..01d336d155 100644
--- a/tests/snapshots/testsuite/table_copy.wast/560.print
+++ b/tests/snapshots/testsuite/table_copy.wast/560.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/622.print b/tests/snapshots/testsuite/table_copy.wast/622.print
index c13ffceb7b..344479868d 100644
--- a/tests/snapshots/testsuite/table_copy.wast/622.print
+++ b/tests/snapshots/testsuite/table_copy.wast/622.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/64.print b/tests/snapshots/testsuite/table_copy.wast/64.print
index dfe7294611..494f9f6c37 100644
--- a/tests/snapshots/testsuite/table_copy.wast/64.print
+++ b/tests/snapshots/testsuite/table_copy.wast/64.print
@@ -12,9 +12,9 @@
   (export "test" (func 10))
   (export "check_t0" (func 11))
   (export "check_t1" (func 12))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (elem (;4;) (table $t1) (i32.const 3) func 1 3 1 4)
   (elem (;5;) (table $t1) (i32.const 11) func 6 3 2 5 7)
diff --git a/tests/snapshots/testsuite/table_copy.wast/684.print b/tests/snapshots/testsuite/table_copy.wast/684.print
index 5cb59bc827..6e35fdd3a3 100644
--- a/tests/snapshots/testsuite/table_copy.wast/684.print
+++ b/tests/snapshots/testsuite/table_copy.wast/684.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/746.print b/tests/snapshots/testsuite/table_copy.wast/746.print
index da840f245b..7b6bb4583b 100644
--- a/tests/snapshots/testsuite/table_copy.wast/746.print
+++ b/tests/snapshots/testsuite/table_copy.wast/746.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/808.print b/tests/snapshots/testsuite/table_copy.wast/808.print
index 43b1e4d804..2fed9ed981 100644
--- a/tests/snapshots/testsuite/table_copy.wast/808.print
+++ b/tests/snapshots/testsuite/table_copy.wast/808.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/870.print b/tests/snapshots/testsuite/table_copy.wast/870.print
index 01f701a496..1502d51c6a 100644
--- a/tests/snapshots/testsuite/table_copy.wast/870.print
+++ b/tests/snapshots/testsuite/table_copy.wast/870.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/932.print b/tests/snapshots/testsuite/table_copy.wast/932.print
index cb3c7d566e..4d3b4d138d 100644
--- a/tests/snapshots/testsuite/table_copy.wast/932.print
+++ b/tests/snapshots/testsuite/table_copy.wast/932.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_copy.wast/994.print b/tests/snapshots/testsuite/table_copy.wast/994.print
index 88b397fd58..c15f308963 100644
--- a/tests/snapshots/testsuite/table_copy.wast/994.print
+++ b/tests/snapshots/testsuite/table_copy.wast/994.print
@@ -16,8 +16,8 @@
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
   (elem (;2;) (table $t1) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (elem (;4;) (i32.const 3) func 1 3 1 4)
-  (elem (;5;) (i32.const 11) func 6 3 2 5 7)
+  (elem (;4;) (table $t0) (i32.const 3) func 1 3 1 4)
+  (elem (;5;) (table $t0) (i32.const 11) func 6 3 2 5 7)
   (func (;5;) (type 0) (result i32)
     i32.const 5
   )
diff --git a/tests/snapshots/testsuite/table_init.wast/198.print b/tests/snapshots/testsuite/table_init.wast/198.print
index 8fb2fa1264..7db893a928 100644
--- a/tests/snapshots/testsuite/table_init.wast/198.print
+++ b/tests/snapshots/testsuite/table_init.wast/198.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/2.print b/tests/snapshots/testsuite/table_init.wast/2.print
index 4e15845244..4c118843c6 100644
--- a/tests/snapshots/testsuite/table_init.wast/2.print
+++ b/tests/snapshots/testsuite/table_init.wast/2.print
@@ -11,9 +11,9 @@
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/table_init.wast/200.print b/tests/snapshots/testsuite/table_init.wast/200.print
index b9794c2e75..56fd971311 100644
--- a/tests/snapshots/testsuite/table_init.wast/200.print
+++ b/tests/snapshots/testsuite/table_init.wast/200.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/202.print b/tests/snapshots/testsuite/table_init.wast/202.print
index e06cc26c40..a0368cda9e 100644
--- a/tests/snapshots/testsuite/table_init.wast/202.print
+++ b/tests/snapshots/testsuite/table_init.wast/202.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/204.print b/tests/snapshots/testsuite/table_init.wast/204.print
index e4ebfa43a3..fe9effea44 100644
--- a/tests/snapshots/testsuite/table_init.wast/204.print
+++ b/tests/snapshots/testsuite/table_init.wast/204.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/206.print b/tests/snapshots/testsuite/table_init.wast/206.print
index 087e93f01e..f29f1fb07e 100644
--- a/tests/snapshots/testsuite/table_init.wast/206.print
+++ b/tests/snapshots/testsuite/table_init.wast/206.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/208.print b/tests/snapshots/testsuite/table_init.wast/208.print
index ba5189ed91..e2b7abf72f 100644
--- a/tests/snapshots/testsuite/table_init.wast/208.print
+++ b/tests/snapshots/testsuite/table_init.wast/208.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/210.print b/tests/snapshots/testsuite/table_init.wast/210.print
index a2d8a752da..b2b48976f2 100644
--- a/tests/snapshots/testsuite/table_init.wast/210.print
+++ b/tests/snapshots/testsuite/table_init.wast/210.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/212.print b/tests/snapshots/testsuite/table_init.wast/212.print
index b85be8a13e..fa41a6c1cb 100644
--- a/tests/snapshots/testsuite/table_init.wast/212.print
+++ b/tests/snapshots/testsuite/table_init.wast/212.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/214.print b/tests/snapshots/testsuite/table_init.wast/214.print
index e27ce74459..1267eb0364 100644
--- a/tests/snapshots/testsuite/table_init.wast/214.print
+++ b/tests/snapshots/testsuite/table_init.wast/214.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/216.print b/tests/snapshots/testsuite/table_init.wast/216.print
index d785928890..17bbe6348f 100644
--- a/tests/snapshots/testsuite/table_init.wast/216.print
+++ b/tests/snapshots/testsuite/table_init.wast/216.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/218.print b/tests/snapshots/testsuite/table_init.wast/218.print
index a77c58270b..d4ad2c460c 100644
--- a/tests/snapshots/testsuite/table_init.wast/218.print
+++ b/tests/snapshots/testsuite/table_init.wast/218.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/220.print b/tests/snapshots/testsuite/table_init.wast/220.print
index 98fe33ff53..9f1d86cff1 100644
--- a/tests/snapshots/testsuite/table_init.wast/220.print
+++ b/tests/snapshots/testsuite/table_init.wast/220.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/222.print b/tests/snapshots/testsuite/table_init.wast/222.print
index a5c59d549f..8836e1d9c5 100644
--- a/tests/snapshots/testsuite/table_init.wast/222.print
+++ b/tests/snapshots/testsuite/table_init.wast/222.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/224.print b/tests/snapshots/testsuite/table_init.wast/224.print
index de8a52e37b..c42e8193be 100644
--- a/tests/snapshots/testsuite/table_init.wast/224.print
+++ b/tests/snapshots/testsuite/table_init.wast/224.print
@@ -4,9 +4,9 @@
   (table $t0 (;0;) 30 30 funcref)
   (table $t1 (;1;) 28 28 funcref)
   (export "test" (func 10))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;0;) (type 0) (result i32)
     i32.const 0
diff --git a/tests/snapshots/testsuite/table_init.wast/34.print b/tests/snapshots/testsuite/table_init.wast/34.print
index 33c183b450..e254c3c71d 100644
--- a/tests/snapshots/testsuite/table_init.wast/34.print
+++ b/tests/snapshots/testsuite/table_init.wast/34.print
@@ -11,9 +11,9 @@
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/table_init.wast/66.print b/tests/snapshots/testsuite/table_init.wast/66.print
index 185386a193..10ee3776f3 100644
--- a/tests/snapshots/testsuite/table_init.wast/66.print
+++ b/tests/snapshots/testsuite/table_init.wast/66.print
@@ -11,9 +11,9 @@
   (table $t1 (;1;) 30 30 funcref)
   (export "test" (func 10))
   (export "check" (func 11))
-  (elem (;0;) (i32.const 2) func 3 1 4 1)
+  (elem (;0;) (table $t0) (i32.const 2) func 3 1 4 1)
   (elem (;1;) funcref (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (;2;) (i32.const 12) func 7 5 2 3 6)
+  (elem (;2;) (table $t0) (i32.const 12) func 7 5 2 3 6)
   (elem (;3;) funcref (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
   (func (;5;) (type 0) (result i32)
     i32.const 5
diff --git a/tests/snapshots/testsuite/unreachable.wast/0.print b/tests/snapshots/testsuite/unreachable.wast/0.print
index 19ad4801f4..90645a9352 100644
--- a/tests/snapshots/testsuite/unreachable.wast/0.print
+++ b/tests/snapshots/testsuite/unreachable.wast/0.print
@@ -67,7 +67,7 @@
   (export "as-compare-right" (func 57))
   (export "as-convert-operand" (func 58))
   (export "as-memory.grow-size" (func 59))
-  (elem (;0;) (i32.const 0) func $dummy3)
+  (elem (;0;) (table 0) (i32.const 0) func $dummy3)
   (func $dummy (;0;) (type 1))
   (func $dummy3 (;1;) (type $sig) (param i32 i32 i32))
   (func (;2;) (type 2) (result i32)