18 files changed, 403 insertions, 403 deletions

diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast
index f2e697566..cfe87040f 100644
--- a/test/llvm_autogenerated/byval.wast
+++ b/test/llvm_autogenerated/byval.wast
@@ -21,7 +21,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -38,14 +38,14 @@
       (i32.const 1)
     )
     (set_local $$5
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$5)
       )
     )
-    (i32.store offset=12 align=4
+    (i32.store offset=12
       (get_local $$5)
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -74,7 +74,7 @@
       (i32.const 1)
     )
     (set_local $$5
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$5)
       )
@@ -91,7 +91,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -108,7 +108,7 @@
       (i32.const 1)
     )
     (set_local $$5
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$5)
       )
@@ -144,7 +144,7 @@
       (i32.const 1)
     )
     (set_local $$5
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$5)
       )
@@ -160,7 +160,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -177,26 +177,26 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$4)
         (i32.const 8)
       )
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$0)
           (i32.const 8)
         )
       )
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$4)
-      (i64.load align=8
+      (i64.load
         (get_local $$0)
       )
     )
@@ -216,7 +216,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$4)
       )
@@ -237,7 +237,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -254,7 +254,7 @@
       (i32.const 1)
     )
     (set_local $$9
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$9)
       )
@@ -273,7 +273,7 @@
         (get_local $$4)
         (i32.const 32)
       )
-      (i32.load8_u align=1
+      (i32.load8_u
         (i32.add
           (get_local $$0)
           (i32.const 32)
@@ -374,7 +374,7 @@
       (i32.const 1)
     )
     (set_local $$9
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$9)
       )
diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast
index 32071a761..12d03677e 100644
--- a/test/llvm_autogenerated/cfg-stackify.wast
+++ b/test/llvm_autogenerated/cfg-stackify.wast
@@ -90,10 +90,10 @@
             (i32.const -1)
           )
         )
-        (f64.store align=8
+        (f64.store
           (get_local $$0)
           (f64.mul
-            (f64.load align=8
+            (f64.load
               (get_local $$0)
             )
             (f64.const 3.2)
@@ -113,7 +113,7 @@
     (return)
   )
   (func $doublediamond (param $$0 i32) (param $$1 i32) (param $$2 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$2)
       (i32.const 0)
     )
@@ -122,13 +122,13 @@
         (br_if $label$1
           (get_local $$0)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 1)
         )
         (br $label$0)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 2)
       )
@@ -136,18 +136,18 @@
         (br_if $label$2
           (get_local $$1)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 3)
         )
         (br $label$0)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 4)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$2)
       (i32.const 5)
     )
@@ -158,7 +158,7 @@
   (func $triangle (param $$0 i32) (param $$1 i32) (result i32)
     (local $$2 i32)
     (set_local $$2
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 0)
       )
@@ -167,12 +167,12 @@
       (br_if $label$0
         (get_local $$1)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 1)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 2)
     )
@@ -181,7 +181,7 @@
     )
   )
   (func $diamond (param $$0 i32) (param $$1 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
@@ -190,18 +190,18 @@
         (br_if $label$1
           (get_local $$1)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$0)
           (i32.const 1)
         )
         (br $label$0)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 2)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 3)
     )
@@ -211,19 +211,19 @@
   )
   (func $single_block (param $$0 i32) (result i32)
     (return
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 0)
       )
     )
   )
   (func $minimal_loop (param $$0 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
     (loop $label$1 $label$0
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 1)
       )
@@ -231,12 +231,12 @@
     )
   )
   (func $simple_loop (param $$0 i32) (param $$1 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
     (loop $label$1 $label$0
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 1)
       )
@@ -247,7 +247,7 @@
         )
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 2)
     )
@@ -258,7 +258,7 @@
   (func $doubletriangle (param $$0 i32) (param $$1 i32) (param $$2 i32) (result i32)
     (local $$3 i32)
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 0)
       )
@@ -267,7 +267,7 @@
       (br_if $label$0
         (get_local $$0)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 2)
       )
@@ -275,17 +275,17 @@
         (br_if $label$1
           (get_local $$1)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 3)
         )
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 4)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$2)
       (i32.const 5)
     )
@@ -294,7 +294,7 @@
     )
   )
   (func $ifelse_earlyexits (param $$0 i32) (param $$1 i32) (param $$2 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$2)
       (i32.const 0)
     )
@@ -303,25 +303,25 @@
         (br_if $label$1
           (get_local $$0)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 1)
         )
         (br $label$0)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 2)
       )
       (br_if $label$0
         (get_local $$1)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 3)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$2)
       (i32.const 4)
     )
@@ -331,7 +331,7 @@
   )
   (func $doublediamond_in_a_loop (param $$0 i32) (param $$1 i32) (param $$2 i32) (result i32)
     (loop $label$1 $label$0
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 0)
       )
@@ -340,13 +340,13 @@
           (br_if $label$3
             (get_local $$0)
           )
-          (i32.store align=4
+          (i32.store
             (get_local $$2)
             (i32.const 1)
           )
           (br $label$2)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 2)
         )
@@ -354,18 +354,18 @@
           (br_if $label$4
             (get_local $$1)
           )
-          (i32.store align=4
+          (i32.store
             (get_local $$2)
             (i32.const 3)
           )
           (br $label$2)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 4)
         )
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 5)
       )
@@ -457,7 +457,7 @@
     (block $label$0
       (loop $label$2 $label$1
         (set_local $$1
-          (i32.store align=4
+          (i32.store
             (i32.const 0)
             (i32.const 0)
           )
@@ -468,7 +468,7 @@
             (i32.const 0)
           )
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$1)
           (i32.const 1)
         )
@@ -476,13 +476,13 @@
           (get_local $$2)
         )
       )
-      (i32.store align=4
+      (i32.store
         (i32.const 0)
         (i32.const 3)
       )
       (return)
     )
-    (i32.store align=4
+    (i32.store
       (i32.const 0)
       (i32.const 2)
     )
@@ -502,7 +502,7 @@
       (block $label$1
         (loop $label$3 $label$2
           (set_local $$0
-            (i32.store align=4
+            (i32.store
               (i32.const 0)
               (i32.const 0)
             )
@@ -519,7 +519,7 @@
                 (i32.and
                   (get_local $$1)
                   (set_local $$4
-                    (i32.store align=4
+                    (i32.store
                       (get_local $$0)
                       (i32.const 1)
                     )
@@ -529,7 +529,7 @@
               (i32.const 0)
             )
           )
-          (i32.store align=4
+          (i32.store
             (get_local $$0)
             (get_local $$4)
           )
@@ -537,18 +537,18 @@
             (get_local $$3)
           )
         )
-        (i32.store align=4
+        (i32.store
           (i32.const 0)
           (i32.const 2)
         )
         (return)
       )
-      (i32.store align=4
+      (i32.store
         (i32.const 0)
         (i32.const 3)
       )
     )
-    (i32.store align=4
+    (i32.store
       (i32.const 0)
       (i32.const 4)
     )
@@ -558,7 +558,7 @@
     (local $$2 i32)
     (local $$3 i32)
     (set_local $$2
-      (i32.store align=4
+      (i32.store
         (i32.const 0)
         (i32.const 0)
       )
@@ -571,7 +571,7 @@
     )
     (loop $label$1 $label$0
       (set_local $$0
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 1)
         )
@@ -580,7 +580,7 @@
         (br_if $label$2
           (get_local $$3)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$2)
           (i32.const 2)
         )
@@ -590,13 +590,13 @@
             (get_local $$0)
           )
         )
-        (i32.store align=4
+        (i32.store
           (i32.const 0)
           (i32.const 4)
         )
         (unreachable)
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (i32.const 3)
       )
@@ -607,7 +607,7 @@
         )
       )
     )
-    (i32.store align=4
+    (i32.store
       (i32.const 0)
       (i32.const 5)
     )
@@ -641,7 +641,7 @@
     (local $$0 i32)
     (local $$1 i32)
     (set_local $$0
-      (i32.store align=4
+      (i32.store
         (i32.const 0)
         (i32.const 0)
       )
@@ -651,7 +651,7 @@
         (i32.eq
           (i32.and
             (set_local $$1
-              (i32.store align=4
+              (i32.store
                 (get_local $$0)
                 (i32.const 1)
               )
@@ -662,7 +662,7 @@
         )
       )
       (loop $label$3 $label$2
-        (i32.store align=4
+        (i32.store
           (get_local $$0)
           (i32.const 2)
         )
@@ -676,7 +676,7 @@
               (i32.const 0)
             )
           )
-          (i32.store align=4
+          (i32.store
             (get_local $$0)
             (i32.const 3)
           )
@@ -688,7 +688,7 @@
           )
           (br $label$0)
         )
-        (i32.store align=4
+        (i32.store
           (get_local $$0)
           (i32.const 4)
         )
@@ -701,7 +701,7 @@
         (br $label$0)
       )
     )
-    (i32.store align=4
+    (i32.store
       (i32.const 0)
       (i32.const 5)
     )
@@ -778,13 +778,13 @@
           (block $label$3
             (br_if $label$3
               (set_local $$0
-                (i32.store align=4
+                (i32.store
                   (i32.const 0)
                   (i32.const 0)
                 )
               )
             )
-            (i32.store align=4
+            (i32.store
               (get_local $$0)
               (i32.const 1)
             )
@@ -792,7 +792,7 @@
               (br_if $label$4
                 (get_local $$0)
               )
-              (i32.store align=4
+              (i32.store
                 (i32.const 0)
                 (i32.const 2)
               )
@@ -800,20 +800,20 @@
                 (i32.const 0)
               )
             )
-            (i32.store align=4
+            (i32.store
               (i32.const 0)
               (i32.const 3)
             )
             (return)
           )
-          (i32.store align=4
+          (i32.store
             (get_local $$0)
             (i32.const 4)
           )
           (br_if $label$0
             (get_local $$0)
           )
-          (i32.store align=4
+          (i32.store
             (i32.const 0)
             (i32.const 5)
           )
@@ -824,19 +824,19 @@
             )
           )
         )
-        (i32.store align=4
+        (i32.store
           (i32.const 0)
           (i32.const 7)
         )
         (return)
       )
-      (i32.store align=4
+      (i32.store
         (i32.const 0)
         (i32.const 6)
       )
       (return)
     )
-    (i32.store align=4
+    (i32.store
       (i32.const 0)
       (i32.const 8)
     )
@@ -851,7 +851,7 @@
             (br_if $label$4
               (i32.gt_s
                 (set_local $$1
-                  (i32.load8_u align=1
+                  (i32.load8_u
                     (get_local $$0)
                   )
                 )
diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast
index 32a354a9f..9cfe98606 100644
--- a/test/llvm_autogenerated/dead-vreg.wast
+++ b/test/llvm_autogenerated/dead-vreg.wast
@@ -45,7 +45,7 @@
             (get_local $$4)
           )
           (loop $label$5 $label$4
-            (i32.store align=4
+            (i32.store
               (get_local $$7)
               (get_local $$6)
             )
diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast
index 7397683e6..6cc5e06a0 100644
--- a/test/llvm_autogenerated/global.wast
+++ b/test/llvm_autogenerated/global.wast
@@ -19,7 +19,7 @@
   (export "call_memcpy" $call_memcpy)
   (func $foo (result i32)
     (return
-      (i32.load offset=28 align=4
+      (i32.load offset=28
         (i32.const 0)
       )
     )
diff --git a/test/llvm_autogenerated/i32-load-store-alignment.wast b/test/llvm_autogenerated/i32-load-store-alignment.wast
index 9ac01babe..793fe9116 100644
--- a/test/llvm_autogenerated/i32-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i32-load-store-alignment.wast
@@ -36,14 +36,14 @@
   )
   (func $ldi32_a4 (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
   )
   (func $ldi32 (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -57,7 +57,7 @@
   )
   (func $ldi8_a1 (param $$0 i32) (result i32)
     (return
-      (i32.load8_u align=1
+      (i32.load8_u
         (get_local $$0)
       )
     )
@@ -78,7 +78,7 @@
   )
   (func $ldi16_a2 (param $$0 i32) (result i32)
     (return
-      (i32.load16_u align=2
+      (i32.load16_u
         (get_local $$0)
       )
     )
@@ -105,14 +105,14 @@
     (return)
   )
   (func $sti32_a4 (param $$0 i32) (param $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $sti32 (param $$0 i32) (param $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (get_local $$1)
     )
@@ -126,7 +126,7 @@
     (return)
   )
   (func $sti8_a1 (param $$0 i32) (param $$1 i32)
-    (i32.store8 align=1
+    (i32.store8
       (get_local $$0)
       (get_local $$1)
     )
@@ -147,7 +147,7 @@
     (return)
   )
   (func $sti16_a2 (param $$0 i32) (param $$1 i32)
-    (i32.store16 align=2
+    (i32.store16
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast
index d363c0e1a..d46a5d398 100644
--- a/test/llvm_autogenerated/i64-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i64-load-store-alignment.wast
@@ -53,14 +53,14 @@
   )
   (func $ldi64_a8 (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (get_local $$0)
       )
     )
   )
   (func $ldi64 (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (get_local $$0)
       )
     )
@@ -74,7 +74,7 @@
   )
   (func $ldi8_a1 (param $$0 i32) (result i64)
     (return
-      (i64.load8_u align=1
+      (i64.load8_u
         (get_local $$0)
       )
     )
@@ -95,7 +95,7 @@
   )
   (func $ldi16_a2 (param $$0 i32) (result i64)
     (return
-      (i64.load16_u align=2
+      (i64.load16_u
         (get_local $$0)
       )
     )
@@ -123,7 +123,7 @@
   )
   (func $ldi32_a4 (param $$0 i32) (result i64)
     (return
-      (i64.load32_u align=4
+      (i64.load32_u
         (get_local $$0)
       )
     )
@@ -157,14 +157,14 @@
     (return)
   )
   (func $sti64_a8 (param $$0 i32) (param $$1 i64)
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $sti64 (param $$0 i32) (param $$1 i64)
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (get_local $$1)
     )
@@ -178,7 +178,7 @@
     (return)
   )
   (func $sti8_a1 (param $$0 i32) (param $$1 i64)
-    (i64.store8 align=1
+    (i64.store8
       (get_local $$0)
       (get_local $$1)
     )
@@ -199,7 +199,7 @@
     (return)
   )
   (func $sti16_a2 (param $$0 i32) (param $$1 i64)
-    (i64.store16 align=2
+    (i64.store16
       (get_local $$0)
       (get_local $$1)
     )
@@ -227,7 +227,7 @@
     (return)
   )
   (func $sti32_a4 (param $$0 i32) (param $$1 i64)
-    (i64.store32 align=4
+    (i64.store32
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast
index a40c40ac2..5739c158d 100644
--- a/test/llvm_autogenerated/legalize.wast
+++ b/test/llvm_autogenerated/legalize.wast
@@ -45,7 +45,7 @@
   (func $fpext_f32_f64 (param $$0 i32) (result f64)
     (return
       (f64.promote/f32
-        (f32.load align=4
+        (f32.load
           (get_local $$0)
         )
       )
@@ -54,7 +54,7 @@
   (func $fpconv_f64_f32 (param $$0 i32) (result f32)
     (return
       (f32.demote/f64
-        (f64.load align=8
+        (f64.load
           (get_local $$0)
         )
       )
@@ -345,7 +345,7 @@
       (i32.const 1)
     )
     (set_local $$183
-      (i32.load align=4
+      (i32.load
         (get_local $$183)
       )
     )
@@ -362,7 +362,7 @@
       (i32.const 1)
     )
     (set_local $$312
-      (i32.store align=4
+      (i32.store
         (get_local $$184)
         (get_local $$312)
       )
@@ -1418,7 +1418,7 @@
       )
     )
     (set_local $$174
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$249)
           (i32.const 8)
@@ -1435,7 +1435,7 @@
       )
     )
     (set_local $$177
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$250)
           (i32.const 8)
@@ -1443,17 +1443,17 @@
       )
     )
     (set_local $$173
-      (i64.load offset=480 align=8
+      (i64.load offset=480
         (get_local $$312)
       )
     )
     (set_local $$181
-      (i64.load offset=464 align=8
+      (i64.load offset=464
         (get_local $$312)
       )
     )
     (set_local $$169
-      (i64.load offset=496 align=8
+      (i64.load offset=496
         (get_local $$312)
       )
     )
@@ -1467,7 +1467,7 @@
       )
     )
     (set_local $$179
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$251)
           (i32.const 8)
@@ -1484,7 +1484,7 @@
       )
     )
     (set_local $$175
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$252)
           (i32.const 8)
@@ -1501,7 +1501,7 @@
       )
     )
     (set_local $$45
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$253)
           (i32.const 8)
@@ -1518,7 +1518,7 @@
       )
     )
     (set_local $$46
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$254)
           (i32.const 8)
@@ -1535,7 +1535,7 @@
       )
     )
     (set_local $$47
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$255)
           (i32.const 8)
@@ -1552,7 +1552,7 @@
       )
     )
     (set_local $$48
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$256)
           (i32.const 8)
@@ -1569,7 +1569,7 @@
       )
     )
     (set_local $$49
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$257)
           (i32.const 8)
@@ -1586,7 +1586,7 @@
       )
     )
     (set_local $$50
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$258)
           (i32.const 8)
@@ -1603,7 +1603,7 @@
       )
     )
     (set_local $$51
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$259)
           (i32.const 8)
@@ -1620,7 +1620,7 @@
       )
     )
     (set_local $$52
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$260)
           (i32.const 8)
@@ -1637,7 +1637,7 @@
       )
     )
     (set_local $$53
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$261)
           (i32.const 8)
@@ -1654,7 +1654,7 @@
       )
     )
     (set_local $$54
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$262)
           (i32.const 8)
@@ -1671,7 +1671,7 @@
       )
     )
     (set_local $$55
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$263)
           (i32.const 8)
@@ -1688,7 +1688,7 @@
       )
     )
     (set_local $$67
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$264)
           (i32.const 8)
@@ -1705,7 +1705,7 @@
       )
     )
     (set_local $$68
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$265)
           (i32.const 8)
@@ -1722,7 +1722,7 @@
       )
     )
     (set_local $$69
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$266)
           (i32.const 8)
@@ -1739,7 +1739,7 @@
       )
     )
     (set_local $$70
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$267)
           (i32.const 8)
@@ -1756,7 +1756,7 @@
       )
     )
     (set_local $$71
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$268)
           (i32.const 8)
@@ -1764,17 +1764,17 @@
       )
     )
     (set_local $$59
-      (i64.load offset=80 align=8
+      (i64.load offset=80
         (get_local $$312)
       )
     )
     (set_local $$60
-      (i64.load offset=96 align=8
+      (i64.load offset=96
         (get_local $$312)
       )
     )
     (set_local $$61
-      (i64.load offset=112 align=8
+      (i64.load offset=112
         (get_local $$312)
       )
     )
@@ -1788,7 +1788,7 @@
       )
     )
     (set_local $$72
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$269)
           (i32.const 8)
@@ -1805,7 +1805,7 @@
       )
     )
     (set_local $$73
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$270)
           (i32.const 8)
@@ -1822,7 +1822,7 @@
       )
     )
     (set_local $$74
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$271)
           (i32.const 8)
@@ -1839,7 +1839,7 @@
       )
     )
     (set_local $$75
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$272)
           (i32.const 8)
@@ -1856,7 +1856,7 @@
       )
     )
     (set_local $$76
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$273)
           (i32.const 8)
@@ -1873,7 +1873,7 @@
       )
     )
     (set_local $$77
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$274)
           (i32.const 8)
@@ -1890,7 +1890,7 @@
       )
     )
     (set_local $$87
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$275)
           (i32.const 8)
@@ -1907,7 +1907,7 @@
       )
     )
     (set_local $$88
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$276)
           (i32.const 8)
@@ -1924,7 +1924,7 @@
       )
     )
     (set_local $$89
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$277)
           (i32.const 8)
@@ -1932,7 +1932,7 @@
       )
     )
     (set_local $$90
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$312)
           (i32.const 8)
@@ -1949,7 +1949,7 @@
       )
     )
     (set_local $$91
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$278)
           (i32.const 8)
@@ -1957,7 +1957,7 @@
       )
     )
     (set_local $$84
-      (i64.load offset=64 align=8
+      (i64.load offset=64
         (get_local $$312)
       )
     )
@@ -1971,7 +1971,7 @@
       )
     )
     (set_local $$93
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$279)
           (i32.const 8)
@@ -1988,7 +1988,7 @@
       )
     )
     (set_local $$92
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$280)
           (i32.const 8)
@@ -2005,7 +2005,7 @@
       )
     )
     (set_local $$94
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$281)
           (i32.const 8)
@@ -2022,7 +2022,7 @@
       )
     )
     (set_local $$95
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$282)
           (i32.const 8)
@@ -2039,7 +2039,7 @@
       )
     )
     (set_local $$109
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$283)
           (i32.const 8)
@@ -2056,7 +2056,7 @@
       )
     )
     (set_local $$110
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$284)
           (i32.const 8)
@@ -2064,17 +2064,17 @@
       )
     )
     (set_local $$81
-      (i64.load align=8
+      (i64.load
         (get_local $$312)
       )
     )
     (set_local $$82
-      (i64.load offset=16 align=8
+      (i64.load offset=16
         (get_local $$312)
       )
     )
     (set_local $$83
-      (i64.load offset=32 align=8
+      (i64.load offset=32
         (get_local $$312)
       )
     )
@@ -2088,7 +2088,7 @@
       )
     )
     (set_local $$111
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$285)
           (i32.const 8)
@@ -2096,47 +2096,47 @@
       )
     )
     (set_local $$96
-      (i64.load offset=192 align=8
+      (i64.load offset=192
         (get_local $$312)
       )
     )
     (set_local $$97
-      (i64.load offset=208 align=8
+      (i64.load offset=208
         (get_local $$312)
       )
     )
     (set_local $$98
-      (i64.load offset=224 align=8
+      (i64.load offset=224
         (get_local $$312)
       )
     )
     (set_local $$44
-      (i64.load offset=240 align=8
+      (i64.load offset=240
         (get_local $$312)
       )
     )
     (set_local $$62
-      (i64.load offset=48 align=8
+      (i64.load offset=48
         (get_local $$312)
       )
     )
     (set_local $$63
-      (i64.load offset=176 align=8
+      (i64.load offset=176
         (get_local $$312)
       )
     )
     (set_local $$78
-      (i64.load offset=128 align=8
+      (i64.load offset=128
         (get_local $$312)
       )
     )
     (set_local $$79
-      (i64.load offset=144 align=8
+      (i64.load offset=144
         (get_local $$312)
       )
     )
     (set_local $$80
-      (i64.load offset=160 align=8
+      (i64.load offset=160
         (get_local $$312)
       )
     )
@@ -2150,7 +2150,7 @@
       )
     )
     (set_local $$112
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$286)
           (i32.const 8)
@@ -2167,7 +2167,7 @@
       )
     )
     (set_local $$113
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$287)
           (i32.const 8)
@@ -2184,7 +2184,7 @@
       )
     )
     (set_local $$114
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$288)
           (i32.const 8)
@@ -2201,7 +2201,7 @@
       )
     )
     (set_local $$115
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$289)
           (i32.const 8)
@@ -2218,7 +2218,7 @@
       )
     )
     (set_local $$116
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$290)
           (i32.const 8)
@@ -2235,7 +2235,7 @@
       )
     )
     (set_local $$117
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$291)
           (i32.const 8)
@@ -2252,7 +2252,7 @@
       )
     )
     (set_local $$118
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$292)
           (i32.const 8)
@@ -2260,12 +2260,12 @@
       )
     )
     (set_local $$104
-      (i64.load offset=384 align=8
+      (i64.load offset=384
         (get_local $$312)
       )
     )
     (set_local $$105
-      (i64.load offset=400 align=8
+      (i64.load offset=400
         (get_local $$312)
       )
     )
@@ -2279,7 +2279,7 @@
       )
     )
     (set_local $$119
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$293)
           (i32.const 8)
@@ -2287,12 +2287,12 @@
       )
     )
     (set_local $$106
-      (i64.load offset=416 align=8
+      (i64.load offset=416
         (get_local $$312)
       )
     )
     (set_local $$36
-      (i64.load offset=432 align=8
+      (i64.load offset=432
         (get_local $$312)
       )
     )
@@ -2306,7 +2306,7 @@
       )
     )
     (set_local $$120
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$294)
           (i32.const 8)
@@ -2314,17 +2314,17 @@
       )
     )
     (set_local $$33
-      (i64.load offset=352 align=8
+      (i64.load offset=352
         (get_local $$312)
       )
     )
     (set_local $$34
-      (i64.load offset=336 align=8
+      (i64.load offset=336
         (get_local $$312)
       )
     )
     (set_local $$35
-      (i64.load offset=368 align=8
+      (i64.load offset=368
         (get_local $$312)
       )
     )
@@ -2338,7 +2338,7 @@
       )
     )
     (set_local $$121
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$295)
           (i32.const 8)
@@ -2346,32 +2346,32 @@
       )
     )
     (set_local $$64
-      (i64.load offset=288 align=8
+      (i64.load offset=288
         (get_local $$312)
       )
     )
     (set_local $$65
-      (i64.load offset=272 align=8
+      (i64.load offset=272
         (get_local $$312)
       )
     )
     (set_local $$66
-      (i64.load offset=304 align=8
+      (i64.load offset=304
         (get_local $$312)
       )
     )
     (set_local $$86
-      (i64.load offset=256 align=8
+      (i64.load offset=256
         (get_local $$312)
       )
     )
     (set_local $$107
-      (i64.load offset=320 align=8
+      (i64.load offset=320
         (get_local $$312)
       )
     )
     (set_local $$108
-      (i64.load offset=448 align=8
+      (i64.load offset=448
         (get_local $$312)
       )
     )
@@ -2385,7 +2385,7 @@
       )
     )
     (set_local $$129
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$296)
           (i32.const 8)
@@ -2402,7 +2402,7 @@
       )
     )
     (set_local $$130
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$297)
           (i32.const 8)
@@ -2410,17 +2410,17 @@
       )
     )
     (set_local $$37
-      (i64.load offset=864 align=8
+      (i64.load offset=864
         (get_local $$312)
       )
     )
     (set_local $$38
-      (i64.load offset=848 align=8
+      (i64.load offset=848
         (get_local $$312)
       )
     )
     (set_local $$39
-      (i64.load offset=880 align=8
+      (i64.load offset=880
         (get_local $$312)
       )
     )
@@ -2434,7 +2434,7 @@
       )
     )
     (set_local $$131
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$298)
           (i32.const 8)
@@ -2442,17 +2442,17 @@
       )
     )
     (set_local $$122
-      (i64.load offset=736 align=8
+      (i64.load offset=736
         (get_local $$312)
       )
     )
     (set_local $$123
-      (i64.load offset=720 align=8
+      (i64.load offset=720
         (get_local $$312)
       )
     )
     (set_local $$124
-      (i64.load offset=752 align=8
+      (i64.load offset=752
         (get_local $$312)
       )
     )
@@ -2466,7 +2466,7 @@
       )
     )
     (set_local $$132
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$299)
           (i32.const 8)
@@ -2483,7 +2483,7 @@
       )
     )
     (set_local $$133
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$300)
           (i32.const 8)
@@ -2500,7 +2500,7 @@
       )
     )
     (set_local $$134
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$301)
           (i32.const 8)
@@ -2517,7 +2517,7 @@
       )
     )
     (set_local $$135
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$302)
           (i32.const 8)
@@ -2534,7 +2534,7 @@
       )
     )
     (set_local $$141
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$303)
           (i32.const 8)
@@ -2551,7 +2551,7 @@
       )
     )
     (set_local $$142
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$304)
           (i32.const 8)
@@ -2559,17 +2559,17 @@
       )
     )
     (set_local $$99
-      (i64.load offset=768 align=8
+      (i64.load offset=768
         (get_local $$312)
       )
     )
     (set_local $$100
-      (i64.load offset=784 align=8
+      (i64.load offset=784
         (get_local $$312)
       )
     )
     (set_local $$101
-      (i64.load offset=800 align=8
+      (i64.load offset=800
         (get_local $$312)
       )
     )
@@ -2583,7 +2583,7 @@
       )
     )
     (set_local $$143
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$305)
           (i32.const 8)
@@ -2591,27 +2591,27 @@
       )
     )
     (set_local $$136
-      (i64.load offset=640 align=8
+      (i64.load offset=640
         (get_local $$312)
       )
     )
     (set_local $$137
-      (i64.load offset=656 align=8
+      (i64.load offset=656
         (get_local $$312)
       )
     )
     (set_local $$138
-      (i64.load offset=672 align=8
+      (i64.load offset=672
         (get_local $$312)
       )
     )
     (set_local $$43
-      (i64.load offset=816 align=8
+      (i64.load offset=816
         (get_local $$312)
       )
     )
     (set_local $$128
-      (i64.load offset=688 align=8
+      (i64.load offset=688
         (get_local $$312)
       )
     )
@@ -2625,7 +2625,7 @@
       )
     )
     (set_local $$144
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$306)
           (i32.const 8)
@@ -2633,12 +2633,12 @@
       )
     )
     (set_local $$103
-      (i64.load offset=832 align=8
+      (i64.load offset=832
         (get_local $$312)
       )
     )
     (set_local $$140
-      (i64.load offset=704 align=8
+      (i64.load offset=704
         (get_local $$312)
       )
     )
@@ -2652,7 +2652,7 @@
       )
     )
     (set_local $$145
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$307)
           (i32.const 8)
@@ -2669,7 +2669,7 @@
       )
     )
     (set_local $$149
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$308)
           (i32.const 8)
@@ -2686,7 +2686,7 @@
       )
     )
     (set_local $$150
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$309)
           (i32.const 8)
@@ -2703,7 +2703,7 @@
       )
     )
     (set_local $$151
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$310)
           (i32.const 8)
@@ -2711,82 +2711,82 @@
       )
     )
     (set_local $$40
-      (i64.load offset=1008 align=8
+      (i64.load offset=1008
         (get_local $$312)
       )
     )
     (set_local $$41
-      (i64.load offset=960 align=8
+      (i64.load offset=960
         (get_local $$312)
       )
     )
     (set_local $$42
-      (i64.load offset=976 align=8
+      (i64.load offset=976
         (get_local $$312)
       )
     )
     (set_local $$56
-      (i64.load offset=912 align=8
+      (i64.load offset=912
         (get_local $$312)
       )
     )
     (set_local $$57
-      (i64.load offset=928 align=8
+      (i64.load offset=928
         (get_local $$312)
       )
     )
     (set_local $$58
-      (i64.load offset=944 align=8
+      (i64.load offset=944
         (get_local $$312)
       )
     )
     (set_local $$85
-      (i64.load offset=896 align=8
+      (i64.load offset=896
         (get_local $$312)
       )
     )
     (set_local $$102
-      (i64.load offset=992 align=8
+      (i64.load offset=992
         (get_local $$312)
       )
     )
     (set_local $$125
-      (i64.load offset=592 align=8
+      (i64.load offset=592
         (get_local $$312)
       )
     )
     (set_local $$126
-      (i64.load offset=608 align=8
+      (i64.load offset=608
         (get_local $$312)
       )
     )
     (set_local $$127
-      (i64.load offset=624 align=8
+      (i64.load offset=624
         (get_local $$312)
       )
     )
     (set_local $$139
-      (i64.load offset=576 align=8
+      (i64.load offset=576
         (get_local $$312)
       )
     )
     (set_local $$146
-      (i64.load offset=528 align=8
+      (i64.load offset=528
         (get_local $$312)
       )
     )
     (set_local $$147
-      (i64.load offset=544 align=8
+      (i64.load offset=544
         (get_local $$312)
       )
     )
     (set_local $$148
-      (i64.load offset=560 align=8
+      (i64.load offset=560
         (get_local $$312)
       )
     )
     (set_local $$152
-      (i64.load offset=512 align=8
+      (i64.load offset=512
         (get_local $$312)
       )
     )
@@ -2799,7 +2799,7 @@
         (get_local $$311)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 8)
@@ -2807,7 +2807,7 @@
       (i64.select
         (i64.select
           (i64.select
-            (i64.load align=8
+            (i64.load
               (i32.add
                 (get_local $$311)
                 (i32.const 8)
@@ -2838,7 +2838,7 @@
         )
       )
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (i64.select
         (i64.select
@@ -2854,7 +2854,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 24)
@@ -2885,7 +2885,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 16)
@@ -2911,7 +2911,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 56)
@@ -2974,7 +2974,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 48)
@@ -3022,7 +3022,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 40)
@@ -3068,7 +3068,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 32)
@@ -3109,7 +3109,7 @@
         (get_local $$166)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 120)
@@ -3249,7 +3249,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 112)
@@ -3349,7 +3349,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 104)
@@ -3452,7 +3452,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 96)
@@ -3545,7 +3545,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 72)
@@ -3621,7 +3621,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 64)
@@ -3692,7 +3692,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 88)
@@ -3775,7 +3775,7 @@
         (get_local $$165)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 80)
@@ -3866,7 +3866,7 @@
       (i32.const 1)
     )
     (set_local $$312
-      (i32.store align=4
+      (i32.store
         (get_local $$185)
         (get_local $$312)
       )
diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast
index b76a7377e..fa9ce0e86 100644
--- a/test/llvm_autogenerated/load-ext.wast
+++ b/test/llvm_autogenerated/load-ext.wast
@@ -12,70 +12,70 @@
   (export "zext_i32_i64" $zext_i32_i64)
   (func $sext_i8_i32 (param $$0 i32) (result i32)
     (return
-      (i32.load8_s align=1
+      (i32.load8_s
         (get_local $$0)
       )
     )
   )
   (func $zext_i8_i32 (param $$0 i32) (result i32)
     (return
-      (i32.load8_u align=1
+      (i32.load8_u
         (get_local $$0)
       )
     )
   )
   (func $sext_i16_i32 (param $$0 i32) (result i32)
     (return
-      (i32.load16_s align=2
+      (i32.load16_s
         (get_local $$0)
       )
     )
   )
   (func $zext_i16_i32 (param $$0 i32) (result i32)
     (return
-      (i32.load16_u align=2
+      (i32.load16_u
         (get_local $$0)
       )
     )
   )
   (func $sext_i8_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load8_s align=1
+      (i64.load8_s
         (get_local $$0)
       )
     )
   )
   (func $zext_i8_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load8_u align=1
+      (i64.load8_u
         (get_local $$0)
       )
     )
   )
   (func $sext_i16_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load16_s align=2
+      (i64.load16_s
         (get_local $$0)
       )
     )
   )
   (func $zext_i16_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load16_u align=2
+      (i64.load16_u
         (get_local $$0)
       )
     )
   )
   (func $sext_i32_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load32_s align=4
+      (i64.load32_s
         (get_local $$0)
       )
     )
   )
   (func $zext_i32_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load32_u align=4
+      (i64.load32_u
         (get_local $$0)
       )
     )
diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast
index 87087a49c..77a596860 100644
--- a/test/llvm_autogenerated/load-store-i1.wast
+++ b/test/llvm_autogenerated/load-store-i1.wast
@@ -8,7 +8,7 @@
   (export "store_i64_i1" $store_i64_i1)
   (func $load_u_i1_i32 (param $$0 i32) (result i32)
     (return
-      (i32.load8_u align=1
+      (i32.load8_u
         (get_local $$0)
       )
     )
@@ -17,7 +17,7 @@
     (return
       (i32.shr_s
         (i32.shl
-          (i32.load8_u align=1
+          (i32.load8_u
             (get_local $$0)
           )
           (i32.const 31)
@@ -28,7 +28,7 @@
   )
   (func $load_u_i1_i64 (param $$0 i32) (result i64)
     (return
-      (i64.load8_u align=1
+      (i64.load8_u
         (get_local $$0)
       )
     )
@@ -37,7 +37,7 @@
     (return
       (i64.shr_s
         (i64.shl
-          (i64.load8_u align=1
+          (i64.load8_u
             (get_local $$0)
           )
           (i64.const 63)
@@ -47,7 +47,7 @@
     )
   )
   (func $store_i32_i1 (param $$0 i32) (param $$1 i32)
-    (i32.store8 align=1
+    (i32.store8
       (get_local $$0)
       (i32.and
         (get_local $$1)
@@ -57,7 +57,7 @@
     (return)
   )
   (func $store_i64_i1 (param $$0 i32) (param $$1 i64)
-    (i64.store8 align=1
+    (i64.store8
       (get_local $$0)
       (i64.and
         (get_local $$1)
diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast
index ff52fcc96..93eb48e4b 100644
--- a/test/llvm_autogenerated/load.wast
+++ b/test/llvm_autogenerated/load.wast
@@ -6,28 +6,28 @@
   (export "ldf64" $ldf64)
   (func $ldi32 (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
   )
   (func $ldi64 (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (get_local $$0)
       )
     )
   )
   (func $ldf32 (param $$0 i32) (result f32)
     (return
-      (f32.load align=4
+      (f32.load
         (get_local $$0)
       )
     )
   )
   (func $ldf64 (param $$0 i32) (result f64)
     (return
-      (f64.load align=8
+      (f64.load
         (get_local $$0)
       )
     )
diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast
index 181e077dd..83e3f96c3 100644
--- a/test/llvm_autogenerated/mem-intrinsics.wast
+++ b/test/llvm_autogenerated/mem-intrinsics.wast
@@ -75,7 +75,7 @@
       (i32.const 1)
     )
     (set_local $$0
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -92,7 +92,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (get_local $$4)
       )
@@ -129,7 +129,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast
index 92efa540f..9a37840b7 100644
--- a/test/llvm_autogenerated/offset.wast
+++ b/test/llvm_autogenerated/offset.wast
@@ -37,21 +37,21 @@
   (export "aggregate_return_without_merge" $aggregate_return_without_merge)
   (func $load_i32_with_folded_offset (param $$0 i32) (result i32)
     (return
-      (i32.load offset=24 align=4
+      (i32.load offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i32_with_folded_gep_offset (param $$0 i32) (result i32)
     (return
-      (i32.load offset=24 align=4
+      (i32.load offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i32_with_unfolded_gep_negative_offset (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (i32.add
           (get_local $$0)
           (i32.const -24)
@@ -61,7 +61,7 @@
   )
   (func $load_i32_with_unfolded_offset (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (i32.add
           (get_local $$0)
           (i32.const 24)
@@ -71,7 +71,7 @@
   )
   (func $load_i32_with_unfolded_gep_offset (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (i32.add
           (get_local $$0)
           (i32.const 24)
@@ -81,21 +81,21 @@
   )
   (func $load_i64_with_folded_offset (param $$0 i32) (result i64)
     (return
-      (i64.load offset=24 align=8
+      (i64.load offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i64_with_folded_gep_offset (param $$0 i32) (result i64)
     (return
-      (i64.load offset=24 align=8
+      (i64.load offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i64_with_unfolded_gep_negative_offset (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$0)
           (i32.const -24)
@@ -105,7 +105,7 @@
   )
   (func $load_i64_with_unfolded_offset (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$0)
           (i32.const 24)
@@ -115,7 +115,7 @@
   )
   (func $load_i64_with_unfolded_gep_offset (param $$0 i32) (result i64)
     (return
-      (i64.load align=8
+      (i64.load
         (i32.add
           (get_local $$0)
           (i32.const 24)
@@ -124,21 +124,21 @@
     )
   )
   (func $store_i32_with_folded_offset (param $$0 i32)
-    (i32.store offset=24 align=4
+    (i32.store offset=24
       (get_local $$0)
       (i32.const 0)
     )
     (return)
   )
   (func $store_i32_with_folded_gep_offset (param $$0 i32)
-    (i32.store offset=24 align=4
+    (i32.store offset=24
       (get_local $$0)
       (i32.const 0)
     )
     (return)
   )
   (func $store_i32_with_unfolded_gep_negative_offset (param $$0 i32)
-    (i32.store align=4
+    (i32.store
       (i32.add
         (get_local $$0)
         (i32.const -24)
@@ -148,7 +148,7 @@
     (return)
   )
   (func $store_i32_with_unfolded_offset (param $$0 i32)
-    (i32.store align=4
+    (i32.store
       (i32.add
         (get_local $$0)
         (i32.const 24)
@@ -158,7 +158,7 @@
     (return)
   )
   (func $store_i32_with_unfolded_gep_offset (param $$0 i32)
-    (i32.store align=4
+    (i32.store
       (i32.add
         (get_local $$0)
         (i32.const 24)
@@ -168,21 +168,21 @@
     (return)
   )
   (func $store_i64_with_folded_offset (param $$0 i32)
-    (i64.store offset=24 align=8
+    (i64.store offset=24
       (get_local $$0)
       (i64.const 0)
     )
     (return)
   )
   (func $store_i64_with_folded_gep_offset (param $$0 i32)
-    (i64.store offset=24 align=8
+    (i64.store offset=24
       (get_local $$0)
       (i64.const 0)
     )
     (return)
   )
   (func $store_i64_with_unfolded_gep_negative_offset (param $$0 i32)
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const -24)
@@ -192,7 +192,7 @@
     (return)
   )
   (func $store_i64_with_unfolded_offset (param $$0 i32)
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 24)
@@ -202,7 +202,7 @@
     (return)
   )
   (func $store_i64_with_unfolded_gep_offset (param $$0 i32)
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 24)
@@ -213,27 +213,27 @@
   )
   (func $load_i32_from_numeric_address (result i32)
     (return
-      (i32.load offset=42 align=4
+      (i32.load offset=42
         (i32.const 0)
       )
     )
   )
   (func $load_i32_from_global_address (result i32)
     (return
-      (i32.load offset=8 align=4
+      (i32.load offset=8
         (i32.const 0)
       )
     )
   )
   (func $store_i32_to_numeric_address
-    (i32.store offset=42 align=4
+    (i32.store offset=42
       (i32.const 0)
       (i32.const 0)
     )
     (return)
   )
   (func $store_i32_to_global_address
-    (i32.store offset=8 align=4
+    (i32.store offset=8
       (i32.const 0)
       (i32.const 0)
     )
@@ -241,41 +241,41 @@
   )
   (func $load_i8_s_with_folded_offset (param $$0 i32) (result i32)
     (return
-      (i32.load8_s offset=24 align=1
+      (i32.load8_s offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i8_s_with_folded_gep_offset (param $$0 i32) (result i32)
     (return
-      (i32.load8_s offset=24 align=1
+      (i32.load8_s offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i8_u_with_folded_offset (param $$0 i32) (result i32)
     (return
-      (i32.load8_u offset=24 align=1
+      (i32.load8_u offset=24
         (get_local $$0)
       )
     )
   )
   (func $load_i8_u_with_folded_gep_offset (param $$0 i32) (result i32)
     (return
-      (i32.load8_u offset=24 align=1
+      (i32.load8_u offset=24
         (get_local $$0)
       )
     )
   )
   (func $store_i8_with_folded_offset (param $$0 i32)
-    (i32.store8 offset=24 align=1
+    (i32.store8 offset=24
       (get_local $$0)
       (i32.const 0)
     )
     (return)
   )
   (func $store_i8_with_folded_gep_offset (param $$0 i32)
-    (i32.store8 offset=24 align=1
+    (i32.store8 offset=24
       (get_local $$0)
       (i32.const 0)
     )
@@ -286,35 +286,35 @@
     (local $$3 i32)
     (local $$4 i32)
     (set_local $$2
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
     (set_local $$3
-      (i32.load offset=4 align=4
+      (i32.load offset=4
         (get_local $$0)
       )
     )
     (set_local $$4
-      (i32.load offset=8 align=4
+      (i32.load offset=8
         (get_local $$0)
       )
     )
-    (i32.store offset=12 align=4
+    (i32.store offset=12
       (get_local $$1)
-      (i32.load offset=12 align=4
+      (i32.load offset=12
         (get_local $$0)
       )
     )
-    (i32.store offset=8 align=4
+    (i32.store offset=8
       (get_local $$1)
       (get_local $$4)
     )
-    (i32.store offset=4 align=4
+    (i32.store offset=4
       (get_local $$1)
       (get_local $$3)
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$1)
       (get_local $$2)
     )
@@ -331,17 +331,17 @@
     (return)
   )
   (func $aggregate_return_without_merge (param $$0 i32)
-    (i32.store offset=8 align=4
+    (i32.store offset=8
       (get_local $$0)
-      (i32.store16 offset=12 align=2
+      (i32.store16 offset=12
         (get_local $$0)
-        (i32.store8 offset=14 align=1
+        (i32.store8 offset=14
           (get_local $$0)
           (i32.const 0)
         )
       )
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (i64.const 0)
     )
diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast
index 25e390498..0a2d25f83 100644
--- a/test/llvm_autogenerated/reg-stackify.wast
+++ b/test/llvm_autogenerated/reg-stackify.wast
@@ -27,11 +27,11 @@
   (export "no_stackify_past_use" $no_stackify_past_use)
   (func $no0 (param $$0 i32) (param $$1 i32) (result i32)
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
@@ -41,11 +41,11 @@
   )
   (func $no1 (param $$0 i32) (param $$1 i32) (result i32)
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
@@ -54,19 +54,19 @@
     )
   )
   (func $yes0 (param $$0 i32) (param $$1 i32) (result i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
   )
   (func $yes1 (param $$0 i32) (result i32)
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -114,7 +114,7 @@
       (br_if $label$0
         (i32.ge_u
           (set_local $$3
-            (i32.load align=4
+            (i32.load
               (get_local $$2)
             )
           )
@@ -127,7 +127,7 @@
           (get_local $$0)
         )
       )
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$3)
       )
@@ -137,13 +137,13 @@
   (func $stackify_store_across_side_effects (param $$0 i32)
     (local $$1 i64)
     (set_local $$1
-      (i64.store align=8
+      (i64.store
         (get_local $$0)
         (i64.const 4611686018427387904)
       )
     )
     (call_import $evoke_side_effects)
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/llvm_autogenerated/store-results.wast b/test/llvm_autogenerated/store-results.wast
index 239d2b352..83277c92f 100644
--- a/test/llvm_autogenerated/store-results.wast
+++ b/test/llvm_autogenerated/store-results.wast
@@ -6,7 +6,7 @@
   (export "fi_ret" $fi_ret)
   (func $single_block (param $$0 i32) (result i32)
     (return
-      (i32.store align=4
+      (i32.store
         (get_local $$0)
         (i32.const 0)
       )
@@ -18,7 +18,7 @@
       (i32.const 0)
     )
     (loop $label$1 $label$0
-      (i32.store offset=8 align=4
+      (i32.store offset=8
         (i32.const 0)
         (i32.const 0)
       )
@@ -43,7 +43,7 @@
       (f32.const 0)
     )
     (loop $label$1 $label$0
-      (i32.store offset=8 align=4
+      (i32.store offset=8
         (i32.const 0)
         (i32.const 0)
       )
@@ -71,7 +71,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -88,12 +88,12 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (get_local $$4)
     )
@@ -110,7 +110,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$4)
       )
diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast
index 543e9e44f..168b201d1 100644
--- a/test/llvm_autogenerated/store-trunc.wast
+++ b/test/llvm_autogenerated/store-trunc.wast
@@ -6,35 +6,35 @@
   (export "trunc_i16_i64" $trunc_i16_i64)
   (export "trunc_i32_i64" $trunc_i32_i64)
   (func $trunc_i8_i32 (param $$0 i32) (param $$1 i32)
-    (i32.store8 align=1
+    (i32.store8
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $trunc_i16_i32 (param $$0 i32) (param $$1 i32)
-    (i32.store16 align=2
+    (i32.store16
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $trunc_i8_i64 (param $$0 i32) (param $$1 i64)
-    (i64.store8 align=1
+    (i64.store8
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $trunc_i16_i64 (param $$0 i32) (param $$1 i64)
-    (i64.store16 align=2
+    (i64.store16
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $trunc_i32_i64 (param $$0 i32) (param $$1 i64)
-    (i64.store32 align=4
+    (i64.store32
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast
index 481f498cf..a52839116 100644
--- a/test/llvm_autogenerated/store.wast
+++ b/test/llvm_autogenerated/store.wast
@@ -5,28 +5,28 @@
   (export "stf32" $stf32)
   (export "stf64" $stf64)
   (func $sti32 (param $$0 i32) (param $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $sti64 (param $$0 i32) (param $$1 i64)
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $stf32 (param $$0 i32) (param $$1 f32)
-    (f32.store align=4
+    (f32.store
       (get_local $$0)
       (get_local $$1)
     )
     (return)
   )
   (func $stf64 (param $$0 i32) (param $$1 f64)
-    (f64.store align=8
+    (f64.store
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast
index 3ff5ec1bb..b5206081b 100644
--- a/test/llvm_autogenerated/userstack.wast
+++ b/test/llvm_autogenerated/userstack.wast
@@ -18,7 +18,7 @@
       (i32.const 1)
     )
     (set_local $$0
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -35,12 +35,12 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (get_local $$3)
       )
     )
-    (i32.store offset=12 align=4
+    (i32.store offset=12
       (get_local $$3)
       (i32.const 0)
     )
@@ -57,7 +57,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$3)
       )
@@ -73,7 +73,7 @@
       (i32.const 1)
     )
     (set_local $$0
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -90,16 +90,16 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (get_local $$3)
       )
     )
-    (i32.store offset=12 align=4
+    (i32.store offset=12
       (get_local $$3)
       (i32.const 0)
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$3)
       (i64.const 0)
     )
@@ -116,7 +116,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$3)
       )
@@ -133,7 +133,7 @@
       (i32.const 1)
     )
     (set_local $$0
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -150,7 +150,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (get_local $$4)
       )
@@ -164,12 +164,12 @@
         (get_local $$3)
       )
     )
-    (i32.store align=4
+    (i32.store
       (i32.add
         (get_local $$3)
         (i32.const 12)
       )
-      (i32.store offset=12 align=4
+      (i32.store offset=12
         (get_local $$4)
         (i32.const 1)
       )
@@ -187,7 +187,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
@@ -205,7 +205,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -222,7 +222,7 @@
       (i32.const 1)
     )
     (set_local $$6
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$6)
       )
@@ -251,7 +251,7 @@
         (get_local $$5)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (get_local $$5)
     )
@@ -268,7 +268,7 @@
       (i32.const 1)
     )
     (set_local $$6
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$6)
       )
@@ -284,7 +284,7 @@
       (i32.const 1)
     )
     (set_local $$0
-      (i32.load align=4
+      (i32.load
         (get_local $$0)
       )
     )
@@ -301,14 +301,14 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (get_local $$3)
       )
     )
-    (i32.store offset=24 align=4
+    (i32.store offset=24
       (get_local $$3)
-      (i32.store offset=12 align=4
+      (i32.store offset=12
         (get_local $$3)
         (i32.const 1)
       )
@@ -326,7 +326,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$3)
       )
@@ -342,7 +342,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -367,7 +367,7 @@
     (set_local $$3
       (get_local $$0)
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
@@ -375,7 +375,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
@@ -392,7 +392,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -412,7 +412,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$4)
       )
@@ -435,7 +435,7 @@
     (set_local $$4
       (get_local $$0)
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.const 0)
     )
@@ -452,7 +452,7 @@
       (i32.const 1)
     )
     (set_local $$4
-      (i32.store align=4
+      (i32.store
         (get_local $$3)
         (get_local $$4)
       )
diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast
index 053589b3d..7fdab4e4e 100644
--- a/test/llvm_autogenerated/varargs.wast
+++ b/test/llvm_autogenerated/varargs.wast
@@ -13,9 +13,9 @@
     (return)
   )
   (func $copy (param $$0 i32) (param $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -23,11 +23,11 @@
   )
   (func $arg_i8 (param $$0 i32) (result i32)
     (local $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.add
         (set_local $$1
-          (i32.load align=4
+          (i32.load
             (get_local $$0)
           )
         )
@@ -35,20 +35,20 @@
       )
     )
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
   )
   (func $arg_i32 (param $$0 i32) (result i32)
     (local $$1 i32)
-    (i32.store align=4
+    (i32.store
       (get_local $$0)
       (i32.add
         (set_local $$1
           (i32.and
             (i32.add
-              (i32.load align=4
+              (i32.load
                 (get_local $$0)
               )
               (i32.const 3)
@@ -60,7 +60,7 @@
       )
     )
     (return
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -70,13 +70,13 @@
     (local $$3 i64)
     (local $$4 i32)
     (set_local $$2
-      (i32.store align=4
+      (i32.store
         (get_local $$1)
         (i32.add
           (set_local $$4
             (i32.and
               (i32.add
-                (i32.load align=4
+                (i32.load
                   (get_local $$1)
                 )
                 (i32.const 7)
@@ -89,27 +89,27 @@
       )
     )
     (set_local $$3
-      (i64.load align=8
+      (i64.load
         (get_local $$4)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$1)
       (i32.add
         (get_local $$4)
         (i32.const 16)
       )
     )
-    (i64.store align=8
+    (i64.store
       (i32.add
         (get_local $$0)
         (i32.const 8)
       )
-      (i64.load align=8
+      (i64.load
         (get_local $$2)
       )
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (get_local $$3)
     )
@@ -133,7 +133,7 @@
       (i32.const 1)
     )
     (set_local $$5
-      (i32.load align=4
+      (i32.load
         (get_local $$5)
       )
     )
@@ -150,7 +150,7 @@
       (i32.const 1)
     )
     (set_local $$8
-      (i32.store align=4
+      (i32.store
         (get_local $$6)
         (get_local $$8)
       )
@@ -159,7 +159,7 @@
       (i32.const 1)
     )
     (set_local $$1
-      (i32.load align=4
+      (i32.load
         (get_local $$1)
       )
     )
@@ -176,12 +176,12 @@
       (i32.const 1)
     )
     (set_local $$8
-      (i32.store align=4
+      (i32.store
         (get_local $$2)
         (get_local $$8)
       )
     )
-    (i32.store align=4
+    (i32.store
       (get_local $$8)
       (i32.const 0)
     )
@@ -191,7 +191,7 @@
         (i32.const 8)
       )
     )
-    (i64.store align=8
+    (i64.store
       (get_local $$0)
       (i64.const 4611686018427387904)
     )
@@ -200,7 +200,7 @@
       (i32.const 1)
     )
     (set_local $$3
-      (i32.load align=4
+      (i32.load
         (get_local $$3)
       )
     )
@@ -217,7 +217,7 @@
       (i32.const 1)
     )
     (set_local $$8
-      (i32.store align=4
+      (i32.store
         (get_local $$4)
         (get_local $$8)
       )
@@ -235,7 +235,7 @@
       (i32.const 1)
     )
     (set_local $$8
-      (i32.store align=4
+      (i32.store
         (get_local $$7)
         (get_local $$8)
       )