diff --git a/racket/src/cs/linklet.sls b/racket/src/cs/linklet.sls
index bf29d722e7..395d07de26 100644
--- a/racket/src/cs/linklet.sls
+++ b/racket/src/cs/linklet.sls
@@ -228,18 +228,18 @@
                     (performance-region
                      'uncompress
                      (bytevector-uncompress c-bv))))])
-      (add-performance-memory! 'faslin (bytevector-length bv))
+      (add-performance-memory! 'faslin-code (bytevector-length bv))
       (cond
        [(eq? format 'interpret)
         (let ([r (performance-region
-                  'faslin
+                  'faslin-code
                   (fasl-read (open-bytevector-input-port bv)))])
           (performance-region
            'outer
            (outer-eval r format)))]
        [else
         (performance-region
-         'faslin
+         'faslin-code
          (code-from-bytevector bv))])))
 
   (define (code-from-bytevector bv)
diff --git a/racket/src/cs/linklet/performance.ss b/racket/src/cs/linklet/performance.ss
index 265a5ddd25..64410ba2e5 100644
--- a/racket/src/cs/linklet/performance.ss
+++ b/racket/src/cs/linklet/performance.ss
@@ -54,33 +54,70 @@
            [gc-total (apply + (hash-table-map region-gc-times (lambda (k v) v)))]
            [name-len (apply max (hash-table-map region-times (lambda (k v) (string-length (symbol->string k)))))]
            [len (string-length (number->string total))]
-           [gc-len (string-length (number->string gc-total))])
-      (define (pad v w)
+           [gc-len (string-length (number->string gc-total))]
+           [categories '((read (read-bundle faslin-code))
+                         (comp-ffi (comp-ffi-call comp-ffi-back))
+                         (run (instantiate outer)))]
+           [region-subs (make-eq-hashtable)]
+           [region-gc-subs (make-eq-hashtable)])
+      (define (pad v w combine)
         (let ([s (chez:format "~a" v)])
-          (string-append (make-string (max 0 (- w (string-length s))) #\space)
-                         s)))
-      (define (report label n n-extra units extra)
-        (chez:printf ";; ~a:  ~a~a ~a~a\n"
-                     (pad label name-len)
-                     (pad (round (inexact->exact n)) len)
+          (combine (make-string (max 0 (- w (string-length s))) #\space)
+                   s)))
+      (define (pad-left v w) (pad v w string-append))
+      (define (pad-right v w) (pad v w (lambda (p s) (string-append s p))))
+      (define (report level label n n-extra units extra)
+        (chez:printf ";; ~a~a~a  ~a~a ~a~a\n"
+                     (make-string (* level 2) #\space)
+                     (pad-right label name-len)
+                     (make-string (* (- 3 level) 2) #\space)
+                     (pad-left (round (inexact->exact n)) len)
                      n-extra
                      units
                      extra))
       (define (ht->sorted-list ht)
         (list-sort (lambda (a b) (< (cdr a) (cdr b)))
                    (hash-table-map ht cons)))
-      (for-each (lambda (p)
-                  (let ([label (car p)]
-                        [n (cdr p)])
-                    (report label n
-                            (chez:format " [~a]" (pad (hashtable-ref region-gc-times label 0) gc-len))
-                            'ms
-                            (let ([c (hashtable-ref region-counts label 0)])
-                              (if (zero? c)
-                                  ""
-                                  (chez:format " ; ~a times" c))))))
-                (ht->sorted-list region-times))
-      (report 'total total (#%format " [~a]" gc-total) 'ms "")
+      (define (sum-values ht keys key subs)
+        (define sub-ht (make-eq-hashtable))
+        (hashtable-set! subs key sub-ht)
+        (let loop ([keys keys])
+          (cond
+           [(null? keys) 0]
+           [else
+            (let* ([sub-key (car keys)]
+                   [v (hashtable-ref ht sub-key 0)])
+              (hashtable-set! sub-ht sub-key v)
+              (hashtable-delete! ht sub-key)
+              (+ v (loop (cdr keys))))])))
+      (define (report-time level label n gc-ht)
+        (report level label n
+                (chez:format " [~a]" (pad-left (hashtable-ref gc-ht label 0) gc-len))
+                'ms
+                (let ([c (hashtable-ref region-counts label 0)])
+                  (if (zero? c)
+                      ""
+                      (chez:format " ; ~a times" c)))))
+      (for-each (lambda (l)
+                  (let* ([cat (car l)]
+                         [subs (cadr l)]
+                         [t (sum-values region-times subs cat region-subs)]
+                         [gc-t (sum-values region-gc-times subs cat region-gc-subs)])
+                    (unless (and (zero? t) (zero? gc-t))
+                      (hashtable-set! region-times cat t)
+                      (hashtable-set! region-gc-times cat gc-t))))
+                categories)
+      (let loop ([ht region-times] [gc-ht region-gc-times] [level 0])
+        (for-each (lambda (p)
+                    (let ([label (car p)]
+                          [n (cdr p)])
+                      (report-time level label n gc-ht)
+                      (let ([sub-ht (hashtable-ref region-subs label #f)]
+                            [sub-gc-ht (hashtable-ref region-gc-subs label #f)])
+                        (when sub-ht
+                          (loop sub-ht sub-gc-ht (add1 level))))))
+                  (ht->sorted-list ht)))
+      (report 0 'total total (#%format " [~a]" gc-total) 'ms "")
       (chez:printf ";;\n")
-      (for-each (lambda (p) (report (car p) (/ (cdr p) 1024 1024) "" 'MB ""))
+      (for-each (lambda (p) (report 0 (car p) (/ (cdr p) 1024 1024) "" 'MB ""))
                 (ht->sorted-list region-memories)))))
diff --git a/racket/src/cs/linklet/read.ss b/racket/src/cs/linklet/read.ss
index 11ac2711e9..e21fc42a29 100644
--- a/racket/src/cs/linklet/read.ss
+++ b/racket/src/cs/linklet/read.ss
@@ -1,6 +1,6 @@
 (define (read-compiled-linklet in)
   (performance-region
-   'read
+   'read-bundle
    (read-compiled-linklet-or-directory in #t)))
 
 (define (read-compiled-linklet-or-directory in initial?)
diff --git a/racket/src/cs/rumble/foreign.ss b/racket/src/cs/rumble/foreign.ss
index 38f6f1a63f..9167ccfbc4 100644
--- a/racket/src/cs/rumble/foreign.ss
+++ b/racket/src/cs/rumble/foreign.ss
@@ -1407,7 +1407,7 @@
                         (weak-hash-ref ffi-expr->code expr #f))]
                    [code (if wb (car wb) #!bwp)])
               (if (eq? code #!bwp)
-                  (let ([code (eval/foreign expr (if call? 'comp-ffi 'comp-ffi-back))])
+                  (let ([code (eval/foreign expr (if call? 'comp-ffi-call 'comp-ffi-back))])
                     (hashtable-set! ffi-code->expr (car code) expr)
                     (with-interrupts-disabled
                      (weak-hash-set! ffi-expr->code expr (weak-cons code #f)))
diff --git a/racket/src/expander/namespace/module.rkt b/racket/src/expander/namespace/module.rkt
index 586e7c389f..860a3ddac7 100644
--- a/racket/src/expander/namespace/module.rkt
+++ b/racket/src/expander/namespace/module.rkt
@@ -372,7 +372,9 @@
                                        #:seen [seen #hasheq()])
   (unless (module-path-index? mpi)
     (error "not a module path index:" mpi))
-  (define name (module-path-index-resolve mpi #t))
+  (define name (performance-region
+                ['eval 'resolve]
+                (module-path-index-resolve mpi #t)))
   (define m (namespace->module ns name))
   (unless m (raise-unknown-module-error 'instantiate name))
   (define (instantiate! instance-phase run-phase ns)
diff --git a/racket/src/foreign/foreign.rktc b/racket/src/foreign/foreign.rktc
index 147fa70a53..54da9c1636 100755
--- a/racket/src/foreign/foreign.rktc
+++ b/racket/src/foreign/foreign.rktc
@@ -2957,7 +2957,7 @@ static Scheme_Object *ffi_call_or_curry(const char *who, int curry, int argc, Sc
   scheme_register_finalizer(data, free_fficall_data, cif, NULL, NULL);
   a[0] = data;
 
-  scheme_performance_record_end("comp-ffi", &perf_state);
+  scheme_performance_record_end("comp-ffi-call", &perf_state);
 
   if (curry) {
     return scheme_make_prim_closure_w_arity(make_ffi_call_from_curried, 
diff --git a/racket/src/racket/src/linklet.c b/racket/src/racket/src/linklet.c
index 4fcf2099b0..3d363582ea 100644
--- a/racket/src/racket/src/linklet.c
+++ b/racket/src/racket/src/linklet.c
@@ -1741,6 +1741,26 @@ typedef struct {
 
 static Performance_Entry perf_entries[MAX_PERF_ENTRIES];
 
+#define MAX_PERF_CATS    3
+#define MAX_PERF_SUBS    3
+
+typedef struct {
+  const char *name;
+  Performance_Entry perf_entries[MAX_PERF_SUBS];
+  int perf_count;
+} Performance_Cat;
+
+typedef struct {
+  const char *entry;
+  const char *cat;
+} Performace_Recat;
+
+static Performace_Recat recats[] = { { "instantiate", "run" },
+                                     { "jit", "run" },
+                                     { "comp-ffi-call", "comp-ffi" },
+                                     { "comp-ffi-back", "comp-ffi" },
+                                     { NULL, NULL} };
+
 static char *do_tab(int len, char *tab, int max_len)
 {
   int i;
@@ -1778,7 +1798,7 @@ static char *tab_string(const char *s, char *tab, int max_len)
   return do_tab(strlen(s), tab, max_len);
 }
 
-static void sort_perf(int lo, int hi)
+static void sort_perf(Performance_Entry *pref_entries, int lo, int hi)
 {
   int i, pivot;
   
@@ -1796,26 +1816,66 @@ static void sort_perf(int lo, int hi)
     }
   }
 
-  sort_perf(lo, pivot);
-  sort_perf(pivot+1, hi);
+  sort_perf(perf_entries, lo, pivot);
+  sort_perf(perf_entries, pivot+1, hi);
 }
 
-static void show_perf()
+static void show_perf(Performance_Entry *perf_entries, int perf_count,
+                      int len, int name_len,
+                      int depth)
 {
   intptr_t total = 0, gc_total = 0;
-  int i, name_len = 0, len, gc_len;
-  char name_tab[16], tab[10], gc_tab[10];
+  int i, j, k, m, n, gc_len;
+  char name_tab[16], tab[10], gc_tab[10], pre_indent[8], post_indent[8];
+  Performance_Cat cats[MAX_PERF_CATS];
+  int num_cats = 0;
 
-  sort_perf(0, perf_count);
+  memset(cats, 0, sizeof(cats));
+
+  if (!depth) {
+    for (i = 0; i < perf_count; i++) {
+      for (j = 0; recats[j].entry; j++) {
+        if (!strcmp(recats[j].entry, perf_entries[i].name)) {
+          for (m = 0; m < num_cats; m++) {
+            if (!strcmp(recats[j].cat, cats[m].name))
+              break;
+          }
+          if (num_cats <= m) num_cats = m+1;
+          cats[m].name = recats[j].cat;
+          for (k = 0; k < perf_count; k++) {
+            if (perf_entries[k].name) {
+              if (!strcmp(perf_entries[k].name, recats[j].cat))
+                break;
+            } else
+              break;
+          }
+          perf_entries[k].name = recats[j].cat;
+          if (perf_count <= k) perf_count = k+1;
+          perf_entries[k].accum += perf_entries[i].accum;
+          perf_entries[k].gc_accum += perf_entries[i].gc_accum;
+          perf_entries[k].count += perf_entries[i].count;
+
+          n = cats[m].perf_count++;
+          cats[m].perf_entries[n] = perf_entries[i];
+          perf_entries[i].accum = 0;
+          perf_entries[i].gc_accum = 0;
+          perf_entries[i].count = 0;
+        }
+      }
+    }
+  }
+
+  sort_perf(perf_entries, 0, perf_count);
 
   for (i = 0; i < perf_count; i++) {
-    len = strlen(perf_entries[i].name);
-    if (len > name_len) name_len = len;
+    n = strlen(perf_entries[i].name);
+    if (n > name_len) name_len = n;
     total += perf_entries[i].accum;
     gc_total += perf_entries[i].gc_accum;
   }
 
-  len = numlen(total);
+  n = numlen(total);
+  if (n > len) len = n;
   gc_len = numlen(gc_total);
 
   if (name_len >= sizeof(name_tab))
@@ -1824,24 +1884,47 @@ static void show_perf()
     len = sizeof(tab) - 1;
   if (gc_len >= sizeof(gc_tab))
     gc_len = sizeof(gc_tab) -1;
+
+  for (i = 0; i < depth * 2; i++) {
+    pre_indent[i] = ' ';
+  }
+  pre_indent[i] = 0;
+  for (i = 0; i < (3 - depth) * 2; i++) {
+    post_indent[i] = ' ';
+  }
+  post_indent[i] = 0;
   
   for (i = 0; i < perf_count; i++) {
-    fprintf(stderr, ";; %s%s:  %s%"PRIdPTR " [%s%"PRIdPTR"] ms ; %"PRIdPTR" times\n",
-            tab_string(perf_entries[i].name, name_tab, name_len),
-            perf_entries[i].name,
-            tab_number(perf_entries[i].accum, tab, len),
-            perf_entries[i].accum,
-            tab_number(perf_entries[i].gc_accum, gc_tab, gc_len),
-            perf_entries[i].gc_accum,
-            perf_entries[i].count);
+    if (perf_entries[i].count)
+      fprintf(stderr, ";; %s%s%s%s  %s%"PRIdPTR " [%s%"PRIdPTR"] ms ; %"PRIdPTR" times\n",
+              pre_indent,
+              perf_entries[i].name,
+              tab_string(perf_entries[i].name, name_tab, name_len),
+              post_indent,
+              tab_number(perf_entries[i].accum, tab, len),
+              perf_entries[i].accum,
+              tab_number(perf_entries[i].gc_accum, gc_tab, gc_len),
+              perf_entries[i].gc_accum,
+              perf_entries[i].count);
+    for (m = 0; m < num_cats; m++) {
+      if (!strcmp(perf_entries[i].name, cats[m].name))
+        show_perf(cats[m].perf_entries, cats[m].perf_count, len, name_len, depth+1);
+    }
   }
 
-  fprintf(stderr, ";; %stotal:  %s%"PRIdPTR " [%s%"PRIdPTR"] ms\n",
-          tab_string("total", name_tab, name_len),
-          tab_number(total, tab, len),
-          total,
-          tab_number(gc_total, gc_tab, gc_len),
-          gc_total);
+  if (!depth)
+    fprintf(stderr, ";; %stotal%s  %s%"PRIdPTR " [%s%"PRIdPTR"] ms\n",
+            tab_number(total, tab, len),
+            tab_string("total", name_tab, name_len),
+            post_indent,
+            total,
+            tab_number(gc_total, gc_tab, gc_len),
+            gc_total);
+}
+
+static void show_all_perf()
+{
+  return show_perf(perf_entries, perf_count, 0, 0, 0);
 }
 
 void scheme_performance_record_start(GC_CAN_IGNORE Scheme_Performance_State *perf_state)
@@ -1854,7 +1937,7 @@ void scheme_performance_record_start(GC_CAN_IGNORE Scheme_Performance_State *per
   if (!perf_reg) {
     if (scheme_getenv("PLT_LINKLET_TIMES")) {
       perf_reg = 1;
-      scheme_atexit(show_perf);
+      scheme_atexit(show_all_perf);
     } else {
       perf_reg = -1;
     }
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 8ab060144a..e4894e6b57 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -13502,7 +13502,7 @@ static const char *startup_source =
 "(void)"
 "                                        (let-values () (error \"not a module path index:\" mpi_16)))"
 "(values))))"
-"(let-values(((name_33)(1/module-path-index-resolve mpi_16 #t)))"
+"(let-values(((name_33)(let-values()(1/module-path-index-resolve mpi_16 #t))))"
 "(let-values(((m_8)(namespace->module ns_29 name_33)))"
 "(let-values((()"
 "(begin"
@@ -43105,17 +43105,19 @@ static const char *startup_source =
 "(1/current-namespace)"
 " dest-namespace1_0)))"
 "(let-values()"
-"(let-values(((temp20_2) 'namespace-attach-module)"
-"((src-namespace21_0) src-namespace_0)"
-"((mod-path22_0) mod-path_10)"
-"((dest-namespace23_0) dest-namespace_0)"
-"((temp24_5) #t))"
+"(let-values()"
+"(let-values()"
+"(let-values(((who21_0) 'namespace-attach-module)"
+"((src-namespace22_0) src-namespace_0)"
+"((mod-path23_0) mod-path_10)"
+"((dest-namespace24_0) dest-namespace_0)"
+"((temp25_5) #t))"
 "(do-attach-module17.1"
-" temp24_5"
-" temp20_2"
-" src-namespace21_0"
-" mod-path22_0"
-" dest-namespace23_0))))))))))"
+" temp25_5"
+" who21_0"
+" src-namespace22_0"
+" mod-path23_0"
+" dest-namespace24_0))))))))))))"
 "(case-lambda"
 "((src-namespace_1 mod-path_11)"
 "(begin 'namespace-attach-module(namespace-attach-module4_0 src-namespace_1 mod-path_11 unsafe-undefined)))"
@@ -43128,30 +43130,32 @@ static const char *startup_source =
 "(begin"
 " 'namespace-attach-module-declaration9"
 "(let-values(((src-namespace_3) src-namespace7_0))"
-"(let-values(((mod-path_13) mod-path8_2))"
+"(let-values(((mod-path_6) mod-path8_2))"
 "(let-values(((dest-namespace_1)"
 "(if(eq? dest-namespace6_0 unsafe-undefined)"
 "(1/current-namespace)"
 " dest-namespace6_0)))"
 "(let-values()"
-"(let-values(((temp25_5) 'namespace-attach-module-declaration)"
-"((src-namespace26_0) src-namespace_3)"
-"((mod-path27_0) mod-path_13)"
-"((dest-namespace28_0) dest-namespace_1)"
-"((temp29_2) #f))"
+"(let-values()"
+"(let-values()"
+"(let-values(((who27_0) 'namespace-attach-module-declaration)"
+"((src-namespace28_0) src-namespace_3)"
+"((mod-path29_0) mod-path_6)"
+"((dest-namespace30_0) dest-namespace_1)"
+"((temp31_2) #f))"
 "(do-attach-module17.1"
-" temp29_2"
-" temp25_5"
-" src-namespace26_0"
-" mod-path27_0"
-" dest-namespace28_0))))))))))"
+" temp31_2"
+" who27_0"
+" src-namespace28_0"
+" mod-path29_0"
+" dest-namespace30_0))))))))))))"
 "(case-lambda"
-"((src-namespace_4 mod-path_14)"
+"((src-namespace_4 mod-path_13)"
 "(begin"
 " 'namespace-attach-module-declaration"
-"(namespace-attach-module-declaration9_0 src-namespace_4 mod-path_14 unsafe-undefined)))"
-"((src-namespace_5 mod-path_15 dest-namespace6_1)"
-"(namespace-attach-module-declaration9_0 src-namespace_5 mod-path_15 dest-namespace6_1)))))"
+"(namespace-attach-module-declaration9_0 src-namespace_4 mod-path_13 unsafe-undefined)))"
+"((src-namespace_5 mod-path_14 dest-namespace6_1)"
+"(namespace-attach-module-declaration9_0 src-namespace_5 mod-path_14 dest-namespace6_1)))))"
 "(define-values"
 "(do-attach-module17.1)"
 "(lambda(attach-instances?11_0 who13_0 src-namespace14_0 mod-path15_0 dest-namespace16_0)"
@@ -43159,7 +43163,7 @@ static const char *startup_source =
 " 'do-attach-module17"
 "(let-values(((who_22) who13_0))"
 "(let-values(((src-namespace_6) src-namespace14_0))"
-"(let-values(((mod-path_16) mod-path15_0))"
+"(let-values(((mod-path_15) mod-path15_0))"
 "(let-values(((dest-namespace_2) dest-namespace16_0))"
 "(let-values(((attach-instances?_0) attach-instances?11_0))"
 "(let-values()"
@@ -43171,14 +43175,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_53)(1/module-path? mod-path_16)))"
-"(if or-part_53 or-part_53(1/resolved-module-path? mod-path_16)))"
+"(if(let-values(((or-part_7)(1/module-path? mod-path_15)))"
+"(if or-part_7 or-part_7(1/resolved-module-path? mod-path_15)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " who_22"
 "                                         \"(or/c module-path? resolved-module-path?)\""
-" mod-path_16)))"
+" mod-path_15)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -43201,12 +43205,12 @@ static const char *startup_source =
 "(namespace-phase dest-namespace_2))))"
 "(values))))"
 "(let-values(((todo_0)(make-hasheq)))"
-"(let-values(((missing_0)(gensym 'missing)))"
+"(let-values(((missing_0) '#:missing))"
 "(let-values((()"
 "(begin"
 "((letrec-values(((loop_97)"
 "(lambda(mpi_45"
-" phase_132"
+" phase_93"
 " attach-instances?_1"
 " attach-phase_0)"
 "(begin"
@@ -43225,7 +43229,7 @@ static const char *startup_source =
 " mpi_45)))))"
 "(let-values(((attach-this-instance?_0)"
 "(if attach-instances?_1"
-"(eqv? phase_132 attach-phase_0)"
+"(eqv? phase_93 attach-phase_0)"
 " #f)))"
 "(let-values(((m-ns_12)"
 "(hash-ref"
@@ -43233,12 +43237,12 @@ static const char *startup_source =
 " todo_0"
 " mod-name_19"
 " '#hasheqv())"
-" phase_132"
+" phase_93"
 " missing_0)))"
-"(if(let-values(((or-part_164)"
+"(if(let-values(((or-part_165)"
 "(eq? missing_0 m-ns_12)))"
-"(if or-part_164"
-" or-part_164"
+"(if or-part_165"
+" or-part_165"
 "(if attach-this-instance?_0"
 "(not m-ns_12)"
 " #f)))"
@@ -43259,9 +43263,8 @@ static const char *startup_source =
 "(if(if(module-cross-phase-persistent?"
 " m_20)"
 "(if(not"
-"(label-phase? phase_132))"
-"(not"
-"(zero-phase? phase_132))"
+"(label-phase? phase_93))"
+"(not(zero-phase? phase_93))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -43301,19 +43304,19 @@ static const char *startup_source =
 " m_20)))"
 "(let-values()"
 "(let-values(((m-ns_14)"
-"(let-values(((src-namespace30_0)"
+"(let-values(((src-namespace32_0)"
 " src-namespace_6)"
-"((mod-name31_0)"
+"((mod-name33_0)"
 " mod-name_19)"
-"((phase32_1)"
-" phase_132))"
+"((phase34_1)"
+" phase_93))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
 " unsafe-undefined"
-" src-namespace30_0"
-" mod-name31_0"
-" phase32_1))))"
+" src-namespace32_0"
+" mod-name33_0"
+" phase34_1))))"
 "(let-values((()"
 "(begin"
 "(if m-ns_14"
@@ -43327,19 +43330,19 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((already-m-ns_0)"
 "(if already-m_0"
-"(let-values(((dest-namespace33_0)"
+"(let-values(((dest-namespace35_0)"
 " dest-namespace_2)"
-"((mod-name34_0)"
+"((mod-name36_0)"
 " mod-name_19)"
-"((phase35_1)"
-" phase_132))"
+"((phase37_1)"
+" phase_93))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
 " unsafe-undefined"
-" dest-namespace33_0"
-" mod-name34_0"
-" phase35_1))"
+" dest-namespace35_0"
+" mod-name36_0"
+" phase37_1))"
 " #f)))"
 "(begin"
 "(if(if already-m-ns_0"
@@ -43368,21 +43371,21 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(if(if(label-phase?"
-" phase_132)"
+" phase_93)"
 "(not"
-"(let-values(((src-namespace36_0)"
+"(let-values(((src-namespace38_0)"
 " src-namespace_6)"
-"((mod-name37_0)"
+"((mod-name39_0)"
 " mod-name_19)"
-"((phase38_0)"
-" phase_132))"
+"((phase40_0)"
+" phase_93))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
 " unsafe-undefined"
-" src-namespace36_0"
-" mod-name37_0"
-" phase38_0)))"
+" src-namespace38_0"
+" mod-name39_0"
+" phase40_0)))"
 " #f)"
 "(let-values()"
 "(with-continuation-mark"
@@ -43394,20 +43397,20 @@ static const char *startup_source =
 " 1/current-namespace"
 " src-namespace_6)"
 "(let-values()"
-"(let-values(((src-namespace39_0)"
+"(let-values(((src-namespace41_0)"
 " src-namespace_6)"
-"((mpi40_0)"
+"((mpi42_0)"
 " mpi_45)"
-"((phase41_1)"
-" phase_132))"
+"((phase43_1)"
+" phase_93))"
 "(namespace-module-instantiate!96.1"
 " #t"
 " unsafe-undefined"
 " unsafe-undefined"
 " #f"
-" src-namespace39_0"
-" mpi40_0"
-" phase41_1)))))"
+" src-namespace41_0"
+" mpi42_0"
+" phase43_1)))))"
 "(void))"
 "(values"
 " #f"
@@ -43421,7 +43424,7 @@ static const char *startup_source =
 "(lambda(ht_144)"
 "(hash-set"
 " ht_144"
-" phase_132"
+" phase_93"
 " m-ns_13))"
 " '#hasheqv())"
 "(if already?_0"
@@ -43439,19 +43442,19 @@ static const char *startup_source =
 "(check-list"
 " lst_298)))"
 "((letrec-values(((for-loop_262)"
-"(lambda(lst_299)"
+"(lambda(lst_97)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_299)"
+" lst_97)"
 "(let-values(((phase+reqs_1)"
 "(unsafe-car"
-" lst_299))"
-"((rest_171)"
+" lst_97))"
+"((rest_46)"
 "(unsafe-cdr"
-" lst_299)))"
+" lst_97)))"
 "(let-values((()"
-"(let-values(((lst_225)"
+"(let-values(((lst_178)"
 "(cdr"
 " phase+reqs_1)))"
 "(begin"
@@ -43460,19 +43463,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_225)))"
-"((letrec-values(((for-loop_99)"
-"(lambda(lst_178)"
+" lst_178)))"
+"((letrec-values(((for-loop_249)"
+"(lambda(lst_10)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_178)"
+" lst_10)"
 "(let-values(((req_5)"
 "(unsafe-car"
-" lst_178))"
-"((rest_172)"
+" lst_10))"
+"((rest_1)"
 "(unsafe-cdr"
-" lst_178)))"
+" lst_10)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -43486,7 +43489,7 @@ static const char *startup_source =
 " m_20)"
 " mpi_45)"
 "(phase+"
-" phase_132"
+" phase_93"
 "(car"
 " phase+reqs_1))"
 " attach-instances?_1"
@@ -43495,22 +43498,22 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_99"
-" rest_172)"
+"(for-loop_249"
+" rest_1)"
 "(values))))"
 "(values))))))"
-" for-loop_99)"
-" lst_225)))))"
+" for-loop_249)"
+" lst_178)))))"
 "(if(not"
 " #f)"
 "(for-loop_262"
-" rest_171)"
+" rest_46)"
 "(values))))"
 "(values))))))"
 " for-loop_262)"
 " lst_298)))"
 "(void)"
-"(let-values(((lst_276)"
+"(let-values(((lst_164)"
 "(module-submodule-names"
 " m_20)))"
 "(begin"
@@ -43519,19 +43522,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_276)))"
-"((letrec-values(((for-loop_100)"
-"(lambda(lst_164)"
+" lst_164)))"
+"((letrec-values(((for-loop_18)"
+"(lambda(lst_299)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_164)"
+" lst_299)"
 "(let-values(((submod-name_0)"
 "(unsafe-car"
-" lst_164))"
-"((rest_95)"
+" lst_299))"
+"((rest_96)"
 "(unsafe-cdr"
-" lst_164)))"
+" lst_299)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -43552,12 +43555,12 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_100"
-" rest_95)"
+"(for-loop_18"
+" rest_96)"
 "(values))))"
 "(values))))))"
-" for-loop_100)"
-" lst_276)))"
+" for-loop_18)"
+" lst_164)))"
 "(void)"
 "(if(module-supermodule-name"
 " m_20)"
@@ -43574,9 +43577,9 @@ static const char *startup_source =
 "(void)))))))))"
 " loop_97)"
 "(1/module-path-index-join"
-"(if(1/resolved-module-path? mod-path_16)"
-"(resolved-module-path->module-path mod-path_16)"
-" mod-path_16)"
+"(if(1/resolved-module-path? mod-path_15)"
+"(resolved-module-path->module-path mod-path_15)"
+" mod-path_15)"
 " #f)"
 " phase_131"
 " attach-instances?_0"
@@ -43590,14 +43593,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_145)))"
 "((letrec-values(((for-loop_263)"
-"(lambda(i_164)"
+"(lambda(i_30)"
 "(begin"
 " 'for-loop"
-"(if i_164"
+"(if i_30"
 "(let-values(((mod-name_20 phases_0)"
 "(hash-iterate-key+value"
 " ht_145"
-" i_164)))"
+" i_30)))"
 "(let-values((()"
 "(let-values(((ht_146)"
 " phases_0))"
@@ -43608,16 +43611,16 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash"
 " ht_146)))"
-"((letrec-values(((for-loop_253)"
-"(lambda(i_46)"
+"((letrec-values(((for-loop_264)"
+"(lambda(i_37)"
 "(begin"
 " 'for-loop"
-"(if i_46"
-"(let-values(((phase_133"
+"(if i_37"
+"(let-values(((phase_76"
 " m-ns_15)"
 "(hash-iterate-key+value"
 " ht_146"
-" i_46)))"
+" i_37)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -43641,44 +43644,44 @@ static const char *startup_source =
 " 1/current-namespace"
 " dest-namespace_2)"
 "(let-values()"
-"(let-values(((dest-namespace42_0)"
+"(let-values(((dest-namespace44_0)"
 " dest-namespace_2)"
-"((m43_0)"
+"((m45_0)"
 " m_21)"
-"((mod-name44_0)"
+"((mod-name46_0)"
 " mod-name_20))"
 "(declare-module!58.1"
 " #t"
-" dest-namespace42_0"
-" m43_0"
-" mod-name44_0))))"
+" dest-namespace44_0"
+" m45_0"
+" mod-name46_0))))"
 "(if m-ns_15"
 "(let-values()"
 "(begin"
 "(namespace-record-module-instance-attached!"
 " src-namespace_6"
 " mod-name_20"
-" phase_133)"
-"(let-values(((or-part_25)"
-"(let-values(((dest-namespace45_0)"
+" phase_76)"
+"(let-values(((or-part_69)"
+"(let-values(((dest-namespace47_0)"
 " dest-namespace_2)"
-"((mod-name46_0)"
+"((mod-name48_0)"
 " mod-name_20)"
-"((phase47_2)"
-" phase_133))"
+"((phase49_1)"
+" phase_76))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
 " unsafe-undefined"
-" dest-namespace45_0"
-" mod-name46_0"
-" phase47_2))))"
-"(if or-part_25"
-" or-part_25"
+" dest-namespace47_0"
+" mod-name48_0"
+" phase49_1))))"
+"(if or-part_69"
+" or-part_69"
 "(namespace-install-module-namespace!"
 " dest-namespace_2"
 " mod-name_20"
-" phase_133"
+" phase_76"
 " m_21"
 " m-ns_15)))))"
 "(void)))))"
@@ -43686,18 +43689,18 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_253"
+"(for-loop_264"
 "(hash-iterate-next"
 " ht_146"
-" i_46))"
+" i_37))"
 "(values))))"
 "(values))))))"
-" for-loop_253)"
+" for-loop_264)"
 "(hash-iterate-first"
 " ht_146))))))"
 "(if(not #f)"
 "(for-loop_263"
-"(hash-iterate-next ht_145 i_164))"
+"(hash-iterate-next ht_145 i_30))"
 "(values))))"
 "(values))))))"
 " for-loop_263)"
@@ -43718,13 +43721,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_147)))"
-"((letrec-values(((for-loop_264)"
-"(lambda(i_21)"
+"((letrec-values(((for-loop_265)"
+"(lambda(i_164)"
 "(begin"
 " 'for-loop"
-"(if i_21"
+"(if i_164"
 "(let-values(((mod-name_21)"
-"(hash-iterate-key ht_147 i_21)))"
+"(hash-iterate-key ht_147 i_164)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -43737,11 +43740,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_264"
-"(hash-iterate-next ht_147 i_21))"
+"(for-loop_265"
+"(hash-iterate-next ht_147 i_164))"
 "(values))))"
 "(values))))))"
-" for-loop_264)"
+" for-loop_265)"
 "(hash-iterate-first ht_147))))"
 "(void))))))))))))))))))))))))"
 "(define-values"
@@ -44920,9 +44923,9 @@ static const char *startup_source =
 "(let-values(((ctx_69)"
 "(let-values(((ns132_0) ns_106)((observer133_0) observer_5))"
 "(make-expand-context10.1 #f observer133_0 #f ns132_0))))"
-"(let-values(((phase_134)(namespace-phase ns_106)))"
+"(let-values(((phase_132)(namespace-phase ns_106)))"
 "((letrec-values(((loop_99)"
-"(lambda(s_462 phase_135 ns_107 as-tail?_7)"
+"(lambda(s_462 phase_133 ns_107 as-tail?_7)"
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
@@ -44936,7 +44939,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_72)"
 "(let-values(((phase135_1)"
-" phase_135)"
+" phase_133)"
 "((namespace136_0)"
 " ns_107)"
 "((just-once?137_0)"
@@ -45057,7 +45060,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_74)"
 "(let-values(((phase141_0)"
-" phase_135)"
+" phase_133)"
 "((namespace142_0)"
 " ns_107))"
 "(expand-context/inner2.1"
@@ -45160,7 +45163,7 @@ static const char *startup_source =
 " require-lifts_5"
 " lifts_12))"
 "((exp-s144_0) exp-s_7)"
-"((phase145_0) phase_135))"
+"((phase145_0) phase_133))"
 "(wrap-lifts-as-begin16.1"
 " unsafe-undefined"
 " unsafe-undefined"
@@ -45183,7 +45186,7 @@ static const char *startup_source =
 " new-s_3"
 "(loop_99"
 " new-s_3"
-" phase_135"
+" phase_133"
 " ns_107"
 " as-tail?_7)))))"
 "(if(not single_0)"
@@ -45207,7 +45210,7 @@ static const char *startup_source =
 "(let-values(((tmp_35)"
 "(core-form-sym"
 " disarmed-exp-s_0"
-" phase_135)))"
+" phase_133)))"
 "(if(equal? tmp_35 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -45294,7 +45297,7 @@ static const char *startup_source =
 "(let-values()"
 "(loop_99"
 "(car es_2)"
-" phase_135"
+" phase_133"
 " ns_107"
 " as-tail?_7))"
 "(let-values()"
@@ -45316,14 +45319,14 @@ static const char *startup_source =
 "(loop_99"
 "(car"
 " es_2)"
-" phase_135"
+" phase_133"
 " ns_107"
 " #f)"
 "(begin"
 "(loop_99"
 "(car"
 " es_2)"
-" phase_135"
+" phase_133"
 " ns_107"
 " #f)"
 "(void)))))"
@@ -45430,7 +45433,7 @@ static const char *startup_source =
 " begin-for-syntax150_1"
 " e151_1))))))"
 "(let-values(((next-phase_0)"
-"(add1 phase_135)))"
+"(add1 phase_133)))"
 "(let-values(((next-ns_0)"
 "(namespace->namespace-at-phase"
 " ns_107"
@@ -45472,7 +45475,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_208)))"
-"((letrec-values(((for-loop_265)"
+"((letrec-values(((for-loop_266)"
 "(lambda(fold-var_274"
 " lst_301)"
 "(begin"
@@ -45513,12 +45516,12 @@ static const char *startup_source =
 " fold-var_205)))))"
 "(if(not"
 " #f)"
-"(for-loop_265"
+"(for-loop_266"
 " fold-var_257"
 " rest_113)"
 " fold-var_257)))"
 " fold-var_274)))))"
-" for-loop_265)"
+" for-loop_266)"
 " null"
 " lst_208))))))"
 "(if wrap_2"
@@ -45555,7 +45558,7 @@ static const char *startup_source =
 " as-tail?_7))))))))))))))))))"
 " loop_99)"
 " s_216"
-" phase_134"
+" phase_132"
 " ns_106"
 " #t)))))))))))))))))"
 "(define-values"
@@ -45669,7 +45672,7 @@ static const char *startup_source =
 "(make-parse-top-lifted-require)"
 "(lambda(ns_110)"
 "(begin"
-"(lambda(s_347 phase_136)"
+"(lambda(s_347 phase_134)"
 "(let-values(((ok?_31 #%require161_0 req162_0)"
 "(let-values(((s_470)(syntax-disarm$1 s_347)))"
 "(let-values(((orig-s_35) s_470))"
@@ -45707,8 +45710,8 @@ static const char *startup_source =
 "(let-values(((temp166_0)(list req162_0))"
 "((s167_0) s_347)"
 "((ns168_0) ns_110)"
-"((phase169_1) phase_136)"
-"((phase170_0) phase_136)"
+"((phase169_1) phase_134)"
+"((phase170_0) phase_134)"
 "((temp171_1)(let-values(((temp173_0) #f))(make-requires+provides8.1 #f temp173_0)))"
 "((temp172_0) 'require))"
 "(parse-and-perform-requires!30.1"
@@ -45746,13 +45749,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_302)))"
-"((letrec-values(((for-loop_266)"
+"((letrec-values(((for-loop_267)"
 "(lambda(fold-var_276 lst_303)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_303)"
 "(let-values(((req_19)(unsafe-car lst_303))"
-"((rest_173)(unsafe-cdr lst_303)))"
+"((rest_171)(unsafe-cdr lst_303)))"
 "(let-values(((fold-var_277)"
 "(let-values(((fold-var_278) fold-var_276))"
 "(let-values(((fold-var_279)"
@@ -45762,9 +45765,9 @@ static const char *startup_source =
 "(parsed-require23.1 req_19))"
 " fold-var_278))))"
 "(values fold-var_279)))))"
-"(if(not #f)(for-loop_266 fold-var_277 rest_173) fold-var_277)))"
+"(if(not #f)(for-loop_267 fold-var_277 rest_171) fold-var_277)))"
 " fold-var_276)))))"
-" for-loop_266)"
+" for-loop_267)"
 " null"
 " lst_302))))"
 "(reverse$1"
@@ -45773,13 +45776,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_304)))"
-"((letrec-values(((for-loop_267)"
+"((letrec-values(((for-loop_268)"
 "(lambda(fold-var_280 lst_305)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_305)"
 "(let-values(((ids+syms+rhs_0)(unsafe-car lst_305))"
-"((rest_174)(unsafe-cdr lst_305)))"
+"((rest_172)(unsafe-cdr lst_305)))"
 "(let-values(((fold-var_281)"
 "(let-values(((fold-var_282) fold-var_280))"
 "(let-values(((fold-var_283)"
@@ -45823,9 +45826,9 @@ static const char *startup_source =
 " dv_0)))))"
 " fold-var_282))))"
 "(values fold-var_283)))))"
-"(if(not #f)(for-loop_267 fold-var_281 rest_174) fold-var_281)))"
+"(if(not #f)(for-loop_268 fold-var_281 rest_172) fold-var_281)))"
 " fold-var_280)))))"
-" for-loop_267)"
+" for-loop_268)"
 " null"
 " lst_304)))))"
 " exp-s_9))))))))))"
@@ -46016,7 +46019,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_149)))"
-"((letrec-values(((for-loop_268)"
+"((letrec-values(((for-loop_269)"
 "(lambda(result_117 i_166)"
 "(begin"
 " 'for-loop"
@@ -46048,12 +46051,12 @@ static const char *startup_source =
 "(if(if(not((lambda x_82(not result_118)) k_36 v_3))"
 "(not #f)"
 " #f)"
-"(for-loop_268"
+"(for-loop_269"
 " result_118"
 "(hash-iterate-next ht_149 i_166))"
 " result_118)))"
 " result_117)))))"
-" for-loop_268)"
+" for-loop_269)"
 " #t"
 "(hash-iterate-first ht_149))))"
 " #f))))))"
@@ -46084,7 +46087,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_150)))"
-"((letrec-values(((for-loop_269)"
+"((letrec-values(((for-loop_270)"
 "(lambda(table_208 i_167)"
 "(begin"
 " 'for-loop"
@@ -46105,10 +46108,10 @@ static const char *startup_source =
 " val_77)))))"
 "(values table_210)))))"
 "(if(not #f)"
-"(for-loop_269 table_209(hash-iterate-next ht_150 i_167))"
+"(for-loop_270 table_209(hash-iterate-next ht_150 i_167))"
 " table_209)))"
 " table_208)))))"
-" for-loop_269)"
+" for-loop_270)"
 " '#hash()"
 "(hash-iterate-first ht_150)))))))))"
 " l_8)))))))"
@@ -46399,7 +46402,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns30_2) ns_114)"
 "((mpi31_0) mpi_46)"
-"((phase32_2) phase_110)"
+"((phase32_1) phase_110)"
 "((phase33_1) phase_110)"
 "((temp34_4) #f))"
 "(namespace-module-instantiate!96.1"
@@ -46409,7 +46412,7 @@ static const char *startup_source =
 " #f"
 " ns30_2"
 " mpi31_0"
-" phase32_2))"
+" phase32_1))"
 "(values))))"
 "(let-values(((ex-mod-name_0)"
 "(1/module-path-index-resolve"
@@ -46514,17 +46517,17 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns39_0)"
 " ns_114)"
-"((mpi40_1)"
+"((mpi40_0)"
 " mpi_46)"
-"((phase41_2)"
+"((phase41_1)"
 " phase_110)"
 "((phase42_0)"
 " phase_110))"
 "(namespace-module-visit!104.1"
 " phase42_0"
 " ns39_0"
-" mpi40_1"
-" phase41_2))"
+" mpi40_0"
+" phase41_1))"
 "(values))))"
 "(let-values(((t_58)"
 "(namespace-get-transformer"
@@ -46542,12 +46545,12 @@ static const char *startup_source =
 " #t"
 " unsafe-undefined"
 " ns43_0))))"
-"(let-values(((mod-path_17)"
+"(let-values(((mod-path_16)"
 "(resolved-module-path->module-path"
 " mod-name_22)))"
 "(begin"
 "(1/namespace-require"
-" mod-path_17"
+" mod-path_16"
 " tmp-ns_0)"
 "(with-continuation-mark"
 " parameterization-key"
@@ -46562,8 +46565,8 @@ static const char *startup_source =
 " sym_71"
 " tmp-ns_0))))))))))))))))))))))))))))))))))))))))))))))))"
 "(case-lambda"
-"((who_25 mod-path_18 sym_88)(begin(do-dynamic-require5_0 who_25 mod-path_18 sym_88 unsafe-undefined)))"
-"((who_26 mod-path_19 sym_89 fail-k1_1)(do-dynamic-require5_0 who_26 mod-path_19 sym_89 fail-k1_1)))))"
+"((who_25 mod-path_17 sym_88)(begin(do-dynamic-require5_0 who_25 mod-path_17 sym_88 unsafe-undefined)))"
+"((who_26 mod-path_18 sym_89 fail-k1_1)(do-dynamic-require5_0 who_26 mod-path_18 sym_89 fail-k1_1)))))"
 " (define-values (default-dynamic-require-fail-thunk) (lambda () (begin (error \"failed\"))))"
 "(define-values"
 "(1/dynamic-require)"
@@ -46571,7 +46574,7 @@ static const char *startup_source =
 "(lambda(mod-path8_3 sym9_0 fail-k7_0)"
 "(begin"
 " 'dynamic-require10"
-"(let-values(((mod-path_20) mod-path8_3))"
+"(let-values(((mod-path_19) mod-path8_3))"
 "(let-values(((sym_90) sym9_0))"
 "(let-values(((fail-k_3)"
 "(if(eq? fail-k7_0 unsafe-undefined)"
@@ -46579,17 +46582,17 @@ static const char *startup_source =
 " fail-k7_0)))"
 "(let-values()"
 "(let-values()"
-"(let-values()(do-dynamic-require 'dynamic-require mod-path_20 sym_90 fail-k_3)))))))))))"
+"(let-values()(do-dynamic-require 'dynamic-require mod-path_19 sym_90 fail-k_3)))))))))))"
 "(case-lambda"
-"((mod-path_21 sym_91)(begin 'dynamic-require(dynamic-require10_0 mod-path_21 sym_91 unsafe-undefined)))"
-"((mod-path_22 sym_92 fail-k7_1)(dynamic-require10_0 mod-path_22 sym_92 fail-k7_1)))))"
+"((mod-path_20 sym_91)(begin 'dynamic-require(dynamic-require10_0 mod-path_20 sym_91 unsafe-undefined)))"
+"((mod-path_21 sym_92 fail-k7_1)(dynamic-require10_0 mod-path_21 sym_92 fail-k7_1)))))"
 "(define-values"
 "(1/dynamic-require-for-syntax)"
 "(let-values(((dynamic-require-for-syntax15_0)"
 "(lambda(mod-path13_0 sym14_0 fail-k12_0)"
 "(begin"
 " 'dynamic-require-for-syntax15"
-"(let-values(((mod-path_23) mod-path13_0))"
+"(let-values(((mod-path_22) mod-path13_0))"
 "(let-values(((sym_93) sym14_0))"
 "(let-values(((fail-k_4)"
 "(if(eq? fail-k12_0 unsafe-undefined)"
@@ -46608,13 +46611,13 @@ static const char *startup_source =
 "(let-values()"
 "(do-dynamic-require"
 " 'dynamic-require-for-syntax"
-" mod-path_23"
+" mod-path_22"
 " sym_93"
 " fail-k_4)))))))))))))"
 "(case-lambda"
-"((mod-path_24 sym_94)"
-"(begin 'dynamic-require-for-syntax(dynamic-require-for-syntax15_0 mod-path_24 sym_94 unsafe-undefined)))"
-"((mod-path_25 sym_95 fail-k12_1)(dynamic-require-for-syntax15_0 mod-path_25 sym_95 fail-k12_1)))))"
+"((mod-path_23 sym_94)"
+"(begin 'dynamic-require-for-syntax(dynamic-require-for-syntax15_0 mod-path_23 sym_94 unsafe-undefined)))"
+"((mod-path_24 sym_95 fail-k12_1)(dynamic-require-for-syntax15_0 mod-path_24 sym_95 fail-k12_1)))))"
 "(define-values"
 "(1/load)"
 "(lambda(s_0)"
@@ -46934,13 +46937,13 @@ static const char *startup_source =
 " bytes-append"
 "(cons"
 " bstr_1"
-"((letrec-values(((loop_101)"
+"((letrec-values(((loop_97)"
 "(lambda()"
 "(begin"
 " 'loop"
 "(let-values(((bstr_2)(read-bytes 8192 p_56)))"
-"(if(eof-object? bstr_2) null(cons bstr_2(loop_101))))))))"
-" loop_101))))"
+"(if(eof-object? bstr_2) null(cons bstr_2(loop_97))))))))"
+" loop_97))))"
 " bstr_1))))))"
 "(call-with-input-file*61.1 'binary path9_0 temp10_4)))))"
 "(define-values"
@@ -47155,7 +47158,7 @@ static const char *startup_source =
 "                                                            \"\""
 "(apply"
 " string-append"
-"((letrec-values(((loop_102)"
+"((letrec-values(((loop_101)"
 "(lambda(cp_0)"
 "(begin"
 " 'loop"
@@ -47164,8 +47167,8 @@ static const char *startup_source =
 "(list*"
 "(to-string_0(car cp_0))"
 "                                                                                      \"/\""
-"(loop_102(cdr cp_0))))))))"
-" loop_102)"
+"(loop_101(cdr cp_0))))))))"
+" loop_101)"
 " collection-path_3)))))"
 "(letrec-values(((filter_1)"
 "(lambda(f_40 l_82)"
@@ -47313,7 +47316,7 @@ static const char *startup_source =
 "(get-installation-name config-table_1)"
 "                                  \"collects\")"
 " #f)"
-"((letrec-values(((loop_103)"
+"((letrec-values(((loop_102)"
 "(lambda(l_83)"
 "(begin"
 " 'loop"
@@ -47327,9 +47330,9 @@ static const char *startup_source =
 "(cons"
 "(simplify-path"
 "(path->complete-path v_198(current-directory)))"
-"(loop_103(cdr l_83)))"
-"(loop_103(cdr l_83))))))))))"
-" loop_103)"
+"(loop_102(cdr l_83)))"
+"(loop_102(cdr l_83))))))))))"
+" loop_102)"
 "(append"
 " extra-collects-dirs_0"
 "(list(find-system-path 'collects-dir))"
@@ -47588,12 +47591,12 @@ static const char *startup_source =
 "(let-values(((or-part_304) dynamic-require_1))"
 "(if or-part_304"
 " or-part_304"
-"(lambda(mod-path_26 sym_97 failure-k_0)"
+"(lambda(mod-path_25 sym_97 failure-k_0)"
 "                                     (error 'read \"no `dynamic-require` provided\"))))"
 "(let-values(((or-part_178) module-declared?_1))"
 "(if or-part_178"
 " or-part_178"
-"                                   (lambda (mod-path_27) (error 'read \"no `module-declare?` provided\"))))"
+"                                   (lambda (mod-path_26) (error 'read \"no `module-declare?` provided\"))))"
 "(let-values(((or-part_221) coerce_1))"
 "(if or-part_221 or-part_221(lambda(for-syntax?_2 v_135 srcloc_9) v_135)))"
 "(let-values(((or-part_305) coerce-key_1))"
@@ -47963,7 +47966,7 @@ static const char *startup_source =
 "(if(let-values(((or-part_53)(not rt_0)))(if or-part_53 or-part_53(1/readtable? rt_0)))"
 "(void)"
 "          (let-values () (raise-argument-error 'make-readtable \"(or/c readtable? #f)\" rt_0)))"
-"((letrec-values(((loop_97)"
+"((letrec-values(((loop_103)"
 "(lambda(args_8 symbol-parser_0 char-ht_0 dispatch-ht_0 delimiter-ht_0)"
 "(begin"
 " 'loop"
@@ -48016,10 +48019,10 @@ static const char *startup_source =
 " 'non-terminating-macro)))"
 "(if or-part_260"
 " or-part_260"
-"(let-values(((or-part_295)"
+"(let-values(((or-part_308)"
 "(eq? mode_17 'dispatch-macro)))"
-"(if or-part_295"
-" or-part_295"
+"(if or-part_308"
+" or-part_308"
 "(char? mode_17)))))))"
 "(void)"
 "(let-values()"
@@ -48062,7 +48065,7 @@ static const char *startup_source =
 " 'make-readtable"
 "                                                             \"(procedure-arity-includes/c 6)\""
 " target_0)))"
-"(loop_97"
+"(loop_103"
 " rest-args_0"
 " target_0"
 " char-ht_0"
@@ -48080,7 +48083,7 @@ static const char *startup_source =
 " 'make-readtable"
 "                                                               \"(procedure-arity-includes/c 6)\""
 " target_0)))"
-"(loop_97"
+"(loop_103"
 " rest-args_0"
 " symbol-parser_0"
 " char-ht_0"
@@ -48128,7 +48131,7 @@ static const char *startup_source =
 " mode_17"
 " mode_17)"
 " mode_17))))"
-"(loop_97"
+"(loop_103"
 " rest-args_0"
 " symbol-parser_0"
 " new-char-ht_0"
@@ -48156,13 +48159,13 @@ static const char *startup_source =
 "(if(eq? mode_17 'terminating-macro)"
 " 'delimit"
 " 'no-delimit))))"
-"(loop_97"
+"(loop_103"
 " rest-args_0"
 " symbol-parser_0"
 " new-char-ht_1"
 " dispatch-ht_0"
 " new-delimiter-ht_1))))))))))))))))))))))"
-" loop_97)"
+" loop_103)"
 " args_7"
 "(if rt_0(readtable-symbol-parser rt_0) #f)"
 "(if rt_0(readtable-char-ht rt_0) '#hasheqv())"
@@ -48179,7 +48182,7 @@ static const char *startup_source =
 "(lambda(c_58 config_11)"
 "(begin"
 "(let-values(((rt_2)(read-config-readtable config_11))((c_59) c_58))"
-"(if(let-values(((or-part_308)(not rt_2)))(if or-part_308 or-part_308(not(char? c_59))))"
+"(if(let-values(((or-part_309)(not rt_2)))(if or-part_309 or-part_309(not(char? c_59))))"
 "(let-values() c_59)"
 "(let-values()(*readtable-effective-char rt_2 c_59)))))))"
 "(define-values"
@@ -48258,21 +48261,21 @@ static const char *startup_source =
 "(readtable-equivalent-chars)"
 "(lambda(rt_6 c_64)"
 "(begin"
-"(let-values(((ht_153)(readtable-char-ht rt_6)))"
+"(let-values(((ht_146)(readtable-char-ht rt_6)))"
 "(append"
-"(if(hash-ref ht_153 c_64 #f) null(list c_64))"
+"(if(hash-ref ht_146 c_64 #f) null(list c_64))"
 "(reverse$1"
-"(let-values(((ht_154) ht_153))"
+"(let-values(((ht_153) ht_146))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-in-hash ht_154)))"
-"((letrec-values(((for-loop_270)"
+"(let-values()(check-in-hash ht_153)))"
+"((letrec-values(((for-loop_271)"
 "(lambda(fold-var_85 i_168)"
 "(begin"
 " 'for-loop"
 "(if i_168"
-"(let-values(((k_41 v_85)(hash-iterate-key+value ht_154 i_168)))"
+"(let-values(((k_41 v_85)(hash-iterate-key+value ht_153 i_168)))"
 "(let-values(((fold-var_284)"
 "(let-values(((fold-var_88) fold-var_85))"
 "(if(eqv? v_85 c_64)"
@@ -48283,12 +48286,12 @@ static const char *startup_source =
 "(values fold-var_13)))"
 " fold-var_88))))"
 "(if(not #f)"
-"(for-loop_270 fold-var_284(hash-iterate-next ht_154 i_168))"
+"(for-loop_271 fold-var_284(hash-iterate-next ht_153 i_168))"
 " fold-var_284)))"
 " fold-var_85)))))"
-" for-loop_270)"
+" for-loop_271)"
 " null"
-"(hash-iterate-first ht_154))))))))))"
+"(hash-iterate-first ht_153))))))))))"
 "(define-values"
 "(struct:special special1.1 special? special-value)"
 "(let-values(((struct:_76 make-_76 ?_76 -ref_76 -set!_76)"
@@ -48362,7 +48365,7 @@ static const char *startup_source =
 "(let-values(((in26_0) in_7)"
 "((config27_0) config_17)"
 "((due-to28_0) due-to_1)"
-"                             ((temp29_3) \"bad syntax `~a`\")"
+"                             ((temp29_2) \"bad syntax `~a`\")"
 "((str30_0) str_26))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -48371,7 +48374,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in26_0"
 " config27_0"
-" temp29_3"
+" temp29_2"
 "(list str30_0)))))))))))"
 "(define-values"
 "(catch-and-reraise-as-reader/proc)"
@@ -48461,10 +48464,10 @@ static const char *startup_source =
 " in_10"
 " special1.1"
 " source_5))))"
-"(if(let-values(((or-part_309)"
+"(if(let-values(((or-part_310)"
 "(eof-object? c_66)))"
-"(if or-part_309"
-" or-part_309"
+"(if or-part_310"
+" or-part_310"
 "(eqv?"
 " '#\\newline"
 "(effective-char c_66 config_15))))"
@@ -48518,8 +48521,8 @@ static const char *startup_source =
 "(if(eq? c_68 'special)"
 "(special1.1 'special)"
 " c_68)))))"
-"(let-values(((or-part_310)(eqv? '#\\space c3_2)))"
-"(if or-part_310 or-part_310(eqv? '#\\/ c3_2))))"
+"(let-values(((or-part_311)(eqv? '#\\space c3_2)))"
+"(if or-part_311 or-part_311(eqv? '#\\/ c3_2))))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -48651,9 +48654,9 @@ static const char *startup_source =
 "(let-values(((or-part_26)(char-whitespace? dc_0)))"
 "(if or-part_26"
 " or-part_26"
-"(let-values(((or-part_311)(char=? dc_0 '#\\()))"
-"(if or-part_311"
-" or-part_311"
+"(let-values(((or-part_312)(char=? dc_0 '#\\()))"
+"(if or-part_312"
+" or-part_312"
 "(let-values(((or-part_292)(char=? dc_0 '#\\))))"
 "(if or-part_292"
 " or-part_292"
@@ -48754,7 +48757,7 @@ static const char *startup_source =
 "              (let-values () (format \"~a, ~a, or ~a\" p_54 s_10 c_71))"
 "(if(let-values(((or-part_298) s_10))(if or-part_298 or-part_298 c_71))"
 "(let-values()"
-"                  (format \"~a or ~a\" p_54 (let-values (((or-part_309) s_10)) (if or-part_309 or-part_309 c_71))))"
+"                  (format \"~a or ~a\" p_54 (let-values (((or-part_310) s_10)) (if or-part_310 or-part_310 c_71))))"
 "(let-values() p_54)))))))))"
 "(define-values"
 "(struct:accum-string"
@@ -49060,7 +49063,7 @@ static const char *startup_source =
 "((temp27_5)"
 "(closer-name closer_1 config_35))"
 "((opener-c28_0) opener-c_0)"
-"((temp29_4)"
+"((temp29_3)"
 "(indentation-possible-cause config_35)))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -49070,7 +49073,7 @@ static const char *startup_source =
 " in22_0"
 " seq-config23_0"
 " temp26_3"
-"(list temp27_5 opener-c28_0 temp29_4))))"
+"(list temp27_5 opener-c28_0 temp29_3))))"
 "(void))"
 " e_76))))))"
 "(let-values(((seq_0)"
@@ -49150,7 +49153,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in30_0)"
 " in_20)"
-"((temp31_2)"
+"((temp31_3)"
 "(reading-at"
 " config_34"
 " dot-line_0"
@@ -49164,7 +49167,7 @@ static const char *startup_source =
 " #f"
 " unsafe-undefined"
 " in30_0"
-" temp31_2"
+" temp31_3"
 " temp32_1"
 "(list)))))"
 "(values))))"
@@ -49452,8 +49455,8 @@ static const char *startup_source =
 "(let-values(((or-part_266)(if(char>=? c_76 '#\\0)(char<=? c_76 '#\\9) #f)))"
 "(if or-part_266"
 " or-part_266"
-"(let-values(((or-part_312)(if(char>=? c_76 '#\\A)(char<=? c_76 '#\\F) #f)))"
-"(if or-part_312 or-part_312(if(char>=? c_76 '#\\a)(char<=? c_76 '#\\f) #f))))))))"
+"(let-values(((or-part_313)(if(char>=? c_76 '#\\A)(char<=? c_76 '#\\F) #f)))"
+"(if or-part_313 or-part_313(if(char>=? c_76 '#\\a)(char<=? c_76 '#\\f) #f))))))))"
 "(define-values"
 "(digit->number)"
 "(lambda(c_77)"
@@ -49958,10 +49961,10 @@ static const char *startup_source =
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if sign-pos_0"
-"(let-values(((or-part_313)"
+"(let-values(((or-part_314)"
 "(if dot-pos_1(< dot-pos_1 sign-pos_0) #f)))"
-"(if or-part_313"
-" or-part_313"
+"(if or-part_314"
+" or-part_314"
 "(if slash-pos_0(< slash-pos_0 sign-pos_0) #f)))"
 " #f)"
 "(let-values()"
@@ -50087,23 +50090,23 @@ static const char *startup_source =
 " slash-pos_0"
 " #f"
 "(if(> i_170 start_44)"
-"(let-values(((or-part_314)(not @-pos_0)))"
-"(if or-part_314"
-" or-part_314"
+"(let-values(((or-part_315)(not @-pos_0)))"
+"(if or-part_315"
+" or-part_315"
 "(> i_170(add1 @-pos_0))))"
 " #f)))))"
 "(if(char=? c_78 '#\\.)"
 "(let-values()"
-"(if(let-values(((or-part_315)"
+"(if(let-values(((or-part_316)"
 "(if exp-pos_0"
-"(let-values(((or-part_316)"
+"(let-values(((or-part_317)"
 "(not sign-pos_0)))"
-"(if or-part_316"
-" or-part_316"
+"(if or-part_317"
+" or-part_317"
 "(> exp-pos_0 sign-pos_0)))"
 " #f)))"
-"(if or-part_315"
-" or-part_315"
+"(if or-part_316"
+" or-part_316"
 "(if dot-pos_1"
 "(let-values(((or-part_208)(not sign-pos_0)))"
 "(if or-part_208"
@@ -50118,9 +50121,9 @@ static const char *startup_source =
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if slash-pos_0"
-"(let-values(((or-part_317)(not sign-pos_0)))"
-"(if or-part_317"
-" or-part_317"
+"(let-values(((or-part_318)(not sign-pos_0)))"
+"(if or-part_318"
+" or-part_318"
 "(> slash-pos_0 sign-pos_0)))"
 " #f)"
 "(let-values()"
@@ -50145,9 +50148,9 @@ static const char *startup_source =
 "(if(char=? c_78 '#\\/)"
 "(let-values()"
 "(if(if dot-pos_1"
-"(let-values(((or-part_318)(not sign-pos_0)))"
-"(if or-part_318"
-" or-part_318"
+"(let-values(((or-part_319)(not sign-pos_0)))"
+"(if or-part_319"
+" or-part_319"
 "(> dot-pos_1 sign-pos_0)))"
 " #f)"
 "(let-values()"
@@ -50157,16 +50160,16 @@ static const char *startup_source =
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_319)"
+"(if(let-values(((or-part_320)"
 "(if exp-pos_0"
-"(let-values(((or-part_320)"
+"(let-values(((or-part_321)"
 "(not sign-pos_0)))"
-"(if or-part_320"
-" or-part_320"
+"(if or-part_321"
+" or-part_321"
 "(> exp-pos_0 sign-pos_0)))"
 " #f)))"
-"(if or-part_319"
-" or-part_319"
+"(if or-part_320"
+" or-part_320"
 "(if slash-pos_0"
 "(let-values(((or-part_280)"
 "(not sign-pos_0)))"
@@ -50193,52 +50196,52 @@ static const char *startup_source =
 " i_170"
 " #f"
 " must-i?_0)))))"
-"(if(let-values(((or-part_321)(char=? c_78 '#\\e)))"
-"(if or-part_321"
-" or-part_321"
-"(let-values(((or-part_322)(char=? c_78 '#\\E)))"
+"(if(let-values(((or-part_322)(char=? c_78 '#\\e)))"
 "(if or-part_322"
 " or-part_322"
-"(let-values(((or-part_323)"
-"(char=? c_78 '#\\f)))"
+"(let-values(((or-part_323)(char=? c_78 '#\\E)))"
 "(if or-part_323"
 " or-part_323"
 "(let-values(((or-part_324)"
-"(char=? c_78 '#\\F)))"
+"(char=? c_78 '#\\f)))"
 "(if or-part_324"
 " or-part_324"
 "(let-values(((or-part_325)"
-"(char=? c_78 '#\\d)))"
+"(char=? c_78 '#\\F)))"
 "(if or-part_325"
 " or-part_325"
+"(let-values(((or-part_326)"
+"(char=? c_78 '#\\d)))"
+"(if or-part_326"
+" or-part_326"
 "(let-values(((or-part_181)"
 "(char=? c_78 '#\\D)))"
 "(if or-part_181"
 " or-part_181"
-"(let-values(((or-part_326)"
-"(char=?"
-" c_78"
-" '#\\s)))"
-"(if or-part_326"
-" or-part_326"
 "(let-values(((or-part_327)"
 "(char=?"
 " c_78"
-" '#\\S)))"
+" '#\\s)))"
 "(if or-part_327"
 " or-part_327"
+"(let-values(((or-part_328)"
+"(char=?"
+" c_78"
+" '#\\S)))"
+"(if or-part_328"
+" or-part_328"
 "(let-values(((or-part_209)"
 "(char=?"
 " c_78"
 " '#\\l)))"
 "(if or-part_209"
 " or-part_209"
-"(let-values(((or-part_328)"
+"(let-values(((or-part_329)"
 "(char=?"
 " c_78"
 " '#\\L)))"
-"(if or-part_328"
-" or-part_328"
+"(if or-part_329"
+" or-part_329"
 "(let-values(((or-part_173)"
 "(char=?"
 " c_78"
@@ -50271,8 +50274,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_329) exp-pos_0))"
-"(if or-part_329 or-part_329 i_170))"
+"(let-values(((or-part_330) exp-pos_0))"
+"(if or-part_330 or-part_330 i_170))"
 " must-i?_0))"
 "(let-values()"
 "(loop_109"
@@ -50284,8 +50287,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_330) exp-pos_0))"
-"(if or-part_330 or-part_330 i_170))"
+"(let-values(((or-part_331) exp-pos_0))"
+"(if or-part_331 or-part_331 i_170))"
 " must-i?_0)))))"
 "(if(char=? c_78 '#\\@)"
 "(let-values()"
@@ -50336,17 +50339,17 @@ static const char *startup_source =
 " #f"
 " #f"
 " must-i?_0)))))))"
-"(if(if(let-values(((or-part_331)"
+"(if(if(let-values(((or-part_332)"
 "(char=? c_78 '#\\i)))"
-"(if or-part_331"
-" or-part_331"
+"(if or-part_332"
+" or-part_332"
 "(char=? c_78 '#\\I)))"
 " sign-pos_0"
 " #f)"
 "(let-values()"
-"(if(let-values(((or-part_332) @-pos_0))"
-"(if or-part_332"
-" or-part_332"
+"(if(let-values(((or-part_333) @-pos_0))"
+"(if or-part_333"
+" or-part_333"
 "(eq? in-complex_1 '@)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -50355,10 +50358,10 @@ static const char *startup_source =
 "                                                                               \"cannot mix `@` and `i` in `~.a`\""
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_333)"
+"(if(let-values(((or-part_334)"
 "(<(add1 i_170) end_34)))"
-"(if or-part_333"
-" or-part_333"
+"(if or-part_334"
+" or-part_334"
 "(eq? in-complex_1 'i)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -50477,11 +50480,11 @@ static const char *startup_source =
 " radix168_0"
 " exactness170_0"
 " convert-mode172_0))))))"
-"(if(let-values(((or-part_334)(not v1_0)))"
-"(if or-part_334 or-part_334(not v2_6)))"
+"(if(let-values(((or-part_335)(not v1_0)))"
+"(if or-part_335 or-part_335(not v2_6)))"
 "(let-values() #f)"
-"(if(if(let-values(((or-part_335)(extflonum? v1_0)))"
-"(if or-part_335 or-part_335(extflonum? v2_6)))"
+"(if(if(let-values(((or-part_336)(extflonum? v1_0)))"
+"(if or-part_336 or-part_336(extflonum? v2_6)))"
 "(not(eq? convert-mode_4 'must-read))"
 " #f)"
 "(let-values()(fail-extflonum convert-mode_4 v1_0))"
@@ -50508,14 +50511,14 @@ static const char *startup_source =
 "(lambda()(begin 'extfl-mark?(char=?(char-downcase(string-ref s_333 exp-pos_1)) '#\\t)))))"
 "(let-values(((simple?_0)"
 "(if(not slash-pos_1)"
-"(if(let-values(((or-part_336)(eq? exactness_3 'inexact)))"
-"(if or-part_336"
-" or-part_336"
-"(let-values(((or-part_337)(eq? exactness_3 'decimal-as-inexact)))"
-"(if or-part_337 or-part_337(if(not dot-pos_2)(not exp-pos_1) #f)))))"
-"(if(let-values(((or-part_338)(not exp-pos_1)))"
-"(if or-part_338"
-" or-part_338"
+"(if(let-values(((or-part_337)(eq? exactness_3 'inexact)))"
+"(if or-part_337"
+" or-part_337"
+"(let-values(((or-part_338)(eq? exactness_3 'decimal-as-inexact)))"
+"(if or-part_338 or-part_338(if(not dot-pos_2)(not exp-pos_1) #f)))))"
+"(if(let-values(((or-part_339)(not exp-pos_1)))"
+"(if or-part_339"
+" or-part_339"
 "(let-values(((or-part_223)(not(eq? convert-mode_5 'number-or-false))))"
 "(if or-part_223 or-part_223(not(extfl-mark?_0))))))"
 "(not(if any-hashes?_1(hashes? s_333 start_45 end_35) #f))"
@@ -50543,9 +50546,9 @@ static const char *startup_source =
 "                          (format \"missing digits before exponent marker in `~.a`\" (substring s_333 start_45 end_35)))"
 "(let-values() #f)))"
 "(if(if exp-pos_1"
-"(let-values(((or-part_339)(= exp-pos_1(sub1 end_35))))"
-"(if or-part_339"
-" or-part_339"
+"(let-values(((or-part_340)(= exp-pos_1(sub1 end_35))))"
+"(if or-part_340"
+" or-part_340"
 "(if(= exp-pos_1(- end_35 2))(char-sign?(string-ref s_333(sub1 end_35))) #f)))"
 " #f)"
 "(let-values()"
@@ -50558,9 +50561,9 @@ static const char *startup_source =
 "(string->number$1"
 "(maybe-substring s_333 start_45 end_35)"
 " radix_7"
-"(if(let-values(((or-part_340)(eq? convert-mode_5 'number-or-false)))"
-"(if or-part_340"
-" or-part_340"
+"(if(let-values(((or-part_341)(eq? convert-mode_5 'number-or-false)))"
+"(if or-part_341"
+" or-part_341"
 "(let-values(((or-part_147)(not exp-pos_1)))"
 "(if or-part_147 or-part_147(not(extfl-mark?_0))))))"
 " 'number-or-false"
@@ -50622,7 +50625,7 @@ static const char *startup_source =
 " 'read)))"
 "(let-values()(real->double-flonum r_43)))))))))"
 "(let-values(((get-extfl?_0)(extfl-mark?_0)))"
-"(if(let-values(((or-part_341)(not m-v_0)))(if or-part_341 or-part_341(not e-v_0)))"
+"(if(let-values(((or-part_342)(not m-v_0)))(if or-part_342 or-part_342(not e-v_0)))"
 "(let-values() #f)"
 "(if(string? m-v_0)"
 "(let-values() m-v_0)"
@@ -50630,8 +50633,8 @@ static const char *startup_source =
 "(let-values() e-v_0)"
 "(if(if(eq? convert-mode_5 'number-or-false) get-extfl?_0 #f)"
 "(let-values() #f)"
-"(if(if(let-values(((or-part_342)(eq? exactness_3 'inexact)))"
-"(if or-part_342 or-part_342(eq? exactness_3 'decimal-as-inexact)))"
+"(if(if(let-values(((or-part_343)(eq? exactness_3 'inexact)))"
+"(if or-part_343 or-part_343(eq? exactness_3 'decimal-as-inexact)))"
 "(>(abs e-v_0)(if get-extfl?_0 6000 400))"
 " #f)"
 "(let-values()"
@@ -50653,8 +50656,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((n_31)(* m-v_0(expt radix_7 e-v_0))))"
 "(if(if(not get-extfl?_0)"
-"(let-values(((or-part_343)(eq? exactness_3 'exact)))"
-"(if or-part_343 or-part_343(eq? exactness_3 'decimal-as-exact)))"
+"(let-values(((or-part_344)(eq? exactness_3 'exact)))"
+"(if or-part_344 or-part_344(eq? exactness_3 'decimal-as-exact)))"
 " #f)"
 "(let-values() n_31)"
 "(if(if(eqv? n_31 0)(char=?(string-ref s_333 start_45) '#\\-) #f)"
@@ -50690,13 +50693,13 @@ static const char *startup_source =
 "(lambda(from-pos_0)"
 "(begin"
 " 'get-inexact?"
-"(let-values(((or-part_344)(eq? exactness_3 'inexact)))"
-"(if or-part_344"
-" or-part_344"
+"(let-values(((or-part_345)(eq? exactness_3 'inexact)))"
+"(if or-part_345"
+" or-part_345"
 "(if(not(eq? exactness_3 'exact))"
 "(hashes? s_333 from-pos_0 end_35)"
 " #f)))))))"
-"(if(let-values(((or-part_345)(not n-v_0)))(if or-part_345 or-part_345(not d-v_0)))"
+"(if(let-values(((or-part_346)(not n-v_0)))(if or-part_346 or-part_346(not d-v_0)))"
 "(let-values() #f)"
 "(if(string? n-v_0)"
 "(let-values() n-v_0)"
@@ -50772,8 +50775,8 @@ static const char *startup_source =
 "(sub1 i_171)"
 "(sub1 j_3)"
 "(if(= hashes-pos_0(add1 i_171)) i_171 hashes-pos_0))))))"
-"(if(let-values(((or-part_346)(char=? c_79 '#\\-)))"
-"(if or-part_346 or-part_346(char=? c_79 '#\\+)))"
+"(if(let-values(((or-part_347)(char=? c_79 '#\\-)))"
+"(if or-part_347 or-part_347(char=? c_79 '#\\+)))"
 "(let-values()"
 "(begin"
 "(string-set! new-str_0 j_3 c_79)"
@@ -50825,25 +50828,25 @@ static const char *startup_source =
 "(lambda(s_473 start_48 end_38 convert-mode_8)"
 "(begin"
 "(if(=(- end_38 start_48) 6)"
-"(if(let-values(((or-part_347)(char=?(string-ref s_473 start_48) '#\\+)))"
-"(if or-part_347 or-part_347(char=?(string-ref s_473 start_48) '#\\-)))"
-"(let-values(((or-part_348)"
+"(if(let-values(((or-part_348)(char=?(string-ref s_473 start_48) '#\\+)))"
+"(if or-part_348 or-part_348(char=?(string-ref s_473 start_48) '#\\-)))"
+"(let-values(((or-part_349)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 1))) '#\\i)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 2))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 3))) '#\\f)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 4))) '#\\.)"
-"(let-values(((or-part_349)"
+"(let-values(((or-part_350)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\0)"
 "(if(char=?(string-ref s_473 start_48) '#\\+) +inf.0 -inf.0)"
 " #f)))"
-"(if or-part_349"
-" or-part_349"
-"(let-values(((or-part_350)"
+"(if or-part_350"
+" or-part_350"
+"(let-values(((or-part_351)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\f)"
 "(if(char=?(string-ref s_473 start_48) '#\\+) +inf.f -inf.f)"
 " #f)))"
-"(if or-part_350"
-" or-part_350"
+"(if or-part_351"
+" or-part_351"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false))"
 "(if(char=?(string-ref s_473 start_48) '#\\+) '+inf.t '-inf.t)"
@@ -50853,20 +50856,20 @@ static const char *startup_source =
 " #f)"
 " #f)"
 " #f)))"
-"(if or-part_348"
-" or-part_348"
+"(if or-part_349"
+" or-part_349"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 1))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 2))) '#\\a)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 3))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 4))) '#\\.)"
-"(let-values(((or-part_351)"
-"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\0) +nan.0 #f)))"
-"(if or-part_351"
-" or-part_351"
 "(let-values(((or-part_352)"
-"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\f) +nan.f #f)))"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\0) +nan.0 #f)))"
 "(if or-part_352"
 " or-part_352"
+"(let-values(((or-part_353)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\f) +nan.f #f)))"
+"(if or-part_353"
+" or-part_353"
 "(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false)) '+nan.t #f)"
 " #f)))))"
@@ -50960,7 +50963,7 @@ static const char *startup_source =
 " 1)))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_271)"
+"((letrec-values(((for-loop_272)"
 "(lambda(result_122 idx_5)"
 "(begin"
 " 'for-loop"
@@ -50972,10 +50975,10 @@ static const char *startup_source =
 "(let-values()(let-values()(char=? c_80 '#\\#)))))"
 "(values result_124)))))"
 "(if(if(not((lambda x_87 result_123) c_80))(not #f) #f)"
-"(for-loop_271 result_123(unsafe-fx+ idx_5 1))"
+"(for-loop_272 result_123(unsafe-fx+ idx_5 1))"
 " result_123)))"
 " result_122)))))"
-" for-loop_271)"
+" for-loop_272)"
 " #f"
 " start*_5))))))"
 "(define-values"
@@ -51000,7 +51003,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_52)))"
-"((letrec-values(((for-loop_272)"
+"((letrec-values(((for-loop_273)"
 "(lambda(idx_6 pos_115)"
 "(begin"
 " 'for-loop"
@@ -51017,9 +51020,9 @@ static const char *startup_source =
 "(string-set! new-s_9 i_121 c_81)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_272(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
+"(if(not #f)(for-loop_273(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
 "(values))))))"
-" for-loop_272)"
+" for-loop_273)"
 " start*_6"
 " start_52)))"
 "(void)"
@@ -51032,25 +51035,25 @@ static const char *startup_source =
 "(exactness-set?)"
 "(lambda(exactness_6)"
 "(begin"
-"(let-values(((or-part_353)(eq? exactness_6 'exact)))(if or-part_353 or-part_353(eq? exactness_6 'inexact))))))"
+"(let-values(((or-part_354)(eq? exactness_6 'exact)))(if or-part_354 or-part_354(eq? exactness_6 'inexact))))))"
 "(define-values"
 "(char-sign?)"
 "(lambda(c_82)"
-"(begin(let-values(((or-part_354)(char=? c_82 '#\\-)))(if or-part_354 or-part_354(char=? c_82 '#\\+))))))"
+"(begin(let-values(((or-part_355)(char=? c_82 '#\\-)))(if or-part_355 or-part_355(char=? c_82 '#\\+))))))"
 "(define-values"
 "(digit?)"
 "(lambda(c_83 radix_11)"
 "(begin"
 "(let-values(((v_233)(char->integer c_83)))"
-"(let-values(((or-part_355)"
-"(if(>= v_233(char->integer '#\\0))(<(- v_233(char->integer '#\\0)) radix_11) #f)))"
-"(if or-part_355"
-" or-part_355"
-"(if(> radix_11 10)"
 "(let-values(((or-part_356)"
-"(if(>= v_233(char->integer '#\\a))(<(- v_233(-(char->integer '#\\a) 10)) radix_11) #f)))"
+"(if(>= v_233(char->integer '#\\0))(<(- v_233(char->integer '#\\0)) radix_11) #f)))"
 "(if or-part_356"
 " or-part_356"
+"(if(> radix_11 10)"
+"(let-values(((or-part_357)"
+"(if(>= v_233(char->integer '#\\a))(<(- v_233(-(char->integer '#\\a) 10)) radix_11) #f)))"
+"(if or-part_357"
+" or-part_357"
 "(if(>= v_233(char->integer '#\\A))(<(- v_233(-(char->integer '#\\A) 10)) radix_11) #f)))"
 " #f)))))))"
 "(define-values"
@@ -51170,11 +51173,11 @@ static const char *startup_source =
 " rt_10)"
 "((c_69)"
 " c_84))"
-"(if(let-values(((or-part_357)"
+"(if(let-values(((or-part_358)"
 "(not"
 " rt_11)))"
-"(if or-part_357"
-" or-part_357"
+"(if or-part_358"
+" or-part_358"
 "(not"
 "(char? c_69))))"
 "(let-values() c_69)"
@@ -51390,7 +51393,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in27_0) in_26)"
 "((config28_0) config_37)"
-"                                                                   ((temp29_5) \"bad number: `~a`\")"
+"                                                                   ((temp29_4) \"bad number: `~a`\")"
 "((temp30_4)(string-append mode_18 str_29)))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -51399,13 +51402,13 @@ static const char *startup_source =
 " unsafe-undefined"
 " in27_0"
 " config28_0"
-" temp29_5"
+" temp29_4"
 "(list temp30_4))))"
 "(void))"
 "(wrap"
-"(let-values(((or-part_358) num_0))"
-"(if or-part_358"
-" or-part_358"
+"(let-values(((or-part_295) num_0))"
+"(if or-part_295"
+" or-part_295"
 "(let-values(((or-part_166)"
 "(if(eq? mode_18 'keyword)"
 "(string->keyword str_29)"
@@ -51554,7 +51557,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_264)))"
-"((letrec-values(((for-loop_273)"
+"((letrec-values(((for-loop_274)"
 "(lambda(i_3 lst_104)"
 "(begin"
 " 'for-loop"
@@ -51596,12 +51599,12 @@ static const char *startup_source =
 " e_77))"
 "(not #f)"
 " #f)"
-"(for-loop_273"
+"(for-loop_274"
 " i_172"
 " rest_145)"
 " i_172)))"
 " i_3)))))"
-" for-loop_273)"
+" for-loop_274)"
 " 0"
 " lst_264)))))"
 " v_36))))))"
@@ -51688,7 +51691,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in22_1) in_30)"
 "((config23_0) config_10)"
-"((temp24_6)"
+"((temp24_5)"
 "                                                                    \"~avector length ~a is too small, ~a values provided\")"
 "((temp25_7)"
 "(let-values(((tmp_43) vector-mode_0))"
@@ -51708,7 +51711,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in22_1"
 " config23_0"
-" temp24_6"
+" temp24_5"
 "(list temp25_7 expected-len26_0 len27_0))))"
 "(let-values()"
 "(let-values(((last-or_0)"
@@ -51770,19 +51773,19 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_54)))"
-"((letrec-values(((for-loop_262)"
-"(lambda(lst_299 pos_117)"
+"((letrec-values(((for-loop_275)"
+"(lambda(lst_298 pos_117)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_299)"
+"(if(if(pair? lst_298)"
 " #t"
 " #f)"
 "(let-values(((e_78)"
 "(unsafe-car"
-" lst_299))"
-"((rest_175)"
+" lst_298))"
+"((rest_173)"
 "(unsafe-cdr"
-" lst_299))"
+" lst_298))"
 "((i_174)"
 " pos_117))"
 "(let-values((()"
@@ -51798,12 +51801,12 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_262"
-" rest_175"
+"(for-loop_275"
+" rest_173"
 "(+ pos_117 1))"
 "(values))))"
 "(values))))))"
-" for-loop_262)"
+" for-loop_275)"
 " lst_8"
 " start_54)))"
 "(void)))"
@@ -51872,7 +51875,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-naturals start_56)))"
-"((letrec-values(((for-loop_274)"
+"((letrec-values(((for-loop_276)"
 "(lambda(lst_98 pos_118)"
 "(begin"
 " 'for-loop"
@@ -51883,7 +51886,7 @@ static const char *startup_source =
 "(let-values(((e_80)"
 "(unsafe-car"
 " lst_98))"
-"((rest_176)"
+"((rest_174)"
 "(unsafe-cdr"
 " lst_98))"
 "((i_46)"
@@ -51901,14 +51904,14 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_274"
-" rest_176"
+"(for-loop_276"
+" rest_174"
 "(+"
 " pos_118"
 " 1))"
 "(values))))"
 "(values))))))"
-" for-loop_274)"
+" for-loop_276)"
 " lst_306"
 " start_56)))"
 "(void)))"
@@ -52160,7 +52163,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in22_2) in_5)"
 "((config23_1) config_15)"
-"((temp24_7)"
+"((temp24_6)"
 "(string-append"
 "                                       \"mismatch between structure description\""
 "                                       \" and number of provided field values in `~as` form\"))"
@@ -52172,7 +52175,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in22_2"
 " config23_1"
-" temp24_7"
+" temp24_6"
 "(list dispatch-c25_0)))))"
 "(if(read-config-for-syntax? config_15)"
 "(let-values()"
@@ -52271,7 +52274,7 @@ static const char *startup_source =
 "(let-values(((read-one17_0) read-one_3)"
 "((c18_1) c_86)"
 "((temp19_3) '#\\[)"
-"((temp20_3) '#\\])"
+"((temp20_2) '#\\])"
 "((in21_0) in_37)"
 "((config22_0) config_44)"
 "((v23_0) v_31))"
@@ -52281,7 +52284,7 @@ static const char *startup_source =
 " read-one17_0"
 " c18_1"
 " temp19_3"
-" temp20_3"
+" temp20_2"
 " in21_0"
 " config22_0)))"
 "(let-values()"
@@ -52297,7 +52300,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((read-one27_0) read-one_3)"
 "((c28_0) c_86)"
-"((temp29_6) '#\\{)"
+"((temp29_5) '#\\{)"
 "((temp30_6) '#\\})"
 "((in31_1) in_37)"
 "((config32_0) config_44)"
@@ -52307,7 +52310,7 @@ static const char *startup_source =
 " 'any"
 " read-one27_0"
 " c28_0"
-" temp29_6"
+" temp29_5"
 " temp30_6"
 " in31_1"
 " config32_0)))"
@@ -52321,9 +52324,9 @@ static const char *startup_source =
 "(if(if(equal? tmp_45 '#\\=) #t(equal? tmp_45 '#\\#))"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_308)(read-config-for-syntax? config_44)))"
-"(if or-part_308"
-" or-part_308"
+"(if(let-values(((or-part_309)(read-config-for-syntax? config_44)))"
+"(if or-part_309"
+" or-part_309"
 "(not(check-parameter 1/read-accept-graph config_44))))"
 "(let-values()"
 "(let-values(((in37_1) in_37)"
@@ -52369,10 +52372,10 @@ static const char *startup_source =
 "(if(equal? tmp_49 '#\\=)"
 "(let-values()"
 "(let-values(((ph_1)(make-placeholder 'placeholder)))"
-"(let-values(((ht_145)(get-graph-hash config_44)))"
+"(let-values(((ht_154)(get-graph-hash config_44)))"
 "(let-values((()"
 "(begin"
-"(if(hash-ref ht_145 v_31 #f)"
+"(if(hash-ref ht_154 v_31 #f)"
 "(let-values()"
 "(let-values(((in50_0) in_37)"
 "((config51_0) config_44)"
@@ -52399,7 +52402,7 @@ static const char *startup_source =
 "(list dispatch-c53_0 temp54_1 c55_0))))"
 "(void))"
 "(values))))"
-"(let-values((()(begin(hash-set! ht_145 v_31 ph_1)(values))))"
+"(let-values((()(begin(hash-set! ht_154 v_31 ph_1)(values))))"
 "(let-values(((result-v_0)"
 "(read-one_3 #f in_37(next-readtable config_44))))"
 "(begin"
@@ -52605,13 +52608,13 @@ static const char *startup_source =
 " read-one-key+value_1)"
 "((c18_2) c_50)"
 "((temp19_4) '#\\[)"
-"((temp20_4) '#\\])"
+"((temp20_3) '#\\])"
 "((in21_1) in_37)"
 "((config22_1) config_44)"
 "((config23_2) config_44)"
-"((temp24_8) #f))"
+"((temp24_7) #f))"
 "(read-unwrapped-sequence17.1"
-" temp24_8"
+" temp24_7"
 " config23_2"
 " unsafe-undefined"
 " #f"
@@ -52619,7 +52622,7 @@ static const char *startup_source =
 " read-one-key+value17_0"
 " c18_2"
 " temp19_4"
-" temp20_4"
+" temp20_3"
 " in21_1"
 " config22_1))"
 " ec_7"
@@ -52658,7 +52661,7 @@ static const char *startup_source =
 "(let-values(((read-one-key+value29_0)"
 " read-one-key+value_2)"
 "((c30_0) c_50)"
-"((temp31_3) '#\\{)"
+"((temp31_4) '#\\{)"
 "((temp32_2) '#\\})"
 "((in33_2) in_37)"
 "((config34_1) config_44)"
@@ -52672,7 +52675,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " read-one-key+value29_0"
 " c30_0"
-" temp31_3"
+" temp31_4"
 " temp32_2"
 " in33_2"
 " config34_1))"
@@ -53017,7 +53020,7 @@ static const char *startup_source =
 " in_37)"
 "((config19_2)"
 " config_44)"
-"((temp20_5)"
+"((temp20_4)"
 "                                                                                                          \"unknown escape sequence `~a~a` in ~a\")"
 "((escaping-c21_0)"
 " escaping-c_0)"
@@ -53032,7 +53035,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in18_1"
 " config19_2"
-" temp20_5"
+" temp20_4"
 "(list"
 " escaping-c21_0"
 " escaped-c22_0"
@@ -53852,7 +53855,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_307)))"
-"((letrec-values(((for-loop_275)"
+"((letrec-values(((for-loop_277)"
 "(lambda(lst_28)"
 "(begin"
 " 'for-loop"
@@ -53860,7 +53863,7 @@ static const char *startup_source =
 "(let-values(((c_93)"
 "(unsafe-car"
 " lst_28))"
-"((rest_177)"
+"((rest_175)"
 "(unsafe-cdr"
 " lst_28)))"
 "(let-values((()"
@@ -53875,11 +53878,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_275"
-" rest_177)"
+"(for-loop_277"
+" rest_175)"
 "(values))))"
 "(values))))))"
-" for-loop_275)"
+" for-loop_277)"
 " lst_307)))"
 "(void))))"
 "(if(char=? c_92 '#\\newline)"
@@ -54015,11 +54018,11 @@ static const char *startup_source =
 "((config17_1) config_8)"
 "((accum-str18_1) accum-str_6)"
 "((temp19_5) 16)"
-"((temp20_6)(if(char=? c_95 '#\\u) 4 8)))"
+"((temp20_5)(if(char=? c_95 '#\\u) 4 8)))"
 "(read-digits12.1"
 " temp19_5"
 " 0"
-" temp20_6"
+" temp20_5"
 " #f"
 " in16_1"
 " config17_1"
@@ -54036,7 +54039,7 @@ static const char *startup_source =
 "(let-values(((in21_2) in_4)"
 "((config22_2) config_8)"
 "                                                         ((temp23_5) \"bad character constant `#\\\\u~a`\")"
-"((temp24_9)"
+"((temp24_8)"
 "(let-values(((accum-str25_0) accum-str_6)"
 "((config26_1) config_8))"
 "(accum-string-get!6.1 0 accum-str25_0 config26_1))))"
@@ -54048,7 +54051,7 @@ static const char *startup_source =
 " in21_2"
 " config22_2"
 " temp23_5"
-"(list temp24_9))))))"
+"(list temp24_8))))))"
 "(let-values()(begin(accum-string-abandon! accum-str_6 config_8) c_95))))))"
 "(if(char-alphabetic? c_95)"
 "(let-values()"
@@ -54140,7 +54143,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in29_0) in_4)"
 "((config30_0) config_8)"
-"((temp31_3)"
+"((temp31_4)"
 "                                                                                        \"bad character constant `#\\\\~a`\")"
 "((name32_0) name_67))"
 "(reader-error12.1"
@@ -54150,7 +54153,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in29_0"
 " config30_0"
-" temp31_3"
+" temp31_4"
 "(list name32_0)))))))))))))))))))))"
 "(let-values() c_95))))"
 "(let-values() c_95))))))))"
@@ -54548,7 +54551,7 @@ static const char *startup_source =
 " config74_0)))))))))))))"
 "(define-values"
 "(read-lang29.1)"
-"(lambda(get-info?20_0 init-c19_0 who21_0 extend-str25_0 read-recur26_0 in27_1 config28_2)"
+"(lambda(get-info?20_0 init-c19_0 who21_1 extend-str25_0 read-recur26_0 in27_1 config28_2)"
 "(begin"
 " 'read-lang29"
 "(let-values(((extend-str_2) extend-str25_0))"
@@ -54557,7 +54560,7 @@ static const char *startup_source =
 "(let-values(((config_51) config28_2))"
 "(let-values(((init-c_15) init-c19_0))"
 "(let-values(((get-info?_2) get-info?20_0))"
-"(let-values(((who_29) who21_0))"
+"(let-values(((who_29) who21_1))"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -54784,7 +54787,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_308)"
-"(let-values(((c_101)(unsafe-car lst_308))((rest_178)(unsafe-cdr lst_308)))"
+"(let-values(((c_101)(unsafe-car lst_308))((rest_176)(unsafe-cdr lst_308)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -54794,7 +54797,7 @@ static const char *startup_source =
 "(accum-string-add! accum-str_11 c_101))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_208 rest_178)(values))))"
+"(if(not #f)(for-loop_208 rest_176)(values))))"
 "(values))))))"
 " for-loop_208)"
 " lst_201)))"
@@ -54858,13 +54861,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()(begin(force-parameters! config_53)(values))))"
 "(let-values(((guard_0)(1/current-reader-guard)))"
-"(let-values(((mod-path_28)"
+"(let-values(((mod-path_27)"
 "(let-values(((or-part_362)"
 "(if try-first-mod-path_0"
-"(let-values(((mod-path_29)(guard_0 try-first-mod-path_0)))"
+"(let-values(((mod-path_28)(guard_0 try-first-mod-path_0)))"
 "(if((read-config-module-declared? config_53)"
 " try-first-mod-path_0)"
-" mod-path_29"
+" mod-path_28"
 " #f))"
 " #f)))"
 "(if or-part_362 or-part_362(guard_0 mod-path-datum_0)))))"
@@ -54874,10 +54877,10 @@ static const char *startup_source =
 "(let-values(((extension_0)"
 "(if get-info?_3"
 "(let-values()"
-"(dynamic-require_2 mod-path_28 'get-info(lambda() no-value_0)))"
+"(dynamic-require_2 mod-path_27 'get-info(lambda() no-value_0)))"
 "(let-values()"
 "(dynamic-require_2"
-" mod-path_28"
+" mod-path_27"
 "(if for-syntax?_8 'read-syntax 'read))))))"
 "(if(eq? extension_0 no-value_0)"
 "(let-values() #f)"
@@ -56352,8 +56355,8 @@ static const char *startup_source =
 "(reference->resolved-module-path27.1 load?37_0 mod36_0)))))"
 "(extract_1 m_25))))))))))))"
 "(case-lambda"
-"((extract_2 who_22 mod_9)(begin(module->9_0 extract_2 who_22 mod_9 #f)))"
-"((extract_3 who_32 mod_10 load?5_1)(module->9_0 extract_3 who_32 mod_10 load?5_1)))))"
+"((extract_2 who_32 mod_9)(begin(module->9_0 extract_2 who_32 mod_9 #f)))"
+"((extract_3 who_33 mod_10 load?5_1)(module->9_0 extract_3 who_33 mod_10 load?5_1)))))"
 "(define-values"
 "(1/module->language-info)"
 "(let-values(((module->language-info13_0)"
@@ -56435,11 +56438,11 @@ static const char *startup_source =
 "(let-values(((name_40)"
 "(let-values(((mod44_0) mod_18)((temp45_1) #t))"
 "(reference->resolved-module-path27.1 temp45_1 mod44_0))))"
-"(let-values(((phase_137)(namespace-phase ns_47)))"
+"(let-values(((phase_135)(namespace-phase ns_47)))"
 "(let-values(((m-ns_17)"
 "(let-values(((ns46_0) ns_47)"
 "((name47_1) name_40)"
-"((phase48_1) phase_137))"
+"((phase48_1) phase_135))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -56482,12 +56485,12 @@ static const char *startup_source =
 " temp49_3)))))"
 "(let-values(((ns41_0) ns_47)"
 "((temp42_3)(namespace-mpi m-ns_17))"
-"((phase43_1) phase_137))"
+"((phase43_2) phase_135))"
 "(namespace-module-make-available!112.1"
 " unsafe-undefined"
 " ns41_0"
 " temp42_3"
-" phase43_1))"
+" phase43_2))"
 " m-ns_17)))))))))))))))"
 "(case-lambda"
 "((mod_19)(begin 'module->namespace(module->namespace17_0 mod_19 unsafe-undefined)))"
@@ -56570,12 +56573,12 @@ static const char *startup_source =
 "((insp_9 mod_23 ns19_2)(namespace-unprotect-module22_0 insp_9 mod_23 ns19_2)))))"
 "(define-values"
 "(namespace->module/complain)"
-"(lambda(who_33 ns_118 name_70)"
+"(lambda(who_34 ns_118 name_70)"
 "(begin"
 "(let-values(((or-part_211)(namespace->module ns_118 name_70)))"
 "(if or-part_211"
 " or-part_211"
-"          (raise-arguments-error who_33 \"unknown module in the current namespace\" \"name\" name_70))))))"
+"          (raise-arguments-error who_34 \"unknown module in the current namespace\" \"name\" name_70))))))"
 "(define-values"
 "(module-reference?)"
 "(lambda(mod_24)"
@@ -56622,8 +56625,8 @@ static const char *startup_source =
 "((src28_0) src_1)"
 "((start29_0) start_57)"
 "((readtable30_0) readtable_4)"
-"((temp31_4)(not graph?_1)))"
-"(read*14.1 temp26_5 start29_0 temp31_4 readtable30_0 temp27_8 src28_0 in25_1)))))"
+"((temp31_5)(not graph?_1)))"
+"(read*14.1 temp26_5 start29_0 temp31_5 readtable30_0 temp27_8 src28_0 in25_1)))))"
 "(define-values"
 "(read$1)"
 "(lambda(in_11)"
@@ -56747,7 +56750,7 @@ static const char *startup_source =
 "(define-values"
 "(original-curly-props)"
 "(syntax-props(syntax-property$1(syntax-property$1 empty-syntax original-property-sym #t) 'paren-shape '#\\{)))"
-"(define-values(read-module-declared?)(lambda(mod-path_30)(begin(1/module-declared? mod-path_30 #t))))"
+"(define-values(read-module-declared?)(lambda(mod-path_29)(begin(1/module-declared? mod-path_29 #t))))"
 "(define-values"
 "(read-coerce)"
 "(lambda(for-syntax?_12 v_246 srcloc_12)"
@@ -56823,7 +56826,7 @@ static const char *startup_source =
 "(lambda(mod-path18_0 sym19_1 fail-thunk17_0)"
 "(begin"
 " 'dynamic-require-reader20"
-"(let-values(((mod-path_31) mod-path18_0))"
+"(let-values(((mod-path_30) mod-path18_0))"
 "(let-values(((sym_99) sym19_1))"
 "(let-values(((fail-thunk_1)"
 "(if(eq? fail-thunk17_0 unsafe-undefined)"
@@ -56838,10 +56841,10 @@ static const char *startup_source =
 "(continuation-mark-set-first #f parameterization-key)"
 " 1/current-namespace"
 " root-ns_0)"
-"(let-values()(1/dynamic-require mod-path_31 sym_99 fail-thunk_1)))"
-"(1/dynamic-require mod-path_31 sym_99 fail-thunk_1)))))))))))"
+"(let-values()(1/dynamic-require mod-path_30 sym_99 fail-thunk_1)))"
+"(1/dynamic-require mod-path_30 sym_99 fail-thunk_1)))))))))))"
 "(case-lambda"
-"((mod-path_32 sym_100)(begin(dynamic-require-reader20_0 mod-path_32 sym_100 unsafe-undefined)))"
+"((mod-path_31 sym_100)(begin(dynamic-require-reader20_0 mod-path_31 sym_100 unsafe-undefined)))"
 "((mod-path_0 sym_101 fail-thunk17_1)(dynamic-require-reader20_0 mod-path_0 sym_101 fail-thunk17_1)))))"
 "(define-values"
 "(1/read-syntax)"
@@ -57095,7 +57098,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_261)"
 "(let-values(((sym_102)(unsafe-car lst_261))"
-"((rest_179)(unsafe-cdr lst_261)))"
+"((rest_177)(unsafe-cdr lst_261)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -57114,7 +57117,7 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_20 rest_179)"
+"(for-loop_20 rest_177)"
 "(values))))"
 "(values))))))"
 " for-loop_20)"
@@ -57511,7 +57514,7 @@ static const char *startup_source =
 " intdefs51_0)"
 "(begin"
 " 'do-local-expand56"
-"(let-values(((who_34) who52_0))"
+"(let-values(((who_35) who52_0))"
 "(let-values(((s-or-s-exp_0) s-or-s-exp53_0))"
 "(let-values(((context_28) context54_0))"
 "(let-values(((stop-ids_20) stop-ids55_0))"
@@ -57546,7 +57549,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(raise-argument-error"
-" who_34"
+" who_35"
 "(if as-transformer?_6"
 "                                                             \"(or/c 'expression 'top-level list?)\""
 "                                                             \"(or/c 'expression 'top-level 'module 'module-begin list?)\")"
@@ -57563,7 +57566,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(raise-argument-error"
-" who_34"
+" who_35"
 "                                                             \"(or/c (listof identifier?) #f)\""
 " stop-ids_20)))"
 "(values))))"
@@ -57573,21 +57576,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(raise-argument-error"
-" who_34"
+" who_35"
 " intdefs-or-false?-string"
 " intdefs_14)))"
 "(values))))"
 "(let-values(((ctx_75)"
-"(let-values(((who98_0) who_34))"
+"(let-values(((who98_0) who_35))"
 "(get-current-expand-context16.1 #f who98_0))))"
-"(let-values(((phase_138)"
+"(let-values(((phase_136)"
 "(if as-transformer?_6"
 "(add1(expand-context-phase ctx_75))"
 "(expand-context-phase ctx_75))))"
 "(let-values(((local-ctx_0)"
 "(let-values(((ctx99_0) ctx_75)"
 "((context100_0) context_28)"
-"((phase101_0) phase_138)"
+"((phase101_0) phase_136)"
 "((intdefs102_0) intdefs_14)"
 "((stop-ids103_0) stop-ids_20)"
 "((extend-stops?104_0) extend-stops?_5)"
@@ -57618,7 +57621,7 @@ static const char *startup_source =
 "(begin"
 "(namespace-visit-available-modules!"
 "(expand-context-namespace ctx_75)"
-" phase_138)"
+" phase_136)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -57870,8 +57873,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_309)(not maybe-insp_2)))"
-"(if or-part_309 or-part_309(inspector? maybe-insp_2)))"
+"(if(let-values(((or-part_310)(not maybe-insp_2)))"
+"(if or-part_310 or-part_310(inspector? maybe-insp_2)))"
 "(void)"
 "                              (let-values () (raise-argument-error 'syntax-disarm \"(or/c inspector? #f)\" maybe-insp_2)))"
 "(values))))"
@@ -58431,12 +58434,12 @@ static const char *startup_source =
 "(hash-iterate-first ht_156))))"
 "(values))))"
 "(let-values()"
-"(let-values(((ht_157)"
-"(let-values(((ht_158) prims_0))"
+"(let-values(((ht_144)"
+"(let-values(((ht_157) prims_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-in-hash ht_158)))"
+"(let-values()(check-in-hash ht_157)))"
 "((letrec-values(((for-loop_249)"
 "(lambda(table_213 i_97)"
 "(begin"
@@ -58444,7 +58447,7 @@ static const char *startup_source =
 "(if i_97"
 "(let-values(((sym_93 val_82)"
 "(hash-iterate-key+value"
-" ht_158"
+" ht_157"
 " i_97)))"
 "(let-values(((table_214)"
 "(let-values(((table_11)"
@@ -58478,30 +58481,30 @@ static const char *startup_source =
 "(if(not #f)"
 "(for-loop_249"
 " table_214"
-"(hash-iterate-next ht_158 i_97))"
+"(hash-iterate-next ht_157 i_97))"
 " table_214)))"
 " table_213)))))"
 " for-loop_249)"
 " '#hasheq()"
-"(hash-iterate-first ht_158))))))"
+"(hash-iterate-first ht_157))))))"
 "(let-values(((ht+extras_0)"
-"(let-values(((ht_146) extras_0))"
+"(let-values(((ht_158) extras_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-in-hash ht_146)))"
+"(let-values()(check-in-hash ht_158)))"
 "((letrec-values(((for-loop_253)"
-"(lambda(ht_153 i_169)"
+"(lambda(ht_146 i_169)"
 "(begin"
 " 'for-loop"
 "(if i_169"
 "(let-values(((k_44 v_83)"
 "(hash-iterate-key+value"
-" ht_146"
+" ht_158"
 " i_169)))"
 "(let-values(((ht_159)"
 "(let-values(((ht_160)"
-" ht_153))"
+" ht_146))"
 "(let-values(((ht_161)"
 "(let-values()"
 "(hash-set"
@@ -58512,12 +58515,12 @@ static const char *startup_source =
 "(if(not #f)"
 "(for-loop_253"
 " ht_159"
-"(hash-iterate-next ht_146 i_169))"
+"(hash-iterate-next ht_158 i_169))"
 " ht_159)))"
-" ht_153)))))"
+" ht_146)))))"
 " for-loop_253)"
-" ht_157"
-"(hash-iterate-first ht_146))))))"
+" ht_144"
+"(hash-iterate-first ht_158))))))"
 "(let-values(((to-name61_0) to-name_0)"
 "((ht+extras62_0) ht+extras_0)"
 "((ns63_0) ns_121)"
@@ -58560,7 +58563,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_163)))"
-"((letrec-values(((for-loop_276)"
+"((letrec-values(((for-loop_278)"
 "(lambda(table_215 i_176)"
 "(begin"
 " 'for-loop"
@@ -58626,14 +58629,14 @@ static const char *startup_source =
 "(values"
 " table_216)))))"
 "(if(not #f)"
-"(for-loop_276"
+"(for-loop_278"
 " table_7"
 "(hash-iterate-next"
 " ht_163"
 " i_176))"
 " table_7)))"
 " table_215)))))"
-" for-loop_276)"
+" for-loop_278)"
 " '#hash()"
 "(hash-iterate-first ht_163))))))"
 "((temp75_4)"
@@ -58653,7 +58656,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_164)))"
-"((letrec-values(((for-loop_277)"
+"((letrec-values(((for-loop_279)"
 "(lambda(i_177)"
 "(begin"
 " 'for-loop"
@@ -58677,13 +58680,13 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_277"
+"(for-loop_279"
 "(hash-iterate-next"
 " ht_164"
 " i_177))"
 "(values))))"
 "(values))))))"
-" for-loop_277)"
+" for-loop_279)"
 "(hash-iterate-first ht_164))))"
 "(void)))"
 "(void)))))"
@@ -58768,14 +58771,14 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_159)))"
-"((letrec-values(((for-loop_278)"
+"((letrec-values(((for-loop_280)"
 "(lambda(table_217 lst_309)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_309)"
 "(let-values(((require-mpi_0)"
 "(unsafe-car lst_309))"
-"((rest_180)"
+"((rest_178)"
 "(unsafe-cdr lst_309)))"
 "(let-values(((table_218)"
 "(let-values(((m_29)"
@@ -58807,7 +58810,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash"
 " ht_165)))"
-"((letrec-values(((for-loop_279)"
+"((letrec-values(((for-loop_281)"
 "(lambda(table_142"
 " i_178)"
 "(begin"
@@ -58837,14 +58840,14 @@ static const char *startup_source =
 " table_220)))))"
 "(if(not"
 " #f)"
-"(for-loop_279"
+"(for-loop_281"
 " table_32"
 "(hash-iterate-next"
 " ht_165"
 " i_178))"
 " table_32)))"
 " table_142)))))"
-" for-loop_279)"
+" for-loop_281)"
 " table_141"
 "(hash-iterate-first"
 " ht_165))))))"
@@ -58852,10 +58855,10 @@ static const char *startup_source =
 " for-loop_187)"
 " table_217)))))"
 "(if(not #f)"
-"(for-loop_278 table_218 rest_180)"
+"(for-loop_280 table_218 rest_178)"
 " table_218)))"
 " table_217)))))"
-" for-loop_278)"
+" for-loop_280)"
 " '#hash()"
 " lst_159))))"
 " '#hasheqv()))"
@@ -59230,8 +59233,8 @@ static const char *startup_source =
 "(check-module-form)"
 "(lambda(exp_0 filename_1)"
 "(begin"
-"(if(let-values(((or-part_311)(eof-object? exp_0)))"
-"(if or-part_311 or-part_311(eof-object?(1/syntax-e exp_0))))"
+"(if(let-values(((or-part_312)(eof-object? exp_0)))"
+"(if or-part_312 or-part_312(eof-object?(1/syntax-e exp_0))))"
 "(let-values()"
 "(if filename_1"
 "(error"
@@ -60004,12 +60007,12 @@ static const char *startup_source =
 "(path-cache-set!)"
 "(lambda(p_70 v_248)"
 "(begin"
-"(let-values(((i_164)(modulo(abs(equal-hash-code p_70)) CACHE-N)))"
-"(let-values(((w_2)(vector-ref -path-cache i_164)))"
+"(let-values(((i_184)(modulo(abs(equal-hash-code p_70)) CACHE-N)))"
+"(let-values(((w_2)(vector-ref -path-cache i_184)))"
 "(let-values(((l_19)(if w_2(weak-box-value w_2) #f)))"
 "(vector-set!"
 " -path-cache"
-" i_164"
+" i_184"
 "(make-weak-box"
 "(cons(cons p_70 v_248)(let-values(((or-part_65) l_19))(if or-part_65 or-part_65 null)))))))))))"
 "(define-values(-loading-filename)(gensym))"
@@ -60882,7 +60885,7 @@ static const char *startup_source =
 "(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_139)(expand-context-phase ctx_77)))"
+"(let-values(((phase_137)(expand-context-phase ctx_77)))"
 "(let-values(((frame-id_7)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
@@ -61057,7 +61060,7 @@ static const char *startup_source =
 "(let-values(((tmp_62)"
 "(core-form-sym"
 " disarmed-exp-body_0"
-" phase_139)))"
+" phase_137)))"
 "(if(equal? tmp_62 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -61383,7 +61386,7 @@ static const char *startup_source =
 "(let-values(((ids92_0)"
 " ids_30)"
 "((phase93_0)"
-" phase_139)"
+" phase_137)"
 "((exp-body94_0)"
 " exp-body_0)"
 "((dups95_0)"
@@ -61408,7 +61411,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_292)))"
-"((letrec-values(((for-loop_280)"
+"((letrec-values(((for-loop_282)"
 "(lambda(fold-var_189"
 " lst_310)"
 "(begin"
@@ -61418,7 +61421,7 @@ static const char *startup_source =
 "(let-values(((id_106)"
 "(unsafe-car"
 " lst_310))"
-"((rest_181)"
+"((rest_179)"
 "(unsafe-cdr"
 " lst_310)))"
 "(let-values(((fold-var_286)"
@@ -61431,7 +61434,7 @@ static const char *startup_source =
 "(let-values(((id96_0)"
 " id_106)"
 "((phase97_0)"
-" phase_139)"
+" phase_137)"
 "((counter98_0)"
 " counter_5)"
 "((frame-id99_0)"
@@ -61449,12 +61452,12 @@ static const char *startup_source =
 " fold-var_288)))))"
 "(if(not"
 " #f)"
-"(for-loop_280"
+"(for-loop_282"
 " fold-var_286"
-" rest_181)"
+" rest_179)"
 " fold-var_286)))"
 " fold-var_189)))))"
-" for-loop_280)"
+" for-loop_282)"
 " null"
 " lst_292))))))"
 "(let-values(((extended-env_0)"
@@ -61475,7 +61478,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_307)))"
-"((letrec-values(((for-loop_275)"
+"((letrec-values(((for-loop_277)"
 "(lambda(env_17"
 " lst_311"
 " lst_312)"
@@ -61489,13 +61492,13 @@ static const char *startup_source =
 "(let-values(((key_88)"
 "(unsafe-car"
 " lst_311))"
-"((rest_182)"
+"((rest_180)"
 "(unsafe-cdr"
 " lst_311))"
 "((id_107)"
 "(unsafe-car"
 " lst_312))"
-"((rest_183)"
+"((rest_181)"
 "(unsafe-cdr"
 " lst_312)))"
 "(let-values(((env_18)"
@@ -61512,13 +61515,13 @@ static const char *startup_source =
 " env_20)))))"
 "(if(not"
 " #f)"
-"(for-loop_275"
+"(for-loop_277"
 " env_18"
-" rest_182"
-" rest_183)"
+" rest_180"
+" rest_181)"
 " env_18)))"
 " env_17)))))"
-" for-loop_275)"
+" for-loop_277)"
 "(expand-context-env"
 " body-ctx_2)"
 " lst_228"
@@ -61586,7 +61589,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_313)))"
-"((letrec-values(((for-loop_281)"
+"((letrec-values(((for-loop_283)"
 "(lambda(fold-var_289"
 " lst_155)"
 "(begin"
@@ -61612,12 +61615,12 @@ static const char *startup_source =
 " fold-var_292)))))"
 "(if(not"
 " #f)"
-"(for-loop_281"
+"(for-loop_283"
 " fold-var_290"
 " rest_79)"
 " fold-var_290)))"
 " fold-var_289)))))"
-" for-loop_281)"
+" for-loop_283)"
 " null"
 " lst_313))))"
 " val-idss_0))"
@@ -61634,7 +61637,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_314)))"
-"((letrec-values(((for-loop_282)"
+"((letrec-values(((for-loop_284)"
 "(lambda(fold-var_293"
 " lst_32)"
 "(begin"
@@ -61644,7 +61647,7 @@ static const char *startup_source =
 "(let-values(((done-body_1)"
 "(unsafe-car"
 " lst_32))"
-"((rest_184)"
+"((rest_182)"
 "(unsafe-cdr"
 " lst_32)))"
 "(let-values(((fold-var_294)"
@@ -61660,12 +61663,12 @@ static const char *startup_source =
 " fold-var_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_282"
+"(for-loop_284"
 " fold-var_294"
-" rest_184)"
+" rest_182)"
 " fold-var_294)))"
 " fold-var_293)))))"
-" for-loop_282)"
+" for-loop_284)"
 " null"
 " lst_314))))"
 " val-keyss_0))"
@@ -61692,7 +61695,7 @@ static const char *startup_source =
 "(let-values(((done-body_2)"
 "(unsafe-car"
 " lst_315))"
-"((rest_185)"
+"((rest_183)"
 "(unsafe-cdr"
 " lst_315)))"
 "(let-values(((fold-var_297)"
@@ -61705,7 +61708,7 @@ static const char *startup_source =
 "(no-binds"
 " done-body_2"
 " s_503"
-" phase_139))"
+" phase_137))"
 " fold-var_298))))"
 "(values"
 " fold-var_145)))))"
@@ -61713,7 +61716,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_126"
 " fold-var_297"
-" rest_185)"
+" rest_183)"
 " fold-var_297)))"
 " fold-var_296)))))"
 " for-loop_126)"
@@ -61733,7 +61736,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_157)))"
-"((letrec-values(((for-loop_283)"
+"((letrec-values(((for-loop_285)"
 "(lambda(fold-var_299"
 " lst_316)"
 "(begin"
@@ -61743,7 +61746,7 @@ static const char *startup_source =
 "(let-values(((done-body_3)"
 "(unsafe-car"
 " lst_316))"
-"((rest_186)"
+"((rest_184)"
 "(unsafe-cdr"
 " lst_316)))"
 "(let-values(((fold-var_41)"
@@ -61759,12 +61762,12 @@ static const char *startup_source =
 " fold-var_300)))))"
 "(if(not"
 " #f)"
-"(for-loop_283"
+"(for-loop_285"
 " fold-var_41"
-" rest_186)"
+" rest_184)"
 " fold-var_41)))"
 " fold-var_299)))))"
-" for-loop_283)"
+" for-loop_285)"
 " null"
 " lst_157))))"
 " track-stxs_0))"
@@ -61854,7 +61857,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_317)))"
-"((letrec-values(((for-loop_284)"
+"((letrec-values(((for-loop_286)"
 "(lambda(id_109"
 " lst_318)"
 "(begin"
@@ -61864,7 +61867,7 @@ static const char *startup_source =
 "(let-values(((s_159)"
 "(unsafe-car"
 " lst_318))"
-"((rest_187)"
+"((rest_185)"
 "(unsafe-cdr"
 " lst_318)))"
 "(let-values(((id_65)"
@@ -61898,12 +61901,12 @@ static const char *startup_source =
 " id_111)))))"
 "(if(not"
 " #f)"
-"(for-loop_284"
+"(for-loop_286"
 " id_65"
-" rest_187)"
+" rest_185)"
 " id_65)))"
 " id_109)))))"
-" for-loop_284)"
+" for-loop_286)"
 " null"
 " lst_317)))))"
 "(reverse$1"
@@ -61994,7 +61997,7 @@ static const char *startup_source =
 "(let-values(((ids114_0)"
 " ids_31)"
 "((phase115_0)"
-" phase_139)"
+" phase_137)"
 "((exp-body116_0)"
 " exp-body_0)"
 "((dups117_0)"
@@ -62019,7 +62022,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_319)))"
-"((letrec-values(((for-loop_285)"
+"((letrec-values(((for-loop_287)"
 "(lambda(fold-var_301"
 " lst_320)"
 "(begin"
@@ -62029,7 +62032,7 @@ static const char *startup_source =
 "(let-values(((id_112)"
 "(unsafe-car"
 " lst_320))"
-"((rest_188)"
+"((rest_186)"
 "(unsafe-cdr"
 " lst_320)))"
 "(let-values(((fold-var_302)"
@@ -62042,7 +62045,7 @@ static const char *startup_source =
 "(let-values(((id118_0)"
 " id_112)"
 "((phase119_0)"
-" phase_139)"
+" phase_137)"
 "((counter120_0)"
 " counter_6)"
 "((frame-id121_0)"
@@ -62060,12 +62063,12 @@ static const char *startup_source =
 " fold-var_304)))))"
 "(if(not"
 " #f)"
-"(for-loop_285"
+"(for-loop_287"
 " fold-var_302"
-" rest_188)"
+" rest_186)"
 " fold-var_302)))"
 " fold-var_301)))))"
-" for-loop_285)"
+" for-loop_287)"
 " null"
 " lst_319))))))"
 "(let-values((()"
@@ -62131,7 +62134,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_323)))"
-"((letrec-values(((for-loop_286)"
+"((letrec-values(((for-loop_288)"
 "(lambda(env_21"
 " lst_324"
 " lst_325"
@@ -62149,19 +62152,19 @@ static const char *startup_source =
 "(let-values(((key_89)"
 "(unsafe-car"
 " lst_324))"
-"((rest_189)"
+"((rest_187)"
 "(unsafe-cdr"
 " lst_324))"
 "((val_41)"
 "(unsafe-car"
 " lst_325))"
-"((rest_190)"
+"((rest_188)"
 "(unsafe-cdr"
 " lst_325))"
 "((id_113)"
 "(unsafe-car"
 " lst_326))"
-"((rest_191)"
+"((rest_189)"
 "(unsafe-cdr"
 " lst_326)))"
 "(let-values(((env_22)"
@@ -62173,7 +62176,7 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_41"
 " id_113"
-" phase_139"
+" phase_137"
 " body-ctx_2)"
 "(env-extend"
 " env_23"
@@ -62183,14 +62186,14 @@ static const char *startup_source =
 " env_24)))))"
 "(if(not"
 " #f)"
-"(for-loop_286"
+"(for-loop_288"
 " env_22"
-" rest_189"
-" rest_190"
-" rest_191)"
+" rest_187"
+" rest_188"
+" rest_189)"
 " env_22)))"
 " env_21)))))"
-" for-loop_286)"
+" for-loop_288)"
 "(expand-context-env"
 " body-ctx_2)"
 " lst_321"
@@ -62298,7 +62301,7 @@ static const char *startup_source =
 "(cons"
 "(core-id"
 " '#%stratified-body"
-" phase_139)"
+" phase_137)"
 "(cons"
 " exp-body_0"
 " rest-bodys_0)))))"
@@ -62467,7 +62470,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-naturals start_64)))"
-"((letrec-values(((for-loop_287)"
+"((letrec-values(((for-loop_289)"
 "(lambda(fold-var_305"
 " lst_5"
 " pos_125)"
@@ -62480,7 +62483,7 @@ static const char *startup_source =
 "(let-values(((done-body_4)"
 "(unsafe-car"
 " lst_5))"
-"((rest_192)"
+"((rest_190)"
 "(unsafe-cdr"
 " lst_5))"
 "((i_14)"
@@ -62567,15 +62570,15 @@ static const char *startup_source =
 " fold-var_308)))))"
 "(if(not"
 " #f)"
-"(for-loop_287"
+"(for-loop_289"
 " fold-var_306"
-" rest_192"
+" rest_190"
 "(+"
 " pos_125"
 " 1))"
 " fold-var_306)))"
 " fold-var_305)))))"
-" for-loop_287)"
+" for-loop_289)"
 " null"
 " lst_213"
 " start_64))))))"
@@ -62689,7 +62692,7 @@ static const char *startup_source =
 "(let-values(((get-body_0) get-body35_0))"
 "(let-values(((track?_1) track?36_0))"
 "(let-values()"
-"(let-values(((phase_140)(expand-context-phase ctx_78)))"
+"(let-values(((phase_138)(expand-context-phase ctx_78)))"
 "((letrec-values(((loop_27)"
 "(lambda(idss_2"
 " keyss_1"
@@ -62734,10 +62737,10 @@ static const char *startup_source =
 "(if(null? accum-idss_0)"
 "(core-id"
 " 'let-values"
-" phase_140)"
+" phase_138)"
 "(core-id"
 " 'letrec-values"
-" phase_140))"
+" phase_138))"
 "(build-clauses"
 " accum-idss_0"
 " accum-rhss_0"
@@ -62846,7 +62849,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'let-values"
-" phase_140)"
+" phase_138)"
 "(list"
 "(build-clause"
 " ids_32"
@@ -62926,7 +62929,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'letrec-values"
-" phase_140)"
+" phase_138)"
 "(build-clauses"
 "(cons"
 " ids_32"
@@ -63000,12 +63003,12 @@ static const char *startup_source =
 "(if track-stx_1(syntax-track-origin$1 clause_2 track-stx_1) clause_2)))))"
 "(define-values"
 "(no-binds)"
-"(lambda(expr_10 s_517 phase_141)"
+"(lambda(expr_10 s_517 phase_139)"
 "(begin"
-"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_141)))"
+"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_139)))"
 "(datum->syntax$1"
-"(core-id '#%app phase_141)"
-"(list(core-id 'begin phase_141) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
+"(core-id '#%app phase_139)"
+"(list(core-id 'begin phase_139) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
 " s_517)))))"
 "(define-values"
 "(log-tag?)"
@@ -63015,7 +63018,7 @@ static const char *startup_source =
 "(lambda(obs_86 ctx_80 s_396 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
 "(begin"
 " 'log-letrec-values"
-"(let-values(((phase_142)(expand-context-phase ctx_80)))"
+"(let-values(((phase_140)(expand-context-phase ctx_80)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
 "(let-values(((lst_327) val-idss_2)((lst_328) val-rhss_2)((lst_329) track-stxs_4))"
@@ -63029,17 +63032,17 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_329)))"
-"((letrec-values(((for-loop_288)"
+"((letrec-values(((for-loop_290)"
 "(lambda(fold-var_309 lst_330 lst_331 lst_332)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_330)(if(pair? lst_331)(pair? lst_332) #f) #f)"
 "(let-values(((val-ids_0)(unsafe-car lst_330))"
-"((rest_193)(unsafe-cdr lst_330))"
+"((rest_191)(unsafe-cdr lst_330))"
 "((val-rhs_0)(unsafe-car lst_331))"
-"((rest_194)(unsafe-cdr lst_331))"
+"((rest_192)(unsafe-cdr lst_331))"
 "((track-stx_2)(unsafe-car lst_332))"
-"((rest_195)(unsafe-cdr lst_332)))"
+"((rest_193)(unsafe-cdr lst_332)))"
 "(let-values(((fold-var_310)"
 "(let-values(((fold-var_311) fold-var_309))"
 "(let-values(((fold-var_312)"
@@ -63053,16 +63056,16 @@ static const char *startup_source =
 " fold-var_311))))"
 "(values fold-var_312)))))"
 "(if(not #f)"
-"(for-loop_288 fold-var_310 rest_193 rest_194 rest_195)"
+"(for-loop_290 fold-var_310 rest_191 rest_192 rest_193)"
 " fold-var_310)))"
 " fold-var_309)))))"
-" for-loop_288)"
+" for-loop_290)"
 " null"
 " lst_327"
 " lst_328"
 " lst_329))))))"
 "(let-values(((had-stxes?_2)(not(null? stx-clauses_2))))"
-"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_142)))"
+"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_140)))"
 "(let-values(((lv-s_0)"
 "(datum->syntax$1"
 " #f"
@@ -63115,10 +63118,10 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((ids33_0) ids_34)"
-"((phase34_1) phase_85)"
+"((phase34_2) phase_85)"
 "((s35_1) s_74)"
 "                                         ((temp36_8) \"argument name\"))"
-"(check-no-duplicate-ids7.1 temp36_8 ids33_0 phase34_1 s35_1 unsafe-undefined))"
+"(check-no-duplicate-ids7.1 temp36_8 ids33_0 phase34_2 s35_1 unsafe-undefined))"
 "(values))))"
 "(let-values(((counter_7)(root-expand-context-counter ctx_81)))"
 "(let-values(((keys_7)"
@@ -63143,7 +63146,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id37_0)"
 " id_114)"
-"((phase38_1)"
+"((phase38_0)"
 " phase_85)"
 "((counter39_0)"
 " counter_7)"
@@ -63153,7 +63156,7 @@ static const char *startup_source =
 " #f"
 " s40_0"
 " id37_0"
-" phase38_1"
+" phase38_0"
 " counter39_0)))"
 " fold-var_34))))"
 "(values fold-var_158)))))"
@@ -63179,9 +63182,9 @@ static const char *startup_source =
 " 'for-loop"
 "(if(if(pair? lst_78)(pair? lst_58) #f)"
 "(let-values(((key_90)(unsafe-car lst_78))"
-"((rest_196)(unsafe-cdr lst_78))"
+"((rest_194)(unsafe-cdr lst_78))"
 "((id_115)(unsafe-car lst_58))"
-"((rest_197)(unsafe-cdr lst_58)))"
+"((rest_195)(unsafe-cdr lst_58)))"
 "(let-values(((env_26)"
 "(let-values(((env_27) env_25))"
 "(let-values(((env_28)"
@@ -63193,7 +63196,7 @@ static const char *startup_source =
 " id_115)))))"
 "(values env_28)))))"
 "(if(not #f)"
-"(for-loop_49 env_26 rest_196 rest_197)"
+"(for-loop_49 env_26 rest_194 rest_195)"
 " env_26)))"
 " env_25)))))"
 " for-loop_49)"
@@ -63448,7 +63451,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list lst_333)))"
-"((letrec-values(((for-loop_289)"
+"((letrec-values(((for-loop_291)"
 "(lambda(formals_4"
 " body_13"
 " lst_334)"
@@ -63459,7 +63462,7 @@ static const char *startup_source =
 "(let-values(((s_209)"
 "(unsafe-car"
 " lst_334))"
-"((rest_198)"
+"((rest_196)"
 "(unsafe-cdr"
 " lst_334)))"
 "(let-values(((formals_5"
@@ -63535,17 +63538,17 @@ static const char *startup_source =
 " body_16)))))"
 "(if(not"
 " #f)"
-"(for-loop_289"
+"(for-loop_291"
 " formals_5"
 " body_14"
-" rest_198)"
+" rest_196)"
 "(values"
 " formals_5"
 " body_14))))"
 "(values"
 " formals_4"
 " body_13))))))"
-" for-loop_289)"
+" for-loop_291)"
 " null"
 " null"
 " lst_333)))))"
@@ -63601,11 +63604,11 @@ static const char *startup_source =
 "(if(pair? lst_336)(pair? lst_337) #f)"
 " #f)"
 "(let-values(((formals_8)(unsafe-car lst_335))"
-"((rest_199)(unsafe-cdr lst_335))"
+"((rest_197)(unsafe-cdr lst_335))"
 "((body_17)(unsafe-car lst_336))"
-"((rest_200)(unsafe-cdr lst_336))"
+"((rest_198)(unsafe-cdr lst_336))"
 "((clause_3)(unsafe-car lst_337))"
-"((rest_201)(unsafe-cdr lst_337)))"
+"((rest_199)(unsafe-cdr lst_337)))"
 "(let-values(((fold-var_313)"
 "(let-values(((fold-var_314) fold-var_197))"
 "(let-values(((fold-var_315)"
@@ -63663,7 +63666,7 @@ static const char *startup_source =
 " fold-var_314))))"
 "(values fold-var_315)))))"
 "(if(not #f)"
-"(for-loop_31 fold-var_313 rest_199 rest_200 rest_201)"
+"(for-loop_31 fold-var_313 rest_197 rest_198 rest_199)"
 " fold-var_313)))"
 " fold-var_197)))))"
 " for-loop_31)"
@@ -63814,7 +63817,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_338)))"
-"((letrec-values(((for-loop_290)"
+"((letrec-values(((for-loop_292)"
 "(lambda(id:trans_1"
 " trans-rhs_1"
 " lst_339)"
@@ -63825,7 +63828,7 @@ static const char *startup_source =
 "(let-values(((s_334)"
 "(unsafe-car"
 " lst_339))"
-"((rest_202)"
+"((rest_200)"
 "(unsafe-cdr"
 " lst_339)))"
 "(let-values(((id:trans_2"
@@ -63879,7 +63882,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_340)))"
-"((letrec-values(((for-loop_291)"
+"((letrec-values(((for-loop_293)"
 "(lambda(id:trans_6"
 " lst_216)"
 "(begin"
@@ -63889,7 +63892,7 @@ static const char *startup_source =
 "(let-values(((s_533)"
 "(unsafe-car"
 " lst_216))"
-"((rest_203)"
+"((rest_201)"
 "(unsafe-cdr"
 " lst_216)))"
 "(let-values(((id:trans_7)"
@@ -63899,15 +63902,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans146_0)"
 "(let-values()"
-"(if(let-values(((or-part_341)"
+"(if(let-values(((or-part_342)"
 "(if(syntax?$1"
 " s_533)"
 "(symbol?"
 "(syntax-e$1"
 " s_533))"
 " #f)))"
-"(if or-part_341"
-" or-part_341"
+"(if or-part_342"
+" or-part_342"
 "(symbol?"
 " s_533)))"
 " s_533"
@@ -63923,12 +63926,12 @@ static const char *startup_source =
 " id:trans_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_291"
+"(for-loop_293"
 " id:trans_7"
-" rest_203)"
+" rest_201)"
 " id:trans_7)))"
 " id:trans_6)))))"
-" for-loop_291)"
+" for-loop_293)"
 " null"
 " lst_340)))))"
 "(reverse$1"
@@ -63992,17 +63995,17 @@ static const char *startup_source =
 " trans-rhs_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_290"
+"(for-loop_292"
 " id:trans_2"
 " trans-rhs_2"
-" rest_202)"
+" rest_200)"
 "(values"
 " id:trans_2"
 " trans-rhs_2))))"
 "(values"
 " id:trans_1"
 " trans-rhs_1))))))"
-" for-loop_290)"
+" for-loop_292)"
 " null"
 " null"
 " lst_338)))))"
@@ -64057,7 +64060,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_341)))"
-"((letrec-values(((for-loop_292)"
+"((letrec-values(((for-loop_294)"
 "(lambda(id:val_1"
 " val-rhs_2"
 " lst_342)"
@@ -64068,7 +64071,7 @@ static const char *startup_source =
 "(let-values(((s_537)"
 "(unsafe-car"
 " lst_342))"
-"((rest_204)"
+"((rest_202)"
 "(unsafe-cdr"
 " lst_342)))"
 "(let-values(((id:val_2"
@@ -64122,7 +64125,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_343)))"
-"((letrec-values(((for-loop_293)"
+"((letrec-values(((for-loop_295)"
 "(lambda(id:val_6"
 " lst_123)"
 "(begin"
@@ -64166,12 +64169,12 @@ static const char *startup_source =
 " id:val_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_293"
+"(for-loop_295"
 " id:val_7"
 " rest_62)"
 " id:val_7)))"
 " id:val_6)))))"
-" for-loop_293)"
+" for-loop_295)"
 " null"
 " lst_343)))))"
 "(reverse$1"
@@ -64235,17 +64238,17 @@ static const char *startup_source =
 " val-rhs_5)))))"
 "(if(not"
 " #f)"
-"(for-loop_292"
+"(for-loop_294"
 " id:val_2"
 " val-rhs_3"
-" rest_204)"
+" rest_202)"
 "(values"
 " id:val_2"
 " val-rhs_3))))"
 "(values"
 " id:val_1"
 " val-rhs_2))))))"
-" for-loop_292)"
+" for-loop_294)"
 " null"
 " null"
 " lst_341)))))"
@@ -64371,7 +64374,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_305)))"
-"((letrec-values(((for-loop_294)"
+"((letrec-values(((for-loop_296)"
 "(lambda(id:val_11"
 " val-rhs_7"
 " lst_344)"
@@ -64382,7 +64385,7 @@ static const char *startup_source =
 "(let-values(((s_545)"
 "(unsafe-car"
 " lst_344))"
-"((rest_205)"
+"((rest_203)"
 "(unsafe-cdr"
 " lst_344)))"
 "(let-values(((id:val_12"
@@ -64436,7 +64439,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_345)))"
-"((letrec-values(((for-loop_295)"
+"((letrec-values(((for-loop_297)"
 "(lambda(id:val_16"
 " lst_346)"
 "(begin"
@@ -64446,7 +64449,7 @@ static const char *startup_source =
 "(let-values(((s_548)"
 "(unsafe-car"
 " lst_346))"
-"((rest_206)"
+"((rest_204)"
 "(unsafe-cdr"
 " lst_346)))"
 "(let-values(((id:val_17)"
@@ -64480,12 +64483,12 @@ static const char *startup_source =
 " id:val_19)))))"
 "(if(not"
 " #f)"
-"(for-loop_295"
+"(for-loop_297"
 " id:val_17"
-" rest_206)"
+" rest_204)"
 " id:val_17)))"
 " id:val_16)))))"
-" for-loop_295)"
+" for-loop_297)"
 " null"
 " lst_345)))))"
 "(reverse$1"
@@ -64549,17 +64552,17 @@ static const char *startup_source =
 " val-rhs_10)))))"
 "(if(not"
 " #f)"
-"(for-loop_294"
+"(for-loop_296"
 " id:val_12"
 " val-rhs_8"
-" rest_205)"
+" rest_203)"
 "(values"
 " id:val_12"
 " val-rhs_8))))"
 "(values"
 " id:val_11"
 " val-rhs_7))))))"
-" for-loop_294)"
+" for-loop_296)"
 " null"
 " null"
 " lst_305)))))"
@@ -64623,14 +64626,14 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_347)))"
-"((letrec-values(((for-loop_296)"
+"((letrec-values(((for-loop_298)"
 "(lambda(fold-var_316 lst_348)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_348)"
 "(let-values(((ids_36)"
 "(unsafe-car lst_348))"
-"((rest_207)"
+"((rest_205)"
 "(unsafe-cdr lst_348)))"
 "(let-values(((fold-var_113)"
 "(let-values(((fold-var_114)"
@@ -64649,7 +64652,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_349)))"
-"((letrec-values(((for-loop_297)"
+"((letrec-values(((for-loop_299)"
 "(lambda(fold-var_317"
 " lst_350)"
 "(begin"
@@ -64659,7 +64662,7 @@ static const char *startup_source =
 "(let-values(((id_116)"
 "(unsafe-car"
 " lst_350))"
-"((rest_208)"
+"((rest_206)"
 "(unsafe-cdr"
 " lst_350)))"
 "(let-values(((fold-var_318)"
@@ -64677,22 +64680,22 @@ static const char *startup_source =
 " fold-var_320)))))"
 "(if(not"
 " #f)"
-"(for-loop_297"
+"(for-loop_299"
 " fold-var_318"
-" rest_208)"
+" rest_206)"
 " fold-var_318)))"
 " fold-var_317)))))"
-" for-loop_297)"
+" for-loop_299)"
 " null"
 " lst_349)))))"
 " fold-var_114))))"
 "(values"
 " fold-var_115)))))"
 "(if(not #f)"
-"(for-loop_296 fold-var_113 rest_207)"
+"(for-loop_298 fold-var_113 rest_205)"
 " fold-var_113)))"
 " fold-var_316)))))"
-" for-loop_296)"
+" for-loop_298)"
 " null"
 " lst_347))))))"
 "(let-values(((val-idss_3)"
@@ -64702,14 +64705,14 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_351)))"
-"((letrec-values(((for-loop_298)"
+"((letrec-values(((for-loop_300)"
 "(lambda(fold-var_321 lst_352)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_352)"
 "(let-values(((ids_37)"
 "(unsafe-car lst_352))"
-"((rest_209)"
+"((rest_207)"
 "(unsafe-cdr lst_352)))"
 "(let-values(((fold-var_322)"
 "(let-values(((fold-var_323)"
@@ -64728,7 +64731,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_353)))"
-"((letrec-values(((for-loop_299)"
+"((letrec-values(((for-loop_301)"
 "(lambda(fold-var_325"
 " lst_354)"
 "(begin"
@@ -64738,7 +64741,7 @@ static const char *startup_source =
 "(let-values(((id_117)"
 "(unsafe-car"
 " lst_354))"
-"((rest_210)"
+"((rest_208)"
 "(unsafe-cdr"
 " lst_354)))"
 "(let-values(((fold-var_326)"
@@ -64756,24 +64759,24 @@ static const char *startup_source =
 " fold-var_328)))))"
 "(if(not"
 " #f)"
-"(for-loop_299"
+"(for-loop_301"
 " fold-var_326"
-" rest_210)"
+" rest_208)"
 " fold-var_326)))"
 " fold-var_325)))))"
-" for-loop_299)"
+" for-loop_301)"
 " null"
 " lst_353)))))"
 " fold-var_323))))"
 "(values"
 " fold-var_324)))))"
 "(if(not #f)"
-"(for-loop_298"
+"(for-loop_300"
 " fold-var_322"
-" rest_209)"
+" rest_207)"
 " fold-var_322)))"
 " fold-var_321)))))"
-" for-loop_298)"
+" for-loop_300)"
 " null"
 " lst_351))))))"
 "(let-values(((val-rhss_3)"
@@ -64785,14 +64788,14 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_355)))"
-"((letrec-values(((for-loop_300)"
+"((letrec-values(((for-loop_302)"
 "(lambda(fold-var_329 lst_356)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_356)"
 "(let-values(((rhs_20)"
 "(unsafe-car lst_356))"
-"((rest_211)"
+"((rest_209)"
 "(unsafe-cdr lst_356)))"
 "(let-values(((fold-var_330)"
 "(let-values(((fold-var_331)"
@@ -64808,12 +64811,12 @@ static const char *startup_source =
 "(values"
 " fold-var_332)))))"
 "(if(not #f)"
-"(for-loop_300"
+"(for-loop_302"
 " fold-var_330"
-" rest_211)"
+" rest_209)"
 " fold-var_330)))"
 " fold-var_329)))))"
-" for-loop_300)"
+" for-loop_302)"
 " null"
 " lst_355))))"
 "(if syntaxes?_0 val-rhs105_0 val-rhs129_0))))"
@@ -65024,7 +65027,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_357)))"
-"((letrec-values(((for-loop_301)"
+"((letrec-values(((for-loop_303)"
 "(lambda(fold-var_333 lst_358)"
 "(begin"
 " 'for-loop"
@@ -65032,7 +65035,7 @@ static const char *startup_source =
 "(let-values(((ids_38)"
 "(unsafe-car"
 " lst_358))"
-"((rest_212)"
+"((rest_210)"
 "(unsafe-cdr"
 " lst_358)))"
 "(let-values(((fold-var_334)"
@@ -65052,7 +65055,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_359)))"
-"((letrec-values(((for-loop_302)"
+"((letrec-values(((for-loop_304)"
 "(lambda(fold-var_337"
 " lst_360)"
 "(begin"
@@ -65062,7 +65065,7 @@ static const char *startup_source =
 "(let-values(((id_118)"
 "(unsafe-car"
 " lst_360))"
-"((rest_213)"
+"((rest_211)"
 "(unsafe-cdr"
 " lst_360)))"
 "(let-values(((fold-var_338)"
@@ -65093,24 +65096,24 @@ static const char *startup_source =
 " fold-var_340)))))"
 "(if(not"
 " #f)"
-"(for-loop_302"
+"(for-loop_304"
 " fold-var_338"
-" rest_213)"
+" rest_211)"
 " fold-var_338)))"
 " fold-var_337)))))"
-" for-loop_302)"
+" for-loop_304)"
 " null"
 " lst_359)))))"
 " fold-var_335))))"
 "(values"
 " fold-var_336)))))"
 "(if(not #f)"
-"(for-loop_301"
+"(for-loop_303"
 " fold-var_334"
-" rest_212)"
+" rest_210)"
 " fold-var_334)))"
 " fold-var_333)))))"
-" for-loop_301)"
+" for-loop_303)"
 " null"
 " lst_357))))))"
 "(let-values(((val-keyss_2)"
@@ -65121,7 +65124,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_361)))"
-"((letrec-values(((for-loop_303)"
+"((letrec-values(((for-loop_305)"
 "(lambda(fold-var_341 lst_362)"
 "(begin"
 " 'for-loop"
@@ -65129,7 +65132,7 @@ static const char *startup_source =
 "(let-values(((ids_39)"
 "(unsafe-car"
 " lst_362))"
-"((rest_214)"
+"((rest_212)"
 "(unsafe-cdr"
 " lst_362)))"
 "(let-values(((fold-var_342)"
@@ -65149,7 +65152,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_131)))"
-"((letrec-values(((for-loop_304)"
+"((letrec-values(((for-loop_306)"
 "(lambda(fold-var_344"
 " lst_363)"
 "(begin"
@@ -65159,7 +65162,7 @@ static const char *startup_source =
 "(let-values(((id_119)"
 "(unsafe-car"
 " lst_363))"
-"((rest_215)"
+"((rest_213)"
 "(unsafe-cdr"
 " lst_363)))"
 "(let-values(((fold-var_345)"
@@ -65190,24 +65193,24 @@ static const char *startup_source =
 " fold-var_347)))))"
 "(if(not"
 " #f)"
-"(for-loop_304"
+"(for-loop_306"
 " fold-var_345"
-" rest_215)"
+" rest_213)"
 " fold-var_345)))"
 " fold-var_344)))))"
-" for-loop_304)"
+" for-loop_306)"
 " null"
 " lst_131)))))"
 " fold-var_343))))"
 "(values"
 " fold-var_118)))))"
 "(if(not #f)"
-"(for-loop_303"
+"(for-loop_305"
 " fold-var_342"
-" rest_214)"
+" rest_212)"
 " fold-var_342)))"
 " fold-var_341)))))"
-" for-loop_303)"
+" for-loop_305)"
 " null"
 " lst_361))))))"
 "(let-values(((bodys_10)"
@@ -65219,7 +65222,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_364)))"
-"((letrec-values(((for-loop_305)"
+"((letrec-values(((for-loop_307)"
 "(lambda(fold-var_348 lst_365)"
 "(begin"
 " 'for-loop"
@@ -65227,7 +65230,7 @@ static const char *startup_source =
 "(let-values(((body_18)"
 "(unsafe-car"
 " lst_365))"
-"((rest_216)"
+"((rest_214)"
 "(unsafe-cdr"
 " lst_365)))"
 "(let-values(((fold-var_123)"
@@ -65244,12 +65247,12 @@ static const char *startup_source =
 "(values"
 " fold-var_48)))))"
 "(if(not #f)"
-"(for-loop_305"
+"(for-loop_307"
 " fold-var_123"
-" rest_216)"
+" rest_214)"
 " fold-var_123)))"
 " fold-var_348)))))"
-" for-loop_305)"
+" for-loop_307)"
 " null"
 " lst_364))))))"
 "(let-values((()"
@@ -65303,7 +65306,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_366)))"
-"((letrec-values(((for-loop_306)"
+"((letrec-values(((for-loop_308)"
 "(lambda(fold-var_350"
 " lst_367"
 " lst_368)"
@@ -65315,13 +65318,13 @@ static const char *startup_source =
 "(let-values(((rhs_21)"
 "(unsafe-car"
 " lst_367))"
-"((rest_217)"
+"((rest_215)"
 "(unsafe-cdr"
 " lst_367))"
 "((ids_40)"
 "(unsafe-car"
 " lst_368))"
-"((rest_218)"
+"((rest_216)"
 "(unsafe-cdr"
 " lst_368)))"
 "(let-values(((fold-var_351)"
@@ -65372,13 +65375,13 @@ static const char *startup_source =
 "(values"
 " fold-var_353)))))"
 "(if(not #f)"
-"(for-loop_306"
+"(for-loop_308"
 " fold-var_351"
-" rest_217"
-" rest_218)"
+" rest_215"
+" rest_216)"
 " fold-var_351)))"
 " fold-var_350)))))"
-" for-loop_306)"
+" for-loop_308)"
 " null"
 " lst_63"
 " lst_366))))))"
@@ -65394,7 +65397,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_135)))"
-"((letrec-values(((for-loop_307)"
+"((letrec-values(((for-loop_309)"
 "(lambda(env_29"
 " lst_370"
 " lst_371)"
@@ -65407,13 +65410,13 @@ static const char *startup_source =
 "(let-values(((keys_10)"
 "(unsafe-car"
 " lst_370))"
-"((rest_219)"
+"((rest_217)"
 "(unsafe-cdr"
 " lst_370))"
 "((ids_41)"
 "(unsafe-car"
 " lst_371))"
-"((rest_220)"
+"((rest_218)"
 "(unsafe-cdr"
 " lst_371)))"
 "(let-values(((env_30)"
@@ -65436,7 +65439,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_373)))"
-"((letrec-values(((for-loop_308)"
+"((letrec-values(((for-loop_310)"
 "(lambda(env_32"
 " lst_374"
 " lst_375)"
@@ -65450,13 +65453,13 @@ static const char *startup_source =
 "(let-values(((key_91)"
 "(unsafe-car"
 " lst_374))"
-"((rest_221)"
+"((rest_219)"
 "(unsafe-cdr"
 " lst_374))"
 "((id_120)"
 "(unsafe-car"
 " lst_375))"
-"((rest_222)"
+"((rest_220)"
 "(unsafe-cdr"
 " lst_375)))"
 "(let-values(((env_33)"
@@ -65473,24 +65476,24 @@ static const char *startup_source =
 " env_35)))))"
 "(if(not"
 " #f)"
-"(for-loop_308"
+"(for-loop_310"
 " env_33"
-" rest_221"
-" rest_222)"
+" rest_219"
+" rest_220)"
 " env_33)))"
 " env_32)))))"
-" for-loop_308)"
+" for-loop_310)"
 " env_31"
 " lst_372"
 " lst_373))))))"
 "(if(not #f)"
-"(for-loop_307"
+"(for-loop_309"
 " env_30"
-" rest_219"
-" rest_220)"
+" rest_217"
+" rest_218)"
 " env_30)))"
 " env_29)))))"
-" for-loop_307)"
+" for-loop_309)"
 "(expand-context-env ctx_85)"
 " lst_369"
 " lst_135)))))"
@@ -65511,7 +65514,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_378)))"
-"((letrec-values(((for-loop_309)"
+"((letrec-values(((for-loop_311)"
 "(lambda(env_36"
 " lst_379"
 " lst_380"
@@ -65529,19 +65532,19 @@ static const char *startup_source =
 "(let-values(((keys_11)"
 "(unsafe-car"
 " lst_379))"
-"((rest_223)"
+"((rest_221)"
 "(unsafe-cdr"
 " lst_379))"
 "((vals_9)"
 "(unsafe-car"
 " lst_380))"
-"((rest_224)"
+"((rest_222)"
 "(unsafe-cdr"
 " lst_380))"
 "((ids_42)"
 "(unsafe-car"
 " lst_381))"
-"((rest_225)"
+"((rest_223)"
 "(unsafe-cdr"
 " lst_381)))"
 "(let-values(((env_37)"
@@ -65574,7 +65577,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_384)))"
-"((letrec-values(((for-loop_310)"
+"((letrec-values(((for-loop_312)"
 "(lambda(env_40"
 " lst_385"
 " lst_386"
@@ -65592,19 +65595,19 @@ static const char *startup_source =
 "(let-values(((key_92)"
 "(unsafe-car"
 " lst_385))"
-"((rest_226)"
+"((rest_224)"
 "(unsafe-cdr"
 " lst_385))"
 "((val_86)"
 "(unsafe-car"
 " lst_386))"
-"((rest_227)"
+"((rest_225)"
 "(unsafe-cdr"
 " lst_386))"
 "((id_121)"
 "(unsafe-car"
 " lst_387))"
-"((rest_228)"
+"((rest_226)"
 "(unsafe-cdr"
 " lst_387)))"
 "(let-values(((env_41)"
@@ -65626,14 +65629,14 @@ static const char *startup_source =
 " env_43)))))"
 "(if(not"
 " #f)"
-"(for-loop_310"
+"(for-loop_312"
 " env_41"
-" rest_226"
-" rest_227"
-" rest_228)"
+" rest_224"
+" rest_225"
+" rest_226)"
 " env_41)))"
 " env_40)))))"
-" for-loop_310)"
+" for-loop_312)"
 " env_38"
 " lst_382"
 " lst_383"
@@ -65641,14 +65644,14 @@ static const char *startup_source =
 "(values"
 " env_39)))))"
 "(if(not #f)"
-"(for-loop_309"
+"(for-loop_311"
 " env_37"
-" rest_223"
-" rest_224"
-" rest_225)"
+" rest_221"
+" rest_222"
+" rest_223)"
 " env_37)))"
 " env_36)))))"
-" for-loop_309)"
+" for-loop_311)"
 " rec-val-env_0"
 " lst_376"
 " lst_377"
@@ -65776,7 +65779,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_388)))"
-"((letrec-values(((for-loop_311)"
+"((letrec-values(((for-loop_313)"
 "(lambda(fold-var_358"
 " lst_389)"
 "(begin"
@@ -65786,7 +65789,7 @@ static const char *startup_source =
 "(let-values(((val-id_0)"
 "(unsafe-car"
 " lst_389))"
-"((rest_229)"
+"((rest_227)"
 "(unsafe-cdr"
 " lst_389)))"
 "(let-values(((fold-var_359)"
@@ -65807,12 +65810,12 @@ static const char *startup_source =
 " fold-var_360)))))"
 "(if(not"
 " #f)"
-"(for-loop_311"
+"(for-loop_313"
 " fold-var_359"
-" rest_229)"
+" rest_227)"
 " fold-var_359)))"
 " fold-var_358)))))"
-" for-loop_311)"
+" for-loop_313)"
 " null"
 " lst_388)))))"
 " fold-var_356))))"
@@ -65970,7 +65973,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_391)))"
-"((letrec-values(((for-loop_312)"
+"((letrec-values(((for-loop_314)"
 "(lambda(fold-var_361"
 " lst_392"
 " lst_393"
@@ -65992,25 +65995,25 @@ static const char *startup_source =
 "(let-values(((ids_43)"
 "(unsafe-car"
 " lst_392))"
-"((rest_230)"
+"((rest_228)"
 "(unsafe-cdr"
 " lst_392))"
 "((keys_12)"
 "(unsafe-car"
 " lst_393))"
-"((rest_231)"
+"((rest_229)"
 "(unsafe-cdr"
 " lst_393))"
 "((rhs_22)"
 "(unsafe-car"
 " lst_394))"
-"((rest_232)"
+"((rest_230)"
 "(unsafe-cdr"
 " lst_394))"
 "((clause_4)"
 "(unsafe-car"
 " lst_395))"
-"((rest_233)"
+"((rest_231)"
 "(unsafe-cdr"
 " lst_395)))"
 "(let-values(((fold-var_51)"
@@ -66067,15 +66070,15 @@ static const char *startup_source =
 " fold-var_363)))))"
 "(if(not"
 " #f)"
-"(for-loop_312"
+"(for-loop_314"
 " fold-var_51"
+" rest_228"
+" rest_229"
 " rest_230"
-" rest_231"
-" rest_232"
-" rest_233)"
+" rest_231)"
 " fold-var_51)))"
 " fold-var_361)))))"
-" for-loop_312)"
+" for-loop_314)"
 " null"
 " lst_150"
 " lst_390"
@@ -66168,15 +66171,15 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_397)))"
-"((letrec-values(((for-loop_313)"
+"((letrec-values(((for-loop_315)"
 "(lambda(fold-var_364 lst_398 lst_399)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_398)(pair? lst_399) #f)"
 "(let-values(((val-ids_2)(unsafe-car lst_398))"
-"((rest_234)(unsafe-cdr lst_398))"
+"((rest_232)(unsafe-cdr lst_398))"
 "((val-rhs_11)(unsafe-car lst_399))"
-"((rest_235)(unsafe-cdr lst_399)))"
+"((rest_233)(unsafe-cdr lst_399)))"
 "(let-values(((fold-var_365)"
 "(let-values(((fold-var_366) fold-var_364))"
 "(let-values(((fold-var_367)"
@@ -66189,10 +66192,10 @@ static const char *startup_source =
 " fold-var_366))))"
 "(values fold-var_367)))))"
 "(if(not #f)"
-"(for-loop_313 fold-var_365 rest_234 rest_235)"
+"(for-loop_315 fold-var_365 rest_232 rest_233)"
 " fold-var_365)))"
 " fold-var_364)))))"
-" for-loop_313)"
+" for-loop_315)"
 " null"
 " lst_396"
 " lst_397))))"
@@ -66212,15 +66215,15 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_401)))"
-"((letrec-values(((for-loop_314)"
+"((letrec-values(((for-loop_316)"
 "(lambda(fold-var_368 lst_402 lst_403)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_402)(pair? lst_403) #f)"
 "(let-values(((trans-ids_0)(unsafe-car lst_402))"
-"((rest_236)(unsafe-cdr lst_402))"
+"((rest_234)(unsafe-cdr lst_402))"
 "((trans-rhs_5)(unsafe-car lst_403))"
-"((rest_237)(unsafe-cdr lst_403)))"
+"((rest_235)(unsafe-cdr lst_403)))"
 "(let-values(((fold-var_369)"
 "(let-values(((fold-var_370) fold-var_368))"
 "(let-values(((fold-var_371)"
@@ -66234,9 +66237,9 @@ static const char *startup_source =
 "(add-scope trans-rhs_5 sc_40))))"
 " fold-var_370))))"
 "(values fold-var_371)))))"
-"(if(not #f)(for-loop_314 fold-var_369 rest_236 rest_237) fold-var_369)))"
+"(if(not #f)(for-loop_316 fold-var_369 rest_234 rest_235) fold-var_369)))"
 " fold-var_368)))))"
-" for-loop_314)"
+" for-loop_316)"
 " null"
 " lst_400"
 " lst_401))))"
@@ -66354,10 +66357,10 @@ static const char *startup_source =
 "                                 (raise-syntax-error$1 '#%datum \"keyword misused as an expression\" #f datum_2))"
 "(void))"
 "(values))))"
-"(let-values(((phase_143)(expand-context-phase ctx_87)))"
+"(let-values(((phase_141)(expand-context-phase ctx_87)))"
 "(if(if(expand-context-to-parsed? ctx_87)(free-id-set-empty?(expand-context-stops ctx_87)) #f)"
 "(parsed-quote14.1(keep-properties-only~ s_575)(syntax->datum$1 datum_2))"
-"(let-values(((s239_0) s_575)((temp240_0)(list(core-id 'quote phase_143) datum_2)))"
+"(let-values(((s239_0) s_575)((temp240_0)(list(core-id 'quote phase_141) datum_2)))"
 "(rebuild5.1 #t s239_0 temp240_0))))))))))))"
 "(void"
 "(add-core-form!*"
@@ -66393,10 +66396,10 @@ static const char *startup_source =
 "(let-values(((es_3) e242_0))"
 "(if(null? es_3)"
 "(let-values()"
-"(let-values(((phase_144)(expand-context-phase ctx_88)))"
+"(let-values(((phase_142)(expand-context-phase ctx_88)))"
 "(if(expand-context-to-parsed? ctx_88)"
 "(parsed-quote14.1(keep-properties-only~ s_580) null)"
-"(let-values(((s245_0) s_580)((temp246_1)(list(core-id 'quote phase_144) null)))"
+"(let-values(((s245_0) s_580)((temp246_1)(list(core-id 'quote phase_142) null)))"
 "(rebuild5.1 #t s245_0 temp246_1)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
@@ -66439,13 +66442,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_404)))"
-"((letrec-values(((for-loop_315)"
+"((letrec-values(((for-loop_317)"
 "(lambda(fold-var_372 lst_405)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_405)"
 "(let-values(((e_89)(unsafe-car lst_405))"
-"((rest_238)"
+"((rest_236)"
 "(unsafe-cdr lst_405)))"
 "(let-values(((fold-var_373)"
 "(let-values(((fold-var_374)"
@@ -66479,10 +66482,10 @@ static const char *startup_source =
 "(values"
 " fold-var_375)))))"
 "(if(not #f)"
-"(for-loop_315 fold-var_373 rest_238)"
+"(for-loop_317 fold-var_373 rest_236)"
 " fold-var_373)))"
 " fold-var_372)))))"
-" for-loop_315)"
+" for-loop_317)"
 " null"
 " lst_404))))))"
 "(if(expand-context-to-parsed? ctx_88)"
@@ -68098,7 +68101,7 @@ static const char *startup_source =
 "(let-values(((spec_0)"
 "(unsafe-car"
 " lst_406))"
-"((rest_239)"
+"((rest_237)"
 "(unsafe-cdr"
 " lst_406)))"
 "(let-values(((track-stxes_2"
@@ -68525,14 +68528,14 @@ static const char *startup_source =
 " track-stxes_7"
 "(let-values(((spec23_0)"
 " spec_0)"
-"((temp24_10)"
+"((temp24_9)"
 "(list*"
 " for-label19_0"
 " exp-specs_7)))"
 "(rebuild5.1"
 " #t"
 " spec23_0"
-" temp24_10)))))))))"
+" temp24_9)))))))))"
 "(if(unsafe-fx<"
 " index_7"
 " 5)"
@@ -68897,7 +68900,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_53)))"
-"((letrec-values(((for-loop_316)"
+"((letrec-values(((for-loop_318)"
 "(lambda(id:field_1"
 " lst_272)"
 "(begin"
@@ -68907,7 +68910,7 @@ static const char *startup_source =
 "(let-values(((s_783)"
 "(unsafe-car"
 " lst_272))"
-"((rest_240)"
+"((rest_238)"
 "(unsafe-cdr"
 " lst_272)))"
 "(let-values(((id:field_2)"
@@ -68941,12 +68944,12 @@ static const char *startup_source =
 " id:field_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_316"
+"(for-loop_318"
 " id:field_2"
-" rest_240)"
+" rest_238)"
 " id:field_2)))"
 " id:field_1)))))"
-" for-loop_316)"
+" for-loop_318)"
 " null"
 " lst_53)))))"
 "(reverse$1"
@@ -69183,7 +69186,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_407)))"
-"((letrec-values(((for-loop_317)"
+"((letrec-values(((for-loop_319)"
 "(lambda(id_130"
 " lst_408)"
 "(begin"
@@ -69193,7 +69196,7 @@ static const char *startup_source =
 "(let-values(((s_787)"
 "(unsafe-car"
 " lst_408))"
-"((rest_241)"
+"((rest_239)"
 "(unsafe-cdr"
 " lst_408)))"
 "(let-values(((id_131)"
@@ -69227,12 +69230,12 @@ static const char *startup_source =
 " id_133)))))"
 "(if(not"
 " #f)"
-"(for-loop_317"
+"(for-loop_319"
 " id_131"
-" rest_241)"
+" rest_239)"
 " id_131)))"
 " id_130)))))"
-" for-loop_317)"
+" for-loop_319)"
 " null"
 " lst_407)))))"
 "(reverse$1"
@@ -69414,7 +69417,7 @@ static const char *startup_source =
 "(let-values(((s_465)"
 "(unsafe-car"
 " lst_409))"
-"((rest_242)"
+"((rest_240)"
 "(unsafe-cdr"
 " lst_409)))"
 "(let-values(((id_136)"
@@ -69450,7 +69453,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_136"
 " id_136"
-" rest_242)"
+" rest_240)"
 " id_136)))"
 " id_135)))))"
 " for-loop_136)"
@@ -69648,15 +69651,15 @@ static const char *startup_source =
 "(let-values(((s_535)"
 "(car"
 " s_243)))"
-"(if(let-values(((or-part_344)"
+"(if(let-values(((or-part_345)"
 "(if(syntax?$1"
 " s_535)"
 "(symbol?"
 "(syntax-e$1"
 " s_535))"
 " #f)))"
-"(if or-part_344"
-" or-part_344"
+"(if or-part_345"
+" or-part_345"
 "(symbol?"
 " s_535)))"
 " s_535"
@@ -69696,7 +69699,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_410)))"
-"((letrec-values(((for-loop_318)"
+"((letrec-values(((for-loop_320)"
 "(lambda(id_37"
 " lst_411)"
 "(begin"
@@ -69706,7 +69709,7 @@ static const char *startup_source =
 "(let-values(((s_797)"
 "(unsafe-car"
 " lst_411))"
-"((rest_243)"
+"((rest_241)"
 "(unsafe-cdr"
 " lst_411)))"
 "(let-values(((id_139)"
@@ -69740,12 +69743,12 @@ static const char *startup_source =
 " id_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_318"
+"(for-loop_320"
 " id_139"
-" rest_243)"
+" rest_241)"
 " id_139)))"
 " id_37)))))"
-" for-loop_318)"
+" for-loop_320)"
 " null"
 " lst_410)))))"
 "(reverse$1"
@@ -70206,7 +70209,7 @@ static const char *startup_source =
 "(for-loop_102"
 " track-stxes_2"
 " exp-specs_2"
-" rest_239)"
+" rest_237)"
 "(values"
 " track-stxes_2"
 " exp-specs_2))))"
@@ -70287,12 +70290,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_412)))"
-"((letrec-values(((for-loop_319)"
+"((letrec-values(((for-loop_321)"
 "(lambda(lst_413)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_413)"
-"(let-values(((fmt_2)(unsafe-car lst_413))((rest_244)(unsafe-cdr lst_413)))"
+"(let-values(((fmt_2)(unsafe-car lst_413))((rest_242)(unsafe-cdr lst_413)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70310,9 +70313,9 @@ static const char *startup_source =
 " protected?_17)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_319 rest_244)(values))))"
+"(if(not #f)(for-loop_321 rest_242)(values))))"
 "(values))))))"
-" for-loop_319)"
+" for-loop_321)"
 " lst_412)))"
 "(void)"
 "(let-values(((lst_414) fields_0))"
@@ -70320,12 +70323,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_414)))"
-"((letrec-values(((for-loop_320)"
+"((letrec-values(((for-loop_322)"
 "(lambda(lst_415)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_415)"
-"(let-values(((field_0)(unsafe-car lst_415))((rest_245)(unsafe-cdr lst_415)))"
+"(let-values(((field_0)(unsafe-car lst_415))((rest_243)(unsafe-cdr lst_415)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70357,24 +70360,24 @@ static const char *startup_source =
 " protected?_17)))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_320 rest_245)(values))))"
+"(if(not #f)(for-loop_322 rest_243)(values))))"
 "(values))))))"
-" for-loop_320)"
+" for-loop_322)"
 " lst_414)))"
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
 "(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_108)"
 "(begin"
-"(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
+"(let-values(((mod-path_32)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
 "(begin"
-"(if(1/module-path? mod-path_33)"
+"(if(1/module-path? mod-path_32)"
 "(void)"
 "(let-values()"
 "                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_80 mod-path-stx_0)))"
 "(values))))"
-"(let-values(((mpi_53)(module-path->mpi/context mod-path_33 ctx_108)))"
+"(let-values(((mpi_53)(module-path->mpi/context mod-path_32 ctx_108)))"
 "(parse-all-from-module mpi_53 #f orig-s_80 except-ids_0 #f at-phase_16 ns_128 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
@@ -70413,13 +70416,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_416)))"
-"((letrec-values(((for-loop_321)"
+"((letrec-values(((for-loop_323)"
 "(lambda(lst_417)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_417)"
-"(let-values(((i_184)(unsafe-car lst_417))"
-"((rest_246)(unsafe-cdr lst_417)))"
+"(let-values(((i_185)(unsafe-car lst_417))"
+"((rest_244)(unsafe-cdr lst_417)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70427,15 +70430,15 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(let-values(((id_143)"
-"(required-id i_184)))"
-"(let-values(((phase_145)"
+"(required-id i_185)))"
+"(let-values(((phase_143)"
 "(required-phase"
-" i_184)))"
+" i_185)))"
 "(if(let-values(((or-part_405)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
-" phase_145"
+" phase_143"
 " at-phase_17)"
 "(free-identifier=?$1"
 " id_143"
@@ -70443,8 +70446,8 @@ static const char *startup_source =
 " matching-stx_0"
 "(syntax-e$1"
 " id_143))"
-" phase_145"
-" phase_145)"
+" phase_143"
+" phase_143)"
 " #f))"
 " #f)))"
 "(if or-part_405"
@@ -70458,7 +70461,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_418)))"
-"((letrec-values(((for-loop_322)"
+"((letrec-values(((for-loop_324)"
 "(lambda(result_127"
 " lst_419)"
 "(begin"
@@ -70468,7 +70471,7 @@ static const char *startup_source =
 "(let-values(((except-id_0)"
 "(unsafe-car"
 " lst_419))"
-"((rest_247)"
+"((rest_245)"
 "(unsafe-cdr"
 " lst_419)))"
 "(let-values(((result_128)"
@@ -70479,8 +70482,8 @@ static const char *startup_source =
 "(if(free-identifier=?$1"
 " id_143"
 " except-id_0"
-" phase_145"
-" phase_145)"
+" phase_143"
+" phase_143)"
 "(hash-set!"
 " found_0"
 " except-id_0"
@@ -70495,12 +70498,12 @@ static const char *startup_source =
 "(not"
 " #f)"
 " #f)"
-"(for-loop_322"
+"(for-loop_324"
 " result_128"
-" rest_247)"
+" rest_245)"
 " result_128)))"
 " result_127)))))"
-" for-loop_322)"
+" for-loop_324)"
 " #f"
 " lst_418)))))"
 "(void)"
@@ -70508,13 +70511,13 @@ static const char *startup_source =
 "(let-values(((b_95)"
 "(resolve+shift/extra-inspector"
 " id_143"
-" phase_145"
+" phase_143"
 " ns_129)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
 " id_143)"
 "((phase131_0)"
-" phase_145)"
+" phase_143)"
 "((temp132_2)"
 " #t))"
 "(resolve+shift28.1"
@@ -70532,7 +70535,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id_143)))"
 "((phase123_0)"
-" phase_145)"
+" phase_143)"
 "((b124_0)"
 " b_95)"
 "((immed-b125_0)"
@@ -70545,7 +70548,7 @@ static const char *startup_source =
 " protected?_19)"
 "((temp129_3)"
 "(required-as-transformer?"
-" i_184)))"
+" i_185)))"
 "(add-provide!117.1"
 " protected?128_0"
 " temp129_3"
@@ -70558,9 +70561,9 @@ static const char *startup_source =
 " orig-s127_0)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_321 rest_246)(values))))"
+"(if(not #f)(for-loop_323 rest_244)(values))))"
 "(values))))))"
-" for-loop_321)"
+" for-loop_323)"
 " lst_416)))"
 "(void)"
 "(if(=(hash-count found_0)(length except-ids_1))"
@@ -70572,13 +70575,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_420)))"
-"((letrec-values(((for-loop_323)"
+"((letrec-values(((for-loop_325)"
 "(lambda(lst_421)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_421)"
 "(let-values(((except-id_1)(unsafe-car lst_421))"
-"((rest_248)(unsafe-cdr lst_421)))"
+"((rest_246)(unsafe-cdr lst_421)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70601,17 +70604,17 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_422)))"
-"((letrec-values(((for-loop_324)"
+"((letrec-values(((for-loop_326)"
 "(lambda(result_130"
 " lst_423)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_423)"
-"(let-values(((i_185)"
+"(let-values(((i_186)"
 "(unsafe-car"
 " lst_423))"
-"((rest_249)"
+"((rest_247)"
 "(unsafe-cdr"
 " lst_423)))"
 "(let-values(((result_131)"
@@ -70621,30 +70624,30 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id_144)"
 "(required-id"
-" i_185)))"
-"(let-values(((phase_146)"
+" i_186)))"
+"(let-values(((phase_144)"
 "(required-phase"
-" i_185)))"
+" i_186)))"
 "(free-identifier=?$1"
 " id_144"
 " except-id_1"
-" phase_146"
-" phase_146)))))))"
+" phase_144"
+" phase_144)))))))"
 "(values"
 " result_132)))))"
 "(if(if(not"
 "((lambda x_100"
 " result_131)"
-" i_185))"
+" i_186))"
 "(not"
 " #f)"
 " #f)"
-"(for-loop_324"
+"(for-loop_326"
 " result_131"
-" rest_249)"
+" rest_247)"
 " result_131)))"
 " result_130)))))"
-" for-loop_324)"
+" for-loop_326)"
 " #f"
 " lst_422)))))"
 "(void)"
@@ -70660,9 +70663,9 @@ static const char *startup_source =
 " except-id_1))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_323 rest_248)(values))))"
+"(if(not #f)(for-loop_325 rest_246)(values))))"
 "(values))))))"
-" for-loop_323)"
+" for-loop_325)"
 " lst_420)))"
 "(void)))))))))))))"
 "(define-values"
@@ -70679,7 +70682,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_424)))"
-"((letrec-values(((for-loop_325)"
+"((letrec-values(((for-loop_327)"
 "(lambda(lst_85)"
 "(begin"
 " 'for-loop"
@@ -70727,9 +70730,9 @@ static const char *startup_source =
 " p_37))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_325 rest_40)(values))))"
+"(if(not #f)(for-loop_327 rest_40)(values))))"
 "(values))))))"
-" for-loop_325)"
+" for-loop_327)"
 " lst_424)))"
 "(void)))))"
 "((check-expr_0)"
@@ -70756,13 +70759,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_82)))"
-"((letrec-values(((for-loop_326)"
+"((letrec-values(((for-loop_328)"
 "(lambda(lst_86)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
 "(let-values(((rand_0)(unsafe-car lst_86))"
-"((rest_250)(unsafe-cdr lst_86)))"
+"((rest_248)(unsafe-cdr lst_86)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70776,10 +70779,10 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_326 rest_250)"
+"(for-loop_328 rest_248)"
 "(values))))"
 "(values))))))"
-" for-loop_326)"
+" for-loop_328)"
 " lst_82)))"
 "(void)"
 "(let-values(((tmp_63)(cross-phase-primitive-name(parsed-app-rator e_90))))"
@@ -70826,7 +70829,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_425)"
 "(let-values(((clause_5)(unsafe-car lst_425))"
-"((rest_251)(unsafe-cdr lst_425)))"
+"((rest_249)(unsafe-cdr lst_425)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70837,7 +70840,7 @@ static const char *startup_source =
 "(cadr clause_5)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_243 rest_251)(values))))"
+"(if(not #f)(for-loop_243 rest_249)(values))))"
 "(values))))))"
 " for-loop_243)"
 " lst_269)))"
@@ -70887,9 +70890,9 @@ static const char *startup_source =
 "(if(let-values(((or-part_83)(not normal-b_1)))"
 "(if or-part_83"
 " or-part_83"
-"(let-values(((or-part_310)(parsed-top-id? id_4)))"
-"(if or-part_310"
-" or-part_310"
+"(let-values(((or-part_311)(parsed-top-id? id_4)))"
+"(if or-part_311"
+" or-part_311"
 "(if(not(symbol? normal-b_1))"
 "(eq?(module-binding-module normal-b_1) self-mpi_6)"
 " #f)))))"
@@ -70942,8 +70945,8 @@ static const char *startup_source =
 " lst_23)))"
 "(void)"
 "(check-body-no-disallowed-expr_0(parsed-let_-values-body e_91))))"
-"(if(let-values(((or-part_357)(parsed-quote-syntax? e_91)))"
-"(if or-part_357 or-part_357(parsed-#%variable-reference? e_91)))"
+"(if(let-values(((or-part_358)(parsed-quote-syntax? e_91)))"
+"(if or-part_358 or-part_358(parsed-#%variable-reference? e_91)))"
 "(let-values()(disallow e_91))"
 "(let-values()(void)))))))))))))))"
 "((check-body-no-disallowed-expr_0)"
@@ -70956,13 +70959,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_77)))"
-"((letrec-values(((for-loop_327)"
+"((letrec-values(((for-loop_329)"
 "(lambda(lst_58)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_58)"
 "(let-values(((e_81)(unsafe-car lst_58))"
-"((rest_196)(unsafe-cdr lst_58)))"
+"((rest_194)(unsafe-cdr lst_58)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70973,9 +70976,9 @@ static const char *startup_source =
 " e_81))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_327 rest_196)(values))))"
+"(if(not #f)(for-loop_329 rest_194)(values))))"
 "(values))))))"
-" for-loop_327)"
+" for-loop_329)"
 " lst_77)))"
 "(void))))))"
 "(check-body_0 bodys_13)))))"
@@ -72965,7 +72968,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_426)))"
-"((letrec-values(((for-loop_328)"
+"((letrec-values(((for-loop_330)"
 "(lambda(lst_427)"
 "(begin"
 " 'for-loop"
@@ -72974,7 +72977,7 @@ static const char *startup_source =
 "(let-values(((mpi_55)"
 "(unsafe-car"
 " lst_427))"
-"((rest_252)"
+"((rest_250)"
 "(unsafe-cdr"
 " lst_427)))"
 "(let-values((()"
@@ -72989,11 +72992,11 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_328"
-" rest_252)"
+"(for-loop_330"
+" rest_250)"
 "(values))))"
 "(values))))))"
-" for-loop_328)"
+" for-loop_330)"
 " lst_426)))"
 "(void)"
 "(let-values(((result-s_15)"
@@ -73073,7 +73076,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ctx_73) ctx22_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes23_0))"
-"(let-values(((phase_147) phase24_4))"
+"(let-values(((phase_145) phase24_4))"
 "(let-values(((s_812) s25_0))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
@@ -73119,7 +73122,7 @@ static const char *startup_source =
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_147))"
+"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_145))"
 "(let-values()(car bodys_18))"
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
@@ -73134,13 +73137,13 @@ static const char *startup_source =
 " '#%module-begin"
 "(core-form-sym"
 "(syntax-disarm$1 partly-expanded-body_0)"
-" phase_147))"
+" phase_145))"
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
 "(let-values(((temp439_0)(list partly-expanded-body_0))"
 "((s440_0) s_812)"
 "((scopes-s441_0) scopes-s_0)"
-"((phase442_0) phase_147)"
+"((phase442_0) phase_145)"
 "((module-name-sym443_0) module-name-sym_1)"
 "((temp444_0)(make-mb-ctx_0))"
 "((temp445_0) #f))"
@@ -73156,7 +73159,7 @@ static const char *startup_source =
 "(let-values(((bodys446_0) bodys_18)"
 "((s447_0) s_812)"
 "((scopes-s448_0) scopes-s_0)"
-"((phase449_0) phase_147)"
+"((phase449_0) phase_145)"
 "((module-name-sym450_0) module-name-sym_1)"
 "((temp451_0)(make-mb-ctx_0)))"
 "(add-module-begin45.1"
@@ -73301,7 +73304,7 @@ static const char *startup_source =
 "(begin"
 " 'partially-expand-bodys79"
 "(let-values(((bodys_20) bodys78_0))"
-"(let-values(((phase_148) phase48_2))"
+"(let-values(((phase_146) phase48_2))"
 "(let-values(((partial-body-ctx_1) ctx49_1))"
 "(let-values(((m-ns_20) namespace50_0))"
 "(let-values(((self_34) self51_0))"
@@ -73318,14 +73321,14 @@ static const char *startup_source =
 "(let-values(((pass-1-and-2-loop_1) loop62_0))"
 "(let-values()"
 "(begin"
-"(namespace-visit-available-modules! m-ns_20 phase_148)"
+"(namespace-visit-available-modules! m-ns_20 phase_146)"
 "((letrec-values(((loop_122)"
 "(lambda(tail?_53 bodys_21)"
 "(begin"
 " 'loop"
 "(if(null? bodys_21)"
 "(let-values()"
-"(if(if tail?_53(not(zero? phase_148)) #f)"
+"(if(if tail?_53(not(zero? phase_146)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_139)"
@@ -73431,7 +73434,7 @@ static const char *startup_source =
 "(let-values(((tmp_64)"
 "(core-form-sym"
 " disarmed-exp-body_1"
-" phase_148)))"
+" phase_146)))"
 "(if(equal?"
 " tmp_64"
 " 'begin)"
@@ -73548,7 +73551,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " m-ns_20"
 "(add1"
-" phase_148))))"
+" phase_146))))"
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
@@ -73626,7 +73629,7 @@ static const char *startup_source =
 "(pass-1-and-2-loop_1"
 " e470_0"
 "(add1"
-" phase_148)"
+" phase_146)"
 " #f)))"
 "(begin"
 "(let-values(((obs_146)"
@@ -73642,17 +73645,17 @@ static const char *startup_source =
 "(namespace-run-available-modules!"
 " m-ns_20"
 "(add1"
-" phase_148))"
+" phase_146))"
 "(eval-nested-bodys"
 " nested-bodys_1"
 "(add1"
-" phase_148)"
+" phase_146)"
 " ct-m-ns_0"
 " self_34"
 " partial-body-ctx_1)"
 "(namespace-visit-available-modules!"
 " m-ns_20"
-" phase_148)"
+" phase_146)"
 "(let-values(((obs_147)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
@@ -73683,7 +73686,7 @@ static const char *startup_source =
 "(let-values(((nested-body_0)"
 "(unsafe-car"
 " lst_429))"
-"((rest_253)"
+"((rest_251)"
 "(unsafe-cdr"
 " lst_429)))"
 "(let-values(((fold-var_377)"
@@ -73702,7 +73705,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_154"
 " fold-var_377"
-" rest_253)"
+" rest_251)"
 " fold-var_377)))"
 " fold-var_376)))))"
 " for-loop_154)"
@@ -73812,7 +73815,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_430)))"
-"((letrec-values(((for-loop_329)"
+"((letrec-values(((for-loop_331)"
 "(lambda(id_147"
 " lst_431)"
 "(begin"
@@ -73822,7 +73825,7 @@ static const char *startup_source =
 "(let-values(((s_832)"
 "(unsafe-car"
 " lst_431))"
-"((rest_254)"
+"((rest_252)"
 "(unsafe-cdr"
 " lst_431)))"
 "(let-values(((id_148)"
@@ -73856,12 +73859,12 @@ static const char *startup_source =
 " id_150)))))"
 "(if(not"
 " #f)"
-"(for-loop_329"
+"(for-loop_331"
 " id_148"
-" rest_254)"
+" rest_252)"
 " id_148)))"
 " id_147)))))"
-" for-loop_329)"
+" for-loop_331)"
 " null"
 " lst_430)))))"
 "(reverse$1"
@@ -73935,7 +73938,7 @@ static const char *startup_source =
 "(let-values(((ids482_0)"
 " ids_44)"
 "((phase483_0)"
-" phase_148)"
+" phase_146)"
 "((exp-body484_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids7.1"
@@ -73950,7 +73953,7 @@ static const char *startup_source =
 "(let-values(((ids485_0)"
 " ids_44)"
 "((phase486_0)"
-" phase_148)"
+" phase_146)"
 "((requires+provides487_0)"
 " requires+provides_7)"
 "((exp-body488_0)"
@@ -73969,7 +73972,7 @@ static const char *startup_source =
 "((self495_0)"
 " self_34)"
 "((phase496_0)"
-" phase_148)"
+" phase_146)"
 "((all-scopes-stx497_0)"
 " all-scopes-stx_5)"
 "((frame-id498_0)"
@@ -73999,7 +74002,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_432)))"
-"((letrec-values(((for-loop_330)"
+"((letrec-values(((for-loop_332)"
 "(lambda(lst_260)"
 "(begin"
 " 'for-loop"
@@ -74019,17 +74022,17 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-unset-transformer!"
 " m-ns_20"
-" phase_148"
+" phase_146"
 " sym_23))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_330"
+"(for-loop_332"
 " rest_142)"
 "(values))))"
 "(values))))))"
-" for-loop_330)"
+" for-loop_332)"
 " lst_432)))"
 "(void)"
 "(let-values(((requires+provides489_0)"
@@ -74037,7 +74040,7 @@ static const char *startup_source =
 "((syms490_0)"
 " syms_23)"
 "((phase491_0)"
-" phase_148))"
+" phase_146))"
 "(add-defined-syms!103.1"
 " #f"
 " requires+provides489_0"
@@ -74180,7 +74183,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_433)))"
-"((letrec-values(((for-loop_331)"
+"((letrec-values(((for-loop_333)"
 "(lambda(id_152"
 " lst_434)"
 "(begin"
@@ -74190,7 +74193,7 @@ static const char *startup_source =
 "(let-values(((s_845)"
 "(unsafe-car"
 " lst_434))"
-"((rest_255)"
+"((rest_253)"
 "(unsafe-cdr"
 " lst_434)))"
 "(let-values(((id_153)"
@@ -74224,12 +74227,12 @@ static const char *startup_source =
 " id_155)))))"
 "(if(not"
 " #f)"
-"(for-loop_331"
+"(for-loop_333"
 " id_153"
-" rest_255)"
+" rest_253)"
 " id_153)))"
 " id_152)))))"
-" for-loop_331)"
+" for-loop_333)"
 " null"
 " lst_433)))))"
 "(reverse$1"
@@ -74303,7 +74306,7 @@ static const char *startup_source =
 "(let-values(((ids510_0)"
 " ids_45)"
 "((phase511_0)"
-" phase_148)"
+" phase_146)"
 "((exp-body512_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids7.1"
@@ -74318,7 +74321,7 @@ static const char *startup_source =
 "(let-values(((ids513_0)"
 " ids_45)"
 "((phase514_0)"
-" phase_148)"
+" phase_146)"
 "((requires+provides515_0)"
 " requires+provides_7)"
 "((exp-body516_0)"
@@ -74337,7 +74340,7 @@ static const char *startup_source =
 "((self524_0)"
 " self_34)"
 "((phase525_0)"
-" phase_148)"
+" phase_146)"
 "((all-scopes-stx526_0)"
 " all-scopes-stx_5)"
 "((frame-id527_0)"
@@ -74366,7 +74369,7 @@ static const char *startup_source =
 "((syms518_0)"
 " syms_24)"
 "((phase519_0)"
-" phase_148)"
+" phase_146)"
 "((temp520_0)"
 " #t))"
 "(add-defined-syms!103.1"
@@ -74527,7 +74530,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_437)))"
-"((letrec-values(((for-loop_332)"
+"((letrec-values(((for-loop_334)"
 "(lambda(lst_438"
 " lst_439"
 " lst_440)"
@@ -74544,19 +74547,19 @@ static const char *startup_source =
 "(let-values(((sym_110)"
 "(unsafe-car"
 " lst_438))"
-"((rest_256)"
+"((rest_254)"
 "(unsafe-cdr"
 " lst_438))"
 "((val_87)"
 "(unsafe-car"
 " lst_439))"
-"((rest_257)"
+"((rest_255)"
 "(unsafe-cdr"
 " lst_439))"
 "((id_156)"
 "(unsafe-car"
 " lst_440))"
-"((rest_258)"
+"((rest_256)"
 "(unsafe-cdr"
 " lst_440)))"
 "(let-values((()"
@@ -74569,24 +74572,24 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_87"
 " id_156"
-" phase_148"
+" phase_146"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
 " m-ns_20"
-" phase_148"
+" phase_146"
 " sym_110"
 " val_87)))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_332"
-" rest_256"
-" rest_257"
-" rest_258)"
+"(for-loop_334"
+" rest_254"
+" rest_255"
+" rest_256)"
 "(values))))"
 "(values))))))"
-" for-loop_332)"
+" for-loop_334)"
 " lst_435"
 " lst_436"
 " lst_437)))"
@@ -74729,9 +74732,9 @@ static const char *startup_source =
 "((m-ns550_0)"
 " m-ns_20)"
 "((phase551_0)"
-" phase_148)"
+" phase_146)"
 "((phase552_0)"
-" phase_148)"
+" phase_146)"
 "((requires+provides553_0)"
 " requires+provides_7)"
 "((declared-submodule-names554_0)"
@@ -74920,7 +74923,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_441)))"
-"((letrec-values(((for-loop_333)"
+"((letrec-values(((for-loop_335)"
 "(lambda(lst_442)"
 "(begin"
 " 'for-loop"
@@ -74929,7 +74932,7 @@ static const char *startup_source =
 "(let-values(((kw_1)"
 "(unsafe-car"
 " lst_442))"
-"((rest_259)"
+"((rest_257)"
 "(unsafe-cdr"
 " lst_442)))"
 "(let-values((()"
@@ -74982,11 +74985,11 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_333"
-" rest_259)"
+"(for-loop_335"
+" rest_257)"
 "(values))))"
 "(values))))))"
-" for-loop_333)"
+" for-loop_335)"
 " lst_441)))"
 "(values))))"
 "(let-values()"
@@ -75034,7 +75037,7 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_35 frame-id_18 inside-scope_2 all-scopes-stx_6 defined-syms_13 requires+provides_8)"
 "(begin"
-"(lambda(ids_46 rhs_23 phase_149)"
+"(lambda(ids_46 rhs_23 phase_147)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
 "(let-values(((lst_443) ids_46))"
@@ -75042,13 +75045,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_443)))"
-"((letrec-values(((for-loop_334)"
+"((letrec-values(((for-loop_336)"
 "(lambda(fold-var_379 lst_444)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_444)"
 "(let-values(((id_157)(unsafe-car lst_444))"
-"((rest_260)(unsafe-cdr lst_444)))"
+"((rest_258)(unsafe-cdr lst_444)))"
 "(let-values(((fold-var_380)"
 "(let-values(((fold-var_381) fold-var_379))"
 "(let-values(((fold-var_382)"
@@ -75060,16 +75063,16 @@ static const char *startup_source =
 " inside-scope_2))"
 " fold-var_381))))"
 "(values fold-var_382)))))"
-"(if(not #f)(for-loop_334 fold-var_380 rest_260) fold-var_380)))"
+"(if(not #f)(for-loop_336 fold-var_380 rest_258) fold-var_380)))"
 " fold-var_379)))))"
-" for-loop_334)"
+" for-loop_336)"
 " null"
 " lst_443))))))"
 "(let-values(((syms_25)"
 "(let-values(((scoped-ids568_0) scoped-ids_0)"
 "((defined-syms569_0) defined-syms_13)"
 "((self570_0) self_35)"
-"((phase571_0) phase_149)"
+"((phase571_0) phase_147)"
 "((all-scopes-stx572_0) all-scopes-stx_6)"
 "((frame-id573_0) frame-id_18)"
 "((requires+provides574_0) requires+provides_8))"
@@ -75089,7 +75092,7 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_149) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_147) 'define-values)"
 " scoped-ids_0"
 " rhs_23))"
 " inside-scope_2)))"
@@ -75104,12 +75107,12 @@ static const char *startup_source =
 "(let-values(((lst_445) bodys_23))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_445)))"
-"((letrec-values(((for-loop_335)"
+"((letrec-values(((for-loop_337)"
 "(lambda(fold-var_383 lst_446)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_446)"
-"(let-values(((body_21)(unsafe-car lst_446))((rest_261)(unsafe-cdr lst_446)))"
+"(let-values(((body_21)(unsafe-car lst_446))((rest_259)(unsafe-cdr lst_446)))"
 "(let-values(((fold-var_384)"
 "(let-values(((fold-var_385) fold-var_383))"
 "(let-values(((fold-var_386)"
@@ -75119,9 +75122,9 @@ static const char *startup_source =
 "(apply-post-expansion pe_3 body_21))"
 " fold-var_385))))"
 "(values fold-var_386)))))"
-"(if(not #f)(for-loop_335 fold-var_384 rest_261) fold-var_384)))"
+"(if(not #f)(for-loop_337 fold-var_384 rest_259) fold-var_384)))"
 " fold-var_383)))))"
-" for-loop_335)"
+" for-loop_337)"
 " null"
 " lst_445))))"
 " bodys_23)))))"
@@ -75138,7 +75141,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons97"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys96_0))"
-"(let-values(((phase_150) phase82_0))"
+"(let-values(((phase_148) phase82_0))"
 "(let-values(((body-ctx_7) ctx83_0))"
 "(let-values(((self_36) self84_0))"
 "(let-values(((declared-submodule-names_5) declared-submodule-names85_0))"
@@ -75152,7 +75155,7 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_24)"
 "(let-values()"
-"(if(if tail?_54(not(zero? phase_150)) #f)"
+"(if(if tail?_54(not(zero? phase_148)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_156)(expand-context-observer body-ctx_7)))"
@@ -75426,7 +75429,7 @@ static const char *startup_source =
 "(let-values(((tmp_65)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_150)))"
+" phase_148)))"
 "(if(if(equal? tmp_65 '#%require)"
 " #t"
 "(if(equal? tmp_65 '#%provide)"
@@ -75504,7 +75507,7 @@ static const char *startup_source =
 "(let-values(((exp-lifted-modules_0)"
 "(let-values(((lifted-modules597_0)"
 " lifted-modules_0)"
-"((phase598_0) phase_150)"
+"((phase598_0) phase_148)"
 "((self599_0) self_36)"
 "((body-ctx600_0)"
 " body-ctx_7)"
@@ -75561,12 +75564,12 @@ static const char *startup_source =
 "(let-values(((ht_166) need-eventually-defined_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_166)))"
-"((letrec-values(((for-loop_336)"
-"(lambda(i_186)"
+"((letrec-values(((for-loop_338)"
+"(lambda(i_187)"
 "(begin"
 " 'for-loop"
-"(if i_186"
-"(let-values(((phase_151 l_89)(hash-iterate-key+value ht_166 i_186)))"
+"(if i_187"
+"(let-values(((phase_149 l_89)(hash-iterate-key+value ht_166 i_187)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75580,7 +75583,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_447)))"
-"((letrec-values(((for-loop_337)"
+"((letrec-values(((for-loop_339)"
 "(lambda(lst_448)"
 "(begin"
 " 'for-loop"
@@ -75589,7 +75592,7 @@ static const char *startup_source =
 "(let-values(((id_158)"
 "(unsafe-car"
 " lst_448))"
-"((rest_262)"
+"((rest_260)"
 "(unsafe-cdr"
 " lst_448)))"
 "(let-values((()"
@@ -75602,7 +75605,7 @@ static const char *startup_source =
 "(let-values(((id605_0)"
 " id_158)"
 "((phase606_0)"
-" phase_151))"
+" phase_149))"
 "(resolve+shift28.1"
 " #f"
 " #f"
@@ -75633,7 +75636,7 @@ static const char *startup_source =
 " requires+provides_9"
 "(module-binding-sym"
 " b_96)"
-" phase_151)"
+" phase_149)"
 " #f)))"
 "(if(eq?"
 " bound-kind_0"
@@ -75657,14 +75660,14 @@ static const char *startup_source =
 "(format"
 "                                                                                                                                                           \"\\n  at phase: ~a\""
 "(let-values(((tmp_66)"
-" phase_151))"
+" phase_149))"
 "(if(equal?"
 " tmp_66"
 " 1)"
 "(let-values()"
 "                                                                                                                                                                 \"1; the transformer environment\")"
 "(let-values()"
-" phase_151)))))"
+" phase_149)))))"
 " id_158"
 " #f"
 " null"
@@ -75674,18 +75677,18 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_337"
-" rest_262)"
+"(for-loop_339"
+" rest_260)"
 "(values))))"
 "(values))))))"
-" for-loop_337)"
+" for-loop_339)"
 " lst_447)))"
 "(void)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_336(hash-iterate-next ht_166 i_186))(values))))"
+"(if(not #f)(for-loop_338(hash-iterate-next ht_166 i_187))(values))))"
 "(values))))))"
-" for-loop_336)"
+" for-loop_338)"
 "(hash-iterate-first ht_166))))"
 "(void)))))"
 "(define-values"
@@ -75703,13 +75706,13 @@ static const char *startup_source =
 "(let-values(((requires+provides_10) requires-and-provides100_0))"
 "(let-values(((declared-submodule-names_6) declared-submodule-names101_0))"
 "(let-values(((m-ns_21) namespace102_0))"
-"(let-values(((phase_152) phase103_0))"
+"(let-values(((phase_150) phase103_0))"
 "(let-values(((self_38) self104_0))"
 "(let-values(((ctx_117) ctx105_0))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_124)"
-"(lambda(bodys_26 phase_153)"
+"(lambda(bodys_26 phase_151)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
@@ -75717,13 +75720,13 @@ static const char *startup_source =
 "(if(let-values(((or-part_413)(parsed?(car bodys_26))))"
 "(if or-part_413 or-part_413(expanded+parsed?(car bodys_26))))"
 "(let-values()"
-"(cons(car bodys_26)(loop_124(cdr bodys_26) phase_153)))"
+"(cons(car bodys_26)(loop_124(cdr bodys_26) phase_151)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_26))"
 "(let-values()"
 "(let-values(((nested-bodys_2)"
 "(loop_124"
 "(semi-parsed-begin-for-syntax-body(car bodys_26))"
-"(add1 phase_153))))"
+"(add1 phase_151))))"
 "(cons"
 "(let-values(((the-struct_116)(car bodys_26)))"
 "(if(semi-parsed-begin-for-syntax? the-struct_116)"
@@ -75735,11 +75738,11 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
 " the-struct_116)))"
-"(loop_124(cdr bodys_26) phase_153))))"
+"(loop_124(cdr bodys_26) phase_151))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_26))))"
 "(let-values(((tmp_67)"
-"(core-form-sym disarmed-body_1 phase_153)))"
+"(core-form-sym disarmed-body_1 phase_151)))"
 "(if(equal? tmp_67 '#%provide)"
 "(let-values()"
 "(let-values((()"
@@ -75816,7 +75819,7 @@ static const char *startup_source =
 "(car bodys_26)"
 " requires+provides_10"
 " self_38"
-" phase_153"
+" phase_151"
 "(let-values(((v_268) ctx_117))"
 "(let-values(((the-struct_117)"
 " v_268))"
@@ -75831,11 +75834,11 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_118)"
 "(let-values(((phase614_0)"
-" phase_153)"
+" phase_151)"
 "((namespace615_0)"
 "(namespace->namespace-at-phase"
 " m-ns_21"
-" phase_153))"
+" phase_151))"
 "((requires+provides616_0)"
 " requires+provides_10)"
 "((declared-submodule-names617_0)"
@@ -75928,7 +75931,7 @@ static const char *startup_source =
 " the-struct_117)))))))"
 "(if(expand-context-to-parsed? ctx_117)"
 "(let-values()"
-"(loop_124(cdr bodys_26) phase_153))"
+"(loop_124(cdr bodys_26) phase_151))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
@@ -75959,14 +75962,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_124"
 "(cdr bodys_26)"
-" phase_153))))))))))"
+" phase_151))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_26)"
-"(loop_124(cdr bodys_26) phase_153))))))))))))))"
+"(loop_124(cdr bodys_26) phase_151))))))))))))))"
 " loop_124)"
 " expression-expanded-bodys_1"
-" phase_152)))))))))))))"
+" phase_150)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion137.1)"
 "(lambda(ctx123_1"
@@ -76092,7 +76095,7 @@ static const char *startup_source =
 " 'expand-post-submodules163"
 "(let-values(((fully-expanded-bodys-except-post-submodules_2) fully-expanded-bodys-except-post-submodules162_0))"
 "(let-values(((declare-enclosing-module_1) declare-enclosing140_0))"
-"(let-values(((phase_154) phase141_1))"
+"(let-values(((phase_152) phase141_1))"
 "(let-values(((self_40) self142_0))"
 "(let-values(((requires+provides_12) requires-and-provides143_0))"
 "(let-values(((enclosing-is-cross-phase-persistent?_1) enclosing-is-cross-phase-persistent?144_0))"
@@ -76104,7 +76107,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx150_0))"
 "(let-values()"
 "((letrec-values(((loop_125)"
-"(lambda(bodys_27 phase_155)"
+"(lambda(bodys_27 phase_153)"
 "(begin"
 " 'loop"
 "(if(null? bodys_27)"
@@ -76184,7 +76187,7 @@ static const char *startup_source =
 "(loop_125"
 "(semi-parsed-begin-for-syntax-body"
 " body_23)"
-"(add1 phase_155))))"
+"(add1 phase_153))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -76206,20 +76209,20 @@ static const char *startup_source =
 " rebuild-body-s636_0"
 " temp637_0))"
 " parsed-bfs_0))"
-"(loop_125 rest-bodys_3 phase_155))))))))"
+"(loop_125 rest-bodys_3 phase_153))))))))"
 "(if(let-values(((or-part_415)(parsed? body_23)))"
 "(if or-part_415"
 " or-part_415"
 "(expanded+parsed? body_23)))"
 "(let-values()"
-"(cons body_23(loop_125 rest-bodys_3 phase_155)))"
+"(cons body_23(loop_125 rest-bodys_3 phase_153)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_23)))"
 "(let-values(((tmp_68)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_155)))"
+" phase_153)))"
 "(if(equal? tmp_68 'module*)"
 "(let-values()"
 "(let-values((()"
@@ -76378,7 +76381,7 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_155)))"
+" phase_153)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
@@ -76433,7 +76436,7 @@ static const char *startup_source =
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_155)))"
+" phase_153)))"
 "(expanded+parsed1.1"
 " s658_0"
 "(expanded+parsed-parsed"
@@ -76445,7 +76448,7 @@ static const char *startup_source =
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_155))))))))"
+" phase_153))))))))"
 "(let-values()"
 "(let-values(((ready-body659_0)"
 " ready-body_2)"
@@ -76479,16 +76482,16 @@ static const char *startup_source =
 " submod_3"
 "(loop_125"
 " rest-bodys_3"
-" phase_155)))))))"
+" phase_153)))))))"
 "(let-values()"
 "(cons"
 " body_23"
 "(loop_125"
 " rest-bodys_3"
-" phase_155)))))))))))))))))"
+" phase_153)))))))))))))))))"
 " loop_125)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_154)))))))))))))))))"
+" phase_152)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
 "(lambda(ctx_119)"
@@ -76503,7 +76506,7 @@ static const char *startup_source =
 "(begin"
 " 'check-ids-unbound171"
 "(let-values(((ids_48) ids168_0))"
-"(let-values(((phase_156) phase169_2))"
+"(let-values(((phase_154) phase169_2))"
 "(let-values(((requires+provides_13) requires+provides170_0))"
 "(let-values(((s_900) in166_0))"
 "(let-values()"
@@ -76513,13 +76516,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_449)))"
-"((letrec-values(((for-loop_338)"
+"((letrec-values(((for-loop_340)"
 "(lambda(lst_450)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_450)"
 "(let-values(((id_159)(unsafe-car lst_450))"
-"((rest_263)(unsafe-cdr lst_450)))"
+"((rest_261)(unsafe-cdr lst_450)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76530,7 +76533,7 @@ static const char *startup_source =
 " requires+provides_13)"
 "((id668_0) id_159)"
 "((phase669_0)"
-" phase_156)"
+" phase_154)"
 "((s670_0) s_900)"
 "((temp671_0) 'module))"
 "(check-not-defined95.1"
@@ -76546,25 +76549,25 @@ static const char *startup_source =
 " phase669_0)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_338 rest_263)(values))))"
+"(if(not #f)(for-loop_340 rest_261)(values))))"
 "(values))))))"
-" for-loop_338)"
+" for-loop_340)"
 " lst_449)))"
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_28 phase_157 m-ns_23 self_41 ctx_120)"
+"(lambda(bodys_28 phase_155 m-ns_23 self_41 ctx_120)"
 "(begin"
 "(begin"
 "(let-values(((lst_451) bodys_28))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_451)))"
-"((letrec-values(((for-loop_339)"
+"((letrec-values(((for-loop_341)"
 "(lambda(lst_452)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_452)"
-"(let-values(((body_24)(unsafe-car lst_452))((rest_264)(unsafe-cdr lst_452)))"
+"(let-values(((body_24)(unsafe-car lst_452))((rest_262)(unsafe-cdr lst_452)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76587,7 +76590,7 @@ static const char *startup_source =
 " ids_49"
 "(parsed-define-values-rhs"
 " p_80)"
-" phase_157"
+" phase_155"
 " m-ns_23"
 " ctx_120)))"
 "(begin"
@@ -76612,7 +76615,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list lst_455)))"
-"((letrec-values(((for-loop_340)"
+"((letrec-values(((for-loop_342)"
 "(lambda(lst_456"
 " lst_457"
 " lst_458)"
@@ -76629,19 +76632,19 @@ static const char *startup_source =
 "(let-values(((id_160)"
 "(unsafe-car"
 " lst_456))"
-"((rest_265)"
+"((rest_263)"
 "(unsafe-cdr"
 " lst_456))"
 "((sym_111)"
 "(unsafe-car"
 " lst_457))"
-"((rest_266)"
+"((rest_264)"
 "(unsafe-cdr"
 " lst_457))"
 "((val_88)"
 "(unsafe-car"
 " lst_458))"
-"((rest_267)"
+"((rest_265)"
 "(unsafe-cdr"
 " lst_458)))"
 "(let-values((()"
@@ -76652,20 +76655,20 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_23"
-" phase_157"
+" phase_155"
 " sym_111"
 " val_88))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_340"
-" rest_265"
-" rest_266"
-" rest_267)"
+"(for-loop_342"
+" rest_263"
+" rest_264"
+" rest_265)"
 "(values))))"
 "(values))))))"
-" for-loop_340)"
+" for-loop_342)"
 " lst_453"
 " lst_454"
 " lst_455)))"
@@ -76703,7 +76706,7 @@ static const char *startup_source =
 "(let-values(((m-ns672_0)"
 " m-ns_23)"
 "((phase673_0)"
-" phase_157))"
+" phase_155))"
 "(make-compile-context14.1"
 " #f"
 " unsafe-undefined"
@@ -76714,9 +76717,9 @@ static const char *startup_source =
 " m-ns_23)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_339 rest_264)(values))))"
+"(if(not #f)(for-loop_341 rest_262)(values))))"
 "(values))))))"
-" for-loop_339)"
+" for-loop_341)"
 " lst_451)))"
 "(void)))))"
 "(define-values"
@@ -77110,7 +77113,7 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules208"
 "(let-values(((bodys_29) bodys204_0))"
-"(let-values(((phase_158) phase205_0))"
+"(let-values(((phase_156) phase205_0))"
 "(let-values(((self_43) self206_0))"
 "(let-values(((ctx_122) ctx207_0))"
 "(let-values(((mpis-to-reset_5) mpis-to-reset196_0))"
@@ -77124,13 +77127,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_459)))"
-"((letrec-values(((for-loop_341)"
+"((letrec-values(((for-loop_343)"
 "(lambda(fold-var_387 lst_460)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_460)"
 "(let-values(((body_25)(unsafe-car lst_460))"
-"((rest_268)(unsafe-cdr lst_460)))"
+"((rest_266)(unsafe-cdr lst_460)))"
 "(let-values(((fold-var_388)"
 "(let-values(((fold-var_389) fold-var_387))"
 "(let-values(((fold-var_390)"
@@ -77141,7 +77144,7 @@ static const char *startup_source =
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_25)"
-" phase_158)))"
+" phase_156)))"
 "(if(equal? tmp_69 'module)"
 "(let-values()"
 "(let-values(((body709_0)"
@@ -77176,10 +77179,10 @@ static const char *startup_source =
 " fold-var_389))))"
 "(values fold-var_390)))))"
 "(if(not #f)"
-"(for-loop_341 fold-var_388 rest_268)"
+"(for-loop_343 fold-var_388 rest_266)"
 " fold-var_388)))"
 " fold-var_387)))))"
-" for-loop_341)"
+" for-loop_343)"
 " null"
 " lst_459))))))))))))))))"
 "(define-values"
@@ -77192,7 +77195,7 @@ static const char *startup_source =
 "(let-values(((requires+provides_14) requires+provides215_0))"
 "(let-values(((declared-submodule-names_10) declared-submodule-names211_0))"
 "(let-values()"
-"(lambda(s_905 phase_159)"
+"(lambda(s_905 phase_157)"
 "(let-values(((ok?_92 #%require717_0 req718_0)"
 "(let-values(((s_906)(syntax-disarm$1 s_905)))"
 "(let-values(((orig-s_93) s_906))"
@@ -77240,8 +77243,8 @@ static const char *startup_source =
 "((s723_0) s_905)"
 "((self724_0) self_44)"
 "((m-ns725_0) m-ns_24)"
-"((phase726_0) phase_159)"
-"((phase727_0) phase_159)"
+"((phase726_0) phase_157)"
+"((phase727_0) phase_157)"
 "((requires+provides728_0) requires+provides_14)"
 "((declared-submodule-names729_0) declared-submodule-names_10)"
 "((temp730_0) 'require))"
@@ -77277,13 +77280,13 @@ static const char *startup_source =
 "(let-values(((lst_461) lifted-defns_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_461)))"
-"((letrec-values(((for-loop_342)"
+"((letrec-values(((for-loop_344)"
 "(lambda(fold-var_391 lst_462)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_462)"
 "(let-values(((lifted-defn_0)(unsafe-car lst_462))"
-"((rest_269)(unsafe-cdr lst_462)))"
+"((rest_267)(unsafe-cdr lst_462)))"
 "(let-values(((fold-var_392)"
 "(let-values(((fold-var_393) fold-var_391))"
 "(let-values(((fold-var_394)"
@@ -77293,9 +77296,9 @@ static const char *startup_source =
 "(defn-extract-syntax lifted-defn_0))"
 " fold-var_393))))"
 "(values fold-var_394)))))"
-"(if(not #f)(for-loop_342 fold-var_392 rest_269) fold-var_392)))"
+"(if(not #f)(for-loop_344 fold-var_392 rest_267) fold-var_392)))"
 " fold-var_391)))))"
-" for-loop_342)"
+" for-loop_344)"
 " null"
 " lst_461)))))))"
 "(define-values"
@@ -77318,13 +77321,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_463)))"
-"((letrec-values(((for-loop_343)"
+"((letrec-values(((for-loop_345)"
 "(lambda(lst_464)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_464)"
 "(let-values(((s-lifted-defn_0)(unsafe-car lst_464))"
-"((rest_270)(unsafe-cdr lst_464)))"
+"((rest_268)(unsafe-cdr lst_464)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -77430,9 +77433,9 @@ static const char *startup_source =
 " s-lifted-defn_0))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_343 rest_270)(values))))"
+"(if(not #f)(for-loop_345 rest_268)(values))))"
 "(values))))))"
-" for-loop_343)"
+" for-loop_345)"
 " lst_463)))"
 "(values))))"
 "(let-values()"
@@ -77565,7 +77568,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_86)"
 "(let-values(((id_161)(unsafe-car lst_86))"
-"((rest_250)(unsafe-cdr lst_86)))"
+"((rest_248)(unsafe-cdr lst_86)))"
 "(let-values(((fold-var_26)"
 "(let-values(((fold-var_397) fold-var_221))"
 "(let-values(((fold-var_224)"
@@ -77578,7 +77581,7 @@ static const char *startup_source =
 " fold-var_397))))"
 "(values fold-var_224)))))"
 "(if(not #f)"
-"(for-loop_83 fold-var_26 rest_250)"
+"(for-loop_83 fold-var_26 rest_248)"
 " fold-var_26)))"
 " fold-var_221)))))"
 " for-loop_83)"
@@ -77819,7 +77822,7 @@ static const char *startup_source =
 "(let-values(((s_930)"
 "(unsafe-car"
 " lst_467))"
-"((rest_271)"
+"((rest_269)"
 "(unsafe-cdr"
 " lst_467)))"
 "(let-values(((id_167)"
@@ -77855,7 +77858,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_2"
 " id_167"
-" rest_271)"
+" rest_269)"
 " id_167)))"
 " id_166)))))"
 " for-loop_2)"
@@ -78273,9 +78276,9 @@ static const char *startup_source =
 "(let-values(((temp17_6) '#%linklet)"
 "((linklet-primitives18_0) linklet-primitives_0)"
 "((ns19_3) ns)"
-"((temp20_7) #t)"
+"((temp20_6) #t)"
 "((temp21_3) #t))"
-"(declare-hash-based-module!41.1 ns19_3 temp20_7 null #f temp21_3 temp17_6 linklet-primitives18_0)))"
+"(declare-hash-based-module!41.1 ns19_3 temp20_6 null #f temp21_3 temp17_6 linklet-primitives18_0)))"
 "(let-values(((temp22_6) '#%expobs)((expobs-primitives23_0) expobs-primitives)((ns24_2) ns)((temp25_9) #t))"
 "(declare-hash-based-module!41.1 ns24_2 #f null temp25_9 #f temp22_6 expobs-primitives23_0))"
 "(let-values(((ns26_1) ns)"
@@ -78310,13 +78313,13 @@ static const char *startup_source =
 " for-loop_20)"
 " '#hash()"
 "(hash-iterate-first ht_167)))))"
-"((temp29_7)"
+"((temp29_6)"
 "(let-values(((ht_127) read-primitives))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_127)))"
-"((letrec-values(((for-loop_327)"
+"((letrec-values(((for-loop_329)"
 "(lambda(table_223 i_182)"
 "(begin"
 " 'for-loop"
@@ -78334,13 +78337,13 @@ static const char *startup_source =
 "(hash-set table_113 key_94 val_90)))))"
 "(values table_114)))))"
 "(if(not #f)"
-"(for-loop_327 table_120(hash-iterate-next ht_127 i_182))"
+"(for-loop_329 table_120(hash-iterate-next ht_127 i_182))"
 " table_120)))"
 " table_223)))))"
-" for-loop_327)"
+" for-loop_329)"
 " '#hash()"
 "(hash-iterate-first ht_127))))))"
-"(declare-kernel-module!8.1 eval27_0 temp28_5 temp29_7 ns26_1))"
+"(declare-kernel-module!8.1 eval27_0 temp28_5 temp29_6 ns26_1))"
 "(begin"
 "(let-values(((lst_17) runtime-instances))"
 "(begin"