diff --git a/src/waforth.wat b/src/waforth.wat
index c4e8917..9ad55e6 100644
--- a/src/waforth.wat
+++ b/src/waforth.wat
@@ -64,7 +64,7 @@
   ;;   COMPILE_CALL_INDEX := 5
   ;;   PUSH_INDIRECT_INDEX := 6
   ;;   END_DO_INDEX := 9
-  (table (export "table") 0xad funcref)
+  (table (export "table") 0xae funcref)
 
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -233,7 +233,7 @@
     (local $bbtos i32)
     (local $m i64)
     (local $npo i32)
-    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x203a0 (; = body(BASE) ;)))))
+    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x203ac (; = body(BASE) ;)))))
     (local.set $v (i64.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))
     (local.set $m (i64.rem_u (local.get $v) (local.get $base)))
     (local.set $v (i64.div_u (local.get $v) (local.get $base)))
@@ -260,7 +260,7 @@
     (local $bbtos i32)
     (local $m i64)
     (local $po i32)
-    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x203a0 (; = body(BASE) ;)))))
+    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x203ac (; = body(BASE) ;)))))
     (local.set $v (i64.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))
     (local.set $po (global.get $po))
     (loop $loop
@@ -392,7 +392,7 @@
       (then
         (call $shell_emit (i32.const 0x2d))
         (local.set $v (i32.sub (i32.const 0) (local.get $v)))))
-    (call $U._ (local.get $v) (i32.load (i32.const 0x203a0 (; = body(BASE) ;))))
+    (call $U._ (local.get $v) (i32.load (i32.const 0x203ac (; = body(BASE) ;))))
     (call $shell_emit (i32.const 0x20)))
   (data (i32.const 0x2015c) "\50\01\02\00" "\01" ".  " "\20\00\00\00")
   (elem (i32.const 0x20) $.)
@@ -402,7 +402,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $Sq)
-    (call $emitICall (i32.const 0) (i32.const 0x9b (; = index("TYPE") ;))))
+    (call $emitICall (i32.const 0) (i32.const 0x9c (; = index("TYPE") ;))))
   (data (i32.const 0x20168) "\5c\01\02\00" "\82" (; F_IMMEDIATE ;) ".\22 " "\21\00\00\00")
   (elem (i32.const 0x21) $.q)
 
@@ -413,7 +413,7 @@
     (block $endLoop
       (loop $loop
         (br_if $endLoop (i32.ge_u (local.get $p) (local.get $tos)))
-        (call $U._ (i32.load (local.get $p)) (i32.load (i32.const 0x203a0 (; = body(BASE) ;))))
+        (call $U._ (i32.load (local.get $p)) (i32.load (i32.const 0x203ac (; = body(BASE) ;))))
         (call $shell_emit (i32.const 0x20))
         (local.set $p (i32.add (local.get $p) (i32.const 4)))
         (br $loop)))
@@ -597,6 +597,17 @@
   (data (i32.const 0x2024c) "\3c\02\02\00" "\05" "2OVER  " "\33\00\00\00")
   (elem (i32.const 0x33) $2OVER)
 
+  ;; [6.2.0415](https://forth-standard.org/standard/core/TwoRFetch)
+  (func $2R@ (param $tos i32) (result i32)
+    (local $bbtors i32)
+    (i32.store (local.get $tos) 
+      (i32.load (local.tee $bbtors (i32.sub (global.get $tors) (i32.const 8)))))
+    (i32.store (i32.add (local.get $tos) (i32.const 4))
+      (i32.load (i32.add (local.get $bbtors) (i32.const 4))))
+    (i32.add (local.get $tos) (i32.const 8)))
+  (data (i32.const 0x2025c) "\4c\02\02\00" "\03" "2R@" "\34\00\00\00")
+  (elem (i32.const 0x34) $2R@)
+
   ;; [6.2.0410](https://forth-standard.org/standard/core/TwoRfrom)
   (func $2R> (param $tos i32) (result i32)
     (local $bbtors i32)
@@ -606,8 +617,8 @@
       (i32.load (i32.add (local.get $bbtors) (i32.const 4))))
     (global.set $tors (local.get $bbtors))
     (i32.add (local.get $tos) (i32.const 8)))
-  (data (i32.const 0x2025c) "\4c\02\02\00" "\03" "2R>" "\34\00\00\00")
-  (elem (i32.const 0x34) $2R>)
+  (data (i32.const 0x20268) "\5c\02\02\00" "\03" "2R>" "\35\00\00\00")
+  (elem (i32.const 0x35) $2R>)
 
   ;; [6.1.0430](https://forth-standard.org/standard/core/TwoSWAP)
   (func $2SWAP (param $tos i32) (result i32)
@@ -624,8 +635,8 @@
     (i32.store (i32.sub (local.get $tos) (i32.const 4))
                 (local.get $x2))
     (local.get $tos))
-  (data (i32.const 0x20268) "\5c\02\02\00" "\05" "2SWAP  " "\35\00\00\00")
-  (elem (i32.const 0x35) $2SWAP)
+  (data (i32.const 0x20274) "\68\02\02\00" "\05" "2SWAP  " "\36\00\00\00")
+  (elem (i32.const 0x36) $2SWAP)
 
   ;; [6.1.0450](https://forth-standard.org/standard/core/Colon)
   (func $: (param $tos i32) (result i32)
@@ -648,8 +659,8 @@
 
     (call $startColon (i32.const 0))
     (call $right-bracket))
-  (data (i32.const 0x20278) "\68\02\02\00" "\01" ":  " "\36\00\00\00")
-  (elem (i32.const 0x36) $:)
+  (data (i32.const 0x20284) "\74\02\02\00" "\01" ":  " "\37\00\00\00")
+  (elem (i32.const 0x37) $:)
 
   ;; [6.1.0460](https://forth-standard.org/standard/core/Semi)
   (func $semicolon (param $tos i32) (result i32)
@@ -658,8 +669,8 @@
     (call $endColon)
     (call $hidden)
     (call $left-bracket))
-  (data (i32.const 0x20284) "\78\02\02\00" "\81" (; F_IMMEDIATE ;) ";  " "\37\00\00\00")
-  (elem (i32.const 0x37) $semicolon)
+  (data (i32.const 0x20290) "\84\02\02\00" "\81" (; F_IMMEDIATE ;) ";  " "\38\00\00\00")
+  (elem (i32.const 0x38) $semicolon)
 
   ;; [6.1.0480](https://forth-standard.org/standard/core/less)
   (func $< (param $tos i32) (result i32)
@@ -670,15 +681,15 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x20290) "\84\02\02\00" "\01" "<  " "\38\00\00\00")
-  (elem (i32.const 0x38) $<)
+  (data (i32.const 0x2029c) "\90\02\02\00" "\01" "<  " "\39\00\00\00")
+  (elem (i32.const 0x39) $<)
 
   ;; [6.1.0490](https://forth-standard.org/standard/core/num-start)
   (func $<# (param $tos i32) (result i32)
     (global.set $po (i32.add (global.get $here) (i32.const 0x200 (; = PICTURED_OUTPUT_OFFSET ;))))
     (local.get $tos))
-  (data (i32.const 0x2029c) "\90\02\02\00" "\02" "<# " "\39\00\00\00")
-  (elem (i32.const 0x39) $<#)
+  (data (i32.const 0x202a8) "\9c\02\02\00" "\02" "<# " "\3a\00\00\00")
+  (elem (i32.const 0x3a) $<#)
 
   ;; [6.1.0530](https://forth-standard.org/standard/core/Equal)
   (func $= (param $tos i32) (result i32)
@@ -689,8 +700,8 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x202a8) "\9c\02\02\00" "\01" "=  " "\3a\00\00\00")
-  (elem (i32.const 0x3a) $=)
+  (data (i32.const 0x202b4) "\a8\02\02\00" "\01" "=  " "\3b\00\00\00")
+  (elem (i32.const 0x3b) $=)
 
   ;; [6.1.0540](https://forth-standard.org/standard/core/more)
   (func $> (param $tos i32) (result i32)
@@ -701,8 +712,8 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x202b4) "\a8\02\02\00" "\01" ">  " "\3b\00\00\00")
-  (elem (i32.const 0x3b) $>)
+  (data (i32.const 0x202c0) "\b4\02\02\00" "\01" ">  " "\3c\00\00\00")
+  (elem (i32.const 0x3c) $>)
 
   ;; [6.1.0550](https://forth-standard.org/standard/core/toBODY)
   (func $>BODY (param $tos i32) (result i32)
@@ -710,11 +721,11 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
       (i32.add (call $body (i32.load (local.get $btos))) (i32.const 4)))
     (local.get $tos))
-  (data (i32.const 0x202c0) "\b4\02\02\00" "\05" ">BODY  " "\3c\00\00\00")
-  (elem (i32.const 0x3c) $>BODY)
+  (data (i32.const 0x202cc) "\c0\02\02\00" "\05" ">BODY  " "\3d\00\00\00")
+  (elem (i32.const 0x3d) $>BODY)
 
   ;; [6.1.0560](https://forth-standard.org/standard/core/toIN)
-  (data (i32.const 0x202d0) "\c0\02\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00")
+  (data (i32.const 0x202dc) "\cc\02\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00")
 
   ;; [6.1.0570](https://forth-standard.org/standard/core/toNUMBER)
   (func $>NUMBER (param $tos i32) (result i32) 
@@ -735,16 +746,16 @@
     (i32.store (local.get $bbtos) (local.get $rest))
     (i64.store (local.get $bbbbtos) (local.get $value))
     (local.get $tos))
-  (data (i32.const 0x202e0) "\d0\02\02\00" "\07" ">NUMBER" "\3d\00\00\00")
-  (elem (i32.const 0x3d) $>NUMBER)
+  (data (i32.const 0x202ec) "\dc\02\02\00" "\07" ">NUMBER" "\3e\00\00\00")
+  (elem (i32.const 0x3e) $>NUMBER)
 
   ;; [6.1.0580](https://forth-standard.org/standard/core/toR)
   (func $>R (param $tos i32) (result i32)
     (local.tee $tos (i32.sub (local.get $tos) (i32.const 4)))
     (i32.store (global.get $tors) (i32.load (local.get $tos)))
     (global.set $tors (i32.add (global.get $tors) (i32.const 4))))
-  (data (i32.const 0x202f0) "\e0\02\02\00" "\02" ">R " "\3e\00\00\00")
-  (elem (i32.const 0x3e) $>R)
+  (data (i32.const 0x202fc) "\ec\02\02\00" "\02" ">R " "\3f\00\00\00")
+  (elem (i32.const 0x3f) $>R)
 
   ;; [6.1.0630](https://forth-standard.org/standard/core/qDUP)
   (func $?DUP (param $tos i32) (result i32)
@@ -756,8 +767,8 @@
         (i32.add (local.get $tos) (i32.const 4)))
       (else 
         (local.get $tos))))
-  (data (i32.const 0x202fc) "\f0\02\02\00" "\04" "?DUP   " "\3f\00\00\00")
-  (elem (i32.const 0x3f) $?DUP)
+  (data (i32.const 0x20308) "\fc\02\02\00" "\04" "?DUP   " "\40\00\00\00")
+  (elem (i32.const 0x40) $?DUP)
 
   ;; [6.1.0650](https://forth-standard.org/standard/core/Fetch)
   (func $@ (param $tos i32) (result i32)
@@ -765,26 +776,26 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
       (i32.load (i32.load (local.get $btos))))
     (local.get $tos))
-  (data (i32.const 0x2030c) "\fc\02\02\00" "\01" "@  " "\40\00\00\00")
-  (elem (i32.const 0x40) $@)
+  (data (i32.const 0x20318) "\08\03\02\00" "\01" "@  " "\41\00\00\00")
+  (elem (i32.const 0x41) $@)
 
   ;; [6.1.0670](https://forth-standard.org/standard/core/ABORT)
   (func $ABORT (param $tos i32) (result i32)
     (global.set $error (i32.const 0x3 (; = ERR_ABORT ;)))
     (call $quit (i32.const 0x10000 (; = STACK_BASE ;))))
-  (data (i32.const 0x20318) "\0c\03\02\00" "\05" "ABORT  " "\41\00\00\00")
-  (elem (i32.const 0x41) $ABORT)
+  (data (i32.const 0x20324) "\18\03\02\00" "\05" "ABORT  " "\42\00\00\00")
+  (elem (i32.const 0x42) $ABORT)
 
   ;; [6.1.0680](https://forth-standard.org/standard/core/ABORTq)
   (func $ABORTq (param $tos i32) (result i32)
     (local.get $tos)
     (call $compileIf)
     (call $Sq)
-    (call $emitICall (i32.const 0) (i32.const 0x9b (; = index("TYPE") ;)))
-    (call $emitICall (i32.const 0) (i32.const 0x41 (; = index("ABORT") ;)))
+    (call $emitICall (i32.const 0) (i32.const 0x9c (; = index("TYPE") ;)))
+    (call $emitICall (i32.const 0) (i32.const 0x42 (; = index("ABORT") ;)))
     (call $compileThen))
-  (data (i32.const 0x20328) "\18\03\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\42\00\00\00")
-  (elem (i32.const 0x42) $ABORTq)
+  (data (i32.const 0x20334) "\24\03\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\43\00\00\00")
+  (elem (i32.const 0x43) $ABORTq)
 
   ;; [6.1.0690](https://forth-standard.org/standard/core/ABS)
   (func $ABS (param $tos i32) (result i32)
@@ -796,8 +807,8 @@
                                   (local.tee $y (i32.shr_s (local.get $v) (i32.const 31))))
                         (local.get $y)))
     (local.get $tos))
-  (data (i32.const 0x20338) "\28\03\02\00" "\03" "ABS" "\43\00\00\00")
-  (elem (i32.const 0x43) $ABS)
+  (data (i32.const 0x20344) "\34\03\02\00" "\03" "ABS" "\44\00\00\00")
+  (elem (i32.const 0x44) $ABS)
 
   ;; [6.1.0695](https://forth-standard.org/standard/core/ACCEPT)
   (func $ACCEPT (param $tos i32) (result i32)
@@ -821,15 +832,15 @@
         (br_if $loop (i32.lt_u (local.get $p) (local.get $endp)))))
     (i32.store (local.get $bbtos)  (i32.sub (local.get $p) (local.get $addr)))
     (local.get $btos))
-  (data (i32.const 0x20344) "\38\03\02\00" "\06" "ACCEPT " "\44\00\00\00")
-  (elem (i32.const 0x44) $ACCEPT)
+  (data (i32.const 0x20350) "\44\03\02\00" "\06" "ACCEPT " "\45\00\00\00")
+  (elem (i32.const 0x45) $ACCEPT)
 
   ;; [6.1.0705](https://forth-standard.org/standard/core/ALIGN)
   (func $ALIGN (param $tos i32) (result i32)
     (global.set $here (call $aligned (global.get $here)))
     (local.get $tos))
-  (data (i32.const 0x20354) "\44\03\02\00" "\05" "ALIGN  " "\45\00\00\00")
-  (elem (i32.const 0x45) $ALIGN)
+  (data (i32.const 0x20360) "\50\03\02\00" "\05" "ALIGN  " "\46\00\00\00")
+  (elem (i32.const 0x46) $ALIGN)
 
   ;; [6.1.0706](https://forth-standard.org/standard/core/ALIGNED)
   (func $ALIGNED (param $tos i32) (result i32)
@@ -837,8 +848,8 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
       (call $aligned (i32.load (local.get $btos))))
     (local.get $tos))
-  (data (i32.const 0x20364) "\54\03\02\00" "\07" "ALIGNED" "\46\00\00\00")
-  (elem (i32.const 0x46) $ALIGNED)
+  (data (i32.const 0x20370) "\60\03\02\00" "\07" "ALIGNED" "\47\00\00\00")
+  (elem (i32.const 0x47) $ALIGNED)
 
   ;; [6.1.0710](https://forth-standard.org/standard/core/ALLOT)
   (func $ALLOT (param $tos i32) (result i32)
@@ -846,8 +857,8 @@
     (local.get $tos)
     (local.set $v (call $pop))
     (global.set $here (i32.add (global.get $here) (local.get $v))))
-  (data (i32.const 0x20374) "\64\03\02\00" "\05" "ALLOT  " "\47\00\00\00")
-  (elem (i32.const 0x47) $ALLOT)
+  (data (i32.const 0x20380) "\70\03\02\00" "\05" "ALLOT  " "\48\00\00\00")
+  (elem (i32.const 0x48) $ALLOT)
 
   ;; [6.1.0720](https://forth-standard.org/standard/core/AND)
   (func $AND (param $tos i32) (result i32)
@@ -857,25 +868,25 @@
                 (i32.and (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))
                         (i32.load (local.get $bbtos))))
     (local.get $btos))
-  (data (i32.const 0x20384) "\74\03\02\00" "\03" "AND" "\48\00\00\00")
-  (elem (i32.const 0x48) $AND)
+  (data (i32.const 0x20390) "\80\03\02\00" "\03" "AND" "\49\00\00\00")
+  (elem (i32.const 0x49) $AND)
 
   ;; [6.1.0750](https://forth-standard.org/standard/core/BASE)
-  (data (i32.const 0x20390) "\84\03\02\00" "\44" (; F_DATA ;) "BASE   " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\0a\00\00\00" (; = pack(10) ;))
+  (data (i32.const 0x2039c) "\90\03\02\00" "\44" (; F_DATA ;) "BASE   " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\0a\00\00\00" (; = pack(10) ;))
 
   ;; [6.1.0760](https://forth-standard.org/standard/core/BEGIN)
   (func $BEGIN (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileBegin))
-  (data (i32.const 0x203a4) "\90\03\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN  " "\49\00\00\00")
-  (elem (i32.const 0x49) $BEGIN)
+  (data (i32.const 0x203b0) "\9c\03\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN  " "\4a\00\00\00")
+  (elem (i32.const 0x4a) $BEGIN)
 
   ;; [6.1.0770](https://forth-standard.org/standard/core/BL)
   (func $BL (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 32)))
-  (data (i32.const 0x203b4) "\a4\03\02\00" "\02" "BL " "\4a\00\00\00")
-  (elem (i32.const 0x4a) $BL)
+  (data (i32.const 0x203c0) "\b0\03\02\00" "\02" "BL " "\4b\00\00\00")
+  (elem (i32.const 0x4b) $BL)
 
   ;; [6.1.0850](https://forth-standard.org/standard/core/CStore)
   (func $C! (param $tos i32) (result i32)
@@ -883,8 +894,8 @@
     (i32.store8 (i32.load (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))
     (local.get $bbtos))
-  (data (i32.const 0x203c0) "\b4\03\02\00" "\02" "C! " "\4b\00\00\00")
-  (elem (i32.const 0x4b) $C!)
+  (data (i32.const 0x203cc) "\c0\03\02\00" "\02" "C! " "\4c\00\00\00")
+  (elem (i32.const 0x4c) $C!)
 
   ;; [6.1.0860](https://forth-standard.org/standard/core/CComma)
   (func $Cc (param $tos i32) (result i32)
@@ -892,8 +903,8 @@
                 (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (global.set $here (i32.add (global.get $here) (i32.const 1)))
     (i32.sub (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x203cc) "\c0\03\02\00" "\02" "C, " "\4c\00\00\00")
-  (elem (i32.const 0x4c) $Cc)
+  (data (i32.const 0x203d8) "\cc\03\02\00" "\02" "C, " "\4d\00\00\00")
+  (elem (i32.const 0x4d) $Cc)
 
   ;; [6.2.0855](https://forth-standard.org/standard/core/Cq)
   (func $Cq (param $tos i32) (result i32)
@@ -911,8 +922,8 @@
     (call $compilePushConst (global.get $here))
     (global.set $here 
       (call $aligned (i32.add (i32.add (global.get $here) (i32.const 1)) (local.get $len)))))
-  (data (i32.const 0x203d8) "\cc\03\02\00" "\82" (; F_IMMEDIATE ;) "C\22 " "\4d\00\00\00")
-  (elem (i32.const 0x4d) $Cq)
+  (data (i32.const 0x203e4) "\d8\03\02\00" "\82" (; F_IMMEDIATE ;) "C\22 " "\4e\00\00\00")
+  (elem (i32.const 0x4e) $Cq)
 
   ;; [6.1.0870](https://forth-standard.org/standard/core/CFetch)
   (func $C@ (param $tos i32) (result i32)
@@ -920,8 +931,8 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.load8_u (i32.load (local.get $btos))))
     (local.get $tos))
-  (data (i32.const 0x203e4) "\d8\03\02\00" "\02" "C@ " "\4e\00\00\00")
-  (elem (i32.const 0x4e) $C@)
+  (data (i32.const 0x203f0) "\e4\03\02\00" "\02" "C@ " "\4f\00\00\00")
+  (elem (i32.const 0x4f) $C@)
 
   ;; [6.1.0880](https://forth-standard.org/standard/core/CELLPlus)
   (func $CELL+ (param $tos i32) (result i32)
@@ -929,8 +940,8 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.add (i32.load (local.get $btos)) (i32.const 4)))
     (local.get $tos))
-  (data (i32.const 0x203f0) "\e4\03\02\00" "\05" "CELL+  " "\4f\00\00\00")
-  (elem (i32.const 0x4f) $CELL+)
+  (data (i32.const 0x203fc) "\f0\03\02\00" "\05" "CELL+  " "\50\00\00\00")
+  (elem (i32.const 0x50) $CELL+)
 
   ;; [6.1.0890](https://forth-standard.org/standard/core/CELLS)
   (func $CELLS (param $tos i32) (result i32)
@@ -938,8 +949,8 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.shl (i32.load (local.get $btos)) (i32.const 2)))            
     (local.get $tos))
-  (data (i32.const 0x20400) "\f0\03\02\00" "\05" "CELLS  " "\50\00\00\00")
-  (elem (i32.const 0x50) $CELLS)
+  (data (i32.const 0x2040c) "\fc\03\02\00" "\05" "CELLS  " "\51\00\00\00")
+  (elem (i32.const 0x51) $CELLS)
 
   ;; [6.1.0895](https://forth-standard.org/standard/core/CHAR)
   (func $CHAR (param $tos i32) (result i32)
@@ -951,20 +962,20 @@
         (call $fail (i32.const 0x2001d (; = str("incomplete input") ;)))))
     (i32.store (local.get $tos) (i32.load8_u (local.get $addr)))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20410) "\00\04\02\00" "\04" "CHAR   " "\51\00\00\00")
-  (elem (i32.const 0x51) $CHAR)
+  (data (i32.const 0x2041c) "\0c\04\02\00" "\04" "CHAR   " "\52\00\00\00")
+  (elem (i32.const 0x52) $CHAR)
 
   ;; [6.1.0897](https://forth-standard.org/standard/core/CHARPlus)
   (func $CHAR+ (param $tos i32) (result i32)
     (call $1+ (local.get $tos)))
-  (data (i32.const 0x20420) "\10\04\02\00" "\05" "CHAR+  " "\52\00\00\00")
-  (elem (i32.const 0x52) $CHAR+)
+  (data (i32.const 0x2042c) "\1c\04\02\00" "\05" "CHAR+  " "\53\00\00\00")
+  (elem (i32.const 0x53) $CHAR+)
 
   ;; [6.1.0898](https://forth-standard.org/standard/core/CHARS)
   (func $CHARS (param $tos i32) (result i32)
     (local.get $tos))
-  (data (i32.const 0x20430) "\20\04\02\00" "\05" "CHARS  " "\53\00\00\00")
-  (elem (i32.const 0x53) $CHARS)
+  (data (i32.const 0x2043c) "\2c\04\02\00" "\05" "CHARS  " "\54\00\00\00")
+  (elem (i32.const 0x54) $CHARS)
 
   ;; [6.1.0950](https://forth-standard.org/standard/core/CONSTANT)
   (func $CONSTANT (param $tos i32) (result i32)
@@ -975,8 +986,8 @@
     (local.set $v (call $pop))
     (i32.store (global.get $here) (local.get $v))
     (global.set $here (i32.add (global.get $here) (i32.const 4))))
-  (data (i32.const 0x20440) "\30\04\02\00" "\08" "CONSTANT   " "\54\00\00\00")
-  (elem (i32.const 0x54) $CONSTANT)
+  (data (i32.const 0x2044c) "\3c\04\02\00" "\08" "CONSTANT   " "\55\00\00\00")
+  (elem (i32.const 0x55) $CONSTANT)
 
   ;; [6.1.0980](https://forth-standard.org/standard/core/COUNT)
   (func $COUNT (param $tos i32) (result i32)
@@ -987,14 +998,14 @@
                                                                                 (i32.const 4)))))))
     (i32.store (local.get $btos) (i32.add (local.get $addr) (i32.const 1)))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20454) "\40\04\02\00" "\05" "COUNT  " "\55\00\00\00")
-  (elem (i32.const 0x55) $COUNT)
+  (data (i32.const 0x20460) "\4c\04\02\00" "\05" "COUNT  " "\56\00\00\00")
+  (elem (i32.const 0x56) $COUNT)
 
   ;; [6.1.0990](https://forth-standard.org/standard/core/CR)
   (func $CR (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 10)) (call $EMIT))
-  (data (i32.const 0x20464) "\54\04\02\00" "\02" "CR " "\56\00\00\00")
-  (elem (i32.const 0x56) $CR)
+  (data (i32.const 0x20470) "\60\04\02\00" "\02" "CR " "\57\00\00\00")
+  (elem (i32.const 0x57) $CR)
 
   ;; [6.1.1000](https://forth-standard.org/standard/core/CREATE)
   (func $CREATE (param $tos i32) (result i32)
@@ -1020,31 +1031,31 @@
     (i32.store (global.get $here) (i32.const 0))
     (call $setFlag (i32.const 0x40 (; = F_DATA ;)))
     (local.get $tos))
-  (data (i32.const 0x20470) "\64\04\02\00" "\06" "CREATE " "\57\00\00\00")
-  (elem (i32.const 0x57) $CREATE)
+  (data (i32.const 0x2047c) "\70\04\02\00" "\06" "CREATE " "\58\00\00\00")
+  (elem (i32.const 0x58) $CREATE)
 
   ;; [6.1.1170](https://forth-standard.org/standard/core/DECIMAL)
   (func $DECIMAL (param $tos i32) (result i32)
-    (i32.store (i32.const 0x203a0 (; = body(BASE) ;)) (i32.const 10))
+    (i32.store (i32.const 0x203ac (; = body(BASE) ;)) (i32.const 10))
     (local.get $tos))
-  (data (i32.const 0x20480) "\70\04\02\00" "\07" "DECIMAL" "\58\00\00\00")
-  (elem (i32.const 0x58) $DECIMAL)
+  (data (i32.const 0x2048c) "\7c\04\02\00" "\07" "DECIMAL" "\59\00\00\00")
+  (elem (i32.const 0x59) $DECIMAL)
 
   ;; [6.1.1200](https://forth-standard.org/standard/core/DEPTH)
   (func $DEPTH (param $tos i32) (result i32)
     (i32.store (local.get $tos)
               (i32.shr_u (i32.sub (local.get $tos) (i32.const 0x10000 (; = STACK_BASE ;))) (i32.const 2)))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20490) "\80\04\02\00" "\05" "DEPTH  " "\59\00\00\00")
-  (elem (i32.const 0x59) $DEPTH)
+  (data (i32.const 0x2049c) "\8c\04\02\00" "\05" "DEPTH  " "\5a\00\00\00")
+  (elem (i32.const 0x5a) $DEPTH)
 
   ;; [6.1.1240](https://forth-standard.org/standard/core/DO)
   (func $DO (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileDo (i32.const 0)))
-  (data (i32.const 0x204a0) "\90\04\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\5a\00\00\00")
-  (elem (i32.const 0x5a) $DO)
+  (data (i32.const 0x204ac) "\9c\04\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\5b\00\00\00")
+  (elem (i32.const 0x5b) $DO)
 
   ;; [6.1.1250](https://forth-standard.org/standard/core/DOES)
   (func $DOES> (param $tos i32) (result i32)
@@ -1055,37 +1066,37 @@
     (call $endColon)
     (call $startColon (i32.const 1))
     (call $compilePushLocal (i32.const 1)))
-  (data (i32.const 0x204ac) "\a0\04\02\00" "\85" (; F_IMMEDIATE ;) "DOES>  " "\5b\00\00\00")
-  (elem (i32.const 0x5b) $DOES>)
+  (data (i32.const 0x204b8) "\ac\04\02\00" "\85" (; F_IMMEDIATE ;) "DOES>  " "\5c\00\00\00")
+  (elem (i32.const 0x5c) $DOES>)
 
   ;; [6.1.1260](https://forth-standard.org/standard/core/DROP)
   (func $DROP (param $tos i32) (result i32)
     (i32.sub (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x204bc) "\ac\04\02\00" "\04" "DROP   " "\5c\00\00\00")
-  (elem (i32.const 0x5c) $DROP)
+  (data (i32.const 0x204c8) "\b8\04\02\00" "\04" "DROP   " "\5d\00\00\00")
+  (elem (i32.const 0x5d) $DROP)
 
   ;; [6.1.1290](https://forth-standard.org/standard/core/DUP)
   (func $DUP (param $tos i32) (result i32)
     (i32.store (local.get $tos)
       (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x204cc) "\bc\04\02\00" "\03" "DUP" "\5d\00\00\00")
-  (elem (i32.const 0x5d) $DUP)
+  (data (i32.const 0x204d8) "\c8\04\02\00" "\03" "DUP" "\5e\00\00\00")
+  (elem (i32.const 0x5e) $DUP)
 
   ;; [6.1.1310](https://forth-standard.org/standard/core/ELSE)
   (func $ELSE (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitElse))
-  (data (i32.const 0x204d8) "\cc\04\02\00" "\84" (; F_IMMEDIATE ;) "ELSE   " "\5e\00\00\00")
-  (elem (i32.const 0x5e) $ELSE)
+  (data (i32.const 0x204e4) "\d8\04\02\00" "\84" (; F_IMMEDIATE ;) "ELSE   " "\5f\00\00\00")
+  (elem (i32.const 0x5f) $ELSE)
 
   ;; [6.1.1320](https://forth-standard.org/standard/core/EMIT)
   (func $EMIT (param $tos i32) (result i32)
     (call $shell_emit (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (i32.sub (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x204e8) "\d8\04\02\00" "\04" "EMIT   " "\5f\00\00\00")
-  (elem (i32.const 0x5f) $EMIT)
+  (data (i32.const 0x204f4) "\e4\04\02\00" "\04" "EMIT   " "\60\00\00\00")
+  (elem (i32.const 0x60) $EMIT)
 
   ;; [6.1.1345](https://forth-standard.org/standard/core/ENVIRONMENTq)
   (func $ENVIRONMENT? (param $tos i32) (result i32)
@@ -1109,8 +1120,8 @@
           (else
             (i32.store (local.get $bbtos) (i32.const 0))
             (local.get $btos))))))
-  (data (i32.const 0x204f8) "\e8\04\02\00" "\0c" "ENVIRONMENT?   " "\60\00\00\00")
-  (elem (i32.const 0x60) $ENVIRONMENT?)
+  (data (i32.const 0x20504) "\f4\04\02\00" "\0c" "ENVIRONMENT?   " "\61\00\00\00")
+  (elem (i32.const 0x61) $ENVIRONMENT?)
 
   ;; [6.2.1350](https://forth-standard.org/standard/core/ERASE)
   (func $ERASE (param $tos i32) (result i32)
@@ -1120,8 +1131,8 @@
       (i32.const 0)
       (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (local.get $bbtos))
-  (data (i32.const 0x20510) "\f8\04\02\00" "\05" "ERASE  " "\61\00\00\00")
-  (elem (i32.const 0x61) $ERASE)
+  (data (i32.const 0x2051c) "\04\05\02\00" "\05" "ERASE  " "\62\00\00\00")
+  (elem (i32.const 0x62) $ERASE)
 
   ;; [6.1.1360](https://forth-standard.org/standard/core/EVALUATE)
   (func $EVALUATE (param $tos i32) (result i32)
@@ -1133,44 +1144,44 @@
 
     ;; Save input state
     (local.set $prevSourceID (global.get $sourceID))
-    (local.set $prevIn (i32.load (i32.const 0x202dc (; = body(>IN) ;))))
+    (local.set $prevIn (i32.load (i32.const 0x202e8 (; = body(>IN) ;))))
     (local.set $prevInputBufferSize (global.get $inputBufferSize))
     (local.set $prevInputBufferBase (global.get $inputBufferBase))
 
     (global.set $sourceID (i32.const -1))
     (global.set $inputBufferBase (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))
     (global.set $inputBufferSize (i32.load (i32.sub (local.get $tos) (i32.const 4))))
-    (i32.store (i32.const 0x202dc (; = body(>IN) ;)) (i32.const 0))
+    (i32.store (i32.const 0x202e8 (; = body(>IN) ;)) (i32.const 0))
 
     (call $interpret (local.get $bbtos))
 
     ;; Restore input state
     (global.set $sourceID (local.get $prevSourceID))
-    (i32.store (i32.const 0x202dc (; = body(>IN) ;)) (local.get $prevIn))
+    (i32.store (i32.const 0x202e8 (; = body(>IN) ;)) (local.get $prevIn))
     (global.set $inputBufferBase (local.get $prevInputBufferBase))
     (global.set $inputBufferSize (local.get $prevInputBufferSize)))
-  (data (i32.const 0x20520) "\10\05\02\00" "\08" "EVALUATE   " "\62\00\00\00")
-  (elem (i32.const 0x62) $EVALUATE)
+  (data (i32.const 0x2052c) "\1c\05\02\00" "\08" "EVALUATE   " "\63\00\00\00")
+  (elem (i32.const 0x63) $EVALUATE)
 
   ;; [6.1.1370](https://forth-standard.org/standard/core/EXECUTE)
   (func $EXECUTE (param $tos i32) (result i32)
     (call $execute (call $pop (local.get $tos))))
-  (data (i32.const 0x20534) "\20\05\02\00" "\07" "EXECUTE" "\63\00\00\00")
-  (elem (i32.const 0x63) $EXECUTE)
+  (data (i32.const 0x20540) "\2c\05\02\00" "\07" "EXECUTE" "\64\00\00\00")
+  (elem (i32.const 0x64) $EXECUTE)
     
   ;; [6.1.1380](https://forth-standard.org/standard/core/EXIT)
   (func $EXIT (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitReturn))
-  (data (i32.const 0x20544) "\34\05\02\00" "\84" (; F_IMMEDIATE ;) "EXIT   " "\64\00\00\00")
-  (elem (i32.const 0x64) $EXIT)
+  (data (i32.const 0x20550) "\40\05\02\00" "\84" (; F_IMMEDIATE ;) "EXIT   " "\65\00\00\00")
+  (elem (i32.const 0x65) $EXIT)
 
   ;; [6.2.1485](https://forth-standard.org/standard/core/FALSE)
   (func $FALSE (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 0x0)))
-  (data (i32.const 0x20554) "\44\05\02\00" "\05" "FALSE  " "\65\00\00\00")
-  (elem (i32.const 0x65) $FALSE)
+  (data (i32.const 0x20560) "\50\05\02\00" "\05" "FALSE  " "\66\00\00\00")
+  (elem (i32.const 0x66) $FALSE)
 
   ;; [6.1.1540](https://forth-standard.org/standard/core/FILL)
   (func $FILL (param $tos i32) (result i32)
@@ -1180,8 +1191,8 @@
       (i32.load (i32.sub (local.get $tos) (i32.const 4)))
       (i32.load (i32.sub (local.get $tos) (i32.const 8))))
     (local.get $bbbtos))
-  (data (i32.const 0x20564) "\54\05\02\00" "\04" "FILL   " "\66\00\00\00")
-  (elem (i32.const 0x66) $FILL)
+  (data (i32.const 0x20570) "\60\05\02\00" "\04" "FILL   " "\67\00\00\00")
+  (elem (i32.const 0x67) $FILL)
 
   ;; [6.1.1550](https://forth-standard.org/standard/core/FIND)
   (func $FIND (param $tos i32) (result i32)
@@ -1197,8 +1208,8 @@
       (else (i32.store (i32.sub (local.get $tos) (i32.const 4)) (local.get $xt))))
     (i32.store (local.get $tos) (local.get $r))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20574) "\64\05\02\00" "\04" "FIND   " "\67\00\00\00")
-  (elem (i32.const 0x67) $FIND)
+  (data (i32.const 0x20580) "\70\05\02\00" "\04" "FIND   " "\68\00\00\00")
+  (elem (i32.const 0x68) $FIND)
 
   ;; [6.1.1561](https://forth-standard.org/standard/core/FMDivMOD)
   (func $FM/MOD (param $tos i32) (result i32)
@@ -1225,22 +1236,22 @@
     (i32.store (local.get $bbbtos) (local.get $mod))
     (i32.store (i32.sub (local.get $tos) (i32.const 8)) (local.get $q))
     (local.get $btos))
-  (data (i32.const 0x20584) "\74\05\02\00" "\06" "FM/MOD " "\68\00\00\00")
-  (elem (i32.const 0x68) $FM/MOD)
+  (data (i32.const 0x20590) "\80\05\02\00" "\06" "FM/MOD " "\69\00\00\00")
+  (elem (i32.const 0x69) $FM/MOD)
 
   ;; [6.1.1650](https://forth-standard.org/standard/core/HERE)
   (func $HERE (param $tos i32) (result i32)
     (i32.store (local.get $tos) (global.get $here))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20594) "\84\05\02\00" "\04" "HERE   " "\69\00\00\00")
-  (elem (i32.const 0x69) $HERE)
+  (data (i32.const 0x205a0) "\90\05\02\00" "\04" "HERE   " "\6a\00\00\00")
+  (elem (i32.const 0x6a) $HERE)
 
   ;; [6.2.1660](https://forth-standard.org/standard/core/HEX)
   (func $HEX (param $tos i32) (result i32)
-    (i32.store (i32.const 0x203a0 (; = body(BASE) ;)) (i32.const 16))
+    (i32.store (i32.const 0x203ac (; = body(BASE) ;)) (i32.const 16))
     (local.get $tos))
-  (data (i32.const 0x205a4) "\94\05\02\00" "\03" "HEX" "\6a\00\00\00")
-  (elem (i32.const 0x6a) $HEX)
+  (data (i32.const 0x205b0) "\a0\05\02\00" "\03" "HEX" "\6b\00\00\00")
+  (elem (i32.const 0x6b) $HEX)
 
   ;; [6.1.1670](https://forth-standard.org/standard/core/HOLD)
   (func $HOLD (param $tos i32) (result i32)
@@ -1251,30 +1262,30 @@
       (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))
     (global.set $po (local.get $npo))
     (local.get $btos))
-  (data (i32.const 0x205b0) "\a4\05\02\00" "\04" "HOLD   " "\6b\00\00\00")
-  (elem (i32.const 0x6b) $HOLD)
+  (data (i32.const 0x205bc) "\b0\05\02\00" "\04" "HOLD   " "\6c\00\00\00")
+  (elem (i32.const 0x6c) $HOLD)
 
   ;; [6.1.1680](https://forth-standard.org/standard/core/I)
   (func $I (param $tos i32) (result i32)
     (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 4))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x205c0) "\b0\05\02\00" "\01" "I  " "\6c\00\00\00")
-  (elem (i32.const 0x6c) $I)
+  (data (i32.const 0x205cc) "\bc\05\02\00" "\01" "I  " "\6d\00\00\00")
+  (elem (i32.const 0x6d) $I)
 
   ;; [6.1.1700](https://forth-standard.org/standard/core/IF)
   (func $IF (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileIf))
-  (data (i32.const 0x205cc) "\c0\05\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\6d\00\00\00")
-  (elem (i32.const 0x6d) $IF)
+  (data (i32.const 0x205d8) "\cc\05\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\6e\00\00\00")
+  (elem (i32.const 0x6e) $IF)
 
   ;; [6.1.1710](https://forth-standard.org/standard/core/IMMEDIATE)
   (func $IMMEDIATE (param $tos i32) (result i32)
     (call $setFlag (i32.const 0x80 (; = F_IMMEDIATE ;)))
     (local.get $tos))
-  (data (i32.const 0x205d8) "\cc\05\02\00" "\09" "IMMEDIATE  " "\6e\00\00\00")
-  (elem (i32.const 0x6e) $IMMEDIATE)
+  (data (i32.const 0x205e4) "\d8\05\02\00" "\09" "IMMEDIATE  " "\6f\00\00\00")
+  (elem (i32.const 0x6f) $IMMEDIATE)
 
   ;; [6.1.1720](https://forth-standard.org/standard/core/INVERT)
   (func $INVERT (param $tos i32) (result i32)
@@ -1282,52 +1293,52 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.xor (i32.load (local.get $btos)) (i32.const -1)))
     (local.get $tos))
-  (data (i32.const 0x205ec) "\d8\05\02\00" "\06" "INVERT " "\6f\00\00\00")
-  (elem (i32.const 0x6f) $INVERT)
+  (data (i32.const 0x205f8) "\e4\05\02\00" "\06" "INVERT " "\70\00\00\00")
+  (elem (i32.const 0x70) $INVERT)
 
   ;; [6.1.1730](https://forth-standard.org/standard/core/J)
   (func $J (param $tos i32) (result i32)
     (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 8))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x205fc) "\ec\05\02\00" "\01" "J  " "\70\00\00\00")
-  (elem (i32.const 0x70) $J)
+  (data (i32.const 0x20608) "\f8\05\02\00" "\01" "J  " "\71\00\00\00")
+  (elem (i32.const 0x71) $J)
 
   ;; [6.1.1750](https://forth-standard.org/standard/core/KEY)
   (func $KEY (param $tos i32) (result i32)
     (i32.store (local.get $tos) (call $shell_key))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20608) "\fc\05\02\00" "\03" "KEY" "\71\00\00\00")
-  (elem (i32.const 0x71) $KEY)
+  (data (i32.const 0x20614) "\08\06\02\00" "\03" "KEY" "\72\00\00\00")
+  (elem (i32.const 0x72) $KEY)
 
   (func $LATEST (param $tos i32) (result i32)
     (i32.store (local.get $tos) (global.get $latest))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20614) "\08\06\02\00" "\06" "LATEST " "\72\00\00\00")
-  (elem (i32.const 0x72) $LATEST)
+  (data (i32.const 0x20620) "\14\06\02\00" "\06" "LATEST " "\73\00\00\00")
+  (elem (i32.const 0x73) $LATEST)
 
   ;; [6.1.1760](https://forth-standard.org/standard/core/LEAVE)
   (func $LEAVE (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileLeave))
-  (data (i32.const 0x20624) "\14\06\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE  " "\73\00\00\00")
-  (elem (i32.const 0x73) $LEAVE)
+  (data (i32.const 0x20630) "\20\06\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE  " "\74\00\00\00")
+  (elem (i32.const 0x74) $LEAVE)
 
   ;; [6.1.1780](https://forth-standard.org/standard/core/LITERAL)
   (func $LITERAL (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x20634) "\24\06\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\74\00\00\00")
-  (elem (i32.const 0x74) $LITERAL)
+  (data (i32.const 0x20640) "\30\06\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\75\00\00\00")
+  (elem (i32.const 0x75) $LITERAL)
 
   ;; [6.1.1800](https://forth-standard.org/standard/core/LOOP)
   (func $LOOP (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileLoop))
-  (data (i32.const 0x20644) "\34\06\02\00" "\84" (; F_IMMEDIATE ;) "LOOP   " "\75\00\00\00")
-  (elem (i32.const 0x75) $LOOP)
+  (data (i32.const 0x20650) "\40\06\02\00" "\84" (; F_IMMEDIATE ;) "LOOP   " "\76\00\00\00")
+  (elem (i32.const 0x76) $LOOP)
 
   ;; [6.1.1805](https://forth-standard.org/standard/core/LSHIFT)
   (func $LSHIFT (param $tos i32) (result i32)
@@ -1337,8 +1348,8 @@
                 (i32.shl (i32.load (local.get $bbtos))
                         (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))))
     (local.get $btos))
-  (data (i32.const 0x20654) "\44\06\02\00" "\06" "LSHIFT " "\76\00\00\00")
-  (elem (i32.const 0x76) $LSHIFT)
+  (data (i32.const 0x20660) "\50\06\02\00" "\06" "LSHIFT " "\77\00\00\00")
+  (elem (i32.const 0x77) $LSHIFT)
 
   ;; [6.1.1810](https://forth-standard.org/standard/core/MTimes)
   (func $M* (param $tos i32) (result i32)
@@ -1348,8 +1359,8 @@
                         (i64.extend_i32_s (i32.load (i32.sub (local.get $tos) 
                                                               (i32.const 4))))))
     (local.get $tos))
-  (data (i32.const 0x20664) "\54\06\02\00" "\02" "M* " "\77\00\00\00")
-  (elem (i32.const 0x77) $M*)
+  (data (i32.const 0x20670) "\60\06\02\00" "\02" "M* " "\78\00\00\00")
+  (elem (i32.const 0x78) $M*)
 
   ;; [6.1.1870](https://forth-standard.org/standard/core/MAX)
   (func $MAX (param $tos i32) (result i32)
@@ -1362,8 +1373,8 @@
       (then
         (i32.store (local.get $bbtos) (local.get $v))))
     (local.get $btos))
-  (data (i32.const 0x20670) "\64\06\02\00" "\03" "MAX" "\78\00\00\00")
-  (elem (i32.const 0x78) $MAX)
+  (data (i32.const 0x2067c) "\70\06\02\00" "\03" "MAX" "\79\00\00\00")
+  (elem (i32.const 0x79) $MAX)
 
   ;; [6.1.1880](https://forth-standard.org/standard/core/MIN)
   (func $MIN (param $tos i32) (result i32)
@@ -1376,8 +1387,8 @@
       (then
         (i32.store (local.get $bbtos) (local.get $v))))
     (local.get $btos))
-  (data (i32.const 0x2067c) "\70\06\02\00" "\03" "MIN" "\79\00\00\00")
-  (elem (i32.const 0x79) $MIN)
+  (data (i32.const 0x20688) "\7c\06\02\00" "\03" "MIN" "\7a\00\00\00")
+  (elem (i32.const 0x7a) $MIN)
 
   ;; [6.1.1890](https://forth-standard.org/standard/core/MOD)
   (func $MOD (param $tos i32) (result i32)
@@ -1387,8 +1398,8 @@
                 (i32.rem_s (i32.load (local.get $bbtos))
                           (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))))
     (local.get $btos))
-  (data (i32.const 0x20688) "\7c\06\02\00" "\03" "MOD" "\7a\00\00\00")
-  (elem (i32.const 0x7a) $MOD)
+  (data (i32.const 0x20694) "\88\06\02\00" "\03" "MOD" "\7b\00\00\00")
+  (elem (i32.const 0x7b) $MOD)
 
   ;; [6.1.1900](https://forth-standard.org/standard/core/MOVE)
   (func $MOVE (param $tos i32) (result i32)
@@ -1398,8 +1409,8 @@
       (i32.load (local.tee $bbbtos (i32.sub (local.get $tos) (i32.const 12))))
       (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (local.get $bbbtos))
-  (data (i32.const 0x20694) "\88\06\02\00" "\04" "MOVE   " "\7b\00\00\00")
-  (elem (i32.const 0x7b) $MOVE)
+  (data (i32.const 0x206a0) "\94\06\02\00" "\04" "MOVE   " "\7c\00\00\00")
+  (elem (i32.const 0x7c) $MOVE)
 
   ;; [6.1.1910](https://forth-standard.org/standard/core/NEGATE)
   (func $NEGATE (param $tos i32) (result i32)
@@ -1407,15 +1418,15 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.sub (i32.const 0) (i32.load (local.get $btos))))
     (local.get $tos))
-  (data (i32.const 0x206a4) "\94\06\02\00" "\06" "NEGATE " "\7c\00\00\00")
-  (elem (i32.const 0x7c) $NEGATE)
+  (data (i32.const 0x206b0) "\a0\06\02\00" "\06" "NEGATE " "\7d\00\00\00")
+  (elem (i32.const 0x7d) $NEGATE)
 
   ;; [6.2.1930](https://forth-standard.org/standard/core/NIP)
   (func $NIP (param $tos i32) (result i32)
     (local.get $tos)
     (call $SWAP) (call $DROP))
-  (data (i32.const 0x206b4) "\a4\06\02\00" "\03" "NIP" "\7d\00\00\00")
-  (elem (i32.const 0x7d) $NIP)
+  (data (i32.const 0x206c0) "\b0\06\02\00" "\03" "NIP" "\7e\00\00\00")
+  (elem (i32.const 0x7e) $NIP)
 
   ;; [6.1.1980](https://forth-standard.org/standard/core/OR)
   (func $OR (param $tos i32) (result i32)
@@ -1425,23 +1436,23 @@
                 (i32.or (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))
                         (i32.load (local.get $bbtos))))
     (local.get $btos))
-  (data (i32.const 0x206c0) "\b4\06\02\00" "\02" "OR " "\7e\00\00\00")
-  (elem (i32.const 0x7e) $OR)
+  (data (i32.const 0x206cc) "\c0\06\02\00" "\02" "OR " "\7f\00\00\00")
+  (elem (i32.const 0x7f) $OR)
 
   ;; [6.1.1990](https://forth-standard.org/standard/core/OVER)
   (func $OVER (param $tos i32) (result i32)
     (i32.store (local.get $tos)
                 (i32.load (i32.sub (local.get $tos) (i32.const 8))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x206cc) "\c0\06\02\00" "\04" "OVER   " "\7f\00\00\00")
-  (elem (i32.const 0x7f) $OVER)
+  (data (i32.const 0x206d8) "\cc\06\02\00" "\04" "OVER   " "\80\00\00\00")
+  (elem (i32.const 0x80) $OVER)
 
   ;; [6.2.2000](https://forth-standard.org/standard/core/PAD)
   (func $PAD (param $tos i32) (result i32)
     (i32.store (local.get $tos) (i32.add (global.get $here) (i32.const 0x304 (; = PAD_OFFSET ;))))
     (i32.add (local.get $tos) (i32.const 0x4)))
-  (data (i32.const 0x206dc) "\cc\06\02\00" "\03" "PAD" "\80\00\00\00")
-  (elem (i32.const 0x80) $PAD)
+  (data (i32.const 0x206e8) "\d8\06\02\00" "\03" "PAD" "\81\00\00\00")
+  (elem (i32.const 0x81) $PAD)
 
   ;; [6.2.2008](https://forth-standard.org/standard/core/PARSE)
   (func $PARSE (param $tos i32) (result i32)
@@ -1454,8 +1465,8 @@
     (i32.store (local.get $btos) (local.get $addr))
     (i32.store (local.get $tos) (local.get $len))
     (i32.add (local.get $tos) (i32.const 0x4)))
-  (data (i32.const 0x206e8) "\dc\06\02\00" "\05" "PARSE  " "\81\00\00\00")
-  (elem (i32.const 0x81) $PARSE)
+  (data (i32.const 0x206f4) "\e8\06\02\00" "\05" "PARSE  " "\82\00\00\00")
+  (elem (i32.const 0x82) $PARSE)
 
   ;; [6.2.2020](https://forth-standard.org/standard/core/PARSE-NAME)
   (func $PARSE-NAME (param $tos i32) (result i32)
@@ -1465,8 +1476,8 @@
     (i32.store (local.get $tos) (local.get $addr))
     (i32.store (i32.add (local.get $tos) (i32.const 0x4)) (local.get $len))
     (i32.add (local.get $tos) (i32.const 0x8)))
-  (data (i32.const 0x206f8) "\e8\06\02\00" "\0a" "PARSE-NAME " "\82\00\00\00")
-  (elem (i32.const 0x82) $PARSE-NAME)
+  (data (i32.const 0x20704) "\f4\06\02\00" "\0a" "PARSE-NAME " "\83\00\00\00")
+  (elem (i32.const 0x83) $PARSE-NAME)
 
   ;; [6.2.2030](https://forth-standard.org/standard/core/PICK)
   (func $PICK (param $tos i32) (result i32)
@@ -1477,8 +1488,8 @@
           (local.get $tos) 
           (i32.shl (i32.add (i32.load (local.get $btos)) (i32.const 2)) (i32.const 2)))))
     (local.get $tos))
-  (data (i32.const 0x2070c) "\f8\06\02\00" "\04" "PICK   " "\83\00\00\00")
-  (elem (i32.const 0x83) $PICK)
+  (data (i32.const 0x20718) "\04\07\02\00" "\04" "PICK   " "\84\00\00\00")
+  (elem (i32.const 0x84) $PICK)
 
   ;; [6.1.2033](https://forth-standard.org/standard/core/POSTPONE)
   (func $POSTPONE (param $tos i32) (result i32)
@@ -1493,44 +1504,44 @@
       (else
         (call $emitConst (local.get $FINDToken))
         (call $emitICall (i32.const 1) (i32.const 0x5 (; = COMPILE_CALL_INDEX ;))))))
-  (data (i32.const 0x2071c) "\0c\07\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE   " "\84\00\00\00")
-  (elem (i32.const 0x84) $POSTPONE)
+  (data (i32.const 0x20728) "\18\07\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE   " "\85\00\00\00")
+  (elem (i32.const 0x85) $POSTPONE)
 
   ;; [6.1.2050](https://forth-standard.org/standard/core/QUIT)
   (func $QUIT (param $tos i32) (result i32)
     (global.set $error (i32.const 0x2 (; = ERR_QUIT ;)))
     (call $quit (local.get $tos)))
-  (data (i32.const 0x20730) "\1c\07\02\00" "\04" "QUIT   " "\85\00\00\00")
-  (elem (i32.const 0x85) $QUIT)
+  (data (i32.const 0x2073c) "\28\07\02\00" "\04" "QUIT   " "\86\00\00\00")
+  (elem (i32.const 0x86) $QUIT)
 
   ;; [6.1.2060](https://forth-standard.org/standard/core/Rfrom)
   (func $R> (param $tos i32) (result i32)
     (global.set $tors (i32.sub (global.get $tors) (i32.const 4)))
     (i32.store (local.get $tos) (i32.load (global.get $tors)))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x20740) "\30\07\02\00" "\02" "R> " "\86\00\00\00")
-  (elem (i32.const 0x86) $R>)
+  (data (i32.const 0x2074c) "\3c\07\02\00" "\02" "R> " "\87\00\00\00")
+  (elem (i32.const 0x87) $R>)
 
   ;; [6.1.2070](https://forth-standard.org/standard/core/RFetch)
   (func $R@ (param $tos i32) (result i32)
     (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 4))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x2074c) "\40\07\02\00" "\02" "R@ " "\87\00\00\00")
-  (elem (i32.const 0x87) $R@)
+  (data (i32.const 0x20758) "\4c\07\02\00" "\02" "R@ " "\88\00\00\00")
+  (elem (i32.const 0x88) $R@)
 
   ;; [6.1.2120](https://forth-standard.org/standard/core/RECURSE)
   (func $RECURSE  (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileRecurse))
-  (data (i32.const 0x20758) "\4c\07\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\88\00\00\00")
-  (elem (i32.const 0x88) $RECURSE)
+  (data (i32.const 0x20764) "\58\07\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\89\00\00\00")
+  (elem (i32.const 0x89) $RECURSE)
 
   ;; [6.2.2125](https://forth-standard.org/standard/core/REFILL)
   (func $REFILL (param $tos i32) (result i32)
     (local $char i32)
     (global.set $inputBufferSize (i32.const 0))
-    (i32.store (i32.const 0x202dc (; = body(>IN) ;)) (i32.const 0))
+    (i32.store (i32.const 0x202e8 (; = body(>IN) ;)) (i32.const 0))
     (local.get $tos)
     (if (param i32) (result i32) (i32.eq (global.get $sourceID) (i32.const -1))
       (then
@@ -1543,16 +1554,16 @@
     (if (param i32) (result i32) (i32.eqz (global.get $inputBufferSize))
       (then (call $push (i32.const 0)))
       (else (call $push (i32.const -1)))))
-  (data (i32.const 0x20768) "\58\07\02\00" "\06" "REFILL " "\89\00\00\00")
-  (elem (i32.const 0x89) $REFILL)
+  (data (i32.const 0x20774) "\64\07\02\00" "\06" "REFILL " "\8a\00\00\00")
+  (elem (i32.const 0x8a) $REFILL)
 
   ;; [6.1.2140](https://forth-standard.org/standard/core/REPEAT)
   (func $REPEAT (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileRepeat))
-  (data (i32.const 0x20778) "\68\07\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\8a\00\00\00")
-  (elem (i32.const 0x8a) $REPEAT)
+  (data (i32.const 0x20784) "\74\07\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\8b\00\00\00")
+  (elem (i32.const 0x8b) $REPEAT)
 
   ;; [6.1.2160](https://forth-standard.org/standard/core/ROT)
   (func $ROT (param $tos i32) (result i32)
@@ -1567,8 +1578,8 @@
       (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))
     (i32.store (local.get $bbtos) (local.get $tmp))
     (local.get $tos))
-  (data (i32.const 0x20788) "\78\07\02\00" "\03" "ROT" "\8b\00\00\00")
-  (elem (i32.const 0x8b) $ROT)
+  (data (i32.const 0x20794) "\84\07\02\00" "\03" "ROT" "\8c\00\00\00")
+  (elem (i32.const 0x8c) $ROT)
 
   ;; [6.1.2162](https://forth-standard.org/standard/core/RSHIFT)
   (func $RSHIFT (param $tos i32) (result i32)
@@ -1578,8 +1589,8 @@
                 (i32.shr_u (i32.load (local.get $bbtos))
                           (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))))
     (local.get $btos))
-  (data (i32.const 0x20794) "\88\07\02\00" "\06" "RSHIFT " "\8c\00\00\00")
-  (elem (i32.const 0x8c) $RSHIFT)
+  (data (i32.const 0x207a0) "\94\07\02\00" "\06" "RSHIFT " "\8d\00\00\00")
+  (elem (i32.const 0x8d) $RSHIFT)
 
   ;; [6.1.2165](https://forth-standard.org/standard/core/Sq)
   (func $Sq (param $tos i32) (result i32)
@@ -1594,8 +1605,8 @@
     (call $compilePushConst (local.get $len))
     (global.set $here 
       (call $aligned (i32.add (global.get $here) (local.get $len)))))
-  (data (i32.const 0x207a4) "\94\07\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\8d\00\00\00")
-  (elem (i32.const 0x8d) $Sq)
+  (data (i32.const 0x207b0) "\a0\07\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\8e\00\00\00")
+  (elem (i32.const 0x8e) $Sq)
 
   ;; [6.1.2170](https://forth-standard.org/standard/core/StoD)
   (func $S>D (param $tos i32) (result i32)
@@ -1603,15 +1614,15 @@
     (i64.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
       (i64.extend_i32_s (i32.load (local.get $btos))))
     (i32.add (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x207b0) "\a4\07\02\00" "\03" "S>D" "\8e\00\00\00")
-  (elem (i32.const 0x8e) $S>D)
+  (data (i32.const 0x207bc) "\b0\07\02\00" "\03" "S>D" "\8f\00\00\00")
+  (elem (i32.const 0x8f) $S>D)
 
   (func $SCALL (param $tos i32) (result i32)
     (global.set $tos (local.get $tos))
     (call $shell_call)
     (global.get $tos))
-  (data (i32.const 0x207bc) "\b0\07\02\00" "\05" "SCALL  " "\8f\00\00\00")
-  (elem (i32.const 0x8f) $SCALL)
+  (data (i32.const 0x207c8) "\bc\07\02\00" "\05" "SCALL  " "\90\00\00\00")
+  (elem (i32.const 0x90) $SCALL)
 
   ;; [6.1.2210](https://forth-standard.org/standard/core/SIGN)
   (func $SIGN (param $tos i32) (result i32)
@@ -1622,8 +1633,8 @@
         (i32.store8 (local.tee $npo (i32.sub (global.get $po) (i32.const 1))) (i32.const 0x2d (; = '-' ;)))
         (global.set $po (local.get $npo))))
     (local.get $btos))
-  (data (i32.const 0x207cc) "\bc\07\02\00" "\04" "SIGN   " "\90\00\00\00")
-  (elem (i32.const 0x90) $SIGN)
+  (data (i32.const 0x207d8) "\c8\07\02\00" "\04" "SIGN   " "\91\00\00\00")
+  (elem (i32.const 0x91) $SIGN)
 
   ;; [6.1.2214](https://forth-standard.org/standard/core/SMDivREM)
   ;;
@@ -1644,29 +1655,29 @@
       (i32.wrap_i64 
         (i64.div_s (local.get $n1) (local.get $n2))))
     (local.get $btos))
-  (data (i32.const 0x207dc) "\cc\07\02\00" "\06" "SM/REM " "\91\00\00\00")
-  (elem (i32.const 0x91) $SM/REM)
+  (data (i32.const 0x207e8) "\d8\07\02\00" "\06" "SM/REM " "\92\00\00\00")
+  (elem (i32.const 0x92) $SM/REM)
 
   ;; [6.1.2216](https://forth-standard.org/standard/core/SOURCE)
   (func $SOURCE (param $tos i32) (result i32)
     (local.get $tos)
     (call $push (global.get $inputBufferBase))
     (call $push (global.get $inputBufferSize)))
-  (data (i32.const 0x207ec) "\dc\07\02\00" "\06" "SOURCE " "\92\00\00\00")
-  (elem (i32.const 0x92) $SOURCE)
+  (data (i32.const 0x207f8) "\e8\07\02\00" "\06" "SOURCE " "\93\00\00\00")
+  (elem (i32.const 0x93) $SOURCE)
 
   ;; [6.2.2218](https://forth-standard.org/standard/core/SOURCE-ID)
   (func $SOURCE-ID (param $tos i32) (result i32)
     (call $push (local.get $tos) (global.get $sourceID)))
-  (data (i32.const 0x207fc) "\ec\07\02\00" "\09" "SOURCE-ID  " "\93\00\00\00")
-  (elem (i32.const 0x93) $SOURCE-ID)
+  (data (i32.const 0x20808) "\f8\07\02\00" "\09" "SOURCE-ID  " "\94\00\00\00")
+  (elem (i32.const 0x94) $SOURCE-ID)
 
   ;; [6.1.2220](https://forth-standard.org/standard/core/SPACE)
   (func $SPACE (param $tos i32) (result i32)
     (local.get $tos)
     (call $BL) (call $EMIT))
-  (data (i32.const 0x20810) "\fc\07\02\00" "\05" "SPACE  " "\94\00\00\00")
-  (elem (i32.const 0x94) $SPACE)
+  (data (i32.const 0x2081c) "\08\08\02\00" "\05" "SPACE  " "\95\00\00\00")
+  (elem (i32.const 0x95) $SPACE)
 
   ;; [6.1.2230](https://forth-standard.org/standard/core/SPACES)
   (func $SPACES (param $tos i32) (result i32)
@@ -1679,11 +1690,11 @@
         (call $SPACE)
         (local.set $i (i32.sub (local.get $i) (i32.const 1)))
         (br $loop))))
-  (data (i32.const 0x20820) "\10\08\02\00" "\06" "SPACES " "\95\00\00\00")
-  (elem (i32.const 0x95) $SPACES)
+  (data (i32.const 0x2082c) "\1c\08\02\00" "\06" "SPACES " "\96\00\00\00")
+  (elem (i32.const 0x96) $SPACES)
 
   ;; [6.1.2250](https://forth-standard.org/standard/core/STATE)
-  (data (i32.const 0x20830) "\20\08\02\00" "\45" (; F_DATA ;) "STATE  " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;))
+  (data (i32.const 0x2083c) "\2c\08\02\00" "\45" (; F_DATA ;) "STATE  " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;))
 
   ;; [6.1.2260](https://forth-standard.org/standard/core/SWAP)
   (func $SWAP (param $tos i32) (result i32)
@@ -1695,16 +1706,16 @@
                 (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))
     (i32.store (local.get $btos) (local.get $tmp))
     (local.get $tos))
-  (data (i32.const 0x20844) "\30\08\02\00" "\04" "SWAP   " "\96\00\00\00")
-  (elem (i32.const 0x96) $SWAP)
+  (data (i32.const 0x20850) "\3c\08\02\00" "\04" "SWAP   " "\97\00\00\00")
+  (elem (i32.const 0x97) $SWAP)
 
   ;; [6.1.2270](https://forth-standard.org/standard/core/THEN)
   (func $THEN (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileThen))
-  (data (i32.const 0x20854) "\44\08\02\00" "\84" (; F_IMMEDIATE ;) "THEN   " "\97\00\00\00")
-  (elem (i32.const 0x97) $THEN)
+  (data (i32.const 0x20860) "\50\08\02\00" "\84" (; F_IMMEDIATE ;) "THEN   " "\98\00\00\00")
+  (elem (i32.const 0x98) $THEN)
 
   ;; [6.2.2295](https://forth-standard.org/standard/core/TO)
   (func $TO (param $tos i32) (result i32)
@@ -1715,21 +1726,21 @@
     (i32.store (i32.add (call $body (local.get $xt)) (i32.const 4)) 
       (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))
     (local.get $btos))
-  (data (i32.const 0x20864) "\54\08\02\00" "\02" "TO " "\98\00\00\00")
-  (elem (i32.const 0x98) $TO)
+  (data (i32.const 0x20870) "\60\08\02\00" "\02" "TO " "\99\00\00\00")
+  (elem (i32.const 0x99) $TO)
 
   ;; [6.2.2298](https://forth-standard.org/standard/core/TRUE)
   (func $TRUE (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 0xffffffff)))
-  (data (i32.const 0x20870) "\64\08\02\00" "\04" "TRUE   " "\99\00\00\00")
-  (elem (i32.const 0x99) $TRUE)
+  (data (i32.const 0x2087c) "\70\08\02\00" "\04" "TRUE   " "\9a\00\00\00")
+  (elem (i32.const 0x9a) $TRUE)
 
   ;; [6.2.2300](https://forth-standard.org/standard/core/TUCK)
   (func $TUCK (param $tos i32) (result i32)
     (local.get $tos)
     (call $SWAP) (call $OVER))
-  (data (i32.const 0x20880) "\70\08\02\00" "\04" "TUCK   " "\9a\00\00\00")
-  (elem (i32.const 0x9a) $TUCK)
+  (data (i32.const 0x2088c) "\7c\08\02\00" "\04" "TUCK   " "\9b\00\00\00")
+  (elem (i32.const 0x9b) $TUCK)
 
   ;; [6.1.2310](https://forth-standard.org/standard/core/TYPE)
   (func $TYPE (param $tos i32) (result i32)
@@ -1739,16 +1750,16 @@
     (local.set $len (call $pop))
     (local.set $p (call $pop))
     (call $type (local.get $p) (local.get $len)))
-  (data (i32.const 0x20890) "\80\08\02\00" "\04" "TYPE   " "\9b\00\00\00")
-  (elem (i32.const 0x9b) $TYPE)
+  (data (i32.const 0x2089c) "\8c\08\02\00" "\04" "TYPE   " "\9c\00\00\00")
+  (elem (i32.const 0x9c) $TYPE)
 
   ;; [6.1.2320](https://forth-standard.org/standard/core/Ud)
   (func $U. (param $tos i32) (result i32)
     (local.get $tos)
-    (call $U._ (call $pop) (i32.load (i32.const 0x203a0 (; = body(BASE) ;))))
+    (call $U._ (call $pop) (i32.load (i32.const 0x203ac (; = body(BASE) ;))))
     (call $shell_emit (i32.const 0x20)))
-  (data (i32.const 0x208a0) "\90\08\02\00" "\02" "U. " "\9c\00\00\00")
-  (elem (i32.const 0x9c) $U.)
+  (data (i32.const 0x208ac) "\9c\08\02\00" "\02" "U. " "\9d\00\00\00")
+  (elem (i32.const 0x9d) $U.)
 
   ;; [6.1.2340](https://forth-standard.org/standard/core/Uless)
   (func $U< (param $tos i32) (result i32)
@@ -1759,8 +1770,8 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x208ac) "\a0\08\02\00" "\02" "U< " "\9d\00\00\00")
-  (elem (i32.const 0x9d) $U<)
+  (data (i32.const 0x208b8) "\ac\08\02\00" "\02" "U< " "\9e\00\00\00")
+  (elem (i32.const 0x9e) $U<)
 
   ;; [6.1.2360](https://forth-standard.org/standard/core/UMTimes)
   (func $UM* (param $tos i32) (result i32)
@@ -1770,8 +1781,8 @@
                         (i64.extend_i32_u (i32.load (i32.sub (local.get $tos) 
                                                               (i32.const 4))))))
     (local.get $tos))
-  (data (i32.const 0x208b8) "\ac\08\02\00" "\03" "UM*" "\9e\00\00\00")
-  (elem (i32.const 0x9e) $UM*)
+  (data (i32.const 0x208c4) "\b8\08\02\00" "\03" "UM*" "\9f\00\00\00")
+  (elem (i32.const 0x9f) $UM*)
 
   ;; [6.1.2370](https://forth-standard.org/standard/core/UMDivMOD)
   (func $UM/MOD (param $tos i32) (result i32)
@@ -1790,50 +1801,50 @@
       (i32.wrap_i64 
         (i64.div_u (local.get $n1) (local.get $n2))))
     (local.get $btos))
-  (data (i32.const 0x208c4) "\b8\08\02\00" "\06" "UM/MOD " "\9f\00\00\00")
-  (elem (i32.const 0x9f) $UM/MOD)
+  (data (i32.const 0x208d0) "\c4\08\02\00" "\06" "UM/MOD " "\a0\00\00\00")
+  (elem (i32.const 0xa0) $UM/MOD)
 
   ;; [6.1.2380](https://forth-standard.org/standard/core/UNLOOP)
   (func $UNLOOP (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitICall (i32.const 0) (i32.const 0x9 (; = END_DO_INDEX ;))))
-  (data (i32.const 0x208d4) "\c4\08\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\a0\00\00\00")
-  (elem (i32.const 0xa0) $UNLOOP)
+  (data (i32.const 0x208e0) "\d0\08\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\a1\00\00\00")
+  (elem (i32.const 0xa1) $UNLOOP)
 
   ;; [6.1.2390](https://forth-standard.org/standard/core/UNTIL)
   (func $UNTIL (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileUntil))
-  (data (i32.const 0x208e4) "\d4\08\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL  " "\a1\00\00\00")
-  (elem (i32.const 0xa1) $UNTIL)
+  (data (i32.const 0x208f0) "\e0\08\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL  " "\a2\00\00\00")
+  (elem (i32.const 0xa2) $UNTIL)
 
   ;; [6.2.2395](https://forth-standard.org/standard/core/UNUSED)
   (func $UNUSED (param $tos i32) (result i32)
     (local.get $tos)
     (call $push (i32.shr_s (i32.sub (i32.const 0x6400000 (; = MEMORY_SIZE ;)) (global.get $here)) (i32.const 2))))
-  (data (i32.const 0x208f4) "\e4\08\02\00" "\06" "UNUSED " "\a2\00\00\00")
-  (elem (i32.const 0xa2) $UNUSED)
+  (data (i32.const 0x20900) "\f0\08\02\00" "\06" "UNUSED " "\a3\00\00\00")
+  (elem (i32.const 0xa3) $UNUSED)
 
   ;; [6.2.2405](https://forth-standard.org/standard/core/VALUE)
-  (data (i32.const 0x20904) "\f4\08\02\00" "\05" "VALUE  " "\54\00\00\00" (; = pack(index("CONSTANT")) ;))
+  (data (i32.const 0x20910) "\00\09\02\00" "\05" "VALUE  " "\55\00\00\00" (; = pack(index("CONSTANT")) ;))
 
   ;; [6.1.2410](https://forth-standard.org/standard/core/VARIABLE)
   (func $VARIABLE (param $tos i32) (result i32)
     (local.get $tos)
     (call $CREATE)
     (global.set $here (i32.add (global.get $here) (i32.const 4))))
-  (data (i32.const 0x20914) "\04\09\02\00" "\08" "VARIABLE   " "\a3\00\00\00")
-  (elem (i32.const 0xa3) $VARIABLE)
+  (data (i32.const 0x20920) "\10\09\02\00" "\08" "VARIABLE   " "\a4\00\00\00")
+  (elem (i32.const 0xa4) $VARIABLE)
 
   ;; [6.1.2430](https://forth-standard.org/standard/core/WHILE)
   (func $WHILE (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileWhile))
-  (data (i32.const 0x20928) "\14\09\02\00" "\85" (; F_IMMEDIATE ;) "WHILE  " "\a4\00\00\00")
-  (elem (i32.const 0xa4) $WHILE)
+  (data (i32.const 0x20934) "\20\09\02\00" "\85" (; F_IMMEDIATE ;) "WHILE  " "\a5\00\00\00")
+  (elem (i32.const 0xa5) $WHILE)
 
   ;; [6.1.2450](https://forth-standard.org/standard/core/WORD)
   (func $WORD (param $tos i32) (result i32)
@@ -1853,8 +1864,8 @@
       (local.get $len))
     (i32.store8 (local.get $wordBase) (local.get $len))
     (call $push (local.get $wordBase)))
-  (data (i32.const 0x20938) "\28\09\02\00" "\04" "WORD   " "\a5\00\00\00")
-  (elem (i32.const 0xa5) $WORD)
+  (data (i32.const 0x20944) "\34\09\02\00" "\04" "WORD   " "\a6\00\00\00")
+  (elem (i32.const 0xa6) $WORD)
 
   ;; 15.6.1.2465
   (func $WORDS (param $tos i32) (result i32)
@@ -1875,8 +1886,8 @@
       (local.set $entryP (i32.load (local.get $entryP)))
       (br_if $loop (local.get $entryP)))
     (local.get $tos))
-  (data (i32.const 0x20948) "\38\09\02\00" "\05" "WORDS  " "\a6\00\00\00")
-  (elem (i32.const 0xa6) $WORDS)
+  (data (i32.const 0x20954) "\44\09\02\00" "\05" "WORDS  " "\a7\00\00\00")
+  (elem (i32.const 0xa7) $WORDS)
 
   ;; [6.1.2490](https://forth-standard.org/standard/core/XOR)
   (func $XOR (param $tos i32) (result i32)
@@ -1886,16 +1897,16 @@
                 (i32.xor (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))
                         (i32.load (local.get $bbtos))))
     (local.get $btos))
-  (data (i32.const 0x20958) "\48\09\02\00" "\03" "XOR" "\a7\00\00\00")
-  (elem (i32.const 0xa7) $XOR)
+  (data (i32.const 0x20964) "\54\09\02\00" "\03" "XOR" "\a8\00\00\00")
+  (elem (i32.const 0xa8) $XOR)
 
   ;; [6.1.2500](https://forth-standard.org/standard/core/Bracket)
   (func $left-bracket (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
-    (i32.store (i32.const 0x20840 (; = body(STATE) ;)) (i32.const 0)))
-  (data (i32.const 0x20964) "\58\09\02\00" "\81" (; F_IMMEDIATE ;) "[  " "\a8\00\00\00")
-  (elem (i32.const 0xa8) $left-bracket)
+    (i32.store (i32.const 0x2084c (; = body(STATE) ;)) (i32.const 0)))
+  (data (i32.const 0x20970) "\64\09\02\00" "\81" (; F_IMMEDIATE ;) "[  " "\a9\00\00\00")
+  (elem (i32.const 0xa9) $left-bracket)
 
   ;; [6.1.2510](https://forth-standard.org/standard/core/BracketTick)
   (func $bracket-tick (param $tos i32) (result i32)
@@ -1903,8 +1914,8 @@
     (call $ensureCompiling)
     (call $')
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x20970) "\64\09\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\a9\00\00\00")
-  (elem (i32.const 0xa9) $bracket-tick)
+  (data (i32.const 0x2097c) "\70\09\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\aa\00\00\00")
+  (elem (i32.const 0xaa) $bracket-tick)
 
   ;; [6.1.2520](https://forth-standard.org/standard/core/BracketCHAR)
   (func $bracket-char (param $tos i32) (result i32)
@@ -1912,22 +1923,22 @@
     (call $ensureCompiling)
     (call $CHAR)
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x2097c) "\70\09\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\aa\00\00\00")
-  (elem (i32.const 0xaa) $bracket-char)
+  (data (i32.const 0x20988) "\7c\09\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\ab\00\00\00")
+  (elem (i32.const 0xab) $bracket-char)
 
   ;; [6.2.2535](https://forth-standard.org/standard/core/bs)
   (func $\ (param $tos i32) (result i32)
     (drop (drop (call $parse (i32.const 0x0a (; '\n' ;)))))
     (local.get $tos))
-  (data (i32.const 0x2098c) "\7c\09\02\00" "\81" (; F_IMMEDIATE ;) "\5c  " "\ab\00\00\00")
-  (elem (i32.const 0xab) $\)
+  (data (i32.const 0x20998) "\88\09\02\00" "\81" (; F_IMMEDIATE ;) "\5c  " "\ac\00\00\00")
+  (elem (i32.const 0xac) $\)
 
   ;; [6.1.2540](https://forth-standard.org/standard/right-bracket)
   (func $right-bracket (param $tos i32) (result i32)
-    (i32.store (i32.const 0x20840 (; = body(STATE) ;)) (i32.const 1))
+    (i32.store (i32.const 0x2084c (; = body(STATE) ;)) (i32.const 1))
     (local.get $tos))
-  (data (i32.const 0x20998) "\8c\09\02\00" "\01" "]  " "\ac\00\00\00")
-  (elem (i32.const 0xac) $right-bracket)
+  (data (i32.const 0x209a4) "\98\09\02\00" "\01" "]  " "\ad\00\00\00")
+  (elem (i32.const 0xad) $right-bracket)
 
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1965,7 +1976,7 @@
               ;; It's a number. Are we compiling?
               (then 
                 (local.set $number)
-                (if (i32.load (i32.const 0x20840 (; = body(STATE) ;)))
+                (if (i32.load (i32.const 0x2084c (; = body(STATE) ;)))
                   (then
                     ;; We're compiling. Pop it off the stack and 
                     ;; add it to the compiled list
@@ -1981,7 +1992,7 @@
             ;; Name found in the dictionary. 
             ;; Are we compiling and is the word non-immediate?
             (if (i32.and
-                  (i32.load (i32.const 0x20840 (; = body(STATE) ;)))
+                  (i32.load (i32.const 0x2084c (; = body(STATE) ;)))
                   (i32.ne (local.get $FINDResult) (i32.const 1)))
               (then
                 ;; We're compiling a non-immediate. 
@@ -2039,7 +2050,7 @@
     (local $n i32)  
     (local.set $p (local.get $addr))
     (local.set $end (i32.add (local.get $p) (local.get $length)))  
-    (local.set $base (i32.load (i32.const 0x203a0 (; = body(BASE) ;))))
+    (local.set $base (i32.load (i32.const 0x203ac (; = body(BASE) ;))))
 
     ;; Read first character
     (if (i32.eq (local.tee $char (i32.load8_u (local.get $p))) (i32.const 0x2d (; = '-' ;)))
@@ -2083,7 +2094,7 @@
     (global.set $tos (local.get $tos))
     (global.set $tors (i32.const 0x2000 (; = RETURN_STACK_BASE ;)))
     (global.set $sourceID (i32.const 0))
-    (i32.store (i32.const 0x20840 (; = body(STATE) ;)) (i32.const 0))
+    (i32.store (i32.const 0x2084c (; = body(STATE) ;)) (i32.const 0))
     (unreachable))
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2104,9 +2115,9 @@
   (global $sourceID (mut i32) (i32.const 0))
 
   ;; Dictionary pointers
-  (global $latest (mut i32) (i32.const 0x20998))
-  (global $here (mut i32) (i32.const 0x209a4))
-  (global $nextTableIndex (mut i32) (i32.const 0xad))
+  (global $latest (mut i32) (i32.const 0x209a4))
+  (global $here (mut i32) (i32.const 0x209b0))
+  (global $nextTableIndex (mut i32) (i32.const 0xae))
 
   ;; Pictured output pointer
   (global $po (mut i32) (i32.const -1))
@@ -2610,7 +2621,7 @@
 
   (func $ensureCompiling (param $tos i32) (result i32)
     (local.get $tos) 
-    (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x20840 (; = body(STATE) ;))))
+    (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x2084c (; = body(STATE) ;))))
       (call $fail (i32.const 0x2002e (; = str("word not supported in interpret mode") ;)))))
 
   ;; Toggle the hidden flag
@@ -2700,7 +2711,7 @@
     (local $delimited i32)
     (local.set $p 
       (local.tee $addr (i32.add (global.get $inputBufferBase) 
-      (i32.load (i32.const 0x202dc (; = body(>IN) ;))))))
+      (i32.load (i32.const 0x202e8 (; = body(>IN) ;))))))
     (local.set $end (i32.add (global.get $inputBufferBase) (global.get $inputBufferSize)))
     (local.set $delimited (i32.const 0))
     (block $endOfInput
@@ -2712,7 +2723,7 @@
           (br_if $delimiter (i32.eq (local.get $c) (i32.const 0xa)))
           (br_if $read (i32.ne (local.get $c) (local.get $delim)))))
       (local.set $delimited (i32.const 1)))
-    (i32.store (i32.const 0x202dc (; = body(>IN) ;)) 
+    (i32.store (i32.const 0x202e8 (; = body(>IN) ;)) 
       (i32.sub (local.get $p) (global.get $inputBufferBase)))
     (local.get $addr)
     (i32.sub
@@ -2726,7 +2737,7 @@
     (local $c i32)
     (local.set $p 
       (local.tee $addr (i32.add (global.get $inputBufferBase) 
-      (i32.load (i32.const 0x202dc (; = body(>IN) ;))))))
+      (i32.load (i32.const 0x202e8 (; = body(>IN) ;))))))
     (local.set $end (i32.add (global.get $inputBufferBase) (global.get $inputBufferSize)))
     (block $endLoop
       (loop $loop
@@ -2736,7 +2747,7 @@
         (local.set $p (i32.add (local.get $p) (i32.const 1)))
         ;; Eat up a newline
         (br_if $loop (i32.ne (local.get $c) (i32.const 0xa)))))
-    (i32.store (i32.const 0x202dc (; = body(>IN) ;)) 
+    (i32.store (i32.const 0x202e8 (; = body(>IN) ;)) 
       (i32.sub (local.get $p) (global.get $inputBufferBase))))
 
   ;; Returns xt, type (0 = not found, 1 = immediate, -1 = non-immediate)
@@ -2818,7 +2829,7 @@
         ;; Show prompt
         (if (i32.eqz (local.get $silent))
           (then
-            (if (i32.ge_s (i32.load (i32.const 0x20840 (; = body(STATE) ;))) (i32.const 0))
+            (if (i32.ge_s (i32.load (i32.const 0x2084c (; = body(STATE) ;))) (i32.const 0))
               (then
                 ;; Write ok
                 (call $shell_emit (i32.const 111))
diff --git a/src/web/tests/forth2012-test-suite/coreexttest.fth b/src/web/tests/forth2012-test-suite/coreexttest.fth
index a0222ef..cc714d3 100644
--- a/src/web/tests/forth2012-test-suite/coreexttest.fth
+++ b/src/web/tests/forth2012-test-suite/coreexttest.fth
@@ -158,9 +158,9 @@ T{ : RR0 2>R 100 R> R> ; -> }T
 T{ 300 400 RR0 -> 100 400 300 }T
 T{ 200 300 400 RR0 -> 200 100 400 300 }T
 
-\ T{ : RR1 2>R 100 2R@ R> R> ; -> }T
-\ T{ 300 400 RR1 -> 100 300 400 400 300 }T
-\ T{ 200 300 400 RR1 -> 200 100 300 400 400 300 }T
+T{ : RR1 2>R 100 2R@ R> R> ; -> }T
+T{ 300 400 RR1 -> 100 300 400 400 300 }T
+T{ 200 300 400 RR1 -> 200 100 300 400 400 300 }T
 
 T{ : RR2 2>R 100 2R> ; -> }T
 T{ 300 400 RR2 -> 100 300 400 }T