From d820f510b35b3428bde7a917c3fe4a1b9153d5fa Mon Sep 17 00:00:00 2001
From: ESL <esl@acm.org>
Date: Sun, 19 Mar 2023 23:31:28 -0400
Subject: [PATCH] new integrable model, part V (fl+, fl-, 'p','m'))

---
 i.c       |  168 +++-
 i.h       |    5 +-
 k.c       | 2376 +++++++++++++++++++++++++++++++----------------------
 s.c       |   45 +-
 src/k.sf  |   23 +
 src/s.scm |  252 ++----
 t.c       |   52 +-
 7 files changed, 1663 insertions(+), 1258 deletions(-)

diff --git a/i.c b/i.c
index 493bae6..4d81239 100644
--- a/i.c
+++ b/i.c
@@ -440,19 +440,42 @@ define_instrhelper(cxi_failactype) {
   { ac = _x; spush((obj)"integrable entry"); musttail return cxi_failactype(IARGS); } } while (0)
 
 
-define_instruction(halt) { unwindi(0); }
+define_instruction(halt) { 
+  unwindi(0); 
+}
 
-define_instruction(lit) { ac = *ip++; gonexti(); }
+define_instruction(lit) { 
+  ac = *ip++; 
+  gonexti();
+}
 
-define_instruction(sref) { int i = fixnum_from_obj(*ip++); ac = sref(i); gonexti(); }  
+define_instruction(sref) {
+  int i = fixnum_from_obj(*ip++);
+  ac = sref(i);
+  gonexti();
+}  
 
-define_instruction(dref) { int i = fixnum_from_obj(*ip++); ac = dref(i); gonexti(); }
+define_instruction(dref) {
+  int i = fixnum_from_obj(*ip++);
+  ac = dref(i); 
+  gonexti();
+}
 
-define_instruction(gref) { obj p = *ip++; ac = gref(p); gonexti(); }
+define_instruction(gref) {
+  obj p = *ip++; 
+  ac = gref(p);
+  gonexti();
+}
 
-define_instruction(iref) { ac = boxref(ac); gonexti(); }
+define_instruction(iref) {
+  ac = boxref(ac);
+  gonexti();
+}
 
-define_instruction(iset) { boxref(ac) = spop(); gonexti(); }
+define_instruction(iset) {
+  boxref(ac) = spop();
+  gonexti();
+}
 
 define_instruction(dclose) {
   int i, n = fixnum_from_obj(*ip++), c = n+1; 
@@ -473,11 +496,33 @@ define_instruction(sbox) {
   gonexti();
 }
 
-define_instruction(br) { int dx = fixnum_from_obj(*ip++); ip += dx; gonexti(); }
+define_instruction(br) { 
+  int dx = fixnum_from_obj(*ip++); 
+  ip += dx; 
+  gonexti(); 
+}
 
-define_instruction(brt) { int dx = fixnum_from_obj(*ip++); if (ac) ip += dx; gonexti(); }
+define_instruction(brt) { 
+  int dx = fixnum_from_obj(*ip++);
+  if (ac) ip += dx; 
+  gonexti(); 
+}
 
-define_instruction(brnot) { int dx = fixnum_from_obj(*ip++); if (!ac) ip += dx; gonexti(); }
+define_instruction(brnot) { 
+  int dx = fixnum_from_obj(*ip++);
+  if (!ac) ip += dx; 
+  gonexti(); 
+}
+
+define_instruction(andbo) {
+  if (ac) { /* go to next binary instruction w/2 args */
+    ac = spop();
+  } else { /* skip the next instruction, drop its args */
+    sdrop(2);
+    ip += 1;
+  }
+  gonexti(); 
+}
 
 define_instruction(sseti) {
   int i = fixnum_from_obj(*ip++);
@@ -723,7 +768,10 @@ define_instruction(adrop) {
   gonexti();
 }
 
-define_instruction(pop) { ac = spop(); gonexti(); }
+define_instruction(pop) { 
+  ac = spop(); 
+  gonexti();
+}
 
 define_instruction(atest) {
   obj no = *ip++;
@@ -751,7 +799,7 @@ define_instruction(shrarg) {
     sdrop(c-n);
     spush(l); 
   }
-  /* ac = obj_from_fixnum(n+1); */
+  ac = obj_from_fixnum(n+1);
   gonexti();
 }
 
@@ -760,8 +808,17 @@ define_instruction(aerr) {
   gonexti();
 }
 
-define_instruction(shlit) { spush(ac); ac = *ip++; gonexti(); }
-define_instruction(shi0)  { spush(ac); ac = obj_from_fixnum(0); gonexti(); }
+define_instruction(shlit) { 
+  spush(ac); 
+  ac = *ip++; 
+  gonexti();
+}
+
+define_instruction(shi0) { 
+  spush(ac);
+  ac = obj_from_fixnum(0);
+  gonexti();
+}
 
 
 /* type checks */
@@ -2649,11 +2706,30 @@ define_instruction(sreturn4) {
   retfromi(); 
 }
 
-define_instruction(atest0) { if (unlikely(ac != obj_from_fixnum(0))) fail("argument count error on entry"); gonexti(); }
-define_instruction(atest1) { if (unlikely(ac != obj_from_fixnum(1))) fail("argument count error on entry"); gonexti(); }
-define_instruction(atest2) { if (unlikely(ac != obj_from_fixnum(2))) fail("argument count error on entry"); gonexti(); }
-define_instruction(atest3) { if (unlikely(ac != obj_from_fixnum(3))) fail("argument count error on entry"); gonexti(); }
-define_instruction(atest4) { if (unlikely(ac != obj_from_fixnum(4))) fail("argument count error on entry"); gonexti(); }
+define_instruction(atest0) {
+  if (unlikely(ac != obj_from_fixnum(0))) fail("argument count error on entry");
+  gonexti();
+}
+
+define_instruction(atest1) {
+  if (unlikely(ac != obj_from_fixnum(1))) fail("argument count error on entry");
+  gonexti();
+}
+
+define_instruction(atest2) {
+  if (unlikely(ac != obj_from_fixnum(2))) fail("argument count error on entry");
+  gonexti();
+}
+
+define_instruction(atest3) {
+  if (unlikely(ac != obj_from_fixnum(3))) fail("argument count error on entry");
+  gonexti();
+}
+
+define_instruction(atest4) {
+  if (unlikely(ac != obj_from_fixnum(4))) fail("argument count error on entry");
+  gonexti();
+}
 
 define_instruction(scall1) {
   int m = 1, n = fixnum_from_obj(*ip++);
@@ -2948,23 +3024,14 @@ static const char *integrable_global(struct intgtab_entry *pi)
 
 static const char *integrable_code(struct intgtab_entry *pi, int n)
 {
-  static char buf[60]; char *ps, *code = NULL;
-  int it = pi->igtype;
+  char *ps, *code = NULL; int it = pi->igtype;
   if (it >= ' ') {
-    ps = pi->enc;
+    ps = pi->enc; assert(ps);
     while (ps && n-- > 0) {
-      ps = strchr(ps, '\t');
-      if (ps) ps += 1;
-    }
-    if (ps) {
-      code = ps; ps = strchr(ps, '\t');
-      if (ps) {
-        assert(ps-code < sizeof(buf));
-        strncpy(buf, code, ps-code);
-        buf[ps-code] = 0;
-        code = buf;
-      }
+      ps += strlen(ps) + 1; /* \0 terminates each field */
+      assert(*ps);
     }
+    code = ps;
   }
   return code;
 }
@@ -3371,6 +3438,19 @@ more:
         *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
         goto more;
       } break;
+      case 'a': { /* andbo */
+        hreserve(hbsz(3), sp-r);
+        *--hp = sref(0); *--hp = pbr->g;  
+        *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
+        c = iportpeekc(sref(1));
+        if (c == EOF || c == '}') { ra = mkeof(); goto out; }
+        pbr = rds_prefix(sref(1));
+        if (pbr->g == 0 || pbr->etyp != 0) { ra = mkeof(); goto out; }
+        hreserve(hbsz(3), sp-r);
+        *--hp = sref(0); *--hp = pbr->g;  
+        *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
+        goto more;
+      } break;
       case 's': { /* save */
         fixnum_t n;
         ra = sref(1); hp = rds_block(r, sp, hp);
@@ -3390,9 +3470,7 @@ more:
       case 'd': { /* dclose */
         fixnum_t n;
         ra = sref(1); hp = rds_arg(r, sp, hp);
-        if (!is_fixnum_obj(ra)) { 
-          ra = mkeof(); goto out; 
-        }
+        if (!is_fixnum_obj(ra)) { ra = mkeof(); goto out; }
         n = fixnum_from_obj(ra);
         ra = sref(1); hp = rds_block(r, sp, hp);
         if (iseof(ra)) goto out;
@@ -3475,7 +3553,7 @@ static obj *rds_stoc(obj *r, obj *sp, obj *hp)
 static obj *rds_intgtab(obj *r, obj *sp, obj *hp)
 {
   int i, n = sizeof(intgtab)/sizeof(intgtab[0]);
-  char lbuf[60], *lcode;
+  char lbuf[200], *lcode, *pe0, *pe1;
   if (!intgtab_sorted) sort_intgtab(n);
   for (i = 0; i < n; ++i) {
     struct intgtab_entry *pe = &intgtab[i];
@@ -3488,16 +3566,26 @@ static obj *rds_intgtab(obj *r, obj *sp, obj *hp)
         break; 
       case 1: case '1':
         lcode = lbuf; assert(pe->enc);
-        sprintf(lbuf, "%%1_!%s]0", pe->enc);   // "%%1.0%s]1"
+        sprintf(lbuf, "%%1_!%s]0", pe->enc);
         break;
       case 2: case '2':
         lcode = lbuf; assert(pe->enc);
-        sprintf(lbuf, "%%2_!%s]0", pe->enc);  // %%2.1,.1%s]2
+        sprintf(lbuf, "%%2_!%s]0", pe->enc);
         break;
       case 3: case '3':
         lcode = lbuf; assert(pe->enc); 
-        sprintf(lbuf, "%%3_!%s]0", pe->enc); // %%3.2,.2,.2%s]3
+        sprintf(lbuf, "%%3_!%s]0", pe->enc);
         break;
+      case 'p': {
+        lcode = lbuf; assert(pe->enc); 
+        pe0 = pe->enc; pe1 = pe0 + strlen(pe0) + 1; assert(*pe1);
+        sprintf(lbuf, "%%!0.0u?{%s]1}.0d,.1a,,#0.0,&1{%%2.1u?{.0]2}.1d,.2a,.2%s,:0^[22}.!0.0^_1[12", pe1, pe0);
+      } break;
+      case 'm': {
+        lcode = lbuf; assert(pe->enc); 
+        pe0 = pe->enc; pe1 = pe0 + strlen(pe0) + 1; assert(*pe1);
+        sprintf(lbuf, "%%!1.0u?{.1%s]2}.0,.2,,#0.0,&1{%%2.1u?{.0]2}.1d,.2a,.2%s,:0^[22}.!0.0^_1[22", pe1, pe0);
+      } break;
       default: assert(0); 
     }
     if (!lcode || *lcode == 0) continue;
diff --git a/i.h b/i.h
index 5e2ca45..0006a82 100644
--- a/i.h
+++ b/i.h
@@ -52,6 +52,7 @@ declare_instruction(sbox,     "#",     1, NULL, 0, NULL)
 declare_instruction(br,       NULL,  'b', NULL, 0, NULL) 
 declare_instruction(brnot,    "?",   'b', NULL, 0, NULL) 
 declare_instruction(brt,      "~?",  'b', NULL, 0, NULL)  
+declare_instruction(andbo,    ";",   'a', NULL, 0, NULL)  
 declare_instruction(sseti,    ".!",    1, NULL, 0, NULL) 
 declare_instruction(dseti,    ":!",    1, NULL, 0, NULL)
 declare_instruction(gloc,     "`",   'g', NULL, 0, NULL)   
@@ -286,8 +287,8 @@ declare_instruction(jintp,    "Jw",    0, "flinteger?",        '1', AUTOGL)
 declare_instruction(jnanp,    "Ju",    0, "flnan?",            '1', AUTOGL)
 declare_instruction(jfinp,    "Jf",    0, "flfinite?",         '1', AUTOGL)
 declare_instruction(jinfp,    "Jh",    0, "flinfinite?",       '1', AUTOGL)
-declare_instruction(jadd,     "J+",    0, "fl+",               '2', AUTOGL)  
-declare_instruction(jsub,     "J-",    0, "fl-",               '2', AUTOGL)
+declare_instruction(jadd, "J+\0'(j0)", 0, "fl+",               'p', AUTOGL)  
+declare_instruction(jsub, "J-\0J-!",   0, "fl-",               'm', AUTOGL)
 declare_instruction(jmul,     "J*",    0, "fl*",               '2', AUTOGL)
 declare_instruction(jdiv,     "J/",    0, "fl/",               '2', AUTOGL)
 declare_instruction(jquo,     "Jq",    0, "flquotient",        '2', AUTOGL)
diff --git a/k.c b/k.c
index 9615eab..cc5a3b4 100644
--- a/k.c
+++ b/k.c
@@ -582,45 +582,45 @@ static obj cx__232436; /* constant #2436 */
 static obj cx__232515; /* constant #2515 */
 static obj cx__232596; /* constant #2596 */
 static obj cx__232982; /* constant #2982 */
-static obj cx__233056; /* constant #3056 */
-static obj cx__233221; /* constant #3221 */
-static obj cx__233351; /* constant #3351 */
-static obj cx__233382; /* constant #3382 */
-static obj cx__233387; /* constant #3387 */
-static obj cx__233391; /* constant #3391 */
-static obj cx__233427; /* constant #3427 */
-static obj cx__233453; /* constant #3453 */
+static obj cx__233129; /* constant #3129 */
+static obj cx__233294; /* constant #3294 */
+static obj cx__233424; /* constant #3424 */
+static obj cx__233455; /* constant #3455 */
+static obj cx__233460; /* constant #3460 */
 static obj cx__233464; /* constant #3464 */
-static obj cx__233515; /* constant #3515 */
-static obj cx__233519; /* constant #3519 */
-static obj cx__233629; /* constant #3629 */
-static obj cx__233671; /* constant #3671 */
-static obj cx__233679; /* constant #3679 */
-static obj cx__233680; /* constant #3680 */
-static obj cx__233681; /* constant #3681 */
-static obj cx__233682; /* constant #3682 */
-static obj cx__233683; /* constant #3683 */
-static obj cx__233705; /* constant #3705 */
-static obj cx__233707; /* constant #3707 */
-static obj cx__233711; /* constant #3711 */
-static obj cx__233981; /* constant #3981 */
-static obj cx__234183; /* constant #4183 */
-static obj cx__234585; /* constant #4585 */
+static obj cx__233500; /* constant #3500 */
+static obj cx__233526; /* constant #3526 */
+static obj cx__233537; /* constant #3537 */
+static obj cx__233588; /* constant #3588 */
+static obj cx__233592; /* constant #3592 */
+static obj cx__233702; /* constant #3702 */
+static obj cx__233744; /* constant #3744 */
+static obj cx__233752; /* constant #3752 */
+static obj cx__233753; /* constant #3753 */
+static obj cx__233754; /* constant #3754 */
+static obj cx__233755; /* constant #3755 */
+static obj cx__233756; /* constant #3756 */
+static obj cx__233778; /* constant #3778 */
+static obj cx__233780; /* constant #3780 */
+static obj cx__233784; /* constant #3784 */
+static obj cx__234054; /* constant #4054 */
+static obj cx__234256; /* constant #4256 */
+static obj cx__234658; /* constant #4658 */
 static obj cx__23469; /* constant #469 */
-static obj cx__234715; /* constant #4715 */
+static obj cx__234788; /* constant #4788 */
 static obj cx__23484; /* constant #484 */
 static obj cx__23506; /* constant #506 */
-static obj cx__235099; /* constant #5099 */
 static obj cx__23512; /* constant #512 */
-static obj cx__235123; /* constant #5123 */
-static obj cx__235124; /* constant #5124 */
-static obj cx__235177; /* constant #5177 */
-static obj cx__235184; /* constant #5184 */
-static obj cx__235191; /* constant #5191 */
-static obj cx__235245; /* constant #5245 */
-static obj cx__235265; /* constant #5265 */
-static obj cx__235268; /* constant #5268 */
-static obj cx__235274; /* constant #5274 */
+static obj cx__235172; /* constant #5172 */
+static obj cx__235196; /* constant #5196 */
+static obj cx__235197; /* constant #5197 */
+static obj cx__235250; /* constant #5250 */
+static obj cx__235257; /* constant #5257 */
+static obj cx__235264; /* constant #5264 */
+static obj cx__235318; /* constant #5318 */
+static obj cx__235338; /* constant #5338 */
+static obj cx__235341; /* constant #5341 */
+static obj cx__235347; /* constant #5347 */
 static obj cx__23535; /* constant #535 */
 static obj cx__23558; /* constant #558 */
 static obj cx__23574; /* constant #574 */
@@ -647,11 +647,11 @@ static obj cxs_set_2Dmember_3F(obj v2_x, obj v1_s)
     return obj_from_bool(1);
   } else {
   { /* let */
-    obj v5698_tmp = (cdr((v1_s)));
-    obj v5697_tmp = (v2_x);
+    obj v5771_tmp = (cdr((v1_s)));
+    obj v5770_tmp = (v2_x);
     /* tail call */
-    v2_x = (v5697_tmp);
-    v1_s = (v5698_tmp);
+    v2_x = (v5770_tmp);
+    v1_s = (v5771_tmp);
     goto s_set_2Dmember_3F;
   }
   }
@@ -672,18 +672,18 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp)
   } else {
   if ((ispair((v41_pat)))) {
   { /* let */
-    obj v5691_tmp;
+    obj v5764_tmp;
   { /* let */
-    obj v5695_tmp;
+    obj v5768_tmp;
   { /* let */
-    obj v5696_tmp;
+    obj v5769_tmp;
     { static obj o = 0; static char s[] = { 36, 0 };
-    v5696_tmp = (o ? o : (o = mksymbol(internsym(s)))); };
-    v5695_tmp = obj_from_bool((car((v41_pat))) == (v5696_tmp));
+    v5769_tmp = (o ? o : (o = mksymbol(internsym(s)))); };
+    v5768_tmp = obj_from_bool((car((v41_pat))) == (v5769_tmp));
   }
-    v5691_tmp = (bool_from_obj(v5695_tmp) ? ((ispair((cdr((v41_pat))))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0));
+    v5764_tmp = (bool_from_obj(v5768_tmp) ? ((ispair((cdr((v41_pat))))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0));
   }
-  if (bool_from_obj(v5691_tmp)) {
+  if (bool_from_obj(v5764_tmp)) {
     return obj_from_bool((v40_exp) == (car((cdr((v41_pat))))));
   } else {
   if (bool_from_obj((ispair((cdr((v41_pat))))) ? (((car((cdr((v41_pat))))) == (mksymbol(internsym("...")))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0))) {
@@ -701,9 +701,9 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp)
   if ((ispair((v58_lst)))) {
   if (bool_from_obj(cxs_syntax_2Dmatch_3F((v56_pat), (car((v58_lst)))))) {
   { /* let */
-    obj v5694_tmp = (cdr((v58_lst)));
+    obj v5767_tmp = (cdr((v58_lst)));
     /* tail call */
-    v58_lst = (v5694_tmp);
+    v58_lst = (v5767_tmp);
     goto s_f;
   }
   } else {
@@ -719,11 +719,11 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp)
   if ((ispair((v40_exp)))) {
   if (bool_from_obj(cxs_syntax_2Dmatch_3F((car((v41_pat))), (car((v40_exp)))))) {
   { /* let */
-    obj v5693_tmp = (cdr((v40_exp)));
-    obj v5692_tmp = (cdr((v41_pat)));
+    obj v5766_tmp = (cdr((v40_exp)));
+    obj v5765_tmp = (cdr((v41_pat)));
     /* tail call */
-    v41_pat = (v5692_tmp);
-    v40_exp = (v5693_tmp);
+    v41_pat = (v5765_tmp);
+    v40_exp = (v5766_tmp);
     goto s_syntax_2Dmatch_3F;
   }
   } else {
@@ -750,11 +750,11 @@ static obj cxs_posq(obj v117_x, obj v116_l)
     obj v120_l;
     obj v119_n;
   { /* let */
-    obj v5690_tmp = obj_from_fixnum(+0);
-    obj v5689_tmp = (v116_l);
+    obj v5763_tmp = obj_from_fixnum(+0);
+    obj v5762_tmp = (v116_l);
     /* tail call */
-    v120_l = (v5689_tmp);
-    v119_n = (v5690_tmp);
+    v120_l = (v5762_tmp);
+    v119_n = (v5763_tmp);
     goto s_loop;
   }
   s_loop:
@@ -765,11 +765,11 @@ static obj cxs_posq(obj v117_x, obj v116_l)
     return (v119_n);
   } else {
   { /* let */
-    obj v5688_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1)));
-    obj v5687_tmp = (cdr((v120_l)));
+    obj v5761_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1)));
+    obj v5760_tmp = (cdr((v120_l)));
     /* tail call */
-    v120_l = (v5687_tmp);
-    v119_n = (v5688_tmp);
+    v120_l = (v5760_tmp);
+    v119_n = (v5761_tmp);
     goto s_loop;
   }
   }
@@ -875,45 +875,45 @@ static obj *globv[] = {
   &cx__232515,
   &cx__232596,
   &cx__232982,
-  &cx__233056,
-  &cx__233221,
-  &cx__233351,
-  &cx__233382,
-  &cx__233387,
-  &cx__233391,
-  &cx__233427,
-  &cx__233453,
+  &cx__233129,
+  &cx__233294,
+  &cx__233424,
+  &cx__233455,
+  &cx__233460,
   &cx__233464,
-  &cx__233515,
-  &cx__233519,
-  &cx__233629,
-  &cx__233671,
-  &cx__233679,
-  &cx__233680,
-  &cx__233681,
-  &cx__233682,
-  &cx__233683,
-  &cx__233705,
-  &cx__233707,
-  &cx__233711,
-  &cx__233981,
-  &cx__234183,
-  &cx__234585,
+  &cx__233500,
+  &cx__233526,
+  &cx__233537,
+  &cx__233588,
+  &cx__233592,
+  &cx__233702,
+  &cx__233744,
+  &cx__233752,
+  &cx__233753,
+  &cx__233754,
+  &cx__233755,
+  &cx__233756,
+  &cx__233778,
+  &cx__233780,
+  &cx__233784,
+  &cx__234054,
+  &cx__234256,
+  &cx__234658,
   &cx__23469,
-  &cx__234715,
+  &cx__234788,
   &cx__23484,
   &cx__23506,
-  &cx__235099,
   &cx__23512,
-  &cx__235123,
-  &cx__235124,
-  &cx__235177,
-  &cx__235184,
-  &cx__235191,
-  &cx__235245,
-  &cx__235265,
-  &cx__235268,
-  &cx__235274,
+  &cx__235172,
+  &cx__235196,
+  &cx__235197,
+  &cx__235250,
+  &cx__235257,
+  &cx__235264,
+  &cx__235318,
+  &cx__235338,
+  &cx__235341,
+  &cx__235347,
   &cx__23535,
   &cx__23558,
   &cx__23574,
@@ -935,7 +935,7 @@ static cxroot_t root = {
 
 /* entry points */
 static obj host(obj);
-static obj cases[539] = {
+static obj cases[548] = {
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
@@ -1043,7 +1043,9 @@ static obj cases[539] = {
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
   (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
-  (obj)host,  (obj)host,  (obj)host,  (obj)host,
+  (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
+  (obj)host,  (obj)host,  (obj)host,  (obj)host,  (obj)host,
+  (obj)host,  (obj)host,  (obj)host,
 };
 
 /* host procedure */
@@ -3777,13 +3779,13 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("quote")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233056 = (hendblk(3)); }
+    cx__233129 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
     *--hp = (mksymbol(internsym("begin")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233221 = (hendblk(3)); }
+    cx__233294 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -3849,25 +3851,25 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("define-inline")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233351 = (hendblk(3)); }
+    cx__233424 = (hendblk(3)); }
     { static char s[] = { 34, 10, 0 };
-    cx__233382 = (hpushstr(0, newstring(s))); }
+    cx__233455 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 32, 32, 34, 0 };
-    cx__233387 = (hpushstr(0, newstring(s))); }
+    cx__233460 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 34, 44, 0 };
-    cx__233391 = (hpushstr(0, newstring(s))); }
+    cx__233464 = (hpushstr(0, newstring(s))); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mksymbol(internsym("args")));
     *--hp = (mksymbol(internsym("_")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233427 = (hendblk(3)); }
+    cx__233500 = (hendblk(3)); }
     { static char s[] = { 34, 44, 10, 0 };
-    cx__233453 = (hpushstr(0, newstring(s))); }
+    cx__233526 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 32, 32, 48, 44, 10, 0 };
-    cx__233464 = (hpushstr(0, newstring(s))); }
-    cx__233515 = (hpushstr(0, newstring("r")));
-    cx__233519 = (hpushstr(0, newstring("cannot open input file")));
+    cx__233537 = (hpushstr(0, newstring(s))); }
+    cx__233588 = (hpushstr(0, newstring("r")));
+    cx__233592 = (hpushstr(0, newstring("cannot open input file")));
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -3885,16 +3887,16 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = obj_from_char(92);
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233629 = (hendblk(3)); }
+    cx__233702 = (hendblk(3)); }
     { static char s[] = { 10, 32, 32, 48, 44, 32, 48, 10, 125, 59, 10, 0 };
-    cx__233671 = (hpushstr(0, newstring(s))); }
-    cx__233679 = (hpushstr(0, newstring("_code[] = {")));
-    cx__233680 = (hpushstr(0, newstring("char *")));
-    cx__233681 = (hpushstr(0, newstring(" */")));
-    cx__233682 = (hpushstr(0, newstring(".c -- generated via skint -c ")));
-    cx__233683 = (hpushstr(0, newstring("/* ")));
-    cx__233705 = (hpushstr(0, newstring("k!")));
-    cx__233707 = (hpushstr(0, newstring("K5")));
+    cx__233744 = (hpushstr(0, newstring(s))); }
+    cx__233752 = (hpushstr(0, newstring("_code[] = {")));
+    cx__233753 = (hpushstr(0, newstring("char *")));
+    cx__233754 = (hpushstr(0, newstring(" */")));
+    cx__233755 = (hpushstr(0, newstring(".c -- generated via skint -c ")));
+    cx__233756 = (hpushstr(0, newstring("/* ")));
+    cx__233778 = (hpushstr(0, newstring("k!")));
+    cx__233780 = (hpushstr(0, newstring("K5")));
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -4710,7 +4712,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233711 = (hendblk(3)); }
+    cx__233784 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -5310,7 +5312,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233981 = (hendblk(3)); }
+    cx__234054 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -6510,7 +6512,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234183 = (hendblk(3)); }
+    cx__234256 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -6894,7 +6896,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234585 = (hendblk(3)); }
+    cx__234658 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -8034,29 +8036,29 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234715 = (hendblk(3)); }
-    cx__235099 = (hpushstr(0, newstring(" ms.")));
-    cx__235123 = (hpushstr(0, newstring("Elapsed time: ")));
-    cx__235124 = (hpushstr(0, newstring("Running tests ...")));
-    cx__235177 = (hpushstr(0, newstring("DECODE+EXECUTE =>")));
-    cx__235184 = (hpushstr(0, newstring("COMPILE-TO-STRING =>")));
-    cx__235191 = (hpushstr(0, newstring("TRANSFORM =>")));
+    cx__234788 = (hendblk(3)); }
+    cx__235172 = (hpushstr(0, newstring(" ms.")));
+    cx__235196 = (hpushstr(0, newstring("Elapsed time: ")));
+    cx__235197 = (hpushstr(0, newstring("Running tests ...")));
+    cx__235250 = (hpushstr(0, newstring("DECODE+EXECUTE =>")));
+    cx__235257 = (hpushstr(0, newstring("COMPILE-TO-STRING =>")));
+    cx__235264 = (hpushstr(0, newstring("TRANSFORM =>")));
     { static char s[] = { 10, 115, 107, 105, 110, 116, 62, 32, 0 };
-    cx__235245 = (hpushstr(0, newstring(s))); }
+    cx__235318 = (hpushstr(0, newstring(s))); }
     r[0] = (hpushstr(0, newstring("-v")));
     { /* cons */ 
     hreserve(hbsz(3), 1); /* 1 live regs */
     *--hp = (mknull());
     *--hp = r[0];  
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__235265 = (hendblk(3)); }
+    cx__235338 = (hendblk(3)); }
     r[0] = (hpushstr(0, newstring("-t")));
     { /* cons */ 
     hreserve(hbsz(3), 1); /* 1 live regs */
     *--hp = (mknull());
     *--hp = r[0];  
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__235268 = (hendblk(3)); }
+    cx__235341 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -8069,7 +8071,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__235274 = (hendblk(3)); }
+    cx__235347 = (hendblk(3)); }
     { static obj c[] = { obj_from_case(1) }; cx_set_2Dmember_3F = (obj)c; }
     { static obj c[] = { obj_from_case(2) }; cx_set_2Dcons = (obj)c; }
     { static obj c[] = { obj_from_case(3) }; cx_set_2Dunion = (obj)c; }
@@ -8935,16 +8937,16 @@ gs_normalize_2Darity: /* k arity */
     r[2+2] = r[1];  
     r += 2; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v14464;
+    goto s_loop_v14659;
   }
 
-s_loop_v14464: /* k cnt l */
+s_loop_v14659: /* k cnt l */
   if ((ispair((r[2])))) {
     r[3] = (cdr((r[2])));
     /* r[0] */    
     r[1] = obj_from_fixnum(fxadd((+1), fixnum_from_obj(r[1])));
     r[2] = r[3];  
-    goto s_loop_v14464;
+    goto s_loop_v14659;
   } else {
   if ((isnull((r[2])))) {
     { /* cons */ 
@@ -9002,10 +9004,10 @@ gs_flatten_2Didslist: /* k ilist */
     r[2+2] = (mknull());
     r += 2; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v14451;
+    goto s_loop_v14646;
   }
 
-s_loop_v14451: /* k l r */
+s_loop_v14646: /* k l r */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     r[4] = (car((r[1])));
@@ -9018,7 +9020,7 @@ s_loop_v14451: /* k l r */
     /* r[0] */    
     r[1] = r[3];  
     r[2] = r[4];  
-    goto s_loop_v14451;
+    goto s_loop_v14646;
   } else {
   if ((isnull((r[1])))) {
     { /* reverse! */
@@ -9920,7 +9922,7 @@ s_conv: /* k sexp */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v14186;
+    goto s_loop_v14381;
   } else {
     r[3+0] = r[0];  
     pc = objptr_from_obj(r[3+0])[0];
@@ -9977,7 +9979,7 @@ case 64: /* clo ek r */
     rc = 3;
     goto jump;
 
-s_loop_v14186: /* k l conv */
+s_loop_v14381: /* k l conv */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -9989,7 +9991,7 @@ s_loop_v14186: /* k l conv */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v14186;
+    goto s_loop_v14381;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10049,13 +10051,13 @@ case 67: /* clo ek r */
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
-    { fixnum_t v14706_tmp;
+    { fixnum_t v14907_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14706_tmp = (n); }
+    v14907_tmp = (n); }
     { /* list->vector */
-    obj l; int i, c = (v14706_tmp);
+    obj l; int i, c = (v14907_tmp);
     hreserve(hbsz(c+1), 3); /* 3 live regs */
     l = r[1];   /* gc-safe */
     for (i = 0; i < c; ++i, l = cdr(l)) hp[i-c] = car(l);
@@ -10394,7 +10396,7 @@ gs_xform_2Dbegin: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v14098;
+    goto s_loop_v14293;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -10407,7 +10409,7 @@ gs_xform_2Dbegin: /* k tail env */
     goto jump;
   }
 
-s_loop_v14098: /* k l env */
+s_loop_v14293: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10419,7 +10421,7 @@ s_loop_v14098: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v14098;
+    goto s_loop_v14293;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10516,7 +10518,7 @@ gs_xform_2Dif: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v14067;
+    goto s_loop_v14262;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -10529,7 +10531,7 @@ gs_xform_2Dif: /* k tail env */
     goto jump;
   }
 
-s_loop_v14067: /* k l env */
+s_loop_v14262: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10541,7 +10543,7 @@ s_loop_v14067: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v14067;
+    goto s_loop_v14262;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10606,13 +10608,13 @@ case 83: /* clo ek r */
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
     r[3] = obj_from_fixnum(n); }
   if (((((r[3]) == obj_from_fixnum(+2)) && ((r[3]) == obj_from_fixnum(+2))) && (1))) {
-    { fixnum_t v14705_tmp;
+    { fixnum_t v14906_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14705_tmp = (n); }
+    v14906_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14705_tmp);
+    obj t, l, o, *p, *d; int c = (v14906_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[1];   t = (cx__23584); /* gc-safe */
     o = t; p = &o; 
@@ -10676,7 +10678,7 @@ gs_xform_2Dcall: /* k xexp tail env */
     r[0] = r[4];  
     r[1] = r[2];  
     r[2] = r[3];  
-    goto s_loop_v14034;
+    goto s_loop_v14229;
   } else {
     r[4+0] = (cx_error);
     pc = objptr_from_obj(r[4+0])[0];
@@ -10689,7 +10691,7 @@ gs_xform_2Dcall: /* k xexp tail env */
     goto jump;
   }
 
-s_loop_v14034: /* k l env */
+s_loop_v14229: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10701,7 +10703,7 @@ s_loop_v14034: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v14034;
+    goto s_loop_v14229;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10807,56 +10809,56 @@ gs_integrable_2Dargc_2Dmatch_3F: /* k igt n */
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+0));
   } else {
-    { const flonum_t v14704_tmp = ((flonum_t)(+0));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14704_tmp)); } 
+    { const flonum_t v14905_tmp = ((flonum_t)(+0));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14905_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('1')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+1));
   } else {
-    { const flonum_t v14703_tmp = ((flonum_t)(+1));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14703_tmp)); } 
+    { const flonum_t v14904_tmp = ((flonum_t)(+1));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14904_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('2')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+2));
   } else {
-    { const flonum_t v14702_tmp = ((flonum_t)(+2));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14702_tmp)); } 
+    { const flonum_t v14903_tmp = ((flonum_t)(+2));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14903_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('3')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+3));
   } else {
-    { const flonum_t v14701_tmp = ((flonum_t)(+3));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14701_tmp)); } 
+    { const flonum_t v14902_tmp = ((flonum_t)(+3));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14902_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('p')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+0));
   } else {
-    { const flonum_t v14700_tmp = ((flonum_t)(+0));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14700_tmp)); } 
+    { const flonum_t v14901_tmp = ((flonum_t)(+0));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14901_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('m')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+1));
   } else {
-    { const flonum_t v14699_tmp = ((flonum_t)(+1));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14699_tmp)); } 
+    { const flonum_t v14900_tmp = ((flonum_t)(+1));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14900_tmp)); } 
   }
   } else {
   if (((((r[1]) == obj_from_char('c')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
   if ((is_fixnum_obj(r[2]))) {
     r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+2));
   } else {
-    { const flonum_t v14698_tmp = ((flonum_t)(+2));
-    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14698_tmp)); } 
+    { const flonum_t v14899_tmp = ((flonum_t)(+2));
+    r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14899_tmp)); } 
   }
   } else {
     r[3] = obj_from_bool(0);
@@ -10942,7 +10944,7 @@ case 91: /* clo ek r */
     r[0] = r[6];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13985;
+    goto s_loop_v14180;
   } else {
     { /* define integrable-global */
     static obj c[] = { obj_from_objptr(vmcases+11) };
@@ -10960,7 +10962,7 @@ case 91: /* clo ek r */
     goto jump;
   }
 
-s_loop_v13985: /* k l env */
+s_loop_v14180: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10972,7 +10974,7 @@ s_loop_v13985: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13985;
+    goto s_loop_v14180;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -11092,7 +11094,7 @@ gs_xform_2Dlambda: /* k tail env */
     r[4+4] = r[0];  
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13899;
+    goto s_l_v14094;
   }
 
 case 97: /* clo ek r */
@@ -11102,7 +11104,7 @@ case 97: /* clo ek r */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v13899: /* ek r env tail k */
+s_l_v14094: /* ek r env tail k */
   if (bool_from_obj(r[1])) {
     r[5] = (car((r[3])));
     r[6+0] = r[4];  
@@ -11112,7 +11114,7 @@ s_l_v13899: /* ek r env tail k */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13900;
+    goto s_loop_v14095;
   } else {
     r[5+0] = (cx_error);
     pc = objptr_from_obj(r[5+0])[0];
@@ -11131,7 +11133,7 @@ case 98: /* clo k vars ienv ipars */
     { obj* p = objptr_from_obj(r[0]);
     r[1+4] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v13900: /* k vars ienv ipars tail */
+s_loop_v14095: /* k vars ienv ipars tail */
   if ((ispair((r[1])))) {
     r[5] = (car((r[1])));
     hreserve(hbsz(1+1), 6); /* 6 live regs */
@@ -11272,13 +11274,13 @@ case 102: /* clo ek r */
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[4] = (hendblk(3)); }
-    { fixnum_t v14697_tmp;
+    { fixnum_t v14898_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14697_tmp = (n); }
+    v14898_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14697_tmp);
+    obj l, o = mknull(); int c = (v14898_tmp);
     hreserve(hbsz(3)*c, 5); /* 5 live regs */
     l = r[3];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -11392,25 +11394,25 @@ case 106: /* clo ek r */
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[5] = (hendblk(3)); }
-    { fixnum_t v14695_tmp;
+    { fixnum_t v14896_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14695_tmp = (n); }
+    v14896_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14695_tmp);
+    obj l, o = mknull(); int c = (v14896_tmp);
     hreserve(hbsz(3)*c, 6); /* 6 live regs */
     l = r[4];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[6] = (o); } }
-    { fixnum_t v14696_tmp;
+    { fixnum_t v14897_tmp;
     { /* length */
     int n; obj l = r[6];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14696_tmp = (n); }
+    v14897_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14696_tmp);
+    obj t, l, o, *p, *d; int c = (v14897_tmp);
     hreserve(hbsz(3)*c, 7); /* 7 live regs */
     l = r[6];   t = r[3];   /* gc-safe */
     o = t; p = &o; 
@@ -11451,7 +11453,7 @@ gs_xform_2Dlambda_2A: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v13855;
+    goto s_loop_v14050;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -11464,7 +11466,7 @@ gs_xform_2Dlambda_2A: /* k tail env */
     goto jump;
   }
 
-s_loop_v13855: /* k l env */
+s_loop_v14050: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -11476,7 +11478,7 @@ s_loop_v13855: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13855;
+    goto s_loop_v14050;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -11538,7 +11540,7 @@ case 108: /* clo ek r */
     r[9+4] = r[8];  
     r += 9; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13859;
+    goto s_l_v14054;
   } else {
     r[0] = r[6];  
     r[1] = (car((r[5])));
@@ -11557,7 +11559,7 @@ case 108: /* clo ek r */
     r[8+4] = r[7];  
     r += 8; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13859;
+    goto s_l_v14054;
   }
 
 case 109: /* clo ek r */
@@ -11589,7 +11591,7 @@ case 110: /* clo ek r */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v13859: /* ek r env aexp k */
+s_l_v14054: /* ek r env aexp k */
   if (bool_from_obj(r[1])) {
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
@@ -11924,13 +11926,13 @@ gs_xform_2Dbody: /* k tail env */
     r[3+5] = r[1];  
     r += 3; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13740;
+    goto s_loop_v13935;
   }
 
 case 123: /* clo k env ids inits nids body */
     assert(rc == 7);
     r += 1; /* shift reg. wnd */
-s_loop_v13740: /* k env ids inits nids body */
+s_loop_v13935: /* k env ids inits nids body */
   if ((ispair((r[5])))) {
     r[6] = (car((r[5])));
     r[6] = obj_from_bool(ispair((r[6])));
@@ -11964,37 +11966,37 @@ s_loop_v13740: /* k env ids inits nids body */
     rreserve(MAX_HOSTREGS);
     goto gs_xform;
   } else {
-    { fixnum_t v14694_tmp;
+    { fixnum_t v14895_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14694_tmp = (n); }
+    v14895_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14694_tmp);
+    obj l, o = mknull(); int c = (v14895_tmp);
     hreserve(hbsz(3)*c, 6); /* 6 live regs */
     l = r[2];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[6] = (o); } }
-    { fixnum_t v14693_tmp;
+    { fixnum_t v14894_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14693_tmp = (n); }
+    v14894_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14693_tmp);
+    obj l, o = mknull(); int c = (v14894_tmp);
     hreserve(hbsz(3)*c, 7); /* 7 live regs */
     l = r[3];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[7] = (o); } }
-    { fixnum_t v14692_tmp;
+    { fixnum_t v14893_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14692_tmp = (n); }
+    v14893_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14692_tmp);
+    obj l, o = mknull(); int c = (v14893_tmp);
     hreserve(hbsz(3)*c, 8); /* 8 live regs */
     l = r[4];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -12027,13 +12029,13 @@ case 124: /* clo ek r */
     /* ek r body loop rest first nids inits ids env k */
   if ((((r[1]) == (mksymbol(internsym("begin")))) && (1))) {
     r[11] = (cdr((r[5])));
-    { fixnum_t v14691_tmp;
+    { fixnum_t v14892_tmp;
     { /* length */
     int n; obj l = (r[11]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14691_tmp = (n); }
+    v14892_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14691_tmp);
+    obj t, l, o, *p, *d; int c = (v14892_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = (r[11]); t = r[4];   /* gc-safe */
     o = t; p = &o; 
@@ -12120,37 +12122,37 @@ case 124: /* clo ek r */
     rc = 4;
     goto jump;
   } else {
-    { fixnum_t v14690_tmp;
+    { fixnum_t v14891_tmp;
     { /* length */
     int n; obj l = r[8];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14690_tmp = (n); }
+    v14891_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14690_tmp);
+    obj l, o = mknull(); int c = (v14891_tmp);
     hreserve(hbsz(3)*c, 11); /* 11 live regs */
     l = r[8];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[11] = (o); } }
-    { fixnum_t v14689_tmp;
+    { fixnum_t v14890_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14689_tmp = (n); }
+    v14890_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14689_tmp);
+    obj l, o = mknull(); int c = (v14890_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[12] = (o); } }
-    { fixnum_t v14688_tmp;
+    { fixnum_t v14889_tmp;
     { /* length */
     int n; obj l = r[6];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14688_tmp = (n); }
+    v14889_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14688_tmp);
+    obj l, o = mknull(); int c = (v14889_tmp);
     hreserve(hbsz(3)*c, 13); /* 13 live regs */
     l = r[6];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -12373,7 +12375,7 @@ gs_xform_2Dlabels: /* k ids inits nids body env */
     r[6+7] = r[4];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13655;
+    goto s_loop_v13850;
 
 case 131: /* clo k ids inits nids sets lids */
     assert(rc == 7);
@@ -12381,7 +12383,7 @@ case 131: /* clo k ids inits nids sets lids */
     r[1+6] = p[1];
     r[1+7] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v13655: /* k ids inits nids sets lids env body */
+s_loop_v13850: /* k ids inits nids sets lids env body */
     hreserve(hbsz(2+1), 8); /* 8 live regs */
     *--hp = r[7];  
     *--hp = r[6];  
@@ -12397,7 +12399,7 @@ s_loop_v13655: /* k ids inits nids sets lids env body */
     r[0] = r[9];  
     r[1] = r[7];  
     r[2] = r[6];  
-    goto s_loop_v13697;
+    goto s_loop_v13892;
   } else {
     r[9] = (car((r[3])));
     r[9] = obj_from_bool(issymbol((r[9])));
@@ -12440,7 +12442,7 @@ s_loop_v13655: /* k ids inits nids sets lids env body */
   }
   }
 
-s_loop_v13697: /* k l env */
+s_loop_v13892: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -12452,7 +12454,7 @@ s_loop_v13697: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13697;
+    goto s_loop_v13892;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -12514,25 +12516,25 @@ case 134: /* clo ek r */
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
     /* ek r k lids sets */
-    { fixnum_t v14686_tmp;
+    { fixnum_t v14887_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14686_tmp = (n); }
+    v14887_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14686_tmp);
+    obj l, o = mknull(); int c = (v14887_tmp);
     hreserve(hbsz(3)*c, 5); /* 5 live regs */
     l = r[4];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[5] = (o); } }
-    { fixnum_t v14687_tmp;
+    { fixnum_t v14888_tmp;
     { /* length */
     int n; obj l = r[5];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14687_tmp = (n); }
+    v14888_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14687_tmp);
+    obj t, l, o, *p, *d; int c = (v14888_tmp);
     hreserve(hbsz(3)*c, 6); /* 6 live regs */
     l = r[5];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -12574,10 +12576,10 @@ case 134: /* clo ek r */
     r[8] = (hendblk(3+1));
     r[0] = r[8];  
     r[1] = r[3];  
-    goto s_loop_v13682;
+    goto s_loop_v13877;
   }
 
-s_loop_v13682: /* k l */
+s_loop_v13877: /* k l */
   if ((ispair((r[1])))) {
     r[2] = (cdr((r[1])));
     hreserve(hbsz(1+1), 3); /* 3 live regs */
@@ -12586,7 +12588,7 @@ s_loop_v13682: /* k l */
     r[3] = (hendblk(1+1));
     r[0] = r[3];  
     r[1] = r[2];  
-    goto s_loop_v13682;
+    goto s_loop_v13877;
   } else {
     r[2+0] = r[0];  
     pc = objptr_from_obj(r[2+0])[0];
@@ -12633,13 +12635,13 @@ case 136: /* clo ek r */
     *--hp = r[3];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[5] = (hendblk(3)); }
-    { fixnum_t v14685_tmp;
+    { fixnum_t v14886_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14685_tmp = (n); }
+    v14886_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14685_tmp);
+    obj l, o = mknull(); int c = (v14886_tmp);
     hreserve(hbsz(3)*c, 6); /* 6 live regs */
     l = r[2];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -13339,7 +13341,7 @@ s_collect: /* k x inc l ellipsis-pair? pred? */
     r[8+4] = r[1];  
     r += 8; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13480;
+    goto s_l_v13675;
   }
   } else {
   if ((isvector((r[1])))) {
@@ -13394,7 +13396,7 @@ case 163: /* clo ek r */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v13480: /* ek r k l x */
+s_l_v13675: /* ek r k l x */
   if (bool_from_obj(r[1])) {
     { /* cons */ 
     hreserve(hbsz(3), 5); /* 5 live regs */
@@ -13529,7 +13531,7 @@ case 167: /* clo k use use-env */
     r[9+8] = r[7];  
     r += 9; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13160;
+    goto s_loop_v13355;
 
 case 168: /* clo k rules */
     assert(rc == 3);
@@ -13542,7 +13544,7 @@ case 168: /* clo k rules */
     r[1+7] = p[6];
     r[1+8] = p[7]; }
     r += 1; /* shift reg. wnd */
-s_loop_v13160: /* k rules use-env pat-literals use mac-env not-pat-literal? ellipsis-pair? list-ids */
+s_loop_v13355: /* k rules use-env pat-literals use mac-env not-pat-literal? ellipsis-pair? list-ids */
     hreserve(hbsz(7+1), 9); /* 9 live regs */
     *--hp = r[8];  
     *--hp = r[7];  
@@ -13601,7 +13603,7 @@ s_loop_v13160: /* k rules use-env pat-literals use mac-env not-pat-literal? elli
     r[11+11] = r[1];  
     r += 11; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13162;
+    goto s_l_v13357;
   }
 
 case 169: /* clo ek . */
@@ -13619,7 +13621,7 @@ case 169: /* clo ek . */
     r[1+10] = p[9];
     r[1+11] = p[10]; }
     r += 1; /* shift reg. wnd */
-s_l_v13162: /* ek . use-env pat-literals use loop mac-env not-pat-literal? ellipsis-pair? list-ids k rules */
+s_l_v13357: /* ek . use-env pat-literals use loop mac-env not-pat-literal? ellipsis-pair? list-ids k rules */
     r[12] = (car((r[11])));
     r[13] = (car((r[12])));
     r[14] = (cdr((r[12])));
@@ -13743,9 +13745,9 @@ case 171: /* clo ek r */
     r[0] = (r[12]);
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v13413;
+    goto s_loop_v13608;
 
-s_loop_v13413: /* k l mac-env */
+s_loop_v13608: /* k l mac-env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -13757,7 +13759,7 @@ s_loop_v13413: /* k l mac-env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13413;
+    goto s_loop_v13608;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -14039,7 +14041,7 @@ s_expand_2Dpart: /* k tmpl ellipsis-pair? list-ids ellipsis-vars expand new-lite
     r[11+8] = r[1];  
     r += 11; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13307;
+    goto s_l_v13502;
   }
   }
   }
@@ -14050,13 +14052,13 @@ case 179: /* clo ek r */
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
-    { fixnum_t v14684_tmp;
+    { fixnum_t v14885_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14684_tmp = (n); }
+    v14885_tmp = (n); }
     { /* list->vector */
-    obj l; int i, c = (v14684_tmp);
+    obj l; int i, c = (v14885_tmp);
     hreserve(hbsz(c+1), 3); /* 3 live regs */
     l = r[1];   /* gc-safe */
     for (i = 0; i < c; ++i, l = cdr(l)) hp[i-c] = car(l);
@@ -14082,7 +14084,7 @@ case 180: /* clo ek r */
     r[1+7] = p[6];
     r[1+8] = p[7]; }
     r += 1; /* shift reg. wnd */
-s_l_v13307: /* ek r list-ids ellipsis-vars bindings expand-part k expand tmpl */
+s_l_v13502: /* ek r list-ids ellipsis-vars bindings expand-part k expand tmpl */
   if (bool_from_obj(r[1])) {
     hreserve(hbsz(5+1), 9); /* 9 live regs */
     *--hp = r[8];  
@@ -14185,7 +14187,7 @@ case 181: /* clo ek r */
     r[0] = r[8];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v13346;
+    goto s_loop_v13541;
   }
 
 case 182: /* clo k vals */
@@ -14274,7 +14276,7 @@ case 185: /* clo ek r */
     rc = 3;
     goto jump;
 
-s_loop_v13346: /* k l bindings */
+s_loop_v13541: /* k l bindings */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -14286,7 +14288,7 @@ s_loop_v13346: /* k l bindings */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13346;
+    goto s_loop_v13541;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -14388,13 +14390,13 @@ case 189: /* clo ek r */
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
     /* ek r k r */
-    { fixnum_t v14683_tmp;
+    { fixnum_t v14884_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14683_tmp = (n); }
+    v14884_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14683_tmp);
+    obj t, l, o, *p, *d; int c = (v14884_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[3];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -14577,7 +14579,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env
     r[1] = obj_from_bool(0);
     r[2] = (r[10]);
     /* r[3] */    
-    goto s_l_v13273;
+    goto s_l_v13468;
   }
   } else {
     { /* cons */ 
@@ -14621,7 +14623,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env
     r[14+6] = r[0];  
     r += 14; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13255;
+    goto s_l_v13450;
   } else {
     r[0] = (r[10]);
     pc = objptr_from_obj(r[0])[0];
@@ -14638,7 +14640,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env
     r[1] = (r[13]);
     r[2] = (r[10]);
     /* r[3] */    
-    goto s_l_v13273;
+    goto s_l_v13468;
   } else {
     hreserve(hbsz(8+1), 13); /* 13 live regs */
     *--hp = r[1];  
@@ -14669,7 +14671,7 @@ case 196: /* clo k condition */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_l_v13273: /* k condition return bindings */
+s_l_v13468: /* k condition return bindings */
   if (bool_from_obj(r[1])) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -14739,7 +14741,7 @@ case 199: /* clo ek . */
     r[1+5] = p[4];
     r[1+6] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_l_v13255: /* ek . match bindings sexp pat k */
+s_l_v13450: /* ek . match bindings sexp pat k */
     { /* vector->list */
     obj v, l = mknull(); int c = (vectorlen((r[5])));
     hreserve(hbsz(3)*c, 7); /* 7 live regs */
@@ -14815,7 +14817,7 @@ case 200: /* clo ek r */
     r[13+10] = (r[10]);
     r += 13; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13175;
+    goto s_l_v13370;
   } else {
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -14867,7 +14869,7 @@ case 201: /* clo ek r */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v13175: /* ek r return list-ids not-pat-literal? match bindings pat k sexp tail-len */
+s_l_v13370: /* ek r return list-ids not-pat-literal? match bindings pat k sexp tail-len */
     hreserve(hbsz(9+1), 11); /* 11 live regs */
     *--hp = (r[10]);
     *--hp = r[1];  
@@ -14902,7 +14904,7 @@ s_l_v13175: /* ek r return list-ids not-pat-literal? match bindings pat k sexp t
     r[12+10] = (r[10]);
     r += 12; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v13177;
+    goto s_l_v13372;
   }
 
 case 202: /* clo ek . */
@@ -14919,35 +14921,35 @@ case 202: /* clo ek . */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v13177: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */
-    { const fixnum_t v14680_tail_2Dlen = fixnum_from_obj(r[10]);
+s_l_v13372: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */
+    { const fixnum_t v14881_tail_2Dlen = fixnum_from_obj(r[10]);
     { /* list-tail */
-    obj l = r[8];   int c = (fxsub(fixnum_from_obj(r[9]), (v14680_tail_2Dlen)));
+    obj l = r[8];   int c = (fxsub(fixnum_from_obj(r[9]), (v14881_tail_2Dlen)));
     while (c-- > 0) l = cdr(l);
     r[11] = (l); }
-    { fixnum_t v14681_tmp;
+    { fixnum_t v14882_tmp;
     { /* length */
     int n; obj l = r[8];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14681_tmp = (n); }
+    v14882_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14681_tmp);
+    obj l, o = mknull(); int c = (v14882_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = r[8];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[12] = (o); } }
     { /* list-tail */
-    obj l = (r[12]); int c = (v14680_tail_2Dlen);
+    obj l = (r[12]); int c = (v14881_tail_2Dlen);
     while (c-- > 0) l = cdr(l);
     r[12] = (l); }
-    { fixnum_t v14682_tmp;
+    { fixnum_t v14883_tmp;
     { /* length */
     int n; obj l = (r[12]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14682_tmp = (n); }
+    v14883_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14682_tmp);
+    obj l, o = mknull(); int c = (v14883_tmp);
     hreserve(hbsz(3)*c, 13); /* 13 live regs */
     l = (r[12]); /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -14997,9 +14999,9 @@ case 203: /* clo ek r */
     r[1] = r[2];  
     r[2] = r[3];  
     r[3] = r[6];  
-    goto s_loop_v13198;
+    goto s_loop_v13393;
 
-s_loop_v13198: /* k l match pat */
+s_loop_v13393: /* k l match pat */
   if ((ispair((r[1])))) {
     r[4] = (cdr((r[1])));
     hreserve(hbsz(4+1), 5); /* 5 live regs */
@@ -15013,7 +15015,7 @@ s_loop_v13198: /* k l match pat */
     r[1] = r[4];  
     /* r[2] */    
     /* r[3] */    
-    goto s_loop_v13198;
+    goto s_loop_v13393;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15067,9 +15069,9 @@ case 205: /* clo ek r */
     r[0] = r[5];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v13209;
+    goto s_loop_v13404;
 
-s_loop_v13209: /* k l f */
+s_loop_v13404: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -15081,7 +15083,7 @@ s_loop_v13209: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v13209;
+    goto s_loop_v13404;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15232,13 +15234,13 @@ case 211: /* clo ek r */
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
     /* ek r k r */
-    { fixnum_t v14679_tmp;
+    { fixnum_t v14880_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14679_tmp = (n); }
+    v14880_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14679_tmp);
+    obj t, l, o, *p, *d; int c = (v14880_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[3];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -15987,42 +15989,42 @@ case 250: /* clo ek r */
     static obj c[] = { obj_from_objptr(vmcases+5) };
     cx_encode_2Dintegrable = obj_from_objptr(c); }
     { static obj c[] = { obj_from_case(338) }; cx_codegen = (obj)c; }
-    { static obj c[] = { obj_from_case(427) }; cx_compile_2Dto_2Dstring = (obj)c; }
+    { static obj c[] = { obj_from_case(436) }; cx_compile_2Dto_2Dstring = (obj)c; }
     { /* define execute-thunk-closure */
     static obj c[] = { obj_from_objptr(vmcases+0) }; 
     cx_execute_2Dthunk_2Dclosure = obj_from_objptr(c); }
     { /* define make-closure */
     static obj c[] = { obj_from_objptr(vmcases+1) };
     cx_make_2Dclosure = obj_from_objptr(c); }
-    { static obj c[] = { obj_from_case(430) }; cx_execute = (obj)c; }
+    { static obj c[] = { obj_from_case(439) }; cx_execute = (obj)c; }
     { /* define decode-sexp */
     static obj c[] = { obj_from_objptr(vmcases+2) };
     cx_decode_2Dsexp = obj_from_objptr(c); }
     { /* define decode */
     static obj c[] = { obj_from_objptr(vmcases+3) };
     cx_decode = obj_from_objptr(c); }
-    { static obj c[] = { obj_from_case(432) }; cx_evaluate = (obj)c; }
-    cx__2Ahide_2Drefs_2A = (cx__233351);
-    { static obj c[] = { obj_from_case(437) }; cx_display_2Dcode = (obj)c; }
-    { static obj c[] = { obj_from_case(438) }; cx_process_2Ddefine_2Dsyntax = (obj)c; }
-    { static obj c[] = { obj_from_case(445) }; cx_process_2Dstatement = (obj)c; }
-    { static obj c[] = { obj_from_case(449) }; cx_process_2Ddefine = (obj)c; }
-    { static obj c[] = { obj_from_case(453) }; cx_scan_2Dtop_2Dform = (obj)c; }
-    { static obj c[] = { obj_from_case(466) }; cx_process_2Dtop_2Dform = (obj)c; }
-    { static obj c[] = { obj_from_case(491) }; cx_path_2Dstrip_2Ddirectory = (obj)c; }
-    { static obj c[] = { obj_from_case(492) }; cx_path_2Dstrip_2Dextension = (obj)c; }
-    { static obj c[] = { obj_from_case(493) }; cx_module_2Dname = (obj)c; }
-    { static obj c[] = { obj_from_case(495) }; cx_process_2Dfile = (obj)c; }
+    { static obj c[] = { obj_from_case(441) }; cx_evaluate = (obj)c; }
+    cx__2Ahide_2Drefs_2A = (cx__233424);
+    { static obj c[] = { obj_from_case(446) }; cx_display_2Dcode = (obj)c; }
+    { static obj c[] = { obj_from_case(447) }; cx_process_2Ddefine_2Dsyntax = (obj)c; }
+    { static obj c[] = { obj_from_case(454) }; cx_process_2Dstatement = (obj)c; }
+    { static obj c[] = { obj_from_case(458) }; cx_process_2Ddefine = (obj)c; }
+    { static obj c[] = { obj_from_case(462) }; cx_scan_2Dtop_2Dform = (obj)c; }
+    { static obj c[] = { obj_from_case(475) }; cx_process_2Dtop_2Dform = (obj)c; }
+    { static obj c[] = { obj_from_case(500) }; cx_path_2Dstrip_2Ddirectory = (obj)c; }
+    { static obj c[] = { obj_from_case(501) }; cx_path_2Dstrip_2Dextension = (obj)c; }
+    { static obj c[] = { obj_from_case(502) }; cx_module_2Dname = (obj)c; }
+    { static obj c[] = { obj_from_case(504) }; cx_process_2Dfile = (obj)c; }
     { /* define decode */
     static obj c[] = { obj_from_objptr(vmcases+3) };
     r[3] = obj_from_objptr(c); }
     hreserve(hbsz(0+1), 4); /* 4 live regs */
-    *--hp = obj_from_case(504);
+    *--hp = obj_from_case(513);
     r[4] = (hendblk(0+1));
     r[0] = r[3];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[4];  
-    r[2] = (cx__233705);
+    r[2] = (cx__233778);
     rreserve(MAX_HOSTREGS);
     rc = 3;
     goto jump;
@@ -16070,8 +16072,8 @@ case 252: /* write-serialized-char k x port */
     assert(rc == 4);
     r += 1; /* shift reg. wnd */
 gs_write_2Dserialized_2Dchar: /* k x port */
-    { const char_t v14678_x = char_from_obj(r[1]);
-  if ((((v14678_x) == ('%')) || (((v14678_x) == (34)) || (((v14678_x) == (92)) || (((v14678_x) < (' ')) || ((v14678_x) > ('~'))))))) {
+    { const char_t v14879_x = char_from_obj(r[1]);
+  if ((((v14879_x) == ('%')) || (((v14879_x) == (34)) || (((v14879_x) == (92)) || (((v14879_x) < (' ')) || ((v14879_x) > ('~'))))))) {
     (void)(oportputc(('%'), (r[2])));
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
@@ -16081,7 +16083,7 @@ gs_write_2Dserialized_2Dchar: /* k x port */
     r[4+0] = (cx_fixnum_2D_3Estring);
     pc = objptr_from_obj(r[4+0])[0];
     r[4+1] = r[3];  
-    r[4+2] = obj_from_fixnum((fixnum_t)(v14678_x));
+    r[4+2] = obj_from_fixnum((fixnum_t)(v14879_x));
     r[4+3] = obj_from_fixnum(+16);
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -16091,7 +16093,7 @@ gs_write_2Dserialized_2Dchar: /* k x port */
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
     r[1] = obj_from_ktrap();
-    r[2] = obj_from_void(oportputc((v14678_x), (r[2])));
+    r[2] = obj_from_void(oportputc((v14879_x), (r[2])));
     rreserve(MAX_HOSTREGS);
     rc = 3;
     goto jump;
@@ -16392,14 +16394,14 @@ case 260: /* clo ek r */
     r[0] = r[3];  
     r[1] = r[2];  
     r[2] = r[4];  
-    goto s_loop_v12919;
+    goto s_loop_v13114;
 
 case 261: /* clo k x */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12919: /* k x port */
+s_loop_v13114: /* k x port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -16508,7 +16510,7 @@ case 265: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12890;
+    goto s_loop_v13085;
 
 case 266: /* clo k i */
     assert(rc == 3);
@@ -16516,7 +16518,7 @@ case 266: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12890: /* k i port x */
+s_loop_v13085: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (vectorlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -16585,7 +16587,7 @@ case 268: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12873;
+    goto s_loop_v13068;
 
 case 269: /* clo k i */
     assert(rc == 3);
@@ -16593,7 +16595,7 @@ case 269: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12873: /* k i port x */
+s_loop_v13068: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -16653,7 +16655,7 @@ case 271: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12856;
+    goto s_loop_v13051;
 
 case 272: /* clo k i */
     assert(rc == 3);
@@ -16661,7 +16663,7 @@ case 272: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12856: /* k i port x */
+s_loop_v13051: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -16711,8 +16713,8 @@ case 274: /* write-serialized-arg k arg port */
 gs_write_2Dserialized_2Darg: /* k arg port */
   if (((is_fixnum_obj(r[1])) || (is_flonum_obj(r[1])))) {
   if ((is_fixnum_obj(r[1]))) {
-    { const fixnum_t v14677_arg = fixnum_from_obj(r[1]);
-    r[3] = obj_from_bool(((+0) <= (v14677_arg)) && ((v14677_arg) <= (+9))); } 
+    { const fixnum_t v14878_arg = fixnum_from_obj(r[1]);
+    r[3] = obj_from_bool(((+0) <= (v14878_arg)) && ((v14878_arg) <= (+9))); } 
   } else {
     r[3] = obj_from_bool(0);
   }
@@ -16720,8 +16722,8 @@ gs_write_2Dserialized_2Darg: /* k arg port */
     r[3] = obj_from_bool(0);
   }
   if (bool_from_obj(r[3])) {
-    { const char_t v14676_tmp = (*(unsigned char*)stringref((cx__232596), fixnum_from_obj(r[1])));
-    r[3] = obj_from_void(oportputc((v14676_tmp), (r[2]))); } 
+    { const char_t v14877_tmp = (*(unsigned char*)stringref((cx__232596), fixnum_from_obj(r[1])));
+    r[3] = obj_from_void(oportputc((v14877_tmp), (r[2]))); } 
     r[4+0] = r[0];  
     pc = objptr_from_obj(r[4+0])[0];
     r[4+1] = obj_from_ktrap();
@@ -17235,9 +17237,9 @@ case 288: /* clo k clauses */
     r[0] = r[4];  
     /* r[1] */    
     r[2] = r[3];  
-    goto s_loop_v12739;
+    goto s_loop_v12934;
 
-s_loop_v12739: /* k l f */
+s_loop_v12934: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -17249,7 +17251,7 @@ s_loop_v12739: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12739;
+    goto s_loop_v12934;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18029,9 +18031,9 @@ case 319: /* clo k clauses */
     r[0] = r[4];  
     /* r[1] */    
     r[2] = r[3];  
-    goto s_loop_v12528;
+    goto s_loop_v12723;
 
-s_loop_v12528: /* k l f */
+s_loop_v12723: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -18043,7 +18045,7 @@ s_loop_v12528: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12528;
+    goto s_loop_v12723;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18626,7 +18628,7 @@ gs_codegen: /* k x l f s g k port */
     *--hp = r[5];  
     *--hp = r[7];  
     *--hp = r[4];  
-    *--hp = obj_from_case(402);
+    *--hp = obj_from_case(411);
     r[8] = (hendblk(6+1));
     { /* make-improper-lambda */
     hreserve(hbsz(3), 9); /* 9 live regs */
@@ -18686,7 +18688,7 @@ case 339: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v12391;
+    goto s_l_v12586;
   } else {
   if (((((r[1]) == obj_from_bool(0)) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
     r[5] = obj_from_void(oportputc(('f'), (r[2])));
@@ -18697,7 +18699,7 @@ case 339: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v12391;
+    goto s_l_v12586;
   } else {
   if (((((r[1]) == (mknull())) || ((is_flonum_obj(r[1])) && ((is_flonum_obj(mknull())) && (flonum_from_obj(r[1]) == flonum_from_obj(mknull()))))) && (1))) {
     r[5] = obj_from_void(oportputc(('n'), (r[2])));
@@ -18708,7 +18710,7 @@ case 339: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v12391;
+    goto s_l_v12586;
   } else {
     (void)(oportputc((39), (r[2])));
     r[0] = r[4];  
@@ -18727,7 +18729,7 @@ case 340: /* clo ek . */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v12391: /* ek . k port k */
+s_l_v12586: /* ek . k port k */
   if (bool_from_obj(r[4])) {
     (void)(oportputc((']'), (r[3])));
     r[0] = r[2];  
@@ -19053,7 +19055,7 @@ case 350: /* clo k exps */
     r[9+7] = r[7];  
     r += 9; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12317;
+    goto s_loop_v12512;
 
 case 351: /* clo k xl */
     assert(rc == 3);
@@ -19065,7 +19067,7 @@ case 351: /* clo k xl */
     r[1+6] = p[5];
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12317: /* k xl port g s f l k */
+s_loop_v12512: /* k xl port g s f l k */
   if ((ispair((r[1])))) {
     r[8] = (cdr((r[1])));
     r[8] = obj_from_bool(ispair((r[8])));
@@ -19256,7 +19258,7 @@ case 356: /* clo ek . */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
   } else {
-    r[10] = obj_from_bool(isequal((r[6]), (cx__233221)));
+    r[10] = obj_from_bool(isequal((r[6]), (cx__233294)));
   if (bool_from_obj(r[10])) {
     r[0] = r[7];  
     pc = objptr_from_obj(r[0])[0];
@@ -19456,13 +19458,13 @@ case 362: /* clo ek r */
     r[1+12] = p[11]; }
     r += 1; /* shift reg. wnd */
     /* ek r f l idsi s g r r exp k k port */
-    { fixnum_t v14675_tmp;
+    { fixnum_t v14876_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14675_tmp = (n); }
+    v14876_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14675_tmp);
+    obj l, o = mknull(); int c = (v14876_tmp);
     hreserve(hbsz(3)*c, 13); /* 13 live regs */
     l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -19489,7 +19491,7 @@ case 362: /* clo ek r */
     r[15+5] = (r[12]);
     r += 15; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12246;
+    goto s_loop_v12441;
 
 case 363: /* clo k free l */
     assert(rc == 4);
@@ -19498,7 +19500,7 @@ case 363: /* clo k free l */
     r[1+4] = p[2];
     r[1+5] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12246: /* k free l g f port */
+s_loop_v12441: /* k free l g f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -19696,7 +19698,7 @@ case 367: /* clo ek . */
     r[12+4] = r[3];  
     r += 12; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12221;
+    goto s_loop_v12416;
 
 case 368: /* clo k ids n */
     assert(rc == 4);
@@ -19704,7 +19706,7 @@ case 368: /* clo k ids n */
     r[1+3] = p[1];
     r[1+4] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12221: /* k ids n port r */
+s_loop_v12416: /* k ids n port r */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -19748,7 +19750,7 @@ s_loop_v12221: /* k ids n port r */
     r[7+5] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v12223;
+    goto s_l_v12418;
   }
   }
 
@@ -19761,7 +19763,7 @@ case 369: /* clo ek . */
     r[1+4] = p[3];
     r[1+5] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_l_v12223: /* ek . loop n ids k */
+s_l_v12418: /* ek . loop n ids k */
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
@@ -19903,13 +19905,13 @@ case 374: /* clo k clauses */
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
     /* k clauses g s f l k port */
-    { fixnum_t v14674_tmp;
+    { fixnum_t v14875_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14674_tmp = (n); }
+    v14875_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14674_tmp);
+    obj l, o = mknull(); int c = (v14875_tmp);
     hreserve(hbsz(3)*c, 8); /* 8 live regs */
     l = r[1];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -19931,7 +19933,7 @@ case 374: /* clo k clauses */
     r[10+6] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12164;
+    goto s_loop_v12359;
 
 case 375: /* clo k clauses l */
     assert(rc == 4);
@@ -19941,7 +19943,7 @@ case 375: /* clo k clauses l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12164: /* k clauses l g s f port */
+s_loop_v12359: /* k clauses l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -20059,14 +20061,14 @@ case 378: /* clo ek . */
     r[1] = r[2];  
     r[2] = obj_from_fixnum(+0);
     r[3] = r[5];  
-    goto s_loop_v12137;
+    goto s_loop_v12332;
 
 case 379: /* clo k clauses i */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12137: /* k clauses i port */
+s_loop_v12332: /* k clauses i port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -20436,7 +20438,7 @@ case 390: /* clo k kexp exp */
     /* k kexp exp g s f l port */
     r[8] = (car((r[2])));
     { /* memq */
-    obj x = (r[8]), l = (cx__233056);
+    obj x = (r[8]), l = (cx__233129);
     for (; l != mknull(); l = cdr(l)) if (car(l) == x) break;
     r[8] = (l == mknull() ? obj_from_bool(0) : l); }
   if (bool_from_obj(r[8])) {
@@ -20664,7 +20666,7 @@ case 396: /* clo ek r */
     { /* define integrable-type */
     static obj c[] = { obj_from_objptr(vmcases+10) };
     r[11] = obj_from_objptr(c); }
-    hreserve(hbsz(9+1), 12); /* 12 live regs */
+    hreserve(hbsz(10+1), 12); /* 12 live regs */
     *--hp = (r[10]);
     *--hp = r[9];  
     *--hp = r[8];  
@@ -20674,8 +20676,9 @@ case 396: /* clo ek r */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
+    *--hp = r[2];  
     *--hp = obj_from_case(397);
-    r[12] = (hendblk(9+1));
+    r[12] = (hendblk(10+1));
     r[0] = (r[11]);
     pc = objptr_from_obj(r[0])[0];
     r[1] = (r[12]);
@@ -20695,56 +20698,172 @@ case 397: /* clo ek r */
     r[1+7] = p[6];
     r[1+8] = p[7];
     r[1+9] = p[8];
-    r[1+10] = p[9]; }
+    r[1+10] = p[9];
+    r[1+11] = p[10]; }
     r += 1; /* shift reg. wnd */
-    /* ek r g s f l args r k port k */
-    hreserve(hbsz(3+1), 11); /* 11 live regs */
+    /* ek r ig g s f l args r k port k */
+    hreserve(hbsz(3+1), 12); /* 12 live regs */
+    *--hp = (r[11]);
     *--hp = (r[10]);
     *--hp = r[9];  
-    *--hp = r[8];  
     *--hp = obj_from_case(398);
-    r[11] = (hendblk(3+1));
+    r[12] = (hendblk(3+1));
   if (((((r[1]) == obj_from_char('0')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('1')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('2')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('3')) || ((is_flonum_obj(r[1])) && (0))) && (1)))))) {
-    { fixnum_t v14673_tmp;
+    { fixnum_t v14874_tmp;
     { /* length */
-    int n; obj l = r[6];  
+    int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14673_tmp = (n); }
+    v14874_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14673_tmp);
-    hreserve(hbsz(3)*c, 12); /* 12 live regs */
-    l = r[6];   /* gc-safe */
+    obj l, o = mknull(); int c = (v14874_tmp);
+    hreserve(hbsz(3)*c, 13); /* 13 live regs */
+    l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
-    r[12] = (o); } }
-    hreserve(hbsz(3+1), 13); /* 13 live regs */
-    *--hp = r[9];  
-    *--hp = r[7];  
-    *--hp = (r[11]);
+    r[13] = (o); } }
+    hreserve(hbsz(3+1), 14); /* 14 live regs */
+    *--hp = (r[10]);
+    *--hp = r[8];  
+    *--hp = (r[12]);
     *--hp = obj_from_case(401);
-    r[13] = (hendblk(3+1));
-    r[14+0] = (r[13]);
-    r[14+1] = (r[12]);
-    r[14+2] = r[5];  
-    r[14+3] = r[2];  
-    r[14+4] = r[3];  
-    r[14+5] = r[4];  
-    r[14+6] = r[9];  
-    r += 14; /* shift reg wnd */
-    rreserve(MAX_HOSTREGS);
-    goto s_loop_v12016;
+    r[14] = (hendblk(3+1));
+    r[0] = (r[14]);
+    r[1] = (r[13]);
+    r[2] = r[6];  
+    /* r[3] */    
+    /* r[4] */    
+    /* r[5] */    
+    r[6] = (r[10]);
+    goto s_loop_v12211;
   } else {
-    r[12+0] = (cx_error);
-    pc = objptr_from_obj(r[12+0])[0];
-    r[12+1] = (r[11]);
-    r[12+2] = (mksymbol(internsym("codegen")));
-    r[12+3] = (cx__232982);
-    r[12+4] = (r[1]);
-    r += 12; /* shift reg wnd */
+  if (((((r[1]) == obj_from_char('p')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
+  if ((isnull((r[7])))) {
+    { /* define integrable-code */
+    static obj c[] = { obj_from_objptr(vmcases+12) };
+    r[13] = obj_from_objptr(c); }
+    hreserve(hbsz(2+1), 14); /* 14 live regs */
+    *--hp = (r[10]);
+    *--hp = (r[12]);
+    *--hp = obj_from_case(402);
+    r[14] = (hendblk(2+1));
+    r[0] = (r[13]);
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = (r[14]);
+    /* r[2] */    
+    r[3] = obj_from_fixnum(+1);
+    rreserve(MAX_HOSTREGS);
+    rc = 4;
+    goto jump;
+  } else {
+    { fixnum_t v14872_tmp;
+    { /* length */
+    int n; obj l = r[7];  
+    for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
+    v14872_tmp = (n); }
+    r[13] = obj_from_fixnum(fxsub((v14872_tmp), (+1))); }
+    { fixnum_t v14873_tmp;
+    { /* length */
+    int n; obj l = r[7];  
+    for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
+    v14873_tmp = (n); }
+    { /* reverse */
+    obj l, o = mknull(); int c = (v14873_tmp);
+    hreserve(hbsz(3)*c, 14); /* 14 live regs */
+    l = r[7];   /* gc-safe */
+    for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
+    *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
+    r[14] = (o); } }
+    hreserve(hbsz(4+1), 15); /* 15 live regs */
+    *--hp = (r[12]);
+    *--hp = (r[13]);
+    *--hp = (r[10]);
+    *--hp = r[8];  
+    *--hp = obj_from_case(405);
+    r[15] = (hendblk(4+1));
+    r[0] = (r[15]);
+    r[1] = (r[14]);
+    r[2] = r[6];  
+    /* r[3] */    
+    /* r[4] */    
+    /* r[5] */    
+    r[6] = (r[10]);
+    goto s_loop_v12186;
+  }
+  } else {
+  if (((((r[1]) == obj_from_char('m')) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
+    r[13] = (cdr((r[7])));
+    r[13] = obj_from_bool(isnull((r[13])));
+  if (bool_from_obj(r[13])) {
+    { /* define integrable-code */
+    static obj c[] = { obj_from_objptr(vmcases+12) };
+    r[13] = obj_from_objptr(c); }
+    hreserve(hbsz(7+1), 14); /* 14 live regs */
+    *--hp = (r[10]);
+    *--hp = (r[12]);
+    *--hp = r[7];  
+    *--hp = r[6];  
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = obj_from_case(406);
+    r[14] = (hendblk(7+1));
+    r[0] = (r[13]);
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = (r[14]);
+    /* r[2] */    
+    r[3] = obj_from_fixnum(+1);
+    rreserve(MAX_HOSTREGS);
+    rc = 4;
+    goto jump;
+  } else {
+    { fixnum_t v14870_tmp;
+    { /* length */
+    int n; obj l = r[7];  
+    for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
+    v14870_tmp = (n); }
+    r[13] = obj_from_fixnum(fxsub((v14870_tmp), (+1))); }
+    { fixnum_t v14871_tmp;
+    { /* length */
+    int n; obj l = r[7];  
+    for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
+    v14871_tmp = (n); }
+    { /* reverse */
+    obj l, o = mknull(); int c = (v14871_tmp);
+    hreserve(hbsz(3)*c, 14); /* 14 live regs */
+    l = r[7];   /* gc-safe */
+    for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
+    *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
+    r[14] = (o); } }
+    hreserve(hbsz(4+1), 15); /* 15 live regs */
+    *--hp = (r[12]);
+    *--hp = (r[13]);
+    *--hp = (r[10]);
+    *--hp = r[8];  
+    *--hp = obj_from_case(410);
+    r[15] = (hendblk(4+1));
+    r[0] = (r[15]);
+    r[1] = (r[14]);
+    r[2] = r[6];  
+    /* r[3] */    
+    /* r[4] */    
+    /* r[5] */    
+    r[6] = (r[10]);
+    goto s_loop_v12150;
+  }
+  } else {
+    r[13+0] = (cx_error);
+    pc = objptr_from_obj(r[13+0])[0];
+    r[13+1] = (r[12]);
+    r[13+2] = (mksymbol(internsym("codegen")));
+    r[13+3] = (cx__232982);
+    r[13+4] = (r[1]);
+    r += 13; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
     rc = 5;
     goto jump;
   }
+  }
+  }
 
 case 398: /* clo ek . */
     assert(rc >= 2);
@@ -20779,7 +20898,7 @@ case 399: /* clo k args l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12016: /* k args l g s f port */
+s_loop_v12211: /* k args l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -20867,7 +20986,302 @@ case 401: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 402: /* clo k exp args */
+case 402: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r k port */
+    r[4+0] = r[2];  
+    pc = objptr_from_obj(r[4+0])[0];
+    r[4+1] = obj_from_ktrap();
+    r[4+2] = obj_from_void(oportputs(stringchars((r[1])), (r[3])));
+    r += 4; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+
+case 403: /* clo k args l */
+    assert(rc == 4);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+3] = p[1];
+    r[1+4] = p[2];
+    r[1+5] = p[3];
+    r[1+6] = p[4]; }
+    r += 1; /* shift reg. wnd */
+s_loop_v12186: /* k args l g s f port */
+  if ((isnull((r[1])))) {
+    /* r[0] */    
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = ((0) ? obj_from_bool(0) : obj_from_void(0));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+  } else {
+    hreserve(hbsz(4+1), 7); /* 7 live regs */
+    *--hp = r[6];  
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = obj_from_case(403);
+    r[7] = (hendblk(4+1));
+    hreserve(hbsz(5+1), 8); /* 8 live regs */
+    *--hp = r[1];  
+    *--hp = r[6];  
+    *--hp = r[0];  
+    *--hp = r[2];  
+    *--hp = r[7];  
+    *--hp = obj_from_case(404);
+    r[7] = (hendblk(5+1));
+    r[8+0] = r[7];  
+    r[8+1] = (car((r[1])));
+    r[8+2] = r[2];  
+    r[8+3] = r[5];  
+    r[8+4] = r[4];  
+    r[8+5] = r[3];  
+    r[8+6] = obj_from_bool(0);
+    r[8+7] = r[6];  
+    r += 8; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    goto gs_codegen;
+  }
+
+case 404: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4];
+    r[1+6] = p[5]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . loop l k port args */
+    r[7] = (cdr((r[6])));
+    r[7] = obj_from_bool(isnull((r[7])));
+  if (bool_from_obj(r[7])) {
+    (void)((0) ? obj_from_bool(0) : obj_from_void(0));
+  } else {
+    (void)(oportputc((','), (r[5])));
+  }
+    { /* cons */ 
+    hreserve(hbsz(3), 7); /* 7 live regs */
+    *--hp = r[3];  
+    *--hp = obj_from_bool(0);
+    *--hp = obj_from_size(PAIR_BTAG); 
+    r[7] = (hendblk(3)); }
+    r[0] = r[2];  
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = r[4];  
+    r[2] = (cdr((r[6])));
+    r[3] = r[7];  
+    rreserve(MAX_HOSTREGS);
+    rc = 4;
+    goto jump;
+
+case 405: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . r port opc k */
+    r[0] = r[5];  
+    r[1] = obj_from_fixnum(+0);
+    /* r[2] */    
+    /* r[3] */    
+    /* r[4] */    
+    goto s_loop_v12177;
+
+s_loop_v12177: /* k i r port opc */
+    { const fixnum_t v14869_i = fixnum_from_obj(r[1]);
+  if (((v14869_i) >= fixnum_from_obj(r[4]))) {
+    /* r[0] */    
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = ((0) ? obj_from_bool(0) : obj_from_void(0));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+  } else {
+    (void)(oportputs(stringchars((r[2])), (r[3])));
+    /* r[0] */    
+    r[1] = obj_from_fixnum(fxadd((v14869_i), (+1)));
+    /* r[2] */    
+    /* r[3] */    
+    /* r[4] */    
+    goto s_loop_v12177;
+  } } 
+
+case 406: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4];
+    r[1+6] = p[5];
+    r[1+7] = p[6];
+    r[1+8] = p[7]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r g s f l args k port */
+    hreserve(hbsz(3+1), 9); /* 9 live regs */
+    *--hp = r[8];  
+    *--hp = r[1];  
+    *--hp = r[7];  
+    *--hp = obj_from_case(407);
+    r[9] = (hendblk(3+1));
+    r[10+0] = r[9];  
+    r[10+1] = (car((r[6])));
+    r[10+2] = r[5];  
+    r[10+3] = r[4];  
+    r[10+4] = r[3];  
+    r[10+5] = r[2];  
+    r[10+6] = obj_from_bool(0);
+    r[10+7] = r[8];  
+    r += 10; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    goto gs_codegen;
+
+case 407: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . k r port */
+    r[0] = r[2];  
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = obj_from_void(oportputs(stringchars((r[3])), (r[4])));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+
+case 408: /* clo k args l */
+    assert(rc == 4);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+3] = p[1];
+    r[1+4] = p[2];
+    r[1+5] = p[3];
+    r[1+6] = p[4]; }
+    r += 1; /* shift reg. wnd */
+s_loop_v12150: /* k args l g s f port */
+  if ((isnull((r[1])))) {
+    /* r[0] */    
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = ((0) ? obj_from_bool(0) : obj_from_void(0));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+  } else {
+    hreserve(hbsz(4+1), 7); /* 7 live regs */
+    *--hp = r[6];  
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = obj_from_case(408);
+    r[7] = (hendblk(4+1));
+    hreserve(hbsz(5+1), 8); /* 8 live regs */
+    *--hp = r[1];  
+    *--hp = r[6];  
+    *--hp = r[0];  
+    *--hp = r[2];  
+    *--hp = r[7];  
+    *--hp = obj_from_case(409);
+    r[7] = (hendblk(5+1));
+    r[8+0] = r[7];  
+    r[8+1] = (car((r[1])));
+    r[8+2] = r[2];  
+    r[8+3] = r[5];  
+    r[8+4] = r[4];  
+    r[8+5] = r[3];  
+    r[8+6] = obj_from_bool(0);
+    r[8+7] = r[6];  
+    r += 8; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    goto gs_codegen;
+  }
+
+case 409: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4];
+    r[1+6] = p[5]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . loop l k port args */
+    r[7] = (cdr((r[6])));
+    r[7] = obj_from_bool(isnull((r[7])));
+  if (bool_from_obj(r[7])) {
+    (void)((0) ? obj_from_bool(0) : obj_from_void(0));
+  } else {
+    (void)(oportputc((','), (r[5])));
+  }
+    { /* cons */ 
+    hreserve(hbsz(3), 7); /* 7 live regs */
+    *--hp = r[3];  
+    *--hp = obj_from_bool(0);
+    *--hp = obj_from_size(PAIR_BTAG); 
+    r[7] = (hendblk(3)); }
+    r[0] = r[2];  
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = r[4];  
+    r[2] = (cdr((r[6])));
+    r[3] = r[7];  
+    rreserve(MAX_HOSTREGS);
+    rc = 4;
+    goto jump;
+
+case 410: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . r port opc k */
+    r[0] = r[5];  
+    r[1] = obj_from_fixnum(+0);
+    /* r[2] */    
+    /* r[3] */    
+    /* r[4] */    
+    goto s_loop_v12141;
+
+s_loop_v12141: /* k i r port opc */
+    { const fixnum_t v14868_i = fixnum_from_obj(r[1]);
+  if (((v14868_i) >= fixnum_from_obj(r[4]))) {
+    /* r[0] */    
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = ((0) ? obj_from_bool(0) : obj_from_void(0));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+  } else {
+    (void)(oportputs(stringchars((r[2])), (r[3])));
+    /* r[0] */    
+    r[1] = obj_from_fixnum(fxadd((v14868_i), (+1)));
+    /* r[2] */    
+    /* r[3] */    
+    /* r[4] */    
+    goto s_loop_v12141;
+  } } 
+
+case 411: /* clo k exp args */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
@@ -20885,19 +21299,19 @@ case 402: /* clo k exp args */
     r[9] = (car((r[9])));
     r[9] = obj_from_bool(islist((r[9])));
   if (bool_from_obj(r[9])) {
-    { fixnum_t v14672_tmp;
-    { fixnum_t v14671_tmp;
+    { fixnum_t v14867_tmp;
+    { fixnum_t v14866_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14672_tmp = (n); }
+    v14867_tmp = (n); }
     r[9] = (cdr((r[1])));
     r[9] = (car((r[9])));
     { /* length */
     int n; obj l = r[9];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14671_tmp = (n); }
-    r[9] = obj_from_bool((v14672_tmp) == (v14671_tmp)); } }
+    v14866_tmp = (n); }
+    r[9] = obj_from_bool((v14867_tmp) == (v14866_tmp)); } }
   } else {
     r[9] = obj_from_bool(0);
   }
@@ -20905,13 +21319,13 @@ case 402: /* clo k exp args */
     r[9] = obj_from_bool(0);
   }
   if (bool_from_obj(r[9])) {
-    { fixnum_t v14670_tmp;
+    { fixnum_t v14865_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14670_tmp = (n); }
+    v14865_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14670_tmp);
+    obj l, o = mknull(); int c = (v14865_tmp);
     hreserve(hbsz(3)*c, 9); /* 9 live regs */
     l = r[2];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -20927,7 +21341,7 @@ case 402: /* clo k exp args */
     *--hp = r[2];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(405);
+    *--hp = obj_from_case(414);
     r[10] = (hendblk(9+1));
     r[11+0] = (r[10]);
     r[11+1] = r[9];  
@@ -20938,7 +21352,7 @@ case 402: /* clo k exp args */
     r[11+6] = r[4];  
     r += 11; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11985;
+    goto s_loop_v12114;
   } else {
     hreserve(hbsz(9+1), 9); /* 9 live regs */
     *--hp = r[7];  
@@ -20950,7 +21364,7 @@ case 402: /* clo k exp args */
     *--hp = r[3];  
     *--hp = r[5];  
     *--hp = r[1];  
-    *--hp = obj_from_case(413);
+    *--hp = obj_from_case(422);
     r[9] = (hendblk(9+1));
     r[10] = (car((r[1])));
     r[10] = obj_from_bool((r[10]) == (mksymbol(internsym("ref"))));
@@ -20997,7 +21411,7 @@ case 402: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11850;
+    goto s_l_v11979;
   }
   } else {
     r[10+0] = obj_from_ktrap();
@@ -21013,7 +21427,7 @@ case 402: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11850;
+    goto s_l_v11979;
   }
   } else {
     r[10+0] = obj_from_ktrap();
@@ -21029,11 +21443,11 @@ case 402: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11850;
+    goto s_l_v11979;
   }
   }
 
-case 403: /* clo k args l */
+case 412: /* clo k args l */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
@@ -21041,7 +21455,7 @@ case 403: /* clo k args l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11985: /* k args l g s f port */
+s_loop_v12114: /* k args l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -21056,7 +21470,7 @@ s_loop_v11985: /* k args l g s f port */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(403);
+    *--hp = obj_from_case(412);
     r[7] = (hendblk(4+1));
     hreserve(hbsz(5+1), 8); /* 8 live regs */
     *--hp = r[6];  
@@ -21064,7 +21478,7 @@ s_loop_v11985: /* k args l g s f port */
     *--hp = r[1];  
     *--hp = r[2];  
     *--hp = r[7];  
-    *--hp = obj_from_case(404);
+    *--hp = obj_from_case(413);
     r[7] = (hendblk(5+1));
     r[8+0] = r[7];  
     r[8+1] = (car((r[1])));
@@ -21079,7 +21493,7 @@ s_loop_v11985: /* k args l g s f port */
     goto gs_codegen;
   }
 
-case 404: /* clo ek . */
+case 413: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21106,7 +21520,7 @@ case 404: /* clo ek . */
     rc = 4;
     goto jump;
 
-case 405: /* clo ek . */
+case 414: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21137,14 +21551,14 @@ case 405: /* clo ek . */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(406);
+    *--hp = obj_from_case(415);
     r[13] = (hendblk(10+1));
     r[0] = (r[13]);
     r[1] = (r[12]);
     r[2] = (r[11]);
     goto gs_find_2Dsets;
 
-case 406: /* clo ek r */
+case 415: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -21170,14 +21584,14 @@ case 406: /* clo ek r */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[1];  
-    *--hp = obj_from_case(407);
+    *--hp = obj_from_case(416);
     r[12] = (hendblk(10+1));
     r[0] = (r[12]);
     r[1] = r[2];  
     r[2] = (r[11]);
     goto gs_set_2Dminus;
 
-case 407: /* clo ek r */
+case 416: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -21203,14 +21617,14 @@ case 407: /* clo ek r */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(408);
+    *--hp = obj_from_case(417);
     r[12] = (hendblk(10+1));
     r[0] = (r[12]);
     /* r[1] */    
     /* r[2] */    
     goto gs_set_2Dunion;
 
-case 408: /* clo ek r */
+case 417: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -21225,13 +21639,13 @@ case 408: /* clo ek r */
     r[1+11] = p[10]; }
     r += 1; /* shift reg. wnd */
     /* ek r r port args g f exp k k l ids */
-    { fixnum_t v14669_tmp;
+    { fixnum_t v14864_tmp;
     { /* length */
     int n; obj l = (r[11]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14669_tmp = (n); }
+    v14864_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v14669_tmp);
+    obj t, l, o, *p, *d; int c = (v14864_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = (r[11]); t = (r[10]); /* gc-safe */
     o = t; p = &o; 
@@ -21250,7 +21664,7 @@ case 408: /* clo ek r */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(411);
+    *--hp = obj_from_case(420);
     r[13] = (hendblk(9+1));
     r[14+0] = (r[13]);
     r[14+1] = (r[11]);
@@ -21259,15 +21673,15 @@ case 408: /* clo ek r */
     r[14+4] = r[2];  
     r += 14; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11956;
+    goto s_loop_v12085;
 
-case 409: /* clo k ids n */
+case 418: /* clo k ids n */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
     r[1+4] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11956: /* k ids n port r */
+s_loop_v12085: /* k ids n port r */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -21280,14 +21694,14 @@ s_loop_v11956: /* k ids n port r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(409);
+    *--hp = obj_from_case(418);
     r[5] = (hendblk(2+1));
     hreserve(hbsz(4+1), 6); /* 6 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[2];  
     *--hp = r[5];  
-    *--hp = obj_from_case(410);
+    *--hp = obj_from_case(419);
     r[5] = (hendblk(4+1));
     r[6] = (car((r[1])));
     r[6] = (cxs_set_2Dmember_3F((r[6]), (r[4])));
@@ -21301,7 +21715,7 @@ s_loop_v11956: /* k ids n port r */
     hreserve(hbsz(2+1), 6); /* 6 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(409);
+    *--hp = obj_from_case(418);
     r[6] = (hendblk(2+1));
     r[7+0] = obj_from_ktrap();
     r[7+1] = obj_from_void(0);
@@ -21311,11 +21725,11 @@ s_loop_v11956: /* k ids n port r */
     r[7+5] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11958;
+    goto s_l_v12087;
   }
   }
 
-case 410: /* clo ek . */
+case 419: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21324,7 +21738,7 @@ case 410: /* clo ek . */
     r[1+4] = p[3];
     r[1+5] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_l_v11958: /* ek . loop n ids k */
+s_l_v12087: /* ek . loop n ids k */
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
@@ -21334,7 +21748,7 @@ s_l_v11958: /* ek . loop n ids k */
     rc = 4;
     goto jump;
 
-case 411: /* clo ek . */
+case 420: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21350,12 +21764,12 @@ case 411: /* clo ek . */
     r += 1; /* shift reg. wnd */
     /* ek . port args g r f newl exp k k */
   if (bool_from_obj(r[10])) {
-    { fixnum_t v14668_tmp;
+    { fixnum_t v14863_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14668_tmp = (n); }
-    r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v14668_tmp))); }
+    v14863_tmp = (n); }
+    r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v14863_tmp))); }
     r[12+0] = r[9];  
     r[12+1] = r[8];  
     r[12+2] = r[7];  
@@ -21372,7 +21786,7 @@ case 411: /* clo ek . */
     *--hp = r[2];  
     *--hp = r[9];  
     *--hp = r[3];  
-    *--hp = obj_from_case(412);
+    *--hp = obj_from_case(421);
     r[11] = (hendblk(3+1));
     r[12+0] = (r[11]);
     r[12+1] = r[8];  
@@ -21387,7 +21801,7 @@ case 411: /* clo ek . */
     goto gs_codegen;
   }
 
-case 412: /* clo ek . */
+case 421: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21406,7 +21820,7 @@ case 412: /* clo ek . */
     r[2] = r[4];  
     goto gs_write_2Dserialized_2Darg;
 
-case 413: /* clo ek r */
+case 422: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -21419,15 +21833,15 @@ case 413: /* clo ek r */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v11850: /* ek r exp g s f l args k port k */
+s_l_v11979: /* ek r exp g s f l args k port k */
   if (bool_from_obj(r[1])) {
-    { fixnum_t v14667_tmp;
+    { fixnum_t v14862_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14667_tmp = (n); }
+    v14862_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14667_tmp);
+    obj l, o = mknull(); int c = (v14862_tmp);
     hreserve(hbsz(3)*c, 11); /* 11 live regs */
     l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -21439,7 +21853,7 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     *--hp = r[8];  
     *--hp = r[7];  
     *--hp = r[1];  
-    *--hp = obj_from_case(416);
+    *--hp = obj_from_case(425);
     r[12] = (hendblk(5+1));
     r[0] = (r[12]);
     r[1] = (r[11]);
@@ -21448,16 +21862,16 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     /* r[4] */    
     /* r[5] */    
     r[6] = r[9];  
-    goto s_loop_v11919;
+    goto s_loop_v12048;
   } else {
   if (bool_from_obj(r[10])) {
-    { fixnum_t v14666_tmp;
+    { fixnum_t v14861_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14666_tmp = (n); }
+    v14861_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14666_tmp);
+    obj l, o = mknull(); int c = (v14861_tmp);
     hreserve(hbsz(3)*c, 11); /* 11 live regs */
     l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -21468,7 +21882,7 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     *--hp = r[8];  
     *--hp = r[7];  
     *--hp = (r[10]);
-    *--hp = obj_from_case(420);
+    *--hp = obj_from_case(429);
     r[12] = (hendblk(4+1));
     r[13+0] = (r[12]);
     r[13+1] = (r[11]);
@@ -21480,17 +21894,17 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     r[13+7] = r[2];  
     r += 13; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11894;
+    goto s_loop_v12023;
   } else {
     (void)(oportputc((36), (r[9])));
     (void)(oportputc(('{'), (r[9])));
-    { fixnum_t v14665_tmp;
+    { fixnum_t v14860_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14665_tmp = (n); }
+    v14860_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14665_tmp);
+    obj l, o = mknull(); int c = (v14860_tmp);
     hreserve(hbsz(3)*c, 11); /* 11 live regs */
     l = r[7];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -21512,7 +21926,7 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     *--hp = r[9];  
     *--hp = r[8];  
     *--hp = r[7];  
-    *--hp = obj_from_case(424);
+    *--hp = obj_from_case(433);
     r[13] = (hendblk(3+1));
     r[14+0] = (r[13]);
     r[14+1] = (r[11]);
@@ -21524,11 +21938,11 @@ s_l_v11850: /* ek r exp g s f l args k port k */
     r[14+7] = r[2];  
     r += 14; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11869;
+    goto s_loop_v11998;
   }
   }
 
-case 414: /* clo k args l */
+case 423: /* clo k args l */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
@@ -21536,7 +21950,7 @@ case 414: /* clo k args l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11919: /* k args l g s f port */
+s_loop_v12048: /* k args l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -21551,7 +21965,7 @@ s_loop_v11919: /* k args l g s f port */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(414);
+    *--hp = obj_from_case(423);
     r[7] = (hendblk(4+1));
     hreserve(hbsz(5+1), 8); /* 8 live regs */
     *--hp = r[1];  
@@ -21559,7 +21973,7 @@ s_loop_v11919: /* k args l g s f port */
     *--hp = r[0];  
     *--hp = r[2];  
     *--hp = r[7];  
-    *--hp = obj_from_case(415);
+    *--hp = obj_from_case(424);
     r[7] = (hendblk(5+1));
     r[8+0] = r[7];  
     r[8+1] = (car((r[1])));
@@ -21574,7 +21988,7 @@ s_loop_v11919: /* k args l g s f port */
     goto gs_codegen;
   }
 
-case 415: /* clo ek . */
+case 424: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21607,7 +22021,7 @@ case 415: /* clo ek . */
     rc = 4;
     goto jump;
 
-case 416: /* clo ek . */
+case 425: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21625,7 +22039,7 @@ case 416: /* clo ek . */
     *--hp = r[6];  
     *--hp = r[5];  
     *--hp = r[4];  
-    *--hp = obj_from_case(417);
+    *--hp = obj_from_case(426);
     r[8] = (hendblk(3+1));
     { /* length */
     int n; obj l = r[3];  
@@ -21642,7 +22056,7 @@ case 416: /* clo ek . */
     rc = 5;
     goto jump;
 
-case 417: /* clo ek . */
+case 426: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21667,7 +22081,7 @@ case 417: /* clo ek . */
     goto jump;
   }
 
-case 418: /* clo k args l */
+case 427: /* clo k args l */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
@@ -21676,7 +22090,7 @@ case 418: /* clo k args l */
     r[1+6] = p[4];
     r[1+7] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11894: /* k args l port g s f exp */
+s_loop_v12023: /* k args l port g s f exp */
   if ((isnull((r[1])))) {
     r[8+0] = r[0];  
     r[8+1] = r[7];  
@@ -21696,7 +22110,7 @@ s_loop_v11894: /* k args l port g s f exp */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(418);
+    *--hp = obj_from_case(427);
     r[8] = (hendblk(5+1));
     hreserve(hbsz(5+1), 9); /* 9 live regs */
     *--hp = r[3];  
@@ -21704,7 +22118,7 @@ s_loop_v11894: /* k args l port g s f exp */
     *--hp = r[1];  
     *--hp = r[2];  
     *--hp = r[8];  
-    *--hp = obj_from_case(419);
+    *--hp = obj_from_case(428);
     r[8] = (hendblk(5+1));
     r[9+0] = r[8];  
     r[9+1] = (car((r[1])));
@@ -21719,7 +22133,7 @@ s_loop_v11894: /* k args l port g s f exp */
     goto gs_codegen;
   }
 
-case 419: /* clo ek . */
+case 428: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21746,7 +22160,7 @@ case 419: /* clo ek . */
     rc = 4;
     goto jump;
 
-case 420: /* clo ek . */
+case 429: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21761,14 +22175,14 @@ case 420: /* clo ek . */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[5];  
-    *--hp = obj_from_case(421);
+    *--hp = obj_from_case(430);
     r[6] = (hendblk(3+1));
     r[0] = r[6];  
     r[1] = r[2];  
     r[2] = r[5];  
     goto gs_write_2Dserialized_2Darg;
 
-case 421: /* clo ek . */
+case 430: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21786,7 +22200,7 @@ case 421: /* clo ek . */
     /* r[2] */    
     goto gs_write_2Dserialized_2Darg;
 
-case 422: /* clo k args l */
+case 431: /* clo k args l */
     assert(rc == 4);
     { obj* p = objptr_from_obj(r[0]);
     r[1+3] = p[1];
@@ -21795,7 +22209,7 @@ case 422: /* clo k args l */
     r[1+6] = p[4];
     r[1+7] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11869: /* k args l port g s f exp */
+s_loop_v11998: /* k args l port g s f exp */
   if ((isnull((r[1])))) {
     r[8+0] = r[0];  
     r[8+1] = r[7];  
@@ -21815,7 +22229,7 @@ s_loop_v11869: /* k args l port g s f exp */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(422);
+    *--hp = obj_from_case(431);
     r[8] = (hendblk(5+1));
     hreserve(hbsz(5+1), 9); /* 9 live regs */
     *--hp = r[3];  
@@ -21823,7 +22237,7 @@ s_loop_v11869: /* k args l port g s f exp */
     *--hp = r[1];  
     *--hp = r[2];  
     *--hp = r[8];  
-    *--hp = obj_from_case(423);
+    *--hp = obj_from_case(432);
     r[8] = (hendblk(5+1));
     r[9+0] = r[8];  
     r[9+1] = (car((r[1])));
@@ -21838,7 +22252,7 @@ s_loop_v11869: /* k args l port g s f exp */
     goto gs_codegen;
   }
 
-case 423: /* clo ek . */
+case 432: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21865,7 +22279,7 @@ case 423: /* clo ek . */
     rc = 4;
     goto jump;
 
-case 424: /* clo ek . */
+case 433: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21879,14 +22293,14 @@ case 424: /* clo ek . */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(425);
+    *--hp = obj_from_case(434);
     r[5] = (hendblk(3+1));
     r[0] = r[5];  
     r[1] = obj_from_fixnum(+0);
     r[2] = r[4];  
     goto gs_write_2Dserialized_2Darg;
 
-case 425: /* clo ek . */
+case 434: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21898,7 +22312,7 @@ case 425: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(426);
+    *--hp = obj_from_case(435);
     r[5] = (hendblk(2+1));
     { /* length */
     int n; obj l = r[2];  
@@ -21909,7 +22323,7 @@ case 425: /* clo ek . */
     r[2] = r[4];  
     goto gs_write_2Dserialized_2Darg;
 
-case 426: /* clo ek . */
+case 435: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21925,7 +22339,7 @@ case 426: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 427: /* compile-to-string k x */
+case 436: /* compile-to-string k x */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
     /* k x */
@@ -21935,14 +22349,14 @@ case 427: /* compile-to-string k x */
     *--hp = r[2];  
     *--hp = r[0];  
     *--hp = r[1];  
-    *--hp = obj_from_case(428);
+    *--hp = obj_from_case(437);
     r[3] = (hendblk(3+1));
     r[0] = r[3];  
     /* r[1] */    
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 428: /* clo ek r */
+case 437: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -21953,7 +22367,7 @@ case 428: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(429);
+    *--hp = obj_from_case(438);
     r[5] = (hendblk(2+1));
     r[6+0] = r[5];  
     r[6+1] = r[2];  
@@ -21967,7 +22381,7 @@ case 428: /* clo ek r */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
 
-case 429: /* clo ek . */
+case 438: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -21989,7 +22403,7 @@ case 429: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 430: /* execute k code */
+case 439: /* execute k code */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_execute: /* k code */
@@ -21998,7 +22412,7 @@ gs_execute: /* k code */
     r[2] = obj_from_objptr(c); }
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(431);
+    *--hp = obj_from_case(440);
     r[3] = (hendblk(1+1));
     r[4+0] = r[2];  
     pc = objptr_from_obj(r[4+0])[0];
@@ -22009,7 +22423,7 @@ gs_execute: /* k code */
     rc = 3;
     goto jump;
 
-case 431: /* clo ek r */
+case 440: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -22027,13 +22441,13 @@ case 431: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 432: /* evaluate k x */
+case 441: /* evaluate k x */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_evaluate: /* k x */
     hreserve(hbsz(1+1), 2); /* 2 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(433);
+    *--hp = obj_from_case(442);
     r[2] = (hendblk(1+1));
     r[3+0] = (cx_transform);
     pc = objptr_from_obj(r[3+0])[0];
@@ -22045,7 +22459,7 @@ gs_evaluate: /* k x */
     rc = 4;
     goto jump;
 
-case 433: /* clo ek r */
+case 442: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -22057,14 +22471,14 @@ case 433: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[1];  
-    *--hp = obj_from_case(434);
+    *--hp = obj_from_case(443);
     r[4] = (hendblk(3+1));
     r[0] = r[4];  
     /* r[1] */    
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 434: /* clo ek r */
+case 443: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22075,7 +22489,7 @@ case 434: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(435);
+    *--hp = obj_from_case(444);
     r[5] = (hendblk(2+1));
     r[6+0] = r[5];  
     r[6+1] = r[2];  
@@ -22089,7 +22503,7 @@ case 434: /* clo ek r */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
 
-case 435: /* clo ek . */
+case 444: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22108,7 +22522,7 @@ case 435: /* clo ek . */
     r[5] = obj_from_objptr(c); }
     hreserve(hbsz(1+1), 6); /* 6 live regs */
     *--hp = r[2];  
-    *--hp = obj_from_case(436);
+    *--hp = obj_from_case(445);
     r[6] = (hendblk(1+1));
     r[0] = r[5];  
     pc = objptr_from_obj(r[0])[0];
@@ -22118,7 +22532,7 @@ case 435: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 436: /* clo ek r */
+case 445: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -22128,7 +22542,7 @@ case 436: /* clo ek r */
     /* r[1] */    
     goto gs_execute;
 
-case 437: /* display-code k cstr oport */
+case 446: /* display-code k cstr oport */
     assert(rc == 4);
     r += 1; /* shift reg. wnd */
 gs_display_2Dcode: /* k cstr oport */
@@ -22139,17 +22553,17 @@ gs_display_2Dcode: /* k cstr oport */
     r[3+4] = r[2];  
     r += 3; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11772;
+    goto s_loop_v11901;
 
-s_loop_v11772: /* k i l cstr oport */
-    { const fixnum_t v14664_i = fixnum_from_obj(r[1]);
-  if (((fxsub(fixnum_from_obj(r[2]), (v14664_i))) <= (+70))) {
-    (void)(oportputcircular((cx__233387), (r[4]), 1));
+s_loop_v11901: /* k i l cstr oport */
+    { const fixnum_t v14859_i = fixnum_from_obj(r[1]);
+  if (((fxsub(fixnum_from_obj(r[2]), (v14859_i))) <= (+70))) {
+    (void)(oportputcircular((cx__233460), (r[4]), 1));
     { /* substring */
-    int *d = substring(stringdata((r[3])), (v14664_i), fixnum_from_obj(r[2]));
+    int *d = substring(stringdata((r[3])), (v14859_i), fixnum_from_obj(r[2]));
     r[5] = (hpushstr(5, d)); }
     (void)(oportputcircular((r[5]), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    r[5] = obj_from_void(oportputcircular((cx__233391), (r[4]), 1));
+    r[5] = obj_from_void(oportputcircular((cx__233464), (r[4]), 1));
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
     r[1] = obj_from_ktrap();
@@ -22158,21 +22572,21 @@ s_loop_v11772: /* k i l cstr oport */
     rc = 3;
     goto jump;
   } else {
-    (void)(oportputcircular((cx__233387), (r[4]), 1));
+    (void)(oportputcircular((cx__233460), (r[4]), 1));
     { /* substring */
-    int *d = substring(stringdata((r[3])), (v14664_i), (fxadd((v14664_i), (+70))));
+    int *d = substring(stringdata((r[3])), (v14859_i), (fxadd((v14859_i), (+70))));
     r[5] = (hpushstr(5, d)); }
     (void)(oportputcircular((r[5]), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    (void)(oportputcircular((cx__233382), (r[4]), 1));
+    (void)(oportputcircular((cx__233455), (r[4]), 1));
     /* r[0] */    
-    r[1] = obj_from_fixnum(fxadd((v14664_i), (+70)));
+    r[1] = obj_from_fixnum(fxadd((v14859_i), (+70)));
     /* r[2] */    
     /* r[3] */    
     /* r[4] */    
-    goto s_loop_v11772;
+    goto s_loop_v11901;
   } } 
 
-case 438: /* process-define-syntax k id xval oport */
+case 447: /* process-define-syntax k id xval oport */
     assert(rc == 5);
     r += 1; /* shift reg. wnd */
 gs_process_2Ddefine_2Dsyntax: /* k id xval oport */
@@ -22180,26 +22594,26 @@ gs_process_2Ddefine_2Dsyntax: /* k id xval oport */
     *--hp = r[2];  
     r[4] = (hendblk(1));
     (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233387), (r[3]), 1));
+    (void)(oportputcircular((cx__233460), (r[3]), 1));
     (void)(oportputcircular((r[1]), (r[3]), 1));
-    (void)(oportputcircular((cx__233453), (r[3]), 1));
+    (void)(oportputcircular((cx__233526), (r[3]), 1));
     r[5] = (objptr_from_obj(r[4])[0]);
     hreserve(hbsz(3+1), 6); /* 6 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[0];  
-    *--hp = obj_from_case(442);
+    *--hp = obj_from_case(451);
     r[6] = (hendblk(3+1));
     r[0] = r[6];  
     r[1] = r[5];  
     goto s_hack;
 
-case 439: /* clo k v */
+case 448: /* clo k v */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 s_hack: /* k v */
     hreserve(hbsz(0+1), 2); /* 2 live regs */
-    *--hp = obj_from_case(439);
+    *--hp = obj_from_case(448);
     r[2] = (hendblk(0+1));
   if ((isprocedure((r[1])))) {
     /* r[0] */    
@@ -22225,7 +22639,7 @@ s_hack: /* k v */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(440);
+    *--hp = obj_from_case(449);
     r[4] = (hendblk(3+1));
     r[0] = r[4];  
     r[1] = r[3];  
@@ -22243,7 +22657,7 @@ s_hack: /* k v */
   }
   }
 
-case 440: /* clo ek r */
+case 449: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22254,7 +22668,7 @@ case 440: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[1];  
     *--hp = r[4];  
-    *--hp = obj_from_case(441);
+    *--hp = obj_from_case(450);
     r[5] = (hendblk(2+1));
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -22264,7 +22678,7 @@ case 440: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 441: /* clo ek r */
+case 450: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22286,7 +22700,7 @@ case 441: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 442: /* clo ek r */
+case 451: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22333,7 +22747,7 @@ case 442: /* clo ek r */
     { /* cons */ 
     hreserve(hbsz(3), 7); /* 7 live regs */
     *--hp = r[6];  
-    *--hp = (cx__233427);
+    *--hp = (cx__233500);
     *--hp = obj_from_size(PAIR_BTAG); 
     r[6] = (hendblk(3)); }
     { /* cons */ 
@@ -22363,14 +22777,14 @@ case 442: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[5];  
-    *--hp = obj_from_case(443);
+    *--hp = obj_from_case(452);
     r[6] = (hendblk(3+1));
     r[0] = r[6];  
     r[1] = (objptr_from_obj(r[4])[0]);
     r[2] = r[5];  
     goto gs_write_2Dserialized_2Dsexp;
 
-case 443: /* clo ek . */
+case 452: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22382,7 +22796,7 @@ case 443: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(444);
+    *--hp = obj_from_case(453);
     r[5] = (hendblk(2+1));
     { /* get-output-string */
     obj o = r[2];   cxtype_oport_t *vt = ckoportvt(o); 
@@ -22395,7 +22809,7 @@ case 443: /* clo ek . */
     r[2] = r[4];  
     goto gs_display_2Dcode;
 
-case 444: /* clo ek . */
+case 453: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22411,7 +22825,7 @@ case 444: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 445: /* process-statement k xval oport */
+case 454: /* process-statement k xval oport */
     assert(rc == 4);
     r += 1; /* shift reg. wnd */
     /* k xval oport */
@@ -22426,14 +22840,14 @@ case 445: /* process-statement k xval oport */
     *--hp = r[2];  
     *--hp = r[0];  
     *--hp = r[1];  
-    *--hp = obj_from_case(446);
+    *--hp = obj_from_case(455);
     r[5] = (hendblk(5+1));
     r[0] = r[5];  
     /* r[1] */    
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 446: /* clo ek r */
+case 455: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22448,7 +22862,7 @@ case 446: /* clo ek r */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(447);
+    *--hp = obj_from_case(456);
     r[7] = (hendblk(4+1));
     r[8+0] = r[7];  
     r[8+1] = r[2];  
@@ -22462,7 +22876,7 @@ case 446: /* clo ek r */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
 
-case 447: /* clo ek . */
+case 456: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22480,18 +22894,18 @@ case 447: /* clo ek . */
     r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
     (void)(objptr_from_obj(r[4])[0] = (r[6]));
     (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233464), (r[3]), 1));
+    (void)(oportputcircular((cx__233537), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(448);
+    *--hp = obj_from_case(457);
     r[7] = (hendblk(2+1));
     r[0] = r[7];  
     r[1] = (objptr_from_obj(r[4])[0]);
     r[2] = r[3];  
     goto gs_display_2Dcode;
 
-case 448: /* clo ek . */
+case 457: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22507,7 +22921,7 @@ case 448: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 449: /* process-define k id xlam oport */
+case 458: /* process-define k id xlam oport */
     assert(rc == 5);
     r += 1; /* shift reg. wnd */
     /* k id xlam oport */
@@ -22540,14 +22954,14 @@ case 449: /* process-define k id xlam oport */
     *--hp = r[3];  
     *--hp = r[0];  
     *--hp = r[4];  
-    *--hp = obj_from_case(450);
+    *--hp = obj_from_case(459);
     r[7] = (hendblk(5+1));
     r[0] = r[7];  
     r[1] = r[4];  
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 450: /* clo ek r */
+case 459: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22562,7 +22976,7 @@ case 450: /* clo ek r */
     *--hp = r[5];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(451);
+    *--hp = obj_from_case(460);
     r[7] = (hendblk(4+1));
     r[8+0] = r[7];  
     r[8+1] = r[2];  
@@ -22576,7 +22990,7 @@ case 450: /* clo ek r */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
 
-case 451: /* clo ek . */
+case 460: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22594,18 +23008,18 @@ case 451: /* clo ek . */
     r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
     (void)(objptr_from_obj(r[4])[0] = (r[6]));
     (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233464), (r[3]), 1));
+    (void)(oportputcircular((cx__233537), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(452);
+    *--hp = obj_from_case(461);
     r[7] = (hendblk(2+1));
     r[0] = r[7];  
     r[1] = (objptr_from_obj(r[4])[0]);
     r[2] = r[3];  
     goto gs_display_2Dcode;
 
-case 452: /* clo ek . */
+case 461: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22621,7 +23035,7 @@ case 452: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 453: /* scan-top-form k x */
+case 462: /* scan-top-form k x */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_scan_2Dtop_2Dform: /* k x */
@@ -22641,10 +23055,10 @@ gs_scan_2Dtop_2Dform: /* k x */
   if (bool_from_obj(r[2])) {
     r[2] = (cdr((r[1])));
     r[2] = (car((r[2])));
-    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233515))));
+    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233588))));
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(454);
+    *--hp = obj_from_case(463);
     r[4] = (hendblk(1+1));
   if (bool_from_obj(r[3])) {
     r[5] = (mkiport_file(5, (void*)((r[3]))));
@@ -22653,12 +23067,12 @@ gs_scan_2Dtop_2Dform: /* k x */
     r[6+2] = r[0];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11633;
+    goto s_l_v11762;
   } else {
     r[5+0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[5+0])[0];
     r[5+1] = r[4];  
-    r[5+2] = (cx__233519);
+    r[5+2] = (cx__233592);
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -22670,7 +23084,7 @@ gs_scan_2Dtop_2Dform: /* k x */
     hreserve(hbsz(2+1), 2); /* 2 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
-    *--hp = obj_from_case(460);
+    *--hp = obj_from_case(469);
     r[2] = (hendblk(2+1));
     r[3+0] = (cx_transform);
     pc = objptr_from_obj(r[3+0])[0];
@@ -22693,16 +23107,16 @@ gs_scan_2Dtop_2Dform: /* k x */
   }
   }
 
-case 454: /* clo ek r */
+case 463: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v11633: /* ek r k */
+s_l_v11762: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
-    *--hp = obj_from_case(455);
+    *--hp = obj_from_case(464);
     r[3] = (hendblk(2+1));
     r[4+0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[4+0])[0];
@@ -22713,7 +23127,7 @@ s_l_v11633: /* ek r k */
     rc = 3;
     goto jump;
 
-case 455: /* clo ek r */
+case 464: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22723,19 +23137,19 @@ case 455: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(459);
+    *--hp = obj_from_case(468);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v11642;
+    goto s_loop_v11771;
 
-case 456: /* clo k x */
+case 465: /* clo k x */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11642: /* k x r */
+s_loop_v11771: /* k x r */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -22747,20 +23161,20 @@ s_loop_v11642: /* k x r */
   } else {
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[2];  
-    *--hp = obj_from_case(456);
+    *--hp = obj_from_case(465);
     r[3] = (hendblk(1+1));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(457);
+    *--hp = obj_from_case(466);
     r[3] = (hendblk(3+1));
     r[0] = r[3];  
     /* r[1] */    
     goto gs_scan_2Dtop_2Dform;
   }
 
-case 457: /* clo ek . */
+case 466: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22772,7 +23186,7 @@ case 457: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(458);
+    *--hp = obj_from_case(467);
     r[5] = (hendblk(2+1));
     r[0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[0])[0];
@@ -22782,7 +23196,7 @@ case 457: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 458: /* clo ek r */
+case 467: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22798,7 +23212,7 @@ case 458: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 459: /* clo ek . */
+case 468: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22814,7 +23228,7 @@ case 459: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 460: /* clo ek r */
+case 469: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22825,13 +23239,13 @@ case 460: /* clo ek r */
     r[4] = (cdr((r[2])));
     r[0] = r[3];  
     r[1] = r[4];  
-    goto s_loop_v11617;
+    goto s_loop_v11746;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[2];  
     *--hp = r[3];  
-    *--hp = obj_from_case(463);
+    *--hp = obj_from_case(472);
     r[4] = (hendblk(2+1));
     r[5] = (cdr((r[2])));
     r[5] = (cdr((r[5])));
@@ -22849,7 +23263,7 @@ case 460: /* clo ek r */
   if ((isprocedure((r[1])))) {
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[3];  
-    *--hp = obj_from_case(465);
+    *--hp = obj_from_case(474);
     r[4] = (hendblk(1+1));
     r[0] = r[1];  
     pc = objptr_from_obj(r[0])[0];
@@ -22871,19 +23285,19 @@ case 460: /* clo ek r */
   }
   }
 
-case 461: /* clo k l */
+case 470: /* clo k l */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
-s_loop_v11617: /* k l */
+s_loop_v11746: /* k l */
   if ((ispair((r[1])))) {
     hreserve(hbsz(0+1), 2); /* 2 live regs */
-    *--hp = obj_from_case(461);
+    *--hp = obj_from_case(470);
     r[2] = (hendblk(0+1));
     hreserve(hbsz(3+1), 3); /* 3 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(462);
+    *--hp = obj_from_case(471);
     r[2] = (hendblk(3+1));
     r[0] = r[2];  
     r[1] = (car((r[1])));
@@ -22899,7 +23313,7 @@ s_loop_v11617: /* k l */
     goto jump;
   }
 
-case 462: /* clo ek . */
+case 471: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -22916,7 +23330,7 @@ case 462: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 463: /* clo ek r */
+case 472: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22928,13 +23342,13 @@ case 463: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(464);
+    *--hp = obj_from_case(473);
     r[5] = (hendblk(2+1));
     r[0] = r[5];  
     r[1] = r[4];  
     goto gs_top_2Dtransformer_2Denv;
 
-case 464: /* clo ek r */
+case 473: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -22950,7 +23364,7 @@ case 464: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 465: /* clo ek r */
+case 474: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -22960,7 +23374,7 @@ case 465: /* clo ek r */
     /* r[1] */    
     goto gs_scan_2Dtop_2Dform;
 
-case 466: /* process-top-form k x oport */
+case 475: /* process-top-form k x oport */
     assert(rc == 4);
     r += 1; /* shift reg. wnd */
 gs_process_2Dtop_2Dform: /* k x oport */
@@ -22980,10 +23394,10 @@ gs_process_2Dtop_2Dform: /* k x oport */
   if (bool_from_obj(r[3])) {
     r[3] = (cdr((r[1])));
     r[3] = (car((r[3])));
-    r[4] = ((obj)fopen(stringchars((r[3])), stringchars((cx__233515))));
+    r[4] = ((obj)fopen(stringchars((r[3])), stringchars((cx__233588))));
     hreserve(hbsz(1+1), 5); /* 5 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(467);
+    *--hp = obj_from_case(476);
     r[5] = (hendblk(1+1));
   if (bool_from_obj(r[4])) {
     r[6] = (mkiport_file(6, (void*)((r[4]))));
@@ -22992,12 +23406,12 @@ gs_process_2Dtop_2Dform: /* k x oport */
     r[7+2] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11555;
+    goto s_l_v11684;
   } else {
     r[0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
-    r[2] = (cx__233519);
+    r[2] = (cx__233592);
     /* r[3] */    
     rreserve(MAX_HOSTREGS);
     rc = 4;
@@ -23009,7 +23423,7 @@ gs_process_2Dtop_2Dform: /* k x oport */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(473);
+    *--hp = obj_from_case(482);
     r[3] = (hendblk(3+1));
     r[4+0] = (cx_transform);
     pc = objptr_from_obj(r[4+0])[0];
@@ -23024,7 +23438,7 @@ gs_process_2Dtop_2Dform: /* k x oport */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[0];  
-    *--hp = obj_from_case(487);
+    *--hp = obj_from_case(496);
     r[3] = (hendblk(2+1));
     r[4+0] = (cx_transform);
     pc = objptr_from_obj(r[4+0])[0];
@@ -23038,16 +23452,16 @@ gs_process_2Dtop_2Dform: /* k x oport */
   }
   }
 
-case 467: /* clo ek r */
+case 476: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v11555: /* ek r k */
+s_l_v11684: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
-    *--hp = obj_from_case(468);
+    *--hp = obj_from_case(477);
     r[3] = (hendblk(2+1));
     r[4+0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[4+0])[0];
@@ -23058,7 +23472,7 @@ s_l_v11555: /* ek r k */
     rc = 3;
     goto jump;
 
-case 468: /* clo ek r */
+case 477: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23068,19 +23482,19 @@ case 468: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(472);
+    *--hp = obj_from_case(481);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v11564;
+    goto s_loop_v11693;
 
-case 469: /* clo k x */
+case 478: /* clo k x */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11564: /* k x r */
+s_loop_v11693: /* k x r */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -23092,20 +23506,20 @@ s_loop_v11564: /* k x r */
   } else {
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[2];  
-    *--hp = obj_from_case(469);
+    *--hp = obj_from_case(478);
     r[3] = (hendblk(1+1));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(470);
+    *--hp = obj_from_case(479);
     r[3] = (hendblk(3+1));
     r[0] = r[3];  
     /* r[1] */    
     goto gs_scan_2Dtop_2Dform;
   }
 
-case 470: /* clo ek . */
+case 479: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -23117,7 +23531,7 @@ case 470: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(471);
+    *--hp = obj_from_case(480);
     r[5] = (hendblk(2+1));
     r[0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[0])[0];
@@ -23127,7 +23541,7 @@ case 470: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 471: /* clo ek r */
+case 480: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23143,7 +23557,7 @@ case 471: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 472: /* clo ek . */
+case 481: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -23159,7 +23573,7 @@ case 472: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 473: /* clo ek r */
+case 482: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23172,14 +23586,14 @@ case 473: /* clo ek r */
     r[0] = r[4];  
     r[1] = r[5];  
     /* r[2] */    
-    goto s_loop_v11539;
+    goto s_loop_v11668;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(3+1), 5); /* 5 live regs */
     *--hp = r[3];  
     *--hp = r[4];  
     *--hp = r[2];  
-    *--hp = obj_from_case(476);
+    *--hp = obj_from_case(485);
     r[5] = (hendblk(3+1));
     r[6] = (cdr((r[3])));
     r[6] = (cdr((r[6])));
@@ -23198,7 +23612,7 @@ case 473: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[4];  
-    *--hp = obj_from_case(478);
+    *--hp = obj_from_case(487);
     r[5] = (hendblk(3+1));
     r[6] = (cdr((r[3])));
     r[6] = (cdr((r[6])));
@@ -23216,7 +23630,7 @@ case 473: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[2];  
-    *--hp = obj_from_case(482);
+    *--hp = obj_from_case(491);
     r[5] = (hendblk(2+1));
     r[0] = r[1];  
     pc = objptr_from_obj(r[0])[0];
@@ -23230,7 +23644,7 @@ case 473: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[2];  
     *--hp = r[4];  
-    *--hp = obj_from_case(483);
+    *--hp = obj_from_case(492);
     r[5] = (hendblk(2+1));
     r[0] = (cx_transform);
     pc = objptr_from_obj(r[0])[0];
@@ -23245,22 +23659,22 @@ case 473: /* clo ek r */
   }
   }
 
-case 474: /* clo k x* */
+case 483: /* clo k x* */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11539: /* k x* oport */
+s_loop_v11668: /* k x* oport */
   if ((ispair((r[1])))) {
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[2];  
-    *--hp = obj_from_case(474);
+    *--hp = obj_from_case(483);
     r[3] = (hendblk(1+1));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[3];  
-    *--hp = obj_from_case(475);
+    *--hp = obj_from_case(484);
     r[3] = (hendblk(3+1));
     r[0] = r[3];  
     r[1] = (car((r[1])));
@@ -23276,7 +23690,7 @@ s_loop_v11539: /* k x* oport */
     goto jump;
   }
 
-case 475: /* clo ek . */
+case 484: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -23293,7 +23707,7 @@ case 475: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 476: /* clo ek r */
+case 485: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23308,13 +23722,13 @@ case 476: /* clo ek r */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(477);
+    *--hp = obj_from_case(486);
     r[6] = (hendblk(4+1));
     r[0] = r[6];  
     r[1] = r[5];  
     goto gs_top_2Dtransformer_2Denv;
 
-case 477: /* clo ek r */
+case 486: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23353,7 +23767,7 @@ case 477: /* clo ek r */
     goto gs_process_2Ddefine_2Dsyntax;
   }
 
-case 478: /* clo ek r */
+case 487: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23392,223 +23806,13 @@ case 478: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[6];  
-    *--hp = obj_from_case(479);
+    *--hp = obj_from_case(488);
     r[9] = (hendblk(5+1));
     r[0] = r[9];  
     r[1] = r[6];  
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 479: /* clo ek r */
-    assert(rc == 3);
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2];
-    r[1+4] = p[3];
-    r[1+5] = p[4];
-    r[1+6] = p[5]; }
-    r += 1; /* shift reg. wnd */
-    /* ek r xval k oport cstr p */
-    hreserve(hbsz(4+1), 7); /* 7 live regs */
-    *--hp = r[6];  
-    *--hp = r[5];  
-    *--hp = r[4];  
-    *--hp = r[3];  
-    *--hp = obj_from_case(480);
-    r[7] = (hendblk(4+1));
-    r[8+0] = r[7];  
-    r[8+1] = r[2];  
-    r[8+2] = (mknull());
-    r[8+3] = (mknull());
-    r[8+4] = (mknull());
-    r[8+5] = r[1];  
-    r[8+6] = obj_from_bool(0);
-    r[8+7] = r[6];  
-    r += 8; /* shift reg wnd */
-    rreserve(MAX_HOSTREGS);
-    goto gs_codegen;
-
-case 480: /* clo ek . */
-    assert(rc >= 2);
-    r[2] = obj_from_void(0); /* ignored */
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2];
-    r[1+4] = p[3];
-    r[1+5] = p[4]; }
-    r += 1; /* shift reg. wnd */
-    /* ek . k oport cstr p */
-    { /* get-output-string */
-    obj o = r[5];   cxtype_oport_t *vt = ckoportvt(o); 
-    if (vt != (cxtype_oport_t *)OPORT_STRING_NTAG &&
-        vt != (cxtype_oport_t *)OPORT_BYTEVECTOR_NTAG) r[6] = (mkeof());
-    else { cbuf_t *pcb = oportdata(o);
-    r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
-    (void)(objptr_from_obj(r[4])[0] = (r[6]));
-    (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233464), (r[3]), 1));
-    hreserve(hbsz(2+1), 7); /* 7 live regs */
-    *--hp = r[3];  
-    *--hp = r[2];  
-    *--hp = obj_from_case(481);
-    r[7] = (hendblk(2+1));
-    r[0] = r[7];  
-    r[1] = (objptr_from_obj(r[4])[0]);
-    r[2] = r[3];  
-    goto gs_display_2Dcode;
-
-case 481: /* clo ek . */
-    assert(rc >= 2);
-    r[2] = obj_from_void(0); /* ignored */
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2]; }
-    r += 1; /* shift reg. wnd */
-    /* ek . k oport */
-    r[0] = r[2];  
-    pc = objptr_from_obj(r[0])[0];
-    r[1] = obj_from_ktrap();
-    r[2] = obj_from_void(oportputc('\n', (r[3])));
-    rreserve(MAX_HOSTREGS);
-    rc = 3;
-    goto jump;
-
-case 482: /* clo ek r */
-    assert(rc == 3);
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2]; }
-    r += 1; /* shift reg. wnd */
-    /* ek r oport k */
-    r[0] = r[3];  
-    /* r[1] */    
-    /* r[2] */    
-    goto gs_process_2Dtop_2Dform;
-
-case 483: /* clo ek r */
-    assert(rc == 3);
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2]; }
-    r += 1; /* shift reg. wnd */
-    /* ek r k oport */
-    hreserve(hbsz(1), 4); /* 4 live regs */
-    *--hp = obj_from_void(0);
-    r[4] = (hendblk(1));
-    { /* open-output-string */
-    r[5] = (mkoport_string(5, newcb())); }
-    hreserve(hbsz(5+1), 6); /* 6 live regs */
-    *--hp = r[5];  
-    *--hp = r[4];  
-    *--hp = r[3];  
-    *--hp = r[2];  
-    *--hp = r[1];  
-    *--hp = obj_from_case(484);
-    r[6] = (hendblk(5+1));
-    r[0] = r[6];  
-    /* r[1] */    
-    r[2] = (mknull());
-    goto gs_find_2Dfree;
-
-case 484: /* clo ek r */
-    assert(rc == 3);
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2];
-    r[1+4] = p[3];
-    r[1+5] = p[4];
-    r[1+6] = p[5]; }
-    r += 1; /* shift reg. wnd */
-    /* ek r r k oport cstr p */
-    hreserve(hbsz(4+1), 7); /* 7 live regs */
-    *--hp = r[6];  
-    *--hp = r[5];  
-    *--hp = r[4];  
-    *--hp = r[3];  
-    *--hp = obj_from_case(485);
-    r[7] = (hendblk(4+1));
-    r[8+0] = r[7];  
-    r[8+1] = r[2];  
-    r[8+2] = (mknull());
-    r[8+3] = (mknull());
-    r[8+4] = (mknull());
-    r[8+5] = r[1];  
-    r[8+6] = obj_from_bool(0);
-    r[8+7] = r[6];  
-    r += 8; /* shift reg wnd */
-    rreserve(MAX_HOSTREGS);
-    goto gs_codegen;
-
-case 485: /* clo ek . */
-    assert(rc >= 2);
-    r[2] = obj_from_void(0); /* ignored */
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2];
-    r[1+4] = p[3];
-    r[1+5] = p[4]; }
-    r += 1; /* shift reg. wnd */
-    /* ek . k oport cstr p */
-    { /* get-output-string */
-    obj o = r[5];   cxtype_oport_t *vt = ckoportvt(o); 
-    if (vt != (cxtype_oport_t *)OPORT_STRING_NTAG &&
-        vt != (cxtype_oport_t *)OPORT_BYTEVECTOR_NTAG) r[6] = (mkeof());
-    else { cbuf_t *pcb = oportdata(o);
-    r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
-    (void)(objptr_from_obj(r[4])[0] = (r[6]));
-    (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233464), (r[3]), 1));
-    hreserve(hbsz(2+1), 7); /* 7 live regs */
-    *--hp = r[3];  
-    *--hp = r[2];  
-    *--hp = obj_from_case(486);
-    r[7] = (hendblk(2+1));
-    r[0] = r[7];  
-    r[1] = (objptr_from_obj(r[4])[0]);
-    r[2] = r[3];  
-    goto gs_display_2Dcode;
-
-case 486: /* clo ek . */
-    assert(rc >= 2);
-    r[2] = obj_from_void(0); /* ignored */
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2]; }
-    r += 1; /* shift reg. wnd */
-    /* ek . k oport */
-    r[0] = r[2];  
-    pc = objptr_from_obj(r[0])[0];
-    r[1] = obj_from_ktrap();
-    r[2] = obj_from_void(oportputc('\n', (r[3])));
-    rreserve(MAX_HOSTREGS);
-    rc = 3;
-    goto jump;
-
-case 487: /* clo ek r */
-    assert(rc == 3);
-    { obj* p = objptr_from_obj(r[0]);
-    r[1+2] = p[1];
-    r[1+3] = p[2]; }
-    r += 1; /* shift reg. wnd */
-    /* ek r k oport */
-    hreserve(hbsz(1), 4); /* 4 live regs */
-    *--hp = obj_from_void(0);
-    r[4] = (hendblk(1));
-    { /* open-output-string */
-    r[5] = (mkoport_string(5, newcb())); }
-    hreserve(hbsz(5+1), 6); /* 6 live regs */
-    *--hp = r[5];  
-    *--hp = r[4];  
-    *--hp = r[3];  
-    *--hp = r[2];  
-    *--hp = r[1];  
-    *--hp = obj_from_case(488);
-    r[6] = (hendblk(5+1));
-    r[0] = r[6];  
-    /* r[1] */    
-    r[2] = (mknull());
-    goto gs_find_2Dfree;
-
 case 488: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
@@ -23618,7 +23822,7 @@ case 488: /* clo ek r */
     r[1+5] = p[4];
     r[1+6] = p[5]; }
     r += 1; /* shift reg. wnd */
-    /* ek r r k oport cstr p */
+    /* ek r xval k oport cstr p */
     hreserve(hbsz(4+1), 7); /* 7 live regs */
     *--hp = r[6];  
     *--hp = r[5];  
@@ -23656,7 +23860,7 @@ case 489: /* clo ek . */
     r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
     (void)(objptr_from_obj(r[4])[0] = (r[6]));
     (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__233464), (r[3]), 1));
+    (void)(oportputcircular((cx__233537), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -23683,7 +23887,217 @@ case 490: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 491: /* path-strip-directory k filename */
+case 491: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r oport k */
+    r[0] = r[3];  
+    /* r[1] */    
+    /* r[2] */    
+    goto gs_process_2Dtop_2Dform;
+
+case 492: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r k oport */
+    hreserve(hbsz(1), 4); /* 4 live regs */
+    *--hp = obj_from_void(0);
+    r[4] = (hendblk(1));
+    { /* open-output-string */
+    r[5] = (mkoport_string(5, newcb())); }
+    hreserve(hbsz(5+1), 6); /* 6 live regs */
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = r[2];  
+    *--hp = r[1];  
+    *--hp = obj_from_case(493);
+    r[6] = (hendblk(5+1));
+    r[0] = r[6];  
+    /* r[1] */    
+    r[2] = (mknull());
+    goto gs_find_2Dfree;
+
+case 493: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4];
+    r[1+6] = p[5]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r r k oport cstr p */
+    hreserve(hbsz(4+1), 7); /* 7 live regs */
+    *--hp = r[6];  
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = obj_from_case(494);
+    r[7] = (hendblk(4+1));
+    r[8+0] = r[7];  
+    r[8+1] = r[2];  
+    r[8+2] = (mknull());
+    r[8+3] = (mknull());
+    r[8+4] = (mknull());
+    r[8+5] = r[1];  
+    r[8+6] = obj_from_bool(0);
+    r[8+7] = r[6];  
+    r += 8; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    goto gs_codegen;
+
+case 494: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . k oport cstr p */
+    { /* get-output-string */
+    obj o = r[5];   cxtype_oport_t *vt = ckoportvt(o); 
+    if (vt != (cxtype_oport_t *)OPORT_STRING_NTAG &&
+        vt != (cxtype_oport_t *)OPORT_BYTEVECTOR_NTAG) r[6] = (mkeof());
+    else { cbuf_t *pcb = oportdata(o);
+    r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
+    (void)(objptr_from_obj(r[4])[0] = (r[6]));
+    (void)(oportputc('\n', (r[3])));
+    (void)(oportputcircular((cx__233537), (r[3]), 1));
+    hreserve(hbsz(2+1), 7); /* 7 live regs */
+    *--hp = r[3];  
+    *--hp = r[2];  
+    *--hp = obj_from_case(495);
+    r[7] = (hendblk(2+1));
+    r[0] = r[7];  
+    r[1] = (objptr_from_obj(r[4])[0]);
+    r[2] = r[3];  
+    goto gs_display_2Dcode;
+
+case 495: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . k oport */
+    r[0] = r[2];  
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = obj_from_void(oportputc('\n', (r[3])));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+
+case 496: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r k oport */
+    hreserve(hbsz(1), 4); /* 4 live regs */
+    *--hp = obj_from_void(0);
+    r[4] = (hendblk(1));
+    { /* open-output-string */
+    r[5] = (mkoport_string(5, newcb())); }
+    hreserve(hbsz(5+1), 6); /* 6 live regs */
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = r[2];  
+    *--hp = r[1];  
+    *--hp = obj_from_case(497);
+    r[6] = (hendblk(5+1));
+    r[0] = r[6];  
+    /* r[1] */    
+    r[2] = (mknull());
+    goto gs_find_2Dfree;
+
+case 497: /* clo ek r */
+    assert(rc == 3);
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4];
+    r[1+6] = p[5]; }
+    r += 1; /* shift reg. wnd */
+    /* ek r r k oport cstr p */
+    hreserve(hbsz(4+1), 7); /* 7 live regs */
+    *--hp = r[6];  
+    *--hp = r[5];  
+    *--hp = r[4];  
+    *--hp = r[3];  
+    *--hp = obj_from_case(498);
+    r[7] = (hendblk(4+1));
+    r[8+0] = r[7];  
+    r[8+1] = r[2];  
+    r[8+2] = (mknull());
+    r[8+3] = (mknull());
+    r[8+4] = (mknull());
+    r[8+5] = r[1];  
+    r[8+6] = obj_from_bool(0);
+    r[8+7] = r[6];  
+    r += 8; /* shift reg wnd */
+    rreserve(MAX_HOSTREGS);
+    goto gs_codegen;
+
+case 498: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2];
+    r[1+4] = p[3];
+    r[1+5] = p[4]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . k oport cstr p */
+    { /* get-output-string */
+    obj o = r[5];   cxtype_oport_t *vt = ckoportvt(o); 
+    if (vt != (cxtype_oport_t *)OPORT_STRING_NTAG &&
+        vt != (cxtype_oport_t *)OPORT_BYTEVECTOR_NTAG) r[6] = (mkeof());
+    else { cbuf_t *pcb = oportdata(o);
+    r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } }
+    (void)(objptr_from_obj(r[4])[0] = (r[6]));
+    (void)(oportputc('\n', (r[3])));
+    (void)(oportputcircular((cx__233537), (r[3]), 1));
+    hreserve(hbsz(2+1), 7); /* 7 live regs */
+    *--hp = r[3];  
+    *--hp = r[2];  
+    *--hp = obj_from_case(499);
+    r[7] = (hendblk(2+1));
+    r[0] = r[7];  
+    r[1] = (objptr_from_obj(r[4])[0]);
+    r[2] = r[3];  
+    goto gs_display_2Dcode;
+
+case 499: /* clo ek . */
+    assert(rc >= 2);
+    r[2] = obj_from_void(0); /* ignored */
+    { obj* p = objptr_from_obj(r[0]);
+    r[1+2] = p[1];
+    r[1+3] = p[2]; }
+    r += 1; /* shift reg. wnd */
+    /* ek . k oport */
+    r[0] = r[2];  
+    pc = objptr_from_obj(r[0])[0];
+    r[1] = obj_from_ktrap();
+    r[2] = obj_from_void(oportputc('\n', (r[3])));
+    rreserve(MAX_HOSTREGS);
+    rc = 3;
+    goto jump;
+
+case 500: /* path-strip-directory k filename */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_path_2Dstrip_2Ddirectory: /* k filename */
@@ -23695,13 +24109,13 @@ gs_path_2Dstrip_2Ddirectory: /* k filename */
     while (c-- > 0) { *--hp = l; *--hp = obj_from_char(s[c]);
     *--hp = obj_from_size(PAIR_BTAG); l = hendblk(3); }
     r[2] = (l); }
-    { fixnum_t v14663_tmp;
+    { fixnum_t v14858_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14663_tmp = (n); }
+    v14858_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14663_tmp);
+    obj l, o = mknull(); int c = (v14858_tmp);
     hreserve(hbsz(3)*c, 3); /* 3 live regs */
     l = r[2];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -23710,17 +24124,17 @@ gs_path_2Dstrip_2Ddirectory: /* k filename */
     /* r[0] */    
     r[1] = r[2];  
     r[2] = (mknull());
-    goto s_loop_v11434;
+    goto s_loop_v11563;
 
-s_loop_v11434: /* k l r */
+s_loop_v11563: /* k l r */
   if ((isnull((r[1])))) {
-    { fixnum_t v14662_tmp;
+    { fixnum_t v14857_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14662_tmp = (n); }
+    v14857_tmp = (n); }
     { /* list->string */
-    int i, c = (v14662_tmp); 
+    int i, c = (v14857_tmp); 
     obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */
     obj l = r[2];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -23735,15 +24149,15 @@ s_loop_v11434: /* k l r */
     goto jump;
   } else {
     r[3] = (car((r[1])));
-    r[3] = (ismemv((r[3]), (cx__233629)));
+    r[3] = (ismemv((r[3]), (cx__233702)));
   if (bool_from_obj(r[3])) {
-    { fixnum_t v14661_tmp;
+    { fixnum_t v14856_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14661_tmp = (n); }
+    v14856_tmp = (n); }
     { /* list->string */
-    int i, c = (v14661_tmp); 
+    int i, c = (v14856_tmp); 
     obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */
     obj l = r[2];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -23768,11 +24182,11 @@ s_loop_v11434: /* k l r */
     /* r[0] */    
     r[1] = r[3];  
     r[2] = r[4];  
-    goto s_loop_v11434;
+    goto s_loop_v11563;
   }
   }
 
-case 492: /* path-strip-extension k filename */
+case 501: /* path-strip-extension k filename */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_path_2Dstrip_2Dextension: /* k filename */
@@ -23784,13 +24198,13 @@ gs_path_2Dstrip_2Dextension: /* k filename */
     while (c-- > 0) { *--hp = l; *--hp = obj_from_char(s[c]);
     *--hp = obj_from_size(PAIR_BTAG); l = hendblk(3); }
     r[2] = (l); }
-    { fixnum_t v14658_tmp;
+    { fixnum_t v14853_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14658_tmp = (n); }
+    v14853_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14658_tmp);
+    obj l, o = mknull(); int c = (v14853_tmp);
     hreserve(hbsz(3)*c, 3); /* 3 live regs */
     l = r[2];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
@@ -23799,25 +24213,25 @@ gs_path_2Dstrip_2Dextension: /* k filename */
     r[3] = (ismemv(obj_from_char('.'), (r[2])));
   if (bool_from_obj(r[3])) {
     r[4] = (cdr((r[3])));
-    { fixnum_t v14659_tmp;
+    { fixnum_t v14854_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14659_tmp = (n); }
+    v14854_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v14659_tmp);
+    obj l, o = mknull(); int c = (v14854_tmp);
     hreserve(hbsz(3)*c, 5); /* 5 live regs */
     l = r[4];   /* gc-safe */
     for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l);
     *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); }  
     r[4] = (o); } }
-    { fixnum_t v14660_tmp;
+    { fixnum_t v14855_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v14660_tmp = (n); }
+    v14855_tmp = (n); }
     { /* list->string */
-    int i, c = (v14660_tmp); 
+    int i, c = (v14855_tmp); 
     obj o = hpushstr(5, allocstring(c, ' ')); /* 5 live regs */
     obj l = r[4];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -23835,19 +24249,19 @@ gs_path_2Dstrip_2Dextension: /* k filename */
     rc = 3;
     goto jump;
 
-case 493: /* module-name k filename */
+case 502: /* module-name k filename */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_module_2Dname: /* k filename */
     hreserve(hbsz(1+1), 2); /* 2 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(494);
+    *--hp = obj_from_case(503);
     r[2] = (hendblk(1+1));
     r[0] = r[2];  
     /* r[1] */    
     goto gs_path_2Dstrip_2Ddirectory;
 
-case 494: /* clo ek r */
+case 503: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -23857,7 +24271,7 @@ case 494: /* clo ek r */
     /* r[1] */    
     goto gs_path_2Dstrip_2Dextension;
 
-case 495: /* process-file k fname */
+case 504: /* process-file k fname */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_process_2Dfile: /* k fname */
@@ -23874,13 +24288,13 @@ gs_process_2Dfile: /* k fname */
     *--hp = r[4];  
     *--hp = r[2];  
     *--hp = r[0];  
-    *--hp = obj_from_case(496);
+    *--hp = obj_from_case(505);
     r[5] = (hendblk(5+1));
     r[0] = r[5];  
     /* r[1] */    
     goto gs_module_2Dname;
 
-case 496: /* clo ek r */
+case 505: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23890,7 +24304,7 @@ case 496: /* clo ek r */
     r[1+6] = p[5]; }
     r += 1; /* shift reg. wnd */
     /* ek r k oport mname iport fname */
-    r[7] = ((obj)fopen(stringchars((r[6])), stringchars((cx__233515))));
+    r[7] = ((obj)fopen(stringchars((r[6])), stringchars((cx__233588))));
     hreserve(hbsz(6+1), 8); /* 8 live regs */
     *--hp = r[5];  
     *--hp = r[1];  
@@ -23898,7 +24312,7 @@ case 496: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[6];  
-    *--hp = obj_from_case(497);
+    *--hp = obj_from_case(506);
     r[8] = (hendblk(6+1));
   if (bool_from_obj(r[7])) {
     r[9] = (mkiport_file(9, (void*)((r[7]))));
@@ -23912,19 +24326,19 @@ case 496: /* clo ek r */
     r[10+7] = r[5];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11366;
+    goto s_l_v11495;
   } else {
     r[0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[8];  
-    r[2] = (cx__233519);
+    r[2] = (cx__233592);
     r[3] = r[6];  
     rreserve(MAX_HOSTREGS);
     rc = 4;
     goto jump;
   }
 
-case 497: /* clo ek r */
+case 506: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23934,25 +24348,25 @@ case 497: /* clo ek r */
     r[1+6] = p[5];
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
-s_l_v11366: /* ek r fname k oport mname r iport */
+s_l_v11495: /* ek r fname k oport mname r iport */
     (void)(objptr_from_obj(r[7])[0] = (r[1]));
     (void)(objptr_from_obj(r[5])[0] = (r[6]));
-    (void)(oportputcircular((cx__233683), (r[4]), 1));
+    (void)(oportputcircular((cx__233756), (r[4]), 1));
     r[8] = (objptr_from_obj(r[5])[0]);
     (void)(oportputcircular((r[8]), (r[4]), 1));
-    (void)(oportputcircular((cx__233682), (r[4]), 1));
+    (void)(oportputcircular((cx__233755), (r[4]), 1));
     hreserve(hbsz(4+1), 8); /* 8 live regs */
     *--hp = r[4];  
     *--hp = r[5];  
     *--hp = r[3];  
     *--hp = r[7];  
-    *--hp = obj_from_case(498);
+    *--hp = obj_from_case(507);
     r[8] = (hendblk(4+1));
     r[0] = r[8];  
     r[1] = r[2];  
     goto gs_path_2Dstrip_2Ddirectory;
 
-case 498: /* clo ek r */
+case 507: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23962,19 +24376,19 @@ case 498: /* clo ek r */
     r += 1; /* shift reg. wnd */
     /* ek r iport k mname oport */
     (void)(oportputcircular((r[1]), (r[5]), 1));
-    (void)(oportputcircular((cx__233681), (r[5]), 1));
+    (void)(oportputcircular((cx__233754), (r[5]), 1));
     (void)(oportputc('\n', (r[5])));
     (void)(oportputc('\n', (r[5])));
-    (void)(oportputcircular((cx__233680), (r[5]), 1));
+    (void)(oportputcircular((cx__233753), (r[5]), 1));
     r[6] = (objptr_from_obj(r[4])[0]);
     (void)(oportputcircular((r[6]), (r[5]), 1));
-    (void)(oportputcircular((cx__233679), (r[5]), 1));
+    (void)(oportputcircular((cx__233752), (r[5]), 1));
     (void)(oportputc('\n', (r[5])));
     hreserve(hbsz(3+1), 6); /* 6 live regs */
     *--hp = r[5];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(499);
+    *--hp = obj_from_case(508);
     r[6] = (hendblk(3+1));
     r[0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[0])[0];
@@ -23984,7 +24398,7 @@ case 498: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 499: /* clo ek r */
+case 508: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -23996,7 +24410,7 @@ case 499: /* clo ek r */
     *--hp = r[4];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(503);
+    *--hp = obj_from_case(512);
     r[5] = (hendblk(3+1));
     r[6+0] = r[5];  
     r[6+1] = r[1];  
@@ -24004,15 +24418,15 @@ case 499: /* clo ek r */
     r[6+3] = r[2];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11377;
+    goto s_loop_v11506;
 
-case 500: /* clo k x */
+case 509: /* clo k x */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11377: /* k x oport iport */
+s_loop_v11506: /* k x oport iport */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -24025,13 +24439,13 @@ s_loop_v11377: /* k x oport iport */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(500);
+    *--hp = obj_from_case(509);
     r[4] = (hendblk(2+1));
     hreserve(hbsz(3+1), 5); /* 5 live regs */
     *--hp = r[0];  
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(501);
+    *--hp = obj_from_case(510);
     r[4] = (hendblk(3+1));
     r[0] = r[4];  
     /* r[1] */    
@@ -24039,7 +24453,7 @@ s_loop_v11377: /* k x oport iport */
     goto gs_process_2Dtop_2Dform;
   }
 
-case 501: /* clo ek . */
+case 510: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24051,7 +24465,7 @@ case 501: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(502);
+    *--hp = obj_from_case(511);
     r[5] = (hendblk(2+1));
     r[0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[0])[0];
@@ -24061,7 +24475,7 @@ case 501: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 502: /* clo ek r */
+case 511: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24077,7 +24491,7 @@ case 502: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 503: /* clo ek . */
+case 512: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24086,7 +24500,7 @@ case 503: /* clo ek . */
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
     /* ek . iport k oport */
-    (void)(oportputcircular((cx__233671), (r[4]), 1));
+    (void)(oportputcircular((cx__233744), (r[4]), 1));
     r[0] = (cx_close_2Dinput_2Dport);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[3];  
@@ -24095,7 +24509,7 @@ case 503: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 504: /* clo ek r */
+case 513: /* clo ek r */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
     /* ek r */
@@ -24104,18 +24518,18 @@ case 504: /* clo ek r */
     static obj c[] = { obj_from_objptr(vmcases+3) };
     r[2] = obj_from_objptr(c); }
     hreserve(hbsz(0+1), 3); /* 3 live regs */
-    *--hp = obj_from_case(505);
+    *--hp = obj_from_case(514);
     r[3] = (hendblk(0+1));
     r[4+0] = r[2];  
     pc = objptr_from_obj(r[4+0])[0];
     r[4+1] = r[3];  
-    r[4+2] = (cx__233707);
+    r[4+2] = (cx__233780);
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
     rc = 3;
     goto jump;
 
-case 505: /* clo ek r */
+case 514: /* clo ek r */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
     /* ek r */
@@ -24123,7 +24537,7 @@ case 505: /* clo ek r */
     static obj c[] = { obj_from_objptr(vmcases+1) };
     r[2] = obj_from_objptr(c); }
     hreserve(hbsz(0+1), 3); /* 3 live regs */
-    *--hp = obj_from_case(506);
+    *--hp = obj_from_case(515);
     r[3] = (hendblk(0+1));
     r[4+0] = r[2];  
     pc = objptr_from_obj(r[4+0])[0];
@@ -24134,7 +24548,7 @@ case 505: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 506: /* clo ek r */
+case 515: /* clo ek r */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
     /* ek r */
@@ -24146,7 +24560,7 @@ case 506: /* clo ek r */
     static obj c[] = { obj_from_objptr(vmcases+6) };
     r[2] = obj_from_objptr(c); }
     hreserve(hbsz(0+1), 3); /* 3 live regs */
-    *--hp = obj_from_case(507);
+    *--hp = obj_from_case(516);
     r[3] = (hendblk(0+1));
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -24155,7 +24569,7 @@ case 506: /* clo ek r */
     rc = 2;
     goto jump;
 
-case 507: /* clo ek . */
+case 516: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     r += 1; /* shift reg. wnd */
@@ -24167,7 +24581,7 @@ case 507: /* clo ek . */
     static obj c[] = { obj_from_objptr(vmcases+7) };
     r[2] = obj_from_objptr(c); }
     hreserve(hbsz(0+1), 3); /* 3 live regs */
-    *--hp = obj_from_case(508);
+    *--hp = obj_from_case(517);
     r[3] = (hendblk(0+1));
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -24176,24 +24590,24 @@ case 507: /* clo ek . */
     rc = 2;
     goto jump;
 
-case 508: /* clo ek . */
+case 517: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     r += 1; /* shift reg. wnd */
     /* ek . */
-    cx_test1 = (cx__233711);
-    cx_test2 = (cx__233981);
-    cx_test3 = (cx__234183);
-    cx_test4 = (cx__234585);
-    cx_test5 = (cx__234715);
+    cx_test1 = (cx__233784);
+    cx_test2 = (cx__234054);
+    cx_test3 = (cx__234256);
+    cx_test4 = (cx__234658);
+    cx_test5 = (cx__234788);
     cx__2Averbose_2A = obj_from_bool(0);
-    { static obj c[] = { obj_from_case(509) }; cx_run_2Dtests = (obj)c; }
-    { static obj c[] = { obj_from_case(515) }; cx_repl_2Deval = (obj)c; }
-    { static obj c[] = { obj_from_case(521) }; cx_repl_2Deval_2Dtop_2Dform = (obj)c; }
-    { static obj c[] = { obj_from_case(530) }; cx_repl_2Dread = (obj)c; }
-    { static obj c[] = { obj_from_case(531) }; cx_repl_2Dfrom_2Dport = (obj)c; }
-    { static obj c[] = { obj_from_case(536) }; cx_run_2Drepl = (obj)c; }
-    { static obj c[] = { obj_from_case(537) }; cx_main = (obj)c; }
+    { static obj c[] = { obj_from_case(518) }; cx_run_2Dtests = (obj)c; }
+    { static obj c[] = { obj_from_case(524) }; cx_repl_2Deval = (obj)c; }
+    { static obj c[] = { obj_from_case(530) }; cx_repl_2Deval_2Dtop_2Dform = (obj)c; }
+    { static obj c[] = { obj_from_case(539) }; cx_repl_2Dread = (obj)c; }
+    { static obj c[] = { obj_from_case(540) }; cx_repl_2Dfrom_2Dport = (obj)c; }
+    { static obj c[] = { obj_from_case(545) }; cx_run_2Drepl = (obj)c; }
+    { static obj c[] = { obj_from_case(546) }; cx_main = (obj)c; }
     r[2] = obj_from_void(0);
     r[3+0] = r[0];
     pc = 0; /* exit from module init */
@@ -24202,7 +24616,7 @@ case 508: /* clo ek . */
     rc = 2;
     goto jump;
 
-case 509: /* run-tests k */
+case 518: /* run-tests k */
     assert(rc == 2);
     r += 1; /* shift reg. wnd */
 gs_run_2Dtests: /* k */
@@ -24211,18 +24625,18 @@ gs_run_2Dtests: /* k */
     r[1] = (hendblk(1));
     r[2] = obj_from_flonum(2, clock());
     (void)(objptr_from_obj(r[1])[0] = (r[2]));
-    (void)(oportputcircular((cx__235124), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235197), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
     hreserve(hbsz(2+1), 2); /* 2 live regs */
     *--hp = r[1];  
     *--hp = r[0];  
-    *--hp = obj_from_case(510);
+    *--hp = obj_from_case(519);
     r[2] = (hendblk(2+1));
     r[0] = r[2];  
     r[1] = (cx_test1);
     goto gs_evaluate;
 
-case 510: /* clo ek r */
+case 519: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24234,13 +24648,13 @@ case 510: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(511);
+    *--hp = obj_from_case(520);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     r[1] = (cx_test2);
     goto gs_evaluate;
 
-case 511: /* clo ek r */
+case 520: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24252,13 +24666,13 @@ case 511: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(512);
+    *--hp = obj_from_case(521);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     r[1] = (cx_test3);
     goto gs_evaluate;
 
-case 512: /* clo ek r */
+case 521: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24270,13 +24684,13 @@ case 512: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(513);
+    *--hp = obj_from_case(522);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     r[1] = (cx_test4);
     goto gs_evaluate;
 
-case 513: /* clo ek r */
+case 522: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24288,13 +24702,13 @@ case 513: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(514);
+    *--hp = obj_from_case(523);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     r[1] = (cx_test5);
     goto gs_evaluate;
 
-case 514: /* clo ek r */
+case 523: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24303,23 +24717,23 @@ case 514: /* clo ek r */
     /* ek r k start */
     (void)(oportputcircular((r[1]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
-    (void)(oportputcircular((cx__235123), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    { flonum_t v14656_b;
-    { flonum_t v14655_a;
-    { const flonum_t v14654_b = (CLOCKS_PER_SEC);
-    { const flonum_t v14652_a = (clock());
+    (void)(oportputcircular((cx__235196), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    { flonum_t v14851_b;
+    { flonum_t v14850_a;
+    { const flonum_t v14849_b = (CLOCKS_PER_SEC);
+    { const flonum_t v14847_a = (clock());
     r[4] = (objptr_from_obj(r[3])[0]);
   if ((is_fixnum_obj(r[4]))) {
-    { const flonum_t v14653_tmp = ((flonum_t)fixnum_from_obj(r[4]));
-    v14655_a = ((v14652_a) - (v14653_tmp)); } 
+    { const flonum_t v14848_tmp = ((flonum_t)fixnum_from_obj(r[4]));
+    v14850_a = ((v14847_a) - (v14848_tmp)); } 
   } else {
-    v14655_a = ((v14652_a) - flonum_from_obj(r[4]));
+    v14850_a = ((v14847_a) - flonum_from_obj(r[4]));
   } } 
-    v14656_b = ((v14655_a) / (v14654_b)); }  }
-    { const flonum_t v14657_tmp = ((flonum_t)(+1000));
-    r[4] = obj_from_flonum(4, (v14657_tmp) * (v14656_b)); }  }
+    v14851_b = ((v14850_a) / (v14849_b)); }  }
+    { const flonum_t v14852_tmp = ((flonum_t)(+1000));
+    r[4] = obj_from_flonum(4, (v14852_tmp) * (v14851_b)); }  }
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
-    (void)(oportputcircular((cx__235099), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235172), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     r[4] = obj_from_void(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -24329,13 +24743,13 @@ case 514: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 515: /* repl-eval k x */
+case 524: /* repl-eval k x */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_repl_2Deval: /* k x */
     hreserve(hbsz(1+1), 2); /* 2 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(516);
+    *--hp = obj_from_case(525);
     r[2] = (hendblk(1+1));
     r[3+0] = (cx_transform);
     pc = objptr_from_obj(r[3+0])[0];
@@ -24347,14 +24761,14 @@ gs_repl_2Deval: /* k x */
     rc = 4;
     goto jump;
 
-case 516: /* clo ek r */
+case 525: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
   if (bool_from_obj(cx__2Averbose_2A)) {
-    (void)(oportputcircular((cx__235191), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235264), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
     (void)(oportputcircular((r[1]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
@@ -24367,7 +24781,7 @@ case 516: /* clo ek r */
   } else {
   }
   if (bool_from_obj(cx__2Averbose_2A)) {
-    (void)(oportputcircular((cx__235184), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235257), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
   } else {
   }
@@ -24377,14 +24791,14 @@ case 516: /* clo ek r */
     *--hp = r[3];  
     *--hp = r[2];  
     *--hp = r[1];  
-    *--hp = obj_from_case(517);
+    *--hp = obj_from_case(526);
     r[4] = (hendblk(3+1));
     r[0] = r[4];  
     /* r[1] */    
     r[2] = (mknull());
     goto gs_find_2Dfree;
 
-case 517: /* clo ek r */
+case 526: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24395,7 +24809,7 @@ case 517: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(518);
+    *--hp = obj_from_case(527);
     r[5] = (hendblk(2+1));
     r[6+0] = r[5];  
     r[6+1] = r[2];  
@@ -24409,7 +24823,7 @@ case 517: /* clo ek r */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
 
-case 518: /* clo ek . */
+case 527: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24429,7 +24843,7 @@ case 518: /* clo ek . */
   if (bool_from_obj(cx__2Averbose_2A)) {
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
-    (void)(oportputcircular((cx__235177), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235250), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
     r[6] = obj_from_flonum(6, clock());
     (void)(objptr_from_obj(r[5])[0] = (r[6]));
@@ -24441,7 +24855,7 @@ case 518: /* clo ek . */
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[5];  
     *--hp = r[2];  
-    *--hp = obj_from_case(519);
+    *--hp = obj_from_case(528);
     r[7] = (hendblk(2+1));
     r[0] = r[6];  
     pc = objptr_from_obj(r[0])[0];
@@ -24451,7 +24865,7 @@ case 518: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 519: /* clo ek r */
+case 528: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24461,13 +24875,13 @@ case 519: /* clo ek r */
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(520);
+    *--hp = obj_from_case(529);
     r[4] = (hendblk(2+1));
     r[0] = r[4];  
     /* r[1] */    
     goto gs_execute;
 
-case 520: /* clo ek r */
+case 529: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24477,23 +24891,23 @@ case 520: /* clo ek r */
     (void)(oportputcircular((r[1]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
   if (bool_from_obj(cx__2Averbose_2A)) {
-    (void)(oportputcircular((cx__235123), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    { flonum_t v14650_b;
-    { flonum_t v14649_a;
-    { const flonum_t v14648_b = (CLOCKS_PER_SEC);
-    { const flonum_t v14646_a = (clock());
+    (void)(oportputcircular((cx__235196), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    { flonum_t v14845_b;
+    { flonum_t v14844_a;
+    { const flonum_t v14843_b = (CLOCKS_PER_SEC);
+    { const flonum_t v14841_a = (clock());
     r[4] = (objptr_from_obj(r[3])[0]);
   if ((is_fixnum_obj(r[4]))) {
-    { const flonum_t v14647_tmp = ((flonum_t)fixnum_from_obj(r[4]));
-    v14649_a = ((v14646_a) - (v14647_tmp)); } 
+    { const flonum_t v14842_tmp = ((flonum_t)fixnum_from_obj(r[4]));
+    v14844_a = ((v14841_a) - (v14842_tmp)); } 
   } else {
-    v14649_a = ((v14646_a) - flonum_from_obj(r[4]));
+    v14844_a = ((v14841_a) - flonum_from_obj(r[4]));
   } } 
-    v14650_b = ((v14649_a) / (v14648_b)); }  }
-    { const flonum_t v14651_tmp = ((flonum_t)(+1000));
-    r[4] = obj_from_flonum(4, (v14651_tmp) * (v14650_b)); }  }
+    v14845_b = ((v14844_a) / (v14843_b)); }  }
+    { const flonum_t v14846_tmp = ((flonum_t)(+1000));
+    r[4] = obj_from_flonum(4, (v14846_tmp) * (v14845_b)); }  }
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
-    (void)(oportputcircular((cx__235099), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__235172), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     r[4] = obj_from_void(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
   } else {
     r[4] = obj_from_void(0);
@@ -24506,7 +24920,7 @@ case 520: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 521: /* repl-eval-top-form k x */
+case 530: /* repl-eval-top-form k x */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_repl_2Deval_2Dtop_2Dform: /* k x */
@@ -24526,10 +24940,10 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */
   if (bool_from_obj(r[2])) {
     r[2] = (cdr((r[1])));
     r[2] = (car((r[2])));
-    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233515))));
+    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233588))));
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(522);
+    *--hp = obj_from_case(531);
     r[4] = (hendblk(1+1));
   if (bool_from_obj(r[3])) {
     r[5] = (mkiport_file(5, (void*)((r[3]))));
@@ -24538,12 +24952,12 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */
     r[6+2] = r[0];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11256;
+    goto s_l_v11385;
   } else {
     r[5+0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[5+0])[0];
     r[5+1] = r[4];  
-    r[5+2] = (cx__233519);
+    r[5+2] = (cx__233592);
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -24555,7 +24969,7 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */
     hreserve(hbsz(2+1), 2); /* 2 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
-    *--hp = obj_from_case(524);
+    *--hp = obj_from_case(533);
     r[2] = (hendblk(2+1));
     r[3+0] = (cx_transform);
     pc = objptr_from_obj(r[3+0])[0];
@@ -24573,22 +24987,22 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */
   }
   }
 
-case 522: /* clo ek r */
+case 531: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v11256: /* ek r k */
+s_l_v11385: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
-    *--hp = obj_from_case(523);
+    *--hp = obj_from_case(532);
     r[3] = (hendblk(2+1));
     r[0] = r[3];  
     /* r[1] */    
     goto gs_repl_2Dfrom_2Dport;
 
-case 523: /* clo ek . */
+case 532: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24604,7 +25018,7 @@ case 523: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 524: /* clo ek r */
+case 533: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24615,13 +25029,13 @@ case 524: /* clo ek r */
     r[4] = (cdr((r[2])));
     r[0] = r[3];  
     r[1] = r[4];  
-    goto s_loop_v11240;
+    goto s_loop_v11369;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(2+1), 4); /* 4 live regs */
     *--hp = r[2];  
     *--hp = r[3];  
-    *--hp = obj_from_case(527);
+    *--hp = obj_from_case(536);
     r[4] = (hendblk(2+1));
     r[5] = (cdr((r[2])));
     r[5] = (cdr((r[5])));
@@ -24639,7 +25053,7 @@ case 524: /* clo ek r */
   if ((isprocedure((r[1])))) {
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[3];  
-    *--hp = obj_from_case(529);
+    *--hp = obj_from_case(538);
     r[4] = (hendblk(1+1));
     r[0] = r[1];  
     pc = objptr_from_obj(r[0])[0];
@@ -24657,19 +25071,19 @@ case 524: /* clo ek r */
   }
   }
 
-case 525: /* clo k x* */
+case 534: /* clo k x* */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
-s_loop_v11240: /* k x* */
+s_loop_v11369: /* k x* */
   if ((ispair((r[1])))) {
     hreserve(hbsz(0+1), 2); /* 2 live regs */
-    *--hp = obj_from_case(525);
+    *--hp = obj_from_case(534);
     r[2] = (hendblk(0+1));
     hreserve(hbsz(3+1), 3); /* 3 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(526);
+    *--hp = obj_from_case(535);
     r[2] = (hendblk(3+1));
     r[0] = r[2];  
     r[1] = (car((r[1])));
@@ -24685,7 +25099,7 @@ s_loop_v11240: /* k x* */
     goto jump;
   }
 
-case 526: /* clo ek . */
+case 535: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24702,7 +25116,7 @@ case 526: /* clo ek . */
     rc = 3;
     goto jump;
 
-case 527: /* clo ek r */
+case 536: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24714,13 +25128,13 @@ case 527: /* clo ek r */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[1];  
     *--hp = r[2];  
-    *--hp = obj_from_case(528);
+    *--hp = obj_from_case(537);
     r[5] = (hendblk(2+1));
     r[0] = r[5];  
     r[1] = r[4];  
     goto gs_top_2Dtransformer_2Denv;
 
-case 528: /* clo ek r */
+case 537: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24736,7 +25150,7 @@ case 528: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 529: /* clo ek r */
+case 538: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
@@ -24746,11 +25160,11 @@ case 529: /* clo ek r */
     /* r[1] */    
     goto gs_repl_2Deval_2Dtop_2Dform;
 
-case 530: /* repl-read k iport */
+case 539: /* repl-read k iport */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_repl_2Dread: /* k iport */
-    (void)(((r[1]) == (cx__2Acurrent_2Dinput_2Dport_2A)) ? (void)(oportputcircular((cx__235245), (cx__2Acurrent_2Doutput_2Dport_2A), 1)) : (void)(0));
+    (void)(((r[1]) == (cx__2Acurrent_2Dinput_2Dport_2A)) ? (void)(oportputcircular((cx__235318), (cx__2Acurrent_2Doutput_2Dport_2A), 1)) : (void)(0));
     r[2+0] = (cx_read_2Ddatum);
     pc = objptr_from_obj(r[2+0])[0];
     r[2+1] = r[0];  
@@ -24760,20 +25174,20 @@ gs_repl_2Dread: /* k iport */
     rc = 3;
     goto jump;
 
-case 531: /* repl-from-port k iport */
+case 540: /* repl-from-port k iport */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
 gs_repl_2Dfrom_2Dport: /* k iport */
     hreserve(hbsz(2+1), 2); /* 2 live regs */
     *--hp = r[0];  
     *--hp = r[1];  
-    *--hp = obj_from_case(532);
+    *--hp = obj_from_case(541);
     r[2] = (hendblk(2+1));
     r[0] = r[2];  
     /* r[1] */    
     goto gs_repl_2Dread;
 
-case 532: /* clo ek r */
+case 541: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24783,14 +25197,14 @@ case 532: /* clo ek r */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v11187;
+    goto s_loop_v11316;
 
-case 533: /* clo k x */
+case 542: /* clo k x */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11187: /* k x iport */
+s_loop_v11316: /* k x iport */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -24802,20 +25216,20 @@ s_loop_v11187: /* k x iport */
   } else {
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[2];  
-    *--hp = obj_from_case(533);
+    *--hp = obj_from_case(542);
     r[3] = (hendblk(1+1));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = r[3];  
     *--hp = r[2];  
-    *--hp = obj_from_case(534);
+    *--hp = obj_from_case(543);
     r[3] = (hendblk(3+1));
     r[0] = r[3];  
     /* r[1] */    
     goto gs_repl_2Deval_2Dtop_2Dform;
   }
 
-case 534: /* clo ek . */
+case 543: /* clo ek . */
     assert(rc >= 2);
     r[2] = obj_from_void(0); /* ignored */
     { obj* p = objptr_from_obj(r[0]);
@@ -24827,13 +25241,13 @@ case 534: /* clo ek . */
     hreserve(hbsz(2+1), 5); /* 5 live regs */
     *--hp = r[4];  
     *--hp = r[3];  
-    *--hp = obj_from_case(535);
+    *--hp = obj_from_case(544);
     r[5] = (hendblk(2+1));
     r[0] = r[5];  
     r[1] = r[2];  
     goto gs_repl_2Dread;
 
-case 535: /* clo ek r */
+case 544: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1];
@@ -24849,7 +25263,7 @@ case 535: /* clo ek r */
     rc = 3;
     goto jump;
 
-case 536: /* run-repl k */
+case 545: /* run-repl k */
     assert(rc == 2);
     r += 1; /* shift reg. wnd */
 gs_run_2Drepl: /* k */
@@ -24859,13 +25273,13 @@ gs_run_2Drepl: /* k */
     rreserve(MAX_HOSTREGS);
     goto gs_repl_2Dfrom_2Dport;
 
-case 537: /* main k argv */
+case 546: /* main k argv */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
     /* k argv */
     hreserve(hbsz(1+1), 2); /* 2 live regs */
     *--hp = r[0];  
-    *--hp = obj_from_case(538);
+    *--hp = obj_from_case(547);
     r[2] = (hendblk(1+1));
     r[3+0] = (cx_command_2Dline);
     pc = objptr_from_obj(r[3+0])[0];
@@ -24875,25 +25289,25 @@ case 537: /* main k argv */
     rc = 2;
     goto jump;
 
-case 538: /* clo ek r */
+case 547: /* clo ek r */
     assert(rc == 3);
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
     r[3] = (cdr((r[1])));
-  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235274), (r[3])))) {
+  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235347), (r[3])))) {
     r[4] = (cdr((r[3])));
     r[4] = (car((r[4])));
     r[0] = r[2];  
     r[1] = r[4];  
     goto gs_process_2Dfile;
   } else {
-  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235268), (r[3])))) {
+  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235341), (r[3])))) {
     r[0] = r[2];  
     goto gs_run_2Dtests;
   } else {
-  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235265), (r[3])))) {
+  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235338), (r[3])))) {
     cx__2Averbose_2A = obj_from_bool(1);
     r[0] = r[2];  
     goto gs_run_2Drepl;
diff --git a/s.c b/s.c
index 5e5e3b8..0f9b1d8 100644
--- a/s.c
+++ b/s.c
@@ -2,30 +2,6 @@
 
 char *s_code[] = {
 
-  0,
-  "@(y4:cons)@!(y14:%25residual-cons)",
-
-  0,
-  "@(y5:pair?)@!(y15:%25residual-pair?)",
-
-  0,
-  "@(y3:car)@!(y13:%25residual-car)",
-
-  0,
-  "@(y3:car)@!(y4:%25car)",
-
-  0,
-  "@(y3:cdr)@!(y13:%25residual-cdr)",
-
-  0,
-  "@(y3:cdr)@!(y4:%25cdr)",
-
-  0,
-  "@(y8:set-car!)@!(y18:%25residual-set-car!)",
-
-  0,
-  "@(y8:set-cdr!)@!(y18:%25residual-set-cdr!)",
-
   "number?",
   "l5:y12:syntax-rules;n;l2:l2:y1:_;y1:x;;l2:y5:%25nump;y1:x;;;l2:py1:_;y"
   "12:syntax-rules;;py17:%25residual-number?;y12:syntax-rules;;;l2:y1:_;y"
@@ -542,8 +518,8 @@ char *s_code[] = {
   "&0{%2.1%l,.1A1]2}@!(y14:%25residual-memv)",
 
   0,
-  "&0{%3.1p?{${.3a,.3,.6[02}?{.1]3}.2,.2d,.2,@(y7:%25member)[33}f]3}@!(y7"
-  ":%25member)",
+  "&0{%3.1p?{${${.5,@(y4:%25car)[01},.3,.6[02}?{.1]3}.2,${.4,@(y4:%25cdr)"
+  "[01},.2,@(y7:%25member)[33}f]3}@!(y7:%25member)",
 
   "member",
   "l6:y12:syntax-rules;n;l2:l3:y1:_;y1:v;y1:y;;l3:y5:%25meme;y1:v;l2:y4:%"
@@ -1391,19 +1367,18 @@ char *s_code[] = {
   0,
   "&0{%!2.0u?{n,.3,,#0.0,.5,&2{%2.0p?{.1,${.3a,:0[01}c,.1d,:1^[22}.1A9]2}"
   ".!0.0^_1[32}n,.1,.4c,,#0.0,.5,&2{%2${.2,,#0.0,&1{%1.0u,.0?{.0]2}.1ap?{"
-  ".1d,:0^[21}f]2}.!0.0^_1[01}?{.1,${@(y13:%25residual-car),${.6,,#0.4,.1"
-  ",&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:0,@(y5:%2"
-  "5appl)[02}c,@(y13:%25residual-cdr),${.4,,#0.4,.1,&2{%1.0p?{${.2d,:0^[0"
-  "1},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:1^[22}.1A9]2}.!0.0^_1[32}@!(y13"
-  ":%25residual-map)",
+  ".1d,:0^[21}f]2}.!0.0^_1[01}?{.1,${@(y3:car),${.6,,#0.4,.1,&2{%1.0p?{${"
+  ".2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:0,@(y5:%25appl)[02}c,@"
+  "(y3:cdr),${.4,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0"
+  ".0^_1[01}_1,:1^[22}.1A9]2}.!0.0^_1[32}@!(y13:%25residual-map)",
 
   0,
   "&0{%!2.0u?{.2,,#0.3,.1,&2{%1.0p?{${.2a,:1[01}.0d,:0^[11}]1}.!0.0^_1[31"
   "}.0,.3c,,#0.3,.1,&2{%1${.2,,#0.0,&1{%1.0u,.0?{.0]2}.1ap?{.1d,:0^[21}f]"
-  "2}.!0.0^_1[01}?{${@(y13:%25residual-car),${.5,,#0.4,.1,&2{%1.0p?{${.2d"
-  ",:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:1,@(y5:%25appl)[02}@(y13:"
-  "%25residual-cdr),${.3,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1"
-  "}n]1}.!0.0^_1[01}_1,:0^[11}]1}.!0.0^_1[31}@!(y18:%25residual-for-each)",
+  "2}.!0.0^_1[01}?{${@(y3:car),${.5,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3"
+  "a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:1,@(y5:%25appl)[02}@(y3:cdr),${.3,,#0."
+  "4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,:0^[11"
+  "}]1}.!0.0^_1[31}@!(y18:%25residual-for-each)",
 
   0,
   "&0{%!0.0,,#0.0,&1{%1.0u?{n]1}.0du?{.0a]1}${.2d,:0^[01},.1aL6]1}.!0.0^_"
diff --git a/src/k.sf b/src/k.sf
index 52543aa..7c4cd86 100644
--- a/src/k.sf
+++ b/src/k.sf
@@ -1101,6 +1101,29 @@
                (codegen (car args) l f s g #f port)
                (unless (null? (cdr args)) (write-char #\, port)))
              (write-string igc0 port)]
+            [(#\p) ; (length args) >= 0
+             (if (null? args)
+                 (let ([igc1 (integrable-code ig 1)])
+                   (write-string igc1 port))
+                 (let ([opc (fx- (length args) 1)])
+                   (do ([args (reverse args) (cdr args)] [l l (cons #f l)]) 
+                     [(null? args)]
+                     (codegen (car args) l f s g #f port)
+                     (unless (null? (cdr args)) (write-char #\, port)))
+                   (do ([i 0 (fx+ i 1)]) [(fx>=? i opc)]
+                     (write-string igc0 port))))]
+            [(#\m) ; (length args) >= 1
+             (if (null? (cdr args))
+                 (let ([igc1 (integrable-code ig 1)])
+                   (codegen (car args) l f s g #f port)
+                   (write-string igc1 port))
+                 (let ([opc (fx- (length args) 1)])
+                   (do ([args (reverse args) (cdr args)] [l l (cons #f l)]) 
+                     [(null? args)]
+                     (codegen (car args) l f s g #f port)
+                     (unless (null? (cdr args)) (write-char #\, port)))
+                   (do ([i 0 (fx+ i 1)]) [(fx>=? i opc)]
+                     (write-string igc0 port))))]
             [else (error 'codegen "NYI: unsupported integrable type" igty)]))
        (when k (write-char #\] port) (write-serialized-arg k port))]
       [call (exp . args)
diff --git a/src/s.scm b/src/s.scm
index 208115d..594b69b 100644
--- a/src/s.scm
+++ b/src/s.scm
@@ -46,139 +46,89 @@
 ;---------------------------------------------------------------------------------------------
 ; Equivalence predicates
 ;---------------------------------------------------------------------------------------------
-#|
-(define-inline (eq? x y) %residual-eq? (%isq x y))
 
-(define-inline (eqv? x y) %residual-eqv? (%isv x y))
+; integrables:
+;
+; (eq? x y)
+; (eqv? x y)
+; (equal? x y)
 
-(define-inline (equal? x y) %residual-equal? (%ise x y))
-|#
 
 ;---------------------------------------------------------------------------------------------
 ; Boxes, aka cells
 ;---------------------------------------------------------------------------------------------
 
-#|
-(define-inline (box? x) %residual-box? (%boxp x))
+; integrables:
+;
+; (box? x)
+; (box x)
+; (unbox x)
+; (set-box! x y)
 
-(define-inline (box x) %residual-box (%box x))
-
-(define-inline (unbox x) %residual-unbox (%unbox x))
-
-(define-inline (set-box! x y) %residual-set-box! (%setbox x y))
-|#
 
 ;---------------------------------------------------------------------------------------------
 ; Exact integer numbers (fixnums)
 ;---------------------------------------------------------------------------------------------
 
-#|
+; integrables:
+;
+; (fixnum? x)
+; (fxzero? x)
+; (fxpositive? x)
+; (fxnegative? x)
+; (fx+ x y)
+; (fx* x y)
+; (fx- x y)
+; (fx/ x y)
+; (fxquotient x y)
+; (fxremainder x y)
+; (fxmodquo x y) 
+; (fxmodulo x y) 
+; (fxeucquo x y) a.k.a. euclidean-quotient
+; (fxeucrem x y) a.k.a. euclidean-remainder
+; (fxneg x)
+; (fxabs x)
+; (fx<? x y)
+; (fx<=? x y)
+; (fx>? x y)
+; (fx>=? x y)
+; (fx=? x y)
+; (fxmin x y)
+; (fxmax x y)
+; (fixnum->flonum x)
 
-(define-inline (fixnum? x) %residual-fixnum? (%fixp x))
-
-(define-inline (fxzero? x) %residual-fxzero? (%izerop x))
-
-(define-inline (fxpositive? x) %residual-fxpositive? (%iposp x))
-
-(define-inline (fxnegative? x) %residual-fxnegative? (%inegp x))
-
-(define-inline (fx+ x y) %residual-fx+ (%iadd x y))
-
-(define-inline (fx* x y) %residual-fx* (%imul x y))
-
-(define-inline (fx- x y) %residual-fx- (%isub x y))
-
-(define-inline (fx/ x y) %residual-fx/ (%idiv x y))
-
-(define-inline (fxquotient x y) %residual-fxquotient (%iquo x y))
-
-(define-inline (fxremainder x y) %residual-fxremainder (%irem x y))
-
-(define-inline (fxmodquo x y) %residual-fxmodquo (%imqu x y))
-
-(define-inline (fxmodulo x y) %residual-fxmodulo (%imlo x y))
-
-(define-inline (fxeucquo x y) %residual-fxeucquo (%ieuq x y)) ;euclidean-quotient
-
-(define-inline (fxeucrem x y) %residual-fxeucrem (%ieur x y)) ;euclidean-remainder
-
-(define-inline (fxneg x) %residual-fxneg (%ineg x))
-
-(define-inline (fxabs x) %residual-fxabs (%iabs x))
-
-(define-inline (fx<? x y) %residual-fx<? (%ilt x y))
-
-(define-inline (fx<=? x y) %residual-fx<=? (%ile x y))
-
-(define-inline (fx>? x y) %residual-fx>? (%igt x y))
-
-(define-inline (fx>=? x y) %residual-fx>=? (%ige x y))
-
-(define-inline (fx=? x y) %residual-fx=? (%ieq x y))
-
-(define-inline (fxmin x y) %residual-fxmin (%imin x y))
-
-(define-inline (fxmax x y) %residual-fxmax (%imax x y))
-
-(define-inline (fixnum->flonum x) %residual-fixnum->flonum (%itoj x))
-
-|#
 
 ;---------------------------------------------------------------------------------------------
 ; Inexact floating-point numbers (flonums)
 ;---------------------------------------------------------------------------------------------
 
-#|
+; integrables:
+;
+; (flonum? x)
+; (flzero? x)
+; (flpositive? x)
+; (flnegative? x)
+; (flinteger? x)
+; (flnan? x)
+; (flinfinite? x)
+; (flfinite? x)
+; (fleven? x)
+; (flodd? x)
+; (fl+ x y)
+; (fl- x y)
+; (fl* x y)
+; (fl/ x y)
+; (flneg x)
+; (flabs x)
+; (fl<? x y)
+; (fl<=? x y)
+; (fl>? x y)
+; (fl>=? x y)
+; (fl=? x y)
+; (flmin x y)
+; (flmax x y)
+; (flonum->fixnum x)
 
-(define-inline (flonum? x) %residual-flonum? (%flop x))
-
-(define-inline (flzero? x) %residual-flzero? (%jzerop x))
-
-(define-inline (flpositive? x) %residual-flpositive? (%jposp x))
-
-(define-inline (flnegative? x) %residual-flnegative? (%jnegp x))
-
-(define-inline (flinteger? x) %residual-flinteger? (%jintp x)) 
-
-(define-inline (flnan? x) %residual-flnan? (%jnanp x)) 
-
-(define-inline (flinfinite? x) %residual-flinfinite? (%jinfp x)) 
-
-(define-inline (flfinite? x) %residual-flfinite? (%jfinp x)) 
-
-(define-inline (fleven? x) %residual-fleven? (%jevnp x))
-
-(define-inline (flodd? x) %residual-flodd? (%joddp x))
-
-(define-inline (fl+ x y) %residual-fl+ (%jadd x y))
-
-(define-inline (fl- x y) %residual-fl- (%jsub x y))
-
-(define-inline (fl* x y) %residual-fl* (%jmul x y))
-
-(define-inline (fl/ x y) %residual-fl/ (%jdiv x y))
-
-(define-inline (flneg x) %residual-flneg (%jneg x))
-
-(define-inline (flabs x) %residual-flabs (%jabs x))
-
-(define-inline (fl<? x y) %residual-fl<? (%jlt x y))
-
-(define-inline (fl<=? x y) %residual-fl<=? (%jle x y))
-
-(define-inline (fl>? x y) %residual-fl>? (%jgt x y))
-
-(define-inline (fl>=? x y) %residual-fl>=? (%jge x y))
-
-(define-inline (fl=? x y) %residual-fl=? (%jeq x y))
-
-(define-inline (flmin x y) %residual-flmin (%jmin x y))
-
-(define-inline (flmax x y) %residual-flmax (%jmax x y))
-
-(define-inline (flonum->fixnum x) %residual-flonum->fixnum (%jtoi x))
-
-|#
 
 ;---------------------------------------------------------------------------------------------
 ; Numbers (fixnums or flonums)
@@ -324,13 +274,11 @@
 ; Booleans
 ;---------------------------------------------------------------------------------------------
 
-#|
+; integrables:
+;
+; (boolean? x)
+; (not x)
 
-(define-inline (boolean? x) %residual-boolean? (%boolp x))
-
-(define-inline (not x) %residual-not (%not x))
-
-|#
 
 ;---------------------------------------------------------------------------------------------
 ; Characters
@@ -382,60 +330,16 @@
 ; Null and Pairs
 ;---------------------------------------------------------------------------------------------
 
-#|
-(define-inline (null? x) %residual-null? (%nullp x))
-
-(define-inline (pair? x) %residual-pair? (%pairp x))
-
-(define-inline (car x) %residual-car (%car x))
-
-(define-inline (set-car! x v) %residual-set-car! (%setcar x v))
-
-(define-inline (cdr x) %residual-cdr (%cdr x))
-
-(define-inline (set-cdr! x v) %residual-set-cdr! (%setcdr x v))
-|#
-
-(define-syntax c?r
-  (syntax-rules (a d)
-    [(c?r x) x]
-    [(c?r a ? ... x) (car (c?r ? ... x))]
-    [(c?r d ? ... x) (cdr (c?r ? ... x))]))
-
-#|
-(define-inline (caar x) %residual-caar (c?r a a x))
-(define-inline (cadr x) %residual-cadr (c?r a d x))
-(define-inline (cdar x) %residual-cdar (c?r d a x))
-(define-inline (cddr x) %residual-cddr (c?r d d x))
-(define-inline (caaar x) %residual-caaar (c?r a a a x))
-(define-inline (caadr x) %residual-caadr (c?r a a d x))
-(define-inline (cadar x) %residual-cadar (c?r a d a x))
-(define-inline (caddr x) %residual-caddr (c?r a d d x))
-(define-inline (cdaar x) %residual-cdaar (c?r d a a x))
-(define-inline (cdadr x) %residual-cdadr (c?r d a d x))
-(define-inline (cddar x) %residual-cddar (c?r d d a x))
-(define-inline (cdddr x) %residual-cdddr (c?r d d d x))
-(define-inline (caaaar x) %residual-caaaar (c?r a a a a x))
-(define-inline (caaadr x) %residual-caaadr (c?r a a a d x))
-(define-inline (caadar x) %residual-caadar (c?r a a d a x))
-(define-inline (caaddr x) %residual-caaddr (c?r a a d d x))
-(define-inline (cadaar x) %residual-cadaar (c?r a d a a x))
-(define-inline (cadadr x) %residual-cadadr (c?r a d a d x))
-(define-inline (caddar x) %residual-caddar (c?r a d d a x))
-(define-inline (cadddr x) %residual-cadddr (c?r a d d d x))
-(define-inline (cdaaar x) %residual-cdaaar (c?r d a a a x))
-(define-inline (cdaadr x) %residual-cdaadr (c?r d a a d x))
-(define-inline (cdadar x) %residual-cdadar (c?r d a d a x))
-(define-inline (cdaddr x) %residual-cdaddr (c?r d a d d x))
-(define-inline (cddaar x) %residual-cddaar (c?r d d a a x))
-(define-inline (cddadr x) %residual-cddadr (c?r d d a d x))
-(define-inline (cdddar x) %residual-cdddar (c?r d d d a x))
-(define-inline (cddddr x) %residual-cddddr (c?r d d d d x))
-|#
-
-#|
-(define-inline (cons x y) %residual-cons (%cons x y))
-|#
+; integrables:
+;
+; (null? x)
+; (pair? x)
+; (car x)
+; (set-car! x v)
+; (cdr x)
+; (set-cdr! x v)
+; (caar x) ... (cddddr x)
+; (cons x y)
 
 
 ;---------------------------------------------------------------------------------------------
@@ -480,7 +384,7 @@
 (define-inline (memv v y) %residual-memv (%memv v (%ckl y)))  ; TODO: make sure memv checks list
 
 (define (%member x l eq)
-  (and (pair? l) (if (eq x (%car l)) l (%member x (%cdr l) eq))))
+  (and (pair? l) (if (eq x (car l)) l (%member x (cdr l) eq))))
 
 (define-syntax member
   (syntax-rules ()
diff --git a/t.c b/t.c
index 198db14..e385398 100644
--- a/t.c
+++ b/t.c
@@ -81,28 +81,28 @@ char *t_code[] = {
   "t-req-count)",
 
   0,
-  "@(y15:%25residual-pair?)@!(y9:val-core?)",
+  "@(y5:pair?)@!(y9:val-core?)",
 
   0,
   "&0{%1.0p~]1}@!(y12:val-special?)",
 
   0,
-  "@(y15:%25residual-pair?)@!(y8:binding?)",
+  "@(y5:pair?)@!(y8:binding?)",
 
   0,
-  "@(y14:%25residual-cons)@!(y12:make-binding)",
+  "@(y4:cons)@!(y12:make-binding)",
 
   0,
-  "@(y13:%25residual-cdr)@!(y11:binding-val)",
+  "@(y3:cdr)@!(y11:binding-val)",
 
   0,
   "&0{%1.0d,@(y12:val-special?)[11}@!(y16:binding-special?)",
 
   0,
-  "@(y13:%25residual-car)@!(y11:binding-sym)",
+  "@(y3:car)@!(y11:binding-sym)",
 
   0,
-  "@(y18:%25residual-set-cdr!)@!(y16:binding-set-val!)",
+  "@(y8:set-cdr!)@!(y16:binding-set-val!)",
 
   0,
   "@(y14:%25residual-assq)@!(y16:find-top-binding)",
@@ -295,26 +295,26 @@ char *t_code[] = {
   "0[01}q}{f},.1^[41}.3,.3,.3cc]4}.1V0?{.2V0,.0?{.0}{${:7^[00}}_1.3,.3X0,"
   ".3X0,:6^[43}.1p~?{.2,.2e,.1^[41}${.3d,:3^[01}?{.1ddg,.3L0?{.3g}{${:7^["
   "00}},.1,.1I-,.0<0?{${:7^[00}}.0,.6A6,.3,.7A8A6A8,${:4^,t,.(i10)a,:5^[0"
-  "3},,#0.8,:6,&2{%1@(y13:%25residual-cdr),${n,.4,:1a,:0^[03},,#0.2,.1,&2"
-  "{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[21}.!0${.(i12),.6,."
-  "(i12)dd,:6^[03},${.3^,${.8,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[0"
-  "1}c]1}n]1}.!0.0^_1[01}_1,.5c,@(y14:%25residual-list)c,@(y13:%25residua"
-  "l-map),@(y5:%25appl)[02}L6](i11)}.2p?{${.5,.5d,.5d,:6^[03},.3a,.3a,:6^"
-  "[43}:7^[40}.!0.0^_1[63}.!5.7,.2,.6,.5,&4{%3,,,#0#1#2:3,&1{%1${${.4,:0["
-  "01},@(y6:new-id)[01},.1c]1},${${.(i10),&1{%1:0,.1A3~]1},t,.(i11),:1^[0"
-  "3},,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1"
-  ".!0${:2^,f,.7,:1^[03}.!1.1,:1,&2{%1:1,&1{%1:0^,.1A0]1},t,.2,:0^[13}.!2"
-  ".5,.5,,#0.8,.4,.2,.8,:0,&5{%2.0,,#0:0,:1,:2,.6,.4,:3,:4,&7{%1${.2,@(y3"
-  ":id?)[01}?{:3,.1A3,.0?{.0}{:0,.2A3,.0?{.0}{:1^,.3A3}_1}_1d]1}.0V0?{${."
-  "2X0,:2^[01}X1]1}.0p?{${.2d,:6^[01}?{${.2a,:5^[01},,,#0#1:3,&1{%1:0,.1A"
-  "3d]1}.!0.2,.4,:4,&3{%!0${.2,:2,@(y14:%25residual-cons),@(y13:%25residu"
-  "al-map)[03},:1a,:0^[12}.!1.0^,${.5,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${"
-  ".3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,${.6dd,:2^[01},${.3,.6^c,@(y13:%25res"
-  "idual-map),@(y5:%25appl)[02}L6]5}${.2d,:2^[01},${.3a,:2^[01}c]1}.0]1}."
-  "!0.0^_1[21}.!0.0^_1[62}.!6.(i10),.7,.7,&3{%2:2,,#0:0,.3,.5,:1,.4,&5{%1"
-  ".0u?{${:3,'(s14:invalid syntax),'(y9:transform),@(y5:error)[03}}.0a,.0"
-  "a,.1da,${:2,:3,.5,:4^[03},.0?{.0,.0,.3,.5,:1^[63}.4d,:0^[51}.!0.0^_1[2"
-  "1}](i11)}@!(y13:syntax-rules*)",
+  "3},,#0.8,:6,&2{%1@(y3:cdr),${n,.4,:1a,:0^[03},,#0.2,.1,&2{%1.0p?{${.2d"
+  ",:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[21}.!0${.(i12),.6,.(i12)dd,:6^[0"
+  "3},${.3^,${.8,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0"
+  ".0^_1[01}_1,.5c,@(y14:%25residual-list)c,@(y13:%25residual-map),@(y5:%"
+  "25appl)[02}L6](i11)}.2p?{${.5,.5d,.5d,:6^[03},.3a,.3a,:6^[43}:7^[40}.!"
+  "0.0^_1[63}.!5.7,.2,.6,.5,&4{%3,,,#0#1#2:3,&1{%1${${.4,:0[01},@(y6:new-"
+  "id)[01},.1c]1},${${.(i10),&1{%1:0,.1A3~]1},t,.(i11),:1^[03},,#0.4,.1,&"
+  "2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1.!0${:2^,f,.7"
+  ",:1^[03}.!1.1,:1,&2{%1:1,&1{%1:0^,.1A0]1},t,.2,:0^[13}.!2.5,.5,,#0.8,."
+  "4,.2,.8,:0,&5{%2.0,,#0:0,:1,:2,.6,.4,:3,:4,&7{%1${.2,@(y3:id?)[01}?{:3"
+  ",.1A3,.0?{.0}{:0,.2A3,.0?{.0}{:1^,.3A3}_1}_1d]1}.0V0?{${.2X0,:2^[01}X1"
+  "]1}.0p?{${.2d,:6^[01}?{${.2a,:5^[01},,,#0#1:3,&1{%1:0,.1A3d]1}.!0.2,.4"
+  ",:4,&3{%!0${.2,:2,@(y4:cons),@(y13:%25residual-map)[03},:1a,:0^[12}.!1"
+  ".0^,${.5,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},${.3a,:1[01}c]1}n]1}.!0.0^_1"
+  "[01}_1,${.6dd,:2^[01},${.3,.6^c,@(y13:%25residual-map),@(y5:%25appl)[0"
+  "2}L6]5}${.2d,:2^[01},${.3a,:2^[01}c]1}.0]1}.!0.0^_1[21}.!0.0^_1[62}.!6"
+  ".(i10),.7,.7,&3{%2:2,,#0:0,.3,.5,:1,.4,&5{%1.0u?{${:3,'(s14:invalid sy"
+  "ntax),'(y9:transform),@(y5:error)[03}}.0a,.0a,.1da,${:2,:3,.5,:4^[03},"
+  ".0?{.0,.0,.3,.5,:1^[63}.4d,:0^[51}.!0.0^_1[21}](i11)}@!(y13:syntax-rul"
+  "es*)",
 
   0,
   "${&0{%2,#0${${'(y6:syntax),'(y6:syntax),@(y12:make-binding)[02},@(y6:n"