From 35dc59ee071c85ea6e3bafa28a5d98e799a4b081 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 9 Mar 2018 15:44:11 -0700
Subject: [PATCH] expander: preserve syntax properties on `let[rec]-values`
 clauses

---
 pkgs/racket-test-core/tests/racket/stx.rktl |   18 +
 racket/src/expander/expand/body.rkt         |    2 +-
 racket/src/expander/expand/expr.rkt         |   16 +-
 racket/src/racket/src/startup.inc           | 6565 ++++++++++---------
 4 files changed, 3399 insertions(+), 3202 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/stx.rktl b/pkgs/racket-test-core/tests/racket/stx.rktl
index 5984618c22..04ba8a4231 100644
--- a/pkgs/racket-test-core/tests/racket/stx.rktl
+++ b/pkgs/racket-test-core/tests/racket/stx.rktl
@@ -419,6 +419,24 @@
             [(eq? v 'do-not-forget-me) #t]
             [else #f]))))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Check property tracking on `let[rec]-values` binding clauses
+
+(let ([mk-e (lambda (bind)
+              #`(let-syntax ([m (lambda (stx)
+                                  (syntax-case stx ()
+                                    [(_ e) (local-expand #'e 'expression '())]))])
+                  (m (#,bind (#,(syntax-property #'[(x) 0] 'keep-me #t)) 1))))])
+  (define (find-keep-me? s)
+    (cond
+      [(syntax? s) (or (syntax-property s 'keep-me)
+                       (find-keep-me? (syntax-e s)))]
+      [(pair? s) (or (find-keep-me? (car s))
+                     (find-keep-me? (cdr s)))]
+      [else #f]))
+  (test #t find-keep-me? (expand (mk-e #'let-values)))
+  (test #t find-keep-me? (expand (mk-e #'letrec-values))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Make sure a language name via `#lang` is original
 
diff --git a/racket/src/expander/expand/body.rkt b/racket/src/expander/expand/body.rkt
index 04ad4c4fd6..97f514142f 100644
--- a/racket/src/expander/expand/body.rkt
+++ b/racket/src/expander/expand/body.rkt
@@ -190,7 +190,7 @@
                val-rhss
                track-stxs
                (cons ids trans-idss)
-               (cons (datum->syntax #f (list ids (m 'rhs)) (m 'rhs)) stx-clauses)
+               (cons (datum->syntax #f (list ids (m 'rhs)) exp-body) stx-clauses)
                new-dups)]
         [else
          (cond
diff --git a/racket/src/expander/expand/expr.rkt b/racket/src/expander/expand/expr.rkt
index e003763d69..af75b38fb5 100644
--- a/racket/src/expander/expand/expr.rkt
+++ b/racket/src/expander/expand/expr.rkt
@@ -185,6 +185,14 @@
                          (for/list ([rhs (in-list (if syntaxes? (stx-m 'val-rhs) (val-m 'val-rhs)))])
                            (add-scope rhs sc))
                          (if syntaxes? (stx-m 'val-rhs) (val-m 'val-rhs))))
+    (define val-clauses ; for syntax tracking
+      (cond
+        [syntaxes?
+         (define-match m disarmed-s '(_ _ (clause ...) . _))
+         (m 'clause)]
+        [else
+         (define-match m disarmed-s '(_ (clause ...) . _))
+         (m 'clause)]))
     (check-no-duplicate-ids (list trans-idss val-idss) phase s)
     ;; Bind each left-hand identifier and generate a corresponding key
     ;; fo the expand-time environment:
@@ -268,14 +276,15 @@
          (define clauses
            (for/list ([ids (in-list val-name-idss)]
                       [keys (in-list val-keyss)]
-                      [rhs (in-list val-rhss)])
+                      [rhs (in-list val-rhss)]
+                      [clause (in-list val-clauses)])
              (log-expand ctx 'next)
              (define exp-rhs (expand rhs (if rec?                               
                                              (as-named-context rec-ctx ids)
                                              (as-named-context expr-ctx ids))))
              (if (expand-context-to-parsed? ctx)
                  (list keys exp-rhs)
-                 `[,ids ,exp-rhs])))
+                 (datum->syntax #f `[,ids ,exp-rhs] clause clause))))
          (define exp-body (get-body))
          (when frame-id
            (reference-record-clear! frame-id))
@@ -288,8 +297,7 @@
               `(,letrec-values-id ,clauses ,@exp-body)))]
         [else
          (expand-and-split-bindings-by-reference
-          val-idss val-keyss val-rhss (for/list ([rhs (in-list val-idss)])
-                                        #f)
+          val-idss val-keyss val-rhss val-clauses
           #:split? #t
           #:frame-id frame-id #:ctx rec-ctx
           #:source rebuild-s #:had-stxes? syntaxes?
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 1d7d1c0943..2709389bda 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -62676,7 +62676,7 @@ static const char *startup_source =
 "(list"
 " ids_30"
 " rhs107_0)"
-" rhs107_0)"
+" exp-body_0)"
 " stx-clauses_0)"
 " new-dups_1)))))))))))))))"
 "(let-values()"
@@ -64179,39 +64179,39 @@ static const char *startup_source =
 " id:val105_0"
 " val-rhs106_0"
 " body107_0)"
-"(let-values(((s_418) disarmed-s_8))"
+"(let-values(((s_440) disarmed-s_8))"
 "(if(if syntaxes?_0 #t #f)"
-"(let-values(((orig-s_45) s_418))"
+"(let-values(((orig-s_45) s_440))"
 "(let-values(((letrec-syntaxes+values102_1"
 " id:trans103_1"
 " trans-rhs104_1"
 " id:val105_1"
 " val-rhs106_1"
 " body107_1)"
-"(let-values(((s_123)"
-"(if(syntax?$1 s_418)"
-"(syntax-e$1 s_418)"
-" s_418)))"
-"(if(pair? s_123)"
+"(let-values(((s_124)"
+"(if(syntax?$1 s_440)"
+"(syntax-e$1 s_440)"
+" s_440)))"
+"(if(pair? s_124)"
 "(let-values(((letrec-syntaxes+values108_0)"
-"(let-values(((s_507)(car s_123))) s_507))"
+"(let-values(((s_125)(car s_124))) s_125))"
 "((id:trans109_0"
 " trans-rhs110_0"
 " id:val111_0"
 " val-rhs112_0"
 " body113_0)"
-"(let-values(((s_125)(cdr s_123)))"
+"(let-values(((s_507)(cdr s_124)))"
 "(let-values(((s_508)"
-"(if(syntax?$1 s_125)"
-"(syntax-e$1 s_125)"
-" s_125)))"
+"(if(syntax?$1 s_507)"
+"(syntax-e$1 s_507)"
+" s_507)))"
 "(if(pair? s_508)"
 "(let-values(((id:trans114_0"
 " trans-rhs115_0)"
 "(let-values(((s_509)"
 "(car"
 " s_508)))"
-"(let-values(((s_510)"
+"(let-values(((s_224)"
 "(if(syntax?$1"
 " s_509)"
 "(syntax-e$1"
@@ -64219,7 +64219,7 @@ static const char *startup_source =
 " s_509)))"
 "(let-values(((flat-s_31)"
 "(to-syntax-list.1"
-" s_510)))"
+" s_224)))"
 "(if(not"
 " flat-s_31)"
 "(let-values()"
@@ -64239,20 +64239,20 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_345)))"
-"((letrec-values(((for-loop_299)"
+"((letrec-values(((for-loop_48)"
 "(lambda(id:trans_1"
 " trans-rhs_1"
-" lst_2)"
+" lst_346)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_2)"
-"(let-values(((s_228)"
+" lst_346)"
+"(let-values(((s_328)"
 "(unsafe-car"
-" lst_2))"
+" lst_346))"
 "((rest_199)"
 "(unsafe-cdr"
-" lst_2)))"
+" lst_346)))"
 "(let-values(((id:trans_2"
 " trans-rhs_2)"
 "(let-values(((id:trans_3)"
@@ -64265,27 +64265,27 @@ static const char *startup_source =
 "(let-values(((id:trans145_0"
 " trans-rhs146_0)"
 "(let-values()"
-"(let-values(((s_511)"
+"(let-values(((s_333)"
 "(if(syntax?$1"
-" s_228)"
+" s_328)"
 "(syntax-e$1"
-" s_228)"
-" s_228)))"
+" s_328)"
+" s_328)))"
 "(if(pair?"
-" s_511)"
+" s_333)"
 "(let-values(((id:trans119_0)"
-"(let-values(((s_335)"
-"(car"
-" s_511)))"
 "(let-values(((s_336)"
+"(car"
+" s_333)))"
+"(let-values(((s_337)"
 "(if(syntax?$1"
-" s_335)"
+" s_336)"
 "(syntax-e$1"
-" s_335)"
-" s_335)))"
+" s_336)"
+" s_336)))"
 "(let-values(((flat-s_32)"
 "(to-syntax-list.1"
-" s_336)))"
+" s_337)))"
 "(if(not"
 " flat-s_32)"
 "(let-values()"
@@ -64295,7 +64295,7 @@ static const char *startup_source =
 " orig-s_45))"
 "(let-values()"
 "(let-values(((id:trans_5)"
-"(let-values(((lst_346)"
+"(let-values(((lst_300)"
 " flat-s_32))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64303,20 +64303,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_346)))"
-"((letrec-values(((for-loop_300)"
+" lst_300)))"
+"((letrec-values(((for-loop_263)"
 "(lambda(id:trans_6"
-" lst_212)"
+" lst_301)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_212)"
-"(let-values(((s_512)"
+" lst_301)"
+"(let-values(((s_232)"
 "(unsafe-car"
-" lst_212))"
-"((rest_200)"
+" lst_301))"
+"((rest_166)"
 "(unsafe-cdr"
-" lst_212)))"
+" lst_301)))"
 "(let-values(((id:trans_7)"
 "(let-values(((id:trans_8)"
 " id:trans_6))"
@@ -64326,21 +64326,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_384)"
 "(if(syntax?$1"
-" s_512)"
+" s_232)"
 "(symbol?"
 "(syntax-e$1"
-" s_512))"
+" s_232))"
 " #f)))"
 "(if or-part_384"
 " or-part_384"
 "(symbol?"
-" s_512)))"
-" s_512"
+" s_232)))"
+" s_232"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_45"
-" s_512)))))"
+" s_232)))))"
 "(cons"
 " id:trans147_0"
 " id:trans_8)))))"
@@ -64348,45 +64348,45 @@ static const char *startup_source =
 " id:trans_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_300"
+"(for-loop_263"
 " id:trans_7"
-" rest_200)"
+" rest_166)"
 " id:trans_7)))"
 " id:trans_6)))))"
-" for-loop_300)"
+" for-loop_263)"
 " null"
-" lst_346)))))"
+" lst_300)))))"
 "(reverse$1"
 " id:trans_5))))))))"
 "((trans-rhs120_0)"
-"(let-values(((s_513)"
+"(let-values(((s_510)"
+"(cdr"
+" s_333)))"
+"(let-values(((s_511)"
+"(if(syntax?$1"
+" s_510)"
+"(syntax-e$1"
+" s_510)"
+" s_510)))"
+"(if(pair?"
+" s_511)"
+"(let-values(((trans-rhs121_0)"
+"(let-values(((s_235)"
+"(car"
+" s_511)))"
+" s_235))"
+"(()"
+"(let-values(((s_236)"
 "(cdr"
 " s_511)))"
-"(let-values(((s_514)"
+"(let-values(((s_343)"
 "(if(syntax?$1"
-" s_513)"
-"(syntax-e$1"
-" s_513)"
-" s_513)))"
-"(if(pair?"
-" s_514)"
-"(let-values(((trans-rhs121_0)"
-"(let-values(((s_234)"
-"(car"
-" s_514)))"
-" s_234))"
-"(()"
-"(let-values(((s_235)"
-"(cdr"
-" s_514)))"
-"(let-values(((s_236)"
-"(if(syntax?$1"
-" s_235)"
-"(syntax-e$1"
-" s_235)"
-" s_235)))"
-"(if(null?"
 " s_236)"
+"(syntax-e$1"
+" s_236)"
+" s_236)))"
+"(if(null?"
+" s_343)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64417,7 +64417,7 @@ static const char *startup_source =
 " trans-rhs_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_299"
+"(for-loop_48"
 " id:trans_2"
 " trans-rhs_2"
 " rest_199)"
@@ -64427,7 +64427,7 @@ static const char *startup_source =
 "(values"
 " id:trans_1"
 " trans-rhs_1))))))"
-" for-loop_299)"
+" for-loop_48)"
 " null"
 " null"
 " lst_345)))))"
@@ -64439,30 +64439,30 @@ static const char *startup_source =
 "((id:val116_0"
 " val-rhs117_0"
 " body118_0)"
-"(let-values(((s_343)"
+"(let-values(((s_344)"
 "(cdr"
 " s_508)))"
-"(let-values(((s_344)"
+"(let-values(((s_237)"
 "(if(syntax?$1"
-" s_343)"
+" s_344)"
 "(syntax-e$1"
-" s_343)"
-" s_343)))"
-"(if(pair? s_344)"
+" s_344)"
+" s_344)))"
+"(if(pair? s_237)"
 "(let-values(((id:val122_0"
 " val-rhs123_0)"
-"(let-values(((s_515)"
-"(car"
-" s_344)))"
 "(let-values(((s_345)"
+"(car"
+" s_237)))"
+"(let-values(((s_346)"
 "(if(syntax?$1"
-" s_515)"
+" s_345)"
 "(syntax-e$1"
-" s_515)"
-" s_515)))"
+" s_345)"
+" s_345)))"
 "(let-values(((flat-s_33)"
 "(to-syntax-list.1"
-" s_345)))"
+" s_346)))"
 "(if(not"
 " flat-s_33)"
 "(let-values()"
@@ -64473,7 +64473,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val_0"
 " val-rhs_1)"
-"(let-values(((lst_143)"
+"(let-values(((lst_347)"
 " flat-s_33))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64481,21 +64481,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_143)))"
-"((letrec-values(((for-loop_301)"
+" lst_347)))"
+"((letrec-values(((for-loop_265)"
 "(lambda(id:val_1"
 " val-rhs_2"
-" lst_347)"
+" lst_348)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_347)"
-"(let-values(((s_350)"
+" lst_348)"
+"(let-values(((s_351)"
 "(unsafe-car"
-" lst_347))"
-"((rest_201)"
+" lst_348))"
+"((rest_200)"
 "(unsafe-cdr"
-" lst_347)))"
+" lst_348)))"
 "(let-values(((id:val_2"
 " val-rhs_3)"
 "(let-values(((id:val_3)"
@@ -64508,27 +64508,27 @@ static const char *startup_source =
 "(let-values(((id:val148_0"
 " val-rhs149_0)"
 "(let-values()"
-"(let-values(((s_516)"
+"(let-values(((s_512)"
 "(if(syntax?$1"
-" s_350)"
+" s_351)"
 "(syntax-e$1"
-" s_350)"
-" s_350)))"
+" s_351)"
+" s_351)))"
 "(if(pair?"
-" s_516)"
+" s_512)"
 "(let-values(((id:val125_0)"
-"(let-values(((s_355)"
-"(car"
-" s_516)))"
 "(let-values(((s_356)"
+"(car"
+" s_512)))"
+"(let-values(((s_513)"
 "(if(syntax?$1"
-" s_355)"
+" s_356)"
 "(syntax-e$1"
-" s_355)"
-" s_355)))"
+" s_356)"
+" s_356)))"
 "(let-values(((flat-s_34)"
 "(to-syntax-list.1"
-" s_356)))"
+" s_513)))"
 "(if(not"
 " flat-s_34)"
 "(let-values()"
@@ -64538,7 +64538,7 @@ static const char *startup_source =
 " orig-s_45))"
 "(let-values()"
 "(let-values(((id:val_5)"
-"(let-values(((lst_348)"
+"(let-values(((lst_349)"
 " flat-s_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64546,20 +64546,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_348)))"
-"((letrec-values(((for-loop_302)"
+" lst_349)))"
+"((letrec-values(((for-loop_299)"
 "(lambda(id:val_6"
-" lst_349)"
+" lst_350)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_349)"
-"(let-values(((s_517)"
+" lst_350)"
+"(let-values(((s_514)"
 "(unsafe-car"
-" lst_349))"
-"((rest_202)"
+" lst_350))"
+"((rest_201)"
 "(unsafe-cdr"
-" lst_349)))"
+" lst_350)))"
 "(let-values(((id:val_7)"
 "(let-values(((id:val_8)"
 " id:val_6))"
@@ -64569,21 +64569,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_385)"
 "(if(syntax?$1"
-" s_517)"
+" s_514)"
 "(symbol?"
 "(syntax-e$1"
-" s_517))"
+" s_514))"
 " #f)))"
 "(if or-part_385"
 " or-part_385"
 "(symbol?"
-" s_517)))"
-" s_517"
+" s_514)))"
+" s_514"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                     \"not an identifier\""
 " orig-s_45"
-" s_517)))))"
+" s_514)))))"
 "(cons"
 " id:val150_0"
 " id:val_8)))))"
@@ -64591,45 +64591,45 @@ static const char *startup_source =
 " id:val_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_302"
+"(for-loop_299"
 " id:val_7"
-" rest_202)"
+" rest_201)"
 " id:val_7)))"
 " id:val_6)))))"
-" for-loop_302)"
+" for-loop_299)"
 " null"
-" lst_348)))))"
+" lst_349)))))"
 "(reverse$1"
 " id:val_5))))))))"
 "((val-rhs126_0)"
-"(let-values(((s_518)"
-"(cdr"
-" s_516)))"
 "(let-values(((s_242)"
-"(if(syntax?$1"
-" s_518)"
-"(syntax-e$1"
-" s_518)"
-" s_518)))"
-"(if(pair?"
-" s_242)"
-"(let-values(((val-rhs127_0)"
-"(let-values(((s_519)"
-"(car"
-" s_242)))"
-" s_519))"
-"(()"
-"(let-values(((s_520)"
 "(cdr"
-" s_242)))"
-"(let-values(((s_521)"
+" s_512)))"
+"(let-values(((s_515)"
 "(if(syntax?$1"
-" s_520)"
+" s_242)"
 "(syntax-e$1"
-" s_520)"
-" s_520)))"
+" s_242)"
+" s_242)))"
+"(if(pair?"
+" s_515)"
+"(let-values(((val-rhs127_0)"
+"(let-values(((s_516)"
+"(car"
+" s_515)))"
+" s_516))"
+"(()"
+"(let-values(((s_517)"
+"(cdr"
+" s_515)))"
+"(let-values(((s_243)"
+"(if(syntax?$1"
+" s_517)"
+"(syntax-e$1"
+" s_517)"
+" s_517)))"
 "(if(null?"
-" s_521)"
+" s_243)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64660,38 +64660,38 @@ static const char *startup_source =
 " val-rhs_5)))))"
 "(if(not"
 " #f)"
-"(for-loop_301"
+"(for-loop_265"
 " id:val_2"
 " val-rhs_3"
-" rest_201)"
+" rest_200)"
 "(values"
 " id:val_2"
 " val-rhs_3))))"
 "(values"
 " id:val_1"
 " val-rhs_2))))))"
-" for-loop_301)"
+" for-loop_265)"
 " null"
 " null"
-" lst_143)))))"
+" lst_347)))))"
 "(values"
 "(reverse$1"
 " id:val_0)"
 "(reverse$1"
 " val-rhs_1)))))))))"
 "((body124_0)"
-"(let-values(((s_243)"
-"(cdr"
-" s_344)))"
 "(let-values(((s_244)"
+"(cdr"
+" s_237)))"
+"(let-values(((s_245)"
 "(if(syntax?$1"
-" s_243)"
+" s_244)"
 "(syntax-e$1"
-" s_243)"
-" s_243)))"
+" s_244)"
+" s_244)))"
 "(let-values(((flat-s_35)"
 "(to-syntax-list.1"
-" s_244)))"
+" s_245)))"
 "(if(not"
 " flat-s_35)"
 "(let-values()"
@@ -64744,39 +64744,39 @@ static const char *startup_source =
 " body107_1)))"
 "(values #f #f #f #f #f #f #f)))))"
 "(let-values(((ok?_38 let-values128_0 id:val129_0 val-rhs130_0 body131_0)"
-"(let-values(((s_522) disarmed-s_8))"
+"(let-values(((s_518) disarmed-s_8))"
 "(if(if(not syntaxes?_0) #t #f)"
-"(let-values(((orig-s_46) s_522))"
+"(let-values(((orig-s_46) s_518))"
 "(let-values(((let-values128_1 id:val129_1 val-rhs130_1 body131_1)"
-"(let-values(((s_248)"
-"(if(syntax?$1 s_522)"
-"(syntax-e$1 s_522)"
-" s_522)))"
-"(if(pair? s_248)"
+"(let-values(((s_519)"
+"(if(syntax?$1 s_518)"
+"(syntax-e$1 s_518)"
+" s_518)))"
+"(if(pair? s_519)"
 "(let-values(((let-values132_0)"
-"(let-values(((s_251)(car s_248)))"
-" s_251))"
+"(let-values(((s_520)(car s_519)))"
+" s_520))"
 "((id:val133_0 val-rhs134_0 body135_0)"
-"(let-values(((s_523)(cdr s_248)))"
-"(let-values(((s_446)"
-"(if(syntax?$1 s_523)"
-"(syntax-e$1 s_523)"
-" s_523)))"
-"(if(pair? s_446)"
+"(let-values(((s_446)(cdr s_519)))"
+"(let-values(((s_447)"
+"(if(syntax?$1 s_446)"
+"(syntax-e$1 s_446)"
+" s_446)))"
+"(if(pair? s_447)"
 "(let-values(((id:val136_0"
 " val-rhs137_0)"
-"(let-values(((s_361)"
-"(car"
-" s_446)))"
 "(let-values(((s_252)"
+"(car"
+" s_447)))"
+"(let-values(((s_362)"
 "(if(syntax?$1"
-" s_361)"
+" s_252)"
 "(syntax-e$1"
-" s_361)"
-" s_361)))"
+" s_252)"
+" s_252)))"
 "(let-values(((flat-s_36)"
 "(to-syntax-list.1"
-" s_252)))"
+" s_362)))"
 "(if(not"
 " flat-s_36)"
 "(let-values()"
@@ -64787,7 +64787,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val_10"
 " val-rhs_6)"
-"(let-values(((lst_350)"
+"(let-values(((lst_351)"
 " flat-s_36))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64795,21 +64795,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_350)))"
-"((letrec-values(((for-loop_303)"
+" lst_351)))"
+"((letrec-values(((for-loop_300)"
 "(lambda(id:val_11"
 " val-rhs_7"
-" lst_351)"
+" lst_352)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_351)"
-"(let-values(((s_370)"
+" lst_352)"
+"(let-values(((s_371)"
 "(unsafe-car"
-" lst_351))"
-"((rest_203)"
+" lst_352))"
+"((rest_202)"
 "(unsafe-cdr"
-" lst_351)))"
+" lst_352)))"
 "(let-values(((id:val_12"
 " val-rhs_8)"
 "(let-values(((id:val_13)"
@@ -64822,27 +64822,27 @@ static const char *startup_source =
 "(let-values(((id:val151_0"
 " val-rhs152_0)"
 "(let-values()"
-"(let-values(((s_524)"
+"(let-values(((s_492)"
 "(if(syntax?$1"
-" s_370)"
+" s_371)"
 "(syntax-e$1"
-" s_370)"
-" s_370)))"
+" s_371)"
+" s_371)))"
 "(if(pair?"
-" s_524)"
+" s_492)"
 "(let-values(((id:val139_0)"
-"(let-values(((s_374)"
-"(car"
-" s_524)))"
 "(let-values(((s_375)"
+"(car"
+" s_492)))"
+"(let-values(((s_376)"
 "(if(syntax?$1"
-" s_374)"
+" s_375)"
 "(syntax-e$1"
-" s_374)"
-" s_374)))"
+" s_375)"
+" s_375)))"
 "(let-values(((flat-s_37)"
 "(to-syntax-list.1"
-" s_375)))"
+" s_376)))"
 "(if(not"
 " flat-s_37)"
 "(let-values()"
@@ -64852,7 +64852,7 @@ static const char *startup_source =
 " orig-s_46))"
 "(let-values()"
 "(let-values(((id:val_15)"
-"(let-values(((lst_352)"
+"(let-values(((lst_306)"
 " flat-s_37))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64860,20 +64860,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_352)))"
-"((letrec-values(((for-loop_304)"
+" lst_306)))"
+"((letrec-values(((for-loop_270)"
 "(lambda(id:val_16"
-" lst_353)"
+" lst_307)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_353)"
-"(let-values(((s_379)"
+" lst_307)"
+"(let-values(((s_521)"
 "(unsafe-car"
-" lst_353))"
-"((rest_204)"
+" lst_307))"
+"((rest_170)"
 "(unsafe-cdr"
-" lst_353)))"
+" lst_307)))"
 "(let-values(((id:val_17)"
 "(let-values(((id:val_18)"
 " id:val_16))"
@@ -64881,23 +64881,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val153_0)"
 "(let-values()"
-"(if(let-values(((or-part_356)"
+"(if(let-values(((or-part_386)"
 "(if(syntax?$1"
-" s_379)"
+" s_521)"
 "(symbol?"
 "(syntax-e$1"
-" s_379))"
+" s_521))"
 " #f)))"
-"(if or-part_356"
-" or-part_356"
+"(if or-part_386"
+" or-part_386"
 "(symbol?"
-" s_379)))"
-" s_379"
+" s_521)))"
+" s_521"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                   \"not an identifier\""
 " orig-s_46"
-" s_379)))))"
+" s_521)))))"
 "(cons"
 " id:val153_0"
 " id:val_18)))))"
@@ -64905,45 +64905,45 @@ static const char *startup_source =
 " id:val_19)))))"
 "(if(not"
 " #f)"
-"(for-loop_304"
+"(for-loop_270"
 " id:val_17"
-" rest_204)"
+" rest_170)"
 " id:val_17)))"
 " id:val_16)))))"
-" for-loop_304)"
+" for-loop_270)"
 " null"
-" lst_352)))))"
+" lst_306)))))"
 "(reverse$1"
 " id:val_15))))))))"
 "((val-rhs140_0)"
-"(let-values(((s_382)"
-"(cdr"
-" s_524)))"
 "(let-values(((s_255)"
-"(if(syntax?$1"
-" s_382)"
-"(syntax-e$1"
-" s_382)"
-" s_382)))"
-"(if(pair?"
-" s_255)"
-"(let-values(((val-rhs141_0)"
-"(let-values(((s_257)"
-"(car"
-" s_255)))"
-" s_257))"
-"(()"
-"(let-values(((s_525)"
 "(cdr"
-" s_255)))"
-"(let-values(((s_526)"
+" s_492)))"
+"(let-values(((s_256)"
 "(if(syntax?$1"
-" s_525)"
+" s_255)"
 "(syntax-e$1"
-" s_525)"
-" s_525)))"
+" s_255)"
+" s_255)))"
+"(if(pair?"
+" s_256)"
+"(let-values(((val-rhs141_0)"
+"(let-values(((s_522)"
+"(car"
+" s_256)))"
+" s_522))"
+"(()"
+"(let-values(((s_523)"
+"(cdr"
+" s_256)))"
+"(let-values(((s_524)"
+"(if(syntax?$1"
+" s_523)"
+"(syntax-e$1"
+" s_523)"
+" s_523)))"
 "(if(null?"
-" s_526)"
+" s_524)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64974,38 +64974,38 @@ static const char *startup_source =
 " val-rhs_10)))))"
 "(if(not"
 " #f)"
-"(for-loop_303"
+"(for-loop_300"
 " id:val_12"
 " val-rhs_8"
-" rest_203)"
+" rest_202)"
 "(values"
 " id:val_12"
 " val-rhs_8))))"
 "(values"
 " id:val_11"
 " val-rhs_7))))))"
-" for-loop_303)"
+" for-loop_300)"
 " null"
 " null"
-" lst_350)))))"
+" lst_351)))))"
 "(values"
 "(reverse$1"
 " id:val_10)"
 "(reverse$1"
 " val-rhs_6)))))))))"
 "((body138_0)"
-"(let-values(((s_527)"
-"(cdr"
-" s_446)))"
 "(let-values(((s_258)"
+"(cdr"
+" s_447)))"
+"(let-values(((s_259)"
 "(if(syntax?$1"
-" s_527)"
+" s_258)"
 "(syntax-e$1"
-" s_527)"
-" s_527)))"
+" s_258)"
+" s_258)))"
 "(let-values(((flat-s_38)"
 "(to-syntax-list.1"
-" s_258)))"
+" s_259)))"
 "(if(not"
 " flat-s_38)"
 "(let-values()"
@@ -65043,20 +65043,20 @@ static const char *startup_source =
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
-"(let-values(((lst_354)(if syntaxes?_0 id:trans103_0 null)))"
+"(let-values(((lst_353)(if syntaxes?_0 id:trans103_0 null)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_354)))"
-"((letrec-values(((for-loop_305)"
-"(lambda(fold-var_323 lst_355)"
+"(let-values()(check-list lst_353)))"
+"((letrec-values(((for-loop_301)"
+"(lambda(fold-var_323 lst_354)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_355)"
+"(if(pair? lst_354)"
 "(let-values(((ids_35)"
-"(unsafe-car lst_355))"
-"((rest_205)"
-"(unsafe-cdr lst_355)))"
+"(unsafe-car lst_354))"
+"((rest_203)"
+"(unsafe-cdr lst_354)))"
 "(let-values(((fold-var_324)"
 "(let-values(((fold-var_325)"
 " fold-var_323))"
@@ -65065,7 +65065,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_356)"
+"(let-values(((lst_355)"
 " ids_35))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65073,20 +65073,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_356)))"
-"((letrec-values(((for-loop_306)"
+" lst_355)))"
+"((letrec-values(((for-loop_302)"
 "(lambda(fold-var_327"
-" lst_357)"
+" lst_356)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_357)"
+" lst_356)"
 "(let-values(((id_122)"
 "(unsafe-car"
-" lst_357))"
-"((rest_206)"
+" lst_356))"
+"((rest_204)"
 "(unsafe-cdr"
-" lst_357)))"
+" lst_356)))"
 "(let-values(((fold-var_328)"
 "(let-values(((fold-var_329)"
 " fold-var_327))"
@@ -65102,44 +65102,44 @@ static const char *startup_source =
 " fold-var_330)))))"
 "(if(not"
 " #f)"
-"(for-loop_306"
+"(for-loop_302"
 " fold-var_328"
-" rest_206)"
+" rest_204)"
 " fold-var_328)))"
 " fold-var_327)))))"
-" for-loop_306)"
+" for-loop_302)"
 " null"
-" lst_356)))))"
+" lst_355)))))"
 " fold-var_325))))"
 "(values"
 " fold-var_326)))))"
 "(if(not #f)"
-"(for-loop_305 fold-var_324 rest_205)"
+"(for-loop_301 fold-var_324 rest_203)"
 " fold-var_324)))"
 " fold-var_323)))))"
-" for-loop_305)"
+" for-loop_301)"
 " null"
-" lst_354))))))"
+" lst_353))))))"
 "(let-values(((val-idss_3)"
 "(reverse$1"
-"(let-values(((lst_358)(if syntaxes?_0 id:val105_0 id:val129_0)))"
+"(let-values(((lst_357)(if syntaxes?_0 id:val105_0 id:val129_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_358)))"
-"((letrec-values(((for-loop_307)"
-"(lambda(fold-var_331 lst_122)"
+"(let-values()(check-list lst_357)))"
+"((letrec-values(((for-loop_63)"
+"(lambda(fold-var_331 lst_358)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_122)"
+"(if(pair? lst_358)"
 "(let-values(((ids_36)"
-"(unsafe-car lst_122))"
-"((rest_207)"
-"(unsafe-cdr lst_122)))"
+"(unsafe-car lst_358))"
+"((rest_205)"
+"(unsafe-cdr lst_358)))"
 "(let-values(((fold-var_332)"
 "(let-values(((fold-var_333)"
 " fold-var_331))"
-"(let-values(((fold-var_334)"
+"(let-values(((fold-var_104)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65153,8 +65153,8 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_359)))"
-"((letrec-values(((for-loop_308)"
-"(lambda(fold-var_335"
+"((letrec-values(((for-loop_157)"
+"(lambda(fold-var_105"
 " lst_360)"
 "(begin"
 " 'for-loop"
@@ -65163,44 +65163,42 @@ static const char *startup_source =
 "(let-values(((id_123)"
 "(unsafe-car"
 " lst_360))"
-"((rest_208)"
+"((rest_206)"
 "(unsafe-cdr"
 " lst_360)))"
-"(let-values(((fold-var_108)"
 "(let-values(((fold-var_109)"
-" fold-var_335))"
-"(let-values(((fold-var_336)"
+"(let-values(((fold-var_334)"
+" fold-var_105))"
+"(let-values(((fold-var_335)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
 " id_123"
 " sc_37))"
-" fold-var_109))))"
+" fold-var_334))))"
 "(values"
-" fold-var_336)))))"
+" fold-var_335)))))"
 "(if(not"
 " #f)"
-"(for-loop_308"
-" fold-var_108"
-" rest_208)"
-" fold-var_108)))"
-" fold-var_335)))))"
-" for-loop_308)"
+"(for-loop_157"
+" fold-var_109"
+" rest_206)"
+" fold-var_109)))"
+" fold-var_105)))))"
+" for-loop_157)"
 " null"
 " lst_359)))))"
 " fold-var_333))))"
 "(values"
-" fold-var_334)))))"
+" fold-var_104)))))"
 "(if(not #f)"
-"(for-loop_307"
-" fold-var_332"
-" rest_207)"
+"(for-loop_63 fold-var_332 rest_205)"
 " fold-var_332)))"
 " fold-var_331)))))"
-" for-loop_307)"
+" for-loop_63)"
 " null"
-" lst_358))))))"
+" lst_357))))))"
 "(let-values(((val-rhss_3)"
 "(if rec?_1"
 "(reverse$1"
@@ -65210,38 +65208,224 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_361)))"
-"((letrec-values(((for-loop_274)"
-"(lambda(fold-var_337 lst_362)"
+"((letrec-values(((for-loop_303)"
+"(lambda(fold-var_336 lst_362)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_362)"
-"(let-values(((rhs_20)"
+"(let-values(((rhs_17)"
 "(unsafe-car lst_362))"
-"((rest_209)"
+"((rest_207)"
 "(unsafe-cdr lst_362)))"
+"(let-values(((fold-var_337)"
 "(let-values(((fold-var_338)"
+" fold-var_336))"
 "(let-values(((fold-var_339)"
-" fold-var_337))"
-"(let-values(((fold-var_340)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
-" rhs_20"
+" rhs_17"
 " sc_37))"
-" fold-var_339))))"
+" fold-var_338))))"
 "(values"
-" fold-var_340)))))"
+" fold-var_339)))))"
 "(if(not #f)"
-"(for-loop_274"
-" fold-var_338"
-" rest_209)"
-" fold-var_338)))"
-" fold-var_337)))))"
-" for-loop_274)"
+"(for-loop_303"
+" fold-var_337"
+" rest_207)"
+" fold-var_337)))"
+" fold-var_336)))))"
+" for-loop_303)"
 " null"
 " lst_361))))"
 "(if syntaxes?_0 val-rhs106_0 val-rhs130_0))))"
+"(let-values(((val-clauses_0)"
+"(if syntaxes?_0"
+"(let-values()"
+"(let-values(((ok?_39 _154_0 _155_0 clause156_0 _157_0)"
+"(let-values(((s_525) disarmed-s_8))"
+"(let-values(((orig-s_47) s_525))"
+"(let-values(((_154_1"
+" _155_1"
+" clause156_1"
+" _157_1)"
+"(let-values(((s_402)"
+"(if(syntax?$1"
+" s_525)"
+"(syntax-e$1"
+" s_525)"
+" s_525)))"
+"(if(pair? s_402)"
+"(let-values(((_158_0)"
+"(let-values(((s_494)"
+"(car"
+" s_402)))"
+" s_494))"
+"((_159_0"
+" clause160_0"
+" _161_0)"
+"(let-values(((s_454)"
+"(cdr"
+" s_402)))"
+"(let-values(((s_526)"
+"(if(syntax?$1"
+" s_454)"
+"(syntax-e$1"
+" s_454)"
+" s_454)))"
+"(if(pair?"
+" s_526)"
+"(let-values(((_162_0)"
+"(let-values(((s_457)"
+"(car"
+" s_526)))"
+" s_457))"
+"((clause163_0"
+" _164_0)"
+"(let-values(((s_527)"
+"(cdr"
+" s_526)))"
+"(let-values(((s_528)"
+"(if(syntax?$1"
+" s_527)"
+"(syntax-e$1"
+" s_527)"
+" s_527)))"
+"(if(pair?"
+" s_528)"
+"(let-values(((clause165_0)"
+"(let-values(((s_529)"
+"(car"
+" s_528)))"
+"(let-values(((s_530)"
+"(if(syntax?$1"
+" s_529)"
+"(syntax-e$1"
+" s_529)"
+" s_529)))"
+"(let-values(((flat-s_39)"
+"(to-syntax-list.1"
+" s_530)))"
+"(if(not"
+" flat-s_39)"
+"(let-values()"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                                                               \"bad syntax\""
+" orig-s_47))"
+"(let-values()"
+" flat-s_39))))))"
+"((_166_0)"
+"(let-values(((s_531)"
+"(cdr"
+" s_528)))"
+" s_531)))"
+"(values"
+" clause165_0"
+" _166_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                                       \"bad syntax\""
+" orig-s_47))))))"
+"(values"
+" _162_0"
+" clause163_0"
+" _164_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                   \"bad syntax\""
+" orig-s_47))))))"
+"(values"
+" _158_0"
+" _159_0"
+" clause160_0"
+" _161_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                               \"bad syntax\""
+" orig-s_47)))))"
+"(values"
+" #t"
+" _154_1"
+" _155_1"
+" clause156_1"
+" _157_1))))))"
+" clause156_0))"
+"(let-values()"
+"(let-values(((ok?_40 _167_0 clause168_0 _169_0)"
+"(let-values(((s_403) disarmed-s_8))"
+"(let-values(((orig-s_48) s_403))"
+"(let-values(((_167_1 clause168_1 _169_1)"
+"(let-values(((s_138)"
+"(if(syntax?$1"
+" s_403)"
+"(syntax-e$1"
+" s_403)"
+" s_403)))"
+"(if(pair? s_138)"
+"(let-values(((_170_0)"
+"(let-values(((s_532)"
+"(car"
+" s_138)))"
+" s_532))"
+"((clause171_0"
+" _172_0)"
+"(let-values(((s_533)"
+"(cdr"
+" s_138)))"
+"(let-values(((s_188)"
+"(if(syntax?$1"
+" s_533)"
+"(syntax-e$1"
+" s_533)"
+" s_533)))"
+"(if(pair?"
+" s_188)"
+"(let-values(((clause173_0)"
+"(let-values(((s_534)"
+"(car"
+" s_188)))"
+"(let-values(((s_535)"
+"(if(syntax?$1"
+" s_534)"
+"(syntax-e$1"
+" s_534)"
+" s_534)))"
+"(let-values(((flat-s_40)"
+"(to-syntax-list.1"
+" s_535)))"
+"(if(not"
+" flat-s_40)"
+"(let-values()"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                                           \"bad syntax\""
+" orig-s_48))"
+"(let-values()"
+" flat-s_40))))))"
+"((_174_0)"
+"(let-values(((s_536)"
+"(cdr"
+" s_188)))"
+" s_536)))"
+"(values"
+" clause173_0"
+" _174_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                   \"bad syntax\""
+" orig-s_48))))))"
+"(values"
+" _170_0"
+" clause171_0"
+" _172_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                               \"bad syntax\""
+" orig-s_48)))))"
+"(values #t _167_1 clause168_1 _169_1))))))"
+" clause168_0)))))"
 "(let-values((()"
 "(begin"
 "(let-values(((temp142_3)(list trans-idss_2 val-idss_3))"
@@ -65265,21 +65449,21 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_363)))"
-"((letrec-values(((for-loop_309)"
-"(lambda(fold-var_341 lst_364)"
+"((letrec-values(((for-loop_304)"
+"(lambda(fold-var_340 lst_364)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_364)"
 "(let-values(((ids_37)"
 "(unsafe-car"
 " lst_364))"
-"((rest_210)"
+"((rest_208)"
 "(unsafe-cdr"
 " lst_364)))"
+"(let-values(((fold-var_341)"
 "(let-values(((fold-var_342)"
+" fold-var_340))"
 "(let-values(((fold-var_343)"
-" fold-var_341))"
-"(let-values(((fold-var_344)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65293,92 +65477,92 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_365)))"
-"((letrec-values(((for-loop_310)"
-"(lambda(fold-var_345"
+"((letrec-values(((for-loop_305)"
+"(lambda(fold-var_344"
 " lst_366)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_366)"
-"(let-values(((id_26)"
+"(let-values(((id_124)"
 "(unsafe-car"
 " lst_366))"
-"((rest_211)"
+"((rest_209)"
 "(unsafe-cdr"
 " lst_366)))"
+"(let-values(((fold-var_345)"
 "(let-values(((fold-var_346)"
+" fold-var_344))"
 "(let-values(((fold-var_347)"
-" fold-var_345))"
-"(let-values(((fold-var_348)"
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id154_1)"
-" id_26)"
-"((phase155_0)"
+"(let-values(((id175_0)"
+" id_124)"
+"((phase176_0)"
 " phase_147)"
-"((counter156_0)"
+"((counter177_0)"
 " counter_8)"
-"((frame-id157_0)"
+"((frame-id178_0)"
 " frame-id_15)"
-"((s158_1)"
+"((s179_0)"
 " s_324))"
 "(add-local-binding!37.1"
-" frame-id157_0"
+" frame-id178_0"
 " #t"
-" s158_1"
+" s179_0"
 " #t"
-" id154_1"
-" phase155_0"
-" counter156_0)))"
-" fold-var_347))))"
+" id175_0"
+" phase176_0"
+" counter177_0)))"
+" fold-var_346))))"
 "(values"
-" fold-var_348)))))"
+" fold-var_347)))))"
 "(if(not"
 " #f)"
-"(for-loop_310"
-" fold-var_346"
-" rest_211)"
-" fold-var_346)))"
-" fold-var_345)))))"
-" for-loop_310)"
+"(for-loop_305"
+" fold-var_345"
+" rest_209)"
+" fold-var_345)))"
+" fold-var_344)))))"
+" for-loop_305)"
 " null"
 " lst_365)))))"
-" fold-var_343))))"
+" fold-var_342))))"
 "(values"
-" fold-var_344)))))"
+" fold-var_343)))))"
 "(if(not #f)"
-"(for-loop_309"
-" fold-var_342"
-" rest_210)"
-" fold-var_342)))"
-" fold-var_341)))))"
-" for-loop_309)"
+"(for-loop_304"
+" fold-var_341"
+" rest_208)"
+" fold-var_341)))"
+" fold-var_340)))))"
+" for-loop_304)"
 " null"
 " lst_363))))))"
 "(let-values(((val-keyss_2)"
 "(reverse$1"
-"(let-values(((lst_367) val-idss_3))"
+"(let-values(((lst_253) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_367)))"
-"((letrec-values(((for-loop_311)"
-"(lambda(fold-var_349 lst_243)"
+"(let-values()(check-list lst_253)))"
+"((letrec-values(((for-loop_306)"
+"(lambda(fold-var_348 lst_367)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_243)"
+"(if(pair? lst_367)"
 "(let-values(((ids_38)"
 "(unsafe-car"
-" lst_243))"
-"((rest_212)"
+" lst_367))"
+"((rest_210)"
 "(unsafe-cdr"
-" lst_243)))"
+" lst_367)))"
+"(let-values(((fold-var_349)"
 "(let-values(((fold-var_350)"
+" fold-var_348))"
 "(let-values(((fold-var_351)"
-" fold-var_349))"
-"(let-values(((fold-var_352)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65392,92 +65576,92 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_368)))"
-"((letrec-values(((for-loop_312)"
-"(lambda(fold-var_353"
+"((letrec-values(((for-loop_307)"
+"(lambda(fold-var_352"
 " lst_369)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_369)"
-"(let-values(((id_124)"
+"(let-values(((id_125)"
 "(unsafe-car"
 " lst_369))"
-"((rest_213)"
+"((rest_211)"
 "(unsafe-cdr"
 " lst_369)))"
+"(let-values(((fold-var_353)"
 "(let-values(((fold-var_354)"
-"(let-values(((fold-var_355)"
-" fold-var_353))"
-"(let-values(((fold-var_356)"
+" fold-var_352))"
+"(let-values(((fold-var_112)"
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id159_0)"
-" id_124)"
-"((phase160_1)"
+"(let-values(((id180_0)"
+" id_125)"
+"((phase181_0)"
 " phase_147)"
-"((counter161_0)"
+"((counter182_0)"
 " counter_8)"
-"((frame-id162_0)"
+"((frame-id183_0)"
 " frame-id_15)"
-"((s163_0)"
+"((s184_0)"
 " s_324))"
 "(add-local-binding!37.1"
-" frame-id162_0"
+" frame-id183_0"
 " #t"
-" s163_0"
+" s184_0"
 " #t"
-" id159_0"
-" phase160_1"
-" counter161_0)))"
-" fold-var_355))))"
+" id180_0"
+" phase181_0"
+" counter182_0)))"
+" fold-var_354))))"
 "(values"
-" fold-var_356)))))"
+" fold-var_112)))))"
 "(if(not"
 " #f)"
-"(for-loop_312"
-" fold-var_354"
-" rest_213)"
-" fold-var_354)))"
-" fold-var_353)))))"
-" for-loop_312)"
+"(for-loop_307"
+" fold-var_353"
+" rest_211)"
+" fold-var_353)))"
+" fold-var_352)))))"
+" for-loop_307)"
 " null"
 " lst_368)))))"
-" fold-var_351))))"
+" fold-var_350))))"
 "(values"
-" fold-var_352)))))"
+" fold-var_351)))))"
 "(if(not #f)"
-"(for-loop_311"
-" fold-var_350"
-" rest_212)"
-" fold-var_350)))"
-" fold-var_349)))))"
-" for-loop_311)"
+"(for-loop_306"
+" fold-var_349"
+" rest_210)"
+" fold-var_349)))"
+" fold-var_348)))))"
+" for-loop_306)"
 " null"
-" lst_367))))))"
+" lst_253))))))"
 "(let-values(((bodys_10)"
 "(reverse$1"
-"(let-values(((lst_146)"
+"(let-values(((lst_370)"
 "(if syntaxes?_0 body107_0 body131_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_146)))"
-"((letrec-values(((for-loop_172)"
-"(lambda(fold-var_357 lst_147)"
+"(let-values()(check-list lst_370)))"
+"((letrec-values(((for-loop_308)"
+"(lambda(fold-var_355 lst_371)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_147)"
+"(if(pair? lst_371)"
 "(let-values(((body_20)"
 "(unsafe-car"
-" lst_147))"
-"((rest_74)"
+" lst_371))"
+"((rest_212)"
 "(unsafe-cdr"
-" lst_147)))"
-"(let-values(((fold-var_317)"
-"(let-values(((fold-var_318)"
-" fold-var_357))"
+" lst_371)))"
+"(let-values(((fold-var_356)"
+"(let-values(((fold-var_357)"
+" fold-var_355))"
 "(let-values(((fold-var_358)"
 "(let-values()"
 "(cons"
@@ -65485,18 +65669,18 @@ static const char *startup_source =
 "(add-scope"
 " body_20"
 " sc_37))"
-" fold-var_318))))"
+" fold-var_357))))"
 "(values"
 " fold-var_358)))))"
 "(if(not #f)"
-"(for-loop_172"
-" fold-var_317"
-" rest_74)"
-" fold-var_317)))"
-" fold-var_357)))))"
-" for-loop_172)"
+"(for-loop_308"
+" fold-var_356"
+" rest_212)"
+" fold-var_356)))"
+" fold-var_355)))))"
+" for-loop_308)"
 " null"
-" lst_146))))))"
+" lst_370))))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_88)"
@@ -65534,43 +65718,45 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((trans-valss_0)"
 "(reverse$1"
-"(let-values(((lst_370)"
-"(if syntaxes?_0 trans-rhs104_0 '()))"
-"((lst_371) trans-idss_2))"
+"(let-values(((lst_131)"
+"(if syntaxes?_0"
+" trans-rhs104_0"
+" '()))"
+"((lst_372) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_370)))"
+"(let-values()(check-list lst_131)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_371)))"
-"((letrec-values(((for-loop_313)"
-"(lambda(fold-var_359"
-" lst_372"
-" lst_373)"
+"(let-values()(check-list lst_372)))"
+"((letrec-values(((for-loop_309)"
+"(lambda(fold-var_117"
+" lst_373"
+" lst_374)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_372)"
-"(pair? lst_373)"
+"(if(if(pair? lst_373)"
+"(pair? lst_374)"
 " #f)"
-"(let-values(((rhs_21)"
-"(unsafe-car"
-" lst_372))"
-"((rest_214)"
-"(unsafe-cdr"
-" lst_372))"
-"((ids_39)"
+"(let-values(((rhs_20)"
 "(unsafe-car"
 " lst_373))"
-"((rest_215)"
+"((rest_213)"
 "(unsafe-cdr"
-" lst_373)))"
+" lst_373))"
+"((ids_39)"
+"(unsafe-car"
+" lst_374))"
+"((rest_214)"
+"(unsafe-cdr"
+" lst_374)))"
+"(let-values(((fold-var_359)"
+"(let-values(((fold-var_121)"
+" fold-var_117))"
 "(let-values(((fold-var_360)"
-"(let-values(((fold-var_361)"
-" fold-var_359))"
-"(let-values(((fold-var_362)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65594,7 +65780,7 @@ static const char *startup_source =
 "(let-values(((trans-val_1)"
 "(eval-for-syntaxes-binding"
 "(add-scope"
-" rhs_21"
+" rhs_20"
 " sc_37)"
 " ids_39"
 " ctx_84)))"
@@ -65610,57 +65796,58 @@ static const char *startup_source =
 " 'exit-bind)))"
 "(void)))"
 " trans-val_1))))"
-" fold-var_361))))"
+" fold-var_121))))"
 "(values"
-" fold-var_362)))))"
+" fold-var_360)))))"
 "(if(not #f)"
-"(for-loop_313"
-" fold-var_360"
-" rest_214"
-" rest_215)"
-" fold-var_360)))"
-" fold-var_359)))))"
-" for-loop_313)"
+"(for-loop_309"
+" fold-var_359"
+" rest_213"
+" rest_214)"
+" fold-var_359)))"
+" fold-var_117)))))"
+" for-loop_309)"
 " null"
-" lst_370"
-" lst_371))))))"
+" lst_131"
+" lst_372))))))"
 "(let-values(((rec-val-env_0)"
-"(let-values(((lst_374) val-keyss_2)"
-"((lst_375) val-idss_3))"
+"(let-values(((lst_375) val-keyss_2)"
+"((lst_256) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_374)))"
+"(let-values()(check-list lst_375)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_375)))"
-"((letrec-values(((for-loop_314)"
+"(let-values()(check-list lst_256)))"
+"((letrec-values(((for-loop_310)"
 "(lambda(env_29"
 " lst_376"
 " lst_377)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_376)"
+"(if(if(pair?"
+" lst_376)"
 "(pair? lst_377)"
 " #f)"
 "(let-values(((keys_10)"
 "(unsafe-car"
 " lst_376))"
-"((rest_216)"
+"((rest_215)"
 "(unsafe-cdr"
 " lst_376))"
 "((ids_40)"
 "(unsafe-car"
 " lst_377))"
-"((rest_217)"
+"((rest_216)"
 "(unsafe-cdr"
 " lst_377)))"
 "(let-values(((env_30)"
 "(let-values(((env_31)"
 " env_29))"
-"(let-values(((lst_285)"
+"(let-values(((lst_258)"
 " keys_10)"
 "((lst_378)"
 " ids_40))"
@@ -65670,97 +65857,97 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_285)))"
+" lst_258)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
 " lst_378)))"
-"((letrec-values(((for-loop_315)"
+"((letrec-values(((for-loop_311)"
 "(lambda(env_32"
-" lst_287"
-" lst_379)"
+" lst_379"
+" lst_380)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_287)"
-"(pair?"
 " lst_379)"
+"(pair?"
+" lst_380)"
 " #f)"
-"(let-values(((key_97)"
-"(unsafe-car"
-" lst_287))"
-"((rest_218)"
-"(unsafe-cdr"
-" lst_287))"
-"((id_125)"
+"(let-values(((key_69)"
 "(unsafe-car"
 " lst_379))"
-"((rest_219)"
+"((rest_217)"
 "(unsafe-cdr"
-" lst_379)))"
-"(let-values(((env_5)"
-"(let-values(((env_6)"
-" env_32))"
+" lst_379))"
+"((id_126)"
+"(unsafe-car"
+" lst_380))"
+"((rest_218)"
+"(unsafe-cdr"
+" lst_380)))"
 "(let-values(((env_33)"
+"(let-values(((env_34)"
+" env_32))"
+"(let-values(((env_35)"
 "(let-values()"
 "(env-extend"
-" env_6"
-" key_97"
+" env_34"
+" key_69"
 "(local-variable1.1"
-" id_125)))))"
+" id_126)))))"
 "(values"
-" env_33)))))"
+" env_35)))))"
 "(if(not"
 " #f)"
-"(for-loop_315"
-" env_5"
-" rest_218"
-" rest_219)"
-" env_5)))"
+"(for-loop_311"
+" env_33"
+" rest_217"
+" rest_218)"
+" env_33)))"
 " env_32)))))"
-" for-loop_315)"
+" for-loop_311)"
 " env_31"
-" lst_285"
+" lst_258"
 " lst_378))))))"
 "(if(not #f)"
-"(for-loop_314"
+"(for-loop_310"
 " env_30"
-" rest_216"
-" rest_217)"
+" rest_215"
+" rest_216)"
 " env_30)))"
 " env_29)))))"
-" for-loop_314)"
+" for-loop_310)"
 "(expand-context-env ctx_84)"
-" lst_374"
-" lst_375)))))"
+" lst_375"
+" lst_256)))))"
 "(let-values(((rec-env_0)"
-"(let-values(((lst_380) trans-keyss_0)"
-"((lst_127) trans-valss_0)"
-"((lst_381) trans-idss_2))"
+"(let-values(((lst_381) trans-keyss_0)"
+"((lst_382) trans-valss_0)"
+"((lst_61) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_380)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_127)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
 "(let-values()(check-list lst_381)))"
-"((letrec-values(((for-loop_316)"
-"(lambda(env_34"
-" lst_382"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_382)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_61)))"
+"((letrec-values(((for-loop_84)"
+"(lambda(env_36"
+" lst_62"
 " lst_383"
 " lst_384)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_382)"
+" lst_62)"
 "(if(pair?"
 " lst_383)"
 "(pair?"
@@ -65769,32 +65956,32 @@ static const char *startup_source =
 " #f)"
 "(let-values(((keys_11)"
 "(unsafe-car"
-" lst_382))"
-"((rest_220)"
+" lst_62))"
+"((rest_219)"
 "(unsafe-cdr"
-" lst_382))"
+" lst_62))"
 "((vals_9)"
 "(unsafe-car"
 " lst_383))"
-"((rest_221)"
+"((rest_220)"
 "(unsafe-cdr"
 " lst_383))"
 "((ids_41)"
 "(unsafe-car"
 " lst_384))"
-"((rest_222)"
+"((rest_221)"
 "(unsafe-cdr"
 " lst_384)))"
-"(let-values(((env_35)"
-"(let-values(((env_36)"
-" env_34))"
 "(let-values(((env_37)"
+"(let-values(((env_38)"
+" env_36))"
+"(let-values(((env_39)"
 "(let-values()"
 "(let-values(((lst_385)"
 " keys_11)"
 "((lst_386)"
 " vals_9)"
-"((lst_128)"
+"((lst_387)"
 " ids_41))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65814,87 +66001,88 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_128)))"
-"((letrec-values(((for-loop_160)"
-"(lambda(env_38"
-" lst_129"
-" lst_387"
-" lst_388)"
+" lst_387)))"
+"((letrec-values(((for-loop_312)"
+"(lambda(env_40"
+" lst_66"
+" lst_388"
+" lst_389)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_129)"
+" lst_66)"
 "(if(pair?"
-" lst_387)"
-"(pair?"
 " lst_388)"
+"(pair?"
+" lst_389)"
 " #f)"
 " #f)"
-"(let-values(((key_98)"
+"(let-values(((key_97)"
 "(unsafe-car"
-" lst_129))"
-"((rest_135)"
+" lst_66))"
+"((rest_222)"
 "(unsafe-cdr"
-" lst_129))"
+" lst_66))"
 "((val_87)"
 "(unsafe-car"
-" lst_387))"
+" lst_388))"
 "((rest_223)"
 "(unsafe-cdr"
-" lst_387))"
-"((id_126)"
-"(unsafe-car"
 " lst_388))"
-"((rest_224)"
+"((id_127)"
+"(unsafe-car"
+" lst_389))"
+"((rest_30)"
 "(unsafe-cdr"
-" lst_388)))"
-"(let-values(((env_39)"
-"(let-values(((env_40)"
-" env_38))"
+" lst_389)))"
 "(let-values(((env_41)"
+"(let-values(((env_42)"
+" env_40))"
+"(let-values(((env_43)"
 "(let-values()"
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_87"
-" id_126"
+" id_127"
 " phase_147"
 " ctx_84)"
 "(env-extend"
-" env_40"
-" key_98"
+" env_42"
+" key_97"
 " val_87)))))"
 "(values"
-" env_41)))))"
+" env_43)))))"
 "(if(not"
 " #f)"
-"(for-loop_160"
-" env_39"
-" rest_135"
+"(for-loop_312"
+" env_41"
+" rest_222"
 " rest_223"
-" rest_224)"
-" env_39)))"
-" env_38)))))"
-" for-loop_160)"
-" env_36"
+" rest_30)"
+" env_41)))"
+" env_40)))))"
+" for-loop_312)"
+" env_38"
 " lst_385"
 " lst_386"
-" lst_128))))))"
+" lst_387))))))"
 "(values"
-" env_37)))))"
+" env_39)))))"
 "(if(not #f)"
-"(for-loop_316"
-" env_35"
+"(for-loop_84"
+" env_37"
+" rest_219"
 " rest_220"
-" rest_221"
-" rest_222)"
-" env_35)))"
-" env_34)))))"
-" for-loop_316)"
+" rest_221)"
+" env_37)))"
+" env_36)))))"
+" for-loop_84)"
 " rec-val-env_0"
-" lst_380"
-" lst_127"
-" lst_381)))))"
-"(let-values(((expr-ctx_0)(as-expression-context ctx_84)))"
+" lst_381"
+" lst_382"
+" lst_61)))))"
+"(let-values(((expr-ctx_0)"
+"(as-expression-context ctx_84)))"
 "(let-values(((orig-rrs_0)"
 "(expand-context-reference-records"
 " expr-ctx_0)))"
@@ -65903,30 +66091,31 @@ static const char *startup_source =
 "(let-values(((the-struct_94) v_259))"
 "(if(expand-context/outer?"
 " the-struct_94)"
-"(let-values(((env164_0) rec-env_0)"
-"((scopes165_0)"
+"(let-values(((env185_0)"
+" rec-env_0)"
+"((scopes186_0)"
 "(cons"
 " sc_37"
 "(expand-context-scopes"
 " ctx_84)))"
-"((reference-records166_0)"
+"((reference-records187_0)"
 "(if split-by-reference?_0"
 "(cons"
 " frame-id_15"
 " orig-rrs_0)"
 " orig-rrs_0))"
-"((binding-layer167_0)"
+"((binding-layer188_0)"
 "(increment-binding-layer"
 "(cons"
 " trans-idss_2"
 " val-idss_3)"
 " ctx_84"
 " sc_37))"
-"((inner168_0)"
+"((inner189_0)"
 "(root-expand-context/outer-inner"
 " v_259)))"
 "(expand-context/outer1.1"
-" inner168_0"
+" inner189_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_94)"
 "(root-expand-context/outer-use-site-scopes"
@@ -65935,14 +66124,14 @@ static const char *startup_source =
 " the-struct_94)"
 "(expand-context/outer-context"
 " the-struct_94)"
-" env164_0"
+" env185_0"
 "(expand-context/outer-post-expansion-scope-action"
 " the-struct_94)"
-" scopes165_0"
+" scopes186_0"
 "(expand-context/outer-def-ctx-scopes"
 " the-struct_94)"
-" binding-layer167_0"
-" reference-records166_0"
+" binding-layer188_0"
+" reference-records187_0"
 "(expand-context/outer-only-immediate?"
 " the-struct_94)"
 "(expand-context/outer-need-eventually-defined"
@@ -65953,62 +66142,63 @@ static const char *startup_source =
 " the-struct_94)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                     \"expand-context/outer?\""
+"                                                                                       \"expand-context/outer?\""
 " the-struct_94))))))"
 "(let-values(((letrec-values-id_0)"
 "(if(not"
-"(expand-context-to-parsed? ctx_84))"
+"(expand-context-to-parsed?"
+" ctx_84))"
 "(if syntaxes?_0"
 "(core-id 'letrec-values phase_147)"
 " let-values128_0)"
 " #f)))"
 "(let-values(((rebuild-s_6)"
-"(let-values(((ctx169_0) ctx_84)"
-"((s170_1) s_324)"
-"((temp171_1) #t))"
+"(let-values(((ctx190_0) ctx_84)"
+"((s191_0) s_324)"
+"((temp192_1) #t))"
 "(keep-as-needed85.1"
 " #f"
 " #f"
-" temp171_1"
+" temp192_1"
 " #t"
 " #f"
 " #f"
-" ctx169_0"
-" s170_1))))"
+" ctx190_0"
+" s191_0))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
 " ctx_84)"
 "(reverse$1"
-"(let-values(((lst_389)"
+"(let-values(((lst_390)"
 " val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_389)))"
-"((letrec-values(((for-loop_317)"
-"(lambda(fold-var_120"
-" lst_132)"
+"(check-list lst_390)))"
+"((letrec-values(((for-loop_71)"
+"(lambda(fold-var_361"
+" lst_391)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_132)"
+" lst_391)"
 "(let-values(((val-ids_1)"
 "(unsafe-car"
-" lst_132))"
-"((rest_225)"
+" lst_391))"
+"((rest_224)"
 "(unsafe-cdr"
-" lst_132)))"
+" lst_391)))"
+"(let-values(((fold-var_362)"
 "(let-values(((fold-var_363)"
+" fold-var_361))"
 "(let-values(((fold-var_364)"
-" fold-var_120))"
-"(let-values(((fold-var_365)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_390)"
+"(let-values(((lst_260)"
 " val-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -66016,23 +66206,23 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_390)))"
-"((letrec-values(((for-loop_318)"
-"(lambda(fold-var_366"
-" lst_391)"
+" lst_260)))"
+"((letrec-values(((for-loop_226)"
+"(lambda(fold-var_365"
+" lst_119)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_391)"
+" lst_119)"
 "(let-values(((val-id_0)"
 "(unsafe-car"
-" lst_391))"
-"((rest_226)"
+" lst_119))"
+"((rest_59)"
 "(unsafe-cdr"
-" lst_391)))"
+" lst_119)))"
+"(let-values(((fold-var_366)"
 "(let-values(((fold-var_367)"
-"(let-values(((fold-var_124)"
-" fold-var_366))"
+" fold-var_365))"
 "(let-values(((fold-var_368)"
 "(let-values()"
 "(cons"
@@ -66043,32 +66233,32 @@ static const char *startup_source =
 " val-id_0)"
 " val-id_0"
 " val-id_0))"
-" fold-var_124))))"
+" fold-var_367))))"
 "(values"
 " fold-var_368)))))"
 "(if(not"
 " #f)"
-"(for-loop_318"
-" fold-var_367"
-" rest_226)"
-" fold-var_367)))"
-" fold-var_366)))))"
-" for-loop_318)"
-" null"
-" lst_390)))))"
-" fold-var_364))))"
-"(values"
+"(for-loop_226"
+" fold-var_366"
+" rest_59)"
+" fold-var_366)))"
 " fold-var_365)))))"
+" for-loop_226)"
+" null"
+" lst_260)))))"
+" fold-var_363))))"
+"(values"
+" fold-var_364)))))"
 "(if(not"
 " #f)"
-"(for-loop_317"
-" fold-var_363"
-" rest_225)"
-" fold-var_363)))"
-" fold-var_120)))))"
-" for-loop_317)"
+"(for-loop_71"
+" fold-var_362"
+" rest_224)"
+" fold-var_362)))"
+" fold-var_361)))))"
+" for-loop_71)"
 " null"
-" lst_389))))"
+" lst_390))))"
 " val-idss_3)))"
 "(let-values((()"
 "(begin"
@@ -66117,13 +66307,13 @@ static const char *startup_source =
 " v_260))"
 "(if(expand-context/outer?"
 " the-struct_95)"
-"(let-values(((reference-records175_0)"
+"(let-values(((reference-records196_0)"
 " orig-rrs_0)"
-"((inner176_0)"
+"((inner197_0)"
 "(root-expand-context/outer-inner"
 " v_260)))"
 "(expand-context/outer1.1"
-" inner176_0"
+" inner197_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_95)"
 "(root-expand-context/outer-use-site-scopes"
@@ -66142,7 +66332,7 @@ static const char *startup_source =
 " the-struct_95)"
 "(expand-context/outer-binding-layer"
 " the-struct_95)"
-" reference-records175_0"
+" reference-records196_0"
 "(expand-context/outer-only-immediate?"
 " the-struct_95)"
 "(expand-context/outer-need-eventually-defined"
@@ -66153,26 +66343,26 @@ static const char *startup_source =
 " the-struct_95)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                   \"expand-context/outer?\""
+"                                                                                                                     \"expand-context/outer?\""
 " the-struct_95))))))"
-"(let-values(((bodys172_0)"
+"(let-values(((bodys193_0)"
 " bodys_10)"
-"((temp173_0)"
-"(let-values(((body-ctx177_0)"
+"((temp194_0)"
+"(let-values(((body-ctx198_0)"
 " body-ctx_5)"
-"((ctx178_0)"
+"((ctx199_0)"
 " ctx_84))"
 "(as-tail-context23.1"
-" ctx178_0"
-" body-ctx177_0)))"
-"((rebuild-s174_0)"
+" ctx199_0"
+" body-ctx198_0)))"
+"((rebuild-s195_0)"
 " rebuild-s_6))"
 "(expand-body7.1"
-" rebuild-s174_0"
+" rebuild-s195_0"
 " #f"
 " #f"
-" bodys172_0"
-" temp173_0))))))))"
+" bodys193_0"
+" temp194_0))))))))"
 "(let-values(((result-s_12)"
 "(if(not"
 " split-by-reference?_0)"
@@ -66181,10 +66371,12 @@ static const char *startup_source =
 "(reverse$1"
 "(let-values(((lst_392)"
 " val-name-idss_0)"
-"((lst_393)"
+"((lst_139)"
 " val-keyss_2)"
+"((lst_393)"
+" val-rhss_3)"
 "((lst_394)"
-" val-rhss_3))"
+" val-clauses_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -66197,6 +66389,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_139)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_393)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -66204,42 +66402,52 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_394)))"
-"((letrec-values(((for-loop_319)"
-"(lambda(fold-var_369"
+"((letrec-values(((for-loop_313)"
+"(lambda(fold-var_135"
 " lst_395"
-" lst_62"
-" lst_396)"
+" lst_396"
+" lst_397"
+" lst_398)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
 " lst_395)"
 "(if(pair?"
-" lst_62)"
-"(pair?"
 " lst_396)"
+"(if(pair?"
+" lst_397)"
+"(pair?"
+" lst_398)"
+" #f)"
 " #f)"
 " #f)"
 "(let-values(((ids_42)"
 "(unsafe-car"
 " lst_395))"
-"((rest_227)"
+"((rest_225)"
 "(unsafe-cdr"
 " lst_395))"
 "((keys_12)"
 "(unsafe-car"
-" lst_62))"
-"((rest_228)"
-"(unsafe-cdr"
-" lst_62))"
-"((rhs_22)"
-"(unsafe-car"
 " lst_396))"
-"((rest_229)"
+"((rest_226)"
 "(unsafe-cdr"
-" lst_396)))"
-"(let-values(((fold-var_47)"
+" lst_396))"
+"((rhs_21)"
+"(unsafe-car"
+" lst_397))"
+"((rest_31)"
+"(unsafe-cdr"
+" lst_397))"
+"((clause_4)"
+"(unsafe-car"
+" lst_398))"
+"((rest_227)"
+"(unsafe-cdr"
+" lst_398)))"
+"(let-values(((fold-var_369)"
 "(let-values(((fold-var_370)"
-" fold-var_369))"
+" fold-var_135))"
 "(let-values(((fold-var_371)"
 "(let-values()"
 "(cons"
@@ -66258,9 +66466,9 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-rhs_4)"
-"(let-values(((rhs179_0)"
-" rhs_22)"
-"((temp180_2)"
+"(let-values(((rhs200_0)"
+" rhs_21)"
+"((temp201_1)"
 "(if rec?_1"
 "(as-named-context"
 " rec-ctx_0"
@@ -66273,31 +66481,37 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" rhs179_0"
-" temp180_2))))"
+" rhs200_0"
+" temp201_1))))"
 "(if(expand-context-to-parsed?"
 " ctx_84)"
 "(list"
 " keys_12"
 " exp-rhs_4)"
+"(datum->syntax$1"
+" #f"
 "(list"
 " ids_42"
-" exp-rhs_4)))))"
+" exp-rhs_4)"
+" clause_4"
+" clause_4)))))"
 " fold-var_370))))"
 "(values"
 " fold-var_371)))))"
 "(if(not"
 " #f)"
-"(for-loop_319"
-" fold-var_47"
-" rest_227"
-" rest_228"
-" rest_229)"
-" fold-var_47)))"
-" fold-var_369)))))"
-" for-loop_319)"
+"(for-loop_313"
+" fold-var_369"
+" rest_225"
+" rest_226"
+" rest_31"
+" rest_227)"
+" fold-var_369)))"
+" fold-var_135)))))"
+" for-loop_313)"
 " null"
 " lst_392"
+" lst_139"
 " lst_393"
 " lst_394))))))"
 "(let-values(((exp-body_4)"
@@ -66321,9 +66535,9 @@ static const char *startup_source =
 " val-name-idss_0"
 " clauses_2"
 " exp-body_4))"
-"(let-values(((rebuild-s181_0)"
+"(let-values(((rebuild-s202_0)"
 " rebuild-s_6)"
-"((temp182_0)"
+"((temp203_0)"
 "(list*"
 " letrec-values-id_0"
 " clauses_2"
@@ -66331,91 +66545,48 @@ static const char *startup_source =
 "(rebuild5.1"
 " #f"
 " #f"
-" rebuild-s181_0"
-" temp182_0)))))))"
+" rebuild-s202_0"
+" temp203_0)))))))"
 "(let-values()"
-"(let-values(((val-idss183_0)"
+"(let-values(((val-idss204_0)"
 " val-idss_3)"
-"((val-keyss184_0)"
+"((val-keyss205_0)"
 " val-keyss_2)"
-"((val-rhss185_0)"
+"((val-rhss206_0)"
 " val-rhss_3)"
-"((temp186_1)"
-"(reverse$1"
-"(let-values(((lst_397)"
-" val-idss_3))"
-"(begin"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_397)))"
-"((letrec-values(((for-loop_320)"
-"(lambda(fold-var_372"
-" lst_398)"
-"(begin"
-" 'for-loop"
-"(if(pair?"
-" lst_398)"
-"(let-values(((rhs_23)"
-"(unsafe-car"
-" lst_398))"
-"((rest_230)"
-"(unsafe-cdr"
-" lst_398)))"
-"(let-values(((fold-var_373)"
-"(let-values(((fold-var_374)"
-" fold-var_372))"
-"(let-values(((fold-var_375)"
-"(let-values()"
-"(cons"
-"(let-values()"
-" #f)"
-" fold-var_374))))"
-"(values"
-" fold-var_375)))))"
-"(if(not"
-" #f)"
-"(for-loop_320"
-" fold-var_373"
-" rest_230)"
-" fold-var_373)))"
-" fold-var_372)))))"
-" for-loop_320)"
-" null"
-" lst_397)))))"
-"((temp187_2)"
+"((val-clauses207_0)"
+" val-clauses_0)"
+"((temp208_0)"
 " #t)"
-"((frame-id188_0)"
+"((frame-id209_0)"
 " frame-id_15)"
-"((rec-ctx189_0)"
+"((rec-ctx210_0)"
 " rec-ctx_0)"
-"((rebuild-s190_0)"
+"((rebuild-s211_0)"
 " rebuild-s_6)"
-"((syntaxes?191_0)"
+"((syntaxes?212_0)"
 " syntaxes?_0)"
-"((get-body192_0)"
+"((get-body213_0)"
 " get-body_1)"
-"((temp193_0)"
+"((temp214_1)"
 " #t))"
 "(expand-and-split-bindings-by-reference48.1"
-" rec-ctx189_0"
-" frame-id188_0"
-" get-body192_0"
-" syntaxes?191_0"
-" rebuild-s190_0"
-" temp187_2"
-" temp193_0"
-" val-idss183_0"
-" val-keyss184_0"
-" val-rhss185_0"
-" temp186_1))))))"
+" rec-ctx210_0"
+" frame-id209_0"
+" get-body213_0"
+" syntaxes?212_0"
+" rebuild-s211_0"
+" temp208_0"
+" temp214_1"
+" val-idss204_0"
+" val-keyss205_0"
+" val-rhss206_0"
+" val-clauses207_0))))))"
 "(if(expand-context-to-parsed? ctx_84)"
 " result-s_12"
 "(attach-disappeared-transformer-bindings"
 " result-s_12"
-" trans-idss_2)))))))))))))))))))))))))))))))))))))))))"
+" trans-idss_2))))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(log-let-renames)"
 "(lambda(obs_95 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_38)"
@@ -66431,31 +66602,31 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_400)))"
-"((letrec-values(((for-loop_321)"
-"(lambda(fold-var_376 lst_401 lst_139)"
+"((letrec-values(((for-loop_314)"
+"(lambda(fold-var_372 lst_401 lst_402)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_401)(pair? lst_139) #f)"
+"(if(if(pair? lst_401)(pair? lst_402) #f)"
 "(let-values(((val-ids_2)(unsafe-car lst_401))"
-"((rest_69)(unsafe-cdr lst_401))"
-"((val-rhs_11)(unsafe-car lst_139))"
-"((rest_231)(unsafe-cdr lst_139)))"
-"(let-values(((fold-var_136)"
-"(let-values(((fold-var_137) fold-var_376))"
-"(let-values(((fold-var_377)"
+"((rest_228)(unsafe-cdr lst_401))"
+"((val-rhs_11)(unsafe-car lst_402))"
+"((rest_229)(unsafe-cdr lst_402)))"
+"(let-values(((fold-var_373)"
+"(let-values(((fold-var_374) fold-var_372))"
+"(let-values(((fold-var_51)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(datum->syntax$1"
 " #f"
 "(list val-ids_2 val-rhs_11)))"
-" fold-var_137))))"
-"(values fold-var_377)))))"
+" fold-var_374))))"
+"(values fold-var_51)))))"
 "(if(not #f)"
-"(for-loop_321 fold-var_136 rest_69 rest_231)"
-" fold-var_136)))"
-" fold-var_376)))))"
-" for-loop_321)"
+"(for-loop_314 fold-var_373 rest_228 rest_229)"
+" fold-var_373)))"
+" fold-var_372)))))"
+" for-loop_314)"
 " null"
 " lst_399"
 " lst_400))))"
@@ -66467,26 +66638,26 @@ static const char *startup_source =
 " vals+body_0"
 "(cons"
 "(reverse$1"
-"(let-values(((lst_402) trans-idss_3)((lst_403) trans-rhss_0))"
+"(let-values(((lst_72) trans-idss_3)((lst_403) trans-rhss_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_402)))"
+"(let-values()(check-list lst_72)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_403)))"
-"((letrec-values(((for-loop_322)"
-"(lambda(fold-var_378 lst_70 lst_148)"
+"((letrec-values(((for-loop_315)"
+"(lambda(fold-var_52 lst_404 lst_405)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_70)(pair? lst_148) #f)"
-"(let-values(((trans-ids_0)(unsafe-car lst_70))"
-"((rest_232)(unsafe-cdr lst_70))"
-"((trans-rhs_5)(unsafe-car lst_148))"
-"((rest_75)(unsafe-cdr lst_148)))"
-"(let-values(((fold-var_379)"
-"(let-values(((fold-var_380) fold-var_378))"
-"(let-values(((fold-var_381)"
+"(if(if(pair? lst_404)(pair? lst_405) #f)"
+"(let-values(((trans-ids_0)(unsafe-car lst_404))"
+"((rest_230)(unsafe-cdr lst_404))"
+"((trans-rhs_5)(unsafe-car lst_405))"
+"((rest_231)(unsafe-cdr lst_405)))"
+"(let-values(((fold-var_375)"
+"(let-values(((fold-var_376) fold-var_52))"
+"(let-values(((fold-var_56)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -66495,13 +66666,13 @@ static const char *startup_source =
 "(list"
 " trans-ids_0"
 "(add-scope trans-rhs_5 sc_38))))"
-" fold-var_380))))"
-"(values fold-var_381)))))"
-"(if(not #f)(for-loop_322 fold-var_379 rest_232 rest_75) fold-var_379)))"
-" fold-var_378)))))"
-" for-loop_322)"
+" fold-var_376))))"
+"(values fold-var_56)))))"
+"(if(not #f)(for-loop_315 fold-var_375 rest_230 rest_231) fold-var_375)))"
+" fold-var_52)))))"
+" for-loop_315)"
 " null"
-" lst_402"
+" lst_72"
 " lst_403))))"
 " vals+body_0)))))))"
 "(define-values"
@@ -66519,25 +66690,25 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'let-values"
-"(let-values(((temp194_0) 'prim-let-values))(make-let-values-form11.1 temp194_0 #f #f #f #f #f #f #f #f))))"
+"(let-values(((temp215_1) 'prim-let-values))(make-let-values-form11.1 temp215_1 #f #f #f #f #f #f #f #f))))"
 "(void"
 "(add-core-form!*"
 " 'letrec-values"
-"(let-values(((temp195_0) #t)((temp196_0) 'prim-letrec-values))"
-"(make-let-values-form11.1 temp196_0 temp195_0 #t #f #f #f #f #f #f))))"
+"(let-values(((temp216_1) #t)((temp217_1) 'prim-letrec-values))"
+"(make-let-values-form11.1 temp217_1 temp216_1 #t #f #f #f #f #f #f))))"
 "(void"
 "(add-core-form!*"
 " 'letrec-syntaxes+values"
-"(let-values(((temp197_1) #t)"
-"((temp198_1) #t)"
-"((temp199_0) #t)"
-"((temp200_0) 'prim-letrec-syntaxes+values)"
-"((temp201_1) 'letrec-syntaxes-renames))"
-"(make-let-values-form11.1 temp200_0 temp198_1 #t temp201_1 #t temp199_0 #t temp197_1 #t))))"
+"(let-values(((temp218_1) #t)"
+"((temp219_1) #t)"
+"((temp220_0) #t)"
+"((temp221_1) 'prim-letrec-syntaxes+values)"
+"((temp222_2) 'letrec-syntaxes-renames))"
+"(make-let-values-form11.1 temp221_1 temp219_1 #t temp222_2 #t temp220_0 #t temp218_1 #t))))"
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_528 ctx_85)"
+"(lambda(s_537 ctx_85)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_97)(expand-context-observer ctx_85)))"
@@ -66545,71 +66716,71 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_97 'prim-#%stratified)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_9)(syntax-disarm$1 s_528)))"
-"(let-values(((ok?_39 #%stratified-body202_0 body203_0)"
-"(let-values(((s_529) disarmed-s_9))"
-"(let-values(((orig-s_47) s_529))"
-"(let-values(((#%stratified-body202_1 body203_1)"
-"(let-values(((s_530)(if(syntax?$1 s_529)(syntax-e$1 s_529) s_529)))"
-"(if(pair? s_530)"
-"(let-values(((#%stratified-body204_0)"
-"(let-values(((s_531)(car s_530))) s_531))"
-"((body205_0)"
-"(let-values(((s_532)(cdr s_530)))"
-"(let-values(((s_533)"
-"(if(syntax?$1 s_532)"
-"(syntax-e$1 s_532)"
-" s_532)))"
-"(let-values(((flat-s_39)(to-syntax-list.1 s_533)))"
-"(if(not flat-s_39)"
+"(let-values(((disarmed-s_9)(syntax-disarm$1 s_537)))"
+"(let-values(((ok?_41 #%stratified-body223_0 body224_0)"
+"(let-values(((s_538) disarmed-s_9))"
+"(let-values(((orig-s_49) s_538))"
+"(let-values(((#%stratified-body223_1 body224_1)"
+"(let-values(((s_539)(if(syntax?$1 s_538)(syntax-e$1 s_538) s_538)))"
+"(if(pair? s_539)"
+"(let-values(((#%stratified-body225_0)"
+"(let-values(((s_540)(car s_539))) s_540))"
+"((body226_0)"
+"(let-values(((s_541)(cdr s_539)))"
+"(let-values(((s_542)"
+"(if(syntax?$1 s_541)"
+"(syntax-e$1 s_541)"
+" s_541)))"
+"(let-values(((flat-s_41)(to-syntax-list.1 s_542)))"
+"(if(not flat-s_41)"
 "(let-values()"
-"                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_47))"
-"(if(null? flat-s_39)"
+"                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_49))"
+"(if(null? flat-s_41)"
 "(let-values()"
-"                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_47))"
-"(let-values() flat-s_39))))))))"
-"(values #%stratified-body204_0 body205_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_47)))))"
-"(values #t #%stratified-body202_1 body203_1))))))"
+"                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_49))"
+"(let-values() flat-s_41))))))))"
+"(values #%stratified-body225_0 body226_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_49)))))"
+"(values #t #%stratified-body223_1 body224_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx206_0) ctx_85)((s207_0) s_528)((temp208_0) #t))"
-"(keep-as-needed85.1 #f #f temp208_0 #t #f #f ctx206_0 s207_0))))"
+"(let-values(((ctx227_0) ctx_85)((s228_0) s_537)((temp229_1) #t))"
+"(keep-as-needed85.1 #f #f temp229_1 #t #f #f ctx227_0 s228_0))))"
 "(let-values(((exp-body_5)"
-"(let-values(((temp209_1) body203_0)"
-"((ctx210_0) ctx_85)"
-"((temp211_1) #t)"
-"((rebuild-s212_0) rebuild-s_7))"
-"(expand-body7.1 rebuild-s212_0 temp211_1 #t temp209_1 ctx210_0))))"
+"(let-values(((temp230_2) body224_0)"
+"((ctx231_0) ctx_85)"
+"((temp232_1) #t)"
+"((rebuild-s233_0) rebuild-s_7))"
+"(expand-body7.1 rebuild-s233_0 temp232_1 #t temp230_2 ctx231_0))))"
 "(if(expand-context-to-parsed? ctx_85)"
 "(parsed-begin12.1 rebuild-s_7 exp-body_5)"
-"(let-values(((rebuild-s213_0) rebuild-s_7)"
-"((temp214_1)"
+"(let-values(((rebuild-s234_0) rebuild-s_7)"
+"((temp235_1)"
 "(if(null?(cdr exp-body_5))"
 "(car exp-body_5)"
 "(list*(core-id 'begin(expand-context-phase ctx_85)) exp-body_5))))"
-"(rebuild5.1 #f #f rebuild-s213_0 temp214_1)))))))))))"
+"(rebuild5.1 #f #f rebuild-s234_0 temp235_1)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_534 ctx_86)"
+"(lambda(s_543 ctx_86)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_98)(expand-context-observer ctx_86)))"
 "(if obs_98(let-values()(let-values()(call-expand-observe obs_98 'prim-#%datum)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_10)(syntax-disarm$1 s_534)))"
-"(let-values(((ok?_40 #%datum215_0 datum216_0)"
-"(let-values(((s_535) disarmed-s_10))"
-"(let-values(((orig-s_48) s_535))"
-"(let-values(((#%datum215_1 datum216_1)"
-"(let-values(((s_536)(if(syntax?$1 s_535)(syntax-e$1 s_535) s_535)))"
-"(if(pair? s_536)"
-"(let-values(((#%datum217_0)(let-values(((s_537)(car s_536))) s_537))"
-"((datum218_0)(let-values(((s_538)(cdr s_536))) s_538)))"
-"(values #%datum217_0 datum218_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
-"(values #t #%datum215_1 datum216_1))))))"
-"(let-values(((datum_2) datum216_0))"
+"(let-values(((disarmed-s_10)(syntax-disarm$1 s_543)))"
+"(let-values(((ok?_42 #%datum236_0 datum237_0)"
+"(let-values(((s_544) disarmed-s_10))"
+"(let-values(((orig-s_50) s_544))"
+"(let-values(((#%datum236_1 datum237_1)"
+"(let-values(((s_545)(if(syntax?$1 s_544)(syntax-e$1 s_544) s_544)))"
+"(if(pair? s_545)"
+"(let-values(((#%datum238_0)(let-values(((s_546)(car s_545))) s_546))"
+"((datum239_0)(let-values(((s_547)(cdr s_545))) s_547)))"
+"(values #%datum238_0 datum239_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_50)))))"
+"(values #t #%datum236_1 datum237_1))))))"
+"(let-values(((datum_2) datum237_0))"
 "(let-values((()"
 "(begin"
 "(if(if(syntax?$1 datum_2)(keyword?(syntax-e$1 datum_2)) #f)"
@@ -66619,70 +66790,70 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((phase_148)(expand-context-phase ctx_86)))"
 "(if(if(expand-context-to-parsed? ctx_86)(free-id-set-empty?(expand-context-stops ctx_86)) #f)"
-"(parsed-quote14.1(keep-properties-only~ s_534)(syntax->datum$1 datum_2))"
-"(let-values(((s219_0) s_534)((temp220_0)(list(core-id 'quote phase_148) datum_2)))"
-"(rebuild5.1 #f #f s219_0 temp220_0))))))))))))"
+"(parsed-quote14.1(keep-properties-only~ s_543)(syntax->datum$1 datum_2))"
+"(let-values(((s240_0) s_543)((temp241_1)(list(core-id 'quote phase_148) datum_2)))"
+"(rebuild5.1 #f #f s240_0 temp241_1))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_539 ctx_87)"
+"(lambda(s_548 ctx_87)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_99)(expand-context-observer ctx_87)))"
 "(if obs_99(let-values()(let-values()(call-expand-observe obs_99 'prim-#%app)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_11)(syntax-disarm$1 s_539)))"
-"(let-values(((ok?_41 #%app221_0 e222_0)"
-"(let-values(((s_540) disarmed-s_11))"
-"(let-values(((orig-s_49) s_540))"
-"(let-values(((#%app221_1 e222_1)"
-"(let-values(((s_541)(if(syntax?$1 s_540)(syntax-e$1 s_540) s_540)))"
-"(if(pair? s_541)"
-"(let-values(((#%app223_0)(let-values(((s_542)(car s_541))) s_542))"
-"((e224_0)"
-"(let-values(((s_543)(cdr s_541)))"
-"(let-values(((s_544)"
-"(if(syntax?$1 s_543)"
-"(syntax-e$1 s_543)"
-" s_543)))"
-"(let-values(((flat-s_40)(to-syntax-list.1 s_544)))"
-"(if(not flat-s_40)"
+"(let-values(((disarmed-s_11)(syntax-disarm$1 s_548)))"
+"(let-values(((ok?_43 #%app242_0 e243_0)"
+"(let-values(((s_549) disarmed-s_11))"
+"(let-values(((orig-s_51) s_549))"
+"(let-values(((#%app242_1 e243_1)"
+"(let-values(((s_550)(if(syntax?$1 s_549)(syntax-e$1 s_549) s_549)))"
+"(if(pair? s_550)"
+"(let-values(((#%app244_0)(let-values(((s_551)(car s_550))) s_551))"
+"((e245_0)"
+"(let-values(((s_552)(cdr s_550)))"
+"(let-values(((s_553)"
+"(if(syntax?$1 s_552)"
+"(syntax-e$1 s_552)"
+" s_552)))"
+"(let-values(((flat-s_42)(to-syntax-list.1 s_553)))"
+"(if(not flat-s_42)"
 "(let-values()"
-"                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_49))"
-"(let-values() flat-s_40)))))))"
-"(values #%app223_0 e224_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_49)))))"
-"(values #t #%app221_1 e222_1))))))"
-"(let-values(((es_3) e222_0))"
+"                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_51))"
+"(let-values() flat-s_42)))))))"
+"(values #%app244_0 e245_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
+"(values #t #%app242_1 e243_1))))))"
+"(let-values(((es_3) e243_0))"
 "(if(null? es_3)"
 "(let-values()"
 "(let-values(((phase_149)(expand-context-phase ctx_87)))"
 "(if(expand-context-to-parsed? ctx_87)"
-"(parsed-quote14.1(keep-properties-only~ s_539) null)"
-"(let-values(((s225_0) s_539)((temp226_1)(list(core-id 'quote phase_149) null)))"
-"(rebuild5.1 #f #f s225_0 temp226_1)))))"
+"(parsed-quote14.1(keep-properties-only~ s_548) null)"
+"(let-values(((s246_0) s_548)((temp247_0)(list(core-id 'quote phase_149) null)))"
+"(rebuild5.1 #f #f s246_0 temp247_0)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_8)"
-"(let-values(((ctx227_0) ctx_87)"
-"((s228_0) s_539)"
-"((keep-for-parsed?229_0) keep-for-parsed?_1))"
-"(keep-as-needed85.1 #f #f #f #f keep-for-parsed?229_0 #t ctx227_0 s228_0))))"
+"(let-values(((ctx248_0) ctx_87)"
+"((s249_0) s_548)"
+"((keep-for-parsed?250_0) keep-for-parsed?_1))"
+"(keep-as-needed85.1 #f #f #f #f keep-for-parsed?250_0 #t ctx248_0 s249_0))))"
 "(let-values(((prefixless_0)(cdr(syntax-e$1 disarmed-s_11))))"
 "(let-values(((rebuild-prefixless_0)"
 "(if(syntax?$1 prefixless_0)"
-"(let-values(((ctx230_0) ctx_87)"
-"((prefixless231_0) prefixless_0)"
-"((keep-for-parsed?232_0) keep-for-parsed?_1))"
+"(let-values(((ctx251_0) ctx_87)"
+"((prefixless252_0) prefixless_0)"
+"((keep-for-parsed?253_0) keep-for-parsed?_1))"
 "(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" keep-for-parsed?232_0"
+" keep-for-parsed?253_0"
 " #t"
-" ctx230_0"
-" prefixless231_0))"
+" ctx251_0"
+" prefixless252_0))"
 " #f)))"
 "(let-values(((expr-ctx_1)(as-expression-context ctx_87)))"
 "(let-values((()"
@@ -66695,33 +66866,33 @@ static const char *startup_source =
 "(call-expand-observe"
 " obs_100"
 " 'enter-list"
-"(datum->syntax$1 #f es_3 s_539))"
+"(datum->syntax$1 #f es_3 s_548))"
 "(call-expand-observe obs_100 'next))))"
 "(void)))"
 "(values))))"
 "(let-values(((rest-es_0)(cdr es_3)))"
 "(let-values(((exp-rator_0)"
-"(let-values(((temp233_2)(car es_3))((expr-ctx234_0) expr-ctx_1))"
-"(expand7.1 #f #f #f #f temp233_2 expr-ctx234_0))))"
+"(let-values(((temp254_0)(car es_3))((expr-ctx255_0) expr-ctx_1))"
+"(expand7.1 #f #f #f #f temp254_0 expr-ctx255_0))))"
 "(let-values(((exp-es_0)"
 "(reverse$1"
-"(let-values(((lst_404) rest-es_0))"
+"(let-values(((lst_406) rest-es_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_404)))"
-"((letrec-values(((for-loop_323)"
-"(lambda(fold-var_382 lst_405)"
+"(let-values()(check-list lst_406)))"
+"((letrec-values(((for-loop_316)"
+"(lambda(fold-var_377 lst_407)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_405)"
-"(let-values(((e_92)(unsafe-car lst_405))"
-"((rest_233)"
-"(unsafe-cdr lst_405)))"
-"(let-values(((fold-var_383)"
-"(let-values(((fold-var_384)"
-" fold-var_382))"
-"(let-values(((fold-var_385)"
+"(if(pair? lst_407)"
+"(let-values(((e_92)(unsafe-car lst_407))"
+"((rest_232)"
+"(unsafe-cdr lst_407)))"
+"(let-values(((fold-var_378)"
+"(let-values(((fold-var_379)"
+" fold-var_377))"
+"(let-values(((fold-var_380)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -66736,41 +66907,41 @@ static const char *startup_source =
 " obs_101"
 " 'next)))"
 "(void)))"
-"(let-values(((e235_0)"
+"(let-values(((e256_0)"
 " e_92)"
-"((expr-ctx236_0)"
+"((expr-ctx257_0)"
 " expr-ctx_1))"
 "(expand7.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" e235_0"
-" expr-ctx236_0))))"
-" fold-var_384))))"
+" e256_0"
+" expr-ctx257_0))))"
+" fold-var_379))))"
 "(values"
-" fold-var_385)))))"
+" fold-var_380)))))"
 "(if(not #f)"
-"(for-loop_323 fold-var_383 rest_233)"
-" fold-var_383)))"
-" fold-var_382)))))"
-" for-loop_323)"
+"(for-loop_316 fold-var_378 rest_232)"
+" fold-var_378)))"
+" fold-var_377)))))"
+" for-loop_316)"
 " null"
-" lst_404))))))"
+" lst_406))))))"
 "(if(expand-context-to-parsed? ctx_87)"
 "(let-values()"
 "(parsed-app7.1"
-"(let-values(((or-part_215) rebuild-prefixless_0))"
-"(if or-part_215 or-part_215 rebuild-s_8))"
+"(let-values(((or-part_387) rebuild-prefixless_0))"
+"(if or-part_387 or-part_387 rebuild-s_8))"
 " exp-rator_0"
 " exp-es_0))"
 "(let-values()"
 "(let-values(((es_4)"
 "(let-values(((exp-es_1)(cons exp-rator_0 exp-es_0)))"
 "(if rebuild-prefixless_0"
-"(let-values(((rebuild-prefixless239_0) rebuild-prefixless_0)"
-"((exp-es240_0) exp-es_1))"
-"(rebuild5.1 #f #f rebuild-prefixless239_0 exp-es240_0))"
+"(let-values(((rebuild-prefixless260_0) rebuild-prefixless_0)"
+"((exp-es261_0) exp-es_1))"
+"(rebuild5.1 #f #f rebuild-prefixless260_0 exp-es261_0))"
 " exp-es_1))))"
 "(begin"
 "(let-values(((obs_102)(expand-context-observer expr-ctx_1)))"
@@ -66782,58 +66953,58 @@ static const char *startup_source =
 " 'exit-list"
 "(datum->syntax$1 #f es_4 rebuild-s_8))))"
 "(void)))"
-"(let-values(((rebuild-s237_0) rebuild-s_8)"
-"((temp238_1)(cons #%app221_0 es_4)))"
-"(rebuild5.1 #f #f rebuild-s237_0 temp238_1))))))))))))))))))))))))"
+"(let-values(((rebuild-s258_0) rebuild-s_8)"
+"((temp259_1)(cons #%app242_0 es_4)))"
+"(rebuild5.1 #f #f rebuild-s258_0 temp259_1))))))))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_545 ctx_88)"
+"(lambda(s_267 ctx_88)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_103)(expand-context-observer ctx_88)))"
 "(if obs_103(let-values()(let-values()(call-expand-observe obs_103 'prim-quote)))(void)))"
 "(values))))"
-"(let-values(((ok?_42 quote241_0 datum242_0)"
-"(let-values(((s_546)(syntax-disarm$1 s_545)))"
-"(let-values(((orig-s_50) s_546))"
-"(let-values(((quote241_1 datum242_1)"
-"(let-values(((s_547)(if(syntax?$1 s_546)(syntax-e$1 s_546) s_546)))"
-"(if(pair? s_547)"
-"(let-values(((quote243_0)(let-values(((s_548)(car s_547))) s_548))"
-"((datum244_0)"
-"(let-values(((s_549)(cdr s_547)))"
-"(let-values(((s_550)"
-"(if(syntax?$1 s_549)"
-"(syntax-e$1 s_549)"
-" s_549)))"
-"(if(pair? s_550)"
-"(let-values(((datum245_0)"
-"(let-values(((s_551)(car s_550))) s_551))"
+"(let-values(((ok?_44 quote262_0 datum263_0)"
+"(let-values(((s_274)(syntax-disarm$1 s_267)))"
+"(let-values(((orig-s_52) s_274))"
+"(let-values(((quote262_1 datum263_1)"
+"(let-values(((s_554)(if(syntax?$1 s_274)(syntax-e$1 s_274) s_274)))"
+"(if(pair? s_554)"
+"(let-values(((quote264_0)(let-values(((s_555)(car s_554))) s_555))"
+"((datum265_0)"
+"(let-values(((s_556)(cdr s_554)))"
+"(let-values(((s_557)"
+"(if(syntax?$1 s_556)"
+"(syntax-e$1 s_556)"
+" s_556)))"
+"(if(pair? s_557)"
+"(let-values(((datum266_0)"
+"(let-values(((s_558)(car s_557))) s_558))"
 "(()"
-"(let-values(((s_552)(cdr s_550)))"
-"(let-values(((s_553)"
-"(if(syntax?$1 s_552)"
-"(syntax-e$1 s_552)"
-" s_552)))"
-"(if(null? s_553)"
+"(let-values(((s_559)(cdr s_557)))"
+"(let-values(((s_560)"
+"(if(syntax?$1 s_559)"
+"(syntax-e$1 s_559)"
+" s_559)))"
+"(if(null? s_560)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                    \"bad syntax\""
-" orig-s_50))))))"
-"(values datum245_0))"
-"                                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_50))))))"
-"(values quote243_0 datum244_0))"
-"                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_50)))))"
-"(values #t quote241_1 datum242_1))))))"
+" orig-s_52))))))"
+"(values datum266_0))"
+"                                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_52))))))"
+"(values quote264_0 datum265_0))"
+"                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_52)))))"
+"(values #t quote262_1 datum263_1))))))"
 "(if(expand-context-to-parsed? ctx_88)"
-"(parsed-quote14.1(keep-properties-only~ s_545)(syntax->datum$1 datum242_0))"
-" s_545))))))"
+"(parsed-quote14.1(keep-properties-only~ s_267)(syntax->datum$1 datum263_0))"
+" s_267))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_554 ctx_89)"
+"(lambda(s_561 ctx_89)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_104)(expand-context-observer ctx_89)))"
@@ -66841,27 +67012,27 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_104 'prim-quote-syntax)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_12)(syntax-disarm$1 s_554)))"
-"(let-values(((ok?_43 quote-syntax246_0 datum247_0)"
-"(let-values(((s_555) disarmed-s_12))"
-"(if(let-values(((s_556)(if(syntax?$1 s_555)(syntax-e$1 s_555) s_555)))"
-"(if(pair? s_556)"
-"(if(let-values(((s_557)(car s_556))) #t)"
-"(let-values(((s_558)(cdr s_556)))"
-"(let-values(((s_559)(if(syntax?$1 s_558)(syntax-e$1 s_558) s_558)))"
-"(if(pair? s_559)"
-"(if(let-values(((s_560)(car s_559))) #t)"
-"(let-values(((s_561)(cdr s_559)))"
-"(let-values(((s_562)(if(syntax?$1 s_561)(syntax-e$1 s_561) s_561)))"
-"(if(pair? s_562)"
-"(if(let-values(((s_563)(car s_562)))"
-"(let-values(((s_564)"
-"(if(syntax?$1 s_563)(syntax-e$1 s_563) s_563)))"
-"(eq? '#:local s_564)))"
-"(let-values(((s_565)(cdr s_562)))"
-"(let-values(((s_566)"
-"(if(syntax?$1 s_565)(syntax-e$1 s_565) s_565)))"
-"(null? s_566)))"
+"(let-values(((disarmed-s_12)(syntax-disarm$1 s_561)))"
+"(let-values(((ok?_45 quote-syntax267_0 datum268_0)"
+"(let-values(((s_562) disarmed-s_12))"
+"(if(let-values(((s_563)(if(syntax?$1 s_562)(syntax-e$1 s_562) s_562)))"
+"(if(pair? s_563)"
+"(if(let-values(((s_282)(car s_563))) #t)"
+"(let-values(((s_283)(cdr s_563)))"
+"(let-values(((s_284)(if(syntax?$1 s_283)(syntax-e$1 s_283) s_283)))"
+"(if(pair? s_284)"
+"(if(let-values(((s_564)(car s_284))) #t)"
+"(let-values(((s_565)(cdr s_284)))"
+"(let-values(((s_566)(if(syntax?$1 s_565)(syntax-e$1 s_565) s_565)))"
+"(if(pair? s_566)"
+"(if(let-values(((s_567)(car s_566)))"
+"(let-values(((s_568)"
+"(if(syntax?$1 s_567)(syntax-e$1 s_567) s_567)))"
+"(eq? '#:local s_568)))"
+"(let-values(((s_569)(cdr s_566)))"
+"(let-values(((s_570)"
+"(if(syntax?$1 s_569)(syntax-e$1 s_569) s_569)))"
+"(null? s_570)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -66869,199 +67040,199 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((quote-syntax246_1 datum247_1)"
-"(let-values(((s_267)(if(syntax?$1 s_555)(syntax-e$1 s_555) s_555)))"
-"(let-values(((quote-syntax248_0)"
-"(let-values(((s_567)(car s_267))) s_567))"
-"((datum249_0)"
-"(let-values(((s_568)(cdr s_267)))"
-"(let-values(((s_268)"
-"(if(syntax?$1 s_568)"
-"(syntax-e$1 s_568)"
-" s_568)))"
-"(let-values(((datum250_0)"
-"(let-values(((s_569)(car s_268))) s_569))"
+"(let-values(((quote-syntax267_1 datum268_1)"
+"(let-values(((s_571)(if(syntax?$1 s_562)(syntax-e$1 s_562) s_562)))"
+"(let-values(((quote-syntax269_0)"
+"(let-values(((s_572)(car s_571))) s_572))"
+"((datum270_0)"
+"(let-values(((s_285)(cdr s_571)))"
+"(let-values(((s_573)"
+"(if(syntax?$1 s_285)"
+"(syntax-e$1 s_285)"
+" s_285)))"
+"(let-values(((datum271_0)"
+"(let-values(((s_574)(car s_573))) s_574))"
 "(()"
-"(let-values(((s_570)(cdr s_268)))"
-"(let-values(((s_269)"
-"(if(syntax?$1 s_570)"
-"(syntax-e$1 s_570)"
-" s_570)))"
+"(let-values(((s_286)(cdr s_573)))"
+"(let-values(((s_575)"
+"(if(syntax?$1 s_286)"
+"(syntax-e$1 s_286)"
+" s_286)))"
 "(let-values((()"
-"(let-values(((s_270)"
+"(let-values(((s_576)"
 "(car"
-" s_269)))"
-"(let-values(((s_271)"
+" s_575)))"
+"(let-values(((s_287)"
 "(if(syntax?$1"
-" s_270)"
+" s_576)"
 "(syntax-e$1"
-" s_270)"
-" s_270)))"
+" s_576)"
+" s_576)))"
 "(values))))"
 "(()"
-"(let-values(((s_571)"
+"(let-values(((s_288)"
 "(cdr"
-" s_269)))"
-"(let-values(((s_572)"
+" s_575)))"
+"(let-values(((s_289)"
 "(if(syntax?$1"
-" s_571)"
+" s_288)"
 "(syntax-e$1"
-" s_571)"
-" s_571)))"
+" s_288)"
+" s_288)))"
 "(values)))))"
 "(values))))))"
-"(values datum250_0))))))"
-"(values quote-syntax248_0 datum249_0)))))"
-"(values #t quote-syntax246_1 datum247_1)))"
+"(values datum271_0))))))"
+"(values quote-syntax269_0 datum270_0)))))"
+"(values #t quote-syntax267_1 datum268_1)))"
 "(values #f #f #f)))))"
-"(let-values(((ok?_44 quote-syntax251_0 datum252_0)"
-"(let-values(((s_272) disarmed-s_12))"
-"(if(if(not ok?_43) #t #f)"
-"(let-values(((orig-s_51) s_272))"
-"(let-values(((quote-syntax251_1 datum252_1)"
-"(let-values(((s_573)(if(syntax?$1 s_272)(syntax-e$1 s_272) s_272)))"
-"(if(pair? s_573)"
-"(let-values(((quote-syntax253_0)"
-"(let-values(((s_574)(car s_573))) s_574))"
-"((datum254_0)"
-"(let-values(((s_575)(cdr s_573)))"
-"(let-values(((s_576)"
-"(if(syntax?$1 s_575)"
-"(syntax-e$1 s_575)"
-" s_575)))"
-"(if(pair? s_576)"
-"(let-values(((datum255_0)"
-"(let-values(((s_577)(car s_576)))"
-" s_577))"
+"(let-values(((ok?_46 quote-syntax272_0 datum273_0)"
+"(let-values(((s_577) disarmed-s_12))"
+"(if(if(not ok?_45) #t #f)"
+"(let-values(((orig-s_53) s_577))"
+"(let-values(((quote-syntax272_1 datum273_1)"
+"(let-values(((s_578)(if(syntax?$1 s_577)(syntax-e$1 s_577) s_577)))"
+"(if(pair? s_578)"
+"(let-values(((quote-syntax274_0)"
+"(let-values(((s_579)(car s_578))) s_579))"
+"((datum275_0)"
+"(let-values(((s_580)(cdr s_578)))"
+"(let-values(((s_581)"
+"(if(syntax?$1 s_580)"
+"(syntax-e$1 s_580)"
+" s_580)))"
+"(if(pair? s_581)"
+"(let-values(((datum276_0)"
+"(let-values(((s_582)(car s_581)))"
+" s_582))"
 "(()"
-"(let-values(((s_578)(cdr s_576)))"
-"(let-values(((s_579)"
-"(if(syntax?$1 s_578)"
-"(syntax-e$1 s_578)"
-" s_578)))"
-"(if(null? s_579)"
+"(let-values(((s_583)(cdr s_581)))"
+"(let-values(((s_584)"
+"(if(syntax?$1 s_583)"
+"(syntax-e$1 s_583)"
+" s_583)))"
+"(if(null? s_584)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                          \"bad syntax\""
-" orig-s_51))))))"
-"(values datum255_0))"
+" orig-s_53))))))"
+"(values datum276_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                      \"bad syntax\""
-" orig-s_51))))))"
-"(values quote-syntax253_0 datum254_0))"
-"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
-"(values #t quote-syntax251_1 datum252_1)))"
+" orig-s_53))))))"
+"(values quote-syntax274_0 datum275_0))"
+"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
+"(values #t quote-syntax272_1 datum273_1)))"
 "(values #f #f #f)))))"
-"(if ok?_43"
+"(if ok?_45"
 "(let-values()"
 "(let-values((()"
 "(begin"
 "(reference-records-all-used!(expand-context-reference-records ctx_89))"
 "(values))))"
-"(let-values(((ok?_45 _256_0 _257_0 kw258_0)"
-"(let-values(((s_580) disarmed-s_12))"
-"(let-values(((orig-s_52) s_580))"
-"(let-values(((_256_1 _257_1 kw258_1)"
-"(let-values(((s_581)"
-"(if(syntax?$1 s_580)(syntax-e$1 s_580) s_580)))"
-"(if(pair? s_581)"
-"(let-values(((_259_0)"
-"(let-values(((s_582)(car s_581))) s_582))"
-"((_260_0 kw261_0)"
-"(let-values(((s_583)(cdr s_581)))"
-"(let-values(((s_280)"
-"(if(syntax?$1 s_583)"
-"(syntax-e$1 s_583)"
-" s_583)))"
-"(if(pair? s_280)"
-"(let-values(((_262_0)"
-"(let-values(((s_584)"
-"(car s_280)))"
-" s_584))"
-"((kw263_0)"
-"(let-values(((s_281)"
-"(cdr s_280)))"
-"(let-values(((s_585)"
+"(let-values(((ok?_47 _277_0 _278_0 kw279_0)"
+"(let-values(((s_585) disarmed-s_12))"
+"(let-values(((orig-s_54) s_585))"
+"(let-values(((_277_1 _278_1 kw279_1)"
+"(let-values(((s_586)"
+"(if(syntax?$1 s_585)(syntax-e$1 s_585) s_585)))"
+"(if(pair? s_586)"
+"(let-values(((_280_0)"
+"(let-values(((s_587)(car s_586))) s_587))"
+"((_281_0 kw282_0)"
+"(let-values(((s_588)(cdr s_586)))"
+"(let-values(((s_589)"
+"(if(syntax?$1 s_588)"
+"(syntax-e$1 s_588)"
+" s_588)))"
+"(if(pair? s_589)"
+"(let-values(((_283_0)"
+"(let-values(((s_590)"
+"(car s_589)))"
+" s_590))"
+"((kw284_0)"
+"(let-values(((s_591)"
+"(cdr s_589)))"
+"(let-values(((s_592)"
 "(if(syntax?$1"
-" s_281)"
+" s_591)"
 "(syntax-e$1"
-" s_281)"
-" s_281)))"
-"(if(pair? s_585)"
-"(let-values(((kw264_0)"
-"(let-values(((s_282)"
+" s_591)"
+" s_591)))"
+"(if(pair? s_592)"
+"(let-values(((kw285_0)"
+"(let-values(((s_593)"
 "(car"
-" s_585)))"
-" s_282))"
+" s_592)))"
+" s_593))"
 "(()"
-"(let-values(((s_283)"
+"(let-values(((s_594)"
 "(cdr"
-" s_585)))"
-"(let-values(((s_284)"
+" s_592)))"
+"(let-values(((s_595)"
 "(if(syntax?$1"
-" s_283)"
+" s_594)"
 "(syntax-e$1"
-" s_283)"
-" s_283)))"
+" s_594)"
+" s_594)))"
 "(if(null?"
-" s_284)"
+" s_595)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                    \"bad syntax\""
-" orig-s_52))))))"
-"(values kw264_0))"
+" orig-s_54))))))"
+"(values kw285_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                \"bad syntax\""
-" orig-s_52))))))"
-"(values _262_0 kw263_0))"
+" orig-s_54))))))"
+"(values _283_0 kw284_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                            \"bad syntax\""
-" orig-s_52))))))"
-"(values _259_0 _260_0 kw261_0))"
-"                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_52)))))"
-"(values #t _256_1 _257_1 kw258_1))))))"
+" orig-s_54))))))"
+"(values _280_0 _281_0 kw282_0))"
+"                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_54)))))"
+"(values #t _277_1 _278_1 kw279_1))))))"
 "(if(expand-context-to-parsed? ctx_89)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_554) datum247_0)"
-"(let-values(((s265_0) s_554)((temp266_1)(list quote-syntax246_0 datum247_0 kw258_0)))"
-"(rebuild5.1 #f #f s265_0 temp266_1))))))"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_561) datum268_0)"
+"(let-values(((s286_0) s_561)((temp287_0)(list quote-syntax267_0 datum268_0 kw279_0)))"
+"(rebuild5.1 #f #f s286_0 temp287_0))))))"
 "(let-values()"
-"(let-values(((datum-s_0)(remove-scopes datum252_0(expand-context-scopes ctx_89))))"
+"(let-values(((datum-s_0)(remove-scopes datum273_0(expand-context-scopes ctx_89))))"
 "(if(if(expand-context-to-parsed? ctx_89)(free-id-set-empty?(expand-context-stops ctx_89)) #f)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_554) datum-s_0)"
-"(let-values(((s267_0) s_554)((temp268_0)(list quote-syntax251_0 datum-s_0)))"
-"(rebuild5.1 #f #f s267_0 temp268_0)))))))))))))"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_561) datum-s_0)"
+"(let-values(((s288_0) s_561)((temp289_0)(list quote-syntax272_0 datum-s_0)))"
+"(rebuild5.1 #f #f s288_0 temp289_0)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
-"(lambda(s_586 ctx_90)"
+"(lambda(s_596 ctx_90)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_105)(expand-context-observer ctx_90)))"
 "(if obs_105(let-values()(let-values()(call-expand-observe obs_105 'prim-if)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_13)(syntax-disarm$1 s_586)))"
-"(let-values(((ok?_46 _269_0 _270_0 _271_0)"
-"(let-values(((s_292) disarmed-s_13))"
-"(if(let-values(((s_293)(if(syntax?$1 s_292)(syntax-e$1 s_292) s_292)))"
-"(if(pair? s_293)"
-"(if(let-values(((s_294)(car s_293))) #t)"
-"(let-values(((s_587)(cdr s_293)))"
-"(let-values(((s_588)(if(syntax?$1 s_587)(syntax-e$1 s_587) s_587)))"
-"(if(pair? s_588)"
-"(if(let-values(((s_295)(car s_588))) #t)"
-"(let-values(((s_296)(cdr s_588)))"
-"(let-values(((s_297)(if(syntax?$1 s_296)(syntax-e$1 s_296) s_296)))"
-"(if(pair? s_297)"
-"(if(let-values(((s_589)(car s_297))) #t)"
-"(let-values(((s_590)(cdr s_297)))"
-"(let-values(((s_591)"
-"(if(syntax?$1 s_590)(syntax-e$1 s_590) s_590)))"
-"(null? s_591)))"
+"(let-values(((disarmed-s_13)(syntax-disarm$1 s_596)))"
+"(let-values(((ok?_48 _290_0 _291_0 _292_0)"
+"(let-values(((s_597) disarmed-s_13))"
+"(if(let-values(((s_598)(if(syntax?$1 s_597)(syntax-e$1 s_597) s_597)))"
+"(if(pair? s_598)"
+"(if(let-values(((s_599)(car s_598))) #t)"
+"(let-values(((s_600)(cdr s_598)))"
+"(let-values(((s_601)(if(syntax?$1 s_600)(syntax-e$1 s_600) s_600)))"
+"(if(pair? s_601)"
+"(if(let-values(((s_602)(car s_601))) #t)"
+"(let-values(((s_603)(cdr s_601)))"
+"(let-values(((s_604)(if(syntax?$1 s_603)(syntax-e$1 s_603) s_603)))"
+"(if(pair? s_604)"
+"(if(let-values(((s_605)(car s_604))) #t)"
+"(let-values(((s_606)(cdr s_604)))"
+"(let-values(((s_607)"
+"(if(syntax?$1 s_606)(syntax-e$1 s_606) s_606)))"
+"(null? s_607)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -67069,142 +67240,142 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((_269_1 _270_1 _271_1)"
-"(let-values(((s_592)(if(syntax?$1 s_292)(syntax-e$1 s_292) s_292)))"
-"(let-values(((_272_0)(let-values(((s_593)(car s_592))) s_593))"
-"((_273_0 _274_0)"
-"(let-values(((s_594)(cdr s_592)))"
-"(let-values(((s_595)"
-"(if(syntax?$1 s_594)"
-"(syntax-e$1 s_594)"
-" s_594)))"
-"(let-values(((_275_0)"
-"(let-values(((s_596)(car s_595))) s_596))"
-"((_276_0)"
-"(let-values(((s_597)(cdr s_595)))"
-"(let-values(((s_598)"
-"(if(syntax?$1 s_597)"
-"(syntax-e$1 s_597)"
-" s_597)))"
-"(let-values(((_277_0)"
-"(let-values(((s_599)"
+"(let-values(((_290_1 _291_1 _292_1)"
+"(let-values(((s_608)(if(syntax?$1 s_597)(syntax-e$1 s_597) s_597)))"
+"(let-values(((_293_0)(let-values(((s_609)(car s_608))) s_609))"
+"((_294_0 _295_0)"
+"(let-values(((s_610)(cdr s_608)))"
+"(let-values(((s_611)"
+"(if(syntax?$1 s_610)"
+"(syntax-e$1 s_610)"
+" s_610)))"
+"(let-values(((_296_0)"
+"(let-values(((s_612)(car s_611))) s_612))"
+"((_297_0)"
+"(let-values(((s_613)(cdr s_611)))"
+"(let-values(((s_614)"
+"(if(syntax?$1 s_613)"
+"(syntax-e$1 s_613)"
+" s_613)))"
+"(let-values(((_298_0)"
+"(let-values(((s_615)"
 "(car"
-" s_598)))"
-" s_599))"
+" s_614)))"
+" s_615))"
 "(()"
-"(let-values(((s_600)"
+"(let-values(((s_616)"
 "(cdr"
-" s_598)))"
-"(let-values(((s_601)"
+" s_614)))"
+"(let-values(((s_617)"
 "(if(syntax?$1"
-" s_600)"
+" s_616)"
 "(syntax-e$1"
-" s_600)"
-" s_600)))"
+" s_616)"
+" s_616)))"
 "(values)))))"
-"(values _277_0))))))"
-"(values _275_0 _276_0))))))"
-"(values _272_0 _273_0 _274_0)))))"
-"(values #t _269_1 _270_1 _271_1)))"
+"(values _298_0))))))"
+"(values _296_0 _297_0))))))"
+"(values _293_0 _294_0 _295_0)))))"
+"(values #t _290_1 _291_1 _292_1)))"
 "(values #f #f #f #f)))))"
 "(let-values((()"
 "(begin"
-"(if ok?_46"
-"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_586))"
+"(if ok?_48"
+"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_596))"
 "(void))"
 "(values))))"
-"(let-values(((ok?_47 if278_0 tst279_0 thn280_0 els281_0)"
-"(let-values(((s_602) disarmed-s_13))"
-"(let-values(((orig-s_53) s_602))"
-"(let-values(((if278_1 tst279_1 thn280_1 els281_1)"
-"(let-values(((s_603)(if(syntax?$1 s_602)(syntax-e$1 s_602) s_602)))"
-"(if(pair? s_603)"
-"(let-values(((if282_0)(let-values(((s_604)(car s_603))) s_604))"
-"((tst283_0 thn284_0 els285_0)"
-"(let-values(((s_605)(cdr s_603)))"
-"(let-values(((s_606)"
-"(if(syntax?$1 s_605)"
-"(syntax-e$1 s_605)"
-" s_605)))"
-"(if(pair? s_606)"
-"(let-values(((tst286_0)"
-"(let-values(((s_607)(car s_606)))"
-" s_607))"
-"((thn287_0 els288_0)"
-"(let-values(((s_608)(cdr s_606)))"
-"(let-values(((s_609)"
-"(if(syntax?$1 s_608)"
-"(syntax-e$1 s_608)"
-" s_608)))"
-"(if(pair? s_609)"
-"(let-values(((thn289_0)"
-"(let-values(((s_610)"
+"(let-values(((ok?_49 if299_0 tst300_0 thn301_0 els302_0)"
+"(let-values(((s_618) disarmed-s_13))"
+"(let-values(((orig-s_55) s_618))"
+"(let-values(((if299_1 tst300_1 thn301_1 els302_1)"
+"(let-values(((s_619)(if(syntax?$1 s_618)(syntax-e$1 s_618) s_618)))"
+"(if(pair? s_619)"
+"(let-values(((if303_0)(let-values(((s_620)(car s_619))) s_620))"
+"((tst304_0 thn305_0 els306_0)"
+"(let-values(((s_621)(cdr s_619)))"
+"(let-values(((s_622)"
+"(if(syntax?$1 s_621)"
+"(syntax-e$1 s_621)"
+" s_621)))"
+"(if(pair? s_622)"
+"(let-values(((tst307_0)"
+"(let-values(((s_623)(car s_622)))"
+" s_623))"
+"((thn308_0 els309_0)"
+"(let-values(((s_624)(cdr s_622)))"
+"(let-values(((s_625)"
+"(if(syntax?$1 s_624)"
+"(syntax-e$1 s_624)"
+" s_624)))"
+"(if(pair? s_625)"
+"(let-values(((thn310_0)"
+"(let-values(((s_626)"
 "(car"
-" s_609)))"
-" s_610))"
-"((els290_0)"
-"(let-values(((s_611)"
+" s_625)))"
+" s_626))"
+"((els311_0)"
+"(let-values(((s_627)"
 "(cdr"
-" s_609)))"
-"(let-values(((s_612)"
+" s_625)))"
+"(let-values(((s_628)"
 "(if(syntax?$1"
-" s_611)"
+" s_627)"
 "(syntax-e$1"
-" s_611)"
-" s_611)))"
+" s_627)"
+" s_627)))"
 "(if(pair?"
-" s_612)"
-"(let-values(((els291_0)"
-"(let-values(((s_613)"
+" s_628)"
+"(let-values(((els312_0)"
+"(let-values(((s_629)"
 "(car"
-" s_612)))"
-" s_613))"
+" s_628)))"
+" s_629))"
 "(()"
-"(let-values(((s_614)"
+"(let-values(((s_630)"
 "(cdr"
-" s_612)))"
-"(let-values(((s_615)"
+" s_628)))"
+"(let-values(((s_631)"
 "(if(syntax?$1"
-" s_614)"
+" s_630)"
 "(syntax-e$1"
-" s_614)"
-" s_614)))"
+" s_630)"
+" s_630)))"
 "(if(null?"
-" s_615)"
+" s_631)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                  \"bad syntax\""
-" orig-s_53))))))"
+" orig-s_55))))))"
 "(values"
-" els291_0))"
+" els312_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                              \"bad syntax\""
-" orig-s_53))))))"
-"(values thn289_0 els290_0))"
+" orig-s_55))))))"
+"(values thn310_0 els311_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                          \"bad syntax\""
-" orig-s_53))))))"
-"(values tst286_0 thn287_0 els288_0))"
+" orig-s_55))))))"
+"(values tst307_0 thn308_0 els309_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                      \"bad syntax\""
-" orig-s_53))))))"
-"(values if282_0 tst283_0 thn284_0 els285_0))"
-"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
-"(values #t if278_1 tst279_1 thn280_1 els281_1))))))"
+" orig-s_55))))))"
+"(values if303_0 tst304_0 thn305_0 els306_0))"
+"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_55)))))"
+"(values #t if299_1 tst300_1 thn301_1 els302_1))))))"
 "(let-values(((expr-ctx_2)(as-expression-context ctx_90)))"
 "(let-values(((tail-ctx_0)"
-"(let-values(((expr-ctx292_0) expr-ctx_2)((ctx293_0) ctx_90))"
-"(as-tail-context23.1 ctx293_0 expr-ctx292_0))))"
+"(let-values(((expr-ctx313_0) expr-ctx_2)((ctx314_0) ctx_90))"
+"(as-tail-context23.1 ctx314_0 expr-ctx313_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx294_0) ctx_90)((s295_0) s_586))"
-"(keep-as-needed85.1 #f #f #f #f #f #f ctx294_0 s295_0))))"
+"(let-values(((ctx315_0) ctx_90)((s316_0) s_596))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx315_0 s316_0))))"
 "(let-values(((exp-tst_0)"
-"(let-values(((temp296_0) tst279_0)((expr-ctx297_0) expr-ctx_2))"
-"(expand7.1 #f #f #f #f temp296_0 expr-ctx297_0))))"
+"(let-values(((temp317_0) tst300_0)((expr-ctx318_0) expr-ctx_2))"
+"(expand7.1 #f #f #f #f temp317_0 expr-ctx318_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_106)(expand-context-observer ctx_90)))"
@@ -67213,8 +67384,8 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-thn_0)"
-"(let-values(((temp298_0) thn280_0)((tail-ctx299_0) tail-ctx_0))"
-"(expand7.1 #f #f #f #f temp298_0 tail-ctx299_0))))"
+"(let-values(((temp319_0) thn301_0)((tail-ctx320_0) tail-ctx_0))"
+"(expand7.1 #f #f #f #f temp319_0 tail-ctx320_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_107)(expand-context-observer ctx_90)))"
@@ -67223,17 +67394,17 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-els_0)"
-"(let-values(((temp300_1) els281_0)((tail-ctx301_0) tail-ctx_0))"
-"(expand7.1 #f #f #f #f temp300_1 tail-ctx301_0))))"
+"(let-values(((temp321_0) els302_0)((tail-ctx322_0) tail-ctx_0))"
+"(expand7.1 #f #f #f #f temp321_0 tail-ctx322_0))))"
 "(if(expand-context-to-parsed? ctx_90)"
 "(parsed-if8.1 rebuild-s_9 exp-tst_0 exp-thn_0 exp-els_0)"
-"(let-values(((rebuild-s302_0) rebuild-s_9)"
-"((temp303_0)(list if278_0 exp-tst_0 exp-thn_0 exp-els_0)))"
-"(rebuild5.1 #f #f rebuild-s302_0 temp303_0)))))))))))))))))))"
+"(let-values(((rebuild-s323_0) rebuild-s_9)"
+"((temp324_0)(list if299_0 exp-tst_0 exp-thn_0 exp-els_0)))"
+"(rebuild5.1 #f #f rebuild-s323_0 temp324_0)))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_616 ctx_91)"
+"(lambda(s_632 ctx_91)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_108)(expand-context-observer ctx_91)))"
@@ -67241,93 +67412,93 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_108 'prim-with-continuation-mark)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_14)(syntax-disarm$1 s_616)))"
-"(let-values(((ok?_48 with-continuation-mark304_0 key305_0 val306_0 body307_0)"
-"(let-values(((s_617) disarmed-s_14))"
-"(let-values(((orig-s_54) s_617))"
-"(let-values(((with-continuation-mark304_1 key305_1 val306_1 body307_1)"
-"(let-values(((s_618)(if(syntax?$1 s_617)(syntax-e$1 s_617) s_617)))"
-"(if(pair? s_618)"
-"(let-values(((with-continuation-mark308_0)"
-"(let-values(((s_619)(car s_618))) s_619))"
-"((key309_0 val310_0 body311_0)"
-"(let-values(((s_620)(cdr s_618)))"
-"(let-values(((s_621)"
-"(if(syntax?$1 s_620)"
-"(syntax-e$1 s_620)"
-" s_620)))"
-"(if(pair? s_621)"
-"(let-values(((key312_0)"
-"(let-values(((s_622)(car s_621)))"
-" s_622))"
-"((val313_0 body314_0)"
-"(let-values(((s_623)(cdr s_621)))"
-"(let-values(((s_624)"
-"(if(syntax?$1 s_623)"
-"(syntax-e$1 s_623)"
-" s_623)))"
-"(if(pair? s_624)"
-"(let-values(((val315_0)"
-"(let-values(((s_625)"
+"(let-values(((disarmed-s_14)(syntax-disarm$1 s_632)))"
+"(let-values(((ok?_50 with-continuation-mark325_0 key326_0 val327_0 body328_0)"
+"(let-values(((s_633) disarmed-s_14))"
+"(let-values(((orig-s_56) s_633))"
+"(let-values(((with-continuation-mark325_1 key326_1 val327_1 body328_1)"
+"(let-values(((s_634)(if(syntax?$1 s_633)(syntax-e$1 s_633) s_633)))"
+"(if(pair? s_634)"
+"(let-values(((with-continuation-mark329_0)"
+"(let-values(((s_635)(car s_634))) s_635))"
+"((key330_0 val331_0 body332_0)"
+"(let-values(((s_636)(cdr s_634)))"
+"(let-values(((s_637)"
+"(if(syntax?$1 s_636)"
+"(syntax-e$1 s_636)"
+" s_636)))"
+"(if(pair? s_637)"
+"(let-values(((key333_0)"
+"(let-values(((s_638)(car s_637)))"
+" s_638))"
+"((val334_0 body335_0)"
+"(let-values(((s_639)(cdr s_637)))"
+"(let-values(((s_640)"
+"(if(syntax?$1 s_639)"
+"(syntax-e$1 s_639)"
+" s_639)))"
+"(if(pair? s_640)"
+"(let-values(((val336_0)"
+"(let-values(((s_641)"
 "(car"
-" s_624)))"
-" s_625))"
-"((body316_0)"
-"(let-values(((s_626)"
+" s_640)))"
+" s_641))"
+"((body337_0)"
+"(let-values(((s_642)"
 "(cdr"
-" s_624)))"
-"(let-values(((s_627)"
+" s_640)))"
+"(let-values(((s_643)"
 "(if(syntax?$1"
-" s_626)"
+" s_642)"
 "(syntax-e$1"
-" s_626)"
-" s_626)))"
-"(if(pair? s_627)"
-"(let-values(((body317_0)"
-"(let-values(((s_628)"
+" s_642)"
+" s_642)))"
+"(if(pair? s_643)"
+"(let-values(((body338_0)"
+"(let-values(((s_644)"
 "(car"
-" s_627)))"
-" s_628))"
+" s_643)))"
+" s_644))"
 "(()"
-"(let-values(((s_629)"
+"(let-values(((s_645)"
 "(cdr"
-" s_627)))"
-"(let-values(((s_630)"
+" s_643)))"
+"(let-values(((s_646)"
 "(if(syntax?$1"
-" s_629)"
+" s_645)"
 "(syntax-e$1"
-" s_629)"
-" s_629)))"
+" s_645)"
+" s_645)))"
 "(if(null?"
-" s_630)"
+" s_646)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                              \"bad syntax\""
-" orig-s_54))))))"
+" orig-s_56))))))"
 "(values"
-" body317_0))"
+" body338_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"bad syntax\""
-" orig-s_54))))))"
-"(values val315_0 body316_0))"
+" orig-s_56))))))"
+"(values val336_0 body337_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
-" orig-s_54))))))"
-"(values key312_0 val313_0 body314_0))"
-"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_54))))))"
-"(values with-continuation-mark308_0 key309_0 val310_0 body311_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_54)))))"
-"(values #t with-continuation-mark304_1 key305_1 val306_1 body307_1))))))"
+" orig-s_56))))))"
+"(values key333_0 val334_0 body335_0))"
+"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_56))))))"
+"(values with-continuation-mark329_0 key330_0 val331_0 body332_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_56)))))"
+"(values #t with-continuation-mark325_1 key326_1 val327_1 body328_1))))))"
 "(let-values(((expr-ctx_3)(as-expression-context ctx_91)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx318_0) ctx_91)((s319_0) s_616))"
-"(keep-as-needed85.1 #f #f #f #f #f #f ctx318_0 s319_0))))"
+"(let-values(((ctx339_0) ctx_91)((s340_0) s_632))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx339_0 s340_0))))"
 "(let-values(((exp-key_0)"
-"(let-values(((temp320_0) key305_0)((expr-ctx321_0) expr-ctx_3))"
-"(expand7.1 #f #f #f #f temp320_0 expr-ctx321_0))))"
+"(let-values(((temp341_0) key326_0)((expr-ctx342_0) expr-ctx_3))"
+"(expand7.1 #f #f #f #f temp341_0 expr-ctx342_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_109)(expand-context-observer ctx_91)))"
@@ -67336,8 +67507,8 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-val_0)"
-"(let-values(((temp322_0) val306_0)((expr-ctx323_0) expr-ctx_3))"
-"(expand7.1 #f #f #f #f temp322_0 expr-ctx323_0))))"
+"(let-values(((temp343_0) val327_0)((expr-ctx344_0) expr-ctx_3))"
+"(expand7.1 #f #f #f #f temp343_0 expr-ctx344_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_110)(expand-context-observer ctx_91)))"
@@ -67346,16 +67517,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-body_6)"
-"(let-values(((temp324_0) body307_0)"
-"((temp325_0)"
-"(let-values(((expr-ctx326_0) expr-ctx_3)((ctx327_0) ctx_91))"
-"(as-tail-context23.1 ctx327_0 expr-ctx326_0))))"
-"(expand7.1 #f #f #f #f temp324_0 temp325_0))))"
+"(let-values(((temp345_0) body328_0)"
+"((temp346_0)"
+"(let-values(((expr-ctx347_0) expr-ctx_3)((ctx348_0) ctx_91))"
+"(as-tail-context23.1 ctx348_0 expr-ctx347_0))))"
+"(expand7.1 #f #f #f #f temp345_0 temp346_0))))"
 "(if(expand-context-to-parsed? ctx_91)"
 "(parsed-with-continuation-mark10.1 rebuild-s_10 exp-key_0 exp-val_0 exp-body_6)"
-"(let-values(((rebuild-s328_0) rebuild-s_10)"
-"((temp329_0)(list with-continuation-mark304_0 exp-key_0 exp-val_0 exp-body_6)))"
-"(rebuild5.1 #f #f rebuild-s328_0 temp329_0))))))))))))))))"
+"(let-values(((rebuild-s349_0) rebuild-s_10)"
+"((temp350_0)(list with-continuation-mark325_0 exp-key_0 exp-val_0 exp-body_6)))"
+"(rebuild5.1 #f #f rebuild-s349_0 temp350_0))))))))))))))))"
 "(define-values"
 "(make-begin20.1)"
 "(lambda(last-is-tail?15_0 list-start-index14_0 log-tag18_0 parsed-begin19_0)"
@@ -67366,7 +67537,7 @@ static const char *startup_source =
 "(let-values(((list-start-index_0) list-start-index14_0))"
 "(let-values(((last-is-tail?_0) last-is-tail?15_0))"
 "(let-values()"
-"(lambda(s_631 ctx_92)"
+"(lambda(s_647 ctx_92)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_111)(expand-context-observer ctx_92)))"
@@ -67374,47 +67545,47 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_111 log-tag_1)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_15)(syntax-disarm$1 s_631)))"
-"(let-values(((ok?_49 begin330_0 e331_0)"
-"(let-values(((s_632) disarmed-s_15))"
-"(let-values(((orig-s_55) s_632))"
-"(let-values(((begin330_1 e331_1)"
-"(let-values(((s_633)"
-"(if(syntax?$1 s_632)(syntax-e$1 s_632) s_632)))"
-"(if(pair? s_633)"
-"(let-values(((begin332_0)"
-"(let-values(((s_634)(car s_633))) s_634))"
-"((e333_0)"
-"(let-values(((s_635)(cdr s_633)))"
-"(let-values(((s_636)"
-"(if(syntax?$1 s_635)"
-"(syntax-e$1 s_635)"
-" s_635)))"
-"(let-values(((flat-s_41)"
-"(to-syntax-list.1 s_636)))"
-"(if(not flat-s_41)"
+"(let-values(((disarmed-s_15)(syntax-disarm$1 s_647)))"
+"(let-values(((ok?_51 begin351_0 e352_0)"
+"(let-values(((s_648) disarmed-s_15))"
+"(let-values(((orig-s_57) s_648))"
+"(let-values(((begin351_1 e352_1)"
+"(let-values(((s_649)"
+"(if(syntax?$1 s_648)(syntax-e$1 s_648) s_648)))"
+"(if(pair? s_649)"
+"(let-values(((begin353_0)"
+"(let-values(((s_650)(car s_649))) s_650))"
+"((e354_0)"
+"(let-values(((s_651)(cdr s_649)))"
+"(let-values(((s_652)"
+"(if(syntax?$1 s_651)"
+"(syntax-e$1 s_651)"
+" s_651)))"
+"(let-values(((flat-s_43)"
+"(to-syntax-list.1 s_652)))"
+"(if(not flat-s_43)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                   \"bad syntax\""
-" orig-s_55))"
-"(if(null? flat-s_41)"
+" orig-s_57))"
+"(if(null? flat-s_43)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                     \"bad syntax\""
-" orig-s_55))"
-"(let-values() flat-s_41))))))))"
-"(values begin332_0 e333_0))"
-"                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_55)))))"
-"(values #t begin330_1 e331_1))))))"
+" orig-s_57))"
+"(let-values() flat-s_43))))))))"
+"(values begin353_0 e354_0))"
+"                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_57)))))"
+"(values #t begin351_1 e352_1))))))"
 "(let-values(((expr-ctx_4)"
 "(if last-is-tail?_0"
 "(as-begin-expression-context ctx_92)"
 "(as-expression-context ctx_92))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx334_0) ctx_92)((s335_0) s_631))"
-"(keep-as-needed85.1 #f #f #f #f #f #f ctx334_0 s335_0))))"
+"(let-values(((ctx355_0) ctx_92)((s356_0) s_647))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx355_0 s356_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_123)"
 "(lambda(es_5 index_6)"
@@ -67452,29 +67623,29 @@ static const char *startup_source =
 "(call-expand-observe obs_113 'next)))"
 "(void)))"
 "(cons"
-"(let-values(((temp336_0)(car es_5))"
-"((temp337_1)"
+"(let-values(((temp357_0)(car es_5))"
+"((temp358_0)"
 "(if(if last-is-tail?_0"
 "(null? rest-es_1)"
 " #f)"
-"(let-values(((expr-ctx338_0)"
+"(let-values(((expr-ctx359_0)"
 " expr-ctx_4)"
-"((ctx339_0)"
+"((ctx360_0)"
 " ctx_92))"
 "(as-tail-context23.1"
-" ctx339_0"
-" expr-ctx338_0))"
+" ctx360_0"
+" expr-ctx359_0))"
 " expr-ctx_4)))"
 "(expand7.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp336_0"
-" temp337_1))"
+" temp357_0"
+" temp358_0))"
 "(loop_123 rest-es_1(sub1 index_6))))))))))))"
 " loop_123)"
-" e331_0"
+" e352_0"
 " list-start-index_0)))"
 "(begin"
 "(let-values(((obs_114)(expand-context-observer ctx_92)))"
@@ -67488,58 +67659,58 @@ static const char *startup_source =
 "(void)))"
 "(if(expand-context-to-parsed? ctx_92)"
 "(parsed-begin_0 rebuild-s_11 exp-es_2)"
-"(let-values(((rebuild-s340_0) rebuild-s_11)((temp341_0)(cons begin330_0 exp-es_2)))"
-"(rebuild5.1 #f #f rebuild-s340_0 temp341_0)))))))))))))))))))"
+"(let-values(((rebuild-s361_0) rebuild-s_11)((temp362_0)(cons begin351_0 exp-es_2)))"
+"(rebuild5.1 #f #f rebuild-s361_0 temp362_0)))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin"
 "(let-values(((nonempty-begin_0)"
-"(let-values(((temp342_0) 'prim-begin)"
-"((parsed-begin343_0) parsed-begin12.1)"
-"((temp344_0) 0)"
-"((temp345_0) #t))"
-"(make-begin20.1 temp345_0 temp344_0 temp342_0 parsed-begin343_0))))"
-"(lambda(s_637 ctx_93)"
+"(let-values(((temp363_0) 'prim-begin)"
+"((parsed-begin364_0) parsed-begin12.1)"
+"((temp365_0) 0)"
+"((temp366_0) #t))"
+"(make-begin20.1 temp366_0 temp365_0 temp363_0 parsed-begin364_0))))"
+"(lambda(s_653 ctx_93)"
 "(let-values(((context_24)(expand-context-context ctx_93)))"
-"(if(let-values(((or-part_386)(eq? context_24 'top-level)))"
-"(if or-part_386 or-part_386(eq? context_24 'module)))"
+"(if(let-values(((or-part_388)(eq? context_24 'top-level)))"
+"(if or-part_388 or-part_388(eq? context_24 'module)))"
 "(let-values()"
-"(let-values(((disarmed-s_16)(syntax-disarm$1 s_637)))"
-"(let-values(((ok?_50 begin346_0)"
-"(let-values(((s_638) disarmed-s_16))"
-"(if(let-values(((s_639)(if(syntax?$1 s_638)(syntax-e$1 s_638) s_638)))"
-"(if(pair? s_639)"
-"(if(let-values(((s_640)(car s_639))) #t)"
-"(let-values(((s_641)(cdr s_639)))"
-"(let-values(((s_642)(if(syntax?$1 s_641)(syntax-e$1 s_641) s_641)))"
-"(null? s_642)))"
+"(let-values(((disarmed-s_16)(syntax-disarm$1 s_653)))"
+"(let-values(((ok?_52 begin367_0)"
+"(let-values(((s_654) disarmed-s_16))"
+"(if(let-values(((s_655)(if(syntax?$1 s_654)(syntax-e$1 s_654) s_654)))"
+"(if(pair? s_655)"
+"(if(let-values(((s_656)(car s_655))) #t)"
+"(let-values(((s_657)(cdr s_655)))"
+"(let-values(((s_658)(if(syntax?$1 s_657)(syntax-e$1 s_657) s_657)))"
+"(null? s_658)))"
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((begin346_1)"
-"(let-values(((s_643)(if(syntax?$1 s_638)(syntax-e$1 s_638) s_638)))"
-"(let-values(((begin347_0)"
-"(let-values(((s_644)(car s_643))) s_644))"
+"(let-values(((begin367_1)"
+"(let-values(((s_659)(if(syntax?$1 s_654)(syntax-e$1 s_654) s_654)))"
+"(let-values(((begin368_0)"
+"(let-values(((s_660)(car s_659))) s_660))"
 "(()"
-"(let-values(((s_645)(cdr s_643)))"
-"(let-values(((s_646)"
-"(if(syntax?$1 s_645)"
-"(syntax-e$1 s_645)"
-" s_645)))"
+"(let-values(((s_661)(cdr s_659)))"
+"(let-values(((s_662)"
+"(if(syntax?$1 s_661)"
+"(syntax-e$1 s_661)"
+" s_661)))"
 "(values)))))"
-"(values begin347_0)))))"
-"(values #t begin346_1)))"
+"(values begin368_0)))))"
+"(values #t begin367_1)))"
 "(values #f #f)))))"
-"(if ok?_50 s_637(nonempty-begin_0 s_637 ctx_93)))))"
-"(let-values()(nonempty-begin_0 s_637 ctx_93))))))))"
+"(if ok?_52 s_653(nonempty-begin_0 s_653 ctx_93)))))"
+"(let-values()(nonempty-begin_0 s_653 ctx_93))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
-"(let-values(((temp348_0) 'prim-begin0)((parsed-begin0349_0) parsed-begin013.1)((temp350_0) 1)((temp351_0) #f))"
-"(make-begin20.1 temp351_0 temp350_0 temp348_0 parsed-begin0349_0))))"
+"(let-values(((temp369_0) 'prim-begin0)((parsed-begin0370_0) parsed-begin013.1)((temp371_0) 1)((temp372_0) #f))"
+"(make-begin20.1 temp372_0 temp371_0 temp369_0 parsed-begin0370_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
-"(lambda(id_127 ctx_94)"
+"(lambda(id_128 ctx_94)"
 "(begin"
 "(if(if(expand-context-need-eventually-defined ctx_94)(>=(expand-context-phase ctx_94) 1) #f)"
 "(let-values()"
@@ -67547,20 +67718,20 @@ static const char *startup_source =
 "(hash-update!"
 "(expand-context-need-eventually-defined ctx_94)"
 "(expand-context-phase ctx_94)"
-"(lambda(l_82)(cons id_127 l_82))"
+"(lambda(l_82)(cons id_128 l_82))"
 " null)"
 " #t))"
 "(let-values() #f)))))"
 "(void"
 "(add-core-form!*"
 " '#%top"
-"(let-values(((core356_0)"
-"(lambda(s354_0 ctx355_0 implicit-omitted?352_0 implicit-omitted?353_0)"
+"(let-values(((core377_0)"
+"(lambda(s375_0 ctx376_0 implicit-omitted?373_0 implicit-omitted?374_0)"
 "(begin"
-" 'core356"
-"(let-values(((s_647) s354_0))"
-"(let-values(((ctx_95) ctx355_0))"
-"(let-values(((implicit-omitted?_0)(if implicit-omitted?353_0 implicit-omitted?352_0 #f)))"
+" 'core377"
+"(let-values(((s_663) s375_0))"
+"(let-values(((ctx_95) ctx376_0))"
+"(let-values(((implicit-omitted?_0)(if implicit-omitted?374_0 implicit-omitted?373_0 #f)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -67570,59 +67741,59 @@ static const char *startup_source =
 "(let-values()(call-expand-observe obs_115 'prim-#%top)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_17)(syntax-disarm$1 s_647)))"
-"(let-values(((id_128)"
+"(let-values(((disarmed-s_17)(syntax-disarm$1 s_663)))"
+"(let-values(((id_129)"
 "(if implicit-omitted?_0"
-"(let-values() s_647)"
+"(let-values() s_663)"
 "(let-values()"
-"(let-values(((ok?_51 #%top358_0 id359_0)"
-"(let-values(((s_648) disarmed-s_17))"
-"(let-values(((orig-s_56) s_648))"
-"(let-values(((#%top358_1 id359_1)"
-"(let-values(((s_649)"
-"(if(syntax?$1 s_648)"
-"(syntax-e$1 s_648)"
-" s_648)))"
-"(if(pair? s_649)"
-"(let-values(((#%top360_0)"
-"(let-values(((s_650)"
+"(let-values(((ok?_53 #%top379_0 id380_0)"
+"(let-values(((s_664) disarmed-s_17))"
+"(let-values(((orig-s_58) s_664))"
+"(let-values(((#%top379_1 id380_1)"
+"(let-values(((s_665)"
+"(if(syntax?$1 s_664)"
+"(syntax-e$1 s_664)"
+" s_664)))"
+"(if(pair? s_665)"
+"(let-values(((#%top381_0)"
+"(let-values(((s_666)"
 "(car"
-" s_649)))"
-" s_650))"
-"((id361_0)"
-"(let-values(((s_651)"
+" s_665)))"
+" s_666))"
+"((id382_0)"
+"(let-values(((s_667)"
 "(cdr"
-" s_649)))"
-"(if(let-values(((or-part_387)"
+" s_665)))"
+"(if(let-values(((or-part_389)"
 "(if(syntax?$1"
-" s_651)"
+" s_667)"
 "(symbol?"
 "(syntax-e$1"
-" s_651))"
+" s_667))"
 " #f)))"
-"(if or-part_387"
-" or-part_387"
+"(if or-part_389"
+" or-part_389"
 "(symbol?"
-" s_651)))"
-" s_651"
+" s_667)))"
+" s_667"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"not an identifier\""
-" orig-s_56"
-" s_651)))))"
-"(values #%top360_0 id361_0))"
+" orig-s_58"
+" s_667)))))"
+"(values #%top381_0 id382_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                        \"bad syntax\""
-" orig-s_56)))))"
-"(values #t #%top358_1 id359_1))))))"
-" id359_0)))))"
+" orig-s_58)))))"
+"(values #t #%top379_1 id380_1))))))"
+" id380_0)))))"
 "(let-values(((b_89)"
-"(let-values(((id362_0) id_128)"
-"((temp363_0)(expand-context-phase ctx_95))"
-"((temp364_0) 'ambiguous))"
+"(let-values(((id383_0) id_129)"
+"((temp384_0)(expand-context-phase ctx_95))"
+"((temp385_0) 'ambiguous))"
 "(resolve+shift30.1"
-" temp364_0"
+" temp385_0"
 " #t"
 " #f"
 " #f"
@@ -67632,10 +67803,10 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" id362_0"
-" temp363_0))))"
+" id383_0"
+" temp384_0))))"
 "(if(eq? b_89 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_128 ctx_95))"
+"(let-values()(raise-ambiguous-error id_129 ctx_95))"
 "(if(if b_89"
 "(if(module-binding? b_89)"
 "(eq?(module-binding-module b_89)(root-expand-context-self-mpi ctx_95))"
@@ -67643,33 +67814,33 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_95)"
-"(parsed-id2.1 id_128 b_89 #f)"
+"(parsed-id2.1 id_129 b_89 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_89))"
-"(let-values() s_647)"
-"(let-values() id_128))))"
-"(if(register-eventual-variable!? id_128 ctx_95)"
+"(let-values() s_663)"
+"(let-values() id_129))))"
+"(if(register-eventual-variable!? id_129 ctx_95)"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_95)"
-"(parsed-id2.1 id_128 b_89 #f)"
-" id_128))"
+"(parsed-id2.1 id_129 b_89 #f)"
+" id_129))"
 "(let-values()"
 "(if(not(expand-context-allow-unbound? ctx_95))"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" id_128"
+" id_129"
 " #f"
 " null"
-"(syntax-debug-info-string id_128 ctx_95)))"
+"(syntax-debug-info-string id_129 ctx_95)))"
 "(let-values()"
 "(let-values(((tl-id_1)"
 "(add-scope"
-" id_128"
+" id_129"
 "(root-expand-context-top-level-bind-scope ctx_95))))"
 "(let-values(((tl-b_1)"
-"(let-values(((tl-id365_0) tl-id_1)"
-"((temp366_0)"
+"(let-values(((tl-id386_0) tl-id_1)"
+"((temp387_0)"
 "(expand-context-phase ctx_95)))"
 "(resolve40.1"
 " #f"
@@ -67680,199 +67851,199 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" tl-id365_0"
-" temp366_0))))"
+" tl-id386_0"
+" temp387_0))))"
 "(if tl-b_1"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_95)"
 "(parsed-top-id4.1 tl-id_1 tl-b_1 #f)"
 "(if implicit-omitted?_0"
-"(let-values() id_128)"
+"(let-values() id_129)"
 "(let-values()"
-"(let-values(((ok?_52 #%top367_0 id368_0)"
-"(let-values(((s_652) disarmed-s_17))"
-"(let-values(((orig-s_57) s_652))"
-"(let-values(((#%top367_1 id368_1)"
-"(let-values(((s_653)"
-"(if(syntax?$1"
-" s_652)"
-"(syntax-e$1"
-" s_652)"
-" s_652)))"
-"(if(pair? s_653)"
-"(let-values(((#%top369_0)"
-"(let-values(((s_654)"
-"(car"
-" s_653)))"
-" s_654))"
-"((id370_0)"
-"(let-values(((s_655)"
-"(cdr"
-" s_653)))"
-"(if(let-values(((or-part_388)"
-"(if(syntax?$1"
-" s_655)"
-"(symbol?"
-"(syntax-e$1"
-" s_655))"
-" #f)))"
-"(if or-part_388"
-" or-part_388"
-"(symbol?"
-" s_655)))"
-" s_655"
-"(raise-syntax-error$1"
-" #f"
-"                                                                                                                      \"not an identifier\""
-" orig-s_57"
-" s_655)))))"
-"(values"
-" #%top369_0"
-" id370_0))"
-"(raise-syntax-error$1"
-" #f"
-"                                                                                                    \"bad syntax\""
-" orig-s_57)))))"
-"(values #t #%top367_1 id368_1))))))"
-"(let-values(((s371_0) s_647)"
-"((temp372_0)(cons #%top367_0 id_128)))"
-"(rebuild5.1 #f #f s371_0 temp372_0)))))))"
-"(let-values()"
-"(if(expand-context-to-parsed? ctx_95)"
-"(parsed-top-id4.1 id_128 b_89 #f)"
-" s_647)))))))))))))))))))))))"
-"(case-lambda"
-"((s_656 ctx_96)(core356_0 s_656 ctx_96 #f #f))"
-"((s_657 ctx_97 implicit-omitted?352_1)(core356_0 s_657 ctx_97 implicit-omitted?352_1 #t))))))"
-"(void"
-"(add-core-form!*"
-" 'set!"
-"(lambda(s_658 ctx_98)"
-"(let-values((()"
-"(begin"
-"(let-values(((obs_116)(expand-context-observer ctx_98)))"
-"(if obs_116(let-values()(let-values()(call-expand-observe obs_116 'prim-set!)))(void)))"
-"(values))))"
-"(let-values(((disarmed-s_18)(syntax-disarm$1 s_658)))"
-"(let-values(((ok?_53 set!373_0 id374_0 rhs375_0)"
-"(let-values(((s_659) disarmed-s_18))"
-"(let-values(((orig-s_58) s_659))"
-"(let-values(((set!373_1 id374_1 rhs375_1)"
-"(let-values(((s_660)(if(syntax?$1 s_659)(syntax-e$1 s_659) s_659)))"
-"(if(pair? s_660)"
-"(let-values(((set!376_0)(let-values(((s_661)(car s_660))) s_661))"
-"((id377_0 rhs378_0)"
-"(let-values(((s_662)(cdr s_660)))"
-"(let-values(((s_663)"
-"(if(syntax?$1 s_662)"
-"(syntax-e$1 s_662)"
-" s_662)))"
-"(if(pair? s_663)"
-"(let-values(((id379_0)"
-"(let-values(((s_664)(car s_663)))"
-"(if(let-values(((or-part_389)"
-"(if(syntax?$1 s_664)"
-"(symbol?"
-"(syntax-e$1"
-" s_664))"
-" #f)))"
-"(if or-part_389"
-" or-part_389"
-"(symbol? s_664)))"
-" s_664"
-"(raise-syntax-error$1"
-" #f"
-"                                                                                    \"not an identifier\""
-" orig-s_58"
-" s_664))))"
-"((rhs380_0)"
-"(let-values(((s_665)(cdr s_663)))"
-"(let-values(((s_666)"
-"(if(syntax?$1 s_665)"
-"(syntax-e$1 s_665)"
-" s_665)))"
-"(if(pair? s_666)"
-"(let-values(((rhs381_0)"
-"(let-values(((s_667)"
-"(car"
-" s_666)))"
-" s_667))"
-"(()"
-"(let-values(((s_668)"
-"(cdr"
-" s_666)))"
+"(let-values(((ok?_54 #%top388_0 id389_0)"
+"(let-values(((s_668) disarmed-s_17))"
+"(let-values(((orig-s_59) s_668))"
+"(let-values(((#%top388_1 id389_1)"
 "(let-values(((s_669)"
 "(if(syntax?$1"
 " s_668)"
 "(syntax-e$1"
 " s_668)"
 " s_668)))"
-"(if(null? s_669)"
+"(if(pair? s_669)"
+"(let-values(((#%top390_0)"
+"(let-values(((s_670)"
+"(car"
+" s_669)))"
+" s_670))"
+"((id391_0)"
+"(let-values(((s_671)"
+"(cdr"
+" s_669)))"
+"(if(let-values(((or-part_390)"
+"(if(syntax?$1"
+" s_671)"
+"(symbol?"
+"(syntax-e$1"
+" s_671))"
+" #f)))"
+"(if or-part_390"
+" or-part_390"
+"(symbol?"
+" s_671)))"
+" s_671"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                      \"not an identifier\""
+" orig-s_59"
+" s_671)))))"
+"(values"
+" #%top390_0"
+" id391_0))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                    \"bad syntax\""
+" orig-s_59)))))"
+"(values #t #%top388_1 id389_1))))))"
+"(let-values(((s392_0) s_663)"
+"((temp393_0)(cons #%top388_0 id_129)))"
+"(rebuild5.1 #f #f s392_0 temp393_0)))))))"
+"(let-values()"
+"(if(expand-context-to-parsed? ctx_95)"
+"(parsed-top-id4.1 id_129 b_89 #f)"
+" s_663)))))))))))))))))))))))"
+"(case-lambda"
+"((s_672 ctx_96)(core377_0 s_672 ctx_96 #f #f))"
+"((s_673 ctx_97 implicit-omitted?373_1)(core377_0 s_673 ctx_97 implicit-omitted?373_1 #t))))))"
+"(void"
+"(add-core-form!*"
+" 'set!"
+"(lambda(s_674 ctx_98)"
+"(let-values((()"
+"(begin"
+"(let-values(((obs_116)(expand-context-observer ctx_98)))"
+"(if obs_116(let-values()(let-values()(call-expand-observe obs_116 'prim-set!)))(void)))"
+"(values))))"
+"(let-values(((disarmed-s_18)(syntax-disarm$1 s_674)))"
+"(let-values(((ok?_55 set!394_0 id395_0 rhs396_0)"
+"(let-values(((s_675) disarmed-s_18))"
+"(let-values(((orig-s_60) s_675))"
+"(let-values(((set!394_1 id395_1 rhs396_1)"
+"(let-values(((s_676)(if(syntax?$1 s_675)(syntax-e$1 s_675) s_675)))"
+"(if(pair? s_676)"
+"(let-values(((set!397_0)(let-values(((s_677)(car s_676))) s_677))"
+"((id398_0 rhs399_0)"
+"(let-values(((s_678)(cdr s_676)))"
+"(let-values(((s_679)"
+"(if(syntax?$1 s_678)"
+"(syntax-e$1 s_678)"
+" s_678)))"
+"(if(pair? s_679)"
+"(let-values(((id400_0)"
+"(let-values(((s_680)(car s_679)))"
+"(if(let-values(((or-part_391)"
+"(if(syntax?$1 s_680)"
+"(symbol?"
+"(syntax-e$1"
+" s_680))"
+" #f)))"
+"(if or-part_391"
+" or-part_391"
+"(symbol? s_680)))"
+" s_680"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                    \"not an identifier\""
+" orig-s_60"
+" s_680))))"
+"((rhs401_0)"
+"(let-values(((s_681)(cdr s_679)))"
+"(let-values(((s_682)"
+"(if(syntax?$1 s_681)"
+"(syntax-e$1 s_681)"
+" s_681)))"
+"(if(pair? s_682)"
+"(let-values(((rhs402_0)"
+"(let-values(((s_683)"
+"(car"
+" s_682)))"
+" s_683))"
+"(()"
+"(let-values(((s_684)"
+"(cdr"
+" s_682)))"
+"(let-values(((s_685)"
+"(if(syntax?$1"
+" s_684)"
+"(syntax-e$1"
+" s_684)"
+" s_684)))"
+"(if(null? s_685)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"bad syntax\""
-" orig-s_58))))))"
-"(values rhs381_0))"
+" orig-s_60))))))"
+"(values rhs402_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
-" orig-s_58))))))"
-"(values id379_0 rhs380_0))"
-"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_58))))))"
-"(values set!376_0 id377_0 rhs378_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_58)))))"
-"(values #t set!373_1 id374_1 rhs375_1))))))"
-"(let-values(((orig-id_1) id374_0))"
+" orig-s_60))))))"
+"(values id400_0 rhs401_0))"
+"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_60))))))"
+"(values set!397_0 id398_0 rhs399_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_60)))))"
+"(values #t set!394_1 id395_1 rhs396_1))))))"
+"(let-values(((orig-id_1) id395_0))"
 "((letrec-values(((rename-loop_0)"
-"(lambda(id_129 from-rename?_0)"
+"(lambda(id_130 from-rename?_0)"
 "(begin"
 " 'rename-loop"
 "(let-values(((binding_30)"
-"(let-values(((id382_0) id_129)"
-"((temp383_0)(expand-context-phase ctx_98))"
-"((temp384_0) 'ambiguous)"
-"((temp385_0) #t))"
+"(let-values(((id403_0) id_130)"
+"((temp404_0)(expand-context-phase ctx_98))"
+"((temp405_0) 'ambiguous)"
+"((temp406_0) #t))"
 "(resolve+shift30.1"
-" temp384_0"
+" temp405_0"
 " #t"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp385_0"
+" temp406_0"
 " #t"
 " #f"
 " #f"
-" id382_0"
-" temp383_0))))"
+" id403_0"
+" temp404_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_30 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_129 ctx_98))"
+"(let-values()(raise-ambiguous-error id_130 ctx_98))"
 "(void))"
 "(values))))"
 "(let-values(((t_58 primitive?_11 insp_24 protected?_12)"
 "(if binding_30"
-"(let-values(((binding386_0) binding_30)"
-"((ctx387_0) ctx_98)"
-"((s388_0) s_658))"
-"(lookup28.1 #f #f #f #f binding386_0 ctx387_0 s388_0))"
+"(let-values(((binding407_0) binding_30)"
+"((ctx408_0) ctx_98)"
+"((s409_0) s_674))"
+"(lookup28.1 #f #f #f #f binding407_0 ctx408_0 s409_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(let-values(((obs_117)(expand-context-observer ctx_98)))"
 "(if obs_117"
 "(let-values()"
-"(let-values()(call-expand-observe obs_117 'resolve id_129)))"
+"(let-values()(call-expand-observe obs_117 'resolve id_130)))"
 "(void)))"
-"(if(let-values(((or-part_390)(variable? t_58)))"
-"(if or-part_390"
-" or-part_390"
+"(if(let-values(((or-part_392)(variable? t_58)))"
+"(if or-part_392"
+" or-part_392"
 "(if(not binding_30)"
-"(let-values(((or-part_391)"
-"(register-eventual-variable!? id_129 ctx_98)))"
-"(if or-part_391"
-" or-part_391"
+"(let-values(((or-part_393)"
+"(register-eventual-variable!? id_130 ctx_98)))"
+"(if or-part_393"
+" or-part_393"
 "(expand-context-allow-unbound? ctx_98)))"
 " #f)))"
 "(let-values()"
@@ -67888,8 +68059,8 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                    \"cannot mutate module-required identifier\""
-" s_658"
-" id_129))"
+" s_674"
+" id_130))"
 "(void))"
 "(values))))"
 "(let-values((()"
@@ -67907,7 +68078,7 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_30)"
 "(values))))"
 "(let-values(((rebuild-s_12)"
-"(let-values(((ctx389_0) ctx_98)((s390_0) s_658))"
+"(let-values(((ctx410_0) ctx_98)((s411_0) s_674))"
 "(keep-as-needed85.1"
 " #f"
 " #f"
@@ -67915,117 +68086,117 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" ctx389_0"
-" s390_0))))"
+" ctx410_0"
+" s411_0))))"
 "(let-values(((exp-rhs_5)"
-"(let-values(((temp391_0) rhs375_0)"
-"((temp392_0)"
+"(let-values(((temp412_0) rhs396_0)"
+"((temp413_0)"
 "(as-expression-context ctx_98)))"
-"(expand7.1 #f #f #f #f temp391_0 temp392_0))))"
+"(expand7.1 #f #f #f #f temp412_0 temp413_0))))"
 "(if(expand-context-to-parsed? ctx_98)"
 "(parsed-set!9.1"
 " rebuild-s_12"
-"(parsed-id2.1 id_129 binding_30 #f)"
+"(parsed-id2.1 id_130 binding_30 #f)"
 " exp-rhs_5)"
-"(let-values(((rebuild-s393_0) rebuild-s_12)"
-"((temp394_0)"
+"(let-values(((rebuild-s414_0) rebuild-s_12)"
+"((temp415_0)"
 "(list"
-" set!373_0"
-"(let-values(((id395_0) id_129)"
-"((t396_0) t_58)"
-"((temp397_0)"
+" set!394_0"
+"(let-values(((id416_0) id_130)"
+"((t417_0) t_58)"
+"((temp418_0)"
 "(free-id-set-empty-or-just-module*?"
 "(expand-context-stops"
 " ctx_98))))"
 "(substitute-variable6.1"
-" temp397_0"
-" id395_0"
-" t396_0))"
+" temp418_0"
+" id416_0"
+" t417_0))"
 " exp-rhs_5)))"
-"(rebuild5.1 #f #f rebuild-s393_0 temp394_0)))))))))"
+"(rebuild5.1 #f #f rebuild-s414_0 temp415_0)))))))))"
 "(if(not binding_30)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" s_658"
-" id_129"
+" s_674"
+" id_130"
 " null"
-"(syntax-debug-info-string id_129 ctx_98)))"
+"(syntax-debug-info-string id_130 ctx_98)))"
 "(if(1/set!-transformer? t_58)"
 "(let-values()"
 "(if(not-in-this-expand-context? t_58 ctx_98)"
 "(let-values()"
-"(let-values(((temp398_0)"
+"(let-values(((temp419_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_658"
+" s_674"
 " disarmed-s_18"
-" set!373_0"
-" rhs375_0"
-" id_129"
+" set!394_0"
+" rhs396_0"
+" id_130"
 " from-rename?_0"
 " ctx_98)"
 " t_58"
 " ctx_98))"
-"((ctx399_0) ctx_98))"
-"(expand7.1 #f #f #f #f temp398_0 ctx399_0)))"
+"((ctx420_0) ctx_98))"
+"(expand7.1 #f #f #f #f temp419_0 ctx420_0)))"
 "(let-values()"
 "(let-values(((exp-s_14 re-ctx_1)"
-"(let-values(((t400_0) t_58)"
-"((insp401_0) insp_24)"
-"((s402_0) s_658)"
-"((orig-id403_0) orig-id_1)"
-"((ctx404_0) ctx_98)"
-"((binding405_0) binding_30)"
-"((orig-id406_0) orig-id_1))"
+"(let-values(((t421_0) t_58)"
+"((insp422_0) insp_24)"
+"((s423_0) s_674)"
+"((orig-id424_0) orig-id_1)"
+"((ctx425_0) ctx_98)"
+"((binding426_0) binding_30)"
+"((orig-id427_0) orig-id_1))"
 "(apply-transformer18.1"
-" orig-id406_0"
+" orig-id427_0"
 " #t"
-" t400_0"
-" insp401_0"
-" s402_0"
-" orig-id403_0"
-" ctx404_0"
-" binding405_0))))"
+" t421_0"
+" insp422_0"
+" s423_0"
+" orig-id424_0"
+" ctx425_0"
+" binding426_0))))"
 "(if(expand-context-just-once? ctx_98)"
 "(let-values() exp-s_14)"
 "(let-values()"
-"(let-values(((exp-s407_0) exp-s_14)"
-"((re-ctx408_0) re-ctx_1))"
-"(expand7.1 #f #f #f #f exp-s407_0 re-ctx408_0))))))))"
+"(let-values(((exp-s428_0) exp-s_14)"
+"((re-ctx429_0) re-ctx_1))"
+"(expand7.1 #f #f #f #f exp-s428_0 re-ctx429_0))))))))"
 "(if(1/rename-transformer? t_58)"
 "(let-values()"
 "(if(not-in-this-expand-context? t_58 ctx_98)"
 "(let-values()"
-"(let-values(((temp409_0)"
+"(let-values(((temp430_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_658"
+" s_674"
 " disarmed-s_18"
-" set!373_0"
-" rhs375_0"
-" id_129"
+" set!394_0"
+" rhs396_0"
+" id_130"
 " from-rename?_0"
 " ctx_98"
 " t_58)"
 " t_58"
 " ctx_98))"
-"((ctx410_0) ctx_98))"
-"(expand7.1 #f #f #f #f temp409_0 ctx410_0)))"
+"((ctx431_0) ctx_98))"
+"(expand7.1 #f #f #f #f temp430_0 ctx431_0)))"
 "(let-values()"
 "(rename-loop_0"
 "(syntax-track-origin$1"
 "(rename-transformer-target-in-context t_58 ctx_98)"
-" id_129"
-" id_129)"
+" id_130"
+" id_130)"
 " #t))))"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                      \"cannot mutate syntax identifier\""
-" s_658"
-" id_129))))))))))))))"
+" s_674"
+" id_130))))))))))))))"
 " rename-loop_0)"
 " orig-id_1"
 " #f))))))))"
@@ -68035,39 +68206,39 @@ static const char *startup_source =
 "(lambda(s25_0 disarmed-s26_0 set!-id27_0 id28_0 rhs-s29_0 from-rename?30_0 ctx31_0 t23_0 t24_0)"
 "(begin"
 " 'substitute-set!-rename32"
-"(let-values(((s_670) s25_0))"
+"(let-values(((s_686) s25_0))"
 "(let-values(((disarmed-s_19) disarmed-s26_0))"
 "(let-values(((set!-id_0) set!-id27_0))"
-"(let-values(((id_130) id28_0))"
+"(let-values(((id_131) id28_0))"
 "(let-values(((rhs-s_0) rhs-s29_0))"
 "(let-values(((from-rename?_1) from-rename?30_0))"
 "(let-values(((ctx_99) ctx31_0))"
 "(let-values(((t_59)(if t24_0 t23_0 #f)))"
 "(let-values()"
-"(if(let-values(((or-part_392) t_59))"
-"(if or-part_392 or-part_392 from-rename?_1))"
+"(if(let-values(((or-part_394) t_59))"
+"(if or-part_394 or-part_394 from-rename?_1))"
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_59"
 "(rename-transformer-target-in-context t_59 ctx_99)"
-" id_130)))"
+" id_131)))"
 "(syntax-rearm$1"
 "(datum->syntax$1"
 " disarmed-s_19"
 "(list set!-id_0 new-id_1 rhs-s_0)"
 " disarmed-s_19"
 " disarmed-s_19)"
-" s_670)))"
-"(let-values() s_670)))))))))))))))"
+" s_686)))"
+"(let-values() s_686)))))))))))))))"
 "(case-lambda"
-"((s_671 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_100)"
-"(begin(substitute-set!-rename32_0 s_671 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_100 #f #f)))"
-"((s_672 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_101 t23_1)"
-"(substitute-set!-rename32_0 s_672 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_101 t23_1 #t)))))"
+"((s_687 disarmed-s_20 set!-id_1 id_132 rhs-s_1 from-rename?_2 ctx_100)"
+"(begin(substitute-set!-rename32_0 s_687 disarmed-s_20 set!-id_1 id_132 rhs-s_1 from-rename?_2 ctx_100 #f #f)))"
+"((s_688 disarmed-s_21 set!-id_2 id_133 rhs-s_2 from-rename?_3 ctx_101 t23_1)"
+"(substitute-set!-rename32_0 s_688 disarmed-s_21 set!-id_2 id_133 rhs-s_2 from-rename?_3 ctx_101 t23_1 #t)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_673 ctx_102)"
+"(lambda(s_689 ctx_102)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_119)(expand-context-observer ctx_102)))"
@@ -68075,154 +68246,154 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_119 'prim-#%variable-reference)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_22)(syntax-disarm$1 s_673)))"
-"(let-values(((ok?_54 #%variable-reference411_0 id412_0)"
-"(let-values(((s_674) disarmed-s_22))"
-"(if(let-values(((s_675)(if(syntax?$1 s_674)(syntax-e$1 s_674) s_674)))"
-"(if(pair? s_675)"
-"(if(let-values(((s_676)(car s_675))) #t)"
-"(let-values(((s_677)(cdr s_675)))"
-"(let-values(((s_678)(if(syntax?$1 s_677)(syntax-e$1 s_677) s_677)))"
-"(if(pair? s_678)"
-"(if(let-values(((s_679)(car s_678)))"
-"(let-values(((or-part_393)"
-"(if(syntax?$1 s_679)(symbol?(syntax-e$1 s_679)) #f)))"
-"(if or-part_393 or-part_393(symbol? s_679))))"
-"(let-values(((s_680)(cdr s_678)))"
-"(let-values(((s_681)(if(syntax?$1 s_680)(syntax-e$1 s_680) s_680)))"
-"(null? s_681)))"
+"(let-values(((disarmed-s_22)(syntax-disarm$1 s_689)))"
+"(let-values(((ok?_56 #%variable-reference432_0 id433_0)"
+"(let-values(((s_690) disarmed-s_22))"
+"(if(let-values(((s_691)(if(syntax?$1 s_690)(syntax-e$1 s_690) s_690)))"
+"(if(pair? s_691)"
+"(if(let-values(((s_692)(car s_691))) #t)"
+"(let-values(((s_693)(cdr s_691)))"
+"(let-values(((s_694)(if(syntax?$1 s_693)(syntax-e$1 s_693) s_693)))"
+"(if(pair? s_694)"
+"(if(let-values(((s_695)(car s_694)))"
+"(let-values(((or-part_395)"
+"(if(syntax?$1 s_695)(symbol?(syntax-e$1 s_695)) #f)))"
+"(if or-part_395 or-part_395(symbol? s_695))))"
+"(let-values(((s_696)(cdr s_694)))"
+"(let-values(((s_697)(if(syntax?$1 s_696)(syntax-e$1 s_696) s_696)))"
+"(null? s_697)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((#%variable-reference411_1 id412_1)"
-"(let-values(((s_682)(if(syntax?$1 s_674)(syntax-e$1 s_674) s_674)))"
-"(let-values(((#%variable-reference413_0)"
-"(let-values(((s_683)(car s_682))) s_683))"
-"((id414_0)"
-"(let-values(((s_684)(cdr s_682)))"
-"(let-values(((s_685)"
-"(if(syntax?$1 s_684)"
-"(syntax-e$1 s_684)"
-" s_684)))"
-"(let-values(((id415_0)"
-"(let-values(((s_686)(car s_685))) s_686))"
+"(let-values(((#%variable-reference432_1 id433_1)"
+"(let-values(((s_698)(if(syntax?$1 s_690)(syntax-e$1 s_690) s_690)))"
+"(let-values(((#%variable-reference434_0)"
+"(let-values(((s_699)(car s_698))) s_699))"
+"((id435_0)"
+"(let-values(((s_700)(cdr s_698)))"
+"(let-values(((s_701)"
+"(if(syntax?$1 s_700)"
+"(syntax-e$1 s_700)"
+" s_700)))"
+"(let-values(((id436_0)"
+"(let-values(((s_702)(car s_701))) s_702))"
 "(()"
-"(let-values(((s_687)(cdr s_685)))"
-"(let-values(((s_688)"
-"(if(syntax?$1 s_687)"
-"(syntax-e$1 s_687)"
-" s_687)))"
+"(let-values(((s_703)(cdr s_701)))"
+"(let-values(((s_704)"
+"(if(syntax?$1 s_703)"
+"(syntax-e$1 s_703)"
+" s_703)))"
 "(values)))))"
-"(values id415_0))))))"
-"(values #%variable-reference413_0 id414_0)))))"
-"(values #t #%variable-reference411_1 id412_1)))"
+"(values id436_0))))))"
+"(values #%variable-reference434_0 id435_0)))))"
+"(values #t #%variable-reference432_1 id433_1)))"
 "(values #f #f #f)))))"
-"(let-values(((ok?_55 #%variable-reference416_0 #%top417_0 id418_0)"
-"(let-values(((s_689) disarmed-s_22))"
-"(if(if(not ok?_54)"
-"(let-values(((s_690)(if(syntax?$1 s_689)(syntax-e$1 s_689) s_689)))"
-"(if(pair? s_690)"
-"(if(let-values(((s_691)(car s_690))) #t)"
-"(let-values(((s_692)(cdr s_690)))"
-"(let-values(((s_693)(if(syntax?$1 s_692)(syntax-e$1 s_692) s_692)))"
-"(if(pair? s_693)"
-"(if(let-values(((s_694)(car s_693)))"
-"(let-values(((s_695)"
-"(if(syntax?$1 s_694)(syntax-e$1 s_694) s_694)))"
-"(if(pair? s_695)"
-"(if(let-values(((s_696)(car s_695))) #t)"
-"(let-values(((s_697)(cdr s_695)))"
-"(let-values(((or-part_394)"
-"(if(syntax?$1 s_697)"
-"(symbol?(syntax-e$1 s_697))"
+"(let-values(((ok?_57 #%variable-reference437_0 #%top438_0 id439_0)"
+"(let-values(((s_705) disarmed-s_22))"
+"(if(if(not ok?_56)"
+"(let-values(((s_706)(if(syntax?$1 s_705)(syntax-e$1 s_705) s_705)))"
+"(if(pair? s_706)"
+"(if(let-values(((s_707)(car s_706))) #t)"
+"(let-values(((s_708)(cdr s_706)))"
+"(let-values(((s_709)(if(syntax?$1 s_708)(syntax-e$1 s_708) s_708)))"
+"(if(pair? s_709)"
+"(if(let-values(((s_710)(car s_709)))"
+"(let-values(((s_711)"
+"(if(syntax?$1 s_710)(syntax-e$1 s_710) s_710)))"
+"(if(pair? s_711)"
+"(if(let-values(((s_712)(car s_711))) #t)"
+"(let-values(((s_713)(cdr s_711)))"
+"(let-values(((or-part_396)"
+"(if(syntax?$1 s_713)"
+"(symbol?(syntax-e$1 s_713))"
 " #f)))"
-"(if or-part_394 or-part_394(symbol? s_697))))"
+"(if or-part_396 or-part_396(symbol? s_713))))"
 " #f)"
 " #f)))"
-"(let-values(((s_698)(cdr s_693)))"
-"(let-values(((s_699)(if(syntax?$1 s_698)(syntax-e$1 s_698) s_698)))"
-"(null? s_699)))"
+"(let-values(((s_714)(cdr s_709)))"
+"(let-values(((s_715)(if(syntax?$1 s_714)(syntax-e$1 s_714) s_714)))"
+"(null? s_715)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 " #f)"
 "(let-values()"
-"(let-values(((#%variable-reference416_1 #%top417_1 id418_1)"
-"(let-values(((s_700)(if(syntax?$1 s_689)(syntax-e$1 s_689) s_689)))"
-"(let-values(((#%variable-reference419_0)"
-"(let-values(((s_701)(car s_700))) s_701))"
-"((#%top420_0 id421_0)"
-"(let-values(((s_702)(cdr s_700)))"
-"(let-values(((s_703)"
-"(if(syntax?$1 s_702)"
-"(syntax-e$1 s_702)"
-" s_702)))"
-"(let-values(((#%top422_0 id423_0)"
-"(let-values(((s_704)(car s_703)))"
-"(let-values(((s_705)"
-"(if(syntax?$1 s_704)"
-"(syntax-e$1 s_704)"
-" s_704)))"
-"(let-values(((#%top424_0)"
-"(let-values(((s_706)"
+"(let-values(((#%variable-reference437_1 #%top438_1 id439_1)"
+"(let-values(((s_716)(if(syntax?$1 s_705)(syntax-e$1 s_705) s_705)))"
+"(let-values(((#%variable-reference440_0)"
+"(let-values(((s_717)(car s_716))) s_717))"
+"((#%top441_0 id442_0)"
+"(let-values(((s_718)(cdr s_716)))"
+"(let-values(((s_719)"
+"(if(syntax?$1 s_718)"
+"(syntax-e$1 s_718)"
+" s_718)))"
+"(let-values(((#%top443_0 id444_0)"
+"(let-values(((s_720)(car s_719)))"
+"(let-values(((s_721)"
+"(if(syntax?$1 s_720)"
+"(syntax-e$1 s_720)"
+" s_720)))"
+"(let-values(((#%top445_0)"
+"(let-values(((s_722)"
 "(car"
-" s_705)))"
-" s_706))"
-"((id425_0)"
-"(let-values(((s_707)"
+" s_721)))"
+" s_722))"
+"((id446_0)"
+"(let-values(((s_723)"
 "(cdr"
-" s_705)))"
-" s_707)))"
-"(values #%top424_0 id425_0)))))"
+" s_721)))"
+" s_723)))"
+"(values #%top445_0 id446_0)))))"
 "(()"
-"(let-values(((s_708)(cdr s_703)))"
-"(let-values(((s_709)"
-"(if(syntax?$1 s_708)"
-"(syntax-e$1 s_708)"
-" s_708)))"
+"(let-values(((s_724)(cdr s_719)))"
+"(let-values(((s_725)"
+"(if(syntax?$1 s_724)"
+"(syntax-e$1 s_724)"
+" s_724)))"
 "(values)))))"
-"(values #%top422_0 id423_0))))))"
-"(values #%variable-reference419_0 #%top420_0 id421_0)))))"
-"(values #t #%variable-reference416_1 #%top417_1 id418_1)))"
+"(values #%top443_0 id444_0))))))"
+"(values #%variable-reference440_0 #%top441_0 id442_0)))))"
+"(values #t #%variable-reference437_1 #%top438_1 id439_1)))"
 "(values #f #f #f #f)))))"
-"(let-values(((ok?_56 #%variable-reference426_0)"
-"(let-values(((s_710) disarmed-s_22))"
-"(if(if(not(let-values(((or-part_395) ok?_54))(if or-part_395 or-part_395 ok?_55)))"
+"(let-values(((ok?_58 #%variable-reference447_0)"
+"(let-values(((s_726) disarmed-s_22))"
+"(if(if(not(let-values(((or-part_397) ok?_56))(if or-part_397 or-part_397 ok?_57)))"
 " #t"
 " #f)"
-"(let-values(((orig-s_59) s_710))"
-"(let-values(((#%variable-reference426_1)"
-"(let-values(((s_711)(if(syntax?$1 s_710)(syntax-e$1 s_710) s_710)))"
-"(if(pair? s_711)"
-"(let-values(((#%variable-reference427_0)"
-"(let-values(((s_712)(car s_711))) s_712))"
+"(let-values(((orig-s_61) s_726))"
+"(let-values(((#%variable-reference447_1)"
+"(let-values(((s_727)(if(syntax?$1 s_726)(syntax-e$1 s_726) s_726)))"
+"(if(pair? s_727)"
+"(let-values(((#%variable-reference448_0)"
+"(let-values(((s_728)(car s_727))) s_728))"
 "(()"
-"(let-values(((s_713)(cdr s_711)))"
-"(let-values(((s_714)"
-"(if(syntax?$1 s_713)"
-"(syntax-e$1 s_713)"
-" s_713)))"
-"(if(null? s_714)"
+"(let-values(((s_729)(cdr s_727)))"
+"(let-values(((s_730)"
+"(if(syntax?$1 s_729)"
+"(syntax-e$1 s_729)"
+" s_729)))"
+"(if(null? s_730)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                        \"bad syntax\""
-" orig-s_59))))))"
-"(values #%variable-reference427_0))"
-"                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_59)))))"
-"(values #t #%variable-reference426_1)))"
+" orig-s_61))))))"
+"(values #%variable-reference448_0))"
+"                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_61)))))"
+"(values #t #%variable-reference447_1)))"
 "(values #f #f)))))"
-"(if(let-values(((or-part_396) ok?_54))(if or-part_396 or-part_396 ok?_55))"
+"(if(let-values(((or-part_398) ok?_56))(if or-part_398 or-part_398 ok?_57))"
 "(let-values()"
-"(let-values(((var-id_0)(if ok?_54 id412_0 id418_0)))"
+"(let-values(((var-id_0)(if ok?_56 id433_0 id439_0)))"
 "(let-values(((binding_31)"
-"(let-values(((var-id428_0) var-id_0)"
-"((temp429_0)(expand-context-phase ctx_102))"
-"((temp430_0) 'ambiguous))"
-"(resolve+shift30.1 temp430_0 #t #f #f #f #f #f #f #f #f var-id428_0 temp429_0))))"
+"(let-values(((var-id449_0) var-id_0)"
+"((temp450_0)(expand-context-phase ctx_102))"
+"((temp451_0) 'ambiguous))"
+"(resolve+shift30.1 temp451_0 #t #f #f #f #f #f #f #f #f var-id449_0 temp450_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_31 'ambiguous)"
@@ -68231,47 +68402,47 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_397) binding_31))"
-"(if or-part_397 or-part_397(expand-context-allow-unbound? ctx_102)))"
+"(if(let-values(((or-part_399) binding_31))"
+"(if or-part_399 or-part_399(expand-context-allow-unbound? ctx_102)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                              \"unbound identifier\""
-" s_673"
+" s_689"
 " var-id_0"
 " null"
 "(syntax-debug-info-string var-id_0 ctx_102))))"
 "(values))))"
 "(let-values(((t_60 primitive?_12 insp-of-t_7 protected?_13)"
 "(if binding_31"
-"(let-values(((binding431_0) binding_31)"
-"((ctx432_0) ctx_102)"
-"((var-id433_0) var-id_0)"
-"((s434_0) s_673)"
-"((temp435_0)(expand-context-in-local-expand? ctx_102)))"
-"(lookup28.1 s434_0 #t temp435_0 #t binding431_0 ctx432_0 var-id433_0))"
+"(let-values(((binding452_0) binding_31)"
+"((ctx453_0) ctx_102)"
+"((var-id454_0) var-id_0)"
+"((s455_0) s_689)"
+"((temp456_0)(expand-context-in-local-expand? ctx_102)))"
+"(lookup28.1 s455_0 #t temp456_0 #t binding452_0 ctx453_0 var-id454_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(if(if t_60(not(variable? t_60)) #f)"
 "(let-values()"
-"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_673))"
+"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_689))"
 "(void))"
 "(if(expand-context-to-parsed? ctx_102)"
 "(parsed-#%variable-reference11.1"
-"(keep-properties-only~ s_673)"
-"(if ok?_55"
+"(keep-properties-only~ s_689)"
+"(if ok?_57"
 "(let-values()(parsed-top-id4.1 var-id_0 binding_31 #f))"
 "(let-values()(parsed-id2.1 var-id_0 binding_31 #f))))"
-" s_673))))))))"
+" s_689))))))))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_102)"
-"(parsed-#%variable-reference11.1(keep-properties-only~ s_673) #f)"
-" s_673)))))))))))"
+"(parsed-#%variable-reference11.1(keep-properties-only~ s_689) #f)"
+" s_689)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_715 ctx_103)"
+"(lambda(s_731 ctx_103)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_120)(expand-context-observer ctx_103)))"
@@ -68279,52 +68450,52 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_120 'prim-#%expression)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_23)(syntax-disarm$1 s_715)))"
-"(let-values(((ok?_57 #%expression436_0 e437_0)"
-"(let-values(((s_716) disarmed-s_23))"
-"(let-values(((orig-s_60) s_716))"
-"(let-values(((#%expression436_1 e437_1)"
-"(let-values(((s_717)(if(syntax?$1 s_716)(syntax-e$1 s_716) s_716)))"
-"(if(pair? s_717)"
-"(let-values(((#%expression438_0)"
-"(let-values(((s_718)(car s_717))) s_718))"
-"((e439_0)"
-"(let-values(((s_719)(cdr s_717)))"
-"(let-values(((s_720)"
-"(if(syntax?$1 s_719)"
-"(syntax-e$1 s_719)"
-" s_719)))"
-"(if(pair? s_720)"
-"(let-values(((e440_0)"
-"(let-values(((s_721)(car s_720)))"
-" s_721))"
+"(let-values(((disarmed-s_23)(syntax-disarm$1 s_731)))"
+"(let-values(((ok?_59 #%expression457_0 e458_0)"
+"(let-values(((s_732) disarmed-s_23))"
+"(let-values(((orig-s_62) s_732))"
+"(let-values(((#%expression457_1 e458_1)"
+"(let-values(((s_733)(if(syntax?$1 s_732)(syntax-e$1 s_732) s_732)))"
+"(if(pair? s_733)"
+"(let-values(((#%expression459_0)"
+"(let-values(((s_734)(car s_733))) s_734))"
+"((e460_0)"
+"(let-values(((s_735)(cdr s_733)))"
+"(let-values(((s_736)"
+"(if(syntax?$1 s_735)"
+"(syntax-e$1 s_735)"
+" s_735)))"
+"(if(pair? s_736)"
+"(let-values(((e461_0)"
+"(let-values(((s_737)(car s_736)))"
+" s_737))"
 "(()"
-"(let-values(((s_722)(cdr s_720)))"
-"(let-values(((s_723)"
-"(if(syntax?$1 s_722)"
-"(syntax-e$1 s_722)"
-" s_722)))"
-"(if(null? s_723)"
+"(let-values(((s_738)(cdr s_736)))"
+"(let-values(((s_739)"
+"(if(syntax?$1 s_738)"
+"(syntax-e$1 s_738)"
+" s_738)))"
+"(if(null? s_739)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
-" orig-s_60))))))"
-"(values e440_0))"
-"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_60))))))"
-"(values #%expression438_0 e439_0))"
-"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_60)))))"
-"(values #t #%expression436_1 e437_1))))))"
+" orig-s_62))))))"
+"(values e461_0))"
+"                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_62))))))"
+"(values #%expression459_0 e460_0))"
+"                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_62)))))"
+"(values #t #%expression457_1 e458_1))))))"
 "(let-values(((rebuild-s_13)"
-"(let-values(((ctx441_0) ctx_103)((s442_0) s_715)((temp443_0) #t))"
-"(keep-as-needed85.1 temp443_0 #t #f #f #f #f ctx441_0 s442_0))))"
+"(let-values(((ctx462_0) ctx_103)((s463_0) s_731)((temp464_0) #t))"
+"(keep-as-needed85.1 temp464_0 #t #f #f #f #f ctx462_0 s463_0))))"
 "(let-values(((exp-e_0)"
-"(let-values(((temp444_0) e437_0)"
-"((temp445_0)"
-"(let-values(((temp446_0)(as-expression-context ctx_103))"
-"((ctx447_0) ctx_103))"
-"(as-tail-context23.1 ctx447_0 temp446_0))))"
-"(expand7.1 #f #f #f #f temp444_0 temp445_0))))"
+"(let-values(((temp465_0) e458_0)"
+"((temp466_0)"
+"(let-values(((temp467_0)(as-expression-context ctx_103))"
+"((ctx468_0) ctx_103))"
+"(as-tail-context23.1 ctx468_0 temp467_0))))"
+"(expand7.1 #f #f #f #f temp465_0 temp466_0))))"
 "(if(expand-context-to-parsed? ctx_103)"
 " exp-e_0"
 "(let-values(((tmp_64)"
@@ -68341,13 +68512,13 @@ static const char *startup_source =
 "(void)))"
 " result-s_13)))"
 "(let-values()"
-"(let-values(((rebuild-s448_0) rebuild-s_13)((temp449_0)(list #%expression436_0 exp-e_0)))"
-"(rebuild5.1 #f #f rebuild-s448_0 temp449_0))))))))))))))"
-" (void (add-core-form!* 'unquote (lambda (s_724 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_724))))"
-" (void (add-core-form!* 'unquote-splicing (lambda (s_725 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_725))))"
+"(let-values(((rebuild-s469_0) rebuild-s_13)((temp470_0)(list #%expression457_0 exp-e_0)))"
+"(rebuild5.1 #f #f rebuild-s469_0 temp470_0))))))))))))))"
+" (void (add-core-form!* 'unquote (lambda (s_740 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_740))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_741 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_741))))"
 "(define-values"
 "(binding-for-transformer?)"
-"(lambda(b_41 id_133 at-phase_12 ns_123)"
+"(lambda(b_41 id_134 at-phase_12 ns_123)"
 "(begin"
 "(if(not at-phase_12)"
 "(let-values()"
@@ -68366,14 +68537,14 @@ static const char *startup_source =
 "((null3_0) null)"
 "((ns4_1) ns_123)"
 "((at-phase5_0) at-phase_12)"
-"((id6_0) id_133))"
+"((id6_0) id_134))"
 "(binding-lookup50.1 #f #f #f #f b1_8 empty-env2_0 null3_0 ns4_1 at-phase5_0 id6_0))))"
 "(not(variable? val_14))))))))"
 "(define-values(layers) '(raw phaseless id))"
 "(define-values(provide-form-name) 'provide)"
 "(define-values"
 "(parse-and-expand-provides!)"
-"(lambda(specs_0 orig-s_61 rp_1 self_30 phase_44 ctx_106)"
+"(lambda(specs_0 orig-s_63 rp_1 self_30 phase_44 ctx_106)"
 "(begin"
 "(let-values(((ns_125)(expand-context-namespace ctx_106)))"
 "((letrec-values(((loop_112)"
@@ -68391,16 +68562,16 @@ static const char *startup_source =
 "((letrec-values(((for-loop_96)"
 "(lambda(track-stxes_1"
 " exp-specs_1"
-" lst_406)"
+" lst_408)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_406)"
+"(if(pair? lst_408)"
 "(let-values(((spec_0)"
 "(unsafe-car"
-" lst_406))"
-"((rest_234)"
+" lst_408))"
+"((rest_233)"
 "(unsafe-cdr"
-" lst_406)))"
+" lst_408)))"
 "(let-values(((track-stxes_2"
 " exp-specs_2)"
 "(let-values(((track-stxes_3)"
@@ -68446,7 +68617,7 @@ static const char *startup_source =
 "(format"
 "                                                                                                                                                                    \"nested `~a' not allowed\""
 " fm_2)"
-" orig-s_61"
+" orig-s_63"
 " spec_0)))))))"
 "(let-values(((tmp_65)"
 " fm_2))"
@@ -68512,7 +68683,7 @@ static const char *startup_source =
 "(begin"
 "(parse-identifier!"
 " spec_0"
-" orig-s_61"
+" orig-s_63"
 "(syntax-e$1"
 " spec_0)"
 " at-phase_13"
@@ -68527,7 +68698,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                                                                                                                                                               \"bad syntax\""
-" orig-s_61"
+" orig-s_63"
 " spec_0))))"
 "(let-values()"
 "(let-values((()"
@@ -68535,13 +68706,13 @@ static const char *startup_source =
 "(check-nested_1"
 " 'raw)"
 "(values))))"
-"(let-values(((ok?_58"
+"(let-values(((ok?_60"
 " for-meta3_0"
 " phase-level4_0"
 " spec5_0)"
 "(let-values(((s_303)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_62)"
+"(let-values(((orig-s_64)"
 " s_303))"
 "(let-values(((for-meta3_1"
 " phase-level4_1"
@@ -68564,48 +68735,48 @@ static const char *startup_source =
 "(let-values(((s_80)"
 "(cdr"
 " s_304)))"
-"(let-values(((s_726)"
+"(let-values(((s_742)"
 "(if(syntax?$1"
 " s_80)"
 "(syntax-e$1"
 " s_80)"
 " s_80)))"
 "(if(pair?"
-" s_726)"
+" s_742)"
 "(let-values(((phase-level9_0)"
 "(let-values(((s_180)"
 "(car"
-" s_726)))"
+" s_742)))"
 " s_180))"
 "((spec10_0)"
 "(let-values(((s_460)"
 "(cdr"
-" s_726)))"
+" s_742)))"
 "(let-values(((s_466)"
 "(if(syntax?$1"
 " s_460)"
 "(syntax-e$1"
 " s_460)"
 " s_460)))"
-"(let-values(((flat-s_42)"
+"(let-values(((flat-s_44)"
 "(to-syntax-list.1"
 " s_466)))"
 "(if(not"
-" flat-s_42)"
+" flat-s_44)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                             \"bad syntax\""
-" orig-s_62))"
+" orig-s_64))"
 "(let-values()"
-" flat-s_42)))))))"
+" flat-s_44)))))))"
 "(values"
 " phase-level9_0"
 " spec10_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_62))))))"
+" orig-s_64))))))"
 "(values"
 " for-meta6_0"
 " phase-level7_0"
@@ -68613,7 +68784,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_62)))))"
+" orig-s_64)))))"
 "(values"
 " #t"
 " for-meta3_1"
@@ -68631,7 +68802,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                                                                                                                                                                                     \"bad `for-meta' phase\""
-" orig-s_61"
+" orig-s_63"
 " spec_0)))"
 "(values))))"
 "(let-values(((track-stxes_5"
@@ -68669,12 +68840,12 @@ static const char *startup_source =
 "(check-nested_1"
 " 'raw)"
 "(values))))"
-"(let-values(((ok?_59"
+"(let-values(((ok?_61"
 " for-syntax13_0"
 " spec14_0)"
 "(let-values(((s_20)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_63)"
+"(let-values(((orig-s_65)"
 " s_20))"
 "(let-values(((for-syntax13_1"
 " spec14_1)"
@@ -68695,31 +68866,31 @@ static const char *startup_source =
 "(let-values(((s_25)"
 "(cdr"
 " s_23)))"
-"(let-values(((s_727)"
+"(let-values(((s_743)"
 "(if(syntax?$1"
 " s_25)"
 "(syntax-e$1"
 " s_25)"
 " s_25)))"
-"(let-values(((flat-s_43)"
+"(let-values(((flat-s_45)"
 "(to-syntax-list.1"
-" s_727)))"
+" s_743)))"
 "(if(not"
-" flat-s_43)"
+" flat-s_45)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                         \"bad syntax\""
-" orig-s_63))"
+" orig-s_65))"
 "(let-values()"
-" flat-s_43)))))))"
+" flat-s_45)))))))"
 "(values"
 " for-syntax15_0"
 " spec16_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_63)))))"
+" orig-s_65)))))"
 "(values"
 " #t"
 " for-syntax13_1"
@@ -68758,12 +68929,12 @@ static const char *startup_source =
 "(check-nested_1"
 " 'raw)"
 "(values))))"
-"(let-values(((ok?_60"
+"(let-values(((ok?_62"
 " for-label19_0"
 " spec20_0)"
 "(let-values(((s_44)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_64)"
+"(let-values(((orig-s_66)"
 " s_44))"
 "(let-values(((for-label19_1"
 " spec20_1)"
@@ -68790,25 +68961,25 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_45)"
 " s_45)))"
-"(let-values(((flat-s_44)"
+"(let-values(((flat-s_46)"
 "(to-syntax-list.1"
 " s_305)))"
 "(if(not"
-" flat-s_44)"
+" flat-s_46)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_64))"
+" orig-s_66))"
 "(let-values()"
-" flat-s_44)))))))"
+" flat-s_46)))))))"
 "(values"
 " for-label21_0"
 " spec22_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_64)))))"
+" orig-s_66)))))"
 "(values"
 " #t"
 " for-label19_1"
@@ -68852,25 +69023,25 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                                                                                                                                                                                     \"nested `protect' not allowed\""
-" orig-s_61"
+" orig-s_63"
 " spec_0))"
 "(void))"
 "(values))))"
-"(let-values(((ok?_61"
+"(let-values(((ok?_63"
 " protect25_0"
 " p-spec26_0)"
-"(let-values(((s_728)"
+"(let-values(((s_744)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_65)"
-" s_728))"
+"(let-values(((orig-s_67)"
+" s_744))"
 "(let-values(((protect25_1"
 " p-spec26_1)"
 "(let-values(((s_31)"
 "(if(syntax?$1"
-" s_728)"
+" s_744)"
 "(syntax-e$1"
-" s_728)"
-" s_728)))"
+" s_744)"
+" s_744)))"
 "(if(pair?"
 " s_31)"
 "(let-values(((protect27_0)"
@@ -68888,25 +69059,25 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_307)"
 " s_307)))"
-"(let-values(((flat-s_45)"
+"(let-values(((flat-s_47)"
 "(to-syntax-list.1"
 " s_481)))"
 "(if(not"
-" flat-s_45)"
+" flat-s_47)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                               \"bad syntax\""
-" orig-s_65))"
+" orig-s_67))"
 "(let-values()"
-" flat-s_45)))))))"
+" flat-s_47)))))))"
 "(values"
 " protect27_0"
 " p-spec28_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_65)))))"
+" orig-s_67)))))"
 "(values"
 " #t"
 " protect25_1"
@@ -68940,23 +69111,23 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_62"
+"(let-values(((ok?_64"
 " rename31_0"
 " id:from32_0"
 " id:to33_0)"
-"(let-values(((s_729)"
+"(let-values(((s_745)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_66)"
-" s_729))"
+"(let-values(((orig-s_68)"
+" s_745))"
 "(let-values(((rename31_1"
 " id:from32_1"
 " id:to33_1)"
 "(let-values(((s_484)"
 "(if(syntax?$1"
-" s_729)"
+" s_745)"
 "(syntax-e$1"
-" s_729)"
-" s_729)))"
+" s_745)"
+" s_745)))"
 "(if(pair?"
 " s_484)"
 "(let-values(((rename34_0)"
@@ -68966,15 +69137,15 @@ static const char *startup_source =
 " s_313))"
 "((id:from35_0"
 " id:to36_0)"
-"(let-values(((s_730)"
+"(let-values(((s_746)"
 "(cdr"
 " s_484)))"
 "(let-values(((s_314)"
 "(if(syntax?$1"
-" s_730)"
+" s_746)"
 "(syntax-e$1"
-" s_730)"
-" s_730)))"
+" s_746)"
+" s_746)))"
 "(if(pair?"
 " s_314)"
 "(let-values(((id:from37_0)"
@@ -68996,24 +69167,24 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
-" orig-s_66"
+" orig-s_68"
 " s_33))))"
 "((id:to38_0)"
 "(let-values(((s_397)"
 "(cdr"
 " s_314)))"
-"(let-values(((s_731)"
+"(let-values(((s_747)"
 "(if(syntax?$1"
 " s_397)"
 "(syntax-e$1"
 " s_397)"
 " s_397)))"
 "(if(pair?"
-" s_731)"
+" s_747)"
 "(let-values(((id:to39_0)"
 "(let-values(((s_431)"
 "(car"
-" s_731)))"
+" s_747)))"
 "(if(let-values(((or-part_57)"
 "(if(syntax?$1"
 " s_431)"
@@ -69029,38 +69200,38 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                               \"not an identifier\""
-" orig-s_66"
+" orig-s_68"
 " s_431))))"
 "(()"
-"(let-values(((s_732)"
+"(let-values(((s_748)"
 "(cdr"
-" s_731)))"
+" s_747)))"
 "(let-values(((s_384)"
 "(if(syntax?$1"
-" s_732)"
+" s_748)"
 "(syntax-e$1"
-" s_732)"
-" s_732)))"
+" s_748)"
+" s_748)))"
 "(if(null?"
 " s_384)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_66))))))"
+" orig-s_68))))))"
 "(values"
 " id:to39_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                             \"bad syntax\""
-" orig-s_66))))))"
+" orig-s_68))))))"
 "(values"
 " id:from37_0"
 " id:to38_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                         \"bad syntax\""
-" orig-s_66))))))"
+" orig-s_68))))))"
 "(values"
 " rename34_0"
 " id:from35_0"
@@ -69068,7 +69239,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_66)))))"
+" orig-s_68)))))"
 "(values"
 " #t"
 " rename31_1"
@@ -69077,7 +69248,7 @@ static const char *startup_source =
 "(begin"
 "(parse-identifier!"
 " id:from32_0"
-" orig-s_61"
+" orig-s_63"
 "(syntax-e$1"
 " id:to33_0)"
 " at-phase_13"
@@ -69100,13 +69271,13 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_63"
+"(let-values(((ok?_65"
 " struct40_0"
 " id:struct41_0"
 " id:field42_0)"
 "(let-values(((s_501)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_67)"
+"(let-values(((orig-s_69)"
 " s_501))"
 "(let-values(((struct40_1"
 " id:struct41_1"
@@ -69126,48 +69297,48 @@ static const char *startup_source =
 " s_201))"
 "((id:struct44_0"
 " id:field45_0)"
-"(let-values(((s_733)"
+"(let-values(((s_749)"
 "(cdr"
 " s_502)))"
-"(let-values(((s_734)"
+"(let-values(((s_750)"
 "(if(syntax?$1"
-" s_733)"
+" s_749)"
 "(syntax-e$1"
-" s_733)"
-" s_733)))"
+" s_749)"
+" s_749)))"
 "(if(pair?"
-" s_734)"
+" s_750)"
 "(let-values(((id:struct46_0)"
-"(let-values(((s_735)"
+"(let-values(((s_751)"
 "(car"
-" s_734)))"
+" s_750)))"
 "(if(let-values(((or-part_364)"
 "(if(syntax?$1"
-" s_735)"
+" s_751)"
 "(symbol?"
 "(syntax-e$1"
-" s_735))"
+" s_751))"
 " #f)))"
 "(if or-part_364"
 " or-part_364"
 "(symbol?"
-" s_735)))"
-" s_735"
+" s_751)))"
+" s_751"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                       \"not an identifier\""
-" orig-s_67"
-" s_735))))"
+" orig-s_69"
+" s_751))))"
 "((id:field47_0)"
-"(let-values(((s_736)"
+"(let-values(((s_752)"
 "(cdr"
-" s_734)))"
+" s_750)))"
 "(let-values(((s_391)"
 "(if(syntax?$1"
-" s_736)"
+" s_752)"
 "(syntax-e$1"
-" s_736)"
-" s_736)))"
+" s_752)"
+" s_752)))"
 "(if(pair?"
 " s_391)"
 "(let-values(((id:field48_0)"
@@ -69180,20 +69351,20 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_37)"
 " s_37)))"
-"(let-values(((flat-s_46)"
+"(let-values(((flat-s_48)"
 "(to-syntax-list.1"
 " s_410)))"
 "(if(not"
-" flat-s_46)"
+" flat-s_48)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_67))"
+" orig-s_69))"
 "(let-values()"
 "(let-values(((id:field_0)"
 "(let-values(((lst_315)"
-" flat-s_46))"
+" flat-s_48))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -69203,17 +69374,17 @@ static const char *startup_source =
 " lst_315)))"
 "((letrec-values(((for-loop_278)"
 "(lambda(id:field_1"
-" lst_407)"
+" lst_409)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_407)"
+" lst_409)"
 "(let-values(((s_64)"
 "(unsafe-car"
-" lst_407))"
-"((rest_235)"
+" lst_409))"
+"((rest_234)"
 "(unsafe-cdr"
-" lst_407)))"
+" lst_409)))"
 "(let-values(((id:field_2)"
 "(let-values(((id:field_3)"
 " id:field_1))"
@@ -69221,22 +69392,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:field49_0)"
 "(let-values()"
-"(if(let-values(((or-part_398)"
+"(if(let-values(((or-part_400)"
 "(if(syntax?$1"
 " s_64)"
 "(symbol?"
 "(syntax-e$1"
 " s_64))"
 " #f)))"
-"(if or-part_398"
-" or-part_398"
+"(if or-part_400"
+" or-part_400"
 "(symbol?"
 " s_64)))"
 " s_64"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
-" orig-s_67"
+" orig-s_69"
 " s_64)))))"
 "(cons"
 " id:field49_0"
@@ -69247,7 +69418,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_278"
 " id:field_2"
-" rest_235)"
+" rest_234)"
 " id:field_2)))"
 " id:field_1)))))"
 " for-loop_278)"
@@ -69259,32 +69430,32 @@ static const char *startup_source =
 "(let-values(((s_204)"
 "(cdr"
 " s_391)))"
-"(let-values(((s_737)"
+"(let-values(((s_753)"
 "(if(syntax?$1"
 " s_204)"
 "(syntax-e$1"
 " s_204)"
 " s_204)))"
 "(if(null?"
-" s_737)"
+" s_753)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                             \"bad syntax\""
-" orig-s_67))))))"
+" orig-s_69))))))"
 "(values"
 " id:field48_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                         \"bad syntax\""
-" orig-s_67))))))"
+" orig-s_69))))))"
 "(values"
 " id:struct46_0"
 " id:field47_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_67))))))"
+" orig-s_69))))))"
 "(values"
 " struct43_0"
 " id:struct44_0"
@@ -69292,7 +69463,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_67)))))"
+" orig-s_69)))))"
 "(values"
 " #t"
 " struct40_1"
@@ -69301,7 +69472,7 @@ static const char *startup_source =
 "(begin"
 "(parse-struct!"
 " id:struct41_0"
-" orig-s_61"
+" orig-s_63"
 " id:field42_0"
 " at-phase_13"
 " ns_125"
@@ -69320,32 +69491,32 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_64"
+"(let-values(((ok?_66"
 " all-from50_0"
 " mod-path51_0)"
-"(let-values(((s_738)"
+"(let-values(((s_754)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_68)"
-" s_738))"
+"(let-values(((orig-s_70)"
+" s_754))"
 "(let-values(((all-from50_1"
 " mod-path51_1)"
-"(let-values(((s_739)"
+"(let-values(((s_755)"
 "(if(syntax?$1"
-" s_738)"
+" s_754)"
 "(syntax-e$1"
-" s_738)"
-" s_738)))"
+" s_754)"
+" s_754)))"
 "(if(pair?"
-" s_739)"
+" s_755)"
 "(let-values(((all-from52_0)"
-"(let-values(((s_740)"
+"(let-values(((s_756)"
 "(car"
-" s_739)))"
-" s_740))"
+" s_755)))"
+" s_756))"
 "((mod-path53_0)"
 "(let-values(((s_207)"
 "(cdr"
-" s_739)))"
+" s_755)))"
 "(let-values(((s_208)"
 "(if(syntax?$1"
 " s_207)"
@@ -69355,10 +69526,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_208)"
 "(let-values(((mod-path54_0)"
-"(let-values(((s_741)"
+"(let-values(((s_757)"
 "(car"
 " s_208)))"
-" s_741))"
+" s_757))"
 "(()"
 "(let-values(((s_93)"
 "(cdr"
@@ -69375,20 +69546,20 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_68))))))"
+" orig-s_70))))))"
 "(values"
 " mod-path54_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_68))))))"
+" orig-s_70))))))"
 "(values"
 " all-from52_0"
 " mod-path53_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_68)))))"
+" orig-s_70)))))"
 "(values"
 " #t"
 " all-from50_1"
@@ -69396,7 +69567,7 @@ static const char *startup_source =
 "(begin"
 "(parse-all-from"
 " mod-path51_0"
-" orig-s_61"
+" orig-s_63"
 " self_30"
 " null"
 " at-phase_13"
@@ -69414,13 +69585,13 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_65"
+"(let-values(((ok?_67"
 " all-from-except55_0"
 " mod-path56_0"
 " id57_0)"
 "(let-values(((s_96)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_69)"
+"(let-values(((orig-s_71)"
 " s_96))"
 "(let-values(((all-from-except55_1"
 " mod-path56_1"
@@ -69452,34 +69623,34 @@ static const char *startup_source =
 "(if(pair?"
 " s_488)"
 "(let-values(((mod-path61_0)"
-"(let-values(((s_742)"
+"(let-values(((s_758)"
 "(car"
 " s_488)))"
-" s_742))"
+" s_758))"
 "((id62_0)"
-"(let-values(((s_743)"
+"(let-values(((s_759)"
 "(cdr"
 " s_488)))"
-"(let-values(((s_744)"
+"(let-values(((s_760)"
 "(if(syntax?$1"
-" s_743)"
+" s_759)"
 "(syntax-e$1"
-" s_743)"
-" s_743)))"
-"(let-values(((flat-s_47)"
+" s_759)"
+" s_759)))"
+"(let-values(((flat-s_49)"
 "(to-syntax-list.1"
-" s_744)))"
+" s_760)))"
 "(if(not"
-" flat-s_47)"
+" flat-s_49)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                               \"bad syntax\""
-" orig-s_69))"
+" orig-s_71))"
 "(let-values()"
-"(let-values(((id_134)"
+"(let-values(((id_135)"
 "(let-values(((lst_43)"
-" flat-s_47))"
+" flat-s_49))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -69500,54 +69671,54 @@ static const char *startup_source =
 "((rest_18)"
 "(unsafe-cdr"
 " lst_44)))"
-"(let-values(((id_135)"
 "(let-values(((id_136)"
-" id_67))"
 "(let-values(((id_137)"
+" id_67))"
+"(let-values(((id_138)"
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
-"(if(let-values(((or-part_399)"
+"(if(let-values(((or-part_401)"
 "(if(syntax?$1"
 " s_491)"
 "(symbol?"
 "(syntax-e$1"
 " s_491))"
 " #f)))"
-"(if or-part_399"
-" or-part_399"
+"(if or-part_401"
+" or-part_401"
 "(symbol?"
 " s_491)))"
 " s_491"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                             \"not an identifier\""
-" orig-s_69"
+" orig-s_71"
 " s_491)))))"
 "(cons"
 " id63_0"
-" id_136)))))"
-"(values"
 " id_137)))))"
+"(values"
+" id_138)))))"
 "(if(not"
 " #f)"
 "(for-loop_58"
-" id_135"
+" id_136"
 " rest_18)"
-" id_135)))"
+" id_136)))"
 " id_67)))))"
 " for-loop_58)"
 " null"
 " lst_43)))))"
 "(reverse$1"
-" id_134)))))))))"
+" id_135)))))))))"
 "(values"
 " mod-path61_0"
 " id62_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_69))))))"
+" orig-s_71))))))"
 "(values"
 " all-from-except58_0"
 " mod-path59_0"
@@ -69555,7 +69726,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_69)))))"
+" orig-s_71)))))"
 "(values"
 " #t"
 " all-from-except55_1"
@@ -69564,7 +69735,7 @@ static const char *startup_source =
 "(begin"
 "(parse-all-from"
 " mod-path56_0"
-" orig-s_61"
+" orig-s_63"
 " self_30"
 " id57_0"
 " at-phase_13"
@@ -69588,11 +69759,11 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_66"
+"(let-values(((ok?_68"
 " all-defined64_0)"
 "(let-values(((s_216)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_70)"
+"(let-values(((orig-s_72)"
 " s_216))"
 "(let-values(((all-defined64_1)"
 "(let-values(((s_393)"
@@ -69609,28 +69780,28 @@ static const char *startup_source =
 " s_393)))"
 " s_108))"
 "(()"
-"(let-values(((s_745)"
+"(let-values(((s_761)"
 "(cdr"
 " s_393)))"
-"(let-values(((s_746)"
+"(let-values(((s_762)"
 "(if(syntax?$1"
-" s_745)"
+" s_761)"
 "(syntax-e$1"
-" s_745)"
-" s_745)))"
+" s_761)"
+" s_761)))"
 "(if(null?"
-" s_746)"
+" s_762)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_70))))))"
+" orig-s_72))))))"
 "(values"
 " all-defined65_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_70)))))"
+" orig-s_72)))))"
 "(values"
 " #t"
 " all-defined64_1))))))"
@@ -69638,7 +69809,7 @@ static const char *startup_source =
 "(parse-all-from-module"
 " self_30"
 " spec_0"
-" orig-s_61"
+" orig-s_63"
 " null"
 " #f"
 " at-phase_13"
@@ -69655,21 +69826,21 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_67"
+"(let-values(((ok?_69"
 " all-defined-except66_0"
 " id67_0)"
-"(let-values(((s_747)"
+"(let-values(((s_763)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_71)"
-" s_747))"
+"(let-values(((orig-s_73)"
+" s_763))"
 "(let-values(((all-defined-except66_1"
 " id67_1)"
 "(let-values(((s_218)"
 "(if(syntax?$1"
-" s_747)"
+" s_763)"
 "(syntax-e$1"
-" s_747)"
-" s_747)))"
+" s_763)"
+" s_763)))"
 "(if(pair?"
 " s_218)"
 "(let-values(((all-defined-except68_0)"
@@ -69687,43 +69858,43 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_219)"
 " s_219)))"
-"(let-values(((flat-s_48)"
+"(let-values(((flat-s_50)"
 "(to-syntax-list.1"
 " s_220)))"
 "(if(not"
-" flat-s_48)"
+" flat-s_50)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_71))"
+" orig-s_73))"
 "(let-values()"
-"(let-values(((id_138)"
-"(let-values(((lst_408)"
-" flat-s_48))"
+"(let-values(((id_139)"
+"(let-values(((lst_410)"
+" flat-s_50))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_408)))"
-"((letrec-values(((for-loop_324)"
-"(lambda(id_139"
-" lst_409)"
+" lst_410)))"
+"((letrec-values(((for-loop_317)"
+"(lambda(id_140"
+" lst_411)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_409)"
+" lst_411)"
 "(let-values(((s_119)"
 "(unsafe-car"
-" lst_409))"
-"((rest_236)"
+" lst_411))"
+"((rest_235)"
 "(unsafe-cdr"
-" lst_409)))"
-"(let-values(((id_140)"
+" lst_411)))"
 "(let-values(((id_141)"
-" id_139))"
+"(let-values(((id_142)"
+" id_140))"
 "(let-values(((id_29)"
 "(let-values()"
 "(let-values(((id70_0)"
@@ -69743,32 +69914,32 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                         \"not an identifier\""
-" orig-s_71"
+" orig-s_73"
 " s_119)))))"
 "(cons"
 " id70_0"
-" id_141)))))"
+" id_142)))))"
 "(values"
 " id_29)))))"
 "(if(not"
 " #f)"
-"(for-loop_324"
-" id_140"
-" rest_236)"
-" id_140)))"
-" id_139)))))"
-" for-loop_324)"
+"(for-loop_317"
+" id_141"
+" rest_235)"
+" id_141)))"
+" id_140)))))"
+" for-loop_317)"
 " null"
-" lst_408)))))"
+" lst_410)))))"
 "(reverse$1"
-" id_138)))))))))"
+" id_139)))))))))"
 "(values"
 " all-defined-except68_0"
 " id69_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_71)))))"
+" orig-s_73)))))"
 "(values"
 " #t"
 " all-defined-except66_1"
@@ -69777,7 +69948,7 @@ static const char *startup_source =
 "(parse-all-from-module"
 " self_30"
 " spec_0"
-" orig-s_61"
+" orig-s_63"
 " id67_0"
 " #f"
 " at-phase_13"
@@ -69797,91 +69968,91 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_68"
+"(let-values(((ok?_70"
 " prefix-all-defined71_0"
 " id:prefix72_0)"
-"(let-values(((s_748)"
+"(let-values(((s_764)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_72)"
-" s_748))"
+"(let-values(((orig-s_74)"
+" s_764))"
 "(let-values(((prefix-all-defined71_1"
 " id:prefix72_1)"
-"(let-values(((s_749)"
+"(let-values(((s_765)"
 "(if(syntax?$1"
-" s_748)"
+" s_764)"
 "(syntax-e$1"
-" s_748)"
-" s_748)))"
+" s_764)"
+" s_764)))"
 "(if(pair?"
-" s_749)"
+" s_765)"
 "(let-values(((prefix-all-defined73_0)"
-"(let-values(((s_750)"
+"(let-values(((s_766)"
 "(car"
-" s_749)))"
-" s_750))"
+" s_765)))"
+" s_766))"
 "((id:prefix74_0)"
-"(let-values(((s_751)"
+"(let-values(((s_767)"
 "(cdr"
-" s_749)))"
-"(let-values(((s_507)"
+" s_765)))"
+"(let-values(((s_768)"
 "(if(syntax?$1"
-" s_751)"
+" s_767)"
 "(syntax-e$1"
-" s_751)"
-" s_751)))"
+" s_767)"
+" s_767)))"
 "(if(pair?"
-" s_507)"
+" s_768)"
 "(let-values(((id:prefix75_0)"
-"(let-values(((s_508)"
+"(let-values(((s_507)"
 "(car"
-" s_507)))"
-"(if(let-values(((or-part_400)"
+" s_768)))"
+"(if(let-values(((or-part_402)"
 "(if(syntax?$1"
-" s_508)"
+" s_507)"
 "(symbol?"
 "(syntax-e$1"
-" s_508))"
+" s_507))"
 " #f)))"
-"(if or-part_400"
-" or-part_400"
+"(if or-part_402"
+" or-part_402"
 "(symbol?"
-" s_508)))"
-" s_508"
+" s_507)))"
+" s_507"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                         \"not an identifier\""
-" orig-s_72"
-" s_508))))"
+" orig-s_74"
+" s_507))))"
 "(()"
-"(let-values(((s_752)"
+"(let-values(((s_769)"
 "(cdr"
-" s_507)))"
+" s_768)))"
 "(let-values(((s_126)"
 "(if(syntax?$1"
-" s_752)"
+" s_769)"
 "(syntax-e$1"
-" s_752)"
-" s_752)))"
+" s_769)"
+" s_769)))"
 "(if(null?"
 " s_126)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_72))))))"
+" orig-s_74))))))"
 "(values"
 " id:prefix75_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_72))))))"
+" orig-s_74))))))"
 "(values"
 " prefix-all-defined73_0"
 " id:prefix74_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_72)))))"
+" orig-s_74)))))"
 "(values"
 " #t"
 " prefix-all-defined71_1"
@@ -69890,7 +70061,7 @@ static const char *startup_source =
 "(parse-all-from-module"
 " self_30"
 " spec_0"
-" orig-s_61"
+" orig-s_63"
 " null"
 "(syntax-e$1"
 " id:prefix72_0)"
@@ -69911,13 +70082,13 @@ static const char *startup_source =
 "(check-nested_1"
 " 'phaseless)"
 "(values))))"
-"(let-values(((ok?_69"
+"(let-values(((ok?_71"
 " prefix-all-defined-except76_0"
 " id:prefix77_0"
 " id78_0)"
 "(let-values(((s_231)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_73)"
+"(let-values(((orig-s_75)"
 " s_231))"
 "(let-values(((prefix-all-defined-except76_1"
 " id:prefix77_1"
@@ -69952,47 +70123,47 @@ static const char *startup_source =
 "(let-values(((s_340)"
 "(car"
 " s_337)))"
-"(if(let-values(((or-part_401)"
+"(if(let-values(((or-part_403)"
 "(if(syntax?$1"
 " s_340)"
 "(symbol?"
 "(syntax-e$1"
 " s_340))"
 " #f)))"
-"(if or-part_401"
-" or-part_401"
+"(if or-part_403"
+" or-part_403"
 "(symbol?"
 " s_340)))"
 " s_340"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
-" orig-s_73"
+" orig-s_75"
 " s_340))))"
 "((id83_0)"
 "(let-values(((s_342)"
 "(cdr"
 " s_337)))"
-"(let-values(((s_512)"
+"(let-values(((s_770)"
 "(if(syntax?$1"
 " s_342)"
 "(syntax-e$1"
 " s_342)"
 " s_342)))"
-"(let-values(((flat-s_49)"
+"(let-values(((flat-s_51)"
 "(to-syntax-list.1"
-" s_512)))"
+" s_770)))"
 "(if(not"
-" flat-s_49)"
+" flat-s_51)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_73))"
+" orig-s_75))"
 "(let-values()"
-"(let-values(((id_142)"
+"(let-values(((id_143)"
 "(let-values(((lst_4)"
-" flat-s_49))"
+" flat-s_51))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -70000,67 +70171,67 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_4)))"
-"((letrec-values(((for-loop_325)"
-"(lambda(id_143"
-" lst_410)"
+"((letrec-values(((for-loop_318)"
+"(lambda(id_144"
+" lst_412)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_410)"
-"(let-values(((s_513)"
+" lst_412)"
+"(let-values(((s_771)"
 "(unsafe-car"
-" lst_410))"
+" lst_412))"
 "((rest_191)"
 "(unsafe-cdr"
-" lst_410)))"
-"(let-values(((id_144)"
+" lst_412)))"
 "(let-values(((id_145)"
-" id_143))"
 "(let-values(((id_146)"
+" id_144))"
+"(let-values(((id_147)"
 "(let-values()"
 "(let-values(((id84_2)"
 "(let-values()"
 "(if(let-values(((or-part_290)"
 "(if(syntax?$1"
-" s_513)"
+" s_771)"
 "(symbol?"
 "(syntax-e$1"
-" s_513))"
+" s_771))"
 " #f)))"
 "(if or-part_290"
 " or-part_290"
 "(symbol?"
-" s_513)))"
-" s_513"
+" s_771)))"
+" s_771"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
-" orig-s_73"
-" s_513)))))"
+" orig-s_75"
+" s_771)))))"
 "(cons"
 " id84_2"
-" id_145)))))"
-"(values"
 " id_146)))))"
+"(values"
+" id_147)))))"
 "(if(not"
 " #f)"
-"(for-loop_325"
-" id_144"
+"(for-loop_318"
+" id_145"
 " rest_191)"
-" id_144)))"
-" id_143)))))"
-" for-loop_325)"
+" id_145)))"
+" id_144)))))"
+" for-loop_318)"
 " null"
 " lst_4)))))"
 "(reverse$1"
-" id_142)))))))))"
+" id_143)))))))))"
 "(values"
 " id:prefix82_0"
 " id83_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                         \"bad syntax\""
-" orig-s_73))))))"
+" orig-s_75))))))"
 "(values"
 " prefix-all-defined-except79_0"
 " id:prefix80_0"
@@ -70068,7 +70239,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_73)))))"
+" orig-s_75)))))"
 "(values"
 " #t"
 " prefix-all-defined-except76_1"
@@ -70078,7 +70249,7 @@ static const char *startup_source =
 "(parse-all-from-module"
 " self_30"
 " spec_0"
-" orig-s_61"
+" orig-s_63"
 " id78_0"
 "(syntax-e$1"
 " id:prefix77_0)"
@@ -70091,23 +70262,23 @@ static const char *startup_source =
 "(list"
 " spec_0))))))"
 "(let-values()"
-"(let-values(((ok?_70"
+"(let-values(((ok?_72"
 " expand85_0"
 " id86_0"
 " datum87_0)"
-"(let-values(((s_519)"
+"(let-values(((s_772)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_74)"
-" s_519))"
+"(let-values(((orig-s_76)"
+" s_772))"
 "(let-values(((expand85_1"
 " id86_1"
 " datum87_1)"
 "(let-values(((s_245)"
 "(if(syntax?$1"
-" s_519)"
+" s_772)"
 "(syntax-e$1"
-" s_519)"
-" s_519)))"
+" s_772)"
+" s_772)))"
 "(if(pair?"
 " s_245)"
 "(let-values(((expand88_0)"
@@ -70117,51 +70288,51 @@ static const char *startup_source =
 " s_246))"
 "((id89_1"
 " datum90_0)"
-"(let-values(((s_753)"
+"(let-values(((s_773)"
 "(cdr"
 " s_245)))"
 "(let-values(((s_247)"
 "(if(syntax?$1"
-" s_753)"
+" s_773)"
 "(syntax-e$1"
-" s_753)"
-" s_753)))"
+" s_773)"
+" s_773)))"
 "(if(pair?"
 " s_247)"
 "(let-values(((id91_0"
 " datum92_0)"
-"(let-values(((s_754)"
+"(let-values(((s_774)"
 "(car"
 " s_247)))"
 "(let-values(((s_249)"
 "(if(syntax?$1"
-" s_754)"
+" s_774)"
 "(syntax-e$1"
-" s_754)"
-" s_754)))"
+" s_774)"
+" s_774)))"
 "(if(pair?"
 " s_249)"
 "(let-values(((id93_1)"
-"(let-values(((s_523)"
+"(let-values(((s_520)"
 "(car"
 " s_249)))"
-"(if(let-values(((or-part_402)"
+"(if(let-values(((or-part_404)"
 "(if(syntax?$1"
-" s_523)"
+" s_520)"
 "(symbol?"
 "(syntax-e$1"
-" s_523))"
+" s_520))"
 " #f)))"
-"(if or-part_402"
-" or-part_402"
+"(if or-part_404"
+" or-part_404"
 "(symbol?"
-" s_523)))"
-" s_523"
+" s_520)))"
+" s_520"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                             \"not an identifier\""
-" orig-s_74"
-" s_523))))"
+" orig-s_76"
+" s_520))))"
 "((datum94_0)"
 "(let-values(((s_447)"
 "(cdr"
@@ -70173,7 +70344,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_74)))))"
+" orig-s_76)))))"
 "(()"
 "(let-values(((s_448)"
 "(cdr"
@@ -70190,14 +70361,14 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_74))))))"
+" orig-s_76))))))"
 "(values"
 " id91_0"
 " datum92_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                       \"bad syntax\""
-" orig-s_74))))))"
+" orig-s_76))))))"
 "(values"
 " expand88_0"
 " id89_1"
@@ -70205,18 +70376,18 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_74)))))"
+" orig-s_76)))))"
 "(values"
 " #t"
 " expand85_1"
 " id86_1"
 " datum87_1))))))"
-"(let-values(((ok?_71"
+"(let-values(((ok?_73"
 " expand95_0"
 " form96_0)"
 "(let-values(((s_361)"
 " disarmed-spec_0))"
-"(let-values(((orig-s_75)"
+"(let-values(((orig-s_77)"
 " s_361))"
 "(let-values(((expand95_1"
 " form96_1)"
@@ -70254,32 +70425,32 @@ static const char *startup_source =
 "(let-values(((s_372)"
 "(cdr"
 " s_369)))"
-"(let-values(((s_755)"
+"(let-values(((s_775)"
 "(if(syntax?$1"
 " s_372)"
 "(syntax-e$1"
 " s_372)"
 " s_372)))"
 "(if(null?"
-" s_755)"
+" s_775)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                             \"bad syntax\""
-" orig-s_75))))))"
+" orig-s_77))))))"
 "(values"
 " form99_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                         \"bad syntax\""
-" orig-s_75))))))"
+" orig-s_77))))))"
 "(values"
 " expand97_0"
 " form98_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_75)))))"
+" orig-s_77)))))"
 "(values"
 " #t"
 " expand95_1"
@@ -70425,60 +70596,60 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                                                                                                                                                                                         \"expansion was not a `begin' sequence\""
-" orig-s_61"
+" orig-s_63"
 " spec_0)))"
 "(values))))"
-"(let-values(((ok?_72"
+"(let-values(((ok?_74"
 " begin100_0"
 " spec101_0)"
-"(let-values(((s_756)"
+"(let-values(((s_776)"
 " exp-spec_0))"
-"(let-values(((orig-s_76)"
-" s_756))"
+"(let-values(((orig-s_78)"
+" s_776))"
 "(let-values(((begin100_1"
 " spec101_1)"
-"(let-values(((s_757)"
+"(let-values(((s_777)"
 "(if(syntax?$1"
-" s_756)"
+" s_776)"
 "(syntax-e$1"
-" s_756)"
-" s_756)))"
+" s_776)"
+" s_776)))"
 "(if(pair?"
-" s_757)"
+" s_777)"
 "(let-values(((begin102_0)"
 "(let-values(((s_377)"
 "(car"
-" s_757)))"
+" s_777)))"
 " s_377))"
 "((spec103_0)"
 "(let-values(((s_378)"
 "(cdr"
-" s_757)))"
+" s_777)))"
 "(let-values(((s_379)"
 "(if(syntax?$1"
 " s_378)"
 "(syntax-e$1"
 " s_378)"
 " s_378)))"
-"(let-values(((flat-s_50)"
+"(let-values(((flat-s_52)"
 "(to-syntax-list.1"
 " s_379)))"
 "(if(not"
-" flat-s_50)"
+" flat-s_52)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                   \"bad syntax\""
-" orig-s_76))"
+" orig-s_78))"
 "(let-values()"
-" flat-s_50)))))))"
+" flat-s_52)))))))"
 "(values"
 " begin102_0"
 " spec103_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                           \"bad syntax\""
-" orig-s_76)))))"
+" orig-s_78)))))"
 "(values"
 " #t"
 " begin100_1"
@@ -70510,7 +70681,7 @@ static const char *startup_source =
 "(for-loop_96"
 " track-stxes_2"
 " exp-specs_2"
-" rest_234)"
+" rest_233)"
 "(values"
 " track-stxes_2"
 " exp-specs_2))))"
@@ -70530,7 +70701,7 @@ static const char *startup_source =
 " 'raw)))))"
 "(define-values"
 "(parse-identifier!)"
-"(lambda(spec_1 orig-s_77 sym_101 at-phase_5 ns_126 rp_2 protected?_16)"
+"(lambda(spec_1 orig-s_79 sym_101 at-phase_5 ns_126 rp_2 protected?_16)"
 "(begin"
 "(let-values(((b_90)(resolve+shift/extra-inspector spec_1 at-phase_5 ns_126)))"
 "(let-values((()"
@@ -70541,7 +70712,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                             \"provided identifier is not defined or required\""
-" orig-s_77"
+" orig-s_79"
 " spec_1)))"
 "(values))))"
 "(let-values(((as-transformer?_6)(binding-for-transformer? b_90 spec_1 at-phase_5 ns_126)))"
@@ -70554,7 +70725,7 @@ static const char *startup_source =
 "((b112_0) b_90)"
 "((immed-b113_0) immed-b_0)"
 "((spec114_0) spec_1)"
-"((orig-s115_0) orig-s_77)"
+"((orig-s115_0) orig-s_79)"
 "((protected?116_0) protected?_16)"
 "((as-transformer?117_0) as-transformer?_6))"
 "(add-provide!109.1"
@@ -70569,7 +70740,7 @@ static const char *startup_source =
 " orig-s115_0)))))))))"
 "(define-values"
 "(parse-struct!)"
-"(lambda(id:struct_0 orig-s_78 fields_0 at-phase_14 ns_127 rp_3 protected?_17)"
+"(lambda(id:struct_0 orig-s_80 fields_0 at-phase_14 ns_127 rp_3 protected?_17)"
 "(begin"
 "(let-values(((mk_0)"
 "(lambda(fmt_1)"
@@ -70591,45 +70762,45 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_123)))"
-"((letrec-values(((for-loop_326)"
-"(lambda(lst_411)"
+"((letrec-values(((for-loop_319)"
+"(lambda(lst_413)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_411)"
-"(let-values(((fmt_3)(unsafe-car lst_411))((rest_237)(unsafe-cdr lst_411)))"
+"(if(pair? lst_413)"
+"(let-values(((fmt_3)(unsafe-car lst_413))((rest_236)(unsafe-cdr lst_413)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((id_147)(mk_0 fmt_3)))"
+"(let-values(((id_148)(mk_0 fmt_3)))"
 "(parse-identifier!"
-" id_147"
-" orig-s_78"
-"(syntax-e$1 id_147)"
+" id_148"
+" orig-s_80"
+"(syntax-e$1 id_148)"
 " at-phase_14"
 " ns_127"
 " rp_3"
 " protected?_17)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_326 rest_237)(values))))"
+"(if(not #f)(for-loop_319 rest_236)(values))))"
 "(values))))))"
-" for-loop_326)"
+" for-loop_319)"
 " lst_123)))"
 "(void)"
-"(let-values(((lst_360) fields_0))"
+"(let-values(((lst_414) fields_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_360)))"
-"((letrec-values(((for-loop_327)"
-"(lambda(lst_412)"
+"(let-values()(check-list lst_414)))"
+"((letrec-values(((for-loop_320)"
+"(lambda(lst_415)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_412)"
-"(let-values(((field_0)(unsafe-car lst_412))((rest_238)(unsafe-cdr lst_412)))"
+"(if(pair? lst_415)"
+"(let-values(((field_0)(unsafe-car lst_415))((rest_237)(unsafe-cdr lst_415)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70645,7 +70816,7 @@ static const char *startup_source =
 "(begin"
 "(parse-identifier!"
 " get-id_0"
-" orig-s_78"
+" orig-s_80"
 "(syntax-e$1 get-id_0)"
 " at-phase_14"
 " ns_127"
@@ -70653,7 +70824,7 @@ static const char *startup_source =
 " protected?_17)"
 "(parse-identifier!"
 " set-id_0"
-" orig-s_78"
+" orig-s_80"
 "(syntax-e$1 set-id_0)"
 " at-phase_14"
 " ns_127"
@@ -70661,14 +70832,14 @@ static const char *startup_source =
 " protected?_17)))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_327 rest_238)(values))))"
+"(if(not #f)(for-loop_320 rest_237)(values))))"
 "(values))))))"
-" for-loop_327)"
-" lst_360)))"
+" for-loop_320)"
+" lst_414)))"
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
-"(lambda(mod-path-stx_0 orig-s_79 self_31 except-ids_0 at-phase_15 ns_128 rp_4 protected?_18 ctx_107)"
+"(lambda(mod-path-stx_0 orig-s_81 self_31 except-ids_0 at-phase_15 ns_128 rp_4 protected?_18 ctx_107)"
 "(begin"
 "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
@@ -70676,13 +70847,13 @@ static const char *startup_source =
 "(if(1/module-path? mod-path_33)"
 "(void)"
 "(let-values()"
-"                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_79 mod-path-stx_0)))"
+"                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_81 mod-path-stx_0)))"
 "(values))))"
 "(let-values(((mpi_57)(module-path->mpi/context mod-path_33 ctx_107)))"
-"(parse-all-from-module mpi_57 #f orig-s_79 except-ids_0 #f at-phase_15 ns_128 rp_4 protected?_18)))))))"
+"(parse-all-from-module mpi_57 #f orig-s_81 except-ids_0 #f at-phase_15 ns_128 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
-"(lambda(mpi_58 matching-stx_0 orig-s_80 except-ids_1 prefix-sym_0 at-phase_16 ns_129 rp_5 protected?_19)"
+"(lambda(mpi_58 matching-stx_0 orig-s_82 except-ids_1 prefix-sym_0 at-phase_16 ns_129 rp_5 protected?_19)"
 "(begin"
 "(let-values(((requireds_2)(extract-module-requires rp_5 mpi_58 at-phase_16)))"
 "(let-values(((phase-desc_0)"
@@ -70702,7 +70873,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " provide-form-name"
 "                               (format \"cannot provide from a module without a matching require~a\" (phase-desc_0))"
-" orig-s_80"
+" orig-s_82"
 " matching-stx_0)))"
 "(values))))"
 "(let-values(((add-prefix_1)"
@@ -70717,43 +70888,43 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_239)))"
-"((letrec-values(((for-loop_328)"
-"(lambda(lst_413)"
+"((letrec-values(((for-loop_321)"
+"(lambda(lst_416)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_413)"
-"(let-values(((i_191)(unsafe-car lst_413))"
-"((rest_239)(unsafe-cdr lst_413)))"
+"(if(pair? lst_416)"
+"(let-values(((i_191)(unsafe-car lst_416))"
+"((rest_238)(unsafe-cdr lst_416)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((id_148)"
+"(let-values(((id_149)"
 "(required-id i_191)))"
 "(let-values(((phase_150)"
 "(required-phase"
 " i_191)))"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_405)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
 " phase_150"
 " at-phase_16)"
 "(free-identifier=?$1"
-" id_148"
+" id_149"
 "(datum->syntax$1"
 " matching-stx_0"
 "(syntax-e$1"
-" id_148))"
+" id_149))"
 " phase_150"
 " phase_150)"
 " #f))"
 " #f)))"
-"(if or-part_403"
-" or-part_403"
-"(let-values(((lst_414)"
+"(if or-part_405"
+" or-part_405"
+"(let-values(((lst_417)"
 " except-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70761,27 +70932,27 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_414)))"
-"((letrec-values(((for-loop_329)"
+" lst_417)))"
+"((letrec-values(((for-loop_322)"
 "(lambda(result_125"
-" lst_415)"
+" lst_418)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_415)"
+" lst_418)"
 "(let-values(((except-id_0)"
 "(unsafe-car"
-" lst_415))"
-"((rest_240)"
+" lst_418))"
+"((rest_239)"
 "(unsafe-cdr"
-" lst_415)))"
+" lst_418)))"
 "(let-values(((result_126)"
 "(let-values()"
 "(let-values(((result_127)"
 "(let-values()"
 "(let-values()"
 "(if(free-identifier=?$1"
-" id_148"
+" id_149"
 " except-id_0"
 " phase_150"
 " phase_150)"
@@ -70799,24 +70970,24 @@ static const char *startup_source =
 "(not"
 " #f)"
 " #f)"
-"(for-loop_329"
+"(for-loop_322"
 " result_126"
-" rest_240)"
+" rest_239)"
 " result_126)))"
 " result_125)))))"
-" for-loop_329)"
+" for-loop_322)"
 " #f"
-" lst_414)))))"
+" lst_417)))))"
 "(void)"
 "(let-values()"
 "(let-values(((b_91)"
 "(resolve+shift/extra-inspector"
-" id_148"
+" id_149"
 " phase_150"
 " ns_129)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
-" id_148)"
+" id_149)"
 "((phase131_0)"
 " phase_150)"
 "((temp132_0)"
@@ -70839,7 +71010,7 @@ static const char *startup_source =
 "((temp122_4)"
 "(add-prefix_1"
 "(syntax-e$1"
-" id_148)))"
+" id_149)))"
 "((phase123_0)"
 " phase_150)"
 "((b124_0)"
@@ -70847,9 +71018,9 @@ static const char *startup_source =
 "((immed-b125_0)"
 " immed-b_1)"
 "((id126_0)"
-" id_148)"
+" id_149)"
 "((orig-s127_0)"
-" orig-s_80)"
+" orig-s_82)"
 "((protected?128_0)"
 " protected?_19)"
 "((temp129_2)"
@@ -70867,9 +71038,9 @@ static const char *startup_source =
 " orig-s127_0)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_328 rest_239)(values))))"
+"(if(not #f)(for-loop_321 rest_238)(values))))"
 "(values))))))"
-" for-loop_328)"
+" for-loop_321)"
 " lst_239)))"
 "(void)"
 "(if(=(hash-count found_0)(length except-ids_1))"
@@ -70894,14 +71065,14 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(let-values(((or-part_404)"
+"(if(let-values(((or-part_406)"
 "(hash-ref"
 " found_0"
 " except-id_1"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
-"(let-values(((lst_416)"
+"(if or-part_406"
+" or-part_406"
+"(let-values(((lst_419)"
 " requireds_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70909,33 +71080,33 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_416)))"
+" lst_419)))"
 "((letrec-values(((for-loop_142)"
 "(lambda(result_128"
-" lst_417)"
+" lst_420)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_417)"
+" lst_420)"
 "(let-values(((i_192)"
 "(unsafe-car"
-" lst_417))"
-"((rest_241)"
+" lst_420))"
+"((rest_240)"
 "(unsafe-cdr"
-" lst_417)))"
+" lst_420)))"
 "(let-values(((result_129)"
 "(let-values()"
 "(let-values(((result_130)"
 "(let-values()"
 "(let-values()"
-"(let-values(((id_149)"
+"(let-values(((id_150)"
 "(required-id"
 " i_192)))"
 "(let-values(((phase_151)"
 "(required-phase"
 " i_192)))"
 "(free-identifier=?$1"
-" id_149"
+" id_150"
 " except-id_1"
 " phase_151"
 " phase_151)))))))"
@@ -70950,12 +71121,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_142"
 " result_129"
-" rest_241)"
+" rest_240)"
 " result_129)))"
 " result_128)))))"
 " for-loop_142)"
 " #f"
-" lst_416)))))"
+" lst_419)))))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -70965,7 +71136,7 @@ static const char *startup_source =
 "                                                                                                  \"excluded identifier was not defined or required in the module~a\""
 "                                                                                                  \"excluded identifier was not required from the specified module~a\")"
 "(phase-desc_0))"
-" orig-s_80"
+" orig-s_82"
 " except-id_1))))"
 "(values)))))"
 "(values)))))"
@@ -70983,12 +71154,12 @@ static const char *startup_source =
 "(begin"
 " 'check-body"
 "(begin"
-"(let-values(((lst_418) bodys_14))"
+"(let-values(((lst_421) bodys_14))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_418)))"
-"((letrec-values(((for-loop_330)"
+"(let-values()(check-list lst_421)))"
+"((letrec-values(((for-loop_323)"
 "(lambda(lst_86)"
 "(begin"
 " 'for-loop"
@@ -71036,10 +71207,10 @@ static const char *startup_source =
 " p_36))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_330 rest_40)(values))))"
+"(if(not #f)(for-loop_323 rest_40)(values))))"
 "(values))))))"
-" for-loop_330)"
-" lst_418)))"
+" for-loop_323)"
+" lst_421)))"
 "(void)))))"
 "((check-expr_0)"
 "(lambda(e_93 num-results_0 enclosing_15)"
@@ -71071,7 +71242,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_87)"
 "(let-values(((rand_0)(unsafe-car lst_87))"
-"((rest_242)(unsafe-cdr lst_87)))"
+"((rest_241)(unsafe-cdr lst_87)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71084,7 +71255,7 @@ static const char *startup_source =
 " e_93))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_81 rest_242)(values))))"
+"(if(not #f)(for-loop_81 rest_241)(values))))"
 "(values))))))"
 " for-loop_81)"
 " lst_80)))"
@@ -71128,12 +71299,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_269)))"
 "((letrec-values(((for-loop_241)"
-"(lambda(lst_419)"
+"(lambda(lst_422)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_419)"
-"(let-values(((clause_4)(unsafe-car lst_419))"
-"((rest_243)(unsafe-cdr lst_419)))"
+"(if(pair? lst_422)"
+"(let-values(((clause_5)(unsafe-car lst_422))"
+"((rest_242)(unsafe-cdr lst_422)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71141,10 +71312,10 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(check-body-no-disallowed-expr_0"
-"(cadr clause_4)))"
+"(cadr clause_5)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_241 rest_243)(values))))"
+"(if(not #f)(for-loop_241 rest_242)(values))))"
 "(values))))))"
 " for-loop_241)"
 " lst_269)))"
@@ -71226,7 +71397,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_91)"
-"(let-values(((clause_5)"
+"(let-values(((clause_6)"
 "(unsafe-car lst_91))"
 "((rest_150)"
 "(unsafe-cdr lst_91)))"
@@ -71238,7 +71409,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-no-disallowed-expr_0"
 "(cadr"
-" clause_5)))"
+" clause_6)))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
@@ -71263,7 +71434,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_83)))"
-"((letrec-values(((for-loop_331)"
+"((letrec-values(((for-loop_324)"
 "(lambda(lst_271)"
 "(begin"
 " 'for-loop"
@@ -71280,9 +71451,9 @@ static const char *startup_source =
 " e_95))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_331 rest_146)(values))))"
+"(if(not #f)(for-loop_324 rest_146)(values))))"
 "(values))))))"
-" for-loop_331)"
+" for-loop_324)"
 " lst_83)))"
 "(void))))))"
 "(check-body_0 bodys_13)))))"
@@ -71314,11 +71485,11 @@ static const char *startup_source =
 "(lambda(e_97)(begin(if(parsed-quote? e_97)(string?(parsed-quote-datum e_97)) #f))))"
 "(define-values"
 "(cross-phase-primitive-name)"
-"(lambda(id_150)"
+"(lambda(id_151)"
 "(begin"
-"(if(parsed-id? id_150)"
+"(if(parsed-id? id_151)"
 "(let-values()"
-"(let-values(((b_92)(parsed-id-binding id_150)))"
+"(let-values(((b_92)(parsed-id-binding id_151)))"
 "(if(module-binding? b_92)"
 "(if(eq? runtime-module-name(1/module-path-index-resolve(module-binding-module b_92)))"
 "(module-binding-sym b_92)"
@@ -71425,11 +71596,11 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%declare"
-"(lambda(s_726 ctx_111)"
+"(lambda(s_742 ctx_111)"
 "(begin"
 "(let-values(((obs_125)(expand-context-observer ctx_111)))"
 "(if obs_125(let-values()(let-values()(call-expand-observe obs_125 'prim-declare)))(void)))"
-"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_726)))))"
+"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_742)))))"
 "(define-values"
 "(expand-module18.1)"
 "(lambda(always-produce-compiled?1_0"
@@ -71479,9 +71650,9 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_24)(syntax-disarm$1 s_16)))"
-"(let-values(((ok?_73 module228_0 id:module-name229_0 initial-require230_0 body231_0)"
+"(let-values(((ok?_75 module228_0 id:module-name229_0 initial-require230_0 body231_0)"
 "(let-values(((s_498) disarmed-s_24))"
-"(let-values(((orig-s_81) s_498))"
+"(let-values(((orig-s_83) s_498))"
 "(let-values(((module228_1"
 " id:module-name229_1"
 " initial-require230_1"
@@ -71497,16 +71668,16 @@ static const char *startup_source =
 "((id:module-name233_0"
 " initial-require234_0"
 " body235_0)"
-"(let-values(((s_729)(cdr s_310)))"
-"(let-values(((s_758)"
-"(if(syntax?$1 s_729)"
-"(syntax-e$1 s_729)"
-" s_729)))"
-"(if(pair? s_758)"
+"(let-values(((s_745)(cdr s_310)))"
+"(let-values(((s_778)"
+"(if(syntax?$1 s_745)"
+"(syntax-e$1 s_745)"
+" s_745)))"
+"(if(pair? s_778)"
 "(let-values(((id:module-name236_0)"
 "(let-values(((s_484)"
 "(car"
-" s_758)))"
+" s_778)))"
 "(if(let-values(((or-part_379)"
 "(if(syntax?$1"
 " s_484)"
@@ -71522,13 +71693,13 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                           \"not an identifier\""
-" orig-s_81"
+" orig-s_83"
 " s_484))))"
 "((initial-require237_0"
 " body238_0)"
 "(let-values(((s_54)"
 "(cdr"
-" s_758)))"
+" s_778)))"
 "(let-values(((s_312)"
 "(if(syntax?$1"
 " s_54)"
@@ -71552,25 +71723,25 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_315)"
 " s_315)))"
-"(let-values(((flat-s_51)"
+"(let-values(((flat-s_53)"
 "(to-syntax-list.1"
 " s_316)))"
 "(if(not"
-" flat-s_51)"
+" flat-s_53)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                     \"bad syntax\""
-" orig-s_81))"
+" orig-s_83))"
 "(let-values()"
-" flat-s_51)))))))"
+" flat-s_53)))))))"
 "(values"
 " initial-require239_0"
 " body240_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                             \"bad syntax\""
-" orig-s_81))))))"
+" orig-s_83))))))"
 "(values"
 " id:module-name236_0"
 " initial-require237_0"
@@ -71578,13 +71749,13 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                         \"bad syntax\""
-" orig-s_81))))))"
+" orig-s_83))))))"
 "(values"
 " module232_0"
 " id:module-name233_0"
 " initial-require234_0"
 " body235_0))"
-"                                                                    (raise-syntax-error$1 #f \"bad syntax\" orig-s_81)))))"
+"                                                                    (raise-syntax-error$1 #f \"bad syntax\" orig-s_83)))))"
 "(values"
 " #t"
 " module228_1"
@@ -71725,13 +71896,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(let-values(((m-ns_18)"
-"(let-values(((temp266_2)"
+"(let-values(((temp266_1)"
 "(expand-context-namespace"
 " init-ctx_0)))"
 "(make-m-ns244_0"
 " #f"
 " #f"
-" temp266_2))))"
+" temp266_1))))"
 "(let-values(((ctx_112)"
 "(let-values(((v_102)"
 "(copy-root-expand-context"
@@ -71845,33 +72016,33 @@ static const char *startup_source =
 "(let-values(((scoped-s_0)"
 "(apply-module-scopes_0"
 " disarmed-s_24)))"
-"(let-values(((ok?_74"
-" _273_1"
+"(let-values(((ok?_76"
+" _273_0"
+" _274_0"
+" _275_0"
+" body276_0)"
+"(let-values(((s_779)"
+" scoped-s_0))"
+"(let-values(((orig-s_84)"
+" s_779))"
+"(let-values(((_273_1"
 " _274_1"
 " _275_1"
-" body276_0)"
-"(let-values(((s_759)"
-" scoped-s_0))"
-"(let-values(((orig-s_82)"
-" s_759))"
-"(let-values(((_273_2"
-" _274_2"
-" _275_2"
 " body276_1)"
 "(let-values(((s_406)"
 "(if(syntax?$1"
-" s_759)"
+" s_779)"
 "(syntax-e$1"
-" s_759)"
-" s_759)))"
+" s_779)"
+" s_779)))"
 "(if(pair?"
 " s_406)"
-"(let-values(((_277_1)"
-"(let-values(((s_739)"
+"(let-values(((_277_2)"
+"(let-values(((s_755)"
 "(car"
 " s_406)))"
-" s_739))"
-"((_278_0"
+" s_755))"
+"((_278_2"
 " _279_0"
 " body280_0)"
 "(let-values(((s_206)"
@@ -71885,22 +72056,22 @@ static const char *startup_source =
 " s_206)))"
 "(if(pair?"
 " s_392)"
-"(let-values(((_281_0)"
+"(let-values(((_281_1)"
 "(let-values(((s_209)"
 "(car"
 " s_392)))"
 " s_209))"
 "((_282_0"
 " body283_0)"
-"(let-values(((s_741)"
+"(let-values(((s_757)"
 "(cdr"
 " s_392)))"
 "(let-values(((s_93)"
 "(if(syntax?$1"
-" s_741)"
+" s_757)"
 "(syntax-e$1"
-" s_741)"
-" s_741)))"
+" s_757)"
+" s_757)))"
 "(if(pair?"
 " s_93)"
 "(let-values(((_284_0)"
@@ -71918,47 +72089,47 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_321)"
 " s_321)))"
-"(let-values(((flat-s_52)"
+"(let-values(((flat-s_54)"
 "(to-syntax-list.1"
 " s_322)))"
 "(if(not"
-" flat-s_52)"
+" flat-s_54)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_82))"
+" orig-s_84))"
 "(let-values()"
-" flat-s_52)))))))"
+" flat-s_54)))))))"
 "(values"
 " _284_0"
 " body285_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                         \"bad syntax\""
-" orig-s_82))))))"
+" orig-s_84))))))"
 "(values"
-" _281_0"
+" _281_1"
 " _282_0"
 " body283_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                     \"bad syntax\""
-" orig-s_82))))))"
+" orig-s_84))))))"
 "(values"
-" _277_1"
-" _278_0"
+" _277_2"
+" _278_2"
 " _279_0"
 " body280_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                 \"bad syntax\""
-" orig-s_82)))))"
+" orig-s_84)))))"
 "(values"
 " #t"
-" _273_2"
-" _274_2"
-" _275_2"
+" _273_1"
+" _274_1"
+" _275_1"
 " body276_1))))))"
 " body276_0))))"
 "(let-values(((requires+provides_6)"
@@ -72263,12 +72434,12 @@ static const char *startup_source =
 "(let-values(((disarmed-mb-s_0)"
 "(syntax-disarm$1"
 " added-s_2)))"
-"(let-values(((ok?_75"
+"(let-values(((ok?_77"
 " #%module-begin301_0"
 " body302_0)"
 "(let-values(((s_220)"
 " disarmed-mb-s_0))"
-"(let-values(((orig-s_83)"
+"(let-values(((orig-s_85)"
 " s_220))"
 "(let-values(((#%module-begin301_1"
 " body302_1)"
@@ -72289,31 +72460,31 @@ static const char *startup_source =
 "(let-values(((s_120)"
 "(cdr"
 " s_221)))"
-"(let-values(((s_760)"
+"(let-values(((s_780)"
 "(if(syntax?$1"
 " s_120)"
 "(syntax-e$1"
 " s_120)"
 " s_120)))"
-"(let-values(((flat-s_53)"
+"(let-values(((flat-s_55)"
 "(to-syntax-list.1"
-" s_760)))"
+" s_780)))"
 "(if(not"
-" flat-s_53)"
+" flat-s_55)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                  \"bad syntax\""
-" orig-s_83))"
+" orig-s_85))"
 "(let-values()"
-" flat-s_53)))))))"
+" flat-s_55)))))))"
 "(values"
 " #%module-begin303_0"
 " body304_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                          \"bad syntax\""
-" orig-s_83)))))"
+" orig-s_85)))))"
 "(values"
 " #t"
 " #%module-begin301_1"
@@ -72426,10 +72597,10 @@ static const char *startup_source =
 " phase_153)"
 "((module-ends345_0)"
 " module-ends_0)"
-"((temp346_0)"
+"((temp346_1)"
 " #f))"
 "(make-to-module-lift-context27.1"
-" temp346_0"
+" temp346_1"
 " module-ends345_0"
 " phase344_0))))"
 "(expand-context/inner2.1"
@@ -73240,17 +73411,17 @@ static const char *startup_source =
 "(check-list"
 " lst_144)))"
 "((letrec-values(((for-loop_140)"
-"(lambda(lst_420)"
+"(lambda(lst_423)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_420)"
+" lst_423)"
 "(let-values(((mpi_59)"
 "(unsafe-car"
-" lst_420))"
-"((rest_244)"
+" lst_423))"
+"((rest_243)"
 "(unsafe-cdr"
-" lst_420)))"
+" lst_423)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -73264,7 +73435,7 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_140"
-" rest_244)"
+" rest_243)"
 "(values))))"
 "(values))))))"
 " for-loop_140)"
@@ -73351,7 +73522,7 @@ static const char *startup_source =
 "(let-values(((ctx_115) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
 "(let-values(((phase_154) phase26_3))"
-"(let-values(((s_761) s27_2))"
+"(let-values(((s_781) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
@@ -73415,7 +73586,7 @@ static const char *startup_source =
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
 "(let-values(((temp434_0)(list partly-expanded-body_0))"
-"((s435_0) s_761)"
+"((s435_0) s_781)"
 "((scopes-s436_0) scopes-s_0)"
 "((phase437_0) phase_154)"
 "((module-name-sym438_0) module-name-sym_1)"
@@ -73432,20 +73603,20 @@ static const char *startup_source =
 " temp439_0)))))))))"
 "(let-values()"
 "(let-values(((bodys441_0) bodys_18)"
-"((s442_1) s_761)"
+"((s442_0) s_781)"
 "((scopes-s443_0) scopes-s_0)"
 "((phase444_0) phase_154)"
 "((module-name-sym445_0) module-name-sym_1)"
-"((temp446_1)(make-mb-ctx_0)))"
+"((temp446_0)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
 " #f"
 " #f"
 " bodys441_0"
-" s442_1"
+" s442_0"
 " scopes-s443_0"
 " phase444_0"
 " module-name-sym445_0"
-" temp446_1))))))"
+" temp446_0))))))"
 "(add-enclosing-name-property mb_1 module-name-sym_1)))))))))))))))"
 "(define-values"
 "(add-module-begin47.1)"
@@ -73504,10 +73675,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((partly-expanded-mb_0)"
 "(let-values()"
-"(let-values(((temp449_1)"
+"(let-values(((temp449_0)"
 "(add-enclosing-name-property mb_2 module-name-sym_2))"
 "((mb-ctx450_0) mb-ctx_1))"
-"(expand7.1 #f #f #f #f temp449_1 mb-ctx450_0)))))"
+"(expand7.1 #f #f #f #f temp449_0 mb-ctx450_0)))))"
 "(begin"
 "(if(eq?"
 " '#%module-begin"
@@ -73533,13 +73704,13 @@ static const char *startup_source =
 " enclosing-self_2"
 " enclosing-mod_2)"
 "(begin"
-"(lambda(s_762)"
+"(lambda(s_782)"
 "(let-values()"
 "(let-values(((s-without-enclosing_0)"
 "(if keep-enclosing-scope-at-phase_1"
-" s_762"
+" s_782"
 "(remove-use-site-scopes"
-"(remove-scopes s_762(root-expand-context-module-scopes init-ctx_1))"
+"(remove-scopes s_782(root-expand-context-module-scopes init-ctx_1))"
 " init-ctx_1))))"
 "(let-values(((s-with-edges_0)"
 "(add-scope(add-scope s-without-enclosing_0 outside-scope_2) inside-scope_1)))"
@@ -73727,61 +73898,61 @@ static const char *startup_source =
 " tmp_67"
 " 'begin)"
 "(let-values()"
-"(let-values(((ok?_76"
+"(let-values(((ok?_78"
 " begin460_0"
-" e461_0)"
-"(let-values(((s_763)"
-" disarmed-exp-body_1))"
-"(let-values(((orig-s_84)"
-" s_763))"
-"(let-values(((begin460_1"
 " e461_1)"
-"(let-values(((s_764)"
+"(let-values(((s_783)"
+" disarmed-exp-body_1))"
+"(let-values(((orig-s_86)"
+" s_783))"
+"(let-values(((begin460_1"
+" e461_2)"
+"(let-values(((s_784)"
 "(if(syntax?$1"
-" s_763)"
+" s_783)"
 "(syntax-e$1"
-" s_763)"
-" s_763)))"
+" s_783)"
+" s_783)))"
 "(if(pair?"
-" s_764)"
+" s_784)"
 "(let-values(((begin462_0)"
-"(let-values(((s_765)"
+"(let-values(((s_785)"
 "(car"
-" s_764)))"
-" s_765))"
+" s_784)))"
+" s_785))"
 "((e463_0)"
-"(let-values(((s_766)"
+"(let-values(((s_786)"
 "(cdr"
-" s_764)))"
-"(let-values(((s_767)"
+" s_784)))"
+"(let-values(((s_787)"
 "(if(syntax?$1"
-" s_766)"
+" s_786)"
 "(syntax-e$1"
-" s_766)"
-" s_766)))"
-"(let-values(((flat-s_54)"
+" s_786)"
+" s_786)))"
+"(let-values(((flat-s_56)"
 "(to-syntax-list.1"
-" s_767)))"
+" s_787)))"
 "(if(not"
-" flat-s_54)"
+" flat-s_56)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                     \"bad syntax\""
-" orig-s_84))"
+" orig-s_86))"
 "(let-values()"
-" flat-s_54)))))))"
+" flat-s_56)))))))"
 "(values"
 " begin462_0"
 " e463_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                             \"bad syntax\""
-" orig-s_84)))))"
+" orig-s_86)))))"
 "(values"
 " #t"
 " begin460_1"
-" e461_1))))))"
+" e461_2))))))"
 "(let-values(((track_1)"
 "(lambda(e_98)"
 "(begin"
@@ -73793,7 +73964,7 @@ static const char *startup_source =
 "(append"
 "(map2"
 " track_1"
-" e461_0)"
+" e461_1)"
 " rest-bodys_1)))"
 "(begin"
 "(let-values(((obs_138)"
@@ -73858,57 +74029,57 @@ static const char *startup_source =
 " 'phase-up)))"
 "(void)))"
 "(values))))"
-"(let-values(((ok?_77"
+"(let-values(((ok?_79"
 " begin-for-syntax464_0"
 " e465_0)"
-"(let-values(((s_768)"
+"(let-values(((s_788)"
 " disarmed-exp-body_1))"
-"(let-values(((orig-s_85)"
-" s_768))"
+"(let-values(((orig-s_87)"
+" s_788))"
 "(let-values(((begin-for-syntax464_1"
 " e465_1)"
-"(let-values(((s_769)"
+"(let-values(((s_789)"
 "(if(syntax?$1"
-" s_768)"
+" s_788)"
 "(syntax-e$1"
-" s_768)"
-" s_768)))"
+" s_788)"
+" s_788)))"
 "(if(pair?"
-" s_769)"
+" s_789)"
 "(let-values(((begin-for-syntax466_0)"
-"(let-values(((s_770)"
+"(let-values(((s_790)"
 "(car"
-" s_769)))"
-" s_770))"
+" s_789)))"
+" s_790))"
 "((e467_0)"
-"(let-values(((s_771)"
+"(let-values(((s_791)"
 "(cdr"
-" s_769)))"
-"(let-values(((s_772)"
+" s_789)))"
+"(let-values(((s_792)"
 "(if(syntax?$1"
-" s_771)"
+" s_791)"
 "(syntax-e$1"
-" s_771)"
-" s_771)))"
-"(let-values(((flat-s_55)"
+" s_791)"
+" s_791)))"
+"(let-values(((flat-s_57)"
 "(to-syntax-list.1"
-" s_772)))"
+" s_792)))"
 "(if(not"
-" flat-s_55)"
+" flat-s_57)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                               \"bad syntax\""
-" orig-s_85))"
+" orig-s_87))"
 "(let-values()"
-" flat-s_55)))))))"
+" flat-s_57)))))))"
 "(values"
 " begin-for-syntax466_0"
 " e467_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                       \"bad syntax\""
-" orig-s_85)))))"
+" orig-s_87)))))"
 "(values"
 " #t"
 " begin-for-syntax464_1"
@@ -73954,7 +74125,7 @@ static const char *startup_source =
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
-"(let-values(((lst_421)"
+"(let-values(((lst_424)"
 " nested-bodys_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -73962,42 +74133,42 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_421)))"
-"((letrec-values(((for-loop_332)"
-"(lambda(fold-var_386"
-" lst_422)"
+" lst_424)))"
+"((letrec-values(((for-loop_325)"
+"(lambda(fold-var_368"
+" lst_425)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_422)"
+" lst_425)"
 "(let-values(((nested-body_0)"
 "(unsafe-car"
-" lst_422))"
-"((rest_245)"
+" lst_425))"
+"((rest_244)"
 "(unsafe-cdr"
-" lst_422)))"
-"(let-values(((fold-var_387)"
-"(let-values(((fold-var_388)"
-" fold-var_386))"
-"(let-values(((fold-var_389)"
+" lst_425)))"
+"(let-values(((fold-var_381)"
+"(let-values(((fold-var_382)"
+" fold-var_368))"
+"(let-values(((fold-var_383)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(extract-syntax"
 " nested-body_0))"
-" fold-var_388))))"
+" fold-var_382))))"
 "(values"
-" fold-var_389)))))"
+" fold-var_383)))))"
 "(if(not"
 " #f)"
-"(for-loop_332"
-" fold-var_387"
-" rest_245)"
-" fold-var_387)))"
-" fold-var_386)))))"
-" for-loop_332)"
+"(for-loop_325"
+" fold-var_381"
+" rest_244)"
+" fold-var_381)))"
+" fold-var_368)))))"
+" for-loop_325)"
 " null"
-" lst_421))))))"
+" lst_424))))))"
 "(datum->syntax$1"
 " #f"
 "(cons"
@@ -74034,175 +74205,175 @@ static const char *startup_source =
 " 'prim-define-values))))"
 "(void)))"
 "(values))))"
-"(let-values(((ok?_78"
+"(let-values(((ok?_80"
 " define-values468_0"
 " id469_0"
 " rhs470_0)"
-"(let-values(((s_773)"
+"(let-values(((s_793)"
 " disarmed-exp-body_1))"
-"(let-values(((orig-s_86)"
-" s_773))"
+"(let-values(((orig-s_88)"
+" s_793))"
 "(let-values(((define-values468_1"
 " id469_1"
 " rhs470_1)"
-"(let-values(((s_774)"
+"(let-values(((s_794)"
 "(if(syntax?$1"
-" s_773)"
+" s_793)"
 "(syntax-e$1"
-" s_773)"
-" s_773)))"
+" s_793)"
+" s_793)))"
 "(if(pair?"
-" s_774)"
+" s_794)"
 "(let-values(((define-values471_0)"
-"(let-values(((s_775)"
+"(let-values(((s_795)"
 "(car"
-" s_774)))"
-" s_775))"
+" s_794)))"
+" s_795))"
 "((id472_0"
 " rhs473_0)"
 "(let-values(((s_193)"
 "(cdr"
-" s_774)))"
-"(let-values(((s_776)"
+" s_794)))"
+"(let-values(((s_796)"
 "(if(syntax?$1"
 " s_193)"
 "(syntax-e$1"
 " s_193)"
 " s_193)))"
 "(if(pair?"
-" s_776)"
+" s_796)"
 "(let-values(((id474_0)"
-"(let-values(((s_777)"
+"(let-values(((s_797)"
 "(car"
-" s_776)))"
-"(let-values(((s_778)"
+" s_796)))"
+"(let-values(((s_798)"
 "(if(syntax?$1"
-" s_777)"
+" s_797)"
 "(syntax-e$1"
-" s_777)"
-" s_777)))"
-"(let-values(((flat-s_56)"
+" s_797)"
+" s_797)))"
+"(let-values(((flat-s_58)"
 "(to-syntax-list.1"
-" s_778)))"
+" s_798)))"
 "(if(not"
-" flat-s_56)"
+" flat-s_58)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                               \"bad syntax\""
-" orig-s_86))"
+" orig-s_88))"
 "(let-values()"
-"(let-values(((id_151)"
-"(let-values(((lst_423)"
-" flat-s_56))"
+"(let-values(((id_152)"
+"(let-values(((lst_426)"
+" flat-s_58))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_423)))"
-"((letrec-values(((for-loop_333)"
-"(lambda(id_152"
-" lst_424)"
+" lst_426)))"
+"((letrec-values(((for-loop_326)"
+"(lambda(id_153"
+" lst_427)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_424)"
-"(let-values(((s_779)"
+" lst_427)"
+"(let-values(((s_799)"
 "(unsafe-car"
-" lst_424))"
-"((rest_246)"
+" lst_427))"
+"((rest_245)"
 "(unsafe-cdr"
-" lst_424)))"
-"(let-values(((id_153)"
+" lst_427)))"
 "(let-values(((id_154)"
-" id_152))"
 "(let-values(((id_155)"
+" id_153))"
+"(let-values(((id_156)"
 "(let-values()"
 "(let-values(((id484_0)"
 "(let-values()"
-"(if(let-values(((or-part_405)"
+"(if(let-values(((or-part_407)"
 "(if(syntax?$1"
-" s_779)"
+" s_799)"
 "(symbol?"
 "(syntax-e$1"
-" s_779))"
+" s_799))"
 " #f)))"
-"(if or-part_405"
-" or-part_405"
+"(if or-part_407"
+" or-part_407"
 "(symbol?"
-" s_779)))"
-" s_779"
+" s_799)))"
+" s_799"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                             \"not an identifier\""
-" orig-s_86"
-" s_779)))))"
+" orig-s_88"
+" s_799)))))"
 "(cons"
 " id484_0"
-" id_154)))))"
-"(values"
 " id_155)))))"
+"(values"
+" id_156)))))"
 "(if(not"
 " #f)"
-"(for-loop_333"
-" id_153"
-" rest_246)"
-" id_153)))"
-" id_152)))))"
-" for-loop_333)"
+"(for-loop_326"
+" id_154"
+" rest_245)"
+" id_154)))"
+" id_153)))))"
+" for-loop_326)"
 " null"
-" lst_423)))))"
+" lst_426)))))"
 "(reverse$1"
-" id_151))))))))"
+" id_152))))))))"
 "((rhs475_0)"
-"(let-values(((s_780)"
+"(let-values(((s_800)"
 "(cdr"
-" s_776)))"
-"(let-values(((s_781)"
+" s_796)))"
+"(let-values(((s_801)"
 "(if(syntax?$1"
-" s_780)"
+" s_800)"
 "(syntax-e$1"
-" s_780)"
-" s_780)))"
+" s_800)"
+" s_800)))"
 "(if(pair?"
-" s_781)"
+" s_801)"
 "(let-values(((rhs476_0)"
-"(let-values(((s_782)"
+"(let-values(((s_802)"
 "(car"
-" s_781)))"
-" s_782))"
+" s_801)))"
+" s_802))"
 "(()"
-"(let-values(((s_783)"
+"(let-values(((s_803)"
 "(cdr"
-" s_781)))"
-"(let-values(((s_784)"
+" s_801)))"
+"(let-values(((s_804)"
 "(if(syntax?$1"
-" s_783)"
+" s_803)"
 "(syntax-e$1"
-" s_783)"
-" s_783)))"
+" s_803)"
+" s_803)))"
 "(if(null?"
-" s_784)"
+" s_804)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                               \"bad syntax\""
-" orig-s_86))))))"
+" orig-s_88))))))"
 "(values"
 " rhs476_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                           \"bad syntax\""
-" orig-s_86))))))"
+" orig-s_88))))))"
 "(values"
 " id474_0"
 " rhs475_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                       \"bad syntax\""
-" orig-s_86))))))"
+" orig-s_88))))))"
 "(values"
 " define-values471_0"
 " id472_0"
@@ -74210,7 +74381,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                   \"bad syntax\""
-" orig-s_86)))))"
+" orig-s_88)))))"
 "(values"
 " #t"
 " define-values468_1"
@@ -74359,175 +74530,175 @@ static const char *startup_source =
 " 'phase-up)))"
 "(void)))"
 "(values))))"
-"(let-values(((ok?_79"
+"(let-values(((ok?_81"
 " define-syntaxes493_0"
 " id494_0"
 " rhs495_0)"
-"(let-values(((s_785)"
+"(let-values(((s_805)"
 " disarmed-exp-body_1))"
-"(let-values(((orig-s_87)"
-" s_785))"
+"(let-values(((orig-s_89)"
+" s_805))"
 "(let-values(((define-syntaxes493_1"
 " id494_1"
 " rhs495_1)"
-"(let-values(((s_786)"
+"(let-values(((s_806)"
 "(if(syntax?$1"
-" s_785)"
+" s_805)"
 "(syntax-e$1"
-" s_785)"
-" s_785)))"
+" s_805)"
+" s_805)))"
 "(if(pair?"
-" s_786)"
+" s_806)"
 "(let-values(((define-syntaxes496_0)"
-"(let-values(((s_787)"
+"(let-values(((s_807)"
 "(car"
-" s_786)))"
-" s_787))"
+" s_806)))"
+" s_807))"
 "((id497_0"
 " rhs498_0)"
-"(let-values(((s_788)"
+"(let-values(((s_808)"
 "(cdr"
-" s_786)))"
-"(let-values(((s_535)"
+" s_806)))"
+"(let-values(((s_809)"
 "(if(syntax?$1"
-" s_788)"
+" s_808)"
 "(syntax-e$1"
-" s_788)"
-" s_788)))"
+" s_808)"
+" s_808)))"
 "(if(pair?"
-" s_535)"
+" s_809)"
 "(let-values(((id499_0)"
-"(let-values(((s_789)"
+"(let-values(((s_810)"
 "(car"
-" s_535)))"
-"(let-values(((s_536)"
+" s_809)))"
+"(let-values(((s_811)"
 "(if(syntax?$1"
-" s_789)"
+" s_810)"
 "(syntax-e$1"
-" s_789)"
-" s_789)))"
-"(let-values(((flat-s_57)"
+" s_810)"
+" s_810)))"
+"(let-values(((flat-s_59)"
 "(to-syntax-list.1"
-" s_536)))"
+" s_811)))"
 "(if(not"
-" flat-s_57)"
+" flat-s_59)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_87))"
+" orig-s_89))"
 "(let-values()"
-"(let-values(((id_156)"
-"(let-values(((lst_425)"
-" flat-s_57))"
+"(let-values(((id_157)"
+"(let-values(((lst_428)"
+" flat-s_59))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_425)))"
-"((letrec-values(((for-loop_334)"
-"(lambda(id_157"
-" lst_426)"
+" lst_428)))"
+"((letrec-values(((for-loop_327)"
+"(lambda(id_158"
+" lst_429)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_426)"
-"(let-values(((s_539)"
+" lst_429)"
+"(let-values(((s_812)"
 "(unsafe-car"
-" lst_426))"
-"((rest_247)"
+" lst_429))"
+"((rest_246)"
 "(unsafe-cdr"
-" lst_426)))"
-"(let-values(((id_158)"
+" lst_429)))"
 "(let-values(((id_159)"
-" id_157))"
 "(let-values(((id_160)"
+" id_158))"
+"(let-values(((id_161)"
 "(let-values()"
 "(let-values(((id509_0)"
 "(let-values()"
-"(if(let-values(((or-part_406)"
+"(if(let-values(((or-part_408)"
 "(if(syntax?$1"
-" s_539)"
+" s_812)"
 "(symbol?"
 "(syntax-e$1"
-" s_539))"
+" s_812))"
 " #f)))"
-"(if or-part_406"
-" or-part_406"
+"(if or-part_408"
+" or-part_408"
 "(symbol?"
-" s_539)))"
-" s_539"
+" s_812)))"
+" s_812"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                   \"not an identifier\""
-" orig-s_87"
-" s_539)))))"
+" orig-s_89"
+" s_812)))))"
 "(cons"
 " id509_0"
-" id_159)))))"
-"(values"
 " id_160)))))"
+"(values"
+" id_161)))))"
 "(if(not"
 " #f)"
-"(for-loop_334"
-" id_158"
-" rest_247)"
-" id_158)))"
-" id_157)))))"
-" for-loop_334)"
+"(for-loop_327"
+" id_159"
+" rest_246)"
+" id_159)))"
+" id_158)))))"
+" for-loop_327)"
 " null"
-" lst_425)))))"
+" lst_428)))))"
 "(reverse$1"
-" id_156))))))))"
+" id_157))))))))"
 "((rhs500_0)"
-"(let-values(((s_790)"
+"(let-values(((s_813)"
 "(cdr"
-" s_535)))"
-"(let-values(((s_791)"
+" s_809)))"
+"(let-values(((s_814)"
 "(if(syntax?$1"
-" s_790)"
+" s_813)"
 "(syntax-e$1"
-" s_790)"
-" s_790)))"
+" s_813)"
+" s_813)))"
 "(if(pair?"
-" s_791)"
+" s_814)"
 "(let-values(((rhs501_0)"
-"(let-values(((s_792)"
+"(let-values(((s_815)"
 "(car"
-" s_791)))"
-" s_792))"
+" s_814)))"
+" s_815))"
 "(()"
-"(let-values(((s_793)"
+"(let-values(((s_816)"
 "(cdr"
-" s_791)))"
-"(let-values(((s_794)"
+" s_814)))"
+"(let-values(((s_817)"
 "(if(syntax?$1"
-" s_793)"
+" s_816)"
 "(syntax-e$1"
-" s_793)"
-" s_793)))"
+" s_816)"
+" s_816)))"
 "(if(null?"
-" s_794)"
+" s_817)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                     \"bad syntax\""
-" orig-s_87))))))"
+" orig-s_89))))))"
 "(values"
 " rhs501_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
-" orig-s_87))))))"
+" orig-s_89))))))"
 "(values"
 " id499_0"
 " rhs500_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                             \"bad syntax\""
-" orig-s_87))))))"
+" orig-s_89))))))"
 "(values"
 " define-syntaxes496_0"
 " id497_0"
@@ -74535,7 +74706,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                         \"bad syntax\""
-" orig-s_87)))))"
+" orig-s_89)))))"
 "(values"
 " #t"
 " define-syntaxes493_1"
@@ -74742,11 +74913,11 @@ static const char *startup_source =
 " temp521_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_427)"
+"(let-values(((lst_430)"
 " syms_25)"
-"((lst_428)"
+"((lst_431)"
 " vals_10)"
-"((lst_429)"
+"((lst_432)"
 " ids_44))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74754,51 +74925,51 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_427)))"
+" lst_430)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_428)))"
+" lst_431)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_429)))"
-"((letrec-values(((for-loop_335)"
-"(lambda(lst_430"
-" lst_431"
-" lst_432)"
+" lst_432)))"
+"((letrec-values(((for-loop_328)"
+"(lambda(lst_433"
+" lst_434"
+" lst_435)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_430)"
+" lst_433)"
 "(if(pair?"
-" lst_431)"
+" lst_434)"
 "(pair?"
-" lst_432)"
+" lst_435)"
 " #f)"
 " #f)"
 "(let-values(((sym_104)"
 "(unsafe-car"
-" lst_430))"
-"((rest_248)"
+" lst_433))"
+"((rest_247)"
 "(unsafe-cdr"
-" lst_430))"
+" lst_433))"
 "((val_88)"
 "(unsafe-car"
-" lst_431))"
+" lst_434))"
+"((rest_248)"
+"(unsafe-cdr"
+" lst_434))"
+"((id_162)"
+"(unsafe-car"
+" lst_435))"
 "((rest_249)"
 "(unsafe-cdr"
-" lst_431))"
-"((id_161)"
-"(unsafe-car"
-" lst_432))"
-"((rest_233)"
-"(unsafe-cdr"
-" lst_432)))"
+" lst_435)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -74808,7 +74979,7 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_88"
-" id_161"
+" id_162"
 " phase_156"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
@@ -74820,16 +74991,16 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_335"
+"(for-loop_328"
+" rest_247"
 " rest_248"
-" rest_249"
-" rest_233)"
+" rest_249)"
 "(values))))"
 "(values))))))"
-" for-loop_335)"
-" lst_427"
-" lst_428"
-" lst_429)))"
+" for-loop_328)"
+" lst_430"
+" lst_431"
+" lst_432)))"
 "(values))))"
 "(let-values()"
 "(let-values((()"
@@ -74905,57 +75076,57 @@ static const char *startup_source =
 "(remove-use-site-scopes"
 " disarmed-exp-body_1"
 " partial-body-ctx_1)))"
-"(let-values(((ok?_80"
+"(let-values(((ok?_82"
 " #%require530_0"
 " req531_0)"
-"(let-values(((s_795)"
+"(let-values(((s_548)"
 " ready-body_0))"
-"(let-values(((orig-s_88)"
-" s_795))"
+"(let-values(((orig-s_90)"
+" s_548))"
 "(let-values(((#%require530_1"
 " req531_1)"
-"(let-values(((s_796)"
+"(let-values(((s_818)"
 "(if(syntax?$1"
-" s_795)"
+" s_548)"
 "(syntax-e$1"
-" s_795)"
-" s_795)))"
+" s_548)"
+" s_548)))"
 "(if(pair?"
-" s_796)"
+" s_818)"
 "(let-values(((#%require532_0)"
-"(let-values(((s_797)"
+"(let-values(((s_819)"
 "(car"
-" s_796)))"
-" s_797))"
+" s_818)))"
+" s_819))"
 "((req533_0)"
-"(let-values(((s_798)"
+"(let-values(((s_820)"
 "(cdr"
-" s_796)))"
-"(let-values(((s_799)"
+" s_818)))"
+"(let-values(((s_821)"
 "(if(syntax?$1"
-" s_798)"
+" s_820)"
 "(syntax-e$1"
-" s_798)"
-" s_798)))"
-"(let-values(((flat-s_58)"
+" s_820)"
+" s_820)))"
+"(let-values(((flat-s_60)"
 "(to-syntax-list.1"
-" s_799)))"
+" s_821)))"
 "(if(not"
-" flat-s_58)"
+" flat-s_60)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                 \"bad syntax\""
-" orig-s_88))"
+" orig-s_90))"
 "(let-values()"
-" flat-s_58)))))))"
+" flat-s_60)))))))"
 "(values"
 " #%require532_0"
 " req533_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                         \"bad syntax\""
-" orig-s_88)))))"
+" orig-s_90)))))"
 "(values"
 " #t"
 " #%require530_1"
@@ -75109,64 +75280,64 @@ static const char *startup_source =
 " tmp_67"
 " '#%declare)"
 "(let-values()"
-"(let-values(((ok?_81"
+"(let-values(((ok?_83"
 " #%declare551_0"
 " kw552_0)"
-"(let-values(((s_800)"
+"(let-values(((s_822)"
 " disarmed-exp-body_1))"
-"(let-values(((orig-s_89)"
-" s_800))"
+"(let-values(((orig-s_91)"
+" s_822))"
 "(let-values(((#%declare551_1"
 " kw552_1)"
-"(let-values(((s_801)"
+"(let-values(((s_823)"
 "(if(syntax?$1"
-" s_800)"
+" s_822)"
 "(syntax-e$1"
-" s_800)"
-" s_800)))"
+" s_822)"
+" s_822)))"
 "(if(pair?"
-" s_801)"
+" s_823)"
 "(let-values(((#%declare553_0)"
-"(let-values(((s_802)"
+"(let-values(((s_824)"
 "(car"
-" s_801)))"
-" s_802))"
+" s_823)))"
+" s_824))"
 "((kw554_0)"
-"(let-values(((s_555)"
+"(let-values(((s_825)"
 "(cdr"
-" s_801)))"
-"(let-values(((s_556)"
+" s_823)))"
+"(let-values(((s_826)"
 "(if(syntax?$1"
-" s_555)"
+" s_825)"
 "(syntax-e$1"
-" s_555)"
-" s_555)))"
-"(let-values(((flat-s_59)"
+" s_825)"
+" s_825)))"
+"(let-values(((flat-s_61)"
 "(to-syntax-list.1"
-" s_556)))"
+" s_826)))"
 "(if(not"
-" flat-s_59)"
+" flat-s_61)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                     \"bad syntax\""
-" orig-s_89))"
+" orig-s_91))"
 "(let-values()"
-" flat-s_59)))))))"
+" flat-s_61)))))))"
 "(values"
 " #%declare553_0"
 " kw554_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                             \"bad syntax\""
-" orig-s_89)))))"
+" orig-s_91)))))"
 "(values"
 " #t"
 " #%declare551_1"
 " kw552_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_433)"
+"(let-values(((lst_436)"
 " kw552_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -75174,19 +75345,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_433)))"
-"((letrec-values(((for-loop_336)"
-"(lambda(lst_434)"
+" lst_436)))"
+"((letrec-values(((for-loop_329)"
+"(lambda(lst_437)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_434)"
+" lst_437)"
 "(let-values(((kw_1)"
 "(unsafe-car"
-" lst_434))"
+" lst_437))"
 "((rest_250)"
 "(unsafe-cdr"
-" lst_434)))"
+" lst_437)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75237,12 +75408,12 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_336"
+"(for-loop_329"
 " rest_250)"
 "(values))))"
 "(values))))))"
-" for-loop_336)"
-" lst_433)))"
+" for-loop_329)"
+" lst_436)))"
 "(values))))"
 "(let-values()"
 "(let-values(((parsed-body_1)"
@@ -75289,37 +75460,37 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_35 frame-id_18 inside-scope_2 all-scopes-stx_6 defined-syms_12 requires+provides_8)"
 "(begin"
-"(lambda(ids_45 rhs_24 phase_157)"
+"(lambda(ids_45 rhs_22 phase_157)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
-"(let-values(((lst_435) ids_45))"
+"(let-values(((lst_438) ids_45))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_435)))"
-"((letrec-values(((for-loop_337)"
-"(lambda(fold-var_390 lst_436)"
+"(let-values()(check-list lst_438)))"
+"((letrec-values(((for-loop_330)"
+"(lambda(fold-var_384 lst_439)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_436)"
-"(let-values(((id_162)(unsafe-car lst_436))"
-"((rest_251)(unsafe-cdr lst_436)))"
-"(let-values(((fold-var_391)"
-"(let-values(((fold-var_392) fold-var_390))"
-"(let-values(((fold-var_393)"
+"(if(pair? lst_439)"
+"(let-values(((id_163)(unsafe-car lst_439))"
+"((rest_251)(unsafe-cdr lst_439)))"
+"(let-values(((fold-var_385)"
+"(let-values(((fold-var_386) fold-var_384))"
+"(let-values(((fold-var_387)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_162"
+" id_163"
 " inside-scope_2))"
-" fold-var_392))))"
-"(values fold-var_393)))))"
-"(if(not #f)(for-loop_337 fold-var_391 rest_251) fold-var_391)))"
-" fold-var_390)))))"
-" for-loop_337)"
+" fold-var_386))))"
+"(values fold-var_387)))))"
+"(if(not #f)(for-loop_330 fold-var_385 rest_251) fold-var_385)))"
+" fold-var_384)))))"
+" for-loop_330)"
 " null"
-" lst_435))))))"
+" lst_438))))))"
 "(let-values(((syms_26)"
 "(let-values(((scoped-ids555_0) scoped-ids_0)"
 "((defined-syms556_0) defined-syms_12)"
@@ -75343,16 +75514,16 @@ static const char *startup_source =
 " self557_0"
 " phase558_0"
 " all-scopes-stx559_0))))"
-"(let-values(((s_803)"
+"(let-values(((s_570)"
 "(add-scope"
 "(datum->syntax$1"
 " #f"
 "(list"
 "(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_157) 'define-values)"
 " scoped-ids_0"
-" rhs_24))"
+" rhs_22))"
 " inside-scope_2)))"
-"(values scoped-ids_0(semi-parsed-define-values2.1 s_803 syms_26 scoped-ids_0 rhs_24)))))))))"
+"(values scoped-ids_0(semi-parsed-define-values2.1 s_570 syms_26 scoped-ids_0 rhs_22)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
 "(lambda(bodys_23 ctx_116)"
@@ -75360,28 +75531,28 @@ static const char *startup_source =
 "(let-values(((sc_39)(root-expand-context-post-expansion-scope ctx_116)))"
 "(if sc_39"
 "(reverse$1"
-"(let-values(((lst_437) bodys_23))"
+"(let-values(((lst_440) bodys_23))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_437)))"
-"((letrec-values(((for-loop_338)"
-"(lambda(fold-var_394 lst_438)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_440)))"
+"((letrec-values(((for-loop_331)"
+"(lambda(fold-var_388 lst_441)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_438)"
-"(let-values(((body_23)(unsafe-car lst_438))((rest_252)(unsafe-cdr lst_438)))"
-"(let-values(((fold-var_395)"
-"(let-values(((fold-var_396) fold-var_394))"
-"(let-values(((fold-var_397)"
+"(if(pair? lst_441)"
+"(let-values(((body_23)(unsafe-car lst_441))((rest_252)(unsafe-cdr lst_441)))"
+"(let-values(((fold-var_389)"
+"(let-values(((fold-var_390) fold-var_388))"
+"(let-values(((fold-var_391)"
 "(let-values()"
 "(cons"
 "(let-values()(add-scope body_23 sc_39))"
-" fold-var_396))))"
-"(values fold-var_397)))))"
-"(if(not #f)(for-loop_338 fold-var_395 rest_252) fold-var_395)))"
-" fold-var_394)))))"
-" for-loop_338)"
+" fold-var_390))))"
+"(values fold-var_391)))))"
+"(if(not #f)(for-loop_331 fold-var_389 rest_252) fold-var_389)))"
+" fold-var_388)))))"
+" for-loop_331)"
 " null"
-" lst_437))))"
+" lst_440))))"
 " bodys_23)))))"
 "(define-values"
 "(finish-expanding-body-expressons99.1)"
@@ -75464,14 +75635,14 @@ static const char *startup_source =
 "(let-values(((body_24)(car bodys_24)))"
 "(let-values(((rest-bodys_2)(cdr bodys_24)))"
 "(let-values(((exp-body_8)"
-"(if(let-values(((or-part_407)"
+"(if(let-values(((or-part_409)"
 "(parsed? body_24)))"
-"(if or-part_407"
-" or-part_407"
-"(let-values(((or-part_408)"
+"(if or-part_409"
+" or-part_409"
+"(let-values(((or-part_410)"
 "(expanded+parsed? body_24)))"
-"(if or-part_408"
-" or-part_408"
+"(if or-part_410"
+" or-part_410"
 "(semi-parsed-begin-for-syntax?"
 " body_24)))))"
 "(let-values() body_24)"
@@ -75488,104 +75659,104 @@ static const char *startup_source =
 "(let-values(((syms_27)"
 "(semi-parsed-define-values-syms"
 " body_24)))"
-"(let-values(((s_804)"
+"(let-values(((s_827)"
 "(semi-parsed-define-values-s"
 " body_24)))"
-"(let-values(((ok?_82"
+"(let-values(((ok?_84"
 " define-values562_0"
 " _563_0"
 " _564_0)"
-"(let-values(((s_805)"
+"(let-values(((s_828)"
 "(syntax-disarm$1"
-" s_804)))"
+" s_827)))"
 "(if(if(not"
 "(expand-context-to-parsed?"
 " rhs-ctx_2))"
 " #t"
 " #f)"
-"(let-values(((orig-s_90)"
-" s_805))"
+"(let-values(((orig-s_92)"
+" s_828))"
 "(let-values(((define-values562_1"
 " _563_1"
 " _564_1)"
-"(let-values(((s_806)"
+"(let-values(((s_829)"
 "(if(syntax?$1"
-" s_805)"
+" s_828)"
 "(syntax-e$1"
-" s_805)"
-" s_805)))"
+" s_828)"
+" s_828)))"
 "(if(pair?"
-" s_806)"
+" s_829)"
 "(let-values(((define-values565_0)"
-"(let-values(((s_807)"
+"(let-values(((s_830)"
 "(car"
-" s_806)))"
-" s_807))"
+" s_829)))"
+" s_830))"
 "((_566_0"
 " _567_0)"
-"(let-values(((s_613)"
+"(let-values(((s_831)"
 "(cdr"
-" s_806)))"
-"(let-values(((s_614)"
+" s_829)))"
+"(let-values(((s_832)"
 "(if(syntax?$1"
-" s_613)"
+" s_831)"
 "(syntax-e$1"
-" s_613)"
-" s_613)))"
+" s_831)"
+" s_831)))"
 "(if(pair?"
-" s_614)"
+" s_832)"
 "(let-values(((_568_0)"
-"(let-values(((s_808)"
+"(let-values(((s_833)"
 "(car"
-" s_614)))"
-" s_808))"
+" s_832)))"
+" s_833))"
 "((_569_0)"
-"(let-values(((s_809)"
+"(let-values(((s_834)"
 "(cdr"
-" s_614)))"
-"(let-values(((s_810)"
+" s_832)))"
+"(let-values(((s_835)"
 "(if(syntax?$1"
-" s_809)"
+" s_834)"
 "(syntax-e$1"
-" s_809)"
-" s_809)))"
+" s_834)"
+" s_834)))"
 "(if(pair?"
-" s_810)"
+" s_835)"
 "(let-values(((_570_0)"
-"(let-values(((s_811)"
+"(let-values(((s_836)"
 "(car"
-" s_810)))"
-" s_811))"
+" s_835)))"
+" s_836))"
 "(()"
-"(let-values(((s_812)"
+"(let-values(((s_837)"
 "(cdr"
-" s_810)))"
-"(let-values(((s_813)"
+" s_835)))"
+"(let-values(((s_838)"
 "(if(syntax?$1"
-" s_812)"
+" s_837)"
 "(syntax-e$1"
-" s_812)"
-" s_812)))"
+" s_837)"
+" s_837)))"
 "(if(null?"
-" s_813)"
+" s_838)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                       \"bad syntax\""
-" orig-s_90))))))"
+" orig-s_92))))))"
 "(values"
 " _570_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                   \"bad syntax\""
-" orig-s_90))))))"
+" orig-s_92))))))"
 "(values"
 " _568_0"
 " _569_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                               \"bad syntax\""
-" orig-s_90))))))"
+" orig-s_92))))))"
 "(values"
 " define-values565_0"
 " _566_0"
@@ -75593,7 +75764,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                           \"bad syntax\""
-" orig-s_90)))))"
+" orig-s_92)))))"
 "(values"
 " #t"
 " define-values562_1"
@@ -75608,7 +75779,7 @@ static const char *startup_source =
 "(let-values(((rhs-ctx571_0)"
 " rhs-ctx_2)"
 "((s572_0)"
-" s_804)"
+" s_827)"
 "((temp573_0)"
 " #t))"
 "(keep-as-needed85.1"
@@ -75827,7 +75998,7 @@ static const char *startup_source =
 "(let-values(((ht_171) need-eventually-defined_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_171)))"
-"((letrec-values(((for-loop_339)"
+"((letrec-values(((for-loop_332)"
 "(lambda(i_193)"
 "(begin"
 " 'for-loop"
@@ -75840,24 +76011,24 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(begin"
-"(let-values(((lst_439) l_84))"
+"(let-values(((lst_442) l_84))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_439)))"
-"((letrec-values(((for-loop_340)"
-"(lambda(lst_440)"
+"(let-values()(check-list lst_442)))"
+"((letrec-values(((for-loop_333)"
+"(lambda(lst_443)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_440)"
-"(let-values(((id_163)"
+" lst_443)"
+"(let-values(((id_164)"
 "(unsafe-car"
-" lst_440))"
+" lst_443))"
 "((rest_253)"
 "(unsafe-cdr"
-" lst_440)))"
+" lst_443)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75866,7 +76037,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((b_93)"
 "(let-values(((id592_0)"
-" id_163)"
+" id_164)"
 "((phase593_0)"
 " phase_159))"
 "(resolve+shift30.1"
@@ -75889,7 +76060,7 @@ static const char *startup_source =
 "(module-binding-sym"
 " b_93)"
 "(syntax-e$1"
-" id_163))"
+" id_164))"
 "(eq?"
 "(module-binding-module"
 " b_93)"
@@ -75902,27 +76073,27 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                     \"reference to an unbound identifier\""
-" id_163"
+" id_164"
 " #f"
 " null"
 "(syntax-debug-info-string"
-" id_163"
+" id_164"
 " ctx_117))))))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_340"
+"(for-loop_333"
 " rest_253)"
 "(values))))"
 "(values))))))"
-" for-loop_340)"
-" lst_439)))"
+" for-loop_333)"
+" lst_442)))"
 "(void)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_339(hash-iterate-next ht_171 i_193))(values))))"
+"(if(not #f)(for-loop_332(hash-iterate-next ht_171 i_193))(values))))"
 "(values))))))"
-" for-loop_339)"
+" for-loop_332)"
 "(hash-iterate-first ht_171))))"
 "(void)))))"
 "(define-values"
@@ -75951,8 +76122,8 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_26)"
 "(let-values() null)"
-"(if(let-values(((or-part_409)(parsed?(car bodys_26))))"
-"(if or-part_409 or-part_409(expanded+parsed?(car bodys_26))))"
+"(if(let-values(((or-part_411)(parsed?(car bodys_26))))"
+"(if or-part_411 or-part_411(expanded+parsed?(car bodys_26))))"
 "(let-values()"
 "(cons(car bodys_26)(loop_126(cdr bodys_26) phase_161)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_26))"
@@ -75997,52 +76168,52 @@ static const char *startup_source =
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
-"(let-values(((ok?_83 #%provide595_0 spec596_0)"
+"(let-values(((ok?_85 #%provide595_0 spec596_0)"
 "(let-values(((s_635) disarmed-body_1))"
-"(let-values(((orig-s_91) s_635))"
+"(let-values(((orig-s_93) s_635))"
 "(let-values(((#%provide595_1"
 " spec596_1)"
-"(let-values(((s_814)"
+"(let-values(((s_839)"
 "(if(syntax?$1"
 " s_635)"
 "(syntax-e$1"
 " s_635)"
 " s_635)))"
-"(if(pair? s_814)"
+"(if(pair? s_839)"
 "(let-values(((#%provide597_0)"
-"(let-values(((s_815)"
+"(let-values(((s_639)"
 "(car"
-" s_814)))"
-" s_815))"
+" s_839)))"
+" s_639))"
 "((spec598_0)"
-"(let-values(((s_816)"
+"(let-values(((s_640)"
 "(cdr"
-" s_814)))"
-"(let-values(((s_817)"
+" s_839)))"
+"(let-values(((s_840)"
 "(if(syntax?$1"
-" s_816)"
+" s_640)"
 "(syntax-e$1"
-" s_816)"
-" s_816)))"
-"(let-values(((flat-s_60)"
+" s_640)"
+" s_640)))"
+"(let-values(((flat-s_62)"
 "(to-syntax-list.1"
-" s_817)))"
+" s_840)))"
 "(if(not"
-" flat-s_60)"
+" flat-s_62)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                             \"bad syntax\""
-" orig-s_91))"
+" orig-s_93))"
 "(let-values()"
-" flat-s_60)))))))"
+" flat-s_62)))))))"
 "(values"
 " #%provide597_0"
 " spec598_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                     \"bad syntax\""
-" orig-s_91)))))"
+" orig-s_93)))))"
 "(values"
 " #t"
 " #%provide595_1"
@@ -76247,8 +76418,8 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_410) enclosing-self_3))"
-"(if or-part_410 or-part_410 self_39)))))"
+"(let-values(((or-part_412) enclosing-self_3))"
+"(if or-part_412 or-part_412 self_39)))))"
 "(let-values(((compiled-module_0)"
 "(let-values(((parsed-mod607_0) parsed-mod_0)"
 "((temp608_0)"
@@ -76314,16 +76485,16 @@ static const char *startup_source =
 " compiled-module615_0)))))))))))))))))))))))))"
 "(define-values"
 "(attach-root-expand-context-properties)"
-"(lambda(s_657 root-ctx_8 orig-self_1 new-self_2)"
+"(lambda(s_841 root-ctx_8 orig-self_1 new-self_2)"
 "(begin"
-"(let-values(((s_818)"
-"(syntax-property$1 s_657 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
-"(let-values(((s_819)"
+"(let-values(((s_842)"
+"(syntax-property$1 s_841 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
+"(let-values(((s_843)"
 "(syntax-property$1"
-" s_818"
+" s_842"
 " 'module-body-inside-context"
 "(add-scope empty-syntax(root-expand-context-post-expansion-scope root-ctx_8)))))"
-" s_819)))))"
+" s_843)))))"
 "(define-values"
 "(expand-post-submodules165.1)"
 "(lambda(all-scopes-s147_0"
@@ -76367,54 +76538,54 @@ static const char *startup_source =
 "(let-values(((body-s_0)"
 "(semi-parsed-begin-for-syntax-s"
 " body_25)))"
-"(let-values(((ok?_84 begin-for-syntax617_0 _618_0)"
-"(let-values(((s_820)"
+"(let-values(((ok?_86 begin-for-syntax617_0 _618_0)"
+"(let-values(((s_844)"
 "(syntax-disarm$1"
 " body-s_0)))"
-"(let-values(((orig-s_92) s_820))"
+"(let-values(((orig-s_94) s_844))"
 "(let-values(((begin-for-syntax617_1"
 " _618_1)"
-"(let-values(((s_821)"
+"(let-values(((s_845)"
 "(if(syntax?$1"
-" s_820)"
+" s_844)"
 "(syntax-e$1"
-" s_820)"
-" s_820)))"
-"(if(pair? s_821)"
+" s_844)"
+" s_844)))"
+"(if(pair? s_845)"
 "(let-values(((begin-for-syntax619_0)"
-"(let-values(((s_822)"
+"(let-values(((s_846)"
 "(car"
-" s_821)))"
-" s_822))"
+" s_845)))"
+" s_846))"
 "((_620_0)"
-"(let-values(((s_823)"
+"(let-values(((s_847)"
 "(cdr"
-" s_821)))"
-"(let-values(((s_824)"
+" s_845)))"
+"(let-values(((s_669)"
 "(if(syntax?$1"
-" s_823)"
+" s_847)"
 "(syntax-e$1"
-" s_823)"
-" s_823)))"
-"(let-values(((flat-s_61)"
+" s_847)"
+" s_847)))"
+"(let-values(((flat-s_63)"
 "(to-syntax-list.1"
-" s_824)))"
+" s_669)))"
 "(if(not"
-" flat-s_61)"
+" flat-s_63)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                 \"bad syntax\""
-" orig-s_92))"
+" orig-s_94))"
 "(let-values()"
-" flat-s_61)))))))"
+" flat-s_63)))))))"
 "(values"
 " begin-for-syntax619_0"
 " _620_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                         \"bad syntax\""
-" orig-s_92)))))"
+" orig-s_94)))))"
 "(values"
 " #t"
 " begin-for-syntax617_1"
@@ -76461,9 +76632,9 @@ static const char *startup_source =
 " temp624_0))"
 " parsed-bfs_0))"
 "(loop_127 rest-bodys_3 phase_163))))))))"
-"(if(let-values(((or-part_411)(parsed? body_25)))"
-"(if or-part_411"
-" or-part_411"
+"(if(let-values(((or-part_413)(parsed? body_25)))"
+"(if or-part_413"
+" or-part_413"
 "(expanded+parsed? body_25)))"
 "(let-values()"
 "(cons body_25(loop_127 rest-bodys_3 phase_163)))"
@@ -76485,64 +76656,64 @@ static const char *startup_source =
 "(remove-use-site-scopes"
 " body_25"
 " submod-ctx_1)))"
-"(let-values(((ok?_85"
+"(let-values(((ok?_87"
 " module*625_0"
 " name626_0"
 " _627_0)"
-"(let-values(((s_825)"
+"(let-values(((s_848)"
 " disarmed-body_2))"
-"(if(let-values(((s_826)"
+"(if(let-values(((s_849)"
 "(if(syntax?$1"
-" s_825)"
+" s_848)"
 "(syntax-e$1"
-" s_825)"
-" s_825)))"
-"(if(pair? s_826)"
-"(if(let-values(((s_827)"
+" s_848)"
+" s_848)))"
+"(if(pair? s_849)"
+"(if(let-values(((s_850)"
 "(car"
-" s_826)))"
+" s_849)))"
 " #t)"
-"(let-values(((s_828)"
+"(let-values(((s_851)"
 "(cdr"
-" s_826)))"
-"(let-values(((s_829)"
+" s_849)))"
+"(let-values(((s_852)"
 "(if(syntax?$1"
-" s_828)"
+" s_851)"
 "(syntax-e$1"
-" s_828)"
-" s_828)))"
+" s_851)"
+" s_851)))"
 "(if(pair?"
-" s_829)"
-"(if(let-values(((s_830)"
+" s_852)"
+"(if(let-values(((s_853)"
 "(car"
-" s_829)))"
+" s_852)))"
 " #t)"
-"(let-values(((s_831)"
+"(let-values(((s_854)"
 "(cdr"
-" s_829)))"
-"(let-values(((s_832)"
+" s_852)))"
+"(let-values(((s_675)"
 "(if(syntax?$1"
-" s_831)"
+" s_854)"
 "(syntax-e$1"
-" s_831)"
-" s_831)))"
+" s_854)"
+" s_854)))"
 "(if(pair?"
-" s_832)"
-"(if(let-values(((s_833)"
+" s_675)"
+"(if(let-values(((s_855)"
 "(car"
-" s_832)))"
-"(let-values(((s_834)"
+" s_675)))"
+"(let-values(((s_856)"
 "(if(syntax?$1"
-" s_833)"
+" s_855)"
 "(syntax-e$1"
-" s_833)"
-" s_833)))"
+" s_855)"
+" s_855)))"
 "(eq?"
 " #f"
-" s_834)))"
-"(let-values(((s_835)"
+" s_856)))"
+"(let-values(((s_857)"
 "(cdr"
-" s_832)))"
+" s_675)))"
 " #t)"
 " #f)"
 " #f)))"
@@ -76554,59 +76725,59 @@ static const char *startup_source =
 "(let-values(((module*625_1"
 " name626_1"
 " _627_1)"
-"(let-values(((s_836)"
+"(let-values(((s_858)"
 "(if(syntax?$1"
-" s_825)"
+" s_848)"
 "(syntax-e$1"
-" s_825)"
-" s_825)))"
+" s_848)"
+" s_848)))"
 "(let-values(((module*628_0)"
-"(let-values(((s_837)"
+"(let-values(((s_859)"
 "(car"
-" s_836)))"
-" s_837))"
+" s_858)))"
+" s_859))"
 "((name629_0"
 " _630_0)"
-"(let-values(((s_838)"
+"(let-values(((s_860)"
 "(cdr"
-" s_836)))"
-"(let-values(((s_839)"
+" s_858)))"
+"(let-values(((s_680)"
 "(if(syntax?$1"
-" s_838)"
+" s_860)"
 "(syntax-e$1"
-" s_838)"
-" s_838)))"
+" s_860)"
+" s_860)))"
 "(let-values(((name631_0)"
-"(let-values(((s_840)"
+"(let-values(((s_682)"
 "(car"
-" s_839)))"
-" s_840))"
+" s_680)))"
+" s_682))"
 "((_632_0)"
-"(let-values(((s_841)"
+"(let-values(((s_861)"
 "(cdr"
-" s_839)))"
-"(let-values(((s_842)"
+" s_680)))"
+"(let-values(((s_683)"
 "(if(syntax?$1"
-" s_841)"
+" s_861)"
 "(syntax-e$1"
-" s_841)"
-" s_841)))"
+" s_861)"
+" s_861)))"
 "(let-values((()"
-"(let-values(((s_843)"
+"(let-values(((s_685)"
 "(car"
-" s_842)))"
-"(let-values(((s_672)"
+" s_683)))"
+"(let-values(((s_862)"
 "(if(syntax?$1"
-" s_843)"
+" s_685)"
 "(syntax-e$1"
-" s_843)"
-" s_843)))"
+" s_685)"
+" s_685)))"
 "(values))))"
 "((_633_0)"
-"(let-values(((s_844)"
+"(let-values(((s_863)"
 "(cdr"
-" s_842)))"
-" s_844)))"
+" s_683)))"
+" s_863)))"
 "(values"
 " _633_0))))))"
 "(values"
@@ -76627,7 +76798,7 @@ static const char *startup_source =
 " #f"
 " #f)))))"
 "(let-values(((submod_3)"
-"(if ok?_85"
+"(if ok?_87"
 "(let-values()"
 "(let-values(((neg-phase_0)"
 "(phase-"
@@ -76771,21 +76942,21 @@ static const char *startup_source =
 "(let-values(((ids_47) ids170_0))"
 "(let-values(((phase_164) phase171_1))"
 "(let-values(((requires+provides_12) requires+provides172_0))"
-"(let-values(((s_703) in168_0))"
+"(let-values(((s_864) in168_0))"
 "(let-values()"
 "(begin"
-"(let-values(((lst_441) ids_47))"
+"(let-values(((lst_444) ids_47))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_441)))"
-"((letrec-values(((for-loop_341)"
-"(lambda(lst_442)"
+"(let-values()(check-list lst_444)))"
+"((letrec-values(((for-loop_334)"
+"(lambda(lst_445)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_442)"
-"(let-values(((id_164)(unsafe-car lst_442))"
-"((rest_254)(unsafe-cdr lst_442)))"
+"(if(pair? lst_445)"
+"(let-values(((id_165)(unsafe-car lst_445))"
+"((rest_254)(unsafe-cdr lst_445)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76794,10 +76965,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((requires+provides655_0)"
 " requires+provides_12)"
-"((id656_0) id_164)"
+"((id656_0) id_165)"
 "((phase657_0)"
 " phase_164)"
-"((s658_0) s_703)"
+"((s658_0) s_864)"
 "((temp659_0) 'module))"
 "(check-not-defined95.1"
 " #f"
@@ -76817,25 +76988,25 @@ static const char *startup_source =
 " phase657_0)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_341 rest_254)(values))))"
+"(if(not #f)(for-loop_334 rest_254)(values))))"
 "(values))))))"
-" for-loop_341)"
-" lst_441)))"
+" for-loop_334)"
+" lst_444)))"
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
 "(lambda(bodys_28 phase_165 m-ns_22 self_41 ctx_121)"
 "(begin"
 "(begin"
-"(let-values(((lst_443) bodys_28))"
+"(let-values(((lst_446) bodys_28))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_443)))"
-"((letrec-values(((for-loop_342)"
-"(lambda(lst_444)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_446)))"
+"((letrec-values(((for-loop_335)"
+"(lambda(lst_447)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_444)"
-"(let-values(((body_26)(unsafe-car lst_444))((rest_255)(unsafe-cdr lst_444)))"
+"(if(pair? lst_447)"
+"(let-values(((body_26)(unsafe-car lst_447))((rest_255)(unsafe-cdr lst_447)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76861,59 +77032,59 @@ static const char *startup_source =
 " m-ns_22"
 " ctx_121)))"
 "(begin"
-"(let-values(((lst_445) ids_48)"
-"((lst_446)"
+"(let-values(((lst_448) ids_48)"
+"((lst_449)"
 "(parsed-define-values-syms"
 " p_88))"
-"((lst_447) vals_11))"
+"((lst_450) vals_11))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_445)))"
+"(check-list lst_448)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_446)))"
+"(check-list lst_449)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_447)))"
-"((letrec-values(((for-loop_343)"
-"(lambda(lst_448"
-" lst_449"
-" lst_450)"
+"(check-list lst_450)))"
+"((letrec-values(((for-loop_336)"
+"(lambda(lst_451"
+" lst_452"
+" lst_453)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_448)"
+" lst_451)"
 "(if(pair?"
-" lst_449)"
+" lst_452)"
 "(pair?"
-" lst_450)"
+" lst_453)"
 " #f)"
 " #f)"
-"(let-values(((id_165)"
+"(let-values(((id_166)"
 "(unsafe-car"
-" lst_448))"
+" lst_451))"
 "((rest_256)"
 "(unsafe-cdr"
-" lst_448))"
+" lst_451))"
 "((sym_105)"
 "(unsafe-car"
-" lst_449))"
+" lst_452))"
 "((rest_257)"
 "(unsafe-cdr"
-" lst_449))"
+" lst_452))"
 "((val_89)"
 "(unsafe-car"
-" lst_450))"
+" lst_453))"
 "((rest_258)"
 "(unsafe-cdr"
-" lst_450)))"
+" lst_453)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76929,30 +77100,30 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_343"
+"(for-loop_336"
 " rest_256"
 " rest_257"
 " rest_258)"
 "(values))))"
 "(values))))))"
-" for-loop_343)"
-" lst_445"
-" lst_446"
-" lst_447)))"
+" for-loop_336)"
+" lst_448"
+" lst_449"
+" lst_450)))"
 "(void)))))"
-"(if(let-values(((or-part_412)"
+"(if(let-values(((or-part_414)"
 "(parsed-define-syntaxes?"
 " p_88)))"
-"(if or-part_412"
-" or-part_412"
+"(if or-part_414"
+" or-part_414"
 "(semi-parsed-begin-for-syntax?"
 " p_88)))"
 "(let-values()(void))"
-"(if(let-values(((or-part_413)"
+"(if(let-values(((or-part_415)"
 "(parsed-#%declare?"
 " p_88)))"
-"(if or-part_413"
-" or-part_413"
+"(if or-part_415"
+" or-part_415"
 "(syntax?$1 p_88)))"
 "(let-values()(void))"
 "(let-values()"
@@ -76990,10 +77161,10 @@ static const char *startup_source =
 " m-ns_22)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_342 rest_255)(values))))"
+"(if(not #f)(for-loop_335 rest_255)(values))))"
 "(values))))))"
-" for-loop_342)"
-" lst_443)))"
+" for-loop_335)"
+" lst_446)))"
 "(void)))))"
 "(define-values"
 "(expand-submodule197.1)"
@@ -77015,7 +77186,7 @@ static const char *startup_source =
 " ctx196_0)"
 "(begin"
 " 'expand-submodule197"
-"(let-values(((s_845) s194_0))"
+"(let-values(((s_865) s194_0))"
 "(let-values(((self_42) self195_0))"
 "(let-values(((ctx_122) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
@@ -77044,52 +77215,52 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_158 'enter-prim s_845)"
+"(call-expand-observe obs_158 'enter-prim s_865)"
 "(call-expand-observe"
 " obs_158"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
-"(let-values(((ok?_86 module662_0 name663_0 _664_0)"
-"(let-values(((s_846) s_845))"
-"(let-values(((orig-s_93) s_846))"
+"(let-values(((ok?_88 module662_0 name663_0 _664_0)"
+"(let-values(((s_866) s_865))"
+"(let-values(((orig-s_95) s_866))"
 "(let-values(((module662_1 name663_1 _664_1)"
-"(let-values(((s_847)"
-"(if(syntax?$1 s_846)"
-"(syntax-e$1 s_846)"
-" s_846)))"
-"(if(pair? s_847)"
+"(let-values(((s_867)"
+"(if(syntax?$1 s_866)"
+"(syntax-e$1 s_866)"
+" s_866)))"
+"(if(pair? s_867)"
 "(let-values(((module665_0)"
-"(let-values(((s_848)(car s_847)))"
-" s_848))"
+"(let-values(((s_868)(car s_867)))"
+" s_868))"
 "((name666_0 _667_0)"
-"(let-values(((s_849)(cdr s_847)))"
-"(let-values(((s_850)"
+"(let-values(((s_869)(cdr s_867)))"
+"(let-values(((s_870)"
 "(if(syntax?$1"
-" s_849)"
-"(syntax-e$1 s_849)"
-" s_849)))"
-"(if(pair? s_850)"
+" s_869)"
+"(syntax-e$1 s_869)"
+" s_869)))"
+"(if(pair? s_870)"
 "(let-values(((name668_0)"
-"(let-values(((s_851)"
+"(let-values(((s_871)"
 "(car"
-" s_850)))"
-" s_851))"
+" s_870)))"
+" s_871))"
 "((_669_0)"
-"(let-values(((s_852)"
+"(let-values(((s_872)"
 "(cdr"
-" s_850)))"
-" s_852)))"
+" s_870)))"
+" s_872)))"
 "(values name668_0 _669_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                           \"bad syntax\""
-" orig-s_93))))))"
+" orig-s_95))))))"
 "(values module665_0 name666_0 _667_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                       \"bad syntax\""
-" orig-s_93)))))"
+" orig-s_95)))))"
 "(values #t module662_1 name663_1 _664_1))))))"
 "(let-values(((name_80)(syntax-e$1 name663_0)))"
 "(let-values((()"
@@ -77099,7 +77270,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"submodule already declared with the same name\""
-" s_845"
+" s_865"
 " name_80))"
 "(void))"
 "(values))))"
@@ -77116,11 +77287,11 @@ static const char *startup_source =
 "(if obs_159"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_159 'enter-prim s_845)))"
+"(call-expand-observe obs_159 'enter-prim s_865)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
-"(let-values(((s670_0) s_845)"
+"(let-values(((s670_0) s_865)"
 "((temp671_0)"
 "(let-values(((v_271) ctx_122))"
 "(let-values(((the-struct_118) v_271))"
@@ -77438,21 +77609,21 @@ static const char *startup_source =
 "(let-values(((modules-being-compiled_9) modules-being-compiled203_0))"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_451) bodys_29))"
+"(let-values(((lst_454) bodys_29))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_451)))"
-"((letrec-values(((for-loop_344)"
-"(lambda(fold-var_398 lst_452)"
+"(let-values()(check-list lst_454)))"
+"((letrec-values(((for-loop_337)"
+"(lambda(fold-var_392 lst_455)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_452)"
-"(let-values(((body_27)(unsafe-car lst_452))"
-"((rest_259)(unsafe-cdr lst_452)))"
-"(let-values(((fold-var_399)"
-"(let-values(((fold-var_400) fold-var_398))"
-"(let-values(((fold-var_401)"
+"(if(pair? lst_455)"
+"(let-values(((body_27)(unsafe-car lst_455))"
+"((rest_259)(unsafe-cdr lst_455)))"
+"(let-values(((fold-var_393)"
+"(let-values(((fold-var_394) fold-var_392))"
+"(let-values(((fold-var_395)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -77497,15 +77668,15 @@ static const char *startup_source =
 " self699_0"
 " ctx700_0)))"
 "(let-values() body_27))))"
-" fold-var_400))))"
-"(values fold-var_401)))))"
+" fold-var_394))))"
+"(values fold-var_395)))))"
 "(if(not #f)"
-"(for-loop_344 fold-var_399 rest_259)"
-" fold-var_399)))"
-" fold-var_398)))))"
-" for-loop_344)"
+"(for-loop_337 fold-var_393 rest_259)"
+" fold-var_393)))"
+" fold-var_392)))))"
+" for-loop_337)"
 " null"
-" lst_451))))))))))))))))"
+" lst_454))))))))))))))))"
 "(define-values"
 "(make-parse-lifted-require220.1)"
 "(lambda(declared-submodule-names215_0 m-ns217_0 self218_0 requires+provides219_0)"
@@ -77516,52 +77687,52 @@ static const char *startup_source =
 "(let-values(((requires+provides_13) requires+provides219_0))"
 "(let-values(((declared-submodule-names_10) declared-submodule-names215_0))"
 "(let-values()"
-"(lambda(s_853 phase_167)"
-"(let-values(((ok?_87 #%require706_0 req707_0)"
-"(let-values(((s_854)(syntax-disarm$1 s_853)))"
-"(let-values(((orig-s_94) s_854))"
+"(lambda(s_873 phase_167)"
+"(let-values(((ok?_89 #%require706_0 req707_0)"
+"(let-values(((s_874)(syntax-disarm$1 s_873)))"
+"(let-values(((orig-s_96) s_874))"
 "(let-values(((#%require706_1 req707_1)"
-"(let-values(((s_855)"
-"(if(syntax?$1 s_854)(syntax-e$1 s_854) s_854)))"
-"(if(pair? s_855)"
+"(let-values(((s_875)"
+"(if(syntax?$1 s_874)(syntax-e$1 s_874) s_874)))"
+"(if(pair? s_875)"
 "(let-values(((#%require708_0)"
-"(let-values(((s_856)(car s_855))) s_856))"
+"(let-values(((s_876)(car s_875))) s_876))"
 "((req709_0)"
-"(let-values(((s_857)(cdr s_855)))"
-"(let-values(((s_858)"
-"(if(syntax?$1 s_857)"
-"(syntax-e$1 s_857)"
-" s_857)))"
-"(if(pair? s_858)"
+"(let-values(((s_877)(cdr s_875)))"
+"(let-values(((s_878)"
+"(if(syntax?$1 s_877)"
+"(syntax-e$1 s_877)"
+" s_877)))"
+"(if(pair? s_878)"
 "(let-values(((req710_0)"
-"(let-values(((s_859)"
-"(car s_858)))"
-" s_859))"
+"(let-values(((s_879)"
+"(car s_878)))"
+" s_879))"
 "(()"
-"(let-values(((s_860)"
-"(cdr s_858)))"
-"(let-values(((s_861)"
+"(let-values(((s_880)"
+"(cdr s_878)))"
+"(let-values(((s_881)"
 "(if(syntax?$1"
-" s_860)"
+" s_880)"
 "(syntax-e$1"
-" s_860)"
-" s_860)))"
-"(if(null? s_861)"
+" s_880)"
+" s_880)))"
+"(if(null? s_881)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                               \"bad syntax\""
-" orig-s_94))))))"
+" orig-s_96))))))"
 "(values req710_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                           \"bad syntax\""
-" orig-s_94))))))"
+" orig-s_96))))))"
 "(values #%require708_0 req709_0))"
-"                                                      (raise-syntax-error$1 #f \"bad syntax\" orig-s_94)))))"
+"                                                      (raise-syntax-error$1 #f \"bad syntax\" orig-s_96)))))"
 "(values #t #%require706_1 req707_1))))))"
 "(let-values(((temp711_0)(list req707_0))"
-"((s712_0) s_853)"
+"((s712_0) s_873)"
 "((self713_0) self_44)"
 "((m-ns714_0) m-ns_23)"
 "((phase715_0) phase_167)"
@@ -77607,30 +77778,30 @@ static const char *startup_source =
 "(lambda(lifted-defns_2)"
 "(begin"
 "(reverse$1"
-"(let-values(((lst_453) lifted-defns_2))"
+"(let-values(((lst_456) lifted-defns_2))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_453)))"
-"((letrec-values(((for-loop_345)"
-"(lambda(fold-var_402 lst_454)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_456)))"
+"((letrec-values(((for-loop_338)"
+"(lambda(fold-var_396 lst_457)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_454)"
-"(let-values(((lifted-defn_0)(unsafe-car lst_454))"
-"((rest_260)(unsafe-cdr lst_454)))"
-"(let-values(((fold-var_403)"
-"(let-values(((fold-var_404) fold-var_402))"
-"(let-values(((fold-var_405)"
+"(if(pair? lst_457)"
+"(let-values(((lifted-defn_0)(unsafe-car lst_457))"
+"((rest_260)(unsafe-cdr lst_457)))"
+"(let-values(((fold-var_397)"
+"(let-values(((fold-var_398) fold-var_396))"
+"(let-values(((fold-var_399)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(defn-extract-syntax lifted-defn_0))"
-" fold-var_404))))"
-"(values fold-var_405)))))"
-"(if(not #f)(for-loop_345 fold-var_403 rest_260) fold-var_403)))"
-" fold-var_402)))))"
-" for-loop_345)"
+" fold-var_398))))"
+"(values fold-var_399)))))"
+"(if(not #f)(for-loop_338 fold-var_397 rest_260) fold-var_397)))"
+" fold-var_396)))))"
+" for-loop_338)"
 " null"
-" lst_453)))))))"
+" lst_456)))))))"
 "(define-values"
 "(log-lifted-defns)"
 "(lambda(partial-body-ctx_2 lifted-defns_3 exp-body_10 rest-bodys_4)"
@@ -77646,75 +77817,75 @@ static const char *startup_source =
 "(let-values((()(begin(call-expand-observe obs_162 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_455) s-lifted-defns_0))"
+"(let-values(((lst_458) s-lifted-defns_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_455)))"
-"((letrec-values(((for-loop_346)"
-"(lambda(lst_456)"
+"(let-values()(check-list lst_458)))"
+"((letrec-values(((for-loop_339)"
+"(lambda(lst_459)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_456)"
-"(let-values(((s-lifted-defn_0)(unsafe-car lst_456))"
-"((rest_261)(unsafe-cdr lst_456)))"
+"(if(pair? lst_459)"
+"(let-values(((s-lifted-defn_0)(unsafe-car lst_459))"
+"((rest_261)(unsafe-cdr lst_459)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((ok?_88"
+"(let-values(((ok?_90"
 " define-values724_0"
 " _725_0)"
-"(let-values(((s_862)"
+"(let-values(((s_882)"
 " s-lifted-defn_0))"
-"(let-values(((orig-s_95)"
-" s_862))"
+"(let-values(((orig-s_97)"
+" s_882))"
 "(let-values(((define-values724_1"
 " _725_1)"
-"(let-values(((s_863)"
+"(let-values(((s_883)"
 "(if(syntax?$1"
-" s_862)"
+" s_882)"
 "(syntax-e$1"
-" s_862)"
-" s_862)))"
+" s_882)"
+" s_882)))"
 "(if(pair?"
-" s_863)"
+" s_883)"
 "(let-values(((define-values726_0)"
-"(let-values(((s_864)"
+"(let-values(((s_884)"
 "(car"
-" s_863)))"
-" s_864))"
+" s_883)))"
+" s_884))"
 "((_727_0)"
-"(let-values(((s_865)"
+"(let-values(((s_885)"
 "(cdr"
-" s_863)))"
-"(let-values(((s_866)"
+" s_883)))"
+"(let-values(((s_886)"
 "(if(syntax?$1"
-" s_865)"
+" s_885)"
 "(syntax-e$1"
-" s_865)"
-" s_865)))"
-"(let-values(((flat-s_62)"
+" s_885)"
+" s_885)))"
+"(let-values(((flat-s_64)"
 "(to-syntax-list.1"
-" s_866)))"
+" s_886)))"
 "(if(not"
-" flat-s_62)"
+" flat-s_64)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                 \"bad syntax\""
-" orig-s_95))"
+" orig-s_97))"
 "(let-values()"
-" flat-s_62)))))))"
+" flat-s_64)))))))"
 "(values"
 " define-values726_0"
 " _727_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                         \"bad syntax\""
-" orig-s_95)))))"
+" orig-s_97)))))"
 "(values"
 " #t"
 " define-values724_1"
@@ -77763,25 +77934,25 @@ static const char *startup_source =
 " s-lifted-defn_0))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_346 rest_261)(values))))"
+"(if(not #f)(for-loop_339 rest_261)(values))))"
 "(values))))))"
-" for-loop_346)"
-" lst_455)))"
+" for-loop_339)"
+" lst_458)))"
 "(values))))"
 "(let-values()"
-"(let-values(((ok?_89 form-id720_0 _721_0)"
-"(let-values(((s_867) exp-body_10))"
-"(let-values(((orig-s_96) s_867))"
+"(let-values(((ok?_91 form-id720_0 _721_0)"
+"(let-values(((s_887) exp-body_10))"
+"(let-values(((orig-s_98) s_887))"
 "(let-values(((form-id720_1 _721_1)"
-"(let-values(((s_868)"
-"(if(syntax?$1 s_867)(syntax-e$1 s_867) s_867)))"
-"(if(pair? s_868)"
+"(let-values(((s_888)"
+"(if(syntax?$1 s_887)(syntax-e$1 s_887) s_887)))"
+"(if(pair? s_888)"
 "(let-values(((form-id722_0)"
-"(let-values(((s_869)(car s_868))) s_869))"
+"(let-values(((s_889)(car s_888))) s_889))"
 "((_723_0)"
-"(let-values(((s_870)(cdr s_868))) s_870)))"
+"(let-values(((s_890)(cdr s_888))) s_890)))"
 "(values form-id722_0 _723_0))"
-"                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_96)))))"
+"                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
 "(values #t form-id720_1 _721_1))))))"
 "(begin"
 "(call-expand-observe obs_162 'next)"
@@ -77800,30 +77971,30 @@ static const char *startup_source =
 "(if obs_163"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
-"(let-values(((ok?_90 define-values728_0 _729_0)"
-"(let-values(((s_871) s-defn_0))"
-"(let-values(((orig-s_97) s_871))"
+"(let-values(((ok?_92 define-values728_0 _729_0)"
+"(let-values(((s_891) s-defn_0))"
+"(let-values(((orig-s_99) s_891))"
 "(let-values(((define-values728_1 _729_1)"
-"(let-values(((s_872)(if(syntax?$1 s_871)(syntax-e$1 s_871) s_871)))"
-"(if(pair? s_872)"
+"(let-values(((s_892)(if(syntax?$1 s_891)(syntax-e$1 s_891) s_891)))"
+"(if(pair? s_892)"
 "(let-values(((define-values730_0)"
-"(let-values(((s_873)(car s_872))) s_873))"
+"(let-values(((s_893)(car s_892))) s_893))"
 "((_731_0)"
-"(let-values(((s_874)(cdr s_872)))"
-"(let-values(((s_875)"
-"(if(syntax?$1 s_874)"
-"(syntax-e$1 s_874)"
-" s_874)))"
-"(let-values(((flat-s_63)(to-syntax-list.1 s_875)))"
-"(if(not flat-s_63)"
+"(let-values(((s_894)(cdr s_892)))"
+"(let-values(((s_895)"
+"(if(syntax?$1 s_894)"
+"(syntax-e$1 s_894)"
+" s_894)))"
+"(let-values(((flat-s_65)(to-syntax-list.1 s_895)))"
+"(if(not flat-s_65)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                           \"bad syntax\""
-" orig-s_97))"
-"(let-values() flat-s_63)))))))"
+" orig-s_99))"
+"(let-values() flat-s_65)))))))"
 "(values define-values730_0 _731_0))"
-"                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))"
+"                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_99)))))"
 "(values #t define-values728_1 _729_1))))))"
 "(begin"
 "(call-expand-observe obs_163 'visit s-defn_0)"
@@ -77858,25 +78029,25 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_6)))"
 "((letrec-values(((for-loop_104)"
-"(lambda(fold-var_406 lst_86)"
+"(lambda(fold-var_400 lst_86)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
-"(let-values(((id_166)(unsafe-car lst_86))"
+"(let-values(((id_167)(unsafe-car lst_86))"
 "((rest_40)(unsafe-cdr lst_86)))"
 "(let-values(((fold-var_61)"
-"(let-values(((fold-var_62) fold-var_406))"
-"(let-values(((fold-var_407)"
+"(let-values(((fold-var_62) fold-var_400))"
+"(let-values(((fold-var_401)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(remove-use-site-scopes"
-" id_166"
+" id_167"
 " ctx_126))"
 " fold-var_62))))"
-"(values fold-var_407)))))"
+"(values fold-var_401)))))"
 "(if(not #f)(for-loop_104 fold-var_61 rest_40) fold-var_61)))"
-" fold-var_406)))))"
+" fold-var_400)))))"
 " for-loop_104)"
 " null"
 " lst_6))))))"
@@ -77892,13 +78063,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_101)))"
-"((letrec-values(((for-loop_347)"
+"((letrec-values(((for-loop_340)"
 "(lambda(fold-var_217 lst_87)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_87)"
-"(let-values(((id_167)(unsafe-car lst_87))"
-"((rest_242)(unsafe-cdr lst_87)))"
+"(let-values(((id_168)(unsafe-car lst_87))"
+"((rest_241)(unsafe-cdr lst_87)))"
 "(let-values(((fold-var_26)"
 "(let-values(((fold-var_152) fold-var_217))"
 "(let-values(((fold-var_220)"
@@ -77906,15 +78077,15 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_167"
+" id_168"
 " top-level-bind-scope_6))"
 " fold-var_152))))"
 "(values fold-var_220)))))"
 "(if(not #f)"
-"(for-loop_347 fold-var_26 rest_242)"
+"(for-loop_340 fold-var_26 rest_241)"
 " fold-var_26)))"
 " fold-var_217)))))"
-" for-loop_347)"
+" for-loop_340)"
 " null"
 " lst_101))))))"
 "(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_126)))))))))"
@@ -77938,7 +78109,7 @@ static const char *startup_source =
 "(let-values(((disarmed-s_25)(syntax-disarm$1 s_0)))"
 "(let-values(((ok?_24 define-values1_0 id2_1 rhs3_0)"
 "(let-values(((s_171) s_0))"
-"(let-values(((orig-s_98) s_171))"
+"(let-values(((orig-s_100) s_171))"
 "(let-values(((define-values1_1 id2_2 rhs3_1)"
 "(let-values(((s_40)(if(syntax?$1 s_171)(syntax-e$1 s_171) s_171)))"
 "(if(pair? s_40)"
@@ -77956,19 +78127,19 @@ static const char *startup_source =
 "(if(syntax?$1 s_158)"
 "(syntax-e$1 s_158)"
 " s_158)))"
-"(let-values(((flat-s_64)"
+"(let-values(((flat-s_66)"
 "(to-syntax-list.1"
 " s_5)))"
-"(if(not flat-s_64)"
+"(if(not flat-s_66)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                            \"bad syntax\""
-" orig-s_98))"
+" orig-s_100))"
 "(let-values()"
-"(let-values(((id_168)"
+"(let-values(((id_169)"
 "(let-values(((lst_24)"
-" flat-s_64))"
+" flat-s_66))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -77989,10 +78160,10 @@ static const char *startup_source =
 "((rest_141)"
 "(unsafe-cdr"
 " lst_81)))"
-"(let-values(((id_169)"
+"(let-values(((id_170)"
 "(let-values(((id_52)"
 " id_6))"
-"(let-values(((id_170)"
+"(let-values(((id_171)"
 "(let-values()"
 "(let-values(((id10_1)"
 "(let-values()"
@@ -78011,24 +78182,24 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                          \"not an identifier\""
-" orig-s_98"
+" orig-s_100"
 " s_182)))))"
 "(cons"
 " id10_1"
 " id_52)))))"
 "(values"
-" id_170)))))"
+" id_171)))))"
 "(if(not"
 " #f)"
 "(for-loop_253"
-" id_169"
+" id_170"
 " rest_141)"
-" id_169)))"
+" id_170)))"
 " id_6)))))"
 " for-loop_253)"
 " null"
 " lst_24)))))"
-"(reverse$1 id_168))))))))"
+"(reverse$1 id_169))))))))"
 "((rhs8_0)"
 "(let-values(((s_84)(cdr s_173)))"
 "(let-values(((s_383)"
@@ -78057,16 +78228,19 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                            \"bad syntax\""
-" orig-s_98))))))"
+" orig-s_100))))))"
 "(values rhs9_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                        \"bad syntax\""
-" orig-s_98))))))"
+" orig-s_100))))))"
 "(values id7_0 rhs8_0))"
-"                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_98))))))"
+"(raise-syntax-error$1"
+" #f"
+"                                                                    \"bad syntax\""
+" orig-s_100))))))"
 "(values define-values4_0 id5_0 rhs6_0))"
-"                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
+"                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_100)))))"
 "(values #t define-values1_1 id2_2 rhs3_1))))))"
 "(let-values(((ids_50 syms_28)(as-expand-time-top-level-bindings id2_1 s_0 ctx_7)))"
 "(let-values(((exp-rhs_9)"
@@ -78080,7 +78254,7 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'define-syntaxes"
-"(lambda(s_876 ctx_127)"
+"(lambda(s_896 ctx_127)"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_166)(expand-context-observer ctx_127)))"
@@ -78097,12 +78271,12 @@ static const char *startup_source =
 "(begin"
 "(if(eq?(expand-context-context ctx_127) 'top-level)"
 "(void)"
-"                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_876)))"
+"                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_896)))"
 "(values))))"
-"(let-values(((disarmed-s_26)(syntax-disarm$1 s_876)))"
-"(let-values(((ok?_91 define-syntaxes15_0 id16_1 rhs17_0)"
+"(let-values(((disarmed-s_26)(syntax-disarm$1 s_896)))"
+"(let-values(((ok?_93 define-syntaxes15_0 id16_1 rhs17_0)"
 "(let-values(((s_426) disarmed-s_26))"
-"(let-values(((orig-s_99) s_426))"
+"(let-values(((orig-s_101) s_426))"
 "(let-values(((define-syntaxes15_1 id16_2 rhs17_1)"
 "(let-values(((s_20)(if(syntax?$1 s_426)(syntax-e$1 s_426) s_426)))"
 "(if(pair? s_20)"
@@ -78116,24 +78290,24 @@ static const char *startup_source =
 " s_461)))"
 "(if(pair? s_24)"
 "(let-values(((id21_0)"
-"(let-values(((s_727)(car s_24)))"
+"(let-values(((s_743)(car s_24)))"
 "(let-values(((s_468)"
-"(if(syntax?$1 s_727)"
-"(syntax-e$1 s_727)"
-" s_727)))"
-"(let-values(((flat-s_65)"
+"(if(syntax?$1 s_743)"
+"(syntax-e$1 s_743)"
+" s_743)))"
+"(let-values(((flat-s_67)"
 "(to-syntax-list.1"
 " s_468)))"
-"(if(not flat-s_65)"
+"(if(not flat-s_67)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                              \"bad syntax\""
-" orig-s_99))"
+" orig-s_101))"
 "(let-values()"
-"(let-values(((id_171)"
+"(let-values(((id_172)"
 "(let-values(((lst_180)"
-" flat-s_65))"
+" flat-s_67))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -78141,22 +78315,22 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_180)))"
-"((letrec-values(((for-loop_348)"
-"(lambda(id_172"
-" lst_457)"
+"((letrec-values(((for-loop_341)"
+"(lambda(id_173"
+" lst_460)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_457)"
+" lst_460)"
 "(let-values(((s_149)"
 "(unsafe-car"
-" lst_457))"
+" lst_460))"
 "((rest_262)"
 "(unsafe-cdr"
-" lst_457)))"
-"(let-values(((id_173)"
+" lst_460)))"
+"(let-values(((id_174)"
 "(let-values(((id_97)"
-" id_172))"
+" id_173))"
 "(let-values(((id_98)"
 "(let-values()"
 "(let-values(((id24_1)"
@@ -78176,7 +78350,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                            \"not an identifier\""
-" orig-s_99"
+" orig-s_101"
 " s_149)))))"
 "(cons"
 " id24_1"
@@ -78185,15 +78359,15 @@ static const char *startup_source =
 " id_98)))))"
 "(if(not"
 " #f)"
-"(for-loop_348"
-" id_173"
+"(for-loop_341"
+" id_174"
 " rest_262)"
-" id_173)))"
-" id_172)))))"
-" for-loop_348)"
+" id_174)))"
+" id_173)))))"
+" for-loop_341)"
 " null"
 " lst_180)))))"
-"(reverse$1 id_171))))))))"
+"(reverse$1 id_172))))))))"
 "((rhs22_0)"
 "(let-values(((s_495)(cdr s_24)))"
 "(let-values(((s_476)"
@@ -78222,27 +78396,27 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                              \"bad syntax\""
-" orig-s_99))))))"
+" orig-s_101))))))"
 "(values rhs23_2))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                          \"bad syntax\""
-" orig-s_99))))))"
+" orig-s_101))))))"
 "(values id21_0 rhs22_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                      \"bad syntax\""
-" orig-s_99))))))"
+" orig-s_101))))))"
 "(values define-syntaxes18_0 id19_1 rhs20_0))"
-"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_99)))))"
+"                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_101)))))"
 "(values #t define-syntaxes15_1 id16_2 rhs17_1))))))"
-"(let-values(((ids_51 syms_29)(as-expand-time-top-level-bindings id16_1 s_876 ctx_127)))"
+"(let-values(((ids_51 syms_29)(as-expand-time-top-level-bindings id16_1 s_896 ctx_127)))"
 "(let-values(((exp-rhs_10)"
 "(let-values(((temp25_7) rhs17_0)((temp26_6)(as-named-context ctx_127 ids_51)))"
 "(expand-transformer58.1 #f #f #f #f #f #f #f #f #f #f #f #f temp25_7 temp26_6))))"
 "(if(expand-context-to-parsed? ctx_127)"
-"(parsed-define-syntaxes20.1 s_876 ids_51 syms_29 exp-rhs_10)"
-"(let-values(((s27_3) s_876)((temp28_7)(list define-syntaxes15_0 ids_51 exp-rhs_10)))"
+"(parsed-define-syntaxes20.1 s_896 ids_51 syms_29 exp-rhs_10)"
+"(let-values(((s27_3) s_896)((temp28_7)(list define-syntaxes15_0 ids_51 exp-rhs_10)))"
 "(rebuild5.1 #f #f s27_3 temp28_7)))))))))))))"
 "(void"
 "(add-core-form!*"
@@ -78254,9 +78428,9 @@ static const char *startup_source =
 "(void)"
 "                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_480)))"
 "(values))))"
-"(let-values(((ok?_92 begin-for-syntax29_0 form30_0)"
+"(let-values(((ok?_94 begin-for-syntax29_0 form30_0)"
 "(let-values(((s_421) s_480))"
-"(let-values(((orig-s_100) s_421))"
+"(let-values(((orig-s_102) s_421))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
 "(let-values(((s_422)(if(syntax?$1 s_421)(syntax-e$1 s_421) s_421)))"
 "(if(pair? s_422)"
@@ -78266,13 +78440,13 @@ static const char *startup_source =
 "(let-values(((s_46)(cdr s_422)))"
 "(let-values(((s_150)"
 "(if(syntax?$1 s_46)(syntax-e$1 s_46) s_46)))"
-"(let-values(((flat-s_66)(to-syntax-list.1 s_150)))"
-"(if(not flat-s_66)"
+"(let-values(((flat-s_68)(to-syntax-list.1 s_150)))"
+"(if(not flat-s_68)"
 "(let-values()"
-"                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_100))"
-"(let-values() flat-s_66)))))))"
+"                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_102))"
+"(let-values() flat-s_68)))))))"
 "(values begin-for-syntax31_0 form32_0))"
-"                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_100)))))"
+"                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_102)))))"
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
@@ -78494,7 +78668,7 @@ static const char *startup_source =
 "                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_33)))"
 "(values))))"
 "(let-values(((disarmed-s_27)(syntax-disarm$1 s_33)))"
-"(let-values(((ok?_93 #%require47_0 req48_0)"
+"(let-values(((ok?_95 #%require47_0 req48_0)"
 "(let-values(((s_196) disarmed-s_27))"
 "(let-values(((orig-s_4) s_196))"
 "(let-values(((#%require47_1 req48_1)"
@@ -78502,16 +78676,16 @@ static const char *startup_source =
 "(if(pair? s_58)"
 "(let-values(((#%require49_0)(let-values(((s_501)(car s_58))) s_501))"
 "((req50_0)"
-"(let-values(((s_877)(cdr s_58)))"
+"(let-values(((s_897)(cdr s_58)))"
 "(let-values(((s_198)"
-"(if(syntax?$1 s_877)"
-"(syntax-e$1 s_877)"
-" s_877)))"
-"(let-values(((flat-s_67)(to-syntax-list.1 s_198)))"
-"(if(not flat-s_67)"
+"(if(syntax?$1 s_897)"
+"(syntax-e$1 s_897)"
+" s_897)))"
+"(let-values(((flat-s_69)(to-syntax-list.1 s_198)))"
+"(if(not flat-s_69)"
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_4))"
-"(let-values() flat-s_67)))))))"
+"(let-values() flat-s_69)))))))"
 "(values #%require49_0 req50_0))"
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_4)))))"
 "(values #t #%require47_1 req48_1))))))"
@@ -78519,21 +78693,21 @@ static const char *startup_source =
 "(begin"
 "(let-values(((temp51_3)"
 "(reverse$1"
-"(let-values(((lst_458) req48_0))"
+"(let-values(((lst_461) req48_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_458)))"
-"((letrec-values(((for-loop_349)"
+"(let-values()(check-list lst_461)))"
+"((letrec-values(((for-loop_342)"
 "(lambda(fold-var_295 lst_152)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_152)"
 "(let-values(((req_20)(unsafe-car lst_152))"
 "((rest_263)(unsafe-cdr lst_152)))"
-"(let-values(((fold-var_408)"
+"(let-values(((fold-var_402)"
 "(let-values(((fold-var_298) fold-var_295))"
-"(let-values(((fold-var_409)"
+"(let-values(((fold-var_403)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -78541,14 +78715,14 @@ static const char *startup_source =
 " req_20"
 " sc_40))"
 " fold-var_298))))"
-"(values fold-var_409)))))"
+"(values fold-var_403)))))"
 "(if(not #f)"
-"(for-loop_349 fold-var_408 rest_263)"
-" fold-var_408)))"
+"(for-loop_342 fold-var_402 rest_263)"
+" fold-var_402)))"
 " fold-var_295)))))"
-" for-loop_349)"
+" for-loop_342)"
 " null"
-" lst_458)))))"
+" lst_461)))))"
 "((s52_0) s_33)"
 "((temp53_5) #f)"
 "((temp54_7)(expand-context-namespace ctx_128))"
@@ -78635,12 +78809,12 @@ static const char *startup_source =
 "(let-values(((table_231) table_230))"
 "(let-values(((table_186)"
 "(let-values()"
-"(let-values(((key_99 val_90)"
+"(let-values(((key_98 val_90)"
 "(let-values()"
 "(values"
 "(let-values() name_81)"
 " #t))))"
-"(hash-set table_231 key_99 val_90)))))"
+"(hash-set table_231 key_98 val_90)))))"
 "(values table_186)))))"
 "(if(not #f)"
 "(for-loop_20 table_217(hash-iterate-next ht_172 i_3))"
@@ -78655,7 +78829,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_173)))"
-"((letrec-values(((for-loop_331)"
+"((letrec-values(((for-loop_324)"
 "(lambda(table_189 i_187)"
 "(begin"
 " 'for-loop"
@@ -78665,21 +78839,18 @@ static const char *startup_source =
 "(let-values(((table_109) table_189))"
 "(let-values(((table_110)"
 "(let-values()"
-"(let-values(((key_100 val_91)"
+"(let-values(((key_99 val_91)"
 "(let-values()"
 "(values"
 "(let-values() name_82)"
 " #t))))"
-"(hash-set"
-" table_109"
-" key_100"
-" val_91)))))"
+"(hash-set table_109 key_99 val_91)))))"
 "(values table_110)))))"
 "(if(not #f)"
-"(for-loop_331 table_116(hash-iterate-next ht_173 i_187))"
+"(for-loop_324 table_116(hash-iterate-next ht_173 i_187))"
 " table_116)))"
 " table_189)))))"
-" for-loop_331)"
+" for-loop_324)"
 " '#hash()"
 "(hash-iterate-first ht_173))))))"
 "(declare-kernel-module!8.1 eval27_0 temp28_8 temp29_5 ns26_3))"
@@ -78749,5 +78920,5 @@ static const char *startup_source =
 "(declare-reexporting-module!50.1 ns35_1 temp36_11 #t temp33_4 temp34_6))"
 "(1/current-namespace ns)"
 "(1/dynamic-require ''#%kernel 0)))"
-"(define-values(datum->kernel-syntax)(lambda(s_878)(begin(1/datum->syntax core-stx s_878)))))"
+"(define-values(datum->kernel-syntax)(lambda(s_898)(begin(1/datum->syntax core-stx s_898)))))"
 ;