From c055a70e0173ef3d8c23225aa414f490e5a53487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <remko@el-tramo.be>
Date: Sat, 28 May 2022 18:26:11 +0200
Subject: [PATCH] Defragment dictionary & remove obsolete entries

---
 src/waforth.wat        | 360 ++++++++++++++++++++---------------------
 src/web/tests/suite.js |  12 +-
 2 files changed, 182 insertions(+), 190 deletions(-)

diff --git a/src/waforth.wat b/src/waforth.wat
index 95f91fc..689133d 100644
--- a/src/waforth.wat
+++ b/src/waforth.wat
@@ -212,7 +212,7 @@
     (i32.store (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 0x21000) "\00\00\00\00" "\01" "!  " "\10\00\00\00")
+  (data (i32.const 0x200a8) "\00\00\00\00" "\01" "!  " "\10\00\00\00")
   (elem (i32.const 0x10) $!)
 
   ;; 6.1.0030
@@ -222,7 +222,7 @@
     (local $bbtos i32)
     (local $m i64)
     (local $npo i32)
-    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x218e4 (; = body(BASE) ;)))))
+    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x2036c (; = 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)))
@@ -231,7 +231,7 @@
     (i64.store (local.get $bbtos) (local.get $v))
     (global.set $po (local.get $npo))
     (local.get $tos))
-  (data (i32.const 0x2100c) "\00\10\02\00" "\01" "#  " "\11\00\00\00")
+  (data (i32.const 0x200b4) "\a8\00\02\00" "\01" "#  " "\11\00\00\00")
   (elem (i32.const 0x11) $#)
 
   ;; 6.1.0040
@@ -239,7 +239,7 @@
     (i32.store (i32.sub (local.get $tos) (i32.const 8)) (global.get $po))
     (i32.store (i32.sub (local.get $tos) (i32.const 4)) (i32.sub (i32.add (global.get $here) (i32.const 0x200 (; = PICTURED_OUTPUT_OFFSET ;))) (global.get $po)))
     (local.get $tos))
-  (data (i32.const 0x21018) "\0c\10\02\00" "\02" "#> " "\12\00\00\00")
+  (data (i32.const 0x200c0) "\b4\00\02\00" "\02" "#> " "\12\00\00\00")
   (elem (i32.const 0x12) $#>)
 
   ;; 6.1.0050
@@ -249,7 +249,7 @@
     (local $bbtos i32)
     (local $m i64)
     (local $po i32)
-    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x218e4 (; = body(BASE) ;)))))
+    (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x2036c (; = 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
@@ -261,7 +261,7 @@
     (i64.store (local.get $bbtos) (local.get $v))
     (global.set $po (local.get $po))
     (local.get $tos))
-  (data (i32.const 0x21024) "\18\10\02\00" "\02" "#S " "\13\00\00\00")
+  (data (i32.const 0x200cc) "\c0\00\02\00" "\02" "#S " "\13\00\00\00")
   (elem (i32.const 0x13) $#S)
 
   ;; 6.1.0070
@@ -273,7 +273,7 @@
         (call $fail (i32.const 0x2001d (; = str("incomplete input") ;)))))
     (call $FIND)
     (drop (call $pop)))
-  (data (i32.const 0x21030) "\24\10\02\00" "\01" "'  " "\14\00\00\00")
+  (data (i32.const 0x200d8) "\cc\00\02\00" "\01" "'  " "\14\00\00\00")
   (elem (i32.const 0x14) $')
 
   ;; 6.1.0080
@@ -284,7 +284,7 @@
       (if (param i32) (result i32) (i32.lt_s (local.tee $c (call $readChar)) (i32.const 0)) 
         (call $fail (i32.const 0x2002e (; = str("missing ')'") ;)))) 
       (br_if $loop (i32.ne (local.get $c) (i32.const 41)))))
-  (data (i32.const 0x2103c) "\30\10\02\00" "\81" (; F_IMMEDIATE ;) "(  " "\15\00\00\00")
+  (data (i32.const 0x200e4) "\d8\00\02\00" "\81" (; F_IMMEDIATE ;) "(  " "\15\00\00\00")
   (elem (i32.const 0x15) $paren)
 
   ;; 6.1.0090
@@ -295,7 +295,7 @@
                 (i32.mul (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))
                         (i32.load (local.get $bbtos))))
     (local.get $btos))
-  (data (i32.const 0x21048) "\3c\10\02\00" "\01" "*  " "\16\00\00\00")
+  (data (i32.const 0x200f0) "\e4\00\02\00" "\01" "*  " "\16\00\00\00")
   (elem (i32.const 0x16) $*)
 
   ;; 6.1.0100
@@ -309,7 +309,7 @@
                                 (i64.extend_i32_s (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))))
                       (i64.extend_i32_s (i32.load (i32.sub (local.get $tos) (i32.const 4)))))))
     (local.get $bbtos))
-  (data (i32.const 0x21054) "\48\10\02\00" "\02" "*/ " "\17\00\00\00")
+  (data (i32.const 0x200fc) "\f0\00\02\00" "\02" "*/ " "\17\00\00\00")
   (elem (i32.const 0x17) $*/)
 
   ;; 6.1.0110
@@ -327,7 +327,7 @@
                       (local.tee $x2 (i64.extend_i32_s (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))))))
     (i32.store (local.get $bbtos) (i32.wrap_i64 (i64.div_s (local.get $x1) (local.get $x2))))
     (local.get $btos))
-  (data (i32.const 0x21060) "\54\10\02\00" "\05" "*/MOD  " "\18\00\00\00")
+  (data (i32.const 0x20108) "\fc\00\02\00" "\05" "*/MOD  " "\18\00\00\00")
   (elem (i32.const 0x18) $*/MOD)
 
   ;; 6.1.0120
@@ -338,7 +338,7 @@
                 (i32.add (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))
                         (i32.load (local.get $bbtos))))
     (local.get $btos))
-  (data (i32.const 0x21070) "\60\10\02\00" "\01" "+  " "\19\00\00\00")
+  (data (i32.const 0x20118) "\08\01\02\00" "\01" "+  " "\19\00\00\00")
   (elem (i32.const 0x19) $+)
 
   ;; 6.1.0130
@@ -349,7 +349,7 @@
                 (i32.add (i32.load (local.get $addr))
                         (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))))
     (local.get $bbtos))
-  (data (i32.const 0x2107c) "\70\10\02\00" "\02" "+! " "\1a\00\00\00")
+  (data (i32.const 0x20124) "\18\01\02\00" "\02" "+! " "\1a\00\00\00")
   (elem (i32.const 0x1a) $+!)
 
   ;; 6.1.0140
@@ -357,7 +357,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compilePlusLoop))
-  (data (i32.const 0x21088) "\7c\10\02\00" "\85" (; F_IMMEDIATE ;) "+LOOP  " "\1b\00\00\00")
+  (data (i32.const 0x20130) "\24\01\02\00" "\85" (; F_IMMEDIATE ;) "+LOOP  " "\1b\00\00\00")
   (elem (i32.const 0x1b) $+LOOP)
 
   ;; 6.1.0150
@@ -367,7 +367,7 @@
       (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (global.set $here (i32.add (global.get $here) (i32.const 4)))
     (i32.sub (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x21098) "\88\10\02\00" "\01" ",  " "\1c\00\00\00")
+  (data (i32.const 0x20140) "\30\01\02\00" "\01" ",  " "\1c\00\00\00")
   (elem (i32.const 0x1c) $comma)
 
   ;; 6.1.0160
@@ -378,7 +378,7 @@
                 (i32.sub (i32.load (local.get $bbtos))
                         (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))))
     (local.get $btos))
-  (data (i32.const 0x210a4) "\98\10\02\00" "\01" "-  " "\1d\00\00\00")
+  (data (i32.const 0x2014c) "\40\01\02\00" "\01" "-  " "\1d\00\00\00")
   (elem (i32.const 0x1d) $-)
 
   ;; 6.1.0180
@@ -390,9 +390,9 @@
       (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 0x218e4 (; = body(BASE) ;))))
+    (call $U._ (local.get $v) (i32.load (i32.const 0x2036c (; = body(BASE) ;))))
     (call $shell_emit (i32.const 0x20)))
-  (data (i32.const 0x21884) "\74\18\02\00" "\01" ".  " "\a6\00\00\00")
+  (data (i32.const 0x20158) "\4c\01\02\00" "\01" ".  " "\a6\00\00\00")
   (elem (i32.const 0xa6) $.)
 
   ;; 6.1.0190
@@ -401,7 +401,7 @@
     (call $ensureCompiling)
     (call $Sq)
     (call $emitICall (i32.const 0) (i32.const 0x85 (; = TYPE_INDEX ;))))
-  (data (i32.const 0x210b0) "\a4\10\02\00" "\82" (; F_IMMEDIATE ;) ".\22 " "\1e\00\00\00")
+  (data (i32.const 0x20164) "\58\01\02\00" "\82" (; F_IMMEDIATE ;) ".\22 " "\1e\00\00\00")
   (elem (i32.const 0x1e) $.q)
 
   ;; 15.6.1.0220
@@ -411,12 +411,12 @@
     (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 0x218e4 (; = body(BASE) ;))))
+        (call $U._ (i32.load (local.get $p)) (i32.load (i32.const 0x2036c (; = body(BASE) ;))))
         (call $shell_emit (i32.const 0x20))
         (local.set $p (i32.add (local.get $p) (i32.const 4)))
         (br $loop)))
     (local.get $tos))
-  (data (i32.const 0x21890) "\84\18\02\00" "\02" ".S " "\a7\00\00\00")
+  (data (i32.const 0x20170) "\64\01\02\00" "\02" ".S " "\a7\00\00\00")
   (elem (i32.const 0xa7) $.S)
 
   ;; 6.1.0230
@@ -429,7 +429,7 @@
     (i32.store (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))
                 (i32.div_s (i32.load (local.get $bbtos)) (local.get $divisor)))
     (local.get $btos))
-  (data (i32.const 0x210bc) "\b0\10\02\00" "\01" "/  " "\1f\00\00\00")
+  (data (i32.const 0x2017c) "\70\01\02\00" "\01" "/  " "\1f\00\00\00")
   (elem (i32.const 0x1f) $/)
 
   ;; 6.1.0240
@@ -444,7 +444,7 @@
                                                                               (i32.const 4)))))))
     (i32.store (local.get $btos) (i32.div_s (local.get $n1) (local.get $n2)))
     (local.get $tos))
-  (data (i32.const 0x210c8) "\bc\10\02\00" "\04" "/MOD   " "\20\00\00\00")
+  (data (i32.const 0x20188) "\7c\01\02\00" "\04" "/MOD   " "\20\00\00\00")
   (elem (i32.const 0x20) $/MOD)
 
   ;; 6.1.0250
@@ -456,7 +456,7 @@
       (then (i32.store (local.get $btos) (i32.const -1)))
       (else (i32.store (local.get $btos) (i32.const 0))))
     (local.get $tos))
-  (data (i32.const 0x210d8) "\c8\10\02\00" "\02" "0< " "\21\00\00\00")
+  (data (i32.const 0x20198) "\88\01\02\00" "\02" "0< " "\21\00\00\00")
   (elem (i32.const 0x21) $0<)
 
   ;; 6.1.0270
@@ -467,7 +467,7 @@
       (then (i32.store (local.get $btos) (i32.const -1)))
       (else (i32.store (local.get $btos) (i32.const 0))))
     (local.get $tos))
-  (data (i32.const 0x210e4) "\d8\10\02\00" "\02" "0= " "\22\00\00\00")
+  (data (i32.const 0x201a4) "\98\01\02\00" "\02" "0= " "\22\00\00\00")
   (elem (i32.const 0x22) $0=)
 
   ;; 6.2.0280
@@ -479,7 +479,7 @@
       (then (i32.store (local.get $btos) (i32.const -1)))
       (else (i32.store (local.get $btos) (i32.const 0))))
     (local.get $tos))
-  (data (i32.const 0x21764) "\58\17\02\00" "\02" "0> " "\94\00\00\00")
+  (data (i32.const 0x201b0) "\a4\01\02\00" "\02" "0> " "\94\00\00\00")
   (elem (i32.const 0x94) $0>)
 
   ;; 6.1.0290
@@ -488,7 +488,7 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.add (i32.load (local.get $btos)) (i32.const 1)))
     (local.get $tos))
-  (data (i32.const 0x210f0) "\e4\10\02\00" "\02" "1+ " "\23\00\00\00")
+  (data (i32.const 0x201bc) "\b0\01\02\00" "\02" "1+ " "\23\00\00\00")
   (elem (i32.const 0x23) $1+)
 
   ;; 6.1.0300
@@ -497,14 +497,14 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.sub (i32.load (local.get $btos)) (i32.const 1)))
     (local.get $tos))
-  (data (i32.const 0x210fc) "\f0\10\02\00" "\02" "1- " "\24\00\00\00")
+  (data (i32.const 0x201c8) "\bc\01\02\00" "\02" "1- " "\24\00\00\00")
   (elem (i32.const 0x24) $1-)
 
   ;; 6.1.0310
   (func $2! (param $tos i32) (result i32)
     (local.get $tos)
     (call $SWAP) (call $OVER) (call $!) (call $CELL+) (call $!))
-  (data (i32.const 0x21108) "\fc\10\02\00" "\02" "2! " "\25\00\00\00")
+  (data (i32.const 0x201d4) "\c8\01\02\00" "\02" "2! " "\25\00\00\00")
   (elem (i32.const 0x25) $2!)
 
   ;; 6.1.0320
@@ -513,7 +513,7 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.shl (i32.load (local.get $btos)) (i32.const 1)))
     (local.get $tos))
-  (data (i32.const 0x21114) "\08\11\02\00" "\02" "2* " "\26\00\00\00")
+  (data (i32.const 0x201e0) "\d4\01\02\00" "\02" "2* " "\26\00\00\00")
   (elem (i32.const 0x26) $2*)
 
   ;; 6.1.0330
@@ -522,7 +522,7 @@
     (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))
                 (i32.shr_s (i32.load (local.get $btos)) (i32.const 1)))
     (local.get $tos))
-  (data (i32.const 0x21120) "\14\11\02\00" "\02" "2/ " "\27\00\00\00")
+  (data (i32.const 0x201ec) "\e0\01\02\00" "\02" "2/ " "\27\00\00\00")
   (elem (i32.const 0x27) $2/)
 
   ;; 6.1.0350
@@ -533,13 +533,13 @@
     (call $@)
     (call $SWAP)
     (call $@))
-  (data (i32.const 0x2112c) "\20\11\02\00" "\02" "2@ " "\28\00\00\00")
+  (data (i32.const 0x201f8) "\ec\01\02\00" "\02" "2@ " "\28\00\00\00")
   (elem (i32.const 0x28) $2@)
 
   ;; 6.1.0370 
   (func $2DROP (param $tos i32) (result i32)
     (i32.sub (local.get $tos) (i32.const 8)))
-  (data (i32.const 0x21138) "\2c\11\02\00" "\05" "2DROP  " "\29\00\00\00")
+  (data (i32.const 0x20204) "\f8\01\02\00" "\05" "2DROP  " "\29\00\00\00")
   (elem (i32.const 0x29) $2DROP)
 
   ;; 6.1.0380
@@ -549,7 +549,7 @@
     (i32.store (i32.add (local.get $tos) (i32.const 4))
                 (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (i32.add (local.get $tos) (i32.const 8)))
-  (data (i32.const 0x21148) "\38\11\02\00" "\04" "2DUP   " "\2a\00\00\00")
+  (data (i32.const 0x20214) "\04\02\02\00" "\04" "2DUP   " "\2a\00\00\00")
   (elem (i32.const 0x2a) $2DUP)
 
   ;; 6.1.0400
@@ -559,7 +559,7 @@
     (i32.store (i32.add (local.get $tos) (i32.const 4))
                 (i32.load (i32.sub (local.get $tos) (i32.const 12))))
     (i32.add (local.get $tos) (i32.const 8)))
-  (data (i32.const 0x21158) "\48\11\02\00" "\05" "2OVER  " "\2b\00\00\00")
+  (data (i32.const 0x20224) "\14\02\02\00" "\05" "2OVER  " "\2b\00\00\00")
   (elem (i32.const 0x2b) $2OVER)
 
   ;; 6.1.0430
@@ -577,7 +577,7 @@
     (i32.store (i32.sub (local.get $tos) (i32.const 4))
                 (local.get $x2))
     (local.get $tos))
-  (data (i32.const 0x21168) "\58\11\02\00" "\05" "2SWAP  " "\2c\00\00\00")
+  (data (i32.const 0x20234) "\24\02\02\00" "\05" "2SWAP  " "\2c\00\00\00")
   (elem (i32.const 0x2c) $2SWAP)
 
   ;; 6.1.0450
@@ -601,7 +601,7 @@
 
     (call $startColon (i32.const 0))
     (call $right-bracket))
-  (data (i32.const 0x21178) "\68\11\02\00" "\01" ":  " "\2d\00\00\00")
+  (data (i32.const 0x20244) "\34\02\02\00" "\01" ":  " "\2d\00\00\00")
   (elem (i32.const 0x2d) $:)
 
   ;; 6.1.0460
@@ -611,7 +611,7 @@
     (call $endColon)
     (call $hidden)
     (call $left-bracket))
-  (data (i32.const 0x21184) "\78\11\02\00" "\81" (; F_IMMEDIATE ;) ";  " "\2e\00\00\00")
+  (data (i32.const 0x20250) "\44\02\02\00" "\81" (; F_IMMEDIATE ;) ";  " "\2e\00\00\00")
   (elem (i32.const 0x2e) $semicolon)
 
   ;; 6.1.0480
@@ -623,14 +623,14 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x21190) "\84\11\02\00" "\01" "<  " "\2f\00\00\00")
+  (data (i32.const 0x2025c) "\50\02\02\00" "\01" "<  " "\2f\00\00\00")
   (elem (i32.const 0x2f) $<)
 
   ;; 6.1.0490
   (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 0x2119c) "\90\11\02\00" "\02" "<# " "\30\00\00\00")
+  (data (i32.const 0x20268) "\5c\02\02\00" "\02" "<# " "\30\00\00\00")
   (elem (i32.const 0x30) $<#)
 
   ;; 6.1.0530
@@ -642,7 +642,7 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x211a8) "\9c\11\02\00" "\01" "=  " "\31\00\00\00")
+  (data (i32.const 0x20274) "\68\02\02\00" "\01" "=  " "\31\00\00\00")
   (elem (i32.const 0x31) $=)
 
   ;; 6.1.0540
@@ -654,7 +654,7 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x211b4) "\a8\11\02\00" "\01" ">  " "\32\00\00\00")
+  (data (i32.const 0x20280) "\74\02\02\00" "\01" ">  " "\32\00\00\00")
   (elem (i32.const 0x32) $>)
 
   ;; 6.1.0550
@@ -663,11 +663,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 0x211c0) "\b4\11\02\00" "\05" ">BODY  " "\33\00\00\00")
+  (data (i32.const 0x2028c) "\80\02\02\00" "\05" ">BODY  " "\33\00\00\00")
   (elem (i32.const 0x33) $>BODY)
 
   ;; 6.1.0560
-  (data (i32.const 0x218fc) "\e8\18\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" "\00\00\00\00")
+  (data (i32.const 0x2029c) "\8c\02\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" "\00\00\00\00")
 
   ;; 6.1.0570
   (func $>NUMBER (param $tos i32) (result i32) 
@@ -688,7 +688,7 @@
     (i32.store (local.get $bbtos) (local.get $rest))
     (i64.store (local.get $bbbbtos) (local.get $value))
     (local.get $tos))
-  (data (i32.const 0x211dc) "\d0\11\02\00" "\07" ">NUMBER" "\35\00\00\00")
+  (data (i32.const 0x202ac) "\9c\02\02\00" "\07" ">NUMBER" "\35\00\00\00")
   (elem (i32.const 0x35) $>NUMBER)
 
   ;; 6.1.0580
@@ -696,7 +696,7 @@
     (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 0x211ec) "\dc\11\02\00" "\02" ">R " "\36\00\00\00")
+  (data (i32.const 0x202bc) "\ac\02\02\00" "\02" ">R " "\36\00\00\00")
   (elem (i32.const 0x36) $>R)
 
   ;; 6.1.0630 
@@ -709,7 +709,7 @@
         (i32.add (local.get $tos) (i32.const 4)))
       (else 
         (local.get $tos))))
-  (data (i32.const 0x211f8) "\ec\11\02\00" "\04" "?DUP   " "\37\00\00\00")
+  (data (i32.const 0x202c8) "\bc\02\02\00" "\04" "?DUP   " "\37\00\00\00")
   (elem (i32.const 0x37) $?DUP)
 
   ;; 6.1.0650
@@ -718,13 +718,13 @@
     (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 0x21208) "\f8\11\02\00" "\01" "@  " "\38\00\00\00")
+  (data (i32.const 0x202d8) "\c8\02\02\00" "\01" "@  " "\38\00\00\00")
   (elem (i32.const 0x38) $@)
 
   ;; 6.1.0670 ABORT 
   (func $ABORT (param $tos i32) (result i32)
     (call $QUIT (i32.const 0x10000 (; = STACK_BASE ;))))
-  (data (i32.const 0x21214) "\08\12\02\00" "\05" "ABORT  " "\39\00\00\00")
+  (data (i32.const 0x202e4) "\d8\02\02\00" "\05" "ABORT  " "\39\00\00\00")
   (elem (i32.const 0x39 (; = ABORT_INDEX ;)) $ABORT)
 
   ;; 6.1.0680 ABORT"
@@ -735,7 +735,7 @@
     (call $emitICall (i32.const 0) (i32.const 0x85 (; = TYPE_INDEX ;)))
     (call $emitICall (i32.const 0) (i32.const 0x39 (; = ABORT_INDEX ;)))
     (call $compileThen))
-  (data (i32.const 0x21224) "\14\12\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\3a\00\00\00")
+  (data (i32.const 0x202f4) "\e4\02\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\3a\00\00\00")
   (elem (i32.const 0x3a) $ABORTq)
 
   ;; 6.1.0690
@@ -748,7 +748,7 @@
                                   (local.tee $y (i32.shr_s (local.get $v) (i32.const 31))))
                         (local.get $y)))
     (local.get $tos))
-  (data (i32.const 0x21234) "\24\12\02\00" "\03" "ABS" "\3b\00\00\00")
+  (data (i32.const 0x20304) "\f4\02\02\00" "\03" "ABS" "\3b\00\00\00")
   (elem (i32.const 0x3b) $ABS)
 
   ;; 6.1.0695
@@ -773,7 +773,7 @@
         (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 0x21240) "\34\12\02\00" "\06" "ACCEPT " "\3c\00\00\00")
+  (data (i32.const 0x20310) "\04\03\02\00" "\06" "ACCEPT " "\3c\00\00\00")
   (elem (i32.const 0x3c) $ACCEPT)
 
   ;; 6.1.0705
@@ -782,7 +782,7 @@
                         (i32.add (global.get $here) (i32.const 3))
                         (i32.const -4 (; ~3 ;))))
     (local.get $tos))
-  (data (i32.const 0x21250) "\40\12\02\00" "\05" "ALIGN  " "\3d\00\00\00")
+  (data (i32.const 0x20320) "\10\03\02\00" "\05" "ALIGN  " "\3d\00\00\00")
   (elem (i32.const 0x3d) $ALIGN)
 
   ;; 6.1.0706
@@ -792,7 +792,7 @@
                 (i32.and (i32.add (i32.load (local.get $btos)) (i32.const 3))
                         (i32.const -4 (; ~3 ;))))
     (local.get $tos))
-  (data (i32.const 0x21260) "\50\12\02\00" "\07" "ALIGNED" "\3e\00\00\00")
+  (data (i32.const 0x20330) "\20\03\02\00" "\07" "ALIGNED" "\3e\00\00\00")
   (elem (i32.const 0x3e) $ALIGNED)
 
   ;; 6.1.0710
@@ -801,7 +801,7 @@
     (local.get $tos)
     (local.set $v (call $pop))
     (global.set $here (i32.add (global.get $here) (local.get $v))))
-  (data (i32.const 0x21270) "\60\12\02\00" "\05" "ALLOT  " "\3f\00\00\00")
+  (data (i32.const 0x20340) "\30\03\02\00" "\05" "ALLOT  " "\3f\00\00\00")
   (elem (i32.const 0x3f) $ALLOT)
 
   ;; 6.1.0720
@@ -812,24 +812,24 @@
                 (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 0x21280) "\70\12\02\00" "\03" "AND" "\40\00\00\00")
+  (data (i32.const 0x20350) "\40\03\02\00" "\03" "AND" "\40\00\00\00")
   (elem (i32.const 0x40) $AND)
 
   ;; 6.1.0750 
-  (data (i32.const 0x218d4) "\c4\18\02\00" "\44" (; F_DATA ;) "BASE   " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\0a\00\00\00" (; = pack(10) ;))
+  (data (i32.const 0x2035c) "\50\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 
   (func $BEGIN (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileBegin))
-  (data (i32.const 0x2129c) "\8c\12\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN  " "\42\00\00\00")
+  (data (i32.const 0x20370) "\5c\03\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN  " "\42\00\00\00")
   (elem (i32.const 0x42) $BEGIN)
 
   ;; 6.1.0770
   (func $BL (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 32)))
-  (data (i32.const 0x212ac) "\9c\12\02\00" "\02" "BL " "\43\00\00\00")
+  (data (i32.const 0x20380) "\70\03\02\00" "\02" "BL " "\43\00\00\00")
   (elem (i32.const 0x43) $BL)
 
   ;; 6.1.0850
@@ -838,7 +838,7 @@
     (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 0x212b8) "\ac\12\02\00" "\02" "C! " "\44\00\00\00")
+  (data (i32.const 0x2038c) "\80\03\02\00" "\02" "C! " "\44\00\00\00")
   (elem (i32.const 0x44) $C!)
 
   ;; 6.1.0860
@@ -847,7 +847,7 @@
                 (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 0x212c4) "\b8\12\02\00" "\02" "C, " "\45\00\00\00")
+  (data (i32.const 0x20398) "\8c\03\02\00" "\02" "C, " "\45\00\00\00")
   (elem (i32.const 0x45) $Cc)
 
   ;; 6.1.0870
@@ -856,7 +856,7 @@
     (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 0x212d0) "\c4\12\02\00" "\02" "C@ " "\46\00\00\00")
+  (data (i32.const 0x203a4) "\98\03\02\00" "\02" "C@ " "\46\00\00\00")
   (elem (i32.const 0x46) $C@)
 
   ;; 6.1.0880
@@ -865,7 +865,7 @@
     (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 0x212dc) "\d0\12\02\00" "\05" "CELL+  " "\47\00\00\00")
+  (data (i32.const 0x203b0) "\a4\03\02\00" "\05" "CELL+  " "\47\00\00\00")
   (elem (i32.const 0x47) $CELL+)
 
   ;; 6.1.0890
@@ -874,7 +874,7 @@
     (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 0x212ec) "\dc\12\02\00" "\05" "CELLS  " "\48\00\00\00")
+  (data (i32.const 0x203c0) "\b0\03\02\00" "\05" "CELLS  " "\48\00\00\00")
   (elem (i32.const 0x48) $CELLS)
 
   ;; 6.1.0895
@@ -885,19 +885,19 @@
     (local.tee $tos)
     (i32.store (i32.sub (local.get $tos) (i32.const 4))
                 (i32.load8_u (i32.add (call $wordBase) (i32.const 1)))))
-  (data (i32.const 0x212fc) "\ec\12\02\00" "\04" "CHAR   " "\49\00\00\00")
+  (data (i32.const 0x203d0) "\c0\03\02\00" "\04" "CHAR   " "\49\00\00\00")
   (elem (i32.const 0x49) $CHAR)
 
   ;; 6.1.0897
   (func $CHAR+ (param $tos i32) (result i32)
     (call $1+ (local.get $tos)))
-  (data (i32.const 0x2130c) "\fc\12\02\00" "\05" "CHAR+  " "\4a\00\00\00")
+  (data (i32.const 0x203e0) "\d0\03\02\00" "\05" "CHAR+  " "\4a\00\00\00")
   (elem (i32.const 0x4a) $CHAR+)
 
   ;; 6.1.0898
   (func $CHARS (param $tos i32) (result i32)
     (local.get $tos))
-  (data (i32.const 0x2131c) "\0c\13\02\00" "\05" "CHARS  " "\4b\00\00\00")
+  (data (i32.const 0x203f0) "\e0\03\02\00" "\05" "CHARS  " "\4b\00\00\00")
   (elem (i32.const 0x4b) $CHARS)
 
   ;; 6.1.0950
@@ -909,7 +909,7 @@
     (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 0x2132c) "\1c\13\02\00" "\08" "CONSTANT   " "\4c\00\00\00")
+  (data (i32.const 0x20400) "\f0\03\02\00" "\08" "CONSTANT   " "\4c\00\00\00")
   (elem (i32.const 0x4c (; = CONSTANT_INDEX ;)) $CONSTANT)
 
   ;; 6.1.0980
@@ -921,13 +921,13 @@
                                                                                 (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 0x21340) "\2c\13\02\00" "\05" "COUNT  " "\4d\00\00\00")
+  (data (i32.const 0x20414) "\00\04\02\00" "\05" "COUNT  " "\4d\00\00\00")
   (elem (i32.const 0x4d) $COUNT)
 
   ;; 6.1.0990
   (func $CR (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 10)) (call $EMIT))
-  (data (i32.const 0x21350) "\40\13\02\00" "\02" "CR " "\4e\00\00\00")
+  (data (i32.const 0x20424) "\14\04\02\00" "\02" "CR " "\4e\00\00\00")
   (elem (i32.const 0x4e) $CR)
 
   ;; 6.1.1000
@@ -960,14 +960,14 @@
     (i32.store (global.get $here) (i32.const 0))
 
     (call $setFlag (i32.const 0x40 (; = F_DATA ;))))
-  (data (i32.const 0x2135c) "\50\13\02\00" "\06" "CREATE " "\4f\00\00\00")
+  (data (i32.const 0x20430) "\24\04\02\00" "\06" "CREATE " "\4f\00\00\00")
   (elem (i32.const 0x4f) $CREATE)
 
   ;; 6.1.1170
   (func $DECIMAL (param $tos i32) (result i32)
-    (i32.store (i32.const 0x218e4 (; = body(BASE) ;)) (i32.const 10))
+    (i32.store (i32.const 0x2036c (; = body(BASE) ;)) (i32.const 10))
     (local.get $tos))
-  (data (i32.const 0x2136c) "\5c\13\02\00" "\07" "DECIMAL" "\50\00\00\00")
+  (data (i32.const 0x20440) "\30\04\02\00" "\07" "DECIMAL" "\50\00\00\00")
   (elem (i32.const 0x50) $DECIMAL)
 
   ;; 6.1.1200
@@ -975,7 +975,7 @@
     (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 0x2137c) "\6c\13\02\00" "\05" "DEPTH  " "\51\00\00\00")
+  (data (i32.const 0x20450) "\40\04\02\00" "\05" "DEPTH  " "\51\00\00\00")
   (elem (i32.const 0x51) $DEPTH)
 
   ;; 6.1.1240
@@ -983,7 +983,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileDo))
-  (data (i32.const 0x2138c) "\7c\13\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\52\00\00\00")
+  (data (i32.const 0x20460) "\50\04\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\52\00\00\00")
   (elem (i32.const 0x52) $DO)
 
   ;; 6.1.1250
@@ -995,13 +995,13 @@
     (call $endColon)
     (call $startColon (i32.const 1))
     (call $compilePushLocal (i32.const 1)))
-  (data (i32.const 0x21398) "\8c\13\02\00" "\85" (; F_IMMEDIATE ;) "DOES>  " "\53\00\00\00")
+  (data (i32.const 0x2046c) "\60\04\02\00" "\85" (; F_IMMEDIATE ;) "DOES>  " "\53\00\00\00")
   (elem (i32.const 0x53) $DOES>)
 
   ;; 6.1.1260
   (func $DROP (param $tos i32) (result i32)
     (i32.sub (local.get $tos) (i32.const 4)))
-  (data (i32.const 0x213a8) "\98\13\02\00" "\04" "DROP   " "\54\00\00\00")
+  (data (i32.const 0x2047c) "\6c\04\02\00" "\04" "DROP   " "\54\00\00\00")
   (elem (i32.const 0x54) $DROP)
 
   ;; 6.1.1290
@@ -1009,7 +1009,7 @@
     (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 0x213b8) "\a8\13\02\00" "\03" "DUP" "\55\00\00\00")
+  (data (i32.const 0x2048c) "\7c\04\02\00" "\03" "DUP" "\55\00\00\00")
   (elem (i32.const 0x55) $DUP)
 
   ;; 6.1.1310
@@ -1017,14 +1017,14 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitElse))
-  (data (i32.const 0x213c4) "\b8\13\02\00" "\84" (; F_IMMEDIATE ;) "ELSE   " "\56\00\00\00")
+  (data (i32.const 0x20498) "\8c\04\02\00" "\84" (; F_IMMEDIATE ;) "ELSE   " "\56\00\00\00")
   (elem (i32.const 0x56) $ELSE)
 
   ;; 6.1.1320
   (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 0x213d4) "\c4\13\02\00" "\04" "EMIT   " "\57\00\00\00")
+  (data (i32.const 0x204a8) "\98\04\02\00" "\04" "EMIT   " "\57\00\00\00")
   (elem (i32.const 0x57) $EMIT)
 
   ;; 6.1.1345
@@ -1049,7 +1049,7 @@
           (else
             (i32.store (local.get $bbtos) (i32.const 0))
             (local.get $btos))))))
-  (data (i32.const 0x218ac) "\9c\18\02\00" "\0c" "ENVIRONMENT?   " "\a9\00\00\00")
+  (data (i32.const 0x204b8) "\a8\04\02\00" "\0c" "ENVIRONMENT?   " "\a9\00\00\00")
   (elem (i32.const 0xa9) $ENVIRONMENT?)
 
   ;; 6.2.1350
@@ -1060,7 +1060,7 @@
       (i32.const 0)
       (i32.load (i32.sub (local.get $tos) (i32.const 4))))
     (local.get $bbtos))
-  (data (i32.const 0x21770) "\64\17\02\00" "\05" "ERASE  " "\95\00\00\00")
+  (data (i32.const 0x204d0) "\b8\04\02\00" "\05" "ERASE  " "\95\00\00\00")
   (elem (i32.const 0x95) $ERASE)
 
   ;; 6.1.1360
@@ -1073,23 +1073,23 @@
 
     ;; Save input state
     (local.set $prevSourceID (global.get $sourceID))
-    (local.set $prevIn (i32.load (i32.const 0x21908 (; = body(>IN) ;))))
+    (local.set $prevIn (i32.load (i32.const 0x202a8 (; = 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 0x21908 (; = body(>IN) ;)) (i32.const 0))
+    (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (i32.const 0))
 
     (drop (call $interpret (local.get $bbtos)))
 
     ;; Restore input state
     (global.set $sourceID (local.get $prevSourceID))
-    (i32.store (i32.const 0x21908 (; = body(>IN) ;)) (local.get $prevIn))
+    (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (local.get $prevIn))
     (global.set $inputBufferBase (local.get $prevInputBufferBase))
     (global.set $inputBufferSize (local.get $prevInputBufferSize)))
-  (data (i32.const 0x213f8) "\e4\13\02\00" "\08" "EVALUATE   " "\59\00\00\00")
+  (data (i32.const 0x204e0) "\d0\04\02\00" "\08" "EVALUATE   " "\59\00\00\00")
   (elem (i32.const 0x59) $EVALUATE)
 
   ;; 6.1.1370
@@ -1105,7 +1105,7 @@
                                         (i32.load (local.get $body))))
       (else
         (call_indirect (type $word) (i32.load (local.get $body))))))
-  (data (i32.const 0x2140c) "\f8\13\02\00" "\07" "EXECUTE" "\5a\00\00\00")
+  (data (i32.const 0x204f4) "\e0\04\02\00" "\07" "EXECUTE" "\5a\00\00\00")
   (elem (i32.const 0x5a) $EXECUTE)
 
   ;; 6.1.1380
@@ -1113,13 +1113,13 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitReturn))
-  (data (i32.const 0x2141c) "\0c\14\02\00" "\84" (; F_IMMEDIATE ;) "EXIT   " "\5b\00\00\00")
+  (data (i32.const 0x20504) "\f4\04\02\00" "\84" (; F_IMMEDIATE ;) "EXIT   " "\5b\00\00\00")
   (elem (i32.const 0x5b) $EXIT)
 
   ;; 6.2.1485
   (func $FALSE (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 0x0)))
-  (data (i32.const 0x2183c) "\2c\18\02\00" "\05" "FALSE  " "\a2\00\00\00")
+  (data (i32.const 0x20514) "\04\05\02\00" "\05" "FALSE  " "\a2\00\00\00")
   (elem (i32.const 0xa2) $FALSE)
 
   ;; 6.1.1540
@@ -1130,7 +1130,7 @@
       (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 0x2142c) "\1c\14\02\00" "\04" "FILL   " "\5c\00\00\00")
+  (data (i32.const 0x20524) "\14\05\02\00" "\04" "FILL   " "\5c\00\00\00")
   (elem (i32.const 0x5c) $FILL)
 
   ;; 6.1.1550
@@ -1163,7 +1163,7 @@
       (local.set $entryP (i32.load (local.get $entryP)))
       (br_if $loop (local.get $entryP)))
     (call $push (local.get $tos) (i32.const 0)))
-  (data (i32.const 0x2143c) "\2c\14\02\00" "\04" "FIND   " "\5d\00\00\00")
+  (data (i32.const 0x20534) "\24\05\02\00" "\04" "FIND   " "\5d\00\00\00")
   (elem (i32.const 0x5d) $FIND)
 
   ;; 6.1.1561
@@ -1191,21 +1191,21 @@
     (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 0x2144c) "\3c\14\02\00" "\06" "FM/MOD " "\5e\00\00\00")
+  (data (i32.const 0x20544) "\34\05\02\00" "\06" "FM/MOD " "\5e\00\00\00")
   (elem (i32.const 0x5e) $FM/MOD)
 
   ;; 6.1.1650
   (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 0x2145c) "\4c\14\02\00" "\04" "HERE   " "\5f\00\00\00")
+  (data (i32.const 0x20554) "\44\05\02\00" "\04" "HERE   " "\5f\00\00\00")
   (elem (i32.const 0x5f) $HERE)
 
   ;; 6.2.1660
   (func $HEX (param $tos i32) (result i32)
-    (i32.store (i32.const 0x218e4 (; = body(BASE) ;)) (i32.const 16))
+    (i32.store (i32.const 0x2036c (; = body(BASE) ;)) (i32.const 16))
     (local.get $tos))
-  (data (i32.const 0x21820) "\08\18\02\00" "\03" "HEX" "\a0\00\00\00")
+  (data (i32.const 0x20564) "\54\05\02\00" "\03" "HEX" "\a0\00\00\00")
   (elem (i32.const 0xa0) $HEX)
 
   ;; 6.1.1670
@@ -1217,14 +1217,14 @@
       (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 0x2146c) "\5c\14\02\00" "\04" "HOLD   " "\60\00\00\00")
+  (data (i32.const 0x20570) "\64\05\02\00" "\04" "HOLD   " "\60\00\00\00")
   (elem (i32.const 0x60) $HOLD)
 
   ;; 6.1.1680
   (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 0x2147c) "\6c\14\02\00" "\01" "I  " "\61\00\00\00")
+  (data (i32.const 0x20580) "\70\05\02\00" "\01" "I  " "\61\00\00\00")
   (elem (i32.const 0x61) $I)
 
   ;; 6.1.1700
@@ -1232,14 +1232,14 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileIf))
-  (data (i32.const 0x21488) "\7c\14\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\62\00\00\00")
+  (data (i32.const 0x2058c) "\80\05\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\62\00\00\00")
   (elem (i32.const 0x62) $IF)
 
   ;; 6.1.1710
   (func $IMMEDIATE (param $tos i32) (result i32)
     (call $setFlag (i32.const 0x80 (; = F_IMMEDIATE ;)))
     (local.get $tos))
-  (data (i32.const 0x21494) "\88\14\02\00" "\09" "IMMEDIATE  " "\63\00\00\00")
+  (data (i32.const 0x20598) "\8c\05\02\00" "\09" "IMMEDIATE  " "\63\00\00\00")
   (elem (i32.const 0x63) $IMMEDIATE)
 
   ;; 6.1.1720
@@ -1248,27 +1248,27 @@
     (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 0x214a8) "\94\14\02\00" "\06" "INVERT " "\64\00\00\00")
+  (data (i32.const 0x205ac) "\98\05\02\00" "\06" "INVERT " "\64\00\00\00")
   (elem (i32.const 0x64) $INVERT)
 
   ;; 6.1.1730
   (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 0x214b8) "\a8\14\02\00" "\01" "J  " "\65\00\00\00")
+  (data (i32.const 0x205bc) "\ac\05\02\00" "\01" "J  " "\65\00\00\00")
   (elem (i32.const 0x65) $J)
 
   ;; 6.1.1750
   (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 0x214c4) "\b8\14\02\00" "\03" "KEY" "\66\00\00\00")
+  (data (i32.const 0x205c8) "\bc\05\02\00" "\03" "KEY" "\66\00\00\00")
   (elem (i32.const 0x66) $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 0x217f8) "\ec\17\02\00" "\06" "LATEST " "\9e\00\00\00")
+  (data (i32.const 0x205d4) "\c8\05\02\00" "\06" "LATEST " "\9e\00\00\00")
   (elem (i32.const 0x9e) $LATEST)
 
   ;; 6.1.1760
@@ -1276,7 +1276,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileLeave))
-  (data (i32.const 0x214d0) "\c4\14\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE  " "\67\00\00\00")
+  (data (i32.const 0x205e4) "\d4\05\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE  " "\67\00\00\00")
   (elem (i32.const 0x67) $LEAVE)
 
   ;; 6.1.1780
@@ -1284,7 +1284,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x214e0) "\d0\14\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\68\00\00\00")
+  (data (i32.const 0x205f4) "\e4\05\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\68\00\00\00")
   (elem (i32.const 0x68) $LITERAL)
 
   ;; 6.1.1800
@@ -1292,7 +1292,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileLoop))
-  (data (i32.const 0x214f0) "\e0\14\02\00" "\84" (; F_IMMEDIATE ;) "LOOP   " "\69\00\00\00")
+  (data (i32.const 0x20604) "\f4\05\02\00" "\84" (; F_IMMEDIATE ;) "LOOP   " "\69\00\00\00")
   (elem (i32.const 0x69) $LOOP)
 
   ;; 6.1.1805
@@ -1303,7 +1303,7 @@
                 (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 0x21500) "\f0\14\02\00" "\06" "LSHIFT " "\6a\00\00\00")
+  (data (i32.const 0x20614) "\04\06\02\00" "\06" "LSHIFT " "\6a\00\00\00")
   (elem (i32.const 0x6a) $LSHIFT)
 
   ;; 6.1.1810
@@ -1314,7 +1314,7 @@
                         (i64.extend_i32_s (i32.load (i32.sub (local.get $tos) 
                                                               (i32.const 4))))))
     (local.get $tos))
-  (data (i32.const 0x21510) "\00\15\02\00" "\02" "M* " "\6b\00\00\00")
+  (data (i32.const 0x20624) "\14\06\02\00" "\02" "M* " "\6b\00\00\00")
   (elem (i32.const 0x6b) $M*)
 
   ;; 6.1.1870
@@ -1328,7 +1328,7 @@
       (then
         (i32.store (local.get $bbtos) (local.get $v))))
     (local.get $btos))
-  (data (i32.const 0x2151c) "\10\15\02\00" "\03" "MAX" "\6c\00\00\00")
+  (data (i32.const 0x20630) "\24\06\02\00" "\03" "MAX" "\6c\00\00\00")
   (elem (i32.const 0x6c) $MAX)
 
   ;; 6.1.1880
@@ -1342,7 +1342,7 @@
       (then
         (i32.store (local.get $bbtos) (local.get $v))))
     (local.get $btos))
-  (data (i32.const 0x21528) "\1c\15\02\00" "\03" "MIN" "\6d\00\00\00")
+  (data (i32.const 0x2063c) "\30\06\02\00" "\03" "MIN" "\6d\00\00\00")
   (elem (i32.const 0x6d) $MIN)
 
   ;; 6.1.1890
@@ -1353,7 +1353,7 @@
                 (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 0x21534) "\28\15\02\00" "\03" "MOD" "\6e\00\00\00")
+  (data (i32.const 0x20648) "\3c\06\02\00" "\03" "MOD" "\6e\00\00\00")
   (elem (i32.const 0x6e) $MOD)
 
   ;; 6.1.1900
@@ -1364,7 +1364,7 @@
       (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 0x21540) "\34\15\02\00" "\04" "MOVE   " "\6f\00\00\00")
+  (data (i32.const 0x20654) "\48\06\02\00" "\04" "MOVE   " "\6f\00\00\00")
   (elem (i32.const 0x6f) $MOVE)
 
   ;; 6.1.1910
@@ -1373,14 +1373,14 @@
     (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 0x21550) "\40\15\02\00" "\06" "NEGATE " "\70\00\00\00")
+  (data (i32.const 0x20664) "\54\06\02\00" "\06" "NEGATE " "\70\00\00\00")
   (elem (i32.const 0x70) $NEGATE)
 
   ;; 6.2.1930
   (func $NIP (param $tos i32) (result i32)
     (local.get $tos)
     (call $SWAP) (call $DROP))
-  (data (i32.const 0x2184c) "\3c\18\02\00" "\03" "NIP" "\a3\00\00\00")
+  (data (i32.const 0x20674) "\64\06\02\00" "\03" "NIP" "\a3\00\00\00")
   (elem (i32.const 0xa3) $NIP)
 
   ;; 6.1.1980
@@ -1391,7 +1391,7 @@
                 (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 0x21560) "\50\15\02\00" "\02" "OR " "\71\00\00\00")
+  (data (i32.const 0x20680) "\74\06\02\00" "\02" "OR " "\71\00\00\00")
   (elem (i32.const 0x71) $OR)
 
   ;; 6.1.1990
@@ -1399,7 +1399,7 @@
     (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 0x2156c) "\60\15\02\00" "\04" "OVER   " "\72\00\00\00")
+  (data (i32.const 0x2068c) "\80\06\02\00" "\04" "OVER   " "\72\00\00\00")
   (elem (i32.const 0x72) $OVER)
 
   ;; 6.2.2030
@@ -1411,7 +1411,7 @@
           (local.get $tos) 
           (i32.shl (i32.add (i32.load (local.get $btos)) (i32.const 2)) (i32.const 2)))))
     (local.get $tos))
-  (data (i32.const 0x21780) "\70\17\02\00" "\04" "PICK   " "\96\00\00\00")
+  (data (i32.const 0x2069c) "\8c\06\02\00" "\04" "PICK   " "\96\00\00\00")
   (elem (i32.const 0x96) $PICK)
 
   ;; 6.1.2033
@@ -1434,7 +1434,7 @@
       (else
         (call $emitConst (local.get $FINDToken))
         (call $emitICall (i32.const 1) (i32.const 0x5 (; = COMPILE_CALL_INDEX ;))))))
-  (data (i32.const 0x2157c) "\6c\15\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE   " "\73\00\00\00")
+  (data (i32.const 0x206ac) "\9c\06\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE   " "\73\00\00\00")
   (elem (i32.const 0x73) $POSTPONE)
 
   ;; 6.1.2050
@@ -1442,9 +1442,9 @@
     (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 0x218f8 (; = body(STATE) ;)) (i32.const 0))
+    (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 0))
     (unreachable))
-  (data (i32.const 0x21590) "\7c\15\02\00" "\04" "QUIT   " "\74\00\00\00")
+  (data (i32.const 0x206c0) "\ac\06\02\00" "\04" "QUIT   " "\74\00\00\00")
   (elem (i32.const 0x74) $QUIT)
 
   ;; 6.1.2060
@@ -1452,14 +1452,14 @@
     (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 0x215a0) "\90\15\02\00" "\02" "R> " "\75\00\00\00")
+  (data (i32.const 0x206d0) "\c0\06\02\00" "\02" "R> " "\75\00\00\00")
   (elem (i32.const 0x75) $R>)
 
   ;; 6.1.2070
   (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 0x215ac) "\a0\15\02\00" "\02" "R@ " "\76\00\00\00")
+  (data (i32.const 0x206dc) "\d0\06\02\00" "\02" "R@ " "\76\00\00\00")
   (elem (i32.const 0x76) $R@)
 
   ;; 6.1.2120 
@@ -1467,7 +1467,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileRecurse))
-  (data (i32.const 0x215b8) "\ac\15\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\77\00\00\00")
+  (data (i32.const 0x206e8) "\dc\06\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\77\00\00\00")
   (elem (i32.const 0x77) $RECURSE)
 
   ;; 6.2.2125
@@ -1486,9 +1486,9 @@
     (if (param i32) (result i32) (i32.eqz (global.get $inputBufferSize))
       (then (call $push (i32.const 0)))
       (else 
-        (i32.store (i32.const 0x21908 (; = body(>IN) ;)) (i32.const 0))
+        (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (i32.const 0))
         (call $push (i32.const -1)))))
-  (data (i32.const 0x21790) "\80\17\02\00" "\06" "REFILL " "\97\00\00\00")
+  (data (i32.const 0x206f8) "\e8\06\02\00" "\06" "REFILL " "\97\00\00\00")
   (elem (i32.const 0x97) $REFILL)
 
   ;; 6.1.2140
@@ -1496,7 +1496,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileRepeat))
-  (data (i32.const 0x215c8) "\b8\15\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\78\00\00\00")
+  (data (i32.const 0x20708) "\f8\06\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\78\00\00\00")
   (elem (i32.const 0x78) $REPEAT)
 
   ;; 6.1.2160 ROT 
@@ -1512,7 +1512,7 @@
       (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 0x215d8) "\c8\15\02\00" "\03" "ROT" "\79\00\00\00")
+  (data (i32.const 0x20718) "\08\07\02\00" "\03" "ROT" "\79\00\00\00")
   (elem (i32.const 0x79) $ROT)
 
   ;; 6.1.2162
@@ -1523,7 +1523,7 @@
                 (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 0x215e4) "\d8\15\02\00" "\06" "RSHIFT " "\7a\00\00\00")
+  (data (i32.const 0x20724) "\18\07\02\00" "\06" "RSHIFT " "\7a\00\00\00")
   (elem (i32.const 0x7a) $RSHIFT)
 
   ;; 6.1.2165
@@ -1544,7 +1544,7 @@
     (call $compilePushConst (local.get $start))
     (call $compilePushConst (i32.sub (global.get $here) (local.get $start)))
     (call $ALIGN))
-  (data (i32.const 0x215f4) "\e4\15\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\7b\00\00\00")
+  (data (i32.const 0x20734) "\24\07\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\7b\00\00\00")
   (elem (i32.const 0x7b) $Sq)
 
   ;; 6.1.2170
@@ -1553,14 +1553,14 @@
     (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 0x21600) "\f4\15\02\00" "\03" "S>D" "\7c\00\00\00")
+  (data (i32.const 0x20740) "\34\07\02\00" "\03" "S>D" "\7c\00\00\00")
   (elem (i32.const 0x7c) $S>D)
 
   (func $SCALL (param $tos i32) (result i32)
     (global.set $tos (local.get $tos))
     (call $shell_call)
     (global.get $tos))
-  (data (i32.const 0x218c4) "\ac\18\02\00" "\05" "SCALL  " "\aa\00\00\00")
+  (data (i32.const 0x2074c) "\40\07\02\00" "\05" "SCALL  " "\aa\00\00\00")
   (elem (i32.const 0xaa) $SCALL)
 
   ;; 6.1.2210
@@ -1572,7 +1572,7 @@
         (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 0x2160c) "\00\16\02\00" "\04" "SIGN   " "\7d\00\00\00")
+  (data (i32.const 0x2075c) "\4c\07\02\00" "\04" "SIGN   " "\7d\00\00\00")
   (elem (i32.const 0x7d) $SIGN)
 
   ;; 6.1.2214
@@ -1593,7 +1593,7 @@
       (i32.wrap_i64 
         (i64.div_s (local.get $n1) (local.get $n2))))
     (local.get $btos))
-  (data (i32.const 0x2161c) "\0c\16\02\00" "\06" "SM/REM " "\7e\00\00\00")
+  (data (i32.const 0x2076c) "\5c\07\02\00" "\06" "SM/REM " "\7e\00\00\00")
   (elem (i32.const 0x7e) $SM/REM)
 
   ;; 6.1.2216
@@ -1601,20 +1601,20 @@
     (local.get $tos)
     (call $push (global.get $inputBufferBase))
     (call $push (global.get $inputBufferSize)))
-  (data (i32.const 0x2162c) "\1c\16\02\00" "\06" "SOURCE " "\7f\00\00\00")
+  (data (i32.const 0x2077c) "\6c\07\02\00" "\06" "SOURCE " "\7f\00\00\00")
   (elem (i32.const 0x7f) $SOURCE)
 
   ;; 6.1.2250
   (func $SOURCE-ID (param $tos i32) (result i32)
     (call $push (local.get $tos) (global.get $sourceID)))
-  (data (i32.const 0x217c8) "\bc\17\02\00" "\09" "SOURCE-ID  " "\9b\00\00\00")
+  (data (i32.const 0x2078c) "\7c\07\02\00" "\09" "SOURCE-ID  " "\9b\00\00\00")
   (elem (i32.const 0x9b) $SOURCE-ID)
 
   ;; 6.1.2220
   (func $SPACE (param $tos i32) (result i32)
     (local.get $tos)
     (call $BL) (call $EMIT))
-  (data (i32.const 0x2163c) "\2c\16\02\00" "\05" "SPACE  " "\80\00\00\00")
+  (data (i32.const 0x207a0) "\8c\07\02\00" "\05" "SPACE  " "\80\00\00\00")
   (elem (i32.const 0x80) $SPACE)
 
   ;; 6.1.2230
@@ -1628,11 +1628,11 @@
         (call $SPACE)
         (local.set $i (i32.sub (local.get $i) (i32.const 1)))
         (br $loop))))
-  (data (i32.const 0x2164c) "\3c\16\02\00" "\06" "SPACES " "\81\00\00\00")
+  (data (i32.const 0x207b0) "\a0\07\02\00" "\06" "SPACES " "\81\00\00\00")
   (elem (i32.const 0x81) $SPACES)
 
   ;; 6.1.2250
-  (data (i32.const 0x218e8) "\d4\18\02\00" "\45" (; F_DATA ;) "STATE  " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;))
+  (data (i32.const 0x207c0) "\b0\07\02\00" "\45" (; F_DATA ;) "STATE  " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;))
 
   ;; 6.1.2260
   (func $SWAP (param $tos i32) (result i32)
@@ -1644,7 +1644,7 @@
                 (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 0x2166c) "\5c\16\02\00" "\04" "SWAP   " "\83\00\00\00")
+  (data (i32.const 0x207d4) "\c0\07\02\00" "\04" "SWAP   " "\83\00\00\00")
   (elem (i32.const 0x83) $SWAP)
 
   ;; 6.1.2270
@@ -1652,7 +1652,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileThen))
-  (data (i32.const 0x2167c) "\6c\16\02\00" "\84" (; F_IMMEDIATE ;) "THEN   " "\84\00\00\00")
+  (data (i32.const 0x207e4) "\d4\07\02\00" "\84" (; F_IMMEDIATE ;) "THEN   " "\84\00\00\00")
   (elem (i32.const 0x84) $THEN)
 
   ;; 6.2.2295
@@ -1669,20 +1669,20 @@
     (local.set $xt (call $pop))
     (local.set $v (call $pop))
     (i32.store (i32.add (call $body (local.get $xt)) (i32.const 4)) (local.get $v)))
-  (data (i32.const 0x217a0) "\90\17\02\00" "\02" "TO " "\98\00\00\00")
+  (data (i32.const 0x207f4) "\e4\07\02\00" "\02" "TO " "\98\00\00\00")
   (elem (i32.const 0x98) $TO)
 
   ;; 6.2.2298
   (func $TRUE (param $tos i32) (result i32)
     (call $push (local.get $tos) (i32.const 0xffffffff)))
-  (data (i32.const 0x2182c) "\20\18\02\00" "\04" "TRUE   " "\a1\00\00\00")
+  (data (i32.const 0x20800) "\f4\07\02\00" "\04" "TRUE   " "\a1\00\00\00")
   (elem (i32.const 0xa1) $TRUE)
 
   ;; 6.2.2300
   (func $TUCK (param $tos i32) (result i32)
     (local.get $tos)
     (call $SWAP) (call $OVER))
-  (data (i32.const 0x2190c) "\fc\18\02\00" "\04" "TUCK   " "\a4\00\00\00")
+  (data (i32.const 0x20810) "\00\08\02\00" "\04" "TUCK   " "\a4\00\00\00")
   (elem (i32.const 0xa4) $TUCK)
 
   ;; 6.1.2310 TYPE 
@@ -1694,15 +1694,15 @@
     (local.set $p (call $pop))
     (call $type (local.get $len) (local.get $p)))
   ;; WARNING: If you change this table index, make sure the emitted ICalls are also updated
-  (data (i32.const 0x2168c) "\7c\16\02\00" "\04" "TYPE   " "\85\00\00\00")
+  (data (i32.const 0x20820) "\10\08\02\00" "\04" "TYPE   " "\85\00\00\00")
   (elem (i32.const 0x85) $TYPE) ;; none
 
   ;; 6.1.2320
   (func $U. (param $tos i32) (result i32)
     (local.get $tos)
-    (call $U._ (call $pop) (i32.load (i32.const 0x218e4 (; = body(BASE) ;))))
+    (call $U._ (call $pop) (i32.load (i32.const 0x2036c (; = body(BASE) ;))))
     (call $shell_emit (i32.const 0x20)))
-  (data (i32.const 0x2169c) "\8c\16\02\00" "\02" "U. " "\86\00\00\00")
+  (data (i32.const 0x20830) "\20\08\02\00" "\02" "U. " "\86\00\00\00")
   (elem (i32.const 0x86) $U.)
 
   ;; 6.1.2340
@@ -1714,7 +1714,7 @@
       (then (i32.store (local.get $bbtos) (i32.const -1)))
       (else (i32.store (local.get $bbtos) (i32.const 0))))
     (local.get $btos))
-  (data (i32.const 0x216a8) "\9c\16\02\00" "\02" "U< " "\87\00\00\00")
+  (data (i32.const 0x2083c) "\30\08\02\00" "\02" "U< " "\87\00\00\00")
   (elem (i32.const 0x87) $U<)
 
   ;; 6.1.2360
@@ -1725,7 +1725,7 @@
                         (i64.extend_i32_u (i32.load (i32.sub (local.get $tos) 
                                                               (i32.const 4))))))
     (local.get $tos))
-  (data (i32.const 0x216b4) "\a8\16\02\00" "\03" "UM*" "\88\00\00\00")
+  (data (i32.const 0x20848) "\3c\08\02\00" "\03" "UM*" "\88\00\00\00")
   (elem (i32.const 0x88) $UM*)
 
   ;; 6.1.2370
@@ -1745,7 +1745,7 @@
       (i32.wrap_i64 
         (i64.div_u (local.get $n1) (local.get $n2))))
     (local.get $btos))
-  (data (i32.const 0x216c0) "\b4\16\02\00" "\06" "UM/MOD " "\89\00\00\00")
+  (data (i32.const 0x20854) "\48\08\02\00" "\06" "UM/MOD " "\89\00\00\00")
   (elem (i32.const 0x89) $UM/MOD) ;; TODO: Rename
 
   ;; 6.1.2380
@@ -1753,7 +1753,7 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $emitICall (i32.const 0) (i32.const 0x9 (; = END_DO_INDEX ;))))
-  (data (i32.const 0x216d0) "\c0\16\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\8a\00\00\00")
+  (data (i32.const 0x20864) "\54\08\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\8a\00\00\00")
   (elem (i32.const 0x8a) $UNLOOP)
 
   ;; 6.1.2390
@@ -1761,14 +1761,14 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileUntil))
-  (data (i32.const 0x216e0) "\d0\16\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL  " "\8b\00\00\00")
+  (data (i32.const 0x20874) "\64\08\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL  " "\8b\00\00\00")
   (elem (i32.const 0x8b) $UNTIL)
 
   ;; 6.1.2395
   (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 0x217ac) "\a0\17\02\00" "\06" "UNUSED " "\99\00\00\00")
+  (data (i32.const 0x20884) "\74\08\02\00" "\06" "UNUSED " "\99\00\00\00")
   (elem (i32.const 0x99) $UNUSED)
 
   (func $UWIDTH (param $tos i32) (result i32)
@@ -1777,7 +1777,7 @@
     (local $base i32)
     (local.get $tos)
     (local.set $v (call $pop))
-    (local.set $base (i32.load (i32.const 0x218e4 (; = body(BASE) ;))))
+    (local.set $base (i32.load (i32.const 0x2036c (; = body(BASE) ;))))
     (block $endLoop
       (loop $loop
         (br_if $endLoop (i32.eqz (local.get $v)))
@@ -1785,18 +1785,18 @@
         (local.set $v (i32.div_s (local.get $v) (local.get $base)))
         (br $loop)))
     (call $push (local.get $r)))
-  (data (i32.const 0x21864) "\58\18\02\00" "\06" "UWIDTH " "\a5\00\00\00")
+  (data (i32.const 0x20894) "\84\08\02\00" "\06" "UWIDTH " "\a5\00\00\00")
   (elem (i32.const 0xa5) $UWIDTH)
 
   ;; 6.2.2405
-  (data (i32.const 0x21874) "\64\18\02\00" "\05" "VALUE  " "\4c\00\00\00" (; = pack(CONSTANT_INDEX) ;))
+  (data (i32.const 0x208a4) "\94\08\02\00" "\05" "VALUE  " "\4c\00\00\00" (; = pack(CONSTANT_INDEX) ;))
 
   ;; 6.1.2410
   (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 0x216f0) "\e0\16\02\00" "\08" "VARIABLE   " "\8c\00\00\00")
+  (data (i32.const 0x208b4) "\a4\08\02\00" "\08" "VARIABLE   " "\8c\00\00\00")
   (elem (i32.const 0x8c) $VARIABLE)
 
   ;; 6.1.2430
@@ -1804,14 +1804,14 @@
     (local.get $tos)
     (call $ensureCompiling)
     (call $compileWhile))
-  (data (i32.const 0x21704) "\f0\16\02\00" "\85" (; F_IMMEDIATE ;) "WHILE  " "\8d\00\00\00")
+  (data (i32.const 0x208c8) "\b4\08\02\00" "\85" (; F_IMMEDIATE ;) "WHILE  " "\8d\00\00\00")
   (elem (i32.const 0x8d) $WHILE)
 
   ;; 6.1.2450
   (func $WORD (param $tos i32) (result i32)
     (local.get $tos)
     (call $readWord (call $pop)))
-  (data (i32.const 0x21714) "\04\17\02\00" "\04" "WORD   " "\8e\00\00\00")
+  (data (i32.const 0x208d8) "\c8\08\02\00" "\04" "WORD   " "\8e\00\00\00")
   (elem (i32.const 0x8e) $WORD)
 
   ;; 15.6.1.2465
@@ -1833,7 +1833,7 @@
       (local.set $entryP (i32.load (local.get $entryP)))
       (br_if $loop (local.get $entryP)))
     (local.get $tos))
-  (data (i32.const 0x2189c) "\90\18\02\00" "\05" "WORDS  " "\a8\00\00\00")
+  (data (i32.const 0x208e8) "\d8\08\02\00" "\05" "WORDS  " "\a8\00\00\00")
   (elem (i32.const 0xa8) $WORDS)
 
   ;; 6.1.2490
@@ -1844,15 +1844,15 @@
                 (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 0x21724) "\14\17\02\00" "\03" "XOR" "\8f\00\00\00")
+  (data (i32.const 0x208f8) "\e8\08\02\00" "\03" "XOR" "\8f\00\00\00")
   (elem (i32.const 0x8f) $XOR)
 
   ;; 6.1.2500
   (func $left-bracket (param $tos i32) (result i32)
     (local.get $tos)
     (call $ensureCompiling)
-    (i32.store (i32.const 0x218f8 (; = body(STATE) ;)) (i32.const 0)))
-  (data (i32.const 0x21730) "\24\17\02\00" "\81" (; F_IMMEDIATE ;) "[  " "\90\00\00\00")
+    (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 0)))
+  (data (i32.const 0x20904) "\f8\08\02\00" "\81" (; F_IMMEDIATE ;) "[  " "\90\00\00\00")
   (elem (i32.const 0x90) $left-bracket)
 
   ;; 6.1.2510
@@ -1861,7 +1861,7 @@
     (call $ensureCompiling)
     (call $')
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x2173c) "\30\17\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\91\00\00\00")
+  (data (i32.const 0x20910) "\04\09\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\91\00\00\00")
   (elem (i32.const 0x91) $bracket-tick)
 
   ;; 6.1.2520
@@ -1870,7 +1870,7 @@
     (call $ensureCompiling)
     (call $CHAR)
     (call $compilePushConst (call $pop)))
-  (data (i32.const 0x21748) "\3c\17\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\92\00\00\00")
+  (data (i32.const 0x2091c) "\10\09\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\92\00\00\00")
   (elem (i32.const 0x92) $bracket-char)
 
   ;; 6.2.2535
@@ -1884,24 +1884,16 @@
         (br_if $endSkipComments (i32.eq (local.get $char) (i32.const -1)))
         (br $skipComments)))
     (local.get $tos))
-  (data (i32.const 0x217bc) "\ac\17\02\00" "\81" (; F_IMMEDIATE ;) "\5c  " "\9a\00\00\00")
+  (data (i32.const 0x2092c) "\1c\09\02\00" "\81" (; F_IMMEDIATE ;) "\5c  " "\9a\00\00\00")
   (elem (i32.const 0x9a) $\)
 
   ;; 6.1.2540
   (func $right-bracket (param $tos i32) (result i32)
-    (i32.store (i32.const 0x218f8 (; = body(STATE) ;)) (i32.const 1))
+    (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 1))
     (local.get $tos))
-  (data (i32.const 0x21758) "\48\17\02\00" "\01" "]  " "\93\00\00\00")
+  (data (i32.const 0x20938) "\2c\09\02\00" "\01" "]  " "\93\00\00\00")
   (elem (i32.const 0x93) $right-bracket)
 
-  (data (i32.const 135820) "\80\12\02\00" "\26" (; HIDDEN ;) "UNDEFIN" "A\00\00\00")
-  (data (i32.const 136796) "L\16\02\00" "\26" (; HIDDEN ;) "UNDEFIN" "\82\00\00\00")
-  (data (i32.const 137180) "\c8\17\02\00" "\24" (; HIDDEN ;) "UNDEFIN" "\9c\00\00\00")
-  (data (i32.const 0x217ec) "\dc\17\02\00" "\22" (; F_HIDDEN ;) "UN " "\9d\00\00\00")
-  (data (i32.const 0x21858) "\4c\18\02\00" "\23" (; HIDDEN ;) "UND" "\a4\00\00\00")
-  (data (i32.const 136164) "\d4\13\02\00" "\2b" (; HIDDEN ;) "UNDEFINED__" "X\00\00\00")
-  (data (i32.const 137224) "\f8\17\02\00" "\2c" (; HIDDEN ;) "UNDEFINED___\00\00\00" "\9f\00\00\00")
-  (data (i32.const 135632) "\c0\11\02\00" "\23" (; HIDDEN;) "UND" "4\00\00\00")
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; Interpreter
@@ -1930,7 +1922,7 @@
             (if (param i32 i32) (result i32) (i32.eqz (call $readNumber))
               (then ;; It's a number. Are we compiling?
                 (local.set $number)
-                (if (param i32) (result i32) (i32.load (i32.const 0x218f8 (; = body(STATE) ;)))
+                (if (param i32) (result i32) (i32.load (i32.const 0x207d0 (; = body(STATE) ;)))
                   (then
                     ;; We're compiling. Pop it off the stack and 
                     ;; add it to the compiled list
@@ -1943,7 +1935,7 @@
                 (call $failUndefinedWord))))
           (else ;; Found the word. 
             ;; Are we compiling or is it immediate?
-            (if (param i32) (result i32) (i32.or (i32.eqz (i32.load (i32.const 0x218f8 (; = body(STATE) ;))))
+            (if (param i32) (result i32) (i32.or (i32.eqz (i32.load (i32.const 0x207d0 (; = body(STATE) ;))))
                         (i32.eq (local.get $FINDResult) (i32.const 1)))
               (then
                 (call $push (local.get $FINDToken))
@@ -1954,7 +1946,7 @@
           (br $loop)))
     ;; 'WORD' left the address on the stack
     (drop (call $pop))
-    (i32.load (i32.const 0x218f8 (; = body(STATE) ;))))
+    (i32.load (i32.const 0x207d0 (; = body(STATE) ;))))
 
   (func $readWord (param $tos i32) (param $delimiter i32) (result i32)
     (local $char i32)
@@ -2016,7 +2008,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 0x218e4 (; = body(BASE) ;))))
+    (local.set $base (i32.load (i32.const 0x2036c (; = body(BASE) ;))))
 
     ;; Read first character
     (if (i32.eq (local.tee $char (i32.load8_u (local.get $p))) (i32.const 0x2d (; = '-' ;)))
@@ -2074,8 +2066,8 @@
   (global $sourceID (mut i32) (i32.const 0))
 
   ;; Dictionary pointers
-  (global $latest (mut i32) (i32.const 0x2190c))
-  (global $here (mut i32) (i32.const 0x2191c))
+  (global $latest (mut i32) (i32.const 0x20938))
+  (global $here (mut i32) (i32.const 0x20944))
   (global $nextTableIndex (mut i32) (i32.const 0xab (; = NEXT_TABLE_INDEX ;)))
 
   ;; Pictured output pointer
@@ -2637,7 +2629,7 @@
 
   (func $ensureCompiling (param $tos i32) (result i32)
     (local.get $tos) 
-    (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x218f8 (; = body(STATE) ;))))
+    (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x207d0 (; = body(STATE) ;))))
       (call $fail (i32.const 0x20044 (; = str("word not supported in interpret mode") ;)))))
 
   ;; Toggle the hidden flag
@@ -2709,13 +2701,13 @@
   (func $readChar (result i32)
     (local $n i32)
     (local $in i32)
-    (if (result i32) (i32.ge_u (local.tee $in (i32.load (i32.const 0x21908 (; = body(>IN) ;))))
+    (if (result i32) (i32.ge_u (local.tee $in (i32.load (i32.const 0x202a8 (; = body(>IN) ;))))
                   (global.get $inputBufferSize))
       (then
         (i32.const -1))
       (else
         (local.set $n (i32.load8_s (i32.add (global.get $inputBufferBase) (local.get $in))))
-        (i32.store (i32.const 0x21908 (; = body(>IN) ;)) (i32.add (local.get $in) (i32.const 1)))
+        (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (i32.add (local.get $in) (i32.const 1)))
         (local.get $n))))
 
     (func $numberToChar (param $v i32) (result i32)
diff --git a/src/web/tests/suite.js b/src/web/tests/suite.js
index c60c73c..8550f7a 100644
--- a/src/web/tests/suite.js
+++ b/src/web/tests/suite.js
@@ -970,21 +970,21 @@ function loadTests() {
       it("should find a word", () => {
         loadString("DUP");
         run("FIND");
-        expect(stackValues()[0]).to.eql(136120);
+        expect(stackValues()[0]).to.eql(132236); // FIXME: Make test more robust against dict changes
         expect(stackValues()[1]).to.eql(-1);
       });
 
       it("should find a short word", () => {
         loadString("!");
         run("FIND");
-        expect(stackValues()[0]).to.eql(135168);
+        expect(stackValues()[0]).to.eql(131240); // FIXME: Make test more robust against dict changes
         expect(stackValues()[1]).to.eql(-1);
       });
 
       it("should find an immediate word", () => {
         loadString("+LOOP");
         run("FIND");
-        expect(stackValues()[0]).to.eql(135304);
+        expect(stackValues()[0]).to.eql(131376); // FIXME: Make test more robust against dict changes
         expect(stackValues()[1]).to.eql(1);
       });
 
@@ -1480,19 +1480,19 @@ function loadTests() {
       it("should work", () => {
         run(': FOO 0 0 S" 123AB" >NUMBER ;');
         run("FOO");
-        expect(stackValues()).to.eql([123, 0, 137515, 2]);
+        expect(stackValues()).to.eql([123, 0, 133459, 2]); // FIXME: Make test more robust against dictionary changes
       });
 
       it("should work with init", () => {
         run(': FOO 1 0 S" 1" >NUMBER ;');
         run("FOO");
-        expect(stackValues()).to.eql([11, 0, 137513, 0]);
+        expect(stackValues()).to.eql([11, 0, 133457, 0]); // FIXME: Make test more robust against dictionary changes
       });
 
       it("should not parse sign", () => {
         run(': FOO 0 0 S" -" >NUMBER ;');
         run("FOO");
-        expect(stackValues()).to.eql([0, 0, 137512, 1]);
+        expect(stackValues()).to.eql([0, 0, 133456, 1]); // FIXME: Make test more robust against dictionary changes
       });
     });