From b564316cf89a2f4b91382a4b38672b5cf78334e0 Mon Sep 17 00:00:00 2001
From: ESL <esl@acm.org>
Date: Tue, 7 Mar 2023 13:42:29 -0500
Subject: [PATCH] lambda*/case-lambda cleanup

---
 i.c       |  49 +--
 i.h       |   5 -
 k.c       | 874 +++++++++++++++++++++++++++---------------------------
 src/k.sf  |   1 +
 src/t.scm |  56 +++-
 t.c       |  43 ++-
 6 files changed, 514 insertions(+), 514 deletions(-)

diff --git a/i.c b/i.c
index 774d9d9..3807194 100644
--- a/i.c
+++ b/i.c
@@ -372,21 +372,6 @@ define_instruction(brt) { int dx = fixnum_from_obj(*ip++); if (ac) ip += dx; gon
 
 define_instruction(brnot) { int dx = fixnum_from_obj(*ip++); if (!ac) ip += dx; gonexti(); }
 
-/* define_instruction(brcne) {
-  obj v = *ip++;
-  int dx = fixnum_from_obj(*ip++);
-  ip = (ac == v) ? ip : ip + dx;
-  gonexti(); 
-}
-
-define_instruction(brclt) {
-  obj v = *ip++;
-  int dx = fixnum_from_obj(*ip++);
-  // unsigned tagged fixnums can be compared as-is
-  ip = (ac >= v) ? ip : ip + dx; 
-  gonexti(); 
-} */
-
 define_instruction(sseti) {
   int i = fixnum_from_obj(*ip++);
   boxref(sref(i)) = ac;
@@ -492,7 +477,7 @@ define_instruction(push) { spush(ac); gonexti(); }
 define_instruction(jdceq) {
   obj v = *ip++, i = *ip++;
   if (ac == v) {
-    rd = dref(fixnum_from_obj(i)); ckx(rd); 
+    rd = dref(fixnum_from_obj(i));
     rx = obj_from_fixnum(0);
     callsubi();
   }
@@ -502,7 +487,7 @@ define_instruction(jdceq) {
 define_instruction(jdcge) {
   obj v = *ip++, i = *ip++;
   if (ac >= v) { /* unsigned tagged fixnums can be compared as-is */
-    rd = dref(fixnum_from_obj(i)); ckx(rd); 
+    rd = dref(fixnum_from_obj(i));
     rx = obj_from_fixnum(0);
     callsubi();
   }
@@ -511,7 +496,7 @@ define_instruction(jdcge) {
 
 define_instruction(jdref) {
   int i = fixnum_from_obj(*ip++); 
-  rd = dref(i); ckx(rd); 
+  rd = dref(i); 
   rx = obj_from_fixnum(0);
   callsubi();
 }
@@ -660,13 +645,6 @@ define_instruction(ckx) {
   failactype("procedure");
 }
 
-define_instruction(cknj) {
-  if (likely(is_flonum_obj(ac))) gonexti();
-  if (!is_fixnum_obj(ac)) failactype("number");
-  ac = obj_from_flonum(sp-r, (flonum_t)fixnum_from_obj(ac));
-  gonexti();
-}
-
 
 /* integrable instructions */
 
@@ -3165,27 +3143,6 @@ more:
         *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
         goto more;
       } break;
-      /* case 'c': { cases 
-        fixnum_t n;
-        ra = sref(1); hp = rds_arg(r, sp, hp);
-        if (iseof(ra)) goto out;
-        hreserve(hbsz(3)*2, sp-r);
-        *--hp = sref(0); *--hp = pbr->g;  
-        *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
-        *--hp = sref(0); *--hp = ra;  
-        *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
-        ra = sref(1); hp = rds_block(r, sp, hp);
-        if (iseof(ra)) goto out;
-        n = length(ra);
-        hreserve(hbsz(3)*1, sp-r); 
-        *--hp = sref(0); *--hp = obj_from_fixnum(n);
-        *--hp = obj_from_size(PAIR_BTAG); sref(0) = hendblk(3);
-        if (n > 0) {
-          obj lp = lastpair(ra); assert(ispair(lp));
-          cdr(lp) = sref(0); sref(0) = ra;
-        }
-        goto more;
-      } break; */
       case 'b': { /* branches */
         fixnum_t n; int c;
         ra = sref(1); hp = rds_block(r, sp, hp);
diff --git a/i.h b/i.h
index 004aa56..2fd841d 100644
--- a/i.h
+++ b/i.h
@@ -51,8 +51,6 @@ 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(brcne,    "|",   'c', NULL, 0, NULL) */
-/* declare_instruction(brclt,    "|!",  'c', NULL, 0, NULL) */ 
 declare_instruction(sseti,    ".!",    1, NULL, 0, NULL) 
 declare_instruction(dseti,    ":!",    1, NULL, 0, NULL)
 declare_instruction(gset,     "@!",  'g', NULL, 0, NULL)
@@ -218,9 +216,6 @@ declare_instruction(ckr,      "%r",    0, "%ckr", 1, INLINED)
 declare_instruction(ckw,      "%w",    0, "%ckw", 1, INLINED) 
 declare_instruction(ckx,      "%x",    0, "%ckx", 1, INLINED) 
 
-/* type checks-adapters */
-declare_instruction(cknj,     "%z",    0, "%cknj", 1, INLINED)
-
 /* intrinsics (no arg checks), integrables and globals */
 declare_instruction(isq,      "q",     0, "%isq", 2, INLINED)
 declare_instruction(isv,      "v",     0, "%isv", 2, INLINED)
diff --git a/k.c b/k.c
index 224349d..a09ac34 100644
--- a/k.c
+++ b/k.c
@@ -567,41 +567,41 @@ static obj cx__232187; /* constant #2187 */
 static obj cx__232211; /* constant #2211 */
 static obj cx__232288; /* constant #2288 */
 static obj cx__232369; /* constant #2369 */
-static obj cx__232806; /* constant #2806 */
-static obj cx__232922; /* constant #2922 */
-static obj cx__232953; /* constant #2953 */
-static obj cx__232958; /* constant #2958 */
-static obj cx__232962; /* constant #2962 */
-static obj cx__232998; /* constant #2998 */
-static obj cx__233024; /* constant #3024 */
-static obj cx__233035; /* constant #3035 */
-static obj cx__233086; /* constant #3086 */
-static obj cx__233090; /* constant #3090 */
-static obj cx__233200; /* constant #3200 */
-static obj cx__233242; /* constant #3242 */
-static obj cx__233250; /* constant #3250 */
-static obj cx__233251; /* constant #3251 */
+static obj cx__232808; /* constant #2808 */
+static obj cx__232924; /* constant #2924 */
+static obj cx__232955; /* constant #2955 */
+static obj cx__232960; /* constant #2960 */
+static obj cx__232964; /* constant #2964 */
+static obj cx__233000; /* constant #3000 */
+static obj cx__233026; /* constant #3026 */
+static obj cx__233037; /* constant #3037 */
+static obj cx__233088; /* constant #3088 */
+static obj cx__233092; /* constant #3092 */
+static obj cx__233202; /* constant #3202 */
+static obj cx__233244; /* constant #3244 */
 static obj cx__233252; /* constant #3252 */
 static obj cx__233253; /* constant #3253 */
 static obj cx__233254; /* constant #3254 */
-static obj cx__233276; /* constant #3276 */
+static obj cx__233255; /* constant #3255 */
+static obj cx__233256; /* constant #3256 */
 static obj cx__233278; /* constant #3278 */
-static obj cx__233282; /* constant #3282 */
-static obj cx__233552; /* constant #3552 */
-static obj cx__233754; /* constant #3754 */
-static obj cx__234156; /* constant #4156 */
-static obj cx__234286; /* constant #4286 */
+static obj cx__233280; /* constant #3280 */
+static obj cx__233284; /* constant #3284 */
+static obj cx__233554; /* constant #3554 */
+static obj cx__233756; /* constant #3756 */
+static obj cx__234158; /* constant #4158 */
+static obj cx__234288; /* constant #4288 */
 static obj cx__23438; /* constant #438 */
 static obj cx__23453; /* constant #453 */
-static obj cx__234669; /* constant #4669 */
-static obj cx__234693; /* constant #4693 */
-static obj cx__234694; /* constant #4694 */
-static obj cx__234744; /* constant #4744 */
+static obj cx__234671; /* constant #4671 */
+static obj cx__234695; /* constant #4695 */
+static obj cx__234696; /* constant #4696 */
+static obj cx__234746; /* constant #4746 */
 static obj cx__23475; /* constant #475 */
-static obj cx__234754; /* constant #4754 */
-static obj cx__234760; /* constant #4760 */
-static obj cx__234815; /* constant #4815 */
-static obj cx__234837; /* constant #4837 */
+static obj cx__234756; /* constant #4756 */
+static obj cx__234762; /* constant #4762 */
+static obj cx__234817; /* constant #4817 */
+static obj cx__234839; /* constant #4839 */
 static obj cx__23498; /* constant #498 */
 static obj cx__23514; /* constant #514 */
 static obj cx__23524; /* constant #524 */
@@ -627,11 +627,11 @@ static obj cxs_set_2Dmember_3F(obj v2_x, obj v1_s)
     return obj_from_bool(1);
   } else {
   { /* let */
-    obj v5227_tmp = (cdr((v1_s)));
-    obj v5226_tmp = (v2_x);
+    obj v5229_tmp = (cdr((v1_s)));
+    obj v5228_tmp = (v2_x);
     /* tail call */
-    v2_x = (v5226_tmp);
-    v1_s = (v5227_tmp);
+    v2_x = (v5228_tmp);
+    v1_s = (v5229_tmp);
     goto s_set_2Dmember_3F;
   }
   }
@@ -652,18 +652,18 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp)
   } else {
   if ((ispair((v41_pat)))) {
   { /* let */
-    obj v5220_tmp;
+    obj v5222_tmp;
   { /* let */
-    obj v5224_tmp;
+    obj v5226_tmp;
   { /* let */
-    obj v5225_tmp;
+    obj v5227_tmp;
     { static obj o = 0; static char s[] = { 36, 0 };
-    v5225_tmp = (o ? o : (o = mksymbol(internsym(s)))); };
-    v5224_tmp = obj_from_bool((car((v41_pat))) == (v5225_tmp));
+    v5227_tmp = (o ? o : (o = mksymbol(internsym(s)))); };
+    v5226_tmp = obj_from_bool((car((v41_pat))) == (v5227_tmp));
   }
-    v5220_tmp = (bool_from_obj(v5224_tmp) ? ((ispair((cdr((v41_pat))))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0));
+    v5222_tmp = (bool_from_obj(v5226_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(v5220_tmp)) {
+  if (bool_from_obj(v5222_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))) {
@@ -681,9 +681,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 v5223_tmp = (cdr((v58_lst)));
+    obj v5225_tmp = (cdr((v58_lst)));
     /* tail call */
-    v58_lst = (v5223_tmp);
+    v58_lst = (v5225_tmp);
     goto s_f;
   }
   } else {
@@ -699,11 +699,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 v5222_tmp = (cdr((v40_exp)));
-    obj v5221_tmp = (cdr((v41_pat)));
+    obj v5224_tmp = (cdr((v40_exp)));
+    obj v5223_tmp = (cdr((v41_pat)));
     /* tail call */
-    v41_pat = (v5221_tmp);
-    v40_exp = (v5222_tmp);
+    v41_pat = (v5223_tmp);
+    v40_exp = (v5224_tmp);
     goto s_syntax_2Dmatch_3F;
   }
   } else {
@@ -730,11 +730,11 @@ static obj cxs_posq(obj v117_x, obj v116_l)
     obj v120_l;
     obj v119_n;
   { /* let */
-    obj v5219_tmp = obj_from_fixnum(+0);
-    obj v5218_tmp = (v116_l);
+    obj v5221_tmp = obj_from_fixnum(+0);
+    obj v5220_tmp = (v116_l);
     /* tail call */
-    v120_l = (v5218_tmp);
-    v119_n = (v5219_tmp);
+    v120_l = (v5220_tmp);
+    v119_n = (v5221_tmp);
     goto s_loop;
   }
   s_loop:
@@ -745,11 +745,11 @@ static obj cxs_posq(obj v117_x, obj v116_l)
     return (v119_n);
   } else {
   { /* let */
-    obj v5217_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1)));
-    obj v5216_tmp = (cdr((v120_l)));
+    obj v5219_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1)));
+    obj v5218_tmp = (cdr((v120_l)));
     /* tail call */
-    v120_l = (v5216_tmp);
-    v119_n = (v5217_tmp);
+    v120_l = (v5218_tmp);
+    v119_n = (v5219_tmp);
     goto s_loop;
   }
   }
@@ -846,41 +846,41 @@ static obj *globv[] = {
   &cx__232211,
   &cx__232288,
   &cx__232369,
-  &cx__232806,
-  &cx__232922,
-  &cx__232953,
-  &cx__232958,
-  &cx__232962,
-  &cx__232998,
-  &cx__233024,
-  &cx__233035,
-  &cx__233086,
-  &cx__233090,
-  &cx__233200,
-  &cx__233242,
-  &cx__233250,
-  &cx__233251,
+  &cx__232808,
+  &cx__232924,
+  &cx__232955,
+  &cx__232960,
+  &cx__232964,
+  &cx__233000,
+  &cx__233026,
+  &cx__233037,
+  &cx__233088,
+  &cx__233092,
+  &cx__233202,
+  &cx__233244,
   &cx__233252,
   &cx__233253,
   &cx__233254,
-  &cx__233276,
+  &cx__233255,
+  &cx__233256,
   &cx__233278,
-  &cx__233282,
-  &cx__233552,
-  &cx__233754,
-  &cx__234156,
-  &cx__234286,
+  &cx__233280,
+  &cx__233284,
+  &cx__233554,
+  &cx__233756,
+  &cx__234158,
+  &cx__234288,
   &cx__23438,
   &cx__23453,
-  &cx__234669,
-  &cx__234693,
-  &cx__234694,
-  &cx__234744,
+  &cx__234671,
+  &cx__234695,
+  &cx__234696,
+  &cx__234746,
   &cx__23475,
-  &cx__234754,
-  &cx__234760,
-  &cx__234815,
-  &cx__234837,
+  &cx__234756,
+  &cx__234762,
+  &cx__234817,
+  &cx__234839,
   &cx__23498,
   &cx__23514,
   &cx__23524,
@@ -3773,7 +3773,7 @@ case 0: /* load module */
     *--hp = (mknull());
     *--hp = (mksymbol(internsym("begin")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__232806 = (hendblk(3)); }
+    cx__232808 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -3839,25 +3839,25 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("define-inline")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__232922 = (hendblk(3)); }
+    cx__232924 = (hendblk(3)); }
     { static char s[] = { 34, 10, 0 };
-    cx__232953 = (hpushstr(0, newstring(s))); }
+    cx__232955 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 32, 32, 34, 0 };
-    cx__232958 = (hpushstr(0, newstring(s))); }
+    cx__232960 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 34, 44, 0 };
-    cx__232962 = (hpushstr(0, newstring(s))); }
+    cx__232964 = (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__232998 = (hendblk(3)); }
+    cx__233000 = (hendblk(3)); }
     { static char s[] = { 34, 44, 10, 0 };
-    cx__233024 = (hpushstr(0, newstring(s))); }
+    cx__233026 = (hpushstr(0, newstring(s))); }
     { static char s[] = { 32, 32, 48, 44, 10, 0 };
-    cx__233035 = (hpushstr(0, newstring(s))); }
-    cx__233086 = (hpushstr(0, newstring("r")));
-    cx__233090 = (hpushstr(0, newstring("cannot open input file")));
+    cx__233037 = (hpushstr(0, newstring(s))); }
+    cx__233088 = (hpushstr(0, newstring("r")));
+    cx__233092 = (hpushstr(0, newstring("cannot open input file")));
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -3875,16 +3875,16 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = obj_from_char(92);
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233200 = (hendblk(3)); }
+    cx__233202 = (hendblk(3)); }
     { static char s[] = { 10, 32, 32, 48, 44, 32, 48, 10, 125, 59, 10, 0 };
-    cx__233242 = (hpushstr(0, newstring(s))); }
-    cx__233250 = (hpushstr(0, newstring("_code[] = {")));
-    cx__233251 = (hpushstr(0, newstring("char *")));
-    cx__233252 = (hpushstr(0, newstring(" */")));
-    cx__233253 = (hpushstr(0, newstring(".c -- generated via skint -c ")));
-    cx__233254 = (hpushstr(0, newstring("/* ")));
-    cx__233276 = (hpushstr(0, newstring("%1.0K2]1")));
-    cx__233278 = (hpushstr(0, newstring("K5")));
+    cx__233244 = (hpushstr(0, newstring(s))); }
+    cx__233252 = (hpushstr(0, newstring("_code[] = {")));
+    cx__233253 = (hpushstr(0, newstring("char *")));
+    cx__233254 = (hpushstr(0, newstring(" */")));
+    cx__233255 = (hpushstr(0, newstring(".c -- generated via skint -c ")));
+    cx__233256 = (hpushstr(0, newstring("/* ")));
+    cx__233278 = (hpushstr(0, newstring("%1.0K2]1")));
+    cx__233280 = (hpushstr(0, newstring("K5")));
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -4700,7 +4700,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233282 = (hendblk(3)); }
+    cx__233284 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -5300,7 +5300,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233552 = (hendblk(3)); }
+    cx__233554 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -6500,7 +6500,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__233754 = (hendblk(3)); }
+    cx__233756 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -6884,7 +6884,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234156 = (hendblk(3)); }
+    cx__234158 = (hendblk(3)); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -8024,15 +8024,15 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = (mksymbol(internsym("let")));
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234286 = (hendblk(3)); }
-    cx__234669 = (hpushstr(0, newstring(" ms.")));
-    cx__234693 = (hpushstr(0, newstring("Elapsed time: ")));
-    cx__234694 = (hpushstr(0, newstring("Running tests ...")));
-    cx__234744 = (hpushstr(0, newstring("DECODE+EXECUTE =>")));
-    cx__234754 = (hpushstr(0, newstring("COMPILE-TO-STRING =>")));
-    cx__234760 = (hpushstr(0, newstring("TRANSFORM =>")));
+    cx__234288 = (hendblk(3)); }
+    cx__234671 = (hpushstr(0, newstring(" ms.")));
+    cx__234695 = (hpushstr(0, newstring("Elapsed time: ")));
+    cx__234696 = (hpushstr(0, newstring("Running tests ...")));
+    cx__234746 = (hpushstr(0, newstring("DECODE+EXECUTE =>")));
+    cx__234756 = (hpushstr(0, newstring("COMPILE-TO-STRING =>")));
+    cx__234762 = (hpushstr(0, newstring("TRANSFORM =>")));
     { static char s[] = { 10, 51, 105, 109, 112, 62, 32, 0 };
-    cx__234815 = (hpushstr(0, newstring(s))); }
+    cx__234817 = (hpushstr(0, newstring(s))); }
     { /* cons */ 
     hreserve(hbsz(3), 0); /* 0 live regs */
     *--hp = (mknull());
@@ -8045,7 +8045,7 @@ case 0: /* load module */
     *--hp = r[0];  
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
-    cx__234837 = (hendblk(3)); }
+    cx__234839 = (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; }
@@ -8772,16 +8772,16 @@ gs_normalize_2Darity: /* k arity */
     r[2+2] = r[1];  
     r += 2; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13185;
+    goto s_loop_v13195;
   }
 
-s_loop_v13185: /* k cnt l */
+s_loop_v13195: /* 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_v13185;
+    goto s_loop_v13195;
   } else {
   if ((isnull((r[2])))) {
     { /* cons */ 
@@ -8839,10 +8839,10 @@ gs_flatten_2Didslist: /* k ilist */
     r[2+2] = (mknull());
     r += 2; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v13172;
+    goto s_loop_v13182;
   }
 
-s_loop_v13172: /* k l r */
+s_loop_v13182: /* k l r */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     r[4] = (car((r[1])));
@@ -8855,7 +8855,7 @@ s_loop_v13172: /* k l r */
     /* r[0] */    
     r[1] = r[3];  
     r[2] = r[4];  
-    goto s_loop_v13172;
+    goto s_loop_v13182;
   } else {
   if ((isnull((r[1])))) {
     { /* reverse! */
@@ -9613,7 +9613,7 @@ s_conv: /* k sexp */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12925;
+    goto s_loop_v12935;
   } else {
     r[3+0] = r[0];  
     pc = objptr_from_obj(r[3+0])[0];
@@ -9670,7 +9670,7 @@ case 59: /* clo ek r */
     rc = 3;
     goto jump;
 
-s_loop_v12925: /* k l conv */
+s_loop_v12935: /* k l conv */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -9682,7 +9682,7 @@ s_loop_v12925: /* k l conv */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12925;
+    goto s_loop_v12935;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -9742,13 +9742,13 @@ case 62: /* clo ek r */
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
-    { fixnum_t v13407_tmp;
+    { fixnum_t v13417_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13407_tmp = (n); }
+    v13417_tmp = (n); }
     { /* list->vector */
-    obj l; int i, c = (v13407_tmp);
+    obj l; int i, c = (v13417_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);
@@ -9979,7 +9979,7 @@ gs_xform_2Dbegin: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12851;
+    goto s_loop_v12861;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -9992,7 +9992,7 @@ gs_xform_2Dbegin: /* k tail env */
     goto jump;
   }
 
-s_loop_v12851: /* k l env */
+s_loop_v12861: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10004,7 +10004,7 @@ s_loop_v12851: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12851;
+    goto s_loop_v12861;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10101,7 +10101,7 @@ gs_xform_2Dif: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12820;
+    goto s_loop_v12830;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -10114,7 +10114,7 @@ gs_xform_2Dif: /* k tail env */
     goto jump;
   }
 
-s_loop_v12820: /* k l env */
+s_loop_v12830: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10126,7 +10126,7 @@ s_loop_v12820: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12820;
+    goto s_loop_v12830;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10191,13 +10191,13 @@ case 76: /* 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 v13406_tmp;
+    { fixnum_t v13416_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13406_tmp = (n); }
+    v13416_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13406_tmp);
+    obj t, l, o, *p, *d; int c = (v13416_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[1];   t = (cx__23524); /* gc-safe */
     o = t; p = &o; 
@@ -10261,7 +10261,7 @@ gs_xform_2Dcall: /* k xexp tail env */
     r[0] = r[4];  
     r[1] = r[2];  
     r[2] = r[3];  
-    goto s_loop_v12787;
+    goto s_loop_v12797;
   } else {
     r[4+0] = (cx_error);
     pc = objptr_from_obj(r[4+0])[0];
@@ -10274,7 +10274,7 @@ gs_xform_2Dcall: /* k xexp tail env */
     goto jump;
   }
 
-s_loop_v12787: /* k l env */
+s_loop_v12797: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10286,7 +10286,7 @@ s_loop_v12787: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12787;
+    goto s_loop_v12797;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10397,7 +10397,7 @@ gs_xform_2Dlambda: /* k tail env */
     r[4+4] = r[1];  
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12716;
+    goto s_loop_v12726;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -10415,7 +10415,7 @@ case 82: /* clo k vars ienv ipars */
     { obj* p = objptr_from_obj(r[0]);
     r[1+4] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12716: /* k vars ienv ipars tail */
+s_loop_v12726: /* k vars ienv ipars tail */
   if ((ispair((r[1])))) {
     r[5] = (car((r[1])));
     hreserve(hbsz(1+1), 6); /* 6 live regs */
@@ -10556,13 +10556,13 @@ case 86: /* clo ek r */
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[4] = (hendblk(3)); }
-    { fixnum_t v13405_tmp;
+    { fixnum_t v13415_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13405_tmp = (n); }
+    v13415_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13405_tmp);
+    obj l, o = mknull(); int c = (v13415_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);
@@ -10676,25 +10676,25 @@ case 90: /* clo ek r */
     *--hp = r[1];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[5] = (hendblk(3)); }
-    { fixnum_t v13403_tmp;
+    { fixnum_t v13413_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13403_tmp = (n); }
+    v13413_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13403_tmp);
+    obj l, o = mknull(); int c = (v13413_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 v13404_tmp;
+    { fixnum_t v13414_tmp;
     { /* length */
     int n; obj l = r[6];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13404_tmp = (n); }
+    v13414_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13404_tmp);
+    obj t, l, o, *p, *d; int c = (v13414_tmp);
     hreserve(hbsz(3)*c, 7); /* 7 live regs */
     l = r[6];   t = r[3];   /* gc-safe */
     o = t; p = &o; 
@@ -10735,7 +10735,7 @@ gs_xform_2Dlambda_2A: /* k tail env */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12679;
+    goto s_loop_v12689;
   } else {
     r[3+0] = (cx_error);
     pc = objptr_from_obj(r[3+0])[0];
@@ -10748,7 +10748,7 @@ gs_xform_2Dlambda_2A: /* k tail env */
     goto jump;
   }
 
-s_loop_v12679: /* k l env */
+s_loop_v12689: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -10760,7 +10760,7 @@ s_loop_v12679: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12679;
+    goto s_loop_v12689;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -10925,13 +10925,13 @@ gs_xform_2Dbody: /* k tail env */
     r[3+5] = r[1];  
     r += 3; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12616;
+    goto s_loop_v12626;
   }
 
 case 98: /* clo k env ids inits nids body */
     assert(rc == 7);
     r += 1; /* shift reg. wnd */
-s_loop_v12616: /* k env ids inits nids body */
+s_loop_v12626: /* k env ids inits nids body */
   if ((ispair((r[5])))) {
     r[6] = (car((r[5])));
     r[6] = obj_from_bool(ispair((r[6])));
@@ -10965,37 +10965,37 @@ s_loop_v12616: /* k env ids inits nids body */
     rreserve(MAX_HOSTREGS);
     goto gs_xform;
   } else {
-    { fixnum_t v13402_tmp;
+    { fixnum_t v13412_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13402_tmp = (n); }
+    v13412_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13402_tmp);
+    obj l, o = mknull(); int c = (v13412_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 v13401_tmp;
+    { fixnum_t v13411_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13401_tmp = (n); }
+    v13411_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13401_tmp);
+    obj l, o = mknull(); int c = (v13411_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 v13400_tmp;
+    { fixnum_t v13410_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13400_tmp = (n); }
+    v13410_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13400_tmp);
+    obj l, o = mknull(); int c = (v13410_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);
@@ -11028,13 +11028,13 @@ case 99: /* 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 v13399_tmp;
+    { fixnum_t v13409_tmp;
     { /* length */
     int n; obj l = (r[11]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13399_tmp = (n); }
+    v13409_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13399_tmp);
+    obj t, l, o, *p, *d; int c = (v13409_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = (r[11]); t = r[4];   /* gc-safe */
     o = t; p = &o; 
@@ -11121,37 +11121,37 @@ case 99: /* clo ek r */
     rc = 4;
     goto jump;
   } else {
-    { fixnum_t v13398_tmp;
+    { fixnum_t v13408_tmp;
     { /* length */
     int n; obj l = r[8];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13398_tmp = (n); }
+    v13408_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13398_tmp);
+    obj l, o = mknull(); int c = (v13408_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 v13397_tmp;
+    { fixnum_t v13407_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13397_tmp = (n); }
+    v13407_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13397_tmp);
+    obj l, o = mknull(); int c = (v13407_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 v13396_tmp;
+    { fixnum_t v13406_tmp;
     { /* length */
     int n; obj l = r[6];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13396_tmp = (n); }
+    v13406_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13396_tmp);
+    obj l, o = mknull(); int c = (v13406_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);
@@ -11374,7 +11374,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_v12531;
+    goto s_loop_v12541;
 
 case 106: /* clo k ids inits nids sets lids */
     assert(rc == 7);
@@ -11382,7 +11382,7 @@ case 106: /* clo k ids inits nids sets lids */
     r[1+6] = p[1];
     r[1+7] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12531: /* k ids inits nids sets lids env body */
+s_loop_v12541: /* k ids inits nids sets lids env body */
     hreserve(hbsz(2+1), 8); /* 8 live regs */
     *--hp = r[7];  
     *--hp = r[6];  
@@ -11398,7 +11398,7 @@ s_loop_v12531: /* k ids inits nids sets lids env body */
     r[0] = r[9];  
     r[1] = r[7];  
     r[2] = r[6];  
-    goto s_loop_v12573;
+    goto s_loop_v12583;
   } else {
     r[9] = (car((r[3])));
     r[9] = obj_from_bool(issymbol((r[9])));
@@ -11441,7 +11441,7 @@ s_loop_v12531: /* k ids inits nids sets lids env body */
   }
   }
 
-s_loop_v12573: /* k l env */
+s_loop_v12583: /* k l env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -11453,7 +11453,7 @@ s_loop_v12573: /* k l env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12573;
+    goto s_loop_v12583;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -11515,25 +11515,25 @@ case 109: /* clo ek r */
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
     /* ek r k lids sets */
-    { fixnum_t v13394_tmp;
+    { fixnum_t v13404_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13394_tmp = (n); }
+    v13404_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13394_tmp);
+    obj l, o = mknull(); int c = (v13404_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 v13395_tmp;
+    { fixnum_t v13405_tmp;
     { /* length */
     int n; obj l = r[5];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13395_tmp = (n); }
+    v13405_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13395_tmp);
+    obj t, l, o, *p, *d; int c = (v13405_tmp);
     hreserve(hbsz(3)*c, 6); /* 6 live regs */
     l = r[5];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -11575,10 +11575,10 @@ case 109: /* clo ek r */
     r[8] = (hendblk(3+1));
     r[0] = r[8];  
     r[1] = r[3];  
-    goto s_loop_v12558;
+    goto s_loop_v12568;
   }
 
-s_loop_v12558: /* k l */
+s_loop_v12568: /* k l */
   if ((ispair((r[1])))) {
     r[2] = (cdr((r[1])));
     hreserve(hbsz(1+1), 3); /* 3 live regs */
@@ -11587,7 +11587,7 @@ s_loop_v12558: /* k l */
     r[3] = (hendblk(1+1));
     r[0] = r[3];  
     r[1] = r[2];  
-    goto s_loop_v12558;
+    goto s_loop_v12568;
   } else {
     r[2+0] = r[0];  
     pc = objptr_from_obj(r[2+0])[0];
@@ -11634,13 +11634,13 @@ case 111: /* clo ek r */
     *--hp = r[3];  
     *--hp = obj_from_size(PAIR_BTAG); 
     r[5] = (hendblk(3)); }
-    { fixnum_t v13393_tmp;
+    { fixnum_t v13403_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13393_tmp = (n); }
+    v13403_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13393_tmp);
+    obj l, o = mknull(); int c = (v13403_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);
@@ -12341,7 +12341,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_v12356;
+    goto s_l_v12366;
   }
   } else {
   if ((isvector((r[1])))) {
@@ -12396,7 +12396,7 @@ case 138: /* clo ek r */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v12356: /* ek r k l x */
+s_l_v12366: /* ek r k l x */
   if (bool_from_obj(r[1])) {
     { /* cons */ 
     hreserve(hbsz(3), 5); /* 5 live regs */
@@ -12531,7 +12531,7 @@ case 142: /* clo k use use-env */
     r[9+8] = r[7];  
     r += 9; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v12048;
+    goto s_loop_v12058;
 
 case 143: /* clo k rules */
     assert(rc == 3);
@@ -12544,7 +12544,7 @@ case 143: /* clo k rules */
     r[1+7] = p[6];
     r[1+8] = p[7]; }
     r += 1; /* shift reg. wnd */
-s_loop_v12048: /* k rules use-env pat-literals use mac-env not-pat-literal? ellipsis-pair? list-ids */
+s_loop_v12058: /* 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];  
@@ -12603,7 +12603,7 @@ s_loop_v12048: /* 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_v12050;
+    goto s_l_v12060;
   }
 
 case 144: /* clo ek . */
@@ -12621,7 +12621,7 @@ case 144: /* clo ek . */
     r[1+10] = p[9];
     r[1+11] = p[10]; }
     r += 1; /* shift reg. wnd */
-s_l_v12050: /* ek . use-env pat-literals use loop mac-env not-pat-literal? ellipsis-pair? list-ids k rules */
+s_l_v12060: /* 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])));
@@ -12745,9 +12745,9 @@ case 146: /* clo ek r */
     r[0] = (r[12]);
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12289;
+    goto s_loop_v12299;
 
-s_loop_v12289: /* k l mac-env */
+s_loop_v12299: /* k l mac-env */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -12759,7 +12759,7 @@ s_loop_v12289: /* k l mac-env */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12289;
+    goto s_loop_v12299;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -13048,13 +13048,13 @@ case 154: /* clo ek r */
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
-    { fixnum_t v13392_tmp;
+    { fixnum_t v13402_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13392_tmp = (n); }
+    v13402_tmp = (n); }
     { /* list->vector */
-    obj l; int i, c = (v13392_tmp);
+    obj l; int i, c = (v13402_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);
@@ -13156,7 +13156,7 @@ case 156: /* clo ek r */
     r[0] = r[8];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12234;
+    goto s_loop_v12244;
 
 case 157: /* clo k vals */
     assert(rc == 3);
@@ -13201,7 +13201,7 @@ case 158: /* clo ek r */
     rc = 4;
     goto jump;
 
-s_loop_v12234: /* k l bindings */
+s_loop_v12244: /* k l bindings */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -13213,7 +13213,7 @@ s_loop_v12234: /* k l bindings */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12234;
+    goto s_loop_v12244;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -13315,13 +13315,13 @@ case 162: /* clo ek r */
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
     /* ek r k r */
-    { fixnum_t v13391_tmp;
+    { fixnum_t v13401_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13391_tmp = (n); }
+    v13401_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13391_tmp);
+    obj t, l, o, *p, *d; int c = (v13401_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[3];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -13504,7 +13504,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_v12161;
+    goto s_l_v12171;
   }
   } else {
     { /* cons */ 
@@ -13548,7 +13548,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_v12143;
+    goto s_l_v12153;
   } else {
     r[0] = (r[10]);
     pc = objptr_from_obj(r[0])[0];
@@ -13565,7 +13565,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_v12161;
+    goto s_l_v12171;
   } else {
     hreserve(hbsz(8+1), 13); /* 13 live regs */
     *--hp = r[1];  
@@ -13596,7 +13596,7 @@ case 169: /* clo k condition */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_l_v12161: /* k condition return bindings */
+s_l_v12171: /* k condition return bindings */
   if (bool_from_obj(r[1])) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -13666,7 +13666,7 @@ case 172: /* clo ek . */
     r[1+5] = p[4];
     r[1+6] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_l_v12143: /* ek . match bindings sexp pat k */
+s_l_v12153: /* 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 */
@@ -13742,7 +13742,7 @@ case 173: /* clo ek r */
     r[13+10] = (r[10]);
     r += 13; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v12063;
+    goto s_l_v12073;
   } else {
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
@@ -13794,7 +13794,7 @@ case 174: /* clo ek r */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v12063: /* ek r return list-ids not-pat-literal? match bindings pat k sexp tail-len */
+s_l_v12073: /* 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];  
@@ -13829,7 +13829,7 @@ s_l_v12063: /* 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_v12065;
+    goto s_l_v12075;
   }
 
 case 175: /* clo ek . */
@@ -13846,35 +13846,35 @@ case 175: /* clo ek . */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v12065: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */
-    { const fixnum_t v13388_tail_2Dlen = fixnum_from_obj(r[10]);
+s_l_v12075: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */
+    { const fixnum_t v13398_tail_2Dlen = fixnum_from_obj(r[10]);
     { /* list-tail */
-    obj l = r[8];   int c = (fxsub(fixnum_from_obj(r[9]), (v13388_tail_2Dlen)));
+    obj l = r[8];   int c = (fxsub(fixnum_from_obj(r[9]), (v13398_tail_2Dlen)));
     while (c-- > 0) l = cdr(l);
     r[11] = (l); }
-    { fixnum_t v13389_tmp;
+    { fixnum_t v13399_tmp;
     { /* length */
     int n; obj l = r[8];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13389_tmp = (n); }
+    v13399_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13389_tmp);
+    obj l, o = mknull(); int c = (v13399_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 = (v13388_tail_2Dlen);
+    obj l = (r[12]); int c = (v13398_tail_2Dlen);
     while (c-- > 0) l = cdr(l);
     r[12] = (l); }
-    { fixnum_t v13390_tmp;
+    { fixnum_t v13400_tmp;
     { /* length */
     int n; obj l = (r[12]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13390_tmp = (n); }
+    v13400_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13390_tmp);
+    obj l, o = mknull(); int c = (v13400_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);
@@ -13924,9 +13924,9 @@ case 176: /* clo ek r */
     r[1] = r[2];  
     r[2] = r[3];  
     r[3] = r[6];  
-    goto s_loop_v12086;
+    goto s_loop_v12096;
 
-s_loop_v12086: /* k l match pat */
+s_loop_v12096: /* k l match pat */
   if ((ispair((r[1])))) {
     r[4] = (cdr((r[1])));
     hreserve(hbsz(4+1), 5); /* 5 live regs */
@@ -13940,7 +13940,7 @@ s_loop_v12086: /* k l match pat */
     r[1] = r[4];  
     /* r[2] */    
     /* r[3] */    
-    goto s_loop_v12086;
+    goto s_loop_v12096;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -13994,9 +13994,9 @@ case 178: /* clo ek r */
     r[0] = r[5];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v12097;
+    goto s_loop_v12107;
 
-s_loop_v12097: /* k l f */
+s_loop_v12107: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -14008,7 +14008,7 @@ s_loop_v12097: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v12097;
+    goto s_loop_v12107;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -14159,13 +14159,13 @@ case 184: /* clo ek r */
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
     /* ek r k r */
-    { fixnum_t v13387_tmp;
+    { fixnum_t v13397_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13387_tmp = (n); }
+    v13397_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13387_tmp);
+    obj t, l, o, *p, *d; int c = (v13397_tmp);
     hreserve(hbsz(3)*c, 4); /* 4 live regs */
     l = r[3];   t = r[1];   /* gc-safe */
     o = t; p = &o; 
@@ -14963,7 +14963,7 @@ case 225: /* clo ek r */
     static obj c[] = { obj_from_objptr(vmcases+3) };
     cx_decode = obj_from_objptr(c); }
     { static obj c[] = { obj_from_case(372) }; cx_evaluate = (obj)c; }
-    cx__2Ahide_2Drefs_2A = (cx__232922);
+    cx__2Ahide_2Drefs_2A = (cx__232924);
     { static obj c[] = { obj_from_case(377) }; cx_display_2Dcode = (obj)c; }
     { static obj c[] = { obj_from_case(378) }; cx_process_2Ddefine_2Dsyntax = (obj)c; }
     { static obj c[] = { obj_from_case(385) }; cx_process_2Dstatement = (obj)c; }
@@ -14983,7 +14983,7 @@ case 225: /* clo ek r */
     r[0] = r[3];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[4];  
-    r[2] = (cx__233276);
+    r[2] = (cx__233278);
     rreserve(MAX_HOSTREGS);
     rc = 3;
     goto jump;
@@ -15026,8 +15026,8 @@ case 227: /* write-serialized-char k x port */
     assert(rc == 4);
     r += 1; /* shift reg. wnd */
 gs_write_2Dserialized_2Dchar: /* k x port */
-    { const char_t v13386_x = char_from_obj(r[1]);
-  if ((((v13386_x) == ('%')) || (((v13386_x) == (34)) || (((v13386_x) == (92)) || (((v13386_x) < (' ')) || ((v13386_x) > ('~'))))))) {
+    { const char_t v13396_x = char_from_obj(r[1]);
+  if ((((v13396_x) == ('%')) || (((v13396_x) == (34)) || (((v13396_x) == (92)) || (((v13396_x) < (' ')) || ((v13396_x) > ('~'))))))) {
     (void)(oportputc(('%'), (r[2])));
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
@@ -15037,7 +15037,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)(v13386_x));
+    r[4+2] = obj_from_fixnum((fixnum_t)(v13396_x));
     r[4+3] = obj_from_fixnum(+16);
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -15047,7 +15047,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((v13386_x), (r[2])));
+    r[2] = obj_from_void(oportputc((v13396_x), (r[2])));
     rreserve(MAX_HOSTREGS);
     rc = 3;
     goto jump;
@@ -15348,14 +15348,14 @@ case 235: /* clo ek r */
     r[0] = r[3];  
     r[1] = r[2];  
     r[2] = r[4];  
-    goto s_loop_v11799;
+    goto s_loop_v11809;
 
 case 236: /* 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_v11799: /* k x port */
+s_loop_v11809: /* k x port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15464,7 +15464,7 @@ case 240: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11770;
+    goto s_loop_v11780;
 
 case 241: /* clo k i */
     assert(rc == 3);
@@ -15472,7 +15472,7 @@ case 241: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11770: /* k i port x */
+s_loop_v11780: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (vectorlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15541,7 +15541,7 @@ case 243: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11753;
+    goto s_loop_v11763;
 
 case 244: /* clo k i */
     assert(rc == 3);
@@ -15549,7 +15549,7 @@ case 244: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11753: /* k i port x */
+s_loop_v11763: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15609,7 +15609,7 @@ case 246: /* clo ek r */
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11736;
+    goto s_loop_v11746;
 
 case 247: /* clo k i */
     assert(rc == 3);
@@ -15617,7 +15617,7 @@ case 247: /* clo k i */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11736: /* k i port x */
+s_loop_v11746: /* k i port x */
   if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -15667,8 +15667,8 @@ case 249: /* 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 v13385_arg = fixnum_from_obj(r[1]);
-    r[3] = obj_from_bool(((+0) <= (v13385_arg)) && ((v13385_arg) <= (+9))); } 
+    { const fixnum_t v13395_arg = fixnum_from_obj(r[1]);
+    r[3] = obj_from_bool(((+0) <= (v13395_arg)) && ((v13395_arg) <= (+9))); } 
   } else {
     r[3] = obj_from_bool(0);
   }
@@ -15676,8 +15676,8 @@ gs_write_2Dserialized_2Darg: /* k arg port */
     r[3] = obj_from_bool(0);
   }
   if (bool_from_obj(r[3])) {
-    { const char_t v13384_tmp = (*(unsigned char*)stringref((cx__232369), fixnum_from_obj(r[1])));
-    r[3] = obj_from_void(oportputc((v13384_tmp), (r[2]))); } 
+    { const char_t v13394_tmp = (*(unsigned char*)stringref((cx__232369), fixnum_from_obj(r[1])));
+    r[3] = obj_from_void(oportputc((v13394_tmp), (r[2]))); } 
     r[4+0] = r[0];  
     pc = objptr_from_obj(r[4+0])[0];
     r[4+1] = obj_from_ktrap();
@@ -16088,9 +16088,9 @@ case 262: /* clo k clauses */
     r[0] = r[4];  
     /* r[1] */    
     r[2] = r[3];  
-    goto s_loop_v11625;
+    goto s_loop_v11635;
 
-s_loop_v11625: /* k l f */
+s_loop_v11635: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -16102,7 +16102,7 @@ s_loop_v11625: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v11625;
+    goto s_loop_v11635;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -16683,9 +16683,9 @@ case 286: /* clo k clauses */
     r[0] = r[4];  
     /* r[1] */    
     r[2] = r[3];  
-    goto s_loop_v11462;
+    goto s_loop_v11472;
 
-s_loop_v11462: /* k l f */
+s_loop_v11472: /* k l f */
   if ((ispair((r[1])))) {
     r[3] = (cdr((r[1])));
     hreserve(hbsz(3+1), 4); /* 4 live regs */
@@ -16697,7 +16697,7 @@ s_loop_v11462: /* k l f */
     r[0] = r[4];  
     r[1] = r[3];  
     /* r[2] */    
-    goto s_loop_v11462;
+    goto s_loop_v11472;
   } else {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -17147,7 +17147,7 @@ case 300: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11367;
+    goto s_l_v11377;
   } else {
   if (((((r[1]) == obj_from_bool(0)) || ((is_flonum_obj(r[1])) && (0))) && (1))) {
     r[5] = obj_from_void(oportputc(('f'), (r[2])));
@@ -17158,7 +17158,7 @@ case 300: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11367;
+    goto s_l_v11377;
   } 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])));
@@ -17169,7 +17169,7 @@ case 300: /* clo k obj */
     r[6+4] = r[3];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11367;
+    goto s_l_v11377;
   } else {
     (void)(oportputc((39), (r[2])));
     r[0] = r[4];  
@@ -17188,7 +17188,7 @@ case 301: /* clo ek . */
     r[1+3] = p[2];
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_l_v11367: /* ek . k port k */
+s_l_v11377: /* ek . k port k */
   if (bool_from_obj(r[4])) {
     (void)(oportputc((']'), (r[3])));
     r[0] = r[2];  
@@ -17450,7 +17450,7 @@ case 309: /* clo k exps */
     r[9+7] = r[7];  
     r += 9; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11305;
+    goto s_loop_v11315;
 
 case 310: /* clo k xl */
     assert(rc == 3);
@@ -17462,7 +17462,7 @@ case 310: /* clo k xl */
     r[1+6] = p[5];
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11305: /* k xl port g s f l k */
+s_loop_v11315: /* 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])));
@@ -17653,7 +17653,7 @@ case 315: /* clo ek . */
     rreserve(MAX_HOSTREGS);
     goto gs_codegen;
   } else {
-    r[10] = obj_from_bool(isequal((r[6]), (cx__232806)));
+    r[10] = obj_from_bool(isequal((r[6]), (cx__232808)));
   if (bool_from_obj(r[10])) {
     r[0] = r[7];  
     pc = objptr_from_obj(r[0])[0];
@@ -17853,13 +17853,13 @@ case 321: /* 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 v13383_tmp;
+    { fixnum_t v13393_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13383_tmp = (n); }
+    v13393_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13383_tmp);
+    obj l, o = mknull(); int c = (v13393_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);
@@ -17886,7 +17886,7 @@ case 321: /* clo ek r */
     r[15+5] = (r[12]);
     r += 15; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11234;
+    goto s_loop_v11244;
 
 case 322: /* clo k free l */
     assert(rc == 4);
@@ -17895,7 +17895,7 @@ case 322: /* clo k free l */
     r[1+4] = p[2];
     r[1+5] = p[3]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11234: /* k free l g f port */
+s_loop_v11244: /* k free l g f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18093,7 +18093,7 @@ case 326: /* clo ek . */
     r[12+4] = r[3];  
     r += 12; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11209;
+    goto s_loop_v11219;
 
 case 327: /* clo k ids n */
     assert(rc == 4);
@@ -18101,7 +18101,7 @@ case 327: /* clo k ids n */
     r[1+3] = p[1];
     r[1+4] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11209: /* k ids n port r */
+s_loop_v11219: /* k ids n port r */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18145,7 +18145,7 @@ s_loop_v11209: /* k ids n port r */
     r[7+5] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11211;
+    goto s_l_v11221;
   }
   }
 
@@ -18158,7 +18158,7 @@ case 328: /* clo ek . */
     r[1+4] = p[3];
     r[1+5] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_l_v11211: /* ek . loop n ids k */
+s_l_v11221: /* ek . loop n ids k */
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
@@ -18300,13 +18300,13 @@ case 333: /* clo k clauses */
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
     /* k clauses g s f l k port */
-    { fixnum_t v13382_tmp;
+    { fixnum_t v13392_tmp;
     { /* length */
     int n; obj l = r[1];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13382_tmp = (n); }
+    v13392_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13382_tmp);
+    obj l, o = mknull(); int c = (v13392_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);
@@ -18328,7 +18328,7 @@ case 333: /* clo k clauses */
     r[10+6] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11152;
+    goto s_loop_v11162;
 
 case 334: /* clo k clauses l */
     assert(rc == 4);
@@ -18338,7 +18338,7 @@ case 334: /* clo k clauses l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11152: /* k clauses l g s f port */
+s_loop_v11162: /* k clauses l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18390,6 +18390,8 @@ case 335: /* clo ek . */
     r[1+6] = p[5]; }
     r += 1; /* shift reg. wnd */
     /* ek . loop l clauses k port */
+    (void)(oportputc(('%'), (r[6])));
+    (void)(oportputc(('x'), (r[6])));
     (void)(oportputc((','), (r[6])));
     { /* cons */ 
     hreserve(hbsz(3), 7); /* 7 live regs */
@@ -18454,14 +18456,14 @@ case 337: /* clo ek . */
     r[1] = r[2];  
     r[2] = obj_from_fixnum(+0);
     r[3] = r[5];  
-    goto s_loop_v11125;
+    goto s_loop_v11135;
 
 case 338: /* 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_v11125: /* k clauses i port */
+s_loop_v11135: /* k clauses i port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18584,19 +18586,19 @@ case 342: /* 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 v13381_tmp;
-    { fixnum_t v13380_tmp;
+    { fixnum_t v13391_tmp;
+    { fixnum_t v13390_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13381_tmp = (n); }
+    v13391_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)) ;
-    v13380_tmp = (n); }
-    r[9] = obj_from_bool((v13381_tmp) == (v13380_tmp)); } }
+    v13390_tmp = (n); }
+    r[9] = obj_from_bool((v13391_tmp) == (v13390_tmp)); } }
   } else {
     r[9] = obj_from_bool(0);
   }
@@ -18604,13 +18606,13 @@ case 342: /* clo k exp args */
     r[9] = obj_from_bool(0);
   }
   if (bool_from_obj(r[9])) {
-    { fixnum_t v13379_tmp;
+    { fixnum_t v13389_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13379_tmp = (n); }
+    v13389_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13379_tmp);
+    obj l, o = mknull(); int c = (v13389_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);
@@ -18637,7 +18639,7 @@ case 342: /* clo k exp args */
     r[11+6] = r[4];  
     r += 11; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11094;
+    goto s_loop_v11104;
   } else {
     hreserve(hbsz(9+1), 9); /* 9 live regs */
     *--hp = r[7];  
@@ -18696,7 +18698,7 @@ case 342: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10959;
+    goto s_l_v10969;
   }
   } else {
     r[10+0] = obj_from_ktrap();
@@ -18712,7 +18714,7 @@ case 342: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10959;
+    goto s_l_v10969;
   }
   } else {
     r[10+0] = obj_from_ktrap();
@@ -18728,7 +18730,7 @@ case 342: /* clo k exp args */
     r[10+10] = r[7];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10959;
+    goto s_l_v10969;
   }
   }
 
@@ -18740,7 +18742,7 @@ case 343: /* clo k args l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11094: /* k args l g s f port */
+s_loop_v11104: /* k args l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -18924,13 +18926,13 @@ case 348: /* 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 v13378_tmp;
+    { fixnum_t v13388_tmp;
     { /* length */
     int n; obj l = (r[11]);
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13378_tmp = (n); }
+    v13388_tmp = (n); }
     { /* append */
-    obj t, l, o, *p, *d; int c = (v13378_tmp);
+    obj t, l, o, *p, *d; int c = (v13388_tmp);
     hreserve(hbsz(3)*c, 12); /* 12 live regs */
     l = (r[11]); t = (r[10]); /* gc-safe */
     o = t; p = &o; 
@@ -18958,7 +18960,7 @@ case 348: /* clo ek r */
     r[14+4] = r[2];  
     r += 14; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v11065;
+    goto s_loop_v11075;
 
 case 349: /* clo k ids n */
     assert(rc == 4);
@@ -18966,7 +18968,7 @@ case 349: /* clo k ids n */
     r[1+3] = p[1];
     r[1+4] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11065: /* k ids n port r */
+s_loop_v11075: /* k ids n port r */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -19010,7 +19012,7 @@ s_loop_v11065: /* k ids n port r */
     r[7+5] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v11067;
+    goto s_l_v11077;
   }
   }
 
@@ -19023,7 +19025,7 @@ case 350: /* clo ek . */
     r[1+4] = p[3];
     r[1+5] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_l_v11067: /* ek . loop n ids k */
+s_l_v11077: /* ek . loop n ids k */
     r[0] = r[2];  
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
@@ -19049,12 +19051,12 @@ case 351: /* 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 v13377_tmp;
+    { fixnum_t v13387_tmp;
     { /* length */
     int n; obj l = r[3];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13377_tmp = (n); }
-    r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v13377_tmp))); }
+    v13387_tmp = (n); }
+    r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v13387_tmp))); }
     r[12+0] = r[9];  
     r[12+1] = r[8];  
     r[12+2] = r[7];  
@@ -19118,15 +19120,15 @@ case 353: /* clo ek r */
     r[1+9] = p[8];
     r[1+10] = p[9]; }
     r += 1; /* shift reg. wnd */
-s_l_v10959: /* ek r exp g s f l args k port k */
+s_l_v10969: /* ek r exp g s f l args k port k */
   if (bool_from_obj(r[1])) {
-    { fixnum_t v13376_tmp;
+    { fixnum_t v13386_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13376_tmp = (n); }
+    v13386_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13376_tmp);
+    obj l, o = mknull(); int c = (v13386_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);
@@ -19147,16 +19149,16 @@ s_l_v10959: /* ek r exp g s f l args k port k */
     /* r[4] */    
     /* r[5] */    
     r[6] = r[9];  
-    goto s_loop_v11028;
+    goto s_loop_v11038;
   } else {
   if (bool_from_obj(r[10])) {
-    { fixnum_t v13375_tmp;
+    { fixnum_t v13385_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13375_tmp = (n); }
+    v13385_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13375_tmp);
+    obj l, o = mknull(); int c = (v13385_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);
@@ -19179,17 +19181,17 @@ s_l_v10959: /* 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_v11003;
+    goto s_loop_v11013;
   } else {
     (void)(oportputc((36), (r[9])));
     (void)(oportputc(('{'), (r[9])));
-    { fixnum_t v13374_tmp;
+    { fixnum_t v13384_tmp;
     { /* length */
     int n; obj l = r[7];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13374_tmp = (n); }
+    v13384_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13374_tmp);
+    obj l, o = mknull(); int c = (v13384_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);
@@ -19223,7 +19225,7 @@ s_l_v10959: /* 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_v10978;
+    goto s_loop_v10988;
   }
   }
 
@@ -19235,7 +19237,7 @@ case 354: /* clo k args l */
     r[1+5] = p[3];
     r[1+6] = p[4]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11028: /* k args l g s f port */
+s_loop_v11038: /* k args l g s f port */
   if ((isnull((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -19375,7 +19377,7 @@ case 358: /* clo k args l */
     r[1+6] = p[4];
     r[1+7] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_loop_v11003: /* k args l port g s f exp */
+s_loop_v11013: /* k args l port g s f exp */
   if ((isnull((r[1])))) {
     r[8+0] = r[0];  
     r[8+1] = r[7];  
@@ -19494,7 +19496,7 @@ case 362: /* clo k args l */
     r[1+6] = p[4];
     r[1+7] = p[5]; }
     r += 1; /* shift reg. wnd */
-s_loop_v10978: /* k args l port g s f exp */
+s_loop_v10988: /* k args l port g s f exp */
   if ((isnull((r[1])))) {
     r[8+0] = r[0];  
     r[8+1] = r[7];  
@@ -19838,17 +19840,17 @@ gs_display_2Dcode: /* k cstr oport */
     r[3+4] = r[2];  
     r += 3; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v10881;
+    goto s_loop_v10891;
 
-s_loop_v10881: /* k i l cstr oport */
-    { const fixnum_t v13373_i = fixnum_from_obj(r[1]);
-  if (((fxsub(fixnum_from_obj(r[2]), (v13373_i))) <= (+70))) {
-    (void)(oportputcircular((cx__232958), (r[4]), 1));
+s_loop_v10891: /* k i l cstr oport */
+    { const fixnum_t v13383_i = fixnum_from_obj(r[1]);
+  if (((fxsub(fixnum_from_obj(r[2]), (v13383_i))) <= (+70))) {
+    (void)(oportputcircular((cx__232960), (r[4]), 1));
     { /* substring */
-    int *d = substring(stringdata((r[3])), (v13373_i), fixnum_from_obj(r[2]));
+    int *d = substring(stringdata((r[3])), (v13383_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__232962), (r[4]), 1));
+    r[5] = obj_from_void(oportputcircular((cx__232964), (r[4]), 1));
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
     r[1] = obj_from_ktrap();
@@ -19857,18 +19859,18 @@ s_loop_v10881: /* k i l cstr oport */
     rc = 3;
     goto jump;
   } else {
-    (void)(oportputcircular((cx__232958), (r[4]), 1));
+    (void)(oportputcircular((cx__232960), (r[4]), 1));
     { /* substring */
-    int *d = substring(stringdata((r[3])), (v13373_i), (fxadd((v13373_i), (+70))));
+    int *d = substring(stringdata((r[3])), (v13383_i), (fxadd((v13383_i), (+70))));
     r[5] = (hpushstr(5, d)); }
     (void)(oportputcircular((r[5]), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    (void)(oportputcircular((cx__232953), (r[4]), 1));
+    (void)(oportputcircular((cx__232955), (r[4]), 1));
     /* r[0] */    
-    r[1] = obj_from_fixnum(fxadd((v13373_i), (+70)));
+    r[1] = obj_from_fixnum(fxadd((v13383_i), (+70)));
     /* r[2] */    
     /* r[3] */    
     /* r[4] */    
-    goto s_loop_v10881;
+    goto s_loop_v10891;
   } } 
 
 case 378: /* process-define-syntax k id xval oport */
@@ -19879,9 +19881,9 @@ gs_process_2Ddefine_2Dsyntax: /* k id xval oport */
     *--hp = r[2];  
     r[4] = (hendblk(1));
     (void)(oportputc('\n', (r[3])));
-    (void)(oportputcircular((cx__232958), (r[3]), 1));
+    (void)(oportputcircular((cx__232960), (r[3]), 1));
     (void)(oportputcircular((r[1]), (r[3]), 1));
-    (void)(oportputcircular((cx__233024), (r[3]), 1));
+    (void)(oportputcircular((cx__233026), (r[3]), 1));
     r[5] = (objptr_from_obj(r[4])[0]);
     hreserve(hbsz(3+1), 6); /* 6 live regs */
     *--hp = r[4];  
@@ -20032,7 +20034,7 @@ case 382: /* clo ek r */
     { /* cons */ 
     hreserve(hbsz(3), 7); /* 7 live regs */
     *--hp = r[6];  
-    *--hp = (cx__232998);
+    *--hp = (cx__233000);
     *--hp = obj_from_size(PAIR_BTAG); 
     r[6] = (hendblk(3)); }
     { /* cons */ 
@@ -20179,7 +20181,7 @@ case 387: /* 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__233035), (r[3]), 1));
+    (void)(oportputcircular((cx__233037), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -20293,7 +20295,7 @@ case 391: /* 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__233035), (r[3]), 1));
+    (void)(oportputcircular((cx__233037), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -20340,7 +20342,7 @@ 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__233086))));
+    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233088))));
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = obj_from_case(394);
@@ -20352,12 +20354,12 @@ gs_scan_2Dtop_2Dform: /* k x */
     r[6+2] = r[0];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10742;
+    goto s_l_v10752;
   } else {
     r[5+0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[5+0])[0];
     r[5+1] = r[4];  
-    r[5+2] = (cx__233090);
+    r[5+2] = (cx__233092);
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -20397,7 +20399,7 @@ case 394: /* clo ek r */
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v10742: /* ek r k */
+s_l_v10752: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
@@ -20427,14 +20429,14 @@ case 395: /* clo ek r */
     r[0] = r[4];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v10751;
+    goto s_loop_v10761;
 
 case 396: /* 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_v10751: /* k x r */
+s_loop_v10761: /* k x r */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -20524,7 +20526,7 @@ case 400: /* clo ek r */
     r[4] = (cdr((r[2])));
     r[0] = r[3];  
     r[1] = r[4];  
-    goto s_loop_v10726;
+    goto s_loop_v10736;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(2+1), 4); /* 4 live regs */
@@ -20573,7 +20575,7 @@ case 400: /* clo ek r */
 case 401: /* clo k l */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
-s_loop_v10726: /* k l */
+s_loop_v10736: /* k l */
   if ((ispair((r[1])))) {
     hreserve(hbsz(0+1), 2); /* 2 live regs */
     *--hp = obj_from_case(401);
@@ -20679,7 +20681,7 @@ 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__233086))));
+    r[4] = ((obj)fopen(stringchars((r[3])), stringchars((cx__233088))));
     hreserve(hbsz(1+1), 5); /* 5 live regs */
     *--hp = r[0];  
     *--hp = obj_from_case(407);
@@ -20691,12 +20693,12 @@ gs_process_2Dtop_2Dform: /* k x oport */
     r[7+2] = r[0];  
     r += 7; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10664;
+    goto s_l_v10674;
   } else {
     r[0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[5];  
-    r[2] = (cx__233090);
+    r[2] = (cx__233092);
     /* r[3] */    
     rreserve(MAX_HOSTREGS);
     rc = 4;
@@ -20742,7 +20744,7 @@ case 407: /* clo ek r */
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v10664: /* ek r k */
+s_l_v10674: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
@@ -20772,14 +20774,14 @@ case 408: /* clo ek r */
     r[0] = r[4];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v10673;
+    goto s_loop_v10683;
 
 case 409: /* 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_v10673: /* k x r */
+s_loop_v10683: /* k x r */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -20871,7 +20873,7 @@ case 413: /* clo ek r */
     r[0] = r[4];  
     r[1] = r[5];  
     /* r[2] */    
-    goto s_loop_v10648;
+    goto s_loop_v10658;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(3+1), 5); /* 5 live regs */
@@ -20949,7 +20951,7 @@ case 414: /* clo k x* */
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_loop_v10648: /* k x* oport */
+s_loop_v10658: /* k x* oport */
   if ((ispair((r[1])))) {
     hreserve(hbsz(1+1), 3); /* 3 live regs */
     *--hp = r[2];  
@@ -21145,7 +21147,7 @@ case 420: /* 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__233035), (r[3]), 1));
+    (void)(oportputcircular((cx__233037), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -21256,7 +21258,7 @@ case 425: /* 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__233035), (r[3]), 1));
+    (void)(oportputcircular((cx__233037), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -21355,7 +21357,7 @@ case 429: /* 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__233035), (r[3]), 1));
+    (void)(oportputcircular((cx__233037), (r[3]), 1));
     hreserve(hbsz(2+1), 7); /* 7 live regs */
     *--hp = r[3];  
     *--hp = r[2];  
@@ -21394,13 +21396,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 v13372_tmp;
+    { fixnum_t v13382_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13372_tmp = (n); }
+    v13382_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13372_tmp);
+    obj l, o = mknull(); int c = (v13382_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);
@@ -21409,17 +21411,17 @@ gs_path_2Dstrip_2Ddirectory: /* k filename */
     /* r[0] */    
     r[1] = r[2];  
     r[2] = (mknull());
-    goto s_loop_v10543;
+    goto s_loop_v10553;
 
-s_loop_v10543: /* k l r */
+s_loop_v10553: /* k l r */
   if ((isnull((r[1])))) {
-    { fixnum_t v13371_tmp;
+    { fixnum_t v13381_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13371_tmp = (n); }
+    v13381_tmp = (n); }
     { /* list->string */
-    int i, c = (v13371_tmp); 
+    int i, c = (v13381_tmp); 
     obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */
     obj l = r[2];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -21434,15 +21436,15 @@ s_loop_v10543: /* k l r */
     goto jump;
   } else {
     r[3] = (car((r[1])));
-    r[3] = (ismemv((r[3]), (cx__233200)));
+    r[3] = (ismemv((r[3]), (cx__233202)));
   if (bool_from_obj(r[3])) {
-    { fixnum_t v13370_tmp;
+    { fixnum_t v13380_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13370_tmp = (n); }
+    v13380_tmp = (n); }
     { /* list->string */
-    int i, c = (v13370_tmp); 
+    int i, c = (v13380_tmp); 
     obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */
     obj l = r[2];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -21467,7 +21469,7 @@ s_loop_v10543: /* k l r */
     /* r[0] */    
     r[1] = r[3];  
     r[2] = r[4];  
-    goto s_loop_v10543;
+    goto s_loop_v10553;
   }
   }
 
@@ -21483,13 +21485,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 v13367_tmp;
+    { fixnum_t v13377_tmp;
     { /* length */
     int n; obj l = r[2];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13367_tmp = (n); }
+    v13377_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13367_tmp);
+    obj l, o = mknull(); int c = (v13377_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);
@@ -21498,25 +21500,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 v13368_tmp;
+    { fixnum_t v13378_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13368_tmp = (n); }
+    v13378_tmp = (n); }
     { /* reverse */
-    obj l, o = mknull(); int c = (v13368_tmp);
+    obj l, o = mknull(); int c = (v13378_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 v13369_tmp;
+    { fixnum_t v13379_tmp;
     { /* length */
     int n; obj l = r[4];  
     for (n = 0; l != mknull(); ++n, l = cdr(l)) ;
-    v13369_tmp = (n); }
+    v13379_tmp = (n); }
     { /* list->string */
-    int i, c = (v13369_tmp); 
+    int i, c = (v13379_tmp); 
     obj o = hpushstr(5, allocstring(c, ' ')); /* 5 live regs */
     obj l = r[4];   /* gc-safe */
     unsigned char *s = (unsigned char *)stringchars(o);
@@ -21589,7 +21591,7 @@ case 436: /* 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__233086))));
+    r[7] = ((obj)fopen(stringchars((r[6])), stringchars((cx__233088))));
     hreserve(hbsz(6+1), 8); /* 8 live regs */
     *--hp = r[5];  
     *--hp = r[1];  
@@ -21611,12 +21613,12 @@ case 436: /* clo ek r */
     r[10+7] = r[5];  
     r += 10; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10475;
+    goto s_l_v10485;
   } else {
     r[0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[8];  
-    r[2] = (cx__233090);
+    r[2] = (cx__233092);
     r[3] = r[6];  
     rreserve(MAX_HOSTREGS);
     rc = 4;
@@ -21633,13 +21635,13 @@ case 437: /* clo ek r */
     r[1+6] = p[5];
     r[1+7] = p[6]; }
     r += 1; /* shift reg. wnd */
-s_l_v10475: /* ek r fname k oport mname r iport */
+s_l_v10485: /* 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__233254), (r[4]), 1));
+    (void)(oportputcircular((cx__233256), (r[4]), 1));
     r[8] = (objptr_from_obj(r[5])[0]);
     (void)(oportputcircular((r[8]), (r[4]), 1));
-    (void)(oportputcircular((cx__233253), (r[4]), 1));
+    (void)(oportputcircular((cx__233255), (r[4]), 1));
     hreserve(hbsz(4+1), 8); /* 8 live regs */
     *--hp = r[4];  
     *--hp = r[5];  
@@ -21661,13 +21663,13 @@ case 438: /* clo ek r */
     r += 1; /* shift reg. wnd */
     /* ek r iport k mname oport */
     (void)(oportputcircular((r[1]), (r[5]), 1));
-    (void)(oportputcircular((cx__233252), (r[5]), 1));
+    (void)(oportputcircular((cx__233254), (r[5]), 1));
     (void)(oportputc('\n', (r[5])));
     (void)(oportputc('\n', (r[5])));
-    (void)(oportputcircular((cx__233251), (r[5]), 1));
+    (void)(oportputcircular((cx__233253), (r[5]), 1));
     r[6] = (objptr_from_obj(r[4])[0]);
     (void)(oportputcircular((r[6]), (r[5]), 1));
-    (void)(oportputcircular((cx__233250), (r[5]), 1));
+    (void)(oportputcircular((cx__233252), (r[5]), 1));
     (void)(oportputc('\n', (r[5])));
     hreserve(hbsz(3+1), 6); /* 6 live regs */
     *--hp = r[5];  
@@ -21703,7 +21705,7 @@ case 439: /* clo ek r */
     r[6+3] = r[2];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_loop_v10486;
+    goto s_loop_v10496;
 
 case 440: /* clo k x */
     assert(rc == 3);
@@ -21711,7 +21713,7 @@ case 440: /* clo k x */
     r[1+2] = p[1];
     r[1+3] = p[2]; }
     r += 1; /* shift reg. wnd */
-s_loop_v10486: /* k x oport iport */
+s_loop_v10496: /* k x oport iport */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -21785,7 +21787,7 @@ case 443: /* clo ek . */
     r[1+4] = p[3]; }
     r += 1; /* shift reg. wnd */
     /* ek . iport k oport */
-    (void)(oportputcircular((cx__233242), (r[4]), 1));
+    (void)(oportputcircular((cx__233244), (r[4]), 1));
     r[0] = (cx_close_2Dinput_2Dport);
     pc = objptr_from_obj(r[0])[0];
     r[1] = r[3];  
@@ -21808,7 +21810,7 @@ case 444: /* clo ek r */
     r[4+0] = r[2];  
     pc = objptr_from_obj(r[4+0])[0];
     r[4+1] = r[3];  
-    r[4+2] = (cx__233278);
+    r[4+2] = (cx__233280);
     r += 4; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
     rc = 3;
@@ -21880,11 +21882,11 @@ case 448: /* clo ek . */
     r[2] = obj_from_void(0); /* ignored */
     r += 1; /* shift reg. wnd */
     /* ek . */
-    cx_test1 = (cx__233282);
-    cx_test2 = (cx__233552);
-    cx_test3 = (cx__233754);
-    cx_test4 = (cx__234156);
-    cx_test5 = (cx__234286);
+    cx_test1 = (cx__233284);
+    cx_test2 = (cx__233554);
+    cx_test3 = (cx__233756);
+    cx_test4 = (cx__234158);
+    cx_test5 = (cx__234288);
     { static obj c[] = { obj_from_case(449) }; cx_run_2Dtests = (obj)c; }
     { static obj c[] = { obj_from_case(455) }; cx_repl_2Deval = (obj)c; }
     { static obj c[] = { obj_from_case(461) }; cx_repl_2Deval_2Dtop_2Dform = (obj)c; }
@@ -21909,7 +21911,7 @@ case 449: /* run-tests k */
     r[1] = (hendblk(1));
     r[2] = obj_from_flonum(2, clock());
     (void)(objptr_from_obj(r[1])[0] = (r[2]));
-    (void)(oportputcircular((cx__234694), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234696), (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];  
@@ -22001,23 +22003,23 @@ case 454: /* 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__234693), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    { flonum_t v13365_b;
-    { flonum_t v13364_a;
-    { const flonum_t v13363_b = (CLOCKS_PER_SEC);
-    { const flonum_t v13361_a = (clock());
+    (void)(oportputcircular((cx__234695), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    { flonum_t v13375_b;
+    { flonum_t v13374_a;
+    { const flonum_t v13373_b = (CLOCKS_PER_SEC);
+    { const flonum_t v13371_a = (clock());
     r[4] = (objptr_from_obj(r[3])[0]);
   if ((is_fixnum_obj(r[4]))) {
-    { const flonum_t v13362_tmp = ((flonum_t)fixnum_from_obj(r[4]));
-    v13364_a = ((v13361_a) - (v13362_tmp)); } 
+    { const flonum_t v13372_tmp = ((flonum_t)fixnum_from_obj(r[4]));
+    v13374_a = ((v13371_a) - (v13372_tmp)); } 
   } else {
-    v13364_a = ((v13361_a) - flonum_from_obj(r[4]));
+    v13374_a = ((v13371_a) - flonum_from_obj(r[4]));
   } } 
-    v13365_b = ((v13364_a) / (v13363_b)); }  }
-    { const flonum_t v13366_tmp = ((flonum_t)(+1000));
-    r[4] = obj_from_flonum(4, (v13366_tmp) * (v13365_b)); }  }
+    v13375_b = ((v13374_a) / (v13373_b)); }  }
+    { const flonum_t v13376_tmp = ((flonum_t)(+1000));
+    r[4] = obj_from_flonum(4, (v13376_tmp) * (v13375_b)); }  }
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
-    (void)(oportputcircular((cx__234669), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234671), (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];
@@ -22051,7 +22053,7 @@ case 456: /* clo ek r */
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
     /* ek r k */
-    (void)(oportputcircular((cx__234760), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234762), (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)));
@@ -22061,7 +22063,7 @@ case 456: /* clo ek r */
     (void)(car((r[1])) = (mksymbol(internsym("set!"))));
   } else {
   }
-    (void)(oportputcircular((cx__234754), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234756), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
     { /* open-output-string */
     r[3] = (mkoport_string(3, newcb())); }
@@ -22120,7 +22122,7 @@ case 458: /* clo ek . */
     r[5] = (hendblk(1));
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
     (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A)));
-    (void)(oportputcircular((cx__234744), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234746), (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]));
@@ -22165,23 +22167,23 @@ case 460: /* 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__234693), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
-    { flonum_t v13359_b;
-    { flonum_t v13358_a;
-    { const flonum_t v13357_b = (CLOCKS_PER_SEC);
-    { const flonum_t v13355_a = (clock());
+    (void)(oportputcircular((cx__234695), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    { flonum_t v13369_b;
+    { flonum_t v13368_a;
+    { const flonum_t v13367_b = (CLOCKS_PER_SEC);
+    { const flonum_t v13365_a = (clock());
     r[4] = (objptr_from_obj(r[3])[0]);
   if ((is_fixnum_obj(r[4]))) {
-    { const flonum_t v13356_tmp = ((flonum_t)fixnum_from_obj(r[4]));
-    v13358_a = ((v13355_a) - (v13356_tmp)); } 
+    { const flonum_t v13366_tmp = ((flonum_t)fixnum_from_obj(r[4]));
+    v13368_a = ((v13365_a) - (v13366_tmp)); } 
   } else {
-    v13358_a = ((v13355_a) - flonum_from_obj(r[4]));
+    v13368_a = ((v13365_a) - flonum_from_obj(r[4]));
   } } 
-    v13359_b = ((v13358_a) / (v13357_b)); }  }
-    { const flonum_t v13360_tmp = ((flonum_t)(+1000));
-    r[4] = obj_from_flonum(4, (v13360_tmp) * (v13359_b)); }  }
+    v13369_b = ((v13368_a) / (v13367_b)); }  }
+    { const flonum_t v13370_tmp = ((flonum_t)(+1000));
+    r[4] = obj_from_flonum(4, (v13370_tmp) * (v13369_b)); }  }
     (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0));
-    (void)(oportputcircular((cx__234669), (cx__2Acurrent_2Doutput_2Dport_2A), 1));
+    (void)(oportputcircular((cx__234671), (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];
@@ -22211,7 +22213,7 @@ 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__233086))));
+    r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233088))));
     hreserve(hbsz(1+1), 4); /* 4 live regs */
     *--hp = r[0];  
     *--hp = obj_from_case(462);
@@ -22223,12 +22225,12 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */
     r[6+2] = r[0];  
     r += 6; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
-    goto s_l_v10365;
+    goto s_l_v10375;
   } else {
     r[5+0] = (cx_file_2Derror);
     pc = objptr_from_obj(r[5+0])[0];
     r[5+1] = r[4];  
-    r[5+2] = (cx__233090);
+    r[5+2] = (cx__233092);
     r[5+3] = r[2];  
     r += 5; /* shift reg wnd */
     rreserve(MAX_HOSTREGS);
@@ -22263,7 +22265,7 @@ case 462: /* clo ek r */
     { obj* p = objptr_from_obj(r[0]);
     r[1+2] = p[1]; }
     r += 1; /* shift reg. wnd */
-s_l_v10365: /* ek r k */
+s_l_v10375: /* ek r k */
     hreserve(hbsz(2+1), 3); /* 3 live regs */
     *--hp = r[2];  
     *--hp = r[1];  
@@ -22300,7 +22302,7 @@ case 464: /* clo ek r */
     r[4] = (cdr((r[2])));
     r[0] = r[3];  
     r[1] = r[4];  
-    goto s_loop_v10349;
+    goto s_loop_v10359;
   } else {
   if (((r[1]) == (mksymbol(internsym("define-syntax"))))) {
     hreserve(hbsz(2+1), 4); /* 4 live regs */
@@ -22345,7 +22347,7 @@ case 464: /* clo ek r */
 case 465: /* clo k x* */
     assert(rc == 3);
     r += 1; /* shift reg. wnd */
-s_loop_v10349: /* k x* */
+s_loop_v10359: /* k x* */
   if ((ispair((r[1])))) {
     hreserve(hbsz(0+1), 2); /* 2 live regs */
     *--hp = obj_from_case(465);
@@ -22435,7 +22437,7 @@ case 470: /* 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__234815), (cx__2Acurrent_2Doutput_2Dport_2A), 1)) : (void)(0));
+    (void)(((r[1]) == (cx__2Acurrent_2Dinput_2Dport_2A)) ? (void)(oportputcircular((cx__234817), (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];  
@@ -22468,14 +22470,14 @@ case 472: /* clo ek r */
     r[0] = r[3];  
     /* r[1] */    
     /* r[2] */    
-    goto s_loop_v10296;
+    goto s_loop_v10306;
 
 case 473: /* 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_v10296: /* k x iport */
+s_loop_v10306: /* k x iport */
   if ((iseof((r[1])))) {
     /* r[0] */    
     pc = objptr_from_obj(r[0])[0];
@@ -22567,7 +22569,7 @@ case 478: /* clo ek r */
     r += 1; /* shift reg. wnd */
     /* ek r k */
     r[3] = (cdr((r[1])));
-  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234837), (r[3])))) {
+  if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234839), (r[3])))) {
     r[4] = (cdr((r[3])));
     r[4] = (car((r[4])));
     r[0] = r[2];  
diff --git a/src/k.sf b/src/k.sf
index 6861dae..301068b 100644
--- a/src/k.sf
+++ b/src/k.sf
@@ -933,6 +933,7 @@
        (do ([clauses (reverse clauses) (cdr clauses)] [l l (cons #f l)]) 
             [(null? clauses)]
          (codegen (cadr (car clauses)) l f s g #f port)
+         (write-char #\% port) (write-char #\x port)
          (write-char #\, port))
        (write-char #\& port)
        (write-serialized-arg (length clauses) port)
diff --git a/src/t.scm b/src/t.scm
index 793923e..96b60e1 100644
--- a/src/t.scm
+++ b/src/t.scm
@@ -23,26 +23,26 @@
         (cons x s))))
 
 (define set-union
-  (lambda (sl s2)
-    (if (null? sl) 
+  (lambda (s1 s2)
+    (if (null? s1) 
         s2 
-        (set-union (cdr sl) (set-cons (car sl) s2)))))
+        (set-union (cdr s1) (set-cons (car s1) s2)))))
 
 (define set-minus
-  (lambda (sl s2)
-    (if (null? sl)
+  (lambda (s1 s2)
+    (if (null? s1)
         '()
-        (if (set-member? (car sl) s2)
-            (set-minus (cdr sl) s2)
-            (cons (car sl) (set-minus (cdr sl) s2))))))
+        (if (set-member? (car s1) s2)
+            (set-minus (cdr s1) s2)
+            (cons (car s1) (set-minus (cdr s1) s2))))))
 
 (define set-intersect
-  (lambda (sl s2)
-    (if (null? sl)
+  (lambda (s1 s2)
+    (if (null? s1)
         '()
-        (if (set-member? (car sl) s2)
-            (cons (car sl) (set-intersect (cdr sl) s2))
-            (set-intersect (cdr sl) s2)))))
+        (if (set-member? (car s1) s2)
+            (cons (car s1) (set-intersect (cdr s1) s2))
+            (set-intersect (cdr s1) s2)))))
 
 (define-syntax record-case
   (syntax-rules (else)
@@ -129,6 +129,7 @@
 ;  <core> -> (ref <id>)
 ;  <core> -> (set! <id> <core>)
 ;  <core> -> (lambda <ids> <core>) where <ids> -> (<id> ...) | (<id> ... . <id>) | <id>
+;  <core> -> (lambda* (<arity> <core>) ...) where <arity> -> (<cnt> <rest?>) 
 ;  <core> -> (begin <core> ...)
 ;  <core> -> (if <core> <core> <core>)
 ;  <core> -> (call <core> <core> ...) 
@@ -139,6 +140,15 @@
 ;  <core> -> (define <id> <core>)
 ;  <core> -> (define-syntax <id> <transformer>)
 
+(define normalize-arity
+  (lambda (arity)
+    (if (and (list2? arity) (fixnum? (car arity)) (boolean? (cadr arity)))
+        arity
+        (let loop ([cnt 0] [l arity])
+          (cond [(pair? l) (loop (fx+ 1 cnt) (cdr l))]
+                [(null? l) (list cnt #f)]
+                [else (list cnt #t)])))))
+
 ; convention for 'flattened' <ids> is to put rest arg if any at the front
 (define flatten-idslist
   (lambda (ilist)
@@ -221,6 +231,7 @@
                   [(begin)         (xform-begin tail env)]
                   [(if)            (xform-if tail env)]
                   [(lambda)        (xform-lambda tail env)]
+                  [(lambda*)       (xform-lambda* tail env)]
                   [(body)          (xform-body tail env)]
                   [(define)        (xform-define (car tail) (cadr tail) env)]
                   [(define-syntax) (xform-define-syntax (car tail) (cadr tail) env)]
@@ -290,6 +301,17 @@
                   (xform-body (cdr tail) ienv)))]))
       (error 'transform "improper lambda body")))
 
+(define (xform-lambda* tail env)
+  (if (list? tail)
+      (cons 'lambda*
+         (map (lambda (aexp)
+                 (if (list2? aexp)
+                     (list (normalize-arity (car aexp))
+                           (xform #f (cadr aexp) env))
+                     (error 'transform "improper lambda* clause")))
+              tail))
+      (error 'transform "improper lambda* form")))
+
 (define (xform-body tail env)
   (if (null? tail)
       (list 'begin)
@@ -360,6 +382,7 @@
     (make-binding 'begin 'begin)
     (make-binding 'if 'if)
     (make-binding 'lambda 'lambda)
+    (make-binding 'lambda* 'lambda*)
     (make-binding 'body 'body)
     denotation-of-default-ellipsis))
 
@@ -499,8 +522,7 @@
       (if (null? rules) (error 'transform "invalid syntax" use))
       (let* ([rule (car rules)] [pat (car rule)] [tmpl (cadr rule)])
         (cond [(match-pattern pat use use-env) =>
-               (lambda (bindings) 
-                 (expand-template pat tmpl bindings))]
+               (lambda (bindings) (expand-template pat tmpl bindings))]
               [else (loop (cdr rules))])))))
 
 (install-transformer! 'syntax-rules
@@ -626,3 +648,7 @@
 (install-sr-transformer! 'unless
   (syntax-rules ()
     [(_ test . rest) (if (not test) (begin . rest))]))
+
+(install-sr-transformer! 'case-lambda
+  (syntax-rules ()
+    [(_ [args . body] ...) (lambda* [args (lambda args . body)] ...)]))
diff --git a/t.c b/t.c
index dfed00b..7f79747 100644
--- a/t.c
+++ b/t.c
@@ -67,6 +67,11 @@ char *t_code[] = {
   0,
   "&0{%1.0p?{.0d,@(y6:list3?)[11}f]1}@!(y6:list4?)",
 
+  0,
+  "&0{%1${.2,@(y6:list2?)[01}?{.0aI0?{.0daY1}{f}}{f}?{.0]1}.0,'0,,#0.0,&1"
+  "{%2.1p?{.1d,.1,'1I+,:0^[22}.1u?{f,.1,l2]2}t,.1,l2]2}.!0.0^_1[12}@!(y15"
+  ":normalize-arity)",
+
   0,
   "&0{%1.0L0?{.0]1}n,.1,,#0.0,&1{%2.0p?{.1,.1ac,.1d,:0^[22}.0u?{.1A9]2}.1"
   "A9,.1c]2}.!0.0^_1[12}@!(y15:flatten-idslist)",
@@ -139,11 +144,12 @@ char *t_code[] = {
   "}'(l1:y5:quote;)%l,.1A1?{.6,.3a,@(y11:xform-quote)[72}'(l1:y4:set!;)%l"
   ",.1A1?{.6,.3da,.4a,@(y10:xform-set!)[73}'(l1:y5:begin;)%l,.1A1?{.6,.3,"
   "@(y11:xform-begin)[72}'(l1:y2:if;)%l,.1A1?{.6,.3,@(y8:xform-if)[72}'(l"
-  "1:y6:lambda;)%l,.1A1?{.6,.3,@(y12:xform-lambda)[72}'(l1:y4:body;)%l,.1"
-  "A1?{.6,.3,@(y10:xform-body)[72}'(l1:y6:define;)%l,.1A1?{.6,.3da,.4a,@("
-  "y12:xform-define)[73}'(l1:y13:define-syntax;)%l,.1A1?{.6,.3da,.4a,@(y1"
-  "9:xform-define-syntax)[73}t?{.1K0?{.6,${.9,.9,.6[02},.6,@(y5:xform)[73"
-  "}.6,.3,.3,@(y10:xform-call)[73}f]7}@!(y5:xform)",
+  "1:y6:lambda;)%l,.1A1?{.6,.3,@(y12:xform-lambda)[72}'(l1:y7:lambda*;)%l"
+  ",.1A1?{.6,.3,@(y13:xform-lambda*)[72}'(l1:y4:body;)%l,.1A1?{.6,.3,@(y1"
+  "0:xform-body)[72}'(l1:y6:define;)%l,.1A1?{.6,.3da,.4a,@(y12:xform-defi"
+  "ne)[73}'(l1:y13:define-syntax;)%l,.1A1?{.6,.3da,.4a,@(y19:xform-define"
+  "-syntax)[73}t?{.1K0?{.6,${.9,.9,.6[02},.6,@(y5:xform)[73}.6,.3,.3,@(y1"
+  "0:xform-call)[73}f]7}@!(y5:xform)",
 
   0,
   "&0{%2${.2,,#0.0,&1{%1${.2,@(y3:id?)[01}?{.0,@(y7:id->sym)[11}.0p?{${.2"
@@ -189,6 +195,13 @@ char *t_code[] = {
   "xform-body)[02},.2,.7A8L6,'(y6:lambda),l3]6}.!0.0^_1[23}'(s20:improper"
   " lambda body),'(y9:transform),@(y5:error)[22}@!(y12:xform-lambda)",
 
+  0,
+  "&0{%2.0L0?{.1,&1{%1${.2,@(y6:list2?)[01}?{${:0,.3da,f,@(y5:xform)[03},"
+  "${.3a,@(y15:normalize-arity)[01},l2]1}'(s23:improper lambda* clause),'"
+  "(y9:transform),@(y5:error)[12},${.3,,#0.4,.1,&2{%1.0p?{${.2d,:0^[01},$"
+  "{.3a,:1[01}c]1}n]1}.!0.0^_1[01}_1,'(y7:lambda*)c]2}'(s21:improper lamb"
+  "da* form),'(y9:transform),@(y5:error)[22}@!(y13:xform-lambda*)",
+
   0,
   "&0{%2.0u?{n,'(y5:begin)c]2}.0,n,n,n,.5,,#0.0,&1{%5.4p?{.4ap}{f}?{.4d,."
   "5a,.0a,${.5,.3,t,@(y5:xform)[03},.0,'(l1:y5:begin;)%l,.1A1?{.4,.4dL6,."
@@ -227,13 +240,14 @@ char *t_code[] = {
 
   0,
   "@(y30:denotation-of-default-ellipsis),${'(y4:body),'(y4:body),@(y12:ma"
-  "ke-binding)[02},${'(y6:lambda),'(y6:lambda),@(y12:make-binding)[02},${"
-  "'(y2:if),'(y2:if),@(y12:make-binding)[02},${'(y5:begin),'(y5:begin),@("
-  "y12:make-binding)[02},${'(y4:set!),'(y4:set!),@(y12:make-binding)[02},"
-  "${'(y5:quote),'(y5:quote),@(y12:make-binding)[02},${'(y13:define-synta"
-  "x),'(y13:define-syntax),@(y12:make-binding)[02},${'(y6:define),'(y6:de"
-  "fine),@(y12:make-binding)[02},${'(y6:syntax),'(y6:syntax),@(y12:make-b"
-  "inding)[02},l(i10)@!(y14:*transformers*)",
+  "ke-binding)[02},${'(y7:lambda*),'(y7:lambda*),@(y12:make-binding)[02},"
+  "${'(y6:lambda),'(y6:lambda),@(y12:make-binding)[02},${'(y2:if),'(y2:if"
+  "),@(y12:make-binding)[02},${'(y5:begin),'(y5:begin),@(y12:make-binding"
+  ")[02},${'(y4:set!),'(y4:set!),@(y12:make-binding)[02},${'(y5:quote),'("
+  "y5:quote),@(y12:make-binding)[02},${'(y13:define-syntax),'(y13:define-"
+  "syntax),@(y12:make-binding)[02},${'(y6:define),'(y6:define),@(y12:make"
+  "-binding)[02},${'(y6:syntax),'(y6:syntax),@(y12:make-binding)[02},l(i1"
+  "1)@!(y14:*transformers*)",
 
   0,
   "&0{%1${@(y14:*transformers*),.3,@(y16:find-top-binding)[02},${.2,@(y8:"
@@ -401,5 +415,10 @@ char *t_code[] = {
   "${'(l1:l2:py1:_;py4:test;y4:rest;;;l3:y2:if;l2:y3:not;y4:test;;py5:beg"
   "in;y4:rest;;;;),n,f,'(y6:unless),@(y26:install-transformer-rules!)[04}",
 
+  0,
+  "${'(l1:l2:l3:y1:_;py4:args;y4:body;;y3:...;;l3:y7:lambda*;l2:y4:args;p"
+  "y6:lambda;py4:args;y4:body;;;;y3:...;;;),n,f,'(y11:case-lambda),@(y26:"
+  "install-transformer-rules!)[04}",
+
   0, 0
 };