From e4e17db51dae69111633a1bac8d91528917581a3 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 8 Mar 2018 14:14:28 -0700
Subject: [PATCH] expander: fix origin tracking with a `set!` transformer

---
 pkgs/racket-test-core/tests/racket/stx.rktl |   19 +
 racket/src/expander/expand/expr.rkt         |    8 +-
 racket/src/expander/expand/main.rkt         |    5 +-
 racket/src/racket/src/startup.inc           | 9640 ++++++++++---------
 4 files changed, 4868 insertions(+), 4804 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/stx.rktl b/pkgs/racket-test-core/tests/racket/stx.rktl
index 2e5f327b0a..5984618c22 100644
--- a/pkgs/racket-test-core/tests/racket/stx.rktl
+++ b/pkgs/racket-test-core/tests/racket/stx.rktl
@@ -400,6 +400,25 @@
         (syntax-case stx ()
           [(_ () (_ () e)) (car (syntax-property #'e 'origin))])))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Check 'origin tracing for a set!-transformer
+
+(test #t
+      'has-do-not-forget-me-origin?
+      (let ([stx (expand #'(let-syntax ([do-not-forget-me (make-set!-transformer
+                                                           (lambda (stx)
+                                                             #'10))])
+                             (set! do-not-forget-me 5)))])
+        (let loop ([v stx])
+          (cond
+            [(syntax? v)
+             (or (loop (syntax-property v 'origin))
+                 (loop (syntax-e v)))]
+            [(pair? v) (or (loop (car v))
+                           (loop (cdr v)))]
+            [(eq? v 'do-not-forget-me) #t]
+            [else #f]))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Make sure a language name via `#lang` is original
 
diff --git a/racket/src/expander/expand/expr.rkt b/racket/src/expander/expand/expr.rkt
index 949888d3a1..e003763d69 100644
--- a/racket/src/expander/expand/expr.rkt
+++ b/racket/src/expander/expand/expr.rkt
@@ -631,8 +631,8 @@
    (log-expand ctx 'prim-set!)
    (define disarmed-s (syntax-disarm s))
    (define-match m disarmed-s '(set! id rhs))
-   (define id (m 'id))
-   (let rename-loop ([id id] [from-rename? #f])
+   (define orig-id (m 'id))
+   (let rename-loop ([id orig-id] [from-rename? #f])
      (define binding (resolve+shift id (expand-context-phase ctx)
                                     #:ambiguous-value 'ambiguous
                                     #:immediate? #t))
@@ -672,7 +672,7 @@
                  ctx)]
         [else
          (define-values (exp-s re-ctx)
-           (apply-transformer t insp s id ctx binding))
+           (apply-transformer t insp s orig-id ctx binding #:origin-id orig-id))
          (cond
           [(expand-context-just-once? ctx) exp-s]
           [else (expand exp-s re-ctx)])])]
@@ -681,7 +681,7 @@
         [(not-in-this-expand-context? t ctx)
          (expand (avoid-current-expand-context (substitute-set!-rename s disarmed-s (m 'set!) (m 'rhs) id from-rename? ctx t) t ctx)
                  ctx)]
-        [else (rename-loop (rename-transformer-target-in-context t ctx) #t)])]
+        [else (rename-loop (syntax-track-origin (rename-transformer-target-in-context t ctx) id id) #t)])]
       [else
        (raise-syntax-error #f "cannot mutate syntax identifier" s id)]))))
 
diff --git a/racket/src/expander/expand/main.rkt b/racket/src/expander/expand/main.rkt
index e7c223bab9..cf93196216 100644
--- a/racket/src/expander/expand/main.rkt
+++ b/racket/src/expander/expand/main.rkt
@@ -337,7 +337,8 @@
 ;; scopes to represent the expansion step; the `insp-of-t` inspector
 ;; is the inspector of the module that defines `t`, which gives it
 ;; priviledge for `syntax-arm` and similar
-(define (apply-transformer t insp-of-t s id ctx binding)
+(define (apply-transformer t insp-of-t s id ctx binding
+                           #:origin-id [origin-id #f])
   (performance-region
    ['expand '_ 'macro]
 
@@ -366,7 +367,7 @@
    ;; any expansion result
    (define post-s (maybe-add-post-expansion-scope result-s ctx))
    ;; Track expansion:
-   (define tracked-s (syntax-track-origin post-s cleaned-s (if (identifier? s) s (car (syntax-e s)))))
+   (define tracked-s (syntax-track-origin post-s cleaned-s (or origin-id (if (identifier? s) s (car (syntax-e s))))))
    (define rearmed-s (taint-dispatch tracked-s (lambda (t-s) (syntax-rearm t-s s)) (expand-context-phase ctx)))
    (log-expand ctx 'exit-macro rearmed-s)
    (values rearmed-s
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index ba12f76455..6aae70d146 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -38730,11 +38730,11 @@ static const char *startup_source =
 " s_43))"
 "(let-values()"
 "(let-values(((binding_18)"
-"(let-values(((id77_0) id_59)"
-"((temp78_2)(expand-context-phase ctx_15))"
-"((temp79_0) 'ambiguous)"
-"((temp80_1) #t))"
-"(resolve+shift30.1 temp79_0 #t #f #f #f #f temp80_1 #t #f #f id77_0 temp78_2))))"
+"(let-values(((id88_0) id_59)"
+"((temp89_1)(expand-context-phase ctx_15))"
+"((temp90_0) 'ambiguous)"
+"((temp91_0) #t))"
+"(resolve+shift30.1 temp90_0 #t #f #f #f #f temp91_0 #t #f #f id88_0 temp89_1))))"
 "(begin"
 "(let-values(((obs_3)(expand-context-observer ctx_15)))"
 "(if obs_3"
@@ -38749,12 +38749,12 @@ static const char *startup_source =
 "(let-values()(expand-implicit '#%top(substitute-alternate-id s_43 alternate-id_1) ctx_15 s_43))"
 "(let-values()"
 "(let-values(((t_45 primitive?_2 insp-of-t_0 protected?_3)"
-"(let-values(((binding81_0) binding_18)"
-"((ctx82_0) ctx_15)"
-"((id83_0) id_59)"
-"((temp84_0)(if alternate-id_1 s_43 #f))"
-"((temp85_0)(expand-context-in-local-expand? ctx_15)))"
-"(lookup17.1 temp84_0 #t temp85_0 #t binding81_0 ctx82_0 id83_0))))"
+"(let-values(((binding92_0) binding_18)"
+"((ctx93_0) ctx_15)"
+"((id94_0) id_59)"
+"((temp95_1)(if alternate-id_1 s_43 #f))"
+"((temp96_2)(expand-context-in-local-expand? ctx_15)))"
+"(lookup28.1 temp95_1 #t temp96_2 #t binding92_0 ctx93_0 id94_0))))"
 "(dispatch t_45 insp-of-t_0 s_43 id_59 ctx_15 binding_18 primitive?_2 protected?_3)))))))))))))"
 "(define-values"
 "(expand-id-application-form)"
@@ -38782,11 +38782,11 @@ static const char *startup_source =
 " s_13))"
 "(let-values()"
 "(let-values(((binding_19)"
-"(let-values(((id86_0) id_60)"
-"((temp87_1)(expand-context-phase ctx_16))"
-"((temp88_2) 'ambiguous)"
-"((temp89_1) #t))"
-"(resolve+shift30.1 temp88_2 #t #f #f #f #f temp89_1 #t #f #f id86_0 temp87_1))))"
+"(let-values(((id97_0) id_60)"
+"((temp98_1)(expand-context-phase ctx_16))"
+"((temp99_1) 'ambiguous)"
+"((temp100_0) #t))"
+"(resolve+shift30.1 temp99_1 #t #f #f #f #f temp100_0 #t #f #f id97_0 temp98_1))))"
 "(begin"
 "(let-values(((obs_4)(expand-context-observer ctx_16)))"
 "(if obs_4"
@@ -38801,12 +38801,12 @@ static const char *startup_source =
 "(let-values()(expand-implicit '#%app(substitute-alternate-id s_13 alternate-id_2) ctx_16 id_60))"
 "(let-values()"
 "(let-values(((t_46 primitive?_3 insp-of-t_1 protected?_4)"
-"(let-values(((binding90_0) binding_19)"
-"((ctx91_0) ctx_16)"
-"((id92_0) id_60)"
-"((temp93_2)(if alternate-id_2(car(syntax-e/no-taint s_13)) #f))"
-"((temp94_1)(expand-context-in-local-expand? ctx_16)))"
-"(lookup17.1 temp93_2 #t temp94_1 #t binding90_0 ctx91_0 id92_0))))"
+"(let-values(((binding101_0) binding_19)"
+"((ctx102_0) ctx_16)"
+"((id103_0) id_60)"
+"((temp104_0)(if alternate-id_2(car(syntax-e/no-taint s_13)) #f))"
+"((temp105_0)(expand-context-in-local-expand? ctx_16)))"
+"(lookup28.1 temp104_0 #t temp105_0 #t binding101_0 ctx102_0 id103_0))))"
 "(if(variable? t_46)"
 "(let-values()"
 "(expand-implicit '#%app(substitute-alternate-id s_13 alternate-id_2) ctx_16 id_60))"
@@ -38859,18 +38859,18 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((b_74)"
-"(let-values(((id95_0) id_61)"
-"((temp96_2)(expand-context-phase ctx_17))"
-"((temp97_1) 'ambiguous)"
-"((temp98_1) #t))"
-"(resolve+shift30.1 temp97_1 #t #f #f #f #f temp98_1 #t #f #f id95_0 temp96_2))))"
+"(let-values(((id106_0) id_61)"
+"((temp107_0)(expand-context-phase ctx_17))"
+"((temp108_0) 'ambiguous)"
+"((temp109_0) #t))"
+"(resolve+shift30.1 temp108_0 #t #f #f #f #f temp109_0 #t #f #f id106_0 temp107_0))))"
 "(if(eq? b_74 'ambiguous)"
 "(let-values()(raise-ambiguous-error id_61 ctx_17))"
 "(let-values()"
 "(let-values(((t_27 primitive?_4 insp-of-t_2 protected?_5)"
 "(if b_74"
-"(let-values(((b99_0) b_74)((ctx100_0) ctx_17)((id101_0) id_61))"
-"(lookup17.1 #f #f #f #f b99_0 ctx100_0 id101_0))"
+"(let-values(((b110_0) b_74)((ctx111_0) ctx_17)((id112_0) id_61))"
+"(lookup28.1 #f #f #f #f b110_0 ctx111_0 id112_0))"
 "(values #f #f #f #f))))"
 "(if(transformer? t_27)"
 "(let-values()"
@@ -38903,9 +38903,9 @@ static const char *startup_source =
 " #f)))"
 "(let-values(((tl-b_0)"
 "(if tl-id_0"
-"(let-values(((tl-id102_0) tl-id_0)"
-"((temp103_1)(expand-context-phase ctx_17)))"
-"(resolve40.1 #f #f #f #f #f #f #f #f tl-id102_0 temp103_1))"
+"(let-values(((tl-id113_0) tl-id_0)"
+"((temp114_0)(expand-context-phase ctx_17)))"
+"(resolve40.1 #f #f #f #f #f #f #f #f tl-id113_0 temp114_0))"
 " #f)))"
 "(if tl-b_0"
 "(let-values()"
@@ -38959,8 +38959,8 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_8 'opaque-expr result-s_1)))"
 "(void)))"
 "(if(if(expand-context-to-parsed? ctx_18)(free-id-set-empty?(expand-context-stops ctx_18)) #f)"
-"(let-values(((result-s104_0) result-s_1)((ctx105_0) ctx_18))"
-"(expand7.1 #f #f #f #f result-s104_0 ctx105_0))"
+"(let-values(((result-s115_0) result-s_1)((ctx116_0) ctx_18))"
+"(expand7.1 #f #f #f #f result-s115_0 ctx116_0))"
 " result-s_1)))))))))))"
 "(define-values"
 "(make-explicit)"
@@ -39053,8 +39053,8 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_16)(expand-context-observer ctx_23)))"
 "(if obs_16(let-values()(let-values()(call-expand-observe obs_16 'exit-macro s_392)))(void)))"
-"(let-values(((adj-s106_0) adj-s_0)((ctx107_0) ctx_23))"
-"(expand7.1 #f #f #f #f adj-s106_0 ctx107_0))))))"
+"(let-values(((adj-s117_0) adj-s_0)((ctx118_0) ctx_23))"
+"(expand7.1 #f #f #f #f adj-s117_0 ctx118_0))))))"
 "(if(expand-context-should-not-encounter-macros? ctx_23)"
 "(let-values()"
 "            (raise-syntax-error$1 #f \"encountered a macro binding in form that should be fully expanded\" s_392))"
@@ -39075,7 +39075,21 @@ static const char *startup_source =
 "(let-values(((exp-s_1 re-ctx_0)"
 "(if(1/rename-transformer? t_50)"
 "(values s_392 ctx_23)"
-"(apply-transformer t_50 insp-of-t_4 s_392 id_63 ctx_23 binding_21))))"
+"(let-values(((t119_0) t_50)"
+"((insp-of-t120_0) insp-of-t_4)"
+"((s121_0) s_392)"
+"((id122_0) id_63)"
+"((ctx123_0) ctx_23)"
+"((binding124_0) binding_21))"
+"(apply-transformer18.1"
+" #f"
+" #f"
+" t119_0"
+" insp-of-t120_0"
+" s121_0"
+" id122_0"
+" ctx123_0"
+" binding124_0)))))"
 "(begin"
 "(let-values(((obs_18)(expand-context-observer ctx_23)))"
 "(if obs_18"
@@ -39087,44 +39101,44 @@ static const char *startup_source =
 "(if(expand-context-just-once? ctx_23)"
 "(let-values() exp-s_1)"
 "(let-values()"
-"(let-values(((exp-s108_0) exp-s_1)"
-"((re-ctx109_0) re-ctx_0)"
-"((temp110_0)"
+"(let-values(((exp-s125_0) exp-s_1)"
+"((re-ctx126_0) re-ctx_0)"
+"((temp127_0)"
 "(if(1/rename-transformer? t_50)"
 "(syntax-track-origin$1"
 "(transfer-srcloc(rename-transformer-target-in-context t_50 ctx_23) id_63)"
 " id_63"
 " id_63)"
 " #f))"
-"((temp111_0)"
-"(let-values(((or-part_47)(expand-context-only-immediate? ctx_23)))"
-"(if or-part_47 or-part_47(1/rename-transformer? t_50)))))"
-"(expand7.1 temp110_0 #t temp111_0 #t exp-s108_0 re-ctx109_0)))))))))))))"
+"((temp128_0)"
+"(let-values(((or-part_271)(expand-context-only-immediate? ctx_23)))"
+"(if or-part_271 or-part_271(1/rename-transformer? t_50)))))"
+"(expand7.1 temp127_0 #t temp128_0 #t exp-s125_0 re-ctx126_0)))))))))))))"
 "(define-values"
 "(dispatch-variable)"
-"(lambda(t_51 s_399 id_8 ctx_24 binding_22 primitive?_6 protected?_7)"
+"(lambda(t_51 s_399 id_64 ctx_24 binding_22 primitive?_6 protected?_7)"
 "(begin"
 "(if(expand-context-only-immediate? ctx_24)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_19)(expand-context-observer ctx_24)))"
 "(if obs_19(let-values()(let-values()(call-expand-observe obs_19 'exit-check s_399)))(void)))"
-" id_8))"
+" id_64))"
 "(let-values()"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_20)(expand-context-observer ctx_24)))"
 "(if obs_20"
-"(let-values()(let-values()(call-expand-observe obs_20 'variable s_399 id_8)))"
+"(let-values()(let-values()(call-expand-observe obs_20 'variable s_399 id_64)))"
 "(void)))"
 "(values))))"
 "(let-values((()(begin(register-variable-referenced-if-local! binding_22)(values))))"
 "(let-values(((result-s_4)"
-"(let-values(((id112_0) id_8)"
-"((t113_0) t_51)"
-"((temp114_0)"
+"(let-values(((id129_0) id_64)"
+"((t130_0) t_51)"
+"((temp131_0)"
 "(free-id-set-empty-or-just-module*?(expand-context-stops ctx_24))))"
-"(substitute-variable6.1 temp114_0 id112_0 t113_0))))"
+"(substitute-variable6.1 temp131_0 id129_0 t130_0))))"
 "(if(if(expand-context-to-parsed? ctx_24)(free-id-set-empty?(expand-context-stops ctx_24)) #f)"
 "(let-values()"
 "(let-values(((prop-s_0)(keep-properties-only~ result-s_4)))"
@@ -39142,21 +39156,32 @@ static const char *startup_source =
 "(void)))"
 " protected-result-s_0))))))))))))"
 "(define-values"
-"(apply-transformer)"
-"(lambda(t_52 insp-of-t_5 s_56 id_64 ctx_25 binding_23)"
+"(apply-transformer18.1)"
+"(lambda(origin-id10_0 origin-id11_0 t12_0 insp-of-t13_0 s14_0 id15_0 ctx16_0 binding17_1)"
 "(begin"
+" 'apply-transformer18"
+"(let-values(((t_52) t12_0))"
+"(let-values(((insp-of-t_5) insp-of-t13_0))"
+"(let-values(((s_59) s14_0))"
+"(let-values(((id_65) id15_0))"
+"(let-values(((ctx_25) ctx16_0))"
+"(let-values(((binding_23) binding17_1))"
+"(let-values(((origin-id_0)(if origin-id11_0 origin-id10_0 #f)))"
+"(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_22)(expand-context-observer ctx_25)))"
 "(if obs_22"
-"(let-values()(let-values()(call-expand-observe obs_22 'enter-macro s_56)))"
+"(let-values()"
+"(let-values()(call-expand-observe obs_22 'enter-macro s_59)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_3)(syntax-disarm$1 s_56)))"
+"(let-values(((disarmed-s_3)(syntax-disarm$1 s_59)))"
 "(let-values(((intro-scope_0)(new-scope 'macro)))"
 "(let-values(((intro-s_0)(flip-scope disarmed-s_3 intro-scope_0)))"
-"(let-values(((use-s_0 use-scopes_0)(maybe-add-use-site-scope intro-s_0 ctx_25 binding_23)))"
+"(let-values(((use-s_0 use-scopes_0)"
+"(maybe-add-use-site-scope intro-s_0 ctx_25 binding_23)))"
 "(let-values(((cleaned-s_0)(syntax-remove-taint-dispatch-properties use-s_0)))"
 "(let-values(((def-ctx-scopes_1)(box null)))"
 "(let-values(((transformed-s_0)"
@@ -39168,31 +39193,37 @@ static const char *startup_source =
 " intro-scope_0"
 " use-scopes_0"
 " def-ctx-scopes_1"
-" id_64)))"
+" id_65)))"
 "(let-values(((result-s_5)(flip-scope transformed-s_0 intro-scope_0)))"
 "(let-values(((post-s_0)(maybe-add-post-expansion-scope result-s_5 ctx_25)))"
 "(let-values(((tracked-s_0)"
 "(syntax-track-origin$1"
 " post-s_0"
 " cleaned-s_0"
-"(if(identifier? s_56) s_56(car(syntax-e$1 s_56))))))"
+"(let-values(((or-part_272) origin-id_0))"
+"(if or-part_272"
+" or-part_272"
+"(if(identifier? s_59) s_59(car(syntax-e$1 s_59))))))))"
 "(let-values(((rearmed-s_0)"
 "(taint-dispatch"
 " tracked-s_0"
-"(lambda(t-s_0)(syntax-rearm$1 t-s_0 s_56))"
+"(lambda(t-s_0)(syntax-rearm$1 t-s_0 s_59))"
 "(expand-context-phase ctx_25))))"
 "(begin"
 "(let-values(((obs_23)(expand-context-observer ctx_25)))"
 "(if obs_23"
 "(let-values()"
-"(let-values()(call-expand-observe obs_23 'exit-macro rearmed-s_0)))"
+"(let-values()"
+"(call-expand-observe obs_23 'exit-macro rearmed-s_0)))"
 "(void)))"
 "(values"
 " rearmed-s_0"
-"(accumulate-def-ctx-scopes ctx_25 def-ctx-scopes_1)))))))))))))))))))"
+"(accumulate-def-ctx-scopes"
+" ctx_25"
+" def-ctx-scopes_1)))))))))))))))))))))))))))"
 "(define-values"
 "(apply-transformer-in-context)"
-"(lambda(t_53 cleaned-s_1 ctx_26 insp-of-t_6 intro-scope_1 use-scopes_1 def-ctx-scopes_2 id_65)"
+"(lambda(t_53 cleaned-s_1 ctx_26 insp-of-t_6 intro-scope_1 use-scopes_1 def-ctx-scopes_2 id_66)"
 "(begin"
 "(let-values((()"
 "(begin"
@@ -39203,9 +39234,9 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((confine-def-ctx-scopes?_0)"
 "(not"
-"(let-values(((or-part_271)(expand-context-only-immediate? ctx_26)))"
-"(if or-part_271"
-" or-part_271"
+"(let-values(((or-part_273)(expand-context-only-immediate? ctx_26)))"
+"(if or-part_273"
+" or-part_273"
 "(not(free-id-set-empty-or-just-module*?(expand-context-stops ctx_26))))))))"
 "(let-values(((accum-ctx_0)"
 "(if(if confine-def-ctx-scopes?_0"
@@ -39216,17 +39247,17 @@ static const char *startup_source =
 "(accumulate-def-ctx-scopes ctx_26(expand-context-def-ctx-scopes ctx_26))"
 " ctx_26)))"
 "(let-values(((m-ctx_0)"
-"(let-values(((v_112) accum-ctx_0))"
-"(let-values(((the-struct_56) v_112))"
+"(let-values(((v_181) accum-ctx_0))"
+"(let-values(((the-struct_56) v_181))"
 "(if(expand-context/outer? the-struct_56)"
-"(let-values(((current-introduction-scopes115_0)(cons intro-scope_1 use-scopes_1))"
-"((def-ctx-scopes116_0)"
+"(let-values(((current-introduction-scopes132_0)(cons intro-scope_1 use-scopes_1))"
+"((def-ctx-scopes133_0)"
 "(if confine-def-ctx-scopes?_0"
 " def-ctx-scopes_2"
 "(expand-context-def-ctx-scopes ctx_26)))"
-"((inner117_0)(root-expand-context/outer-inner v_112)))"
+"((inner134_0)(root-expand-context/outer-inner v_181)))"
 "(expand-context/outer1.1"
-" inner117_0"
+" inner134_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_56)"
 "(root-expand-context/outer-use-site-scopes the-struct_56)"
 "(root-expand-context/outer-frame-id the-struct_56)"
@@ -39234,12 +39265,12 @@ static const char *startup_source =
 "(expand-context/outer-env the-struct_56)"
 "(expand-context/outer-post-expansion-scope-action the-struct_56)"
 "(expand-context/outer-scopes the-struct_56)"
-" def-ctx-scopes116_0"
+" def-ctx-scopes133_0"
 "(expand-context/outer-binding-layer the-struct_56)"
 "(expand-context/outer-reference-records the-struct_56)"
 "(expand-context/outer-only-immediate? the-struct_56)"
 "(expand-context/outer-need-eventually-defined the-struct_56)"
-" current-introduction-scopes115_0"
+" current-introduction-scopes132_0"
 "(expand-context/outer-name the-struct_56)))"
 "                                (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_56))))))"
 "(let-values(((transformed-s_1)"
@@ -39254,8 +39285,8 @@ static const char *startup_source =
 "(expand-context-namespace ctx_26)"
 "(add1(expand-context-phase ctx_26)))"
 " current-module-code-inspector"
-"(let-values(((or-part_272) insp-of-t_6))"
-"(if or-part_272 or-part_272(current-module-code-inspector))))"
+"(let-values(((or-part_103) insp-of-t_6))"
+"(if or-part_103 or-part_103(current-module-code-inspector))))"
 "(let-values()"
 "(call-with-continuation-barrier"
 "(lambda()((transformer->procedure t_53) cleaned-s_1)))))))"
@@ -39269,14 +39300,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
-"(syntax-e$1 id_65)"
+"(syntax-e$1 id_66)"
 "                       \"received value from syntax expander was not syntax\""
 "                       \"received\""
 " transformed-s_1)))"
 " transformed-s_1)))))))))"
 "(define-values"
 "(maybe-add-use-site-scope)"
-"(lambda(s_400 ctx_27 binding_24)"
+"(lambda(s_212 ctx_27 binding_24)"
 "(begin"
 "(if(if(root-expand-context-use-site-scopes ctx_27)"
 "(matching-frame?(root-expand-context-frame-id ctx_27)(binding-frame-id binding_24))"
@@ -39284,44 +39315,44 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((sc_30)(new-scope 'use-site)))"
 "(let-values(((b_75)(root-expand-context-use-site-scopes ctx_27)))"
-"(begin(set-box! b_75(cons sc_30(unbox b_75)))(values(add-scope s_400 sc_30)(list sc_30))))))"
-"(let-values()(values s_400 null))))))"
+"(begin(set-box! b_75(cons sc_30(unbox b_75)))(values(add-scope s_212 sc_30)(list sc_30))))))"
+"(let-values()(values s_212 null))))))"
 "(define-values"
 "(matching-frame?)"
 "(lambda(current-frame-id_0 bind-frame-id_0)"
 "(begin"
 "(if current-frame-id_0"
-"(let-values(((or-part_273)(eq? current-frame-id_0 bind-frame-id_0)))"
-"(if or-part_273 or-part_273(eq? current-frame-id_0 'all)))"
+"(let-values(((or-part_274)(eq? current-frame-id_0 bind-frame-id_0)))"
+"(if or-part_274 or-part_274(eq? current-frame-id_0 'all)))"
 " #f))))"
 "(define-values"
 "(maybe-add-post-expansion-scope)"
-"(lambda(s_401 ctx_28)"
+"(lambda(s_99 ctx_28)"
 "(begin"
 "(if(root-expand-context-post-expansion-scope ctx_28)"
 "(let-values()"
-"((expand-context-post-expansion-scope-action ctx_28) s_401(root-expand-context-post-expansion-scope ctx_28)))"
-"(let-values() s_401)))))"
+"((expand-context-post-expansion-scope-action ctx_28) s_99(root-expand-context-post-expansion-scope ctx_28)))"
+"(let-values() s_99)))))"
 "(define-values"
 "(accumulate-def-ctx-scopes)"
 "(lambda(ctx_29 def-ctx-scopes_3)"
 "(begin"
 "(if(null?(unbox def-ctx-scopes_3))"
 " ctx_29"
-"(let-values(((v_181) ctx_29))"
-"(let-values(((the-struct_57) v_181))"
+"(let-values(((v_182) ctx_29))"
+"(let-values(((the-struct_57) v_182))"
 "(if(expand-context/outer? the-struct_57)"
-"(let-values(((scopes118_0)(append(unbox def-ctx-scopes_3)(expand-context-scopes ctx_29)))"
-"((inner119_0)(root-expand-context/outer-inner v_181)))"
+"(let-values(((scopes135_0)(append(unbox def-ctx-scopes_3)(expand-context-scopes ctx_29)))"
+"((inner136_0)(root-expand-context/outer-inner v_182)))"
 "(expand-context/outer1.1"
-" inner119_0"
+" inner136_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_57)"
 "(root-expand-context/outer-use-site-scopes the-struct_57)"
 "(root-expand-context/outer-frame-id the-struct_57)"
 "(expand-context/outer-context the-struct_57)"
 "(expand-context/outer-env the-struct_57)"
 "(expand-context/outer-post-expansion-scope-action the-struct_57)"
-" scopes118_0"
+" scopes135_0"
 "(expand-context/outer-def-ctx-scopes the-struct_57)"
 "(expand-context/outer-binding-layer the-struct_57)"
 "(expand-context/outer-reference-records the-struct_57)"
@@ -39331,51 +39362,51 @@ static const char *startup_source =
 "(expand-context/outer-name the-struct_57)))"
 "              (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_57))))))))"
 "(define-values"
-"(lookup17.1)"
-"(lambda(in10_1 in12_1 out-of-context-as-variable?11_0 out-of-context-as-variable?13_0 b14_0 ctx15_0 id16_1)"
+"(lookup28.1)"
+"(lambda(in21_0 in23_0 out-of-context-as-variable?22_0 out-of-context-as-variable?24_0 b25_0 ctx26_0 id27_0)"
 "(begin"
-" 'lookup17"
-"(let-values(((b_76) b14_0))"
-"(let-values(((ctx_30) ctx15_0))"
-"(let-values(((id_66) id16_1))"
-"(let-values(((in-s_7)(if in12_1 in10_1 #f)))"
+" 'lookup28"
+"(let-values(((b_76) b25_0))"
+"(let-values(((ctx_30) ctx26_0))"
+"(let-values(((id_67) id27_0))"
+"(let-values(((in-s_7)(if in23_0 in21_0 #f)))"
 "(let-values(((out-of-context-as-variable?_1)"
-"(if out-of-context-as-variable?13_0 out-of-context-as-variable?11_0 #f)))"
+"(if out-of-context-as-variable?24_0 out-of-context-as-variable?22_0 #f)))"
 "(let-values()"
-"(let-values(((b120_0) b_76)"
-"((temp121_0)(expand-context-env ctx_30))"
-"((temp122_0)(expand-context-lift-envs ctx_30))"
-"((temp123_1)(expand-context-namespace ctx_30))"
-"((temp124_1)(expand-context-phase ctx_30))"
-"((id125_0) id_66)"
-"((in-s126_0) in-s_7)"
-"((out-of-context-as-variable?127_0) out-of-context-as-variable?_1))"
+"(let-values(((b137_0) b_76)"
+"((temp138_0)(expand-context-env ctx_30))"
+"((temp139_0)(expand-context-lift-envs ctx_30))"
+"((temp140_1)(expand-context-namespace ctx_30))"
+"((temp141_1)(expand-context-phase ctx_30))"
+"((id142_0) id_67)"
+"((in-s143_0) in-s_7)"
+"((out-of-context-as-variable?144_0) out-of-context-as-variable?_1))"
 "(binding-lookup50.1"
-" in-s126_0"
+" in-s143_0"
 " #t"
-" out-of-context-as-variable?127_0"
+" out-of-context-as-variable?144_0"
 " #t"
-" b120_0"
-" temp121_0"
-" temp122_0"
-" temp123_1"
-" temp124_1"
-" id125_0)))))))))))"
+" b137_0"
+" temp138_0"
+" temp139_0"
+" temp140_1"
+" temp141_1"
+" id142_0)))))))))))"
 "(define-values"
 "(substitute-alternate-id)"
-"(lambda(s_402 alternate-id_3)"
+"(lambda(s_400 alternate-id_3)"
 "(begin"
 "(if(not alternate-id_3)"
-"(let-values() s_402)"
-"(if(identifier? s_402)"
-"(let-values()(syntax-rearm$1(syntax-track-origin$1 alternate-id_3 s_402) s_402))"
+"(let-values() s_400)"
+"(if(identifier? s_400)"
+"(let-values()(syntax-rearm$1(syntax-track-origin$1 alternate-id_3 s_400) s_400))"
 "(let-values()"
-"(let-values(((disarmed-s_4)(syntax-disarm$1 s_402)))"
+"(let-values(((disarmed-s_4)(syntax-disarm$1 s_400)))"
 "(syntax-rearm$1"
 "(syntax-track-origin$1"
-"(datum->syntax$1 disarmed-s_4(cons alternate-id_3(cdr(syntax-e$1 disarmed-s_4))) s_402)"
-" s_402)"
-" s_402))))))))"
+"(datum->syntax$1 disarmed-s_4(cons alternate-id_3(cdr(syntax-e$1 disarmed-s_4))) s_400)"
+" s_400)"
+" s_400))))))))"
 "(define-values"
 "(register-variable-referenced-if-local!)"
 "(lambda(binding_25)"
@@ -39384,61 +39415,61 @@ static const char *startup_source =
 "(let-values()(reference-record-used!(binding-frame-id binding_25)(local-binding-key binding_25)))"
 "(void)))))"
 "(define-values"
-"(expand/capture-lifts30.1)"
-"(lambda(always-wrap?23_0"
-" always-wrap?27_0"
-" begin-form?21_0"
-" begin-form?25_0"
-" expand-lifts?20_0"
-" expand-lifts?24_0"
-" lift-key22_0"
-" lift-key26_0"
-" s28_1"
-" ctx29_0)"
+"(expand/capture-lifts41.1)"
+"(lambda(always-wrap?34_0"
+" always-wrap?38_0"
+" begin-form?32_0"
+" begin-form?36_0"
+" expand-lifts?31_0"
+" expand-lifts?35_0"
+" lift-key33_0"
+" lift-key37_0"
+" s39_0"
+" ctx40_0)"
 "(begin"
-" 'expand/capture-lifts30"
-"(let-values(((s_106) s28_1))"
-"(let-values(((ctx_31) ctx29_0))"
-"(let-values(((expand-lifts?_0)(if expand-lifts?24_0 expand-lifts?20_0 #f)))"
-"(let-values(((begin-form?_0)(if begin-form?25_0 begin-form?21_0 #f)))"
-"(let-values(((lift-key_2)(if lift-key26_0 lift-key22_0(generate-lift-key))))"
-"(let-values(((always-wrap?_0)(if always-wrap?27_0 always-wrap?23_0 #f)))"
+" 'expand/capture-lifts41"
+"(let-values(((s_401) s39_0))"
+"(let-values(((ctx_31) ctx40_0))"
+"(let-values(((expand-lifts?_0)(if expand-lifts?35_0 expand-lifts?31_0 #f)))"
+"(let-values(((begin-form?_0)(if begin-form?36_0 begin-form?32_0 #f)))"
+"(let-values(((lift-key_2)(if lift-key37_0 lift-key33_0(generate-lift-key))))"
+"(let-values(((always-wrap?_0)(if always-wrap?38_0 always-wrap?34_0 #f)))"
 "(let-values()"
 "(let-values(((context_6)(expand-context-context ctx_31)))"
 "(let-values(((phase_103)(expand-context-phase ctx_31)))"
 "(let-values(((local?_0)(not begin-form?_0)))"
 "((letrec-values(((loop_93)"
-"(lambda(s_403 always-wrap?_1 ctx_32)"
+"(lambda(s_224 always-wrap?_1 ctx_32)"
 "(begin"
 " 'loop"
 "(let-values(((lift-env_2)(if local?_0(box empty-env) #f)))"
 "(let-values(((lift-ctx_0)"
-"(let-values(((temp128_0)"
+"(let-values(((temp145_1)"
 "(if local?_0"
 "(make-local-lift"
 " lift-env_2"
 "(root-expand-context-counter ctx_32))"
 "(make-top-level-lift ctx_32)))"
-"((temp129_1)"
+"((temp146_1)"
 "(if(not local?_0)"
 "(eq? context_6 'module)"
 " #f)))"
-"(make-lift-context6.1 temp129_1 #t temp128_0))))"
+"(make-lift-context6.1 temp146_1 #t temp145_1))))"
 "(let-values(((capture-ctx_0)"
-"(let-values(((v_182) ctx_32))"
-"(let-values(((the-struct_58) v_182))"
+"(let-values(((v_74) ctx_32))"
+"(let-values(((the-struct_58) v_74))"
 "(if(expand-context/outer? the-struct_58)"
-"(let-values(((inner130_0)"
+"(let-values(((inner147_0)"
 "(let-values(((the-struct_59)"
 "(root-expand-context/outer-inner"
-" v_182)))"
+" v_74)))"
 "(if(expand-context/inner?"
 " the-struct_59)"
-"(let-values(((lift-key131_0)"
+"(let-values(((lift-key148_0)"
 " lift-key_2)"
-"((lifts132_0)"
+"((lifts149_0)"
 " lift-ctx_0)"
-"((lift-envs133_0)"
+"((lift-envs150_0)"
 "(if local?_0"
 "(cons"
 " lift-env_2"
@@ -39446,11 +39477,11 @@ static const char *startup_source =
 " ctx_32))"
 "(expand-context-lift-envs"
 " ctx_32)))"
-"((module-lifts134_0)"
-"(if(let-values(((or-part_274)"
+"((module-lifts151_0)"
+"(if(let-values(((or-part_275)"
 " local?_0))"
-"(if or-part_274"
-" or-part_274"
+"(if or-part_275"
+" or-part_275"
 "(not"
 "(memq"
 " context_6"
@@ -39472,7 +39503,7 @@ static const char *startup_source =
 " the-struct_59)"
 "(root-expand-context/inner-counter"
 " the-struct_59)"
-" lift-key131_0"
+" lift-key148_0"
 "(expand-context/inner-to-parsed?"
 " the-struct_59)"
 "(expand-context/inner-phase"
@@ -39491,9 +39522,9 @@ static const char *startup_source =
 " the-struct_59)"
 "(expand-context/inner-declared-submodule-names"
 " the-struct_59)"
-" lifts132_0"
-" lift-envs133_0"
-" module-lifts134_0"
+" lifts149_0"
+" lift-envs150_0"
+" module-lifts151_0"
 "(expand-context/inner-require-lifts"
 " the-struct_59)"
 "(expand-context/inner-to-module-lifts"
@@ -39511,7 +39542,7 @@ static const char *startup_source =
 "                                                                                           \"expand-context/inner?\""
 " the-struct_59)))))"
 "(expand-context/outer1.1"
-" inner130_0"
+" inner147_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_58)"
 "(root-expand-context/outer-use-site-scopes"
@@ -39540,25 +39571,25 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                         \"expand-context/outer?\""
 " the-struct_58))))))"
-"(let-values(((rebuild-s_0)(keep-properties-only s_403)))"
+"(let-values(((rebuild-s_0)(keep-properties-only s_224)))"
 "(let-values(((exp-s_2)"
-"(let-values(((s135_0) s_403)"
-"((capture-ctx136_0) capture-ctx_0))"
+"(let-values(((s152_0) s_224)"
+"((capture-ctx153_0) capture-ctx_0))"
 "(expand7.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" s135_0"
-" capture-ctx136_0))))"
+" s152_0"
+" capture-ctx153_0))))"
 "(let-values(((lifts_6)"
 "(get-and-clear-lifts!"
 "(expand-context-lifts capture-ctx_0))))"
 "(let-values(((with-lifts-s_0)"
-"(if(let-values(((or-part_275)"
+"(if(let-values(((or-part_276)"
 "(pair? lifts_6)))"
-"(if or-part_275"
-" or-part_275"
+"(if or-part_276"
+" or-part_276"
 " always-wrap?_1))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_32)"
@@ -39578,29 +39609,29 @@ static const char *startup_source =
 "(loop_93 rhs_15 #f rhs-ctx_0)))))"
 "(let-values()"
 "(if begin-form?_0"
-"(let-values(((lifts137_0) lifts_6)"
-"((exp-s138_0) exp-s_2)"
-"((phase139_0)"
+"(let-values(((lifts154_0) lifts_6)"
+"((exp-s155_0) exp-s_2)"
+"((phase156_0)"
 " phase_103))"
 "(wrap-lifts-as-begin16.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" lifts137_0"
-" exp-s138_0"
-" phase139_0))"
+" lifts154_0"
+" exp-s155_0"
+" phase156_0))"
 "(wrap-lifts-as-let"
 " lifts_6"
 " exp-s_2"
 " phase_103)))))"
 "(let-values() exp-s_2))))"
-"(if(let-values(((or-part_276)(not expand-lifts?_0)))"
-"(if or-part_276"
-" or-part_276"
-"(let-values(((or-part_277)(null? lifts_6)))"
-"(if or-part_277"
-" or-part_277"
+"(if(let-values(((or-part_109)(not expand-lifts?_0)))"
+"(if or-part_109"
+" or-part_109"
+"(let-values(((or-part_110)(null? lifts_6)))"
+"(if or-part_110"
+" or-part_110"
 "(expand-context-to-parsed? ctx_32)))))"
 "(let-values() with-lifts-s_0)"
 "(let-values()"
@@ -39617,72 +39648,72 @@ static const char *startup_source =
 "(void)))"
 "(loop_93 with-lifts-s_0 #f ctx_32)))))))))))))))"
 " loop_93)"
-" s_106"
+" s_401"
 " always-wrap?_0"
 " ctx_31))))))))))))))"
 "(define-values"
-"(expand-transformer47.1)"
-"(lambda(always-wrap?37_0"
-" always-wrap?43_0"
-" begin-form?34_0"
-" begin-form?40_0"
-" context33_0"
-" context39_0"
-" expand-lifts?35_0"
-" expand-lifts?41_0"
-" keep-stops?38_0"
-" keep-stops?44_0"
-" lift-key36_0"
-" lift-key42_0"
-" s45_0"
-" ctx46_0)"
+"(expand-transformer58.1)"
+"(lambda(always-wrap?48_0"
+" always-wrap?54_0"
+" begin-form?45_0"
+" begin-form?51_0"
+" context44_0"
+" context50_0"
+" expand-lifts?46_0"
+" expand-lifts?52_0"
+" keep-stops?49_0"
+" keep-stops?55_0"
+" lift-key47_0"
+" lift-key53_0"
+" s56_0"
+" ctx57_0)"
 "(begin"
-" 'expand-transformer47"
-"(let-values(((s_404) s45_0))"
-"(let-values(((ctx_33) ctx46_0))"
-"(let-values(((context_7)(if context39_0 context33_0 'expression)))"
-"(let-values(((begin-form?_1)(if begin-form?40_0 begin-form?34_0 #f)))"
-"(let-values(((expand-lifts?_1)(if expand-lifts?41_0 expand-lifts?35_0 #t)))"
-"(let-values(((lift-key_3)(if lift-key42_0 lift-key36_0(generate-lift-key))))"
-"(let-values(((always-wrap?_2)(if always-wrap?43_0 always-wrap?37_0 #f)))"
-"(let-values(((keep-stops?_0)(if keep-stops?44_0 keep-stops?38_0 #f)))"
+" 'expand-transformer58"
+"(let-values(((s_348) s56_0))"
+"(let-values(((ctx_33) ctx57_0))"
+"(let-values(((context_7)(if context50_0 context44_0 'expression)))"
+"(let-values(((begin-form?_1)(if begin-form?51_0 begin-form?45_0 #f)))"
+"(let-values(((expand-lifts?_1)(if expand-lifts?52_0 expand-lifts?46_0 #t)))"
+"(let-values(((lift-key_3)(if lift-key53_0 lift-key47_0(generate-lift-key))))"
+"(let-values(((always-wrap?_2)(if always-wrap?54_0 always-wrap?48_0 #f)))"
+"(let-values(((keep-stops?_0)(if keep-stops?55_0 keep-stops?49_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values(((trans-ctx_0)"
-"(let-values(((ctx146_0) ctx_33)"
-"((context147_0) context_7)"
-"((keep-stops?148_0) keep-stops?_0))"
-"(context->transformer-context55.1"
-" keep-stops?148_0"
+"(let-values(((ctx163_0) ctx_33)"
+"((context164_0) context_7)"
+"((keep-stops?165_0) keep-stops?_0))"
+"(context->transformer-context66.1"
+" keep-stops?165_0"
 " #t"
-" ctx146_0"
-" context147_0"
+" ctx163_0"
+" context164_0"
 " #t))))"
-"(let-values(((s140_0) s_404)"
-"((trans-ctx141_0) trans-ctx_0)"
-"((expand-lifts?142_0) expand-lifts?_1)"
-"((begin-form?143_0) begin-form?_1)"
-"((lift-key144_0) lift-key_3)"
-"((always-wrap?145_0) always-wrap?_2))"
-"(expand/capture-lifts30.1"
-" always-wrap?145_0"
+"(let-values(((s157_0) s_348)"
+"((trans-ctx158_0) trans-ctx_0)"
+"((expand-lifts?159_0) expand-lifts?_1)"
+"((begin-form?160_0) begin-form?_1)"
+"((lift-key161_0) lift-key_3)"
+"((always-wrap?162_0) always-wrap?_2))"
+"(expand/capture-lifts41.1"
+" always-wrap?162_0"
 " #t"
-" begin-form?143_0"
+" begin-form?160_0"
 " #t"
-" expand-lifts?142_0"
+" expand-lifts?159_0"
 " #t"
-" lift-key144_0"
+" lift-key161_0"
 " #t"
-" s140_0"
-" trans-ctx141_0))))))))))))))))"
+" s157_0"
+" trans-ctx158_0))))))))))))))))"
 "(define-values"
-"(context->transformer-context55.1)"
-"(lambda(keep-stops?50_0 keep-stops?51_0 ctx54_0 context52_0 context53_0)"
+"(context->transformer-context66.1)"
+"(lambda(keep-stops?61_0 keep-stops?62_0 ctx65_0 context63_0 context64_0)"
 "(begin"
-" 'context->transformer-context55"
-"(let-values(((ctx_34) ctx54_0))"
-"(let-values(((context_8)(if context53_0 context52_0 'expression)))"
-"(let-values(((keep-stops?_1)(if keep-stops?51_0 keep-stops?50_0 #f)))"
+" 'context->transformer-context66"
+"(let-values(((ctx_34) ctx65_0))"
+"(let-values(((context_8)(if context64_0 context63_0 'expression)))"
+"(let-values(((keep-stops?_1)(if keep-stops?62_0 keep-stops?61_0 #f)))"
 "(let-values()"
 "(let-values(((phase_104)(add1(expand-context-phase ctx_34))))"
 "(let-values(((ns_73)(namespace->namespace-at-phase(expand-context-namespace ctx_34) phase_104)))"
@@ -39691,19 +39722,19 @@ static const char *startup_source =
 "(let-values(((v_183) ctx_34))"
 "(let-values(((the-struct_60) v_183))"
 "(if(expand-context/outer? the-struct_60)"
-"(let-values(((context149_0) context_8)"
-"((scopes150_0) null)"
-"((env151_0) empty-env)"
-"((only-immediate?152_0)"
+"(let-values(((context166_0) context_8)"
+"((scopes167_0) null)"
+"((env168_0) empty-env)"
+"((only-immediate?169_0)"
 "(if keep-stops?_1(expand-context-only-immediate? ctx_34) #f))"
-"((def-ctx-scopes153_0) #f)"
-"((post-expansion-scope154_0) #f)"
-"((inner155_0)"
+"((def-ctx-scopes170_0) #f)"
+"((post-expansion-scope171_0) #f)"
+"((inner172_0)"
 "(let-values(((the-struct_61)(root-expand-context/outer-inner v_183)))"
 "(if(expand-context/inner? the-struct_61)"
-"(let-values(((phase156_0) phase_104)"
-"((namespace157_0) ns_73)"
-"((stops158_0)"
+"(let-values(((phase173_0) phase_104)"
+"((namespace174_0) ns_73)"
+"((stops175_0)"
 "(if keep-stops?_1"
 "(expand-context-stops ctx_34)"
 " empty-free-id-set)))"
@@ -39716,13 +39747,13 @@ static const char *startup_source =
 "(root-expand-context/inner-counter the-struct_61)"
 "(root-expand-context/inner-lift-key the-struct_61)"
 "(expand-context/inner-to-parsed? the-struct_61)"
-" phase156_0"
-" namespace157_0"
+" phase173_0"
+" namespace174_0"
 "(expand-context/inner-just-once? the-struct_61)"
 "(expand-context/inner-module-begin-k the-struct_61)"
 "(expand-context/inner-allow-unbound? the-struct_61)"
 "(expand-context/inner-in-local-expand? the-struct_61)"
-" stops158_0"
+" stops175_0"
 "(expand-context/inner-declared-submodule-names the-struct_61)"
 "(expand-context/inner-lifts the-struct_61)"
 "(expand-context/inner-lift-envs the-struct_61)"
@@ -39738,44 +39769,44 @@ static const char *startup_source =
 "                                             \"expand-context/inner?\""
 " the-struct_61)))))"
 "(expand-context/outer1.1"
-" inner155_0"
-" post-expansion-scope154_0"
+" inner172_0"
+" post-expansion-scope171_0"
 "(root-expand-context/outer-use-site-scopes the-struct_60)"
 "(root-expand-context/outer-frame-id the-struct_60)"
-" context149_0"
-" env151_0"
+" context166_0"
+" env168_0"
 "(expand-context/outer-post-expansion-scope-action the-struct_60)"
-" scopes150_0"
-" def-ctx-scopes153_0"
+" scopes167_0"
+" def-ctx-scopes170_0"
 "(expand-context/outer-binding-layer the-struct_60)"
 "(expand-context/outer-reference-records the-struct_60)"
-" only-immediate?152_0"
+" only-immediate?169_0"
 "(expand-context/outer-need-eventually-defined the-struct_60)"
 "(expand-context/outer-current-introduction-scopes the-struct_60)"
 "(expand-context/outer-name the-struct_60)))"
 "                          (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_60))))))))))))))"
 "(define-values"
-"(expand+eval-for-syntaxes-binding63.1)"
-"(lambda(log-next?58_0 log-next?59_0 rhs60_0 ids61_0 ctx62_0)"
+"(expand+eval-for-syntaxes-binding74.1)"
+"(lambda(log-next?69_0 log-next?70_0 rhs71_0 ids72_0 ctx73_0)"
 "(begin"
-" 'expand+eval-for-syntaxes-binding63"
-"(let-values(((rhs_16) rhs60_0))"
-"(let-values(((ids_19) ids61_0))"
-"(let-values(((ctx_35) ctx62_0))"
-"(let-values(((log-next?_0)(if log-next?59_0 log-next?58_0 #t)))"
+" 'expand+eval-for-syntaxes-binding74"
+"(let-values(((rhs_16) rhs71_0))"
+"(let-values(((ids_19) ids72_0))"
+"(let-values(((ctx_35) ctx73_0))"
+"(let-values(((log-next?_0)(if log-next?70_0 log-next?69_0 #t)))"
 "(let-values()"
 "(let-values(((exp-rhs_0)"
-"(let-values(((rhs159_0) rhs_16)((temp160_1)(as-named-context ctx_35 ids_19)))"
-"(expand-transformer47.1 #f #f #f #f #f #f #f #f #f #f #f #f rhs159_0 temp160_1))))"
+"(let-values(((rhs176_0) rhs_16)((temp177_0)(as-named-context ctx_35 ids_19)))"
+"(expand-transformer58.1 #f #f #f #f #f #f #f #f #f #f #f #f rhs176_0 temp177_0))))"
 "(let-values(((phase_105)(add1(expand-context-phase ctx_35))))"
 "(let-values(((parsed-rhs_0)"
 "(if(expand-context-to-parsed? ctx_35)"
 " exp-rhs_0"
-"(let-values(((exp-rhs161_0) exp-rhs_0)"
-"((temp162_2)"
-"(let-values(((temp163_1)(as-to-parsed-context ctx_35)))"
-"(context->transformer-context55.1 #f #f temp163_1 #f #f))))"
-"(expand7.1 #f #f #f #f exp-rhs161_0 temp162_2)))))"
+"(let-values(((exp-rhs178_0) exp-rhs_0)"
+"((temp179_0)"
+"(let-values(((temp180_0)(as-to-parsed-context ctx_35)))"
+"(context->transformer-context66.1 #f #f temp180_0 #f #f))))"
+"(expand7.1 #f #f #f #f exp-rhs178_0 temp179_0)))))"
 "(begin"
 "(if log-next?_0"
 "(let-values()"
@@ -39796,8 +39827,8 @@ static const char *startup_source =
 "(lambda(rhs_17 ids_20 ctx_36)"
 "(begin"
 "(let-values(((exp-rhs_1 parsed-rhs_1 vals_3)"
-"(let-values(((rhs164_0) rhs_17)((ids165_0) ids_20)((ctx166_0) ctx_36))"
-"(expand+eval-for-syntaxes-binding63.1 #f #f rhs164_0 ids165_0 ctx166_0))))"
+"(let-values(((rhs181_0) rhs_17)((ids182_0) ids_20)((ctx183_0) ctx_36))"
+"(expand+eval-for-syntaxes-binding74.1 #f #f rhs181_0 ids182_0 ctx183_0))))"
 " vals_3))))"
 "(define-values"
 "(eval-for-bindings)"
@@ -39808,8 +39839,8 @@ static const char *startup_source =
 " #f"
 "(compile-single"
 " p_49"
-"(let-values(((ns167_0) ns_74)((phase168_1) phase_106))"
-"(make-compile-context14.1 #f #f #f #f #f #f ns167_0 #t phase168_1 #t #f #f))))))"
+"(let-values(((ns184_0) ns_74)((phase185_0) phase_106))"
+"(make-compile-context14.1 #f #f #f #f #f #f ns184_0 #t phase185_0 #t #f #f))))))"
 "(let-values(((vals_4)"
 "(call-with-values"
 "(lambda()"
@@ -39833,27 +39864,27 @@ static const char *startup_source =
 "(void)"
 "              (let-values () (error \"wrong number of results (\" (length vals_4) \"vs.\" (length ids_21) \")\" \"from\" p_49)))"
 " vals_4))))))"
-"(define-values(keep-properties-only)(lambda(s_405)(begin(datum->syntax$1 #f 'props s_405 s_405))))"
-"(define-values(keep-properties-only~)(lambda(s_406)(begin #f)))"
+"(define-values(keep-properties-only)(lambda(s_402)(begin(datum->syntax$1 #f 'props s_402 s_402))))"
+"(define-values(keep-properties-only~)(lambda(s_403)(begin #f)))"
 "(define-values"
-"(keep-as-needed74.1)"
-"(lambda(for-track?66_0"
-" for-track?69_0"
-" keep-for-error?68_0"
-" keep-for-error?71_0"
-" keep-for-parsed?67_0"
-" keep-for-parsed?70_0"
-" ctx72_0"
-" s73_1)"
+"(keep-as-needed85.1)"
+"(lambda(for-track?77_0"
+" for-track?80_0"
+" keep-for-error?79_0"
+" keep-for-error?82_0"
+" keep-for-parsed?78_0"
+" keep-for-parsed?81_0"
+" ctx83_0"
+" s84_0)"
 "(begin"
-" 'keep-as-needed74"
-"(let-values(((ctx_38) ctx72_0))"
-"(let-values(((s_407) s73_1))"
+" 'keep-as-needed85"
+"(let-values(((ctx_38) ctx83_0))"
+"(let-values(((s_404) s84_0))"
 "(let-values()"
-"(let-values(((keep-for-parsed?_0)(if keep-for-parsed?70_0 keep-for-parsed?67_0 #f)))"
-"(let-values(((keep-for-error?_0)(if keep-for-error?71_0 keep-for-error?68_0 #f)))"
+"(let-values(((keep-for-parsed?_0)(if keep-for-parsed?81_0 keep-for-parsed?78_0 #f)))"
+"(let-values(((keep-for-error?_0)(if keep-for-error?82_0 keep-for-error?79_0 #f)))"
 "(let-values()"
-"(let-values(((d_32)(syntax-e$1 s_407)))"
+"(let-values(((d_32)(syntax-e$1 s_404)))"
 "(let-values(((keep-e_0)"
 "(if(symbol? d_32)"
 "(let-values() d_32)"
@@ -39862,28 +39893,28 @@ static const char *startup_source =
 "(let-values() #f)))))"
 "(if(expand-context-to-parsed? ctx_38)"
 "(let-values()"
-"(if(let-values(((or-part_278) keep-for-parsed?_0))"
-"(if or-part_278 or-part_278 keep-for-error?_0))"
-"(datum->syntax$1 #f keep-e_0 s_407 s_407)"
+"(if(let-values(((or-part_277) keep-for-parsed?_0))"
+"(if or-part_277 or-part_277 keep-for-error?_0))"
+"(datum->syntax$1 #f keep-e_0 s_404 s_404)"
 " #f))"
 "(let-values()"
 "(syntax-rearm$1"
-"(datum->syntax$1(syntax-disarm$1 s_407) keep-e_0 s_407 s_407)"
-" s_407))))))))))))))"
+"(datum->syntax$1(syntax-disarm$1 s_404) keep-e_0 s_404 s_404)"
+" s_404))))))))))))))"
 "(define-values"
 "(attach-disappeared-transformer-bindings)"
-"(lambda(s_408 trans-idss_0)"
+"(lambda(s_405 trans-idss_0)"
 "(begin"
 "(if(null? trans-idss_0)"
-"(let-values() s_408)"
+"(let-values() s_405)"
 "(let-values()"
 "(syntax-property$1"
-" s_408"
+" s_405"
 " 'disappeared-binding"
 "(append"
 "(apply append trans-idss_0)"
-"(let-values(((or-part_123)(syntax-property$1 s_408 'disappeared-binding)))"
-"(if or-part_123 or-part_123 null)))))))))"
+"(let-values(((or-part_278)(syntax-property$1 s_405 'disappeared-binding)))"
+"(if or-part_278 or-part_278 null)))))))))"
 "(define-values"
 "(increment-binding-layer)"
 "(lambda(ids_22 ctx_39 layer-val_0)"
@@ -39929,7 +39960,7 @@ static const char *startup_source =
 "(let-values(((v_184) rhs-ctx_1))"
 "(let-values(((the-struct_62) v_184))"
 "(if(expand-context/outer? the-struct_62)"
-"(let-values(((env169_0)"
+"(let-values(((env186_0)"
 "(let-values(((lst_285) ids_24)((lst_286) keys_4))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -39947,7 +39978,7 @@ static const char *startup_source =
 "(if(if(pair? lst_287)"
 "(pair? lst_288)"
 " #f)"
-"(let-values(((id_67)"
+"(let-values(((id_68)"
 "(unsafe-car"
 " lst_287))"
 "((rest_157)"
@@ -39968,7 +39999,7 @@ static const char *startup_source =
 " env_5"
 " key_86"
 "(local-variable1.1"
-" id_67)))))"
+" id_68)))))"
 "(values"
 " env_6)))))"
 "(if(not #f)"
@@ -39982,14 +40013,14 @@ static const char *startup_source =
 "(expand-context-env rhs-ctx_1)"
 " lst_285"
 " lst_286))))"
-"((inner170_0)(root-expand-context/outer-inner v_184)))"
+"((inner187_0)(root-expand-context/outer-inner v_184)))"
 "(expand-context/outer1.1"
-" inner170_0"
+" inner187_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_62)"
 "(root-expand-context/outer-use-site-scopes the-struct_62)"
 "(root-expand-context/outer-frame-id the-struct_62)"
 "(expand-context/outer-context the-struct_62)"
-" env169_0"
+" env186_0"
 "(expand-context/outer-post-expansion-scope-action the-struct_62)"
 "(expand-context/outer-scopes the-struct_62)"
 "(expand-context/outer-def-ctx-scopes the-struct_62)"
@@ -40016,14 +40047,14 @@ static const char *startup_source =
 "(let-values()(1/rename-transformer-target t_54))))))"
 "(define-values"
 "(maybe-install-free=id-in-context!)"
-"(lambda(val_71 id_68 phase_107 ctx_42)"
+"(lambda(val_71 id_69 phase_107 ctx_42)"
 "(begin"
 "(if(1/rename-transformer? val_71)"
 "(let-values()"
 "(with-continuation-mark"
 " parameterization-key"
 "(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_42)"
-"(let-values()(maybe-install-free=id! val_71 id_68 phase_107))))"
+"(let-values()(maybe-install-free=id! val_71 id_69 phase_107))))"
 "(void)))))"
 "(define-values"
 "(transfer-srcloc)"
@@ -40033,14 +40064,14 @@ static const char *startup_source =
 "(if srcloc_7"
 "(let-values(((the-struct_63) new-s_1))"
 "(if(syntax?$1 the-struct_63)"
-"(let-values(((srcloc171_0) srcloc_7))"
+"(let-values(((srcloc188_0) srcloc_7))"
 "(syntax1.1"
 "(syntax-content the-struct_63)"
 "(syntax-scopes the-struct_63)"
 "(syntax-shifted-multi-scopes the-struct_63)"
 "(syntax-scope-propagations+tamper the-struct_63)"
 "(syntax-mpi-shifts the-struct_63)"
-" srcloc171_0"
+" srcloc188_0"
 "(syntax-props the-struct_63)"
 "(syntax-inspector the-struct_63)))"
 "              (raise-argument-error 'struct-copy \"syntax?\" the-struct_63)))"
@@ -40237,7 +40268,7 @@ static const char *startup_source =
 "((parent-ctx3_1)(syntax-local-make-definition-context7_0 parent-ctx3_1 #f #t #f)))))"
 "(define-values"
 "(1/syntax-local-bind-syntaxes)"
-"(lambda(ids_25 s_409 intdef_0)"
+"(lambda(ids_25 s_406 intdef_0)"
 "(begin"
 " 'syntax-local-bind-syntaxes"
 "(let-values((()"
@@ -40249,9 +40280,9 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_167)(not s_409)))(if or-part_167 or-part_167(syntax?$1 s_409)))"
+"(if(let-values(((or-part_167)(not s_406)))(if or-part_167 or-part_167(syntax?$1 s_406)))"
 "(void)"
-"                          (let-values () (raise-argument-error 'syntax-local-bind-syntaxes \"(or/c syntax? #f)\" s_409)))"
+"                          (let-values () (raise-argument-error 'syntax-local-bind-syntaxes \"(or/c syntax? #f)\" s_406)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -40286,7 +40317,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_185)"
-"(let-values(((id_69)(unsafe-car lst_185))"
+"(let-values(((id_70)(unsafe-car lst_185))"
 "((rest_160)(unsafe-cdr lst_185)))"
 "(let-values(((fold-var_231)"
 "(let-values(((fold-var_241)"
@@ -40298,7 +40329,7 @@ static const char *startup_source =
 "(let-values(((pre-id_0)"
 "(remove-use-site-scopes"
 "(flip-introduction-scopes"
-" id_69"
+" id_70"
 " ctx_44)"
 " ctx_44)))"
 "(let-values(((pre-id44_0)"
@@ -40380,11 +40411,11 @@ static const char *startup_source =
 " null"
 " lst_290))))))"
 "(let-values(((vals_5)"
-"(if s_409"
+"(if s_406"
 "(let-values()"
 "(let-values(((input-s_0)"
 "(flip-introduction-scopes"
-"(let-values(((s51_0) s_409)"
+"(let-values(((s51_0) s_406)"
 "((intdef52_0) intdef_0)"
 "((temp53_1) #t))"
 "(add-intdef-scopes21.1 #f #f temp53_1 #t s51_0 intdef52_0))"
@@ -40516,7 +40547,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_294)"
-"(let-values(((id_70)(unsafe-car lst_294))"
+"(let-values(((id_71)(unsafe-car lst_294))"
 "((rest_163)(unsafe-cdr lst_294)))"
 "(let-values(((fold-var_247)"
 "(let-values(((fold-var_248)"
@@ -40643,7 +40674,7 @@ static const char *startup_source =
 "(begin"
 " 'internal-definition-context-introduce13"
 "(let-values(((intdef_2) intdef11_0))"
-"(let-values(((s_410) s12_1))"
+"(let-values(((s_407) s12_1))"
 "(let-values(((mode_12)(if mode10_0 mode9_0 'flip)))"
 "(let-values()"
 "(begin"
@@ -40654,11 +40685,11 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                   \"internal-definition-context?\""
 " intdef_2)))"
-"(if(syntax?$1 s_410)"
+"(if(syntax?$1 s_407)"
 "(void)"
 "(let-values()"
-"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_410)))"
-"(let-values(((s59_0) s_410)"
+"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_407)))"
+"(let-values(((s59_0) s_407)"
 "((intdef60_0) intdef_2)"
 "((temp61_1)"
 "(let-values(((tmp_31) mode_12))"
@@ -40691,13 +40722,13 @@ static const char *startup_source =
 "(void)))))"
 "(define-values"
 "(1/identifier-remove-from-definition-context)"
-"(lambda(id_71 intdef_6)"
+"(lambda(id_72 intdef_6)"
 "(begin"
 " 'identifier-remove-from-definition-context"
 "(begin"
-"(if(identifier? id_71)"
+"(if(identifier? id_72)"
 "(void)"
-"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_71)))"
+"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_72)))"
 "(if(let-values(((or-part_281)(1/internal-definition-context? intdef_6)))"
 "(if or-part_281 or-part_281(if(list? intdef_6)(andmap2 1/internal-definition-context? intdef_6) #f)))"
 "(void)"
@@ -40719,19 +40750,19 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? a_46)"
 "(let-values(((intdef_7)(car a_46)))"
-"(let-values(((id_72)"
-"(let-values(((id_73) id_17))"
-"(let-values(((id_74)"
+"(let-values(((id_73)"
+"(let-values(((id_74) id_17))"
+"(let-values(((id_75)"
 "(let-values()"
 "(1/internal-definition-context-introduce"
 " intdef_7"
-" id_73"
+" id_74"
 " 'remove))))"
-"(values id_74)))))"
-"(if(not #f)(for-loop_178 id_72(cdr a_46)) id_72)))"
+"(values id_75)))))"
+"(if(not #f)(for-loop_178 id_73(cdr a_46)) id_73)))"
 " id_17)))))"
 " for-loop_178)"
-" id_71"
+" id_72"
 " x_74)))))))"
 "(define-values"
 "(add-intdef-bindings)"
@@ -40807,7 +40838,7 @@ static const char *startup_source =
 "(lambda(action16_0 action18_0 always?15_0 always?17_0 s19_0 intdefs20_0)"
 "(begin"
 " 'add-intdef-scopes21"
-"(let-values(((s_411) s19_0))"
+"(let-values(((s_408) s19_0))"
 "(let-values(((intdefs_1) intdefs20_0))"
 "(let-values(((always?_0)(if always?17_0 always?15_0 #f)))"
 "(let-values(((action_0)(if action18_0 action16_0 add-scope)))"
@@ -40844,7 +40875,7 @@ static const char *startup_source =
 "(if(not #f)(for-loop_180 s_210(cdr a_50)) s_210)))"
 " s_394)))))"
 " for-loop_180)"
-" s_411"
+" s_408"
 " x_76)))))))))))"
 "(define-values"
 "(make-local-expand-context37.1)"
@@ -40930,10 +40961,10 @@ static const char *startup_source =
 "(let-values()"
 " 'all)"
 "(let-values()"
-"(let-values(((or-part_274)"
+"(let-values(((or-part_287)"
 " frame-id_11))"
-"(if or-part_274"
-" or-part_274"
+"(if or-part_287"
+" or-part_287"
 " i-frame-id_0))))))))"
 "(values frame-id_12)))))"
 "(if(not #f)"
@@ -40956,8 +40987,8 @@ static const char *startup_source =
 "(lambda(s_219 placeholder-sc_0)"
 "(begin"
 " 'post-expansion-scope-action67"
-"(let-values(((s73_2) s_219)((intdefs74_0) intdefs_2))"
-"(add-intdef-scopes21.1 #f #f #f #f s73_2 intdefs74_0))))"
+"(let-values(((s73_1) s_219)((intdefs74_0) intdefs_2))"
+"(add-intdef-scopes21.1 #f #f #f #f s73_1 intdefs74_0))))"
 "(expand-context-post-expansion-scope-action ctx_45)))"
 "((scopes68_0)(append def-ctx-scopes_5(expand-context-scopes ctx_45)))"
 "((only-immediate?69_0)(not stop-ids_1))"
@@ -40979,8 +41010,8 @@ static const char *startup_source =
 "((stops78_0)"
 "(free-id-set"
 " phase_110"
-"(let-values(((or-part_287) all-stop-ids_0))"
-"(if or-part_287 or-part_287 null)))))"
+"(let-values(((or-part_288) all-stop-ids_0))"
+"(if or-part_288 or-part_288 null)))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi the-struct_65)"
 "(root-expand-context/inner-module-scopes the-struct_65)"
@@ -41090,22 +41121,22 @@ static const char *startup_source =
 "(flip-introduction-scopes s_173 ctx_51))))))))"
 "(define-values"
 "(1/syntax-local-identifier-as-binding)"
-"(lambda(id_75)"
+"(lambda(id_76)"
 "(begin"
 " 'syntax-local-identifier-as-binding"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_75)"
+"(if(identifier? id_76)"
 "(void)"
 "(let-values()"
-"                              (raise-argument-error 'syntax-local-identifier-as-binding \"identifier?\" id_75)))"
+"                              (raise-argument-error 'syntax-local-identifier-as-binding \"identifier?\" id_76)))"
 "(values))))"
 "(let-values(((ctx_52)"
 "(let-values(((temp70_0) 'syntax-local-identifier-as-binding))"
 "(get-current-expand-context17.1 #f #f temp70_0 #t))))"
-"(remove-use-site-scopes id_75 ctx_52))))))))"
+"(remove-use-site-scopes id_76 ctx_52))))))))"
 "(define-values"
 "(1/syntax-local-phase-level)"
 "(lambda()"
@@ -41123,8 +41154,8 @@ static const char *startup_source =
 "(let-values(((ctx_54)"
 "(let-values(((who73_0) 'syntax-local-name))"
 "(get-current-expand-context17.1 #f #f who73_0 #t))))"
-"(let-values(((id_76)(expand-context-name ctx_54)))"
-"(if id_76(datum->syntax$1 #f(syntax-e$1 id_76) id_76) #f))))))))"
+"(let-values(((id_77)(expand-context-name ctx_54)))"
+"(if id_77(datum->syntax$1 #f(syntax-e$1 id_77) id_77) #f))))))))"
 "(define-values"
 "(1/make-syntax-introducer)"
 "(let-values(((make-syntax-introducer3_0)"
@@ -41244,7 +41275,7 @@ static const char *startup_source =
 "(lambda(s85_0 mode83_0 mode84_0)"
 "(begin"
 " 'core86"
-"(let-values(((s_412) s85_0))"
+"(let-values(((s_409) s85_0))"
 "(let-values(((mode_14)"
 "(if mode84_0 mode83_0 'add)))"
 "(let-values()"
@@ -41252,13 +41283,13 @@ static const char *startup_source =
 "(let-values(((tmp_33) mode_14))"
 "(if(equal? tmp_33 'add)"
 "(let-values()"
-"(add-scopes s_412 delta-scs_0))"
+"(add-scopes s_409 delta-scs_0))"
 "(if(equal? tmp_33 'remove)"
 "(let-values()"
-"(remove-scopes s_412 delta-scs_0))"
+"(remove-scopes s_409 delta-scs_0))"
 "(if(equal? tmp_33 'flip)"
 "(let-values()"
-"(flip-scopes s_412 delta-scs_0))"
+"(flip-scopes s_409 delta-scs_0))"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-introducer"
@@ -41266,7 +41297,7 @@ static const char *startup_source =
 " mode_14))))))))))))))"
 "(case-lambda"
 "((s_15)(core86_0 s_15 #f #f))"
-"((s_413 mode83_1)(core86_0 s_413 mode83_1 #t))))))))))))))))))))))"
+"((s_410 mode83_1)(core86_0 s_410 mode83_1 #t))))))))))))))))))))))"
 "(case-lambda"
 "((ext-s_1 base-s_1)(begin 'make-syntax-delta-introducer(make-syntax-delta-introducer9_0 ext-s_1 base-s_1 #f #f)))"
 "((ext-s_2 base-s_2 phase5_2)(make-syntax-delta-introducer9_0 ext-s_2 base-s_2 phase5_2 #t)))))"
@@ -41291,16 +41322,16 @@ static const char *startup_source =
 "(begin"
 " 'do-syntax-local-value17"
 "(let-values(((who_16) who13_0))"
-"(let-values(((id_77) id14_1))"
+"(let-values(((id_78) id14_1))"
 "(let-values(((intdef_11) intdef15_0))"
 "(let-values(((failure-thunk_0) failure-thunk16_0))"
 "(let-values(((immediate?_1) immediate?11_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_77)"
+"(if(identifier? id_78)"
 "(void)"
-"                                    (let-values () (raise-argument-error who_16 \"identifier?\" id_77)))"
+"                                    (let-values () (raise-argument-error who_16 \"identifier?\" id_78)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -41371,19 +41402,19 @@ static const char *startup_source =
 "(let-values(((obs_33)(expand-context-observer ctx_55)))"
 "(if obs_33"
 "(let-values()"
-"(let-values()(call-expand-observe obs_33 'local-value id_77)))"
+"(let-values()(call-expand-observe obs_33 'local-value id_78)))"
 "(void)))"
 "(values))))"
 "(let-values(((phase_112)(expand-context-phase ctx_55)))"
 "((letrec-values(((loop_96)"
-"(lambda(id_78)"
+"(lambda(id_79)"
 "(begin"
 " 'loop"
 "(let-values(((b_77)"
 "(if immediate?_1"
-"(let-values(((id92_1) id_78)"
+"(let-values(((id92_0) id_79)"
 "((phase93_0) phase_112)"
-"((temp94_2) #t))"
+"((temp94_1) #t))"
 "(resolve+shift30.1"
 " #f"
 " #f"
@@ -41391,14 +41422,14 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp94_2"
+" temp94_1"
 " #t"
 " #f"
 " #f"
-" id92_1"
+" id92_0"
 " phase93_0))"
 "(resolve+shift/extra-inspector"
-" id_78"
+" id_79"
 " phase_112"
 "(expand-context-namespace ctx_55)))))"
 "(begin"
@@ -41406,7 +41437,7 @@ static const char *startup_source =
 "(if obs_8"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_8 'resolve id_78)))"
+"(call-expand-observe obs_8 'resolve id_79)))"
 "(void)))"
 "(if(not b_77)"
 "(let-values()"
@@ -41423,23 +41454,23 @@ static const char *startup_source =
 "(void)))"
 "(if failure-thunk_0"
 "(failure-thunk_0)"
-"                                                                  (error who_16 \"unbound identifier: ~v\" id_78))))"
+"                                                                  (error who_16 \"unbound identifier: ~v\" id_79))))"
 "(let-values()"
 "(let-values(((v_37 primitive?_7 insp_17 protected?_8)"
 "(let-values(((b95_0) b_77)"
 "((ctx96_0) ctx_55)"
-"((id97_0) id_78)"
+"((id97_1) id_79)"
 "((temp98_2) #t))"
-"(lookup17.1"
+"(lookup28.1"
 " #f"
 " #f"
 " temp98_2"
 " #t"
 " b95_0"
 " ctx96_0"
-" id97_0))))"
-"(if(let-values(((or-part_288)(variable? v_37)))"
-"(if or-part_288 or-part_288(core-form? v_37)))"
+" id97_1))))"
+"(if(let-values(((or-part_289)(variable? v_37)))"
+"(if or-part_289 or-part_289(core-form? v_37)))"
 "(let-values()"
 "(begin"
 "(let-values(((obs_35)"
@@ -41457,7 +41488,7 @@ static const char *startup_source =
 "(error"
 " who_16"
 "                                                                         \"identifier is not bound to syntax: ~v\""
-" id_78))))"
+" id_79))))"
 "(let-values()"
 "(begin"
 "(let-values(((obs_36)"
@@ -41487,57 +41518,57 @@ static const char *startup_source =
 "(let-values()(values v_37 #f))"
 "(let-values() v_37)))))))))))))))"
 " loop_96)"
-"(flip-introduction-scopes id_77 ctx_55))))))))))))))))))"
+"(flip-introduction-scopes id_78 ctx_55))))))))))))))))))"
 "(define-values"
 "(1/syntax-local-value)"
 "(let-values(((syntax-local-value25_0)"
 "(lambda(id24_0 failure-thunk20_0 intdef21_0 failure-thunk22_0 intdef23_0)"
 "(begin"
 " 'syntax-local-value25"
-"(let-values(((id_79) id24_0))"
+"(let-values(((id_80) id24_0))"
 "(let-values(((failure-thunk_1)(if failure-thunk22_0 failure-thunk20_0 #f)))"
 "(let-values(((intdef_12)(if intdef23_0 intdef21_0 #f)))"
 "(let-values()"
-"(let-values(((temp99_1) 'syntax-local-value)"
-"((temp100_0) #f)"
-"((id101_1) id_79)"
+"(let-values(((temp99_2) 'syntax-local-value)"
+"((temp100_1) #f)"
+"((id101_0) id_80)"
 "((intdef102_0) intdef_12)"
 "((failure-thunk103_0) failure-thunk_1))"
 "(do-syntax-local-value17.1"
-" temp100_0"
-" temp99_1"
-" id101_1"
+" temp100_1"
+" temp99_2"
+" id101_0"
 " intdef102_0"
 " failure-thunk103_0))))))))))"
 "(case-lambda"
-"((id_80)(begin 'syntax-local-value(syntax-local-value25_0 id_80 #f #f #f #f)))"
-"((id_81 failure-thunk_2 intdef21_1)(syntax-local-value25_0 id_81 failure-thunk_2 intdef21_1 #t #t))"
-"((id_82 failure-thunk20_1)(syntax-local-value25_0 id_82 failure-thunk20_1 #f #t #f)))))"
+"((id_81)(begin 'syntax-local-value(syntax-local-value25_0 id_81 #f #f #f #f)))"
+"((id_82 failure-thunk_2 intdef21_1)(syntax-local-value25_0 id_82 failure-thunk_2 intdef21_1 #t #t))"
+"((id_83 failure-thunk20_1)(syntax-local-value25_0 id_83 failure-thunk20_1 #f #t #f)))))"
 "(define-values"
 "(1/syntax-local-value/immediate)"
 "(let-values(((syntax-local-value/immediate32_0)"
 "(lambda(id31_1 failure-thunk27_0 intdef28_0 failure-thunk29_0 intdef30_0)"
 "(begin"
 " 'syntax-local-value/immediate32"
-"(let-values(((id_83) id31_1))"
+"(let-values(((id_84) id31_1))"
 "(let-values(((failure-thunk_3)(if failure-thunk29_0 failure-thunk27_0 #f)))"
 "(let-values(((intdef_13)(if intdef30_0 intdef28_0 #f)))"
 "(let-values()"
-"(let-values(((temp104_0) 'syntax-local-value/immediate)"
-"((temp105_0) #t)"
-"((id106_0) id_83)"
+"(let-values(((temp104_1) 'syntax-local-value/immediate)"
+"((temp105_1) #t)"
+"((id106_1) id_84)"
 "((intdef107_0) intdef_13)"
 "((failure-thunk108_0) failure-thunk_3))"
 "(do-syntax-local-value17.1"
-" temp105_0"
-" temp104_0"
-" id106_0"
+" temp105_1"
+" temp104_1"
+" id106_1"
 " intdef107_0"
 " failure-thunk108_0))))))))))"
 "(case-lambda"
-"((id_84)(begin 'syntax-local-value/immediate(syntax-local-value/immediate32_0 id_84 #f #f #f #f)))"
-"((id_85 failure-thunk_4 intdef28_1)(syntax-local-value/immediate32_0 id_85 failure-thunk_4 intdef28_1 #t #t))"
-"((id_86 failure-thunk27_1)(syntax-local-value/immediate32_0 id_86 failure-thunk27_1 #f #t #f)))))"
+"((id_85)(begin 'syntax-local-value/immediate(syntax-local-value/immediate32_0 id_85 #f #f #f #f)))"
+"((id_86 failure-thunk_4 intdef28_1)(syntax-local-value/immediate32_0 id_86 failure-thunk_4 intdef28_1 #t #t))"
+"((id_87 failure-thunk27_1)(syntax-local-value/immediate32_0 id_87 failure-thunk27_1 #f #t #f)))))"
 "(define-values"
 "(do-lift-values-expression)"
 "(lambda(who_17 n_28 s_198)"
@@ -41613,7 +41644,7 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_37 'lift-expr ids_26 s_198)))"
 "(void)))"
 "(map2"
-"(lambda(id_87)(flip-introduction-scopes id_87 ctx_56))"
+"(lambda(id_88)(flip-introduction-scopes id_88 ctx_56))"
 "(add-lifted!"
 " lifts_0"
 " ids_26"
@@ -41621,10 +41652,10 @@ static const char *startup_source =
 "(expand-context-phase ctx_56))))))))))))))"
 "(define-values"
 "(1/syntax-local-lift-expression)"
-"(lambda(s_414)"
+"(lambda(s_411)"
 "(begin"
 " 'syntax-local-lift-expression"
-"(let-values()(let-values()(car(do-lift-values-expression 'syntax-local-lift-expression 1 s_414)))))))"
+"(let-values()(let-values()(car(do-lift-values-expression 'syntax-local-lift-expression 1 s_411)))))))"
 "(define-values"
 "(1/syntax-local-lift-values-expression)"
 "(lambda(n_29 s_61)"
@@ -41644,23 +41675,23 @@ static const char *startup_source =
 "(root-expand-context-lift-key ctx_57)))))))"
 "(define-values"
 "(1/syntax-local-lift-module)"
-"(lambda(s_415)"
+"(lambda(s_412)"
 "(begin"
 " 'syntax-local-lift-module"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_415)"
+"(if(syntax?$1 s_412)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-local-lift-module \"syntax?\" s_415)))"
+"                            (let-values () (raise-argument-error 'syntax-local-lift-module \"syntax?\" s_412)))"
 "(values))))"
 "(let-values(((ctx_58)"
 "(let-values(((who115_0) 'syntax-local-lift-module))"
 "(get-current-expand-context17.1 #f #f who115_0 #t))))"
 "(let-values(((phase_113)(expand-context-phase ctx_58)))"
 "(begin"
-"(let-values(((tmp_34)(core-form-sym s_415 phase_113)))"
+"(let-values(((tmp_34)(core-form-sym s_412 phase_113)))"
 "(if(if(equal? tmp_34 'module) #t(equal? tmp_34 'module*))"
 "(let-values()"
 "(let-values(((lifts_8)(expand-context-module-lifts ctx_58)))"
@@ -41672,13 +41703,13 @@ static const char *startup_source =
 " 'syntax-local-lift-module"
 "                                 \"not currently transforming within a module declaration or top level\""
 "                                 \"form to lift\""
-" s_415)))"
-"(add-lifted-module! lifts_8(flip-introduction-scopes s_415 ctx_58) phase_113))))"
+" s_412)))"
+"(add-lifted-module! lifts_8(flip-introduction-scopes s_412 ctx_58) phase_113))))"
 "(let-values()"
-"                        (raise-arguments-error 'syntax-local-lift-module \"not a module form\" \"given form\" s_415))))"
+"                        (raise-arguments-error 'syntax-local-lift-module \"not a module form\" \"given form\" s_412))))"
 "(let-values(((obs_38)(expand-context-observer ctx_58)))"
 "(if obs_38"
-"(let-values()(let-values()(call-expand-observe obs_38 'lift-statement s_415)))"
+"(let-values()(let-values()(call-expand-observe obs_38 'lift-statement s_412)))"
 "(void))))))))))))"
 "(define-values"
 "(do-local-lift-to-module54.1)"
@@ -41701,7 +41732,7 @@ static const char *startup_source =
 "(begin"
 " 'do-local-lift-to-module54"
 "(let-values(((who_18) who52_0))"
-"(let-values(((s_416) s53_1))"
+"(let-values(((s_413) s53_1))"
 "(let-values(((no-target-msg_0) no-target-msg34_0))"
 "(let-values(((intro?_0)(if intro?44_0 intro?35_0 #t)))"
 "(let-values(((more-checks_0)(if more-checks45_0 more-checks36_0 void)))"
@@ -41715,7 +41746,7 @@ static const char *startup_source =
 "(let-values(((shift-wrap_0)"
 "(if shift-wrap50_0"
 " shift-wrap41_0"
-"(lambda(s_417 phase_115 lift-ctx_2)(begin 'shift-wrap s_417)))))"
+"(lambda(s_414 phase_115 lift-ctx_2)(begin 'shift-wrap s_414)))))"
 "(let-values(((post-wrap_0)"
 "(if post-wrap51_0"
 " post-wrap42_0"
@@ -41723,9 +41754,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_416)"
+"(if(syntax?$1 s_413)"
 "(void)"
-"                                                (let-values () (raise-argument-error who_18 \"syntax?\" s_416)))"
+"                                                (let-values () (raise-argument-error who_18 \"syntax?\" s_413)))"
 "(values))))"
 "(let-values((()(begin(more-checks_0)(values))))"
 "(let-values(((ctx_59)"
@@ -41741,12 +41772,12 @@ static const char *startup_source =
 " who_18"
 " no-target-msg_0"
 "                                                           \"form to lift\""
-" s_416)))"
+" s_413)))"
 "(values))))"
 "(let-values(((phase_117)(expand-context-phase ctx_59)))"
 "(let-values(((wrt-phase_1)(get-wrt-phase_0 lift-ctx_4)))"
 "(let-values(((added-s_0)"
-"(if intro?_0(flip-introduction-scopes s_416 ctx_59) s_416)))"
+"(if intro?_0(flip-introduction-scopes s_413 ctx_59) s_413)))"
 "(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_117 lift-ctx_4)))"
 "(let-values(((shift-s_0)"
 "(let-values(((start_41) phase_117)"
@@ -41765,23 +41796,23 @@ static const char *startup_source =
 "(if(> pos_24 end_31)"
 "(let-values(((phase_53)"
 " pos_24))"
-"(let-values(((s_418)"
-"(let-values(((s_419)"
+"(let-values(((s_415)"
+"(let-values(((s_416)"
 " s_99))"
-"(let-values(((s_420)"
+"(let-values(((s_417)"
 "(let-values()"
 "(shift-wrap_0"
-" s_419"
+" s_416"
 "(sub1"
 " phase_53)"
 " lift-ctx_4))))"
 "(values"
-" s_420)))))"
+" s_417)))))"
 "(if(not #f)"
 "(for-loop_204"
-" s_418"
+" s_415"
 "(+ pos_24 inc_25))"
-" s_418)))"
+" s_415)))"
 " s_99)))))"
 " for-loop_204)"
 " pre-s_0"
@@ -41803,8 +41834,8 @@ static const char *startup_source =
 "(let-values(((who118_0) 'syntax-local-lift-require)"
 "((temp119_1)(datum->syntax$1 #f s_111))"
 "                                       ((temp120_1) \"could not find target context\")"
-"((temp121_1) #f)"
-"((temp122_1)"
+"((temp121_0) #f)"
+"((temp122_0)"
 "(lambda()"
 "(if(syntax?$1 use-s_1)"
 "(void)"
@@ -41814,21 +41845,21 @@ static const char *startup_source =
 "((require-lift-context-wrt-phase124_0) require-lift-context-wrt-phase)"
 "((add-lifted-require!125_0) add-lifted-require!)"
 "((temp126_1)"
-"(lambda(s_421 phase_118 require-lift-ctx_0)"
-"(require-spec-shift-for-syntax s_421)))"
-"((temp127_0)"
+"(lambda(s_418 phase_118 require-lift-ctx_0)"
+"(require-spec-shift-for-syntax s_418)))"
+"((temp127_1)"
 "(lambda(s_117 phase_119 require-lift-ctx_1)"
 "(wrap-form '#%require(add-scope s_117 sc_33) phase_119))))"
 "(do-local-lift-to-module54.1"
 " add-lifted-require!125_0"
 " expand-context-require-lifts123_0"
 " require-lift-context-wrt-phase124_0"
-" temp121_1"
+" temp121_0"
 " #t"
-" temp122_1"
+" temp122_0"
 " #t"
 " temp120_1"
-" temp127_0"
+" temp127_1"
 " #t"
 " #f"
 " #f"
@@ -41860,15 +41891,15 @@ static const char *startup_source =
 "(let-values(((ctx_60 result-s_7)"
 "(let-values(((who129_0) 'syntax-local-lift-provide)"
 "((s130_0) s_118)"
-"                                     ((temp131_0) \"not expanding in a module run-time body\")"
+"                                     ((temp131_1) \"not expanding in a module run-time body\")"
 "((expand-context-to-module-lifts132_0) expand-context-to-module-lifts)"
 "((to-module-lift-context-wrt-phase133_0) to-module-lift-context-wrt-phase)"
 "((add-lifted-to-module-provide!134_0) add-lifted-to-module-provide!)"
 "((temp135_0)"
-"(lambda(s_422 phase_120 to-module-lift-ctx_0)(wrap-form 'for-syntax s_422 #f)))"
+"(lambda(s_419 phase_120 to-module-lift-ctx_0)(wrap-form 'for-syntax s_419 #f)))"
 "((temp136_0)"
-"(lambda(s_423 phase_121 to-module-lift-ctx_1)"
-"(wrap-form '#%provide s_423 phase_121))))"
+"(lambda(s_420 phase_121 to-module-lift-ctx_1)"
+"(wrap-form '#%provide s_420 phase_121))))"
 "(do-local-lift-to-module54.1"
 " add-lifted-to-module-provide!134_0"
 " expand-context-to-module-lifts132_0"
@@ -41877,7 +41908,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp131_0"
+" temp131_1"
 " temp136_0"
 " #t"
 " #f"
@@ -41892,15 +41923,15 @@ static const char *startup_source =
 "(void)))))))))"
 "(define-values"
 "(1/syntax-local-lift-module-end-declaration)"
-"(lambda(s_424)"
+"(lambda(s_421)"
 "(begin"
 " 'syntax-local-lift-module-end-declaration"
 "(let-values()"
 "(let-values()"
 "(let-values(((ctx_61 also-s_0)"
 "(let-values(((who138_0) 'syntax-local-lift-module-end-declaration)"
-"((s139_0) s_424)"
-"((temp140_1)"
+"((s139_0) s_421)"
+"((temp140_2)"
 "                                      \"not currently transforming an expression within a module declaration\")"
 "((expand-context-to-module-lifts141_0) expand-context-to-module-lifts)"
 "((temp142_0)(lambda(lift-ctx_5) 0))"
@@ -41910,7 +41941,7 @@ static const char *startup_source =
 "(if(to-module-lift-context-end-as-expressions? to-module-lift-ctx_2)"
 "(wrap-form '#%expression orig-s_32 phase_122)"
 " orig-s_32)))"
-"((temp145_1)"
+"((temp145_2)"
 "(lambda(s_225 phase_123 to-module-lift-ctx_3)"
 "(wrap-form 'begin-for-syntax s_225 phase_123))))"
 "(do-local-lift-to-module54.1"
@@ -41921,18 +41952,18 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp140_1"
+" temp140_2"
 " #f"
 " #f"
 " temp144_1"
 " #t"
-" temp145_1"
+" temp145_2"
 " #t"
 " who138_0"
 " s139_0))))"
-"(let-values(((obs_41)(expand-context-observer ctx_61)))"
-"(if obs_41"
-"(let-values()(let-values()(call-expand-observe obs_41 'lift-statement s_424)))"
+"(let-values(((obs_26)(expand-context-observer ctx_61)))"
+"(if obs_26"
+"(let-values()(let-values()(call-expand-observe obs_26 'lift-statement s_421)))"
 "(void)))))))))"
 "(define-values"
 "(wrap-form)"
@@ -42079,9 +42110,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_289)(1/module-path? mod-path_9)))"
-"(if or-part_289"
-" or-part_289"
+"(if(let-values(((or-part_290)(1/module-path? mod-path_9)))"
+"(if or-part_290"
+" or-part_290"
 "(if(syntax?$1 mod-path_9)(1/module-path?(syntax->datum$1 mod-path_9)) #f)))"
 "(void)"
 "(let-values()"
@@ -42230,29 +42261,29 @@ static const char *startup_source =
 "(lambda(id59_0 only-generated?57_0 only-generated?58_0)"
 "(begin"
 " 'syntax-local-get-shadower60"
-"(let-values(((id_88) id59_0))"
+"(let-values(((id_89) id59_0))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_88)"
+"(if(identifier? id_89)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-local-get-shadower"
 "                                                   \"identifier?\""
-" id_88)))"
+" id_89)))"
 "(values))))"
 "(let-values(((ctx_66)"
 "(let-values(((who155_0) 'syntax-local-get-shadower))"
 "(get-current-expand-context17.1 #f #f who155_0 #t))))"
-"(let-values(((new-id_0)(add-scopes id_88(expand-context-scopes ctx_66))))"
-"(if(syntax-clean? id_88) new-id_0(syntax-taint$1 new-id_0))))))))))))))"
+"(let-values(((new-id_0)(add-scopes id_89(expand-context-scopes ctx_66))))"
+"(if(syntax-clean? id_89) new-id_0(syntax-taint$1 new-id_0))))))))))))))"
 "(case-lambda"
-"((id_89)(begin 'syntax-local-get-shadower(syntax-local-get-shadower60_0 id_89 #f #f)))"
-"((id_90 only-generated?57_1)(syntax-local-get-shadower60_0 id_90 only-generated?57_1 #t)))))"
+"((id_90)(begin 'syntax-local-get-shadower(syntax-local-get-shadower60_0 id_90 #f #f)))"
+"((id_91 only-generated?57_1)(syntax-local-get-shadower60_0 id_91 only-generated?57_1 #t)))))"
 "(define-values"
 "(syntax-source-accessor)"
 "(lambda(who_0 srcloc-accessor_0)"
@@ -42278,8 +42309,8 @@ static const char *startup_source =
 "(srcloc-vector?)"
 "(lambda(v_66)"
 "(begin"
-"(if(let-values(((or-part_290)(not(vector-ref v_66 1))))"
-"(if or-part_290 or-part_290(exact-positive-integer?(vector-ref v_66 1))))"
+"(if(let-values(((or-part_291)(not(vector-ref v_66 1))))"
+"(if or-part_291 or-part_291(exact-positive-integer?(vector-ref v_66 1))))"
 "(if(let-values(((or-part_27)(not(vector-ref v_66 2))))"
 "(if or-part_27 or-part_27(exact-nonnegative-integer?(vector-ref v_66 2))))"
 "(if(let-values(((or-part_10)(not(vector-ref v_66 3))))"
@@ -42368,15 +42399,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_291)(not stx-c_4)))"
-"(if or-part_291 or-part_291(syntax?$1 stx-c_4)))"
+"(if(let-values(((or-part_292)(not stx-c_4)))"
+"(if or-part_292 or-part_292(syntax?$1 stx-c_4)))"
 "(void)"
 "                                        (let-values () (raise-argument-error 'datum->syntax \"(or #f syntax?)\" stx-c_4)))"
-"(if(let-values(((or-part_292)(not stx-l_2)))"
-"(if or-part_292"
-" or-part_292"
-"(let-values(((or-part_293)(syntax?$1 stx-l_2)))"
-"(if or-part_293 or-part_293(encoded-srcloc? stx-l_2)))))"
+"(if(let-values(((or-part_293)(not stx-l_2)))"
+"(if or-part_293"
+" or-part_293"
+"(let-values(((or-part_294)(syntax?$1 stx-l_2)))"
+"(if or-part_294 or-part_294(encoded-srcloc? stx-l_2)))))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -42394,8 +42425,8 @@ static const char *startup_source =
 "                                            \"                 (or/c exact-positive-integer? #f)\\n\""
 "                                            \"                 (or/c exact-nonnegative-integer? #f)))\")"
 " stx-l_2)))"
-"(if(let-values(((or-part_294)(not stx-p_1)))"
-"(if or-part_294 or-part_294(syntax?$1 stx-p_1)))"
+"(if(let-values(((or-part_295)(not stx-p_1)))"
+"(if or-part_295 or-part_295(syntax?$1 stx-p_1)))"
 "(void)"
 "                                        (let-values () (raise-argument-error 'datum->syntax \"(or #f syntax?)\" stx-p_1)))"
 "(datum->syntax$1 stx-c_4 s_171(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
@@ -42403,7 +42434,7 @@ static const char *startup_source =
 "((stx-c_5 s_300)(begin 'datum->syntax(datum->syntax9_0 stx-c_5 s_300 #f #f #f #f #f #f)))"
 "((stx-c_6 s_174 stx-l_3 stx-p_2 ignored3_1)(datum->syntax9_0 stx-c_6 s_174 stx-l_3 stx-p_2 ignored3_1 #t #t #t))"
 "((stx-c_7 s_73 stx-l_4 stx-p2_1)(datum->syntax9_0 stx-c_7 s_73 stx-l_4 stx-p2_1 #f #t #t #f))"
-"((stx-c_8 s_425 stx-l1_1)(datum->syntax9_0 stx-c_8 s_425 stx-l1_1 #f #f #t #f #f)))))"
+"((stx-c_8 s_422 stx-l1_1)(datum->syntax9_0 stx-c_8 s_422 stx-l1_1 #f #f #t #f #f)))))"
 "(define-values"
 "(1/syntax->list)"
 "(lambda(s_5)"
@@ -42427,11 +42458,11 @@ static const char *startup_source =
 "(define-values"
 "(1/bound-identifier=?)"
 "(let-values(((bound-identifier=?15_0)"
-"(lambda(a13_0 b14_1 phase11_0 phase12_1)"
+"(lambda(a13_0 b14_0 phase11_0 phase12_1)"
 "(begin"
 " 'bound-identifier=?15"
 "(let-values(((a_53) a13_0))"
-"(let-values(((b_78) b14_1))"
+"(let-values(((b_78) b14_0))"
 "(let-values(((phase_127)(if phase12_1 phase11_0(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
@@ -42544,44 +42575,44 @@ static const char *startup_source =
 "(lambda(id29_1 phase25_1 top-level-symbol?26_0 phase27_0 top-level-symbol?28_0)"
 "(begin"
 " 'identifier-binding30"
-"(let-values(((id_91) id29_1))"
+"(let-values(((id_92) id29_1))"
 "(let-values(((phase_34)(if phase27_0 phase25_1(1/syntax-local-phase-level))))"
 "(let-values(((top-level-symbol?_1)(if top-level-symbol?28_0 top-level-symbol?26_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_91)"
+"(if(identifier? id_92)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'identifier-binding \"identifier?\" id_91)))"
+"                                    (let-values () (raise-argument-error 'identifier-binding \"identifier?\" id_92)))"
 "(if(phase? phase_34)"
 "(void)"
 "(let-values()(raise-argument-error 'identifier-binding phase?-string phase_34)))"
-"(identifier-binding$1 id_91 phase_34 top-level-symbol?_1))))))))))))"
+"(identifier-binding$1 id_92 phase_34 top-level-symbol?_1))))))))))))"
 "(case-lambda"
-"((id_92)(begin 'identifier-binding(identifier-binding30_0 id_92 #f #f #f #f)))"
-"((id_93 phase_130 top-level-symbol?26_1)(identifier-binding30_0 id_93 phase_130 top-level-symbol?26_1 #t #t))"
-"((id_94 phase25_2)(identifier-binding30_0 id_94 phase25_2 #f #t #f)))))"
+"((id_93)(begin 'identifier-binding(identifier-binding30_0 id_93 #f #f #f #f)))"
+"((id_94 phase_130 top-level-symbol?26_1)(identifier-binding30_0 id_94 phase_130 top-level-symbol?26_1 #t #t))"
+"((id_95 phase25_2)(identifier-binding30_0 id_95 phase25_2 #f #t #f)))))"
 "(define-values"
 "(1/identifier-transformer-binding)"
 "(let-values(((identifier-transformer-binding35_0)"
 "(lambda(id34_1 phase32_1 phase33_1)"
 "(begin"
 " 'identifier-transformer-binding35"
-"(let-values(((id_95) id34_1))"
+"(let-values(((id_96) id34_1))"
 "(let-values(((phase_131)(if phase33_1 phase32_1(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_95)"
+"(if(identifier? id_96)"
 "(void)"
 "(let-values()"
-"                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_95)))"
-"(identifier-binding$1 id_95(if phase_131(add1 phase_131) #f))))))))))))"
+"                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_96)))"
+"(identifier-binding$1 id_96(if phase_131(add1 phase_131) #f))))))))))))"
 "(case-lambda"
-"((id_96)(begin 'identifier-transformer-binding(identifier-transformer-binding35_0 id_96 #f #f)))"
-"((id_97 phase32_2)(identifier-transformer-binding35_0 id_97 phase32_2 #t)))))"
+"((id_97)(begin 'identifier-transformer-binding(identifier-transformer-binding35_0 id_97 #f #f)))"
+"((id_98 phase32_2)(identifier-transformer-binding35_0 id_98 phase32_2 #t)))))"
 "(define-values"
 "(1/identifier-template-binding)"
 "(lambda(id_53)"
@@ -42596,55 +42627,56 @@ static const char *startup_source =
 "(identifier-binding$1 id_53(sub1(1/syntax-local-phase-level)))))))))"
 "(define-values"
 "(1/identifier-label-binding)"
-"(lambda(id_98)"
+"(lambda(id_99)"
 "(begin"
 " 'identifier-label-binding"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_98)"
+"(if(identifier? id_99)"
 "(void)"
-"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_98)))"
-"(identifier-binding$1 id_98 #f)))))))"
+"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_99)))"
+"(identifier-binding$1 id_99 #f)))))))"
 "(define-values"
 "(1/identifier-binding-symbol)"
 "(let-values(((identifier-binding-symbol40_0)"
 "(lambda(id39_0 phase37_2 phase38_0)"
 "(begin"
 " 'identifier-binding-symbol40"
-"(let-values(((id_99) id39_0))"
+"(let-values(((id_100) id39_0))"
 "(let-values(((phase_132)(if phase38_0 phase37_2(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_99)"
+"(if(identifier? id_100)"
 "(void)"
-"                                  (let-values () (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_99)))"
+"(let-values()"
+"                                    (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_100)))"
 "(if(phase? phase_132)"
 "(void)"
 "(let-values()"
 "(raise-argument-error 'identifier-binding-symbol phase?-string phase_132)))"
-"(identifier-binding-symbol$1 id_99 phase_132)))))))))))"
+"(identifier-binding-symbol$1 id_100 phase_132)))))))))))"
 "(case-lambda"
-"((id_100)(begin 'identifier-binding-symbol(identifier-binding-symbol40_0 id_100 #f #f)))"
-"((id_101 phase37_3)(identifier-binding-symbol40_0 id_101 phase37_3 #t)))))"
+"((id_101)(begin 'identifier-binding-symbol(identifier-binding-symbol40_0 id_101 #f #f)))"
+"((id_102 phase37_3)(identifier-binding-symbol40_0 id_102 phase37_3 #t)))))"
 "(define-values"
 "(1/identifier-prune-lexical-context)"
 "(let-values(((identifier-prune-lexical-context45_0)"
 "(lambda(id44_0 syms42_0 syms43_0)"
 "(begin"
 " 'identifier-prune-lexical-context45"
-"(let-values(((id_102) id44_0))"
+"(let-values(((id_103) id44_0))"
 "(let-values(((syms_23)(if syms43_0 syms42_0 null)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_102)"
+"(if(identifier? id_103)"
 "(void)"
 "(let-values()"
-"                                    (raise-argument-error 'identifier-prune-lexical-context \"identifier?\" id_102)))"
+"                                    (raise-argument-error 'identifier-prune-lexical-context \"identifier?\" id_103)))"
 "(if(if(list? syms_23)(andmap2 symbol? syms_23) #f)"
 "(void)"
 "(let-values()"
@@ -42652,32 +42684,32 @@ static const char *startup_source =
 " 'identifier-prune-lexical-context"
 "                                     \"(listof symbol?)\""
 " syms_23)))"
-" id_102))))))))))"
+" id_103))))))))))"
 "(case-lambda"
-"((id_103)(begin 'identifier-prune-lexical-context(identifier-prune-lexical-context45_0 id_103 #f #f)))"
-"((id_104 syms42_1)(identifier-prune-lexical-context45_0 id_104 syms42_1 #t)))))"
+"((id_104)(begin 'identifier-prune-lexical-context(identifier-prune-lexical-context45_0 id_104 #f #f)))"
+"((id_105 syms42_1)(identifier-prune-lexical-context45_0 id_105 syms42_1 #t)))))"
 "(define-values"
 "(1/syntax-debug-info)"
 "(let-values(((syntax-debug-info52_0)"
 "(lambda(s51_1 phase47_2 all-bindings?48_0 phase49_1 all-bindings?50_0)"
 "(begin"
 " 'syntax-debug-info52"
-"(let-values(((s_426) s51_1))"
+"(let-values(((s_423) s51_1))"
 "(let-values(((phase_133)(if phase49_1 phase47_2(1/syntax-local-phase-level))))"
 "(let-values(((all-bindings?_1)(if all-bindings?50_0 all-bindings?48_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_426)"
+"(if(syntax?$1 s_423)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'syntax-debug-info \"syntax?\" s_426)))"
+"                                    (let-values () (raise-argument-error 'syntax-debug-info \"syntax?\" s_423)))"
 "(if(phase? phase_133)"
 "(void)"
 "(let-values()(raise-argument-error 'syntax-debug-info phase?-string phase_133)))"
-"(syntax-debug-info$1 s_426 phase_133 all-bindings?_1))))))))))))"
+"(syntax-debug-info$1 s_423 phase_133 all-bindings?_1))))))))))))"
 "(case-lambda"
-"((s_427)(begin 'syntax-debug-info(syntax-debug-info52_0 s_427 #f #f #f #f)))"
+"((s_424)(begin 'syntax-debug-info(syntax-debug-info52_0 s_424 #f #f #f #f)))"
 "((s_88 phase_96 all-bindings?48_1)(syntax-debug-info52_0 s_88 phase_96 all-bindings?48_1 #t #t))"
 "((s_46 phase47_3)(syntax-debug-info52_0 s_46 phase47_3 #f #t #f)))))"
 "(define-values"
@@ -42695,7 +42727,7 @@ static const char *startup_source =
 "(syntax-shift-phase-level$1 s_89 phase_134)))))))"
 "(define-values"
 "(1/syntax-track-origin)"
-"(lambda(new-stx_8 old-stx_4 id_105)"
+"(lambda(new-stx_8 old-stx_4 id_106)"
 "(begin"
 " 'syntax-track-origin"
 "(let-values()"
@@ -42714,19 +42746,19 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_105)"
+"(if(identifier? id_106)"
 "(void)"
-"                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_105)))"
+"                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_106)))"
 "(values))))"
-"(let-values(((s_32)(syntax-track-origin$1 new-stx_8 old-stx_4 id_105)))"
+"(let-values(((s_32)(syntax-track-origin$1 new-stx_8 old-stx_4 id_106)))"
 "(let-values(((ctx_67)"
 "(let-values(((temp73_0) #t))(get-current-expand-context17.1 temp73_0 #t #f #f))))"
 "(begin"
 "(if ctx_67"
 "(let-values()"
-"(let-values(((obs_42)(expand-context-observer ctx_67)))"
-"(if obs_42"
-"(let-values()(let-values()(call-expand-observe obs_42 'track-origin new-stx_8 s_32)))"
+"(let-values(((obs_41)(expand-context-observer ctx_67)))"
+"(if obs_41"
+"(let-values()(let-values()(call-expand-observe obs_41 'track-origin new-stx_8 s_32)))"
 "(void))))"
 "(void))"
 " s_32)))))))))))"
@@ -42929,10 +42961,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((m-ns_13"
 " already?_0)"
-"(if(let-values(((or-part_295)"
+"(if(let-values(((or-part_296)"
 " attach-this-instance?_0))"
-"(if or-part_295"
-" or-part_295"
+"(if or-part_296"
+" or-part_296"
 "(module-cross-phase-persistent?"
 " m_20)))"
 "(let-values()"
@@ -43309,7 +43341,7 @@ static const char *startup_source =
 " src-namespace_6"
 " mod-name_20"
 " phase_136)"
-"(let-values(((or-part_296)"
+"(let-values(((or-part_297)"
 "(let-values(((dest-namespace47_0)"
 " dest-namespace_2)"
 "((mod-name48_0)"
@@ -43326,8 +43358,8 @@ static const char *startup_source =
 " dest-namespace47_0"
 " mod-name48_0"
 " phase49_2))))"
-"(if or-part_296"
-" or-part_296"
+"(if or-part_297"
+" or-part_297"
 "(namespace-install-module-namespace!"
 " dest-namespace_2"
 " mod-name_20"
@@ -43490,11 +43522,11 @@ static const char *startup_source =
 "(lambda(s_4)"
 "(begin"
 " 'add-ns-scopes"
-"(let-values(((temp79_1)"
+"(let-values(((temp79_0)"
 "(add-scopes"
 "(push-scope s_4 post-scope_1)"
 " other-namespace-scopes_0))"
-"((temp80_2)"
+"((temp80_1)"
 "(root-expand-context-all-scopes-stx root-ctx_5))"
 "((temp81_0)"
 "(let-values(((or-part_72)"
@@ -43507,8 +43539,8 @@ static const char *startup_source =
 "(syntax-transfer-shifts39.1"
 " temp82_2"
 " #t"
-" temp79_1"
-" temp80_2"
+" temp79_0"
+" temp80_1"
 " temp81_0"
 " #t))))))"
 "(let-values(((maybe-module-id_0)"
@@ -43531,7 +43563,7 @@ static const char *startup_source =
 " s_3))"
 "(let-values()(add-ns-scopes_0 s_3)))))))))))))))))))"
 "(case-lambda"
-"((s_428)(begin 'namespace-syntax-introduce(namespace-syntax-introduce4_0 s_428 #f #f)))"
+"((s_425)(begin 'namespace-syntax-introduce(namespace-syntax-introduce4_0 s_425 #f #f)))"
 "((s_73 ns1_4)(namespace-syntax-introduce4_0 s_73 ns1_4 #t)))))"
 "(define-values"
 "(namespace-datum-introduce)"
@@ -43617,18 +43649,18 @@ static const char *startup_source =
 "(if(let-values(((or-part_22)(1/module-path-index? req_6)))"
 "(if or-part_22 or-part_22(1/module-path? req_6)))"
 "(let-values()"
-"(let-values(((temp85_1)"
+"(let-values(((temp85_0)"
 "(if(1/module-path-index? req_6)"
 " req_6"
 "(1/module-path-index-join req_6 #f)))"
 "((temp86_0) #f)"
-"((temp87_2) #f)"
+"((temp87_1) #f)"
 "((ctx-stx88_0) ctx-stx_0)"
 "((ns89_0) ns_76)"
 "((run?90_0) run?_3)"
 "((visit?91_0) visit?_3)"
 "((temp92_1)(namespace-phase ns_76))"
-"((temp93_3)(namespace-phase ns_76))"
+"((temp93_2)(namespace-phase ns_76))"
 "((copy-variable-phase-level94_0) copy-variable-phase-level_2)"
 "((copy-variable-as-constant?95_0) copy-variable-as-constant?_2)"
 "((skip-variable-phase-level96_0) skip-variable-phase-level_2)"
@@ -43651,7 +43683,7 @@ static const char *startup_source =
 " temp92_1"
 " #f"
 " #f"
-" temp93_3"
+" temp93_2"
 " run?90_0"
 " #t"
 " skip-variable-phase-level96_0"
@@ -43659,21 +43691,21 @@ static const char *startup_source =
 " visit?91_0"
 " #t"
 " who97_0"
-" temp85_1"
+" temp85_0"
 " temp86_0"
-" temp87_2"
+" temp87_1"
 " ctx-stx88_0"
 " ns89_0)))"
 "(let-values()"
 "(let-values(((run?98_0) run?_3)"
 "((visit?99_0) visit?_3)"
-"((temp100_1)(list(1/datum->syntax ctx-stx_0 req_6)))"
+"((temp100_2)(list(1/datum->syntax ctx-stx_0 req_6)))"
 "((temp101_0) #f)"
 "((ns102_0) ns_76)"
-"((temp103_2)(namespace-phase ns_76))"
-"((temp104_1)"
-"(let-values(((temp107_0) #f))"
-"(make-requires+provides8.1 #f #f temp107_0)))"
+"((temp103_1)(namespace-phase ns_76))"
+"((temp104_2)"
+"(let-values(((temp107_1) #f))"
+"(make-requires+provides8.1 #f #f temp107_1)))"
 "((skip-variable-phase-level105_0) skip-variable-phase-level_2)"
 "((who106_0) who_20))"
 "(parse-and-perform-requires!30.1"
@@ -43696,11 +43728,11 @@ static const char *startup_source =
 " visit?99_0"
 " #t"
 " who106_0"
-" temp100_1"
+" temp100_2"
 " temp101_0"
 " ns102_0"
-" temp103_2"
-" temp104_1))))))))))))))))))"
+" temp103_1"
+" temp104_2))))))))))))))))))"
 "(define-values"
 "(1/namespace-require)"
 "(let-values(((namespace-require29_0)"
@@ -43777,12 +43809,12 @@ static const char *startup_source =
 "(let-values(((who119_0) 'namespace-require/constant)"
 "((req120_0) req_13)"
 "((ns121_0) ns_79)"
-"((temp122_2) 0)"
-"((temp123_2) #t))"
+"((temp122_1) 0)"
+"((temp123_1) #t))"
 "(do-namespace-require23.1"
-" temp123_2"
+" temp123_1"
 " #t"
-" temp122_2"
+" temp122_1"
 " #t"
 " #f"
 " #f"
@@ -43811,7 +43843,7 @@ static const char *startup_source =
 "((req126_0) req_16)"
 "((ns127_0) ns_80)"
 "((temp128_1) 0)"
-"((temp129_2) 0))"
+"((temp129_1) 0))"
 "(do-namespace-require23.1"
 " #f"
 " #f"
@@ -43819,7 +43851,7 @@ static const char *startup_source =
 " #t"
 " #f"
 " #f"
-" temp129_2"
+" temp129_1"
 " #t"
 " #f"
 " #f"
@@ -43846,9 +43878,9 @@ static const char *startup_source =
 "(if(symbol? sym_69)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'namespace-variable-value \"symbol?\" sym_69)))"
-"(if(let-values(((or-part_297)(not failure-thunk_5)))"
-"(if or-part_297"
-" or-part_297"
+"(if(let-values(((or-part_298)(not failure-thunk_5)))"
+"(if or-part_298"
+" or-part_298"
 "(if(procedure? failure-thunk_5)"
 "(procedure-arity-includes? failure-thunk_5 0)"
 " #f)))"
@@ -44007,10 +44039,10 @@ static const char *startup_source =
 "(namespace-phase ns_82)"
 " sym_74)"
 "(values))))"
-"(let-values(((id_106)(1/datum->syntax #f sym_74)))"
-"(let-values(((temp138_0)(1/namespace-syntax-introduce id_106 ns_82))"
-"((temp139_0)"
-"(let-values(((temp141_1)(namespace-mpi ns_82))"
+"(let-values(((id_107)(1/datum->syntax #f sym_74)))"
+"(let-values(((temp138_1)(1/namespace-syntax-introduce id_107 ns_82))"
+"((temp139_1)"
+"(let-values(((temp141_2)(namespace-mpi ns_82))"
 "((temp142_1)(namespace-phase ns_82))"
 "((sym143_0) sym_74))"
 "(make-module-binding22.1"
@@ -44032,11 +44064,11 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp141_1"
+" temp141_2"
 " temp142_1"
 " sym143_0)))"
-"((temp140_2)(namespace-phase ns_82)))"
-"(add-binding!17.1 #f #f #f #f temp138_0 temp139_0 temp140_2)))))"
+"((temp140_3)(namespace-phase ns_82)))"
+"(add-binding!17.1 #f #f #f #f temp138_1 temp139_1 temp140_3)))))"
 "(void)))))))))))))))"
 "(case-lambda"
 "((sym_75 val_74)"
@@ -44120,28 +44152,28 @@ static const char *startup_source =
 "(let-values(((compile_1)"
 "(if compile4_0"
 " compile2_0"
-"(lambda(s_429 ns_87)(begin 'compile(1/compile s_429 ns_87 #f))))))"
+"(lambda(s_426 ns_87)(begin 'compile(1/compile s_426 ns_87 #f))))))"
 "(let-values()"
-"(if(let-values(((or-part_292)(compiled-in-memory? s_172)))"
-"(if or-part_292"
-" or-part_292"
-"(let-values(((or-part_293)(1/linklet-directory? s_172)))"
-"(if or-part_293 or-part_293(1/linklet-bundle? s_172)))))"
+"(if(let-values(((or-part_293)(compiled-in-memory? s_172)))"
+"(if or-part_293"
+" or-part_293"
+"(let-values(((or-part_294)(1/linklet-directory? s_172)))"
+"(if or-part_294 or-part_294(1/linklet-bundle? s_172)))))"
 "(let-values()(eval-compiled s_172 ns_43))"
 "(if(if(syntax?$1 s_172)"
-"(let-values(((or-part_294)(compiled-in-memory?(1/syntax-e s_172))))"
-"(if or-part_294"
-" or-part_294"
-"(let-values(((or-part_298)(1/linklet-directory?(1/syntax-e s_172))))"
-"(if or-part_298 or-part_298(1/linklet-bundle?(1/syntax-e s_172))))))"
+"(let-values(((or-part_295)(compiled-in-memory?(1/syntax-e s_172))))"
+"(if or-part_295"
+" or-part_295"
+"(let-values(((or-part_299)(1/linklet-directory?(1/syntax-e s_172))))"
+"(if or-part_299 or-part_299(1/linklet-bundle?(1/syntax-e s_172))))))"
 " #f)"
 "(let-values()(eval-compiled(1/syntax->datum s_172) ns_43))"
 "(let-values()"
 "(let-values(((s80_0) s_172)"
 "((ns81_0) ns_43)"
 "((temp82_3)"
-"(lambda(s_430 ns_88 tail?_1)"
-"(eval-compiled(compile_1 s_430 ns_88) ns_88 tail?_1)))"
+"(lambda(s_427 ns_88 tail?_1)"
+"(eval-compiled(compile_1 s_427 ns_88) ns_88 tail?_1)))"
 "((temp83_1) #f))"
 "(per-top-level68.1"
 " #f"
@@ -44210,7 +44242,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((s86_0) s_180)"
 "((ns87_0) ns_92)"
-"((temp88_3)"
+"((temp88_2)"
 "(lambda(s_12 ns_49 as-tail?_4)"
 "(list"
 "(compile-single$1"
@@ -44220,18 +44252,18 @@ static const char *startup_source =
 " serializable?_4"
 " to-source?_5))))"
 "((append89_0) append)"
-"((temp90_0) #f))"
+"((temp90_1) #f))"
 "(per-top-level68.1"
 " append89_0"
 " #t"
 " #f"
 " #f"
-" temp90_0"
+" temp90_1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp88_3"
+" temp88_2"
 " #f"
 " #f"
 " s86_0"
@@ -44252,22 +44284,22 @@ static const char *startup_source =
 " cs91_0))))))))))))))"
 "(case-lambda"
 "((s_187)(begin 'compile(compile23_0 s_187 #f #f #f #f #f #f #f #f)))"
-"((s_431 ns_93 serializable?_5 expand_1 to-source?17_1)"
-"(compile23_0 s_431 ns_93 serializable?_5 expand_1 to-source?17_1 #t #t #t #t))"
+"((s_428 ns_93 serializable?_5 expand_1 to-source?17_1)"
+"(compile23_0 s_428 ns_93 serializable?_5 expand_1 to-source?17_1 #t #t #t #t))"
 "((s_20 ns_94 serializable?_6 expand16_1)(compile23_0 s_20 ns_94 serializable?_6 expand16_1 #f #t #t #t #f))"
 "((s_23 ns_95 serializable?15_1)(compile23_0 s_23 ns_95 serializable?15_1 #f #f #t #t #f #f))"
-"((s_432 ns14_3)(compile23_0 s_432 ns14_3 #f #f #f #t #f #f #f)))))"
+"((s_429 ns14_3)(compile23_0 s_429 ns14_3 #f #f #f #t #f #f #f)))))"
 "(define-values"
 "(compile-to-linklets)"
 "(let-values(((compile-to-linklets28_0)"
 "(lambda(s27_0 ns25_0 ns26_2)"
 "(begin"
 " 'compile-to-linklets28"
-"(let-values(((s_409) s27_0))"
+"(let-values(((s_406) s27_0))"
 "(let-values(((ns_96)(if ns26_2 ns25_0(1/current-namespace))))"
-"(let-values()(1/compile s_409 ns_96 #t expand$1 #t))))))))"
+"(let-values()(1/compile s_406 ns_96 #t expand$1 #t))))))))"
 "(case-lambda"
-"((s_433)(begin(compile-to-linklets28_0 s_433 #f #f)))"
+"((s_430)(begin(compile-to-linklets28_0 s_430 #f #f)))"
 "((s_303 ns25_1)(compile-to-linklets28_0 s_303 ns25_1 #t)))))"
 "(define-values"
 "(struct:lifted-parsed-begin"
@@ -44309,7 +44341,7 @@ static const char *startup_source =
 "(if(parsed-module? exp-s_5)"
 "(let-values()"
 "(let-values(((exp-s96_0) exp-s_5)"
-"((temp97_2)"
+"((temp97_1)"
 "(let-values(((ns100_0) ns_97))"
 "(make-compile-context14.1 #f #f #f #f #f #f ns100_0 #t #f #f #f #f)))"
 "((serializable?98_0) serializable?_7)"
@@ -44326,7 +44358,7 @@ static const char *startup_source =
 " to-source?99_0"
 " #t"
 " exp-s96_0"
-" temp97_2)))"
+" temp97_1)))"
 "(if(lifted-parsed-begin? exp-s_5)"
 "(let-values()"
 "(let-values(((temp101_1)"
@@ -44371,7 +44403,7 @@ static const char *startup_source =
 "(compiled-tops->compiled-top8.1 #f #f #f #f to-source?102_0 #t temp101_1)))"
 "(let-values()"
 "(let-values(((exp-s103_0) exp-s_5)"
-"((temp104_2)"
+"((temp104_3)"
 "(let-values(((ns107_0) ns_97))"
 "(make-compile-context14.1"
 " #f"
@@ -44396,13 +44428,13 @@ static const char *startup_source =
 " to-source?106_0"
 " #t"
 " exp-s103_0"
-" temp104_2)))))))))"
+" temp104_3)))))))))"
 " loop_97)"
 " exp-s_4)))))"
 "(define-values"
 "(expand$1)"
 "(let-values(((expand40_0)"
-"(lambda(s39_0"
+"(lambda(s39_1"
 " ns31_3"
 " observable?32_0"
 " to-parsed?33_0"
@@ -44413,7 +44445,7 @@ static const char *startup_source =
 " serializable?38_0)"
 "(begin"
 " 'expand40"
-"(let-values(((s_434) s39_0))"
+"(let-values(((s_431) s39_1))"
 "(let-values(((ns_98)(if ns35_0 ns31_3(1/current-namespace))))"
 "(let-values(((observable?_0)(if observable?36_0 observable?32_0 #f)))"
 "(let-values(((to-parsed?_2)(if to-parsed?37_0 to-parsed?33_0 #f)))"
@@ -44429,12 +44461,12 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s108_0) s_434)"
+"(let-values(((s108_0) s_431)"
 "((ns109_1) ns_98)"
-"((temp110_1)"
-"(lambda(s_435 ns_99 as-tail?_5)"
+"((temp110_0)"
+"(lambda(s_432 ns_99 as-tail?_5)"
 "(expand-single"
-" s_435"
+" s_432"
 " ns_99"
 " observer_2"
 " to-parsed?_2"
@@ -44452,30 +44484,30 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp110_1"
+" temp110_0"
 " re-pair112_0"
 " #t"
 " s108_0"
 " ns109_1))))))))))))))))"
 "(case-lambda"
 "((s_301)(begin 'expand(expand40_0 s_301 #f #f #f #f #f #f #f #f)))"
-"((s_436 ns_100 observable?_1 to-parsed?_3 serializable?34_1)"
-"(expand40_0 s_436 ns_100 observable?_1 to-parsed?_3 serializable?34_1 #t #t #t #t))"
-"((s_437 ns_101 observable?_2 to-parsed?33_1)(expand40_0 s_437 ns_101 observable?_2 to-parsed?33_1 #f #t #t #t #f))"
+"((s_433 ns_100 observable?_1 to-parsed?_3 serializable?34_1)"
+"(expand40_0 s_433 ns_100 observable?_1 to-parsed?_3 serializable?34_1 #t #t #t #t))"
+"((s_434 ns_101 observable?_2 to-parsed?33_1)(expand40_0 s_434 ns_101 observable?_2 to-parsed?33_1 #f #t #t #t #f))"
 "((s_34 ns_102 observable?32_1)(expand40_0 s_34 ns_102 observable?32_1 #f #f #t #t #f #f))"
 "((s_389 ns31_4)(expand40_0 s_389 ns31_4 #f #f #f #t #f #f #f)))))"
 "(define-values"
 "(expand-single)"
-"(lambda(s_438 ns_103 observer_3 to-parsed?_4 serializable?_9)"
+"(lambda(s_435 ns_103 observer_3 to-parsed?_4 serializable?_9)"
 "(begin"
-"(let-values(((rebuild-s_2)(keep-properties-only s_438)))"
+"(let-values(((rebuild-s_2)(keep-properties-only s_435)))"
 "(let-values(((ctx_68)"
 "(let-values(((ns114_0) ns_103)"
 "((to-parsed?115_0) to-parsed?_4)"
 "((serializable?116_0) serializable?_9)"
 "((observer117_0) observer_3))"
 "(make-expand-context10.1 serializable?116_0 #t observer117_0 #t to-parsed?115_0 #t ns114_0))))"
-"(let-values(((require-lifts_3 lifts_9 exp-s_6)(expand-capturing-lifts s_438 ctx_68)))"
+"(let-values(((require-lifts_3 lifts_9 exp-s_6)(expand-capturing-lifts s_435 ctx_68)))"
 "(if(if(null? require-lifts_3)(null? lifts_9) #f)"
 "(let-values() exp-s_6)"
 "(if to-parsed?_4"
@@ -44484,11 +44516,11 @@ static const char *startup_source =
 "((lifts119_0) lifts_9)"
 "((exp-s120_0) exp-s_6)"
 "((rebuild-s121_0) rebuild-s_2)"
-"((temp122_3)"
+"((temp122_2)"
 "(lambda(form_0)"
 "(expand-single form_0 ns_103 observer_3 to-parsed?_4 serializable?_9))))"
 "(wrap-lifts-as-lifted-parsed-begin77.1"
-" temp122_3"
+" temp122_2"
 " require-lifts118_0"
 " lifts119_0"
 " exp-s120_0"
@@ -44499,14 +44531,14 @@ static const char *startup_source =
 "(log-top-lift-begin-before ctx_68 require-lifts_3 lifts_9 exp-s_6 ns_103)"
 "(values))))"
 "(let-values(((new-s_2)"
-"(let-values(((temp123_3)(append require-lifts_3 lifts_9))"
-"((temp124_2)"
+"(let-values(((temp123_2)(append require-lifts_3 lifts_9))"
+"((temp124_1)"
 "(lambda(form_1)"
 "(begin"
-"(let-values(((obs_43)(expand-context-observer ctx_68)))"
-"(if obs_43"
+"(let-values(((obs_23)(expand-context-observer ctx_68)))"
+"(if obs_23"
 "(let-values()"
-"(let-values()(call-expand-observe obs_43 'next)))"
+"(let-values()(call-expand-observe obs_23 'next)))"
 "(void)))"
 "(expand-single"
 " form_1"
@@ -44520,10 +44552,10 @@ static const char *startup_source =
 "(let-values() form_2)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_44)(expand-context-observer ctx_68)))"
-"(if obs_44"
+"(let-values(((obs_42)(expand-context-observer ctx_68)))"
+"(if obs_42"
 "(let-values()"
-"(let-values()(call-expand-observe obs_44 'next)))"
+"(let-values()(call-expand-observe obs_42 'next)))"
 "(void)))"
 "(expand-single"
 " form_2"
@@ -44532,15 +44564,15 @@ static const char *startup_source =
 " to-parsed?_4"
 " serializable?_9))))))"
 "((exp-s126_0) exp-s_6)"
-"((temp127_1)(namespace-phase ns_103)))"
+"((temp127_2)(namespace-phase ns_103)))"
 "(wrap-lifts-as-begin16.1"
 " temp125_0"
 " #t"
-" temp124_2"
+" temp124_1"
 " #t"
-" temp123_3"
+" temp123_2"
 " exp-s126_0"
-" temp127_1))))"
+" temp127_2))))"
 "(begin(log-top-begin-after ctx_68 new-s_2) new-s_2))))))))))))"
 "(define-values"
 "(expand-once$1)"
@@ -44554,7 +44586,7 @@ static const char *startup_source =
 "(let-values(((s128_0) s_391)"
 "((ns129_0) ns_104)"
 "((temp130_1)"
-"(lambda(s_439 ns_105 as-tail?_6)(expand-single-once s_439 ns_105)))"
+"(lambda(s_436 ns_105 as-tail?_6)(expand-single-once s_436 ns_105)))"
 "((cons131_0) cons)"
 "((re-pair132_0) re-pair)"
 "((temp133_0) #t)"
@@ -44575,21 +44607,21 @@ static const char *startup_source =
 " s128_0"
 " ns129_0)))))))))"
 "(case-lambda"
-"((s_440)(begin 'expand-once(expand-once45_0 s_440 #f #f)))"
-"((s_441 ns42_2)(expand-once45_0 s_441 ns42_2 #t)))))"
+"((s_437)(begin 'expand-once(expand-once45_0 s_437 #f #f)))"
+"((s_438 ns42_2)(expand-once45_0 s_438 ns42_2 #t)))))"
 "(define-values"
 "(expand-single-once)"
-"(lambda(s_442 ns_106)"
+"(lambda(s_439 ns_106)"
 "(begin"
 "(let-values(((require-lifts_4 lifts_10 exp-s_7)"
 "(expand-capturing-lifts"
-" s_442"
+" s_439"
 "(let-values(((v_190)"
 "(let-values(((ns135_1) ns_106))"
 "(make-expand-context10.1 #f #f #f #f #f #f ns135_1))))"
 "(let-values(((the-struct_69) v_190))"
 "(if(expand-context/outer? the-struct_69)"
-"(let-values(((inner136_0)"
+"(let-values(((inner136_1)"
 "(let-values(((the-struct_70)(root-expand-context/outer-inner v_190)))"
 "(if(expand-context/inner? the-struct_70)"
 "(let-values(((just-once?137_0) #t))"
@@ -44624,7 +44656,7 @@ static const char *startup_source =
 "                                              \"expand-context/inner?\""
 " the-struct_70)))))"
 "(expand-context/outer1.1"
-" inner136_0"
+" inner136_1"
 "(root-expand-context/outer-post-expansion-scope the-struct_69)"
 "(root-expand-context/outer-use-site-scopes the-struct_69)"
 "(root-expand-context/outer-frame-id the-struct_69)"
@@ -44643,10 +44675,10 @@ static const char *startup_source =
 "(if(if(null? require-lifts_4)(null? lifts_10) #f)"
 "(let-values() exp-s_7)"
 "(let-values()"
-"(let-values(((temp138_1)(append require-lifts_4 lifts_10))"
+"(let-values(((temp138_2)(append require-lifts_4 lifts_10))"
 "((exp-s139_0) exp-s_7)"
-"((temp140_3)(namespace-phase ns_106)))"
-"(wrap-lifts-as-begin16.1 #f #f #f #f temp138_1 exp-s139_0 temp140_3))))))))"
+"((temp140_4)(namespace-phase ns_106)))"
+"(wrap-lifts-as-begin16.1 #f #f #f #f temp138_2 exp-s139_0 temp140_4))))))))"
 "(define-values"
 "(expand-to-top-form$1)"
 "(let-values(((expand-to-top-form50_0)"
@@ -44687,7 +44719,7 @@ static const char *startup_source =
 " s141_0"
 " ns142_0)))))))))))))"
 "(case-lambda"
-"((s_443)(begin 'expand-to-top-form(expand-to-top-form50_0 s_443 #f #f)))"
+"((s_440)(begin 'expand-to-top-form(expand-to-top-form50_0 s_440 #f #f)))"
 "((s_212 ns47_3)(expand-to-top-form50_0 s_212 ns47_3 #t)))))"
 "(define-values"
 "(per-top-level68.1)"
@@ -44723,7 +44755,7 @@ static const char *startup_source =
 "(make-expand-context10.1 #f #f observer147_0 #t #f #f ns146_0))))"
 "(let-values(((phase_137)(namespace-phase ns_107)))"
 "((letrec-values(((loop_98)"
-"(lambda(s_214 phase_103 ns_108 as-tail?_7)"
+"(lambda(s_214 phase_138 ns_108 as-tail?_7)"
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
@@ -44737,7 +44769,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_71)"
 "(let-values(((phase149_0)"
-" phase_103)"
+" phase_138)"
 "((namespace150_0)"
 " ns_108)"
 "((just-once?151_0)"
@@ -44829,14 +44861,14 @@ static const char *startup_source =
 "(let-values(((wb-s_0)(if just-once?_1 s_214 #f)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_45)"
+"(let-values(((obs_43)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_45"
+"(if obs_43"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_45"
+" obs_43"
 " 'visit"
 " s_214)))"
 "(void)))"
@@ -44845,21 +44877,21 @@ static const char *startup_source =
 "(expand-capturing-lifts"
 " s_214"
 "(let-values(((v_191) tl-ctx_0))"
-"(let-values(((the-struct_59) v_191))"
-"(if(expand-context/outer? the-struct_59)"
+"(let-values(((the-struct_72) v_191))"
+"(if(expand-context/outer? the-struct_72)"
 "(let-values(((only-immediate?153_0)"
 " #t)"
 "((def-ctx-scopes154_0)"
 "(box null))"
-"((inner155_1)"
+"((inner155_0)"
 "(let-values(((the-struct_33)"
 "(root-expand-context/outer-inner"
 " v_191)))"
 "(if(expand-context/inner?"
 " the-struct_33)"
 "(let-values(((phase156_1)"
-" phase_103)"
-"((namespace157_1)"
+" phase_138)"
+"((namespace157_0)"
 " ns_108))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -44879,7 +44911,7 @@ static const char *startup_source =
 "(expand-context/inner-to-parsed?"
 " the-struct_33)"
 " phase156_1"
-" namespace157_1"
+" namespace157_0"
 "(expand-context/inner-just-once?"
 " the-struct_33)"
 "(expand-context/inner-module-begin-k"
@@ -44915,42 +44947,42 @@ static const char *startup_source =
 "                                                                                                    \"expand-context/inner?\""
 " the-struct_33)))))"
 "(expand-context/outer1.1"
-" inner155_1"
+" inner155_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_59)"
+" the-struct_72)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_59)"
+" the-struct_72)"
 "(root-expand-context/outer-frame-id"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-context"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-env"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-scopes"
-" the-struct_59)"
+" the-struct_72)"
 " def-ctx-scopes154_0"
 "(expand-context/outer-binding-layer"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-reference-records"
-" the-struct_59)"
+" the-struct_72)"
 " only-immediate?153_0"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_59)"
+" the-struct_72)"
 "(expand-context/outer-name"
-" the-struct_59)))"
+" the-struct_72)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                  \"expand-context/outer?\""
-" the-struct_59)))))))"
+" the-struct_72)))))))"
 "(let-values(((disarmed-exp-s_0)"
 "(syntax-disarm$1 exp-s_8)))"
-"(if(let-values(((or-part_299)"
+"(if(let-values(((or-part_300)"
 "(pair? require-lifts_5)))"
-"(if or-part_299 or-part_299(pair? lifts_11)))"
+"(if or-part_300 or-part_300(pair? lifts_11)))"
 "(let-values()"
 "(let-values(((new-s_3)"
 "(let-values(((temp158_0)"
@@ -44958,7 +44990,7 @@ static const char *startup_source =
 " require-lifts_5"
 " lifts_11))"
 "((exp-s159_0) exp-s_8)"
-"((phase160_0) phase_103))"
+"((phase160_0) phase_138))"
 "(wrap-lifts-as-begin16.1"
 " #f"
 " #f"
@@ -44968,14 +45000,14 @@ static const char *startup_source =
 " exp-s159_0"
 " phase160_0))))"
 "(begin"
-"(let-values(((obs_46)"
+"(let-values(((obs_44)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_46"
+"(if obs_44"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_46"
+" obs_44"
 " 'lift-loop"
 " new-s_3)))"
 "(void)))"
@@ -44983,20 +45015,20 @@ static const char *startup_source =
 " new-s_3"
 "(loop_98"
 " new-s_3"
-" phase_103"
+" phase_138"
 " ns_108"
 " as-tail?_7)))))"
 "(if(not single_0)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_47)"
+"(let-values(((obs_45)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_47"
+"(if obs_45"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_47"
+" obs_45"
 " 'return"
 " exp-s_8)))"
 "(void)))"
@@ -45007,52 +45039,52 @@ static const char *startup_source =
 "(let-values(((tmp_35)"
 "(core-form-sym"
 " disarmed-exp-s_0"
-" phase_103)))"
+" phase_138)))"
 "(if(equal? tmp_35 'begin)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_48)"
+"(let-values(((obs_46)"
 "(expand-context-observer"
 " ctx_69)))"
-"(if obs_48"
+"(if obs_46"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_48"
+" obs_46"
 " 'prim-begin)))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_27 begin161_0 e162_0)"
-"(let-values(((s_444)"
+"(let-values(((s_441)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_33)"
-" s_444))"
+" s_441))"
 "(let-values(((begin161_1"
 " e162_1)"
-"(let-values(((s_422)"
+"(let-values(((s_419)"
 "(if(syntax?$1"
-" s_444)"
+" s_441)"
 "(syntax-e$1"
-" s_444)"
-" s_444)))"
+" s_441)"
+" s_441)))"
 "(if(pair?"
-" s_422)"
+" s_419)"
 "(let-values(((begin163_0)"
-"(let-values(((s_423)"
+"(let-values(((s_420)"
 "(car"
-" s_422)))"
-" s_423))"
+" s_419)))"
+" s_420))"
 "((e164_0)"
-"(let-values(((s_445)"
+"(let-values(((s_442)"
 "(cdr"
-" s_422)))"
+" s_419)))"
 "(let-values(((s_123)"
 "(if(syntax?$1"
-" s_445)"
+" s_442)"
 "(syntax-e$1"
-" s_445)"
-" s_445)))"
+" s_442)"
+" s_442)))"
 "(let-values(((flat-s_20)"
 "(to-syntax-list.1"
 " s_123)))"
@@ -45094,20 +45126,20 @@ static const char *startup_source =
 "(let-values()"
 "(loop_98"
 "(car es_2)"
-" phase_103"
+" phase_138"
 " ns_108"
 " as-tail?_7))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_49)"
+"(let-values(((obs_47)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_49"
+"(if obs_47"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_49"
+" obs_47"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -45116,14 +45148,14 @@ static const char *startup_source =
 "(loop_98"
 "(car"
 " es_2)"
-" phase_103"
+" phase_138"
 " ns_108"
 " #f)"
 "(begin"
 "(loop_98"
 "(car"
 " es_2)"
-" phase_103"
+" phase_138"
 " ns_108"
 " #f)"
 "(void)))))"
@@ -45145,14 +45177,14 @@ static const char *startup_source =
 "(begin-loop_0"
 " e162_0))))"
 "(begin"
-"(let-values(((obs_50)"
+"(let-values(((obs_48)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_50"
+"(if obs_48"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_50"
+" obs_48"
 " 'return"
 " new-s_4)))"
 "(void)))"
@@ -45163,14 +45195,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_51)"
+"(let-values(((obs_49)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_51"
+"(if obs_49"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_51"
+" obs_49"
 " 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
@@ -45230,21 +45262,21 @@ static const char *startup_source =
 " begin-for-syntax165_1"
 " e166_1))))))"
 "(let-values(((next-phase_0)"
-"(add1 phase_103)))"
+"(add1 phase_138)))"
 "(let-values(((next-ns_0)"
 "(namespace->namespace-at-phase"
 " ns_108"
 " next-phase_0)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_52)"
+"(let-values(((obs_50)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_52"
+"(if obs_50"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_52"
+" obs_50"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -45293,14 +45325,14 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_53)"
+"(let-values(((obs_51)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_53"
+"(if obs_51"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_53"
+" obs_51"
 " 'next)))"
 "(void)))"
 "(loop_98"
@@ -45329,14 +45361,14 @@ static const char *startup_source =
 " exp-s_8"
 " l_69)))"
 "(begin"
-"(let-values(((obs_54)"
+"(let-values(((obs_52)"
 "(expand-context-observer"
 " tl-ctx_0)))"
-"(if obs_54"
+"(if obs_52"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_54"
+" obs_52"
 " 'return"
 " new-s_5)))"
 "(void)))"
@@ -45360,15 +45392,15 @@ static const char *startup_source =
 " #t)))))))))))))))))"
 "(define-values"
 "(maybe-intro)"
-"(lambda(s_446 ns_109)"
-"(begin(if(syntax?$1 s_446) s_446(1/namespace-syntax-introduce(1/datum->syntax #f s_446) ns_109)))))"
+"(lambda(s_443 ns_109)"
+"(begin(if(syntax?$1 s_443) s_443(1/namespace-syntax-introduce(1/datum->syntax #f s_443) ns_109)))))"
 "(define-values"
 "(re-pair)"
-"(lambda(form-id_0 s_447 r_44)"
-"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_447)(cons form-id_0 r_44) s_447 s_447) s_447))))"
+"(lambda(form-id_0 s_444 r_44)"
+"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_444)(cons form-id_0 r_44) s_444 s_444) s_444))))"
 "(define-values"
 "(expand-capturing-lifts)"
-"(lambda(s_448 ctx_70)"
+"(lambda(s_445 ctx_70)"
 "(begin"
 "(let-values()"
 "(let-values(((ns_110)(expand-context-namespace ctx_70)))"
@@ -45381,83 +45413,83 @@ static const char *startup_source =
 "(namespace-phase ns_110)"
 "(make-parse-top-lifted-require ns_110))))"
 "(let-values(((exp-s_9)"
-"(let-values(((s170_0) s_448)"
+"(let-values(((s170_0) s_445)"
 "((temp171_0)"
 "(let-values(((v_192) ctx_70))"
-"(let-values(((the-struct_72) v_192))"
-"(if(expand-context/outer? the-struct_72)"
-"(let-values(((inner172_0)"
-"(let-values(((the-struct_73)"
+"(let-values(((the-struct_73) v_192))"
+"(if(expand-context/outer? the-struct_73)"
+"(let-values(((inner172_1)"
+"(let-values(((the-struct_74)"
 "(root-expand-context/outer-inner v_192)))"
-"(if(expand-context/inner? the-struct_73)"
+"(if(expand-context/inner? the-struct_74)"
 "(let-values(((lifts173_0) lift-ctx_6)"
 "((module-lifts174_0) lift-ctx_6)"
 "((require-lifts175_0)"
 " require-lift-ctx_2))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_73)"
-"(root-expand-context/inner-counter the-struct_73)"
+" the-struct_74)"
+"(root-expand-context/inner-counter the-struct_74)"
 "(root-expand-context/inner-lift-key"
-" the-struct_73)"
-"(expand-context/inner-to-parsed? the-struct_73)"
-"(expand-context/inner-phase the-struct_73)"
-"(expand-context/inner-namespace the-struct_73)"
-"(expand-context/inner-just-once? the-struct_73)"
+" the-struct_74)"
+"(expand-context/inner-to-parsed? the-struct_74)"
+"(expand-context/inner-phase the-struct_74)"
+"(expand-context/inner-namespace the-struct_74)"
+"(expand-context/inner-just-once? the-struct_74)"
 "(expand-context/inner-module-begin-k"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_73)"
-"(expand-context/inner-stops the-struct_73)"
+" the-struct_74)"
+"(expand-context/inner-stops the-struct_74)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_73)"
+" the-struct_74)"
 " lifts173_0"
-"(expand-context/inner-lift-envs the-struct_73)"
+"(expand-context/inner-lift-envs the-struct_74)"
 " module-lifts174_0"
 " require-lifts175_0"
 "(expand-context/inner-to-module-lifts"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-requires+provides"
-" the-struct_73)"
-"(expand-context/inner-observer the-struct_73)"
+" the-struct_74)"
+"(expand-context/inner-observer the-struct_74)"
 "(expand-context/inner-for-serializable?"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_73)))"
+" the-struct_74)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                     \"expand-context/inner?\""
-" the-struct_73)))))"
+" the-struct_74)))))"
 "(expand-context/outer1.1"
-" inner172_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_72)"
-"(root-expand-context/outer-use-site-scopes the-struct_72)"
-"(root-expand-context/outer-frame-id the-struct_72)"
-"(expand-context/outer-context the-struct_72)"
-"(expand-context/outer-env the-struct_72)"
-"(expand-context/outer-post-expansion-scope-action the-struct_72)"
-"(expand-context/outer-scopes the-struct_72)"
-"(expand-context/outer-def-ctx-scopes the-struct_72)"
-"(expand-context/outer-binding-layer the-struct_72)"
-"(expand-context/outer-reference-records the-struct_72)"
-"(expand-context/outer-only-immediate? the-struct_72)"
-"(expand-context/outer-need-eventually-defined the-struct_72)"
-"(expand-context/outer-current-introduction-scopes the-struct_72)"
-"(expand-context/outer-name the-struct_72)))"
+" inner172_1"
+"(root-expand-context/outer-post-expansion-scope the-struct_73)"
+"(root-expand-context/outer-use-site-scopes the-struct_73)"
+"(root-expand-context/outer-frame-id the-struct_73)"
+"(expand-context/outer-context the-struct_73)"
+"(expand-context/outer-env the-struct_73)"
+"(expand-context/outer-post-expansion-scope-action the-struct_73)"
+"(expand-context/outer-scopes the-struct_73)"
+"(expand-context/outer-def-ctx-scopes the-struct_73)"
+"(expand-context/outer-binding-layer the-struct_73)"
+"(expand-context/outer-reference-records the-struct_73)"
+"(expand-context/outer-only-immediate? the-struct_73)"
+"(expand-context/outer-need-eventually-defined the-struct_73)"
+"(expand-context/outer-current-introduction-scopes the-struct_73)"
+"(expand-context/outer-name the-struct_73)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                   \"expand-context/outer?\""
-" the-struct_72))))))"
+" the-struct_73))))))"
 "(expand7.1 #f #f #f #f s170_0 temp171_0))))"
 "(values"
 "(get-and-clear-require-lifts! require-lift-ctx_2)"
@@ -45465,14 +45497,14 @@ static const char *startup_source =
 " exp-s_9))))))))))"
 "(define-values"
 "(make-parse-top-lifted-require)"
-"(lambda(ns_73)"
+"(lambda(ns_111)"
 "(begin"
-"(lambda(s_449 phase_138)"
+"(lambda(s_446 phase_139)"
 "(let-values(((ok?_28 #%require176_0 req177_0)"
-"(let-values(((s_450)(syntax-disarm$1 s_449)))"
-"(let-values(((orig-s_35) s_450))"
+"(let-values(((s_447)(syntax-disarm$1 s_446)))"
+"(let-values(((orig-s_35) s_447))"
 "(let-values(((#%require176_1 req177_1)"
-"(let-values(((s_250)(if(syntax?$1 s_450)(syntax-e$1 s_450) s_450)))"
+"(let-values(((s_250)(if(syntax?$1 s_447)(syntax-e$1 s_447) s_447)))"
 "(if(pair? s_250)"
 "(let-values(((#%require178_0)(let-values(((s_251)(car s_250))) s_251))"
 "((req179_0)"
@@ -45483,15 +45515,15 @@ static const char *startup_source =
 " s_252)))"
 "(if(pair? s_253)"
 "(let-values(((req180_0)"
-"(let-values(((s_451)(car s_253)))"
-" s_451))"
+"(let-values(((s_448)(car s_253)))"
+" s_448))"
 "(()"
-"(let-values(((s_452)(cdr s_253)))"
-"(let-values(((s_453)"
-"(if(syntax?$1 s_452)"
-"(syntax-e$1 s_452)"
-" s_452)))"
-"(if(null? s_453)"
+"(let-values(((s_449)(cdr s_253)))"
+"(let-values(((s_450)"
+"(if(syntax?$1 s_449)"
+"(syntax-e$1 s_449)"
+" s_449)))"
+"(if(null? s_450)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -45503,10 +45535,10 @@ static const char *startup_source =
 "                                            (raise-syntax-error$1 #f \"bad syntax\" orig-s_35)))))"
 "(values #t #%require176_1 req177_1))))))"
 "(let-values(((temp181_0)(list req177_0))"
-"((s182_0) s_449)"
-"((ns183_0) ns_73)"
-"((phase184_1) phase_138)"
-"((phase185_0) phase_138)"
+"((s182_0) s_446)"
+"((ns183_0) ns_111)"
+"((phase184_1) phase_139)"
+"((phase185_1) phase_139)"
 "((temp186_0)(let-values(((temp188_0) #f))(make-requires+provides8.1 #f #f temp188_0)))"
 "((temp187_0) 'require))"
 "(parse-and-perform-requires!30.1"
@@ -45518,7 +45550,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" phase185_0"
+" phase185_1"
 " #t"
 " #f"
 " #f"
@@ -45593,16 +45625,16 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((exp-rhs_1)"
+"(let-values(((exp-rhs_3)"
 "(adjust-form_1"
 "(caddr"
 " ids+syms+rhs_0))))"
 "(let-values(((just-rhs_0)"
 "(if(lifted-parsed-begin?"
-" exp-rhs_1)"
+" exp-rhs_3)"
 "(lifted-parsed-begin-last"
-" exp-rhs_1)"
-" exp-rhs_1)))"
+" exp-rhs_3)"
+" exp-rhs_3)))"
 "(let-values(((dv_0)"
 "(parsed-define-values19.1"
 " rebuild-s_3"
@@ -45612,21 +45644,21 @@ static const char *startup_source =
 " ids+syms+rhs_0)"
 " just-rhs_0)))"
 "(if(lifted-parsed-begin?"
-" exp-rhs_1)"
-"(let-values(((the-struct_74)"
-" exp-rhs_1))"
+" exp-rhs_3)"
+"(let-values(((the-struct_75)"
+" exp-rhs_3))"
 "(if(lifted-parsed-begin?"
-" the-struct_74)"
+" the-struct_75)"
 "(let-values(((last189_0)"
 " dv_0))"
 "(lifted-parsed-begin30.1"
 "(lifted-parsed-begin-seq"
-" the-struct_74)"
+" the-struct_75)"
 " last189_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                   \"lifted-parsed-begin?\""
-" the-struct_74)))"
+" the-struct_75)))"
 " dv_0)))))"
 " fold-var_283))))"
 "(values fold-var_284)))))"
@@ -45638,38 +45670,38 @@ static const char *startup_source =
 " exp-s_10))))))))))"
 "(define-values"
 "(log-top-lift-begin-before)"
-"(lambda(ctx_71 require-lifts_7 lifts_13 exp-s_11 ns_111)"
+"(lambda(ctx_71 require-lifts_7 lifts_13 exp-s_11 ns_112)"
 "(begin"
-"(let-values(((obs_55)(expand-context-observer ctx_71)))"
-"(if obs_55"
+"(let-values(((obs_53)(expand-context-observer ctx_71)))"
+"(if obs_53"
 "(let-values()"
 "(let-values(((new-s_6)"
 "(let-values(((temp190_0)(append require-lifts_7 lifts_13))"
 "((exp-s191_0) exp-s_11)"
-"((temp192_0)(namespace-phase ns_111)))"
+"((temp192_0)(namespace-phase ns_112)))"
 "(wrap-lifts-as-begin16.1 #f #f #f #f temp190_0 exp-s191_0 temp192_0))))"
-"(begin(call-expand-observe obs_55 'lift-loop new-s_6)(log-top-begin-before ctx_71 new-s_6))))"
+"(begin(call-expand-observe obs_53 'lift-loop new-s_6)(log-top-begin-before ctx_71 new-s_6))))"
 "(void))))))"
 "(define-values"
 "(log-top-begin-before)"
 "(lambda(ctx_72 new-s_7)"
 "(begin"
-"(let-values(((obs_56)(expand-context-observer ctx_72)))"
-"(if obs_56"
+"(let-values(((obs_54)(expand-context-observer ctx_72)))"
+"(if obs_54"
 "(let-values()"
 "(let-values(((ok?_29 begin193_0 e194_0)"
-"(let-values(((s_454) new-s_7))"
-"(let-values(((orig-s_36) s_454))"
+"(let-values(((s_451) new-s_7))"
+"(let-values(((orig-s_36) s_451))"
 "(let-values(((begin193_1 e194_1)"
-"(let-values(((s_455)(if(syntax?$1 s_454)(syntax-e$1 s_454) s_454)))"
-"(if(pair? s_455)"
-"(let-values(((begin195_0)(let-values(((s_456)(car s_455))) s_456))"
+"(let-values(((s_452)(if(syntax?$1 s_451)(syntax-e$1 s_451) s_451)))"
+"(if(pair? s_452)"
+"(let-values(((begin195_0)(let-values(((s_453)(car s_452))) s_453))"
 "((e196_0)"
-"(let-values(((s_457)(cdr s_455)))"
+"(let-values(((s_454)(cdr s_452)))"
 "(let-values(((s_134)"
-"(if(syntax?$1 s_457)"
-"(syntax-e$1 s_457)"
-" s_457)))"
+"(if(syntax?$1 s_454)"
+"(syntax-e$1 s_454)"
+" s_454)))"
 "(let-values(((flat-s_22)(to-syntax-list.1 s_134)))"
 "(if(not flat-s_22)"
 "(let-values()"
@@ -45682,33 +45714,33 @@ static const char *startup_source =
 "                                                (raise-syntax-error$1 #f \"bad syntax\" orig-s_36)))))"
 "(values #t begin193_1 e194_1))))))"
 "(begin"
-"(call-expand-observe obs_56 'visit new-s_7)"
-"(call-expand-observe obs_56 'resolve begin193_0)"
-"(call-expand-observe obs_56 'enter-prim new-s_7)"
-"(call-expand-observe obs_56 'prim-begin)"
-"(call-expand-observe obs_56 'enter-list(1/datum->syntax #f e194_0 new-s_7)))))"
+"(call-expand-observe obs_54 'visit new-s_7)"
+"(call-expand-observe obs_54 'resolve begin193_0)"
+"(call-expand-observe obs_54 'enter-prim new-s_7)"
+"(call-expand-observe obs_54 'prim-begin)"
+"(call-expand-observe obs_54 'enter-list(1/datum->syntax #f e194_0 new-s_7)))))"
 "(void))))))"
 "(define-values"
 "(log-top-begin-after)"
 "(lambda(ctx_73 new-s_8)"
 "(begin"
-"(let-values(((obs_57)(expand-context-observer ctx_73)))"
-"(if obs_57"
+"(let-values(((obs_55)(expand-context-observer ctx_73)))"
+"(if obs_55"
 "(let-values()"
 "(let-values(((ok?_30 begin197_0 e198_0)"
-"(let-values(((s_458) new-s_8))"
-"(let-values(((orig-s_37) s_458))"
+"(let-values(((s_455) new-s_8))"
+"(let-values(((orig-s_37) s_455))"
 "(let-values(((begin197_1 e198_1)"
-"(let-values(((s_459)(if(syntax?$1 s_458)(syntax-e$1 s_458) s_458)))"
-"(if(pair? s_459)"
-"(let-values(((begin199_0)(let-values(((s_460)(car s_459))) s_460))"
+"(let-values(((s_456)(if(syntax?$1 s_455)(syntax-e$1 s_455) s_455)))"
+"(if(pair? s_456)"
+"(let-values(((begin199_0)(let-values(((s_457)(car s_456))) s_457))"
 "((e200_0)"
-"(let-values(((s_461)(cdr s_459)))"
-"(let-values(((s_462)"
-"(if(syntax?$1 s_461)"
-"(syntax-e$1 s_461)"
-" s_461)))"
-"(let-values(((flat-s_23)(to-syntax-list.1 s_462)))"
+"(let-values(((s_458)(cdr s_456)))"
+"(let-values(((s_459)"
+"(if(syntax?$1 s_458)"
+"(syntax-e$1 s_458)"
+" s_458)))"
+"(let-values(((flat-s_23)(to-syntax-list.1 s_459)))"
 "(if(not flat-s_23)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -45719,14 +45751,14 @@ static const char *startup_source =
 "(values begin199_0 e200_0))"
 "                                                (raise-syntax-error$1 #f \"bad syntax\" orig-s_37)))))"
 "(values #t begin197_1 e198_1))))))"
-"(let-values(((obs_58)(expand-context-observer ctx_73)))"
-"(if obs_58"
+"(let-values(((obs_56)(expand-context-observer ctx_73)))"
+"(if obs_56"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_58 'exit-list(1/datum->syntax #f e198_0 new-s_8))"
-"(call-expand-observe obs_58 'exit-prim new-s_8)"
-"(call-expand-observe obs_58 'return new-s_8))))"
+"(call-expand-observe obs_56 'exit-list(1/datum->syntax #f e198_0 new-s_8))"
+"(call-expand-observe obs_56 'exit-prim new-s_8)"
+"(call-expand-observe obs_56 'return new-s_8))))"
 "(void)))))"
 "(void))))))"
 "(define-values"
@@ -45762,8 +45794,8 @@ static const char *startup_source =
 "(let-values(((or-part_6)(not sym_82)))"
 "(if or-part_6"
 " or-part_6"
-"(let-values(((or-part_300)(equal? sym_82 0)))"
-"(if or-part_300 or-part_300(void? sym_82)))))))"
+"(let-values(((or-part_301)(equal? sym_82 0)))"
+"(if or-part_301 or-part_301(void? sym_82)))))))"
 "(void)"
 "(let-values()"
 "                                                    (raise-argument-error who_21 \"(or/c symbol? #f 0 void?)\" sym_82)))"
@@ -45787,13 +45819,13 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_5)"
 " #f))))))"
 "(let-values(((mod-name_22)(1/module-path-index-resolve mpi_48 #t)))"
-"(let-values(((phase_139)(namespace-phase ns_58)))"
+"(let-values(((phase_140)(namespace-phase ns_58)))"
 "(if(not sym_82)"
 "(let-values()"
 "(let-values(((ns20_1) ns_58)"
 "((mpi21_0) mpi_48)"
-"((phase22_0) phase_139)"
-"((phase23_1) phase_139)"
+"((phase22_0) phase_140)"
+"((phase23_1) phase_140)"
 "((temp24_4) #f))"
 "(namespace-module-instantiate!96.1"
 " temp24_4"
@@ -45811,8 +45843,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns25_2) ns_58)"
 "((mpi26_0) mpi_48)"
-"((phase27_1) phase_139)"
-"((phase28_1) phase_139))"
+"((phase27_1) phase_140)"
+"((phase28_1) phase_140))"
 "(namespace-module-instantiate!96.1"
 " #f"
 " #f"
@@ -45829,8 +45861,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns29_0) ns_58)"
 "((mpi30_0) mpi_48)"
-"((phase31_1) phase_139)"
-"((phase32_3) phase_139))"
+"((phase31_1) phase_140)"
+"((phase32_3) phase_140))"
 "(namespace-module-visit!104.1"
 " phase32_3"
 " #t"
@@ -45875,9 +45907,9 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns33_0) ns_58)"
 "((mpi34_0) mpi_48)"
-"((phase35_1) phase_139)"
+"((phase35_1) phase_140)"
 "((phase36_0)"
-" phase_139))"
+" phase_140))"
 "(namespace-module-instantiate!96.1"
 " #f"
 " #f"
@@ -45903,7 +45935,7 @@ static const char *startup_source =
 " ex-mod-name_0)"
 "((temp39_4)"
 "(phase-"
-" phase_139"
+" phase_140"
 " ex-phase_0))"
 "((temp40_2) #t))"
 "(namespace->module-namespace82.1"
@@ -46000,9 +46032,9 @@ static const char *startup_source =
 "((mpi42_1)"
 " mpi_48)"
 "((phase43_2)"
-" phase_139)"
+" phase_140)"
 "((phase44_0)"
-" phase_139))"
+" phase_140))"
 "(namespace-module-visit!104.1"
 " phase44_0"
 " #t"
@@ -46173,12 +46205,12 @@ static const char *startup_source =
 "(if(list? l_8)"
 "(andmap2"
 "(lambda(p_56)"
-"(let-values(((or-part_292)(not p_56)))"
-"(if or-part_292"
-" or-part_292"
-"(let-values(((or-part_293)(complete-path-string? p_56)))"
+"(let-values(((or-part_293)(not p_56)))"
 "(if or-part_293"
 " or-part_293"
+"(let-values(((or-part_294)(complete-path-string? p_56)))"
+"(if or-part_294"
+" or-part_294"
 "(if(hash? p_56)"
 "(let-values(((ht_153) p_56))"
 "(begin"
@@ -46400,11 +46432,11 @@ static const char *startup_source =
 "(let-values(((sp_0)(find-system-path 'exec-file)))"
 "(let-values(((exe_0)(find-executable-path sp_0 #f)))"
 "(let-values(((start_43)"
-"(let-values(((or-part_293)(1/string->number start_42)))"
-"(if or-part_293 or-part_293 0))))"
+"(let-values(((or-part_294)(1/string->number start_42)))"
+"(if or-part_294 or-part_294 0))))"
 "(let-values(((end_33)"
-"(let-values(((or-part_298)(1/string->number end_32)))"
-"(if or-part_298 or-part_298 0))))"
+"(let-values(((or-part_299)(1/string->number end_32)))"
+"(if or-part_299 or-part_299 0))))"
 "(let-values(((exe4_0) exe_0)"
 "((temp5_5)"
 "(lambda()"
@@ -46446,7 +46478,7 @@ static const char *startup_source =
 "(let-values()((1/current-eval) e_77)))"
 "(loop_74)))))))))"
 " loop_74)))))))"
-"(define-values(->path)(lambda(s_430)(begin(if(string? s_430)(string->path s_430) s_430))))"
+"(define-values(->path)(lambda(s_427)(begin(if(string? s_427)(string->path s_427) s_427))))"
 "(define-values"
 "(find-main-collects)"
 "(lambda()"
@@ -46522,7 +46554,7 @@ static const char *startup_source =
 "(lambda(d_33)"
 "(begin"
 "      (let-values (((p_63) (if d_33 (build-path d_33 \"config.rktd\") #f)))"
-"(let-values(((or-part_291)"
+"(let-values(((or-part_292)"
 "(if p_63"
 "(if(file-exists? p_63)"
 "(let-values(((p9_0) p_63)"
@@ -46535,7 +46567,7 @@ static const char *startup_source =
 "(with-input-from-file45.1 #f #f p9_0 temp10_4))"
 " #f)"
 " #f)))"
-"(if or-part_291 or-part_291 '#hash()))))))"
+"(if or-part_292 or-part_292 '#hash()))))))"
 "(define-values"
 "(get-installation-name)"
 "(lambda(config-table_0)(begin(hash-ref config-table_0 'installation-name(version)))))"
@@ -46734,17 +46766,17 @@ static const char *startup_source =
 "(if(list? p_67)"
 "(if(let-values(((or-part_232)(= 2(length p_67))))"
 "(if or-part_232 or-part_232(= 3(length p_67))))"
-"(if(let-values(((or-part_301)(string?(car p_67))))"
-"(if or-part_301"
-" or-part_301"
-"(let-values(((or-part_302)"
-"(eq? 'root(car p_67))))"
+"(if(let-values(((or-part_302)(string?(car p_67))))"
 "(if or-part_302"
 " or-part_302"
+"(let-values(((or-part_303)"
+"(eq? 'root(car p_67))))"
+"(if or-part_303"
+" or-part_303"
 "(eq? 'static-root(car p_67))))))"
 "(if(path-string?(cadr p_67))"
-"(let-values(((or-part_303)(null?(cddr p_67))))"
-"(if or-part_303 or-part_303(regexp?(caddr p_67))))"
+"(let-values(((or-part_304)(null?(cddr p_67))))"
+"(if or-part_304 or-part_304(regexp?(caddr p_67))))"
 " #f)"
 " #f)"
 " #f)"
@@ -46761,8 +46793,8 @@ static const char *startup_source =
 "(begin"
 "(for-each2"
 "(lambda(p_68)"
-"(if(let-values(((or-part_304)(null?(cddr p_68))))"
-"(if or-part_304 or-part_304(regexp-match?(caddr p_68)(version))))"
+"(if(let-values(((or-part_305)(null?(cddr p_68))))"
+"(if or-part_305 or-part_305(regexp-match?(caddr p_68)(version))))"
 "(let-values()"
 "(let-values(((dir_1)"
 "(simplify-path(path->complete-path(cadr p_68) dir_0))))"
@@ -47319,14 +47351,14 @@ static const char *startup_source =
 " or-part_87"
 "(lambda(mod-path_25 sym_91 failure-k_0)"
 "                                     (error 'read \"no `dynamic-require` provided\"))))"
-"(let-values(((or-part_305) module-declared?_1))"
-"(if or-part_305"
-" or-part_305"
+"(let-values(((or-part_306) module-declared?_1))"
+"(if or-part_306"
+" or-part_306"
 "                                   (lambda (mod-path_26) (error 'read \"no `module-declare?` provided\"))))"
 "(let-values(((or-part_227) coerce_1))"
 "(if or-part_227 or-part_227(lambda(for-syntax?_2 v_109 srcloc_9) v_109)))"
-"(let-values(((or-part_271) coerce-key_1))"
-"(if or-part_271 or-part_271(lambda(for-syntax?_3 v_113) v_113)))"
+"(let-values(((or-part_272) coerce-key_1))"
+"(if or-part_272 or-part_272(lambda(for-syntax?_3 v_113) v_113)))"
 " #f"
 " #f"
 " #f"
@@ -47357,13 +47389,13 @@ static const char *startup_source =
 "(let-values(((keep-comment?_2) keep-comment?34_0))"
 "(let-values()"
 "(let-values(((v_214) config_0))"
-"(let-values(((the-struct_75) v_214))"
-"(if(read-config/outer? the-struct_75)"
+"(let-values(((the-struct_76) v_214))"
+"(if(read-config/outer? the-struct_76)"
 "(let-values(((wrap55_0) wrap_5)"
 "((keep-comment?56_0) keep-comment?_2)"
 "((inner57_0)"
-"(let-values(((the-struct_76)(read-config/outer-inner v_214)))"
-"(if(read-config/inner? the-struct_76)"
+"(let-values(((the-struct_77)(read-config/outer-inner v_214)))"
+"(if(read-config/inner? the-struct_77)"
 "(let-values(((for-syntax?58_0) for-syntax?_4)"
 "((readtable59_0) readtable_2)"
 "((next-readtable60_0) next-readtable_2)"
@@ -47375,25 +47407,25 @@ static const char *startup_source =
 " readtable59_0"
 " next-readtable60_0"
 " for-syntax?58_0"
-"(read-config/inner-source the-struct_76)"
-"(read-config/inner-read-compiled the-struct_76)"
-"(read-config/inner-dynamic-require the-struct_76)"
-"(read-config/inner-module-declared? the-struct_76)"
-"(read-config/inner-coerce the-struct_76)"
-"(read-config/inner-coerce-key the-struct_76)"
-"(read-config/inner-parameter-override the-struct_76)"
-"(read-config/inner-parameter-cache the-struct_76)"
+"(read-config/inner-source the-struct_77)"
+"(read-config/inner-read-compiled the-struct_77)"
+"(read-config/inner-dynamic-require the-struct_77)"
+"(read-config/inner-module-declared? the-struct_77)"
+"(read-config/inner-coerce the-struct_77)"
+"(read-config/inner-coerce-key the-struct_77)"
+"(read-config/inner-parameter-override the-struct_77)"
+"(read-config/inner-parameter-cache the-struct_77)"
 " st61_0))"
-"                                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_76)))))"
+"                                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_77)))))"
 "(read-config/outer1.1"
 " inner57_0"
 " wrap55_0"
-"(read-config/outer-line the-struct_75)"
-"(read-config/outer-col the-struct_75)"
-"(read-config/outer-pos the-struct_75)"
-"(read-config/outer-indentations the-struct_75)"
+"(read-config/outer-line the-struct_76)"
+"(read-config/outer-col the-struct_76)"
+"(read-config/outer-pos the-struct_76)"
+"(read-config/outer-indentations the-struct_76)"
 " keep-comment?56_0))"
-"                            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_75)))))))))))))))"
+"                            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_76)))))))))))))))"
 "(define-values"
 "(port+config->srcloc49.1)"
 "(lambda(end-pos45_0 end-pos46_0 in47_0 config48_0)"
@@ -47404,16 +47436,16 @@ static const char *startup_source =
 "(let-values(((given-end-pos_0)(if end-pos46_0 end-pos45_0 #f)))"
 "(let-values()"
 "(let-values(((end-pos_0)"
-"(let-values(((or-part_306) given-end-pos_0))"
-"(if or-part_306"
-" or-part_306"
+"(let-values(((or-part_307) given-end-pos_0))"
+"(if or-part_307"
+" or-part_307"
 "(let-values(((end-line_0 end-col_0 end-pos_1)(port-next-location in_1)))"
 " end-pos_1)))))"
 "(srcloc"
 "(let-values(((or-part_186)(read-config-source config_1)))"
 "(if or-part_186"
 " or-part_186"
-"                     (let-values (((or-part_307) (object-name in_1))) (if or-part_307 or-part_307 \"UNKNOWN\"))))"
+"                     (let-values (((or-part_308) (object-name in_1))) (if or-part_308 or-part_308 \"UNKNOWN\"))))"
 "(read-config-line config_1)"
 "(read-config-col config_1)"
 "(read-config-pos config_1)"
@@ -47425,55 +47457,55 @@ static const char *startup_source =
 "(lambda(config_2 line_2 col_1 pos_108)"
 "(begin"
 "(let-values(((v_215) config_2))"
-"(let-values(((the-struct_77) v_215))"
-"(if(read-config/outer? the-struct_77)"
+"(let-values(((the-struct_78) v_215))"
+"(if(read-config/outer? the-struct_78)"
 "(let-values(((line62_0) line_2)"
 "((col63_0) col_1)"
 "((pos64_0) pos_108)"
 "((inner65_0)(read-config/outer-inner v_215)))"
 "(read-config/outer1.1"
 " inner65_0"
-"(read-config/outer-wrap the-struct_77)"
+"(read-config/outer-wrap the-struct_78)"
 " line62_0"
 " col63_0"
 " pos64_0"
-"(read-config/outer-indentations the-struct_77)"
-"(read-config/outer-keep-comment? the-struct_77)))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_77)))))))"
+"(read-config/outer-indentations the-struct_78)"
+"(read-config/outer-keep-comment? the-struct_78)))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_78)))))))"
 "(define-values"
 "(disable-wrapping)"
 "(lambda(config_3)"
 "(begin"
 "(let-values(((v_216) config_3))"
-"(let-values(((the-struct_78) v_216))"
-"(if(read-config/outer? the-struct_78)"
+"(let-values(((the-struct_79) v_216))"
+"(if(read-config/outer? the-struct_79)"
 "(let-values(((wrap66_0) #f)((inner67_0)(read-config/outer-inner v_216)))"
 "(read-config/outer1.1"
 " inner67_0"
 " wrap66_0"
-"(read-config/outer-line the-struct_78)"
-"(read-config/outer-col the-struct_78)"
-"(read-config/outer-pos the-struct_78)"
-"(read-config/outer-indentations the-struct_78)"
-"(read-config/outer-keep-comment? the-struct_78)))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_78)))))))"
+"(read-config/outer-line the-struct_79)"
+"(read-config/outer-col the-struct_79)"
+"(read-config/outer-pos the-struct_79)"
+"(read-config/outer-indentations the-struct_79)"
+"(read-config/outer-keep-comment? the-struct_79)))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_79)))))))"
 "(define-values"
 "(keep-comment)"
 "(lambda(config_4)"
 "(begin"
 "(let-values(((v_217) config_4))"
-"(let-values(((the-struct_79) v_217))"
-"(if(read-config/outer? the-struct_79)"
+"(let-values(((the-struct_80) v_217))"
+"(if(read-config/outer? the-struct_80)"
 "(let-values(((keep-comment?68_0) #t)((inner69_0)(read-config/outer-inner v_217)))"
 "(read-config/outer1.1"
 " inner69_0"
-"(read-config/outer-wrap the-struct_79)"
-"(read-config/outer-line the-struct_79)"
-"(read-config/outer-col the-struct_79)"
-"(read-config/outer-pos the-struct_79)"
-"(read-config/outer-indentations the-struct_79)"
+"(read-config/outer-wrap the-struct_80)"
+"(read-config/outer-line the-struct_80)"
+"(read-config/outer-col the-struct_80)"
+"(read-config/outer-pos the-struct_80)"
+"(read-config/outer-indentations the-struct_80)"
 " keep-comment?68_0))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_79)))))))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_80)))))))"
 "(define-values"
 "(discard-comment)"
 "(lambda(config_5)"
@@ -47482,18 +47514,18 @@ static const char *startup_source =
 "(let-values() config_5)"
 "(let-values()"
 "(let-values(((v_218) config_5))"
-"(let-values(((the-struct_80) v_218))"
-"(if(read-config/outer? the-struct_80)"
+"(let-values(((the-struct_81) v_218))"
+"(if(read-config/outer? the-struct_81)"
 "(let-values(((keep-comment?70_0) #f)((inner71_0)(read-config/outer-inner v_218)))"
 "(read-config/outer1.1"
 " inner71_0"
-"(read-config/outer-wrap the-struct_80)"
-"(read-config/outer-line the-struct_80)"
-"(read-config/outer-col the-struct_80)"
-"(read-config/outer-pos the-struct_80)"
-"(read-config/outer-indentations the-struct_80)"
+"(read-config/outer-wrap the-struct_81)"
+"(read-config/outer-line the-struct_81)"
+"(read-config/outer-col the-struct_81)"
+"(read-config/outer-pos the-struct_81)"
+"(read-config/outer-indentations the-struct_81)"
 " keep-comment?70_0))"
-"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_80)))))))))"
+"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_81)))))))))"
 "(define-values"
 "(next-readtable)"
 "(lambda(config_6)"
@@ -47502,35 +47534,35 @@ static const char *startup_source =
 "(let-values() config_6)"
 "(let-values()"
 "(let-values(((v_219) config_6))"
-"(let-values(((the-struct_81) v_219))"
-"(if(read-config/outer? the-struct_81)"
+"(let-values(((the-struct_82) v_219))"
+"(if(read-config/outer? the-struct_82)"
 "(let-values(((inner72_1)"
-"(let-values(((the-struct_82)(read-config/outer-inner v_219)))"
-"(if(read-config/inner? the-struct_82)"
+"(let-values(((the-struct_83)(read-config/outer-inner v_219)))"
+"(if(read-config/inner? the-struct_83)"
 "(let-values(((readtable73_0)(read-config-next-readtable config_6)))"
 "(read-config/inner2.1"
 " readtable73_0"
-"(read-config/inner-next-readtable the-struct_82)"
-"(read-config/inner-for-syntax? the-struct_82)"
-"(read-config/inner-source the-struct_82)"
-"(read-config/inner-read-compiled the-struct_82)"
-"(read-config/inner-dynamic-require the-struct_82)"
-"(read-config/inner-module-declared? the-struct_82)"
-"(read-config/inner-coerce the-struct_82)"
-"(read-config/inner-coerce-key the-struct_82)"
-"(read-config/inner-parameter-override the-struct_82)"
-"(read-config/inner-parameter-cache the-struct_82)"
-"(read-config/inner-st the-struct_82)))"
-"                                  (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_82)))))"
+"(read-config/inner-next-readtable the-struct_83)"
+"(read-config/inner-for-syntax? the-struct_83)"
+"(read-config/inner-source the-struct_83)"
+"(read-config/inner-read-compiled the-struct_83)"
+"(read-config/inner-dynamic-require the-struct_83)"
+"(read-config/inner-module-declared? the-struct_83)"
+"(read-config/inner-coerce the-struct_83)"
+"(read-config/inner-coerce-key the-struct_83)"
+"(read-config/inner-parameter-override the-struct_83)"
+"(read-config/inner-parameter-cache the-struct_83)"
+"(read-config/inner-st the-struct_83)))"
+"                                  (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_83)))))"
 "(read-config/outer1.1"
 " inner72_1"
-"(read-config/outer-wrap the-struct_81)"
-"(read-config/outer-line the-struct_81)"
-"(read-config/outer-col the-struct_81)"
-"(read-config/outer-pos the-struct_81)"
-"(read-config/outer-indentations the-struct_81)"
-"(read-config/outer-keep-comment? the-struct_81)))"
-"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_81)))))))))"
+"(read-config/outer-wrap the-struct_82)"
+"(read-config/outer-line the-struct_82)"
+"(read-config/outer-col the-struct_82)"
+"(read-config/outer-pos the-struct_82)"
+"(read-config/outer-indentations the-struct_82)"
+"(read-config/outer-keep-comment? the-struct_82)))"
+"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_82)))))))))"
 "(define-values"
 "(coerce)"
 "(lambda(val_79 in_2 config_7)"
@@ -47583,36 +47615,36 @@ static const char *startup_source =
 "(lambda(param_1 config_9 v_28)"
 "(begin"
 "(let-values(((v_91) config_9))"
-"(let-values(((the-struct_83) v_91))"
-"(if(read-config/outer? the-struct_83)"
+"(let-values(((the-struct_84) v_91))"
+"(if(read-config/outer? the-struct_84)"
 "(let-values(((inner1_0)"
-"(let-values(((the-struct_84)(read-config/outer-inner v_91)))"
-"(if(read-config/inner? the-struct_84)"
+"(let-values(((the-struct_85)(read-config/outer-inner v_91)))"
+"(if(read-config/inner? the-struct_85)"
 "(let-values(((parameter-override2_0)"
 "(hash-set(read-config-parameter-override config_9) param_1 v_28)))"
 "(read-config/inner2.1"
-"(read-config/inner-readtable the-struct_84)"
-"(read-config/inner-next-readtable the-struct_84)"
-"(read-config/inner-for-syntax? the-struct_84)"
-"(read-config/inner-source the-struct_84)"
-"(read-config/inner-read-compiled the-struct_84)"
-"(read-config/inner-dynamic-require the-struct_84)"
-"(read-config/inner-module-declared? the-struct_84)"
-"(read-config/inner-coerce the-struct_84)"
-"(read-config/inner-coerce-key the-struct_84)"
+"(read-config/inner-readtable the-struct_85)"
+"(read-config/inner-next-readtable the-struct_85)"
+"(read-config/inner-for-syntax? the-struct_85)"
+"(read-config/inner-source the-struct_85)"
+"(read-config/inner-read-compiled the-struct_85)"
+"(read-config/inner-dynamic-require the-struct_85)"
+"(read-config/inner-module-declared? the-struct_85)"
+"(read-config/inner-coerce the-struct_85)"
+"(read-config/inner-coerce-key the-struct_85)"
 " parameter-override2_0"
-"(read-config/inner-parameter-cache the-struct_84)"
-"(read-config/inner-st the-struct_84)))"
-"                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_84)))))"
+"(read-config/inner-parameter-cache the-struct_85)"
+"(read-config/inner-st the-struct_85)))"
+"                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_85)))))"
 "(read-config/outer1.1"
 " inner1_0"
-"(read-config/outer-wrap the-struct_83)"
-"(read-config/outer-line the-struct_83)"
-"(read-config/outer-col the-struct_83)"
-"(read-config/outer-pos the-struct_83)"
-"(read-config/outer-indentations the-struct_83)"
-"(read-config/outer-keep-comment? the-struct_83)))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_83)))))))"
+"(read-config/outer-wrap the-struct_84)"
+"(read-config/outer-line the-struct_84)"
+"(read-config/outer-col the-struct_84)"
+"(read-config/outer-pos the-struct_84)"
+"(read-config/outer-indentations the-struct_84)"
+"(read-config/outer-keep-comment? the-struct_84)))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_84)))))))"
 "(define-values"
 "(force-parameters!)"
 "(lambda(config_10)"
@@ -47750,10 +47782,10 @@ static const char *startup_source =
 " 'non-terminating-macro)))"
 "(if or-part_174"
 " or-part_174"
-"(let-values(((or-part_308)"
+"(let-values(((or-part_309)"
 "(eq? mode_16 'dispatch-macro)))"
-"(if or-part_308"
-" or-part_308"
+"(if or-part_309"
+" or-part_309"
 "(char? mode_16)))))))"
 "(void)"
 "(let-values()"
@@ -48073,8 +48105,8 @@ static const char *startup_source =
 "                      (let-values (((msg_0) (format \"~a: ~a\" who_26 (apply format str_24 args_9))))"
 "(let-values(((srcloc_10)"
 "(if in_6"
-"(let-values(((in23_0) in_6)((config24_0) config_16)((end-pos25_0) end-pos_2))"
-"(port+config->srcloc49.1 end-pos25_0 #t in23_0 config24_0))"
+"(let-values(((in23_1) in_6)((config24_0) config_16)((end-pos25_0) end-pos_2))"
+"(port+config->srcloc49.1 end-pos25_0 #t in23_1 config24_0))"
 " #f)))"
 "(raise"
 "((if(eof-object? due-to_0)"
@@ -48196,10 +48228,10 @@ static const char *startup_source =
 " in_10"
 " special1.1"
 " source_5))))"
-"(if(let-values(((or-part_294)"
+"(if(let-values(((or-part_295)"
 "(eof-object? c_65)))"
-"(if or-part_294"
-" or-part_294"
+"(if or-part_295"
+" or-part_295"
 "(eqv?"
 " '#\\newline"
 "(effective-char c_65 config_15))))"
@@ -48382,12 +48414,12 @@ static const char *startup_source =
 "(let-values(((or-part_26)(char-whitespace? dc_0)))"
 "(if or-part_26"
 " or-part_26"
-"(let-values(((or-part_309)(char=? dc_0 '#\\()))"
-"(if or-part_309"
-" or-part_309"
-"(let-values(((or-part_290)(char=? dc_0 '#\\))))"
-"(if or-part_290"
-" or-part_290"
+"(let-values(((or-part_310)(char=? dc_0 '#\\()))"
+"(if or-part_310"
+" or-part_310"
+"(let-values(((or-part_291)(char=? dc_0 '#\\))))"
+"(if or-part_291"
+" or-part_291"
 "(let-values(((or-part_27)(char=? dc_0 '#\\[)))"
 "(if or-part_27"
 " or-part_27"
@@ -48483,9 +48515,9 @@ static const char *startup_source =
 "(if(check-parameter 1/read-curly-brace-as-paren config_21)(opener-name '#\\{ config_21) #f)))"
 "(if(if s_10 c_69 #f)"
 "              (let-values () (format \"~a, ~a, or ~a\" p_63 s_10 c_69))"
-"(if(let-values(((or-part_293) s_10))(if or-part_293 or-part_293 c_69))"
+"(if(let-values(((or-part_294) s_10))(if or-part_294 or-part_294 c_69))"
 "(let-values()"
-"                  (format \"~a or ~a\" p_63 (let-values (((or-part_294) s_10)) (if or-part_294 or-part_294 c_69))))"
+"                  (format \"~a or ~a\" p_63 (let-values (((or-part_295) s_10)) (if or-part_295 or-part_295 c_69))))"
 "(let-values() p_63)))))))))"
 "(define-values"
 "(struct:accum-string"
@@ -48667,7 +48699,7 @@ static const char *startup_source =
 "                 (let-values () (format \"unexpected `~a`\" c_71))"
 "(let-values()"
 "(let-values(((missing_2)"
-"(let-values(((or-part_302)"
+"(let-values(((or-part_303)"
 "(let-values(((lst_311)(cdr indts_1)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
@@ -48704,7 +48736,7 @@ static const char *startup_source =
 " for-loop_273)"
 " #f"
 " lst_311)))))"
-"                                   (if or-part_302 or-part_302 \"expected\"))))"
+"                                   (if or-part_303 or-part_303 \"expected\"))))"
 "(let-values(((opener-str_0)(opener-name(closer->opener(indentation-closer indt_2)) config_33)))"
 "(format"
 "                        \"~a ~a to close ~a, found instead `~a`\""
@@ -48752,8 +48784,8 @@ static const char *startup_source =
 "(let-values(((indentation_0)(make-indentation closer_1 in_10 seq-config_0)))"
 "(let-values(((config_34)"
 "(let-values(((v_226) elem-config_0))"
-"(let-values(((the-struct_85) v_226))"
-"(if(read-config/outer? the-struct_85)"
+"(let-values(((the-struct_86) v_226))"
+"(if(read-config/outer? the-struct_86)"
 "(let-values(((indentations20_0)"
 "(cons"
 " indentation_0"
@@ -48761,16 +48793,16 @@ static const char *startup_source =
 "((inner21_0)(read-config/outer-inner v_226)))"
 "(read-config/outer1.1"
 " inner21_0"
-"(read-config/outer-wrap the-struct_85)"
-"(read-config/outer-line the-struct_85)"
-"(read-config/outer-col the-struct_85)"
-"(read-config/outer-pos the-struct_85)"
+"(read-config/outer-wrap the-struct_86)"
+"(read-config/outer-line the-struct_86)"
+"(read-config/outer-col the-struct_86)"
+"(read-config/outer-pos the-struct_86)"
 " indentations20_0"
-"(read-config/outer-keep-comment? the-struct_85)))"
+"(read-config/outer-keep-comment? the-struct_86)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                       \"read-config/outer?\""
-" the-struct_85))))))"
+" the-struct_86))))))"
 "(let-values(((open-end-line_0 open-end-col_0 open-end-pos_0)"
 "(port-next-location in_10)))"
 "(let-values(((config/keep-comment_0)(keep-comment config_34)))"
@@ -49208,9 +49240,9 @@ static const char *startup_source =
 "(hex-digit?)"
 "(lambda(c_77)"
 "(begin"
-"(let-values(((or-part_310)(if(char>=? c_77 '#\\0)(char<=? c_77 '#\\9) #f)))"
-"(if or-part_310"
-" or-part_310"
+"(let-values(((or-part_311)(if(char>=? c_77 '#\\0)(char<=? c_77 '#\\9) #f)))"
+"(if or-part_311"
+" or-part_311"
 "(let-values(((or-part_96)(if(char>=? c_77 '#\\A)(char<=? c_77 '#\\F) #f)))"
 "(if or-part_96 or-part_96(if(char>=? c_77 '#\\a)(char<=? c_77 '#\\f) #f))))))))"
 "(define-values"
@@ -49285,17 +49317,17 @@ static const char *startup_source =
 " decimal-mode74_0"
 " convert-mode75_0))))))))))))))"
 "(case-lambda"
-"((s_463)(begin 'string->number(string->number8_0 s_463 #f #f #f #f #f #f)))"
-"((s_464 radix_1 convert-mode_1 decimal-mode3_1)"
-"(string->number8_0 s_464 radix_1 convert-mode_1 decimal-mode3_1 #t #t #t))"
+"((s_460)(begin 'string->number(string->number8_0 s_460 #f #f #f #f #f #f)))"
+"((s_461 radix_1 convert-mode_1 decimal-mode3_1)"
+"(string->number8_0 s_461 radix_1 convert-mode_1 decimal-mode3_1 #t #t #t))"
 "((s_181 radix_2 convert-mode2_1)(string->number8_0 s_181 radix_2 convert-mode2_1 #f #t #t #f))"
-"((s_465 radix1_1)(string->number8_0 s_465 radix1_1 #f #f #t #f #f)))))"
+"((s_462 radix1_1)(string->number8_0 s_462 radix1_1 #f #f #t #f #f)))))"
 "(define-values"
 "(do-string->number20.1)"
 "(lambda(in-complex11_0"
 " in-complex13_0"
 " radix-set?10_0"
-" s14_0"
+" s14_1"
 " start15_0"
 " end16_0"
 " radix17_0"
@@ -49303,7 +49335,7 @@ static const char *startup_source =
 " convert-mode19_0)"
 "(begin"
 " 'do-string->number20"
-"(let-values(((s_466) s14_0))"
+"(let-values(((s_463) s14_1))"
 "(let-values(((start_44) start15_0))"
 "(let-values(((end_34) end16_0))"
 "(let-values(((radix_3) radix17_0))"
@@ -49318,17 +49350,17 @@ static const char *startup_source =
 "                              (let-values () (format \"no digits\"))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((c_79)(string-ref s_466 start_44)))"
+"(let-values(((c_79)(string-ref s_463 start_44)))"
 "(if(char=? '#\\# c_79)"
 "(let-values()"
 "(let-values(((next_4)(add1 start_44)))"
 "(if(= next_4 end_34)"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
-"                                          (let-values () (format \"no character after `#` indicator in `~.a`\" s_466))"
+"                                          (let-values () (format \"no character after `#` indicator in `~.a`\" s_463))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((i_176)(string-ref s_466 next_4)))"
+"(let-values(((i_176)(string-ref s_463 next_4)))"
 "(let-values(((tmp_38) i_176))"
 "(let-values(((index_2)"
 "(if(char? tmp_38)"
@@ -49404,21 +49436,21 @@ static const char *startup_source =
 "(format"
 "                                                       \"bad `#` indicator `~a` at `~.a`\""
 " i_176"
-"(substring s_466 start_44 end_34)))"
+"(substring s_463 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(unsafe-fx< index_2 2)"
 "(let-values()"
-"(if(let-values(((or-part_311)(exactness-set? exactness_0)))"
-"(if or-part_311 or-part_311 in-complex_0))"
+"(if(let-values(((or-part_312)(exactness-set? exactness_0)))"
+"(if or-part_312 or-part_312 in-complex_0))"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
 "(let-values()"
 "(format"
 "                                                             \"misplaced exactness specification at `~.a`\""
-"(substring s_466 start_44 end_34)))"
+"(substring s_463 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((s76_1) s_466)"
+"(let-values(((s76_1) s_463)"
 "((temp77_0)(add1 next_4))"
 "((end78_0) end_34)"
 "((radix79_0) radix_3)"
@@ -49446,14 +49478,14 @@ static const char *startup_source =
 " temp81_1"
 " temp82_4)))))"
 "(let-values()"
-"(if(let-values(((or-part_312) radix-set?_0))"
-"(if or-part_312 or-part_312 in-complex_0))"
+"(if(let-values(((or-part_313) radix-set?_0))"
+"(if or-part_313 or-part_313 in-complex_0))"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
 "(let-values()"
 "(format"
 "                                                             \"misplaced radix specification at `~.a`\""
-"(substring s_466 start_44 end_34)))"
+"(substring s_463 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(let-values(((radix_4)"
@@ -49471,11 +49503,11 @@ static const char *startup_source =
 "(equal? tmp_39 '#\\D))"
 "(let-values() 10)"
 "(let-values() 16)))))))"
-"(let-values(((s83_0) s_466)"
-"((temp84_1)(add1 next_4))"
+"(let-values(((s83_0) s_463)"
+"((temp84_0)(add1 next_4))"
 "((end85_0) end_34)"
 "((radix86_0) radix_4)"
-"((temp87_3) #t)"
+"((temp87_2) #t)"
 "((exactness88_0) exactness_0)"
 "((temp89_2)"
 "(if(eq? convert-mode_2 'read)"
@@ -49484,16 +49516,16 @@ static const char *startup_source =
 "(do-string->number20.1"
 " #f"
 " #f"
-" temp87_3"
+" temp87_2"
 " s83_0"
-" temp84_1"
+" temp84_0"
 " end85_0"
 " radix86_0"
 " exactness88_0"
 " temp89_2)))))))))))))))"
 "(let-values(((c1_28)"
 "(if(char-sign? c_79)"
-"(read-special-number s_466 start_44 end_34 convert-mode_2)"
+"(read-special-number s_463 start_44 end_34 convert-mode_2)"
 " #f)))"
 "(if c1_28"
 "((lambda(v_230)"
@@ -49508,10 +49540,10 @@ static const char *startup_source =
 "(if(char-sign? c_79)"
 "(if(not in-complex_0)"
 "(if(>(- end_34 start_44) 7)"
-"(if(char=? '#\\i(string-ref s_466(sub1 end_34)))"
-"(if(char-sign?(string-ref s_466 6))"
+"(if(char=? '#\\i(string-ref s_463(sub1 end_34)))"
+"(if(char-sign?(string-ref s_463 6))"
 "(read-special-number"
-" s_466"
+" s_463"
 " start_44"
 "(+ start_44 6)"
 " convert-mode_2)"
@@ -49522,8 +49554,8 @@ static const char *startup_source =
 " #f)))"
 "(if c2_3"
 "((lambda(v_231)"
-"(let-values(((s90_1) s_466)"
-"((temp91_0)(+ start_44 6))"
+"(let-values(((s90_1) s_463)"
+"((temp91_1)(+ start_44 6))"
 "((temp92_2)(sub1 end_34))"
 "((radix93_0) radix_3)"
 "((exactness94_0) exactness_0)"
@@ -49538,7 +49570,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " s90_1"
-" temp91_0"
+" temp91_1"
 " temp92_2"
 " radix93_0"
 " exactness94_0"
@@ -49549,10 +49581,10 @@ static const char *startup_source =
 "(let-values(((c3_2)"
 "(if(not in-complex_0)"
 "(if(>=(- end_34 start_44) 7)"
-"(if(char=? '#\\i(string-ref s_466(sub1 end_34)))"
-"(if(char-sign?(string-ref s_466(- end_34 7)))"
+"(if(char=? '#\\i(string-ref s_463(sub1 end_34)))"
+"(if(char-sign?(string-ref s_463(- end_34 7)))"
 "(read-special-number"
-" s_466"
+" s_463"
 "(- end_34 7)"
 "(sub1 end_34)"
 " convert-mode_2)"
@@ -49565,20 +49597,20 @@ static const char *startup_source =
 "(if(if(= start_44(- end_34 7))(not(extflonum? v2_1)) #f)"
 "(let-values()(make-rectangular 0 v2_1))"
 "(let-values()"
-"(let-values(((s99_0) s_466)"
+"(let-values(((s99_0) s_463)"
 "((start100_0) start_44)"
 "((temp101_2)(- end_34 7))"
 "((radix102_0) radix_3)"
 "((exactness103_0) exactness_0)"
 "((convert-mode104_0) convert-mode_2)"
-"((temp105_1) 'i)"
+"((temp105_2) 'i)"
 "((temp106_1) #t)"
 "((v2107_0) v2_1)"
-"((temp108_0)"
+"((temp108_1)"
 "(lambda(v2_2 v_77)"
 "(begin 'temp108(make-rectangular v_77 v2_2)))))"
 "(read-for-special-compound65.1"
-" temp105_1"
+" temp105_2"
 " temp106_1"
 " #t"
 " s99_0"
@@ -49588,15 +49620,15 @@ static const char *startup_source =
 " exactness103_0"
 " convert-mode104_0"
 " v2107_0"
-" temp108_0)))))"
+" temp108_1)))))"
 " c3_2)"
 "(let-values(((c4_0)"
 "(if(char-sign? c_79)"
 "(if(not in-complex_0)"
 "(if(>(- end_34 start_44) 7)"
-"(if(char=? '#\\@(string-ref s_466(+ start_44 6)))"
+"(if(char=? '#\\@(string-ref s_463(+ start_44 6)))"
 "(read-special-number"
-" s_466"
+" s_463"
 " start_44"
 "(+ start_44 6)"
 " convert-mode_2)"
@@ -49606,8 +49638,8 @@ static const char *startup_source =
 " #f)))"
 "(if c4_0"
 "((lambda(v_199)"
-"(let-values(((s109_0) s_466)"
-"((temp110_2)(+ start_44 7))"
+"(let-values(((s109_0) s_463)"
+"((temp110_1)(+ start_44 7))"
 "((end111_0) end_34)"
 "((radix112_0) radix_3)"
 "((exactness113_0) exactness_0)"
@@ -49622,7 +49654,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " s109_0"
-" temp110_2"
+" temp110_1"
 " end111_0"
 " radix112_0"
 " exactness113_0"
@@ -49633,9 +49665,9 @@ static const char *startup_source =
 "(let-values(((c5_1)"
 "(if(not in-complex_0)"
 "(if(>(- end_34 start_44) 7)"
-"(if(char=? '#\\@(string-ref s_466(- end_34 7)))"
+"(if(char=? '#\\@(string-ref s_463(- end_34 7)))"
 "(read-special-number"
-" s_466"
+" s_463"
 "(- end_34 6)"
 " end_34"
 " convert-mode_2)"
@@ -49644,20 +49676,20 @@ static const char *startup_source =
 " #f)))"
 "(if c5_1"
 "((lambda(v2_4)"
-"(let-values(((s118_0) s_466)"
+"(let-values(((s118_0) s_463)"
 "((start119_0) start_44)"
 "((temp120_2)(- end_34 7))"
 "((radix121_0) radix_3)"
 "((exactness122_0) exactness_0)"
 "((convert-mode123_0) convert-mode_2)"
-"((temp124_3) '@)"
+"((temp124_2) '@)"
 "((temp125_1) #t)"
 "((v2126_0) v2_4)"
-"((temp127_2)"
+"((temp127_3)"
 "(lambda(v2_5 v_233)"
 "(begin 'temp127(make-polar v_233 v2_5)))))"
 "(read-for-special-compound65.1"
-" temp124_3"
+" temp124_2"
 " temp125_1"
 " #t"
 " s118_0"
@@ -49667,10 +49699,10 @@ static const char *startup_source =
 " exactness122_0"
 " convert-mode123_0"
 " v2126_0"
-" temp127_2)))"
+" temp127_3)))"
 " c5_1)"
 "(let-values()"
-"(let-values(((s128_1) s_466)"
+"(let-values(((s128_1) s_463)"
 "((start129_0) start_44)"
 "((end130_0) end_34)"
 "((radix131_0) radix_3)"
@@ -49742,10 +49774,10 @@ static const char *startup_source =
 "(substring s_38 start_45 end_35)))"
 "(let-values() #f)))"
 "(if(if sign-pos_0"
-"(let-values(((or-part_313)"
+"(let-values(((or-part_314)"
 "(if dot-pos_1(< dot-pos_1 sign-pos_0) #f)))"
-"(if or-part_313"
-" or-part_313"
+"(if or-part_314"
+" or-part_314"
 "(if slash-pos_0(< slash-pos_0 sign-pos_0) #f)))"
 " #f)"
 "(let-values()"
@@ -49761,22 +49793,22 @@ static const char *startup_source =
 "((start137_0) start_45)"
 "((sign-pos138_0) sign-pos_0)"
 "((sign-pos139_0) sign-pos_0)"
-"((temp140_4)(sub1 end_35))"
+"((temp140_5)(sub1 end_35))"
 "((i-pos141_0) i-pos_3)"
 "((sign-pos142_0) sign-pos_0)"
 "((radix143_0) radix_5)"
 "((radix-set?144_0) radix-set?_1)"
 "((exactness145_0) exactness_1)"
-"((temp146_1) 'i)"
+"((temp146_2) 'i)"
 "((convert-mode147_0) convert-mode_3))"
 "(string->complex-number50.1"
-" temp146_1"
+" temp146_2"
 " radix-set?144_0"
 " s136_0"
 " start137_0"
 " sign-pos138_0"
 " sign-pos139_0"
-" temp140_4"
+" temp140_5"
 " i-pos141_0"
 " sign-pos142_0"
 " radix143_0"
@@ -49871,27 +49903,27 @@ static const char *startup_source =
 " slash-pos_0"
 " #f"
 "(if(> i_177 start_45)"
-"(let-values(((or-part_314)(not @-pos_0)))"
-"(if or-part_314"
-" or-part_314"
+"(let-values(((or-part_315)(not @-pos_0)))"
+"(if or-part_315"
+" or-part_315"
 "(> i_177(add1 @-pos_0))))"
 " #f)))))"
 "(if(char=? c_80 '#\\.)"
 "(let-values()"
 "(if(let-values(((or-part_218)"
 "(if exp-pos_0"
-"(let-values(((or-part_315)"
+"(let-values(((or-part_316)"
 "(not sign-pos_0)))"
-"(if or-part_315"
-" or-part_315"
+"(if or-part_316"
+" or-part_316"
 "(> exp-pos_0 sign-pos_0)))"
 " #f)))"
 "(if or-part_218"
 " or-part_218"
 "(if dot-pos_1"
-"(let-values(((or-part_316)(not sign-pos_0)))"
-"(if or-part_316"
-" or-part_316"
+"(let-values(((or-part_274)(not sign-pos_0)))"
+"(if or-part_274"
+" or-part_274"
 "(> dot-pos_1 sign-pos_0)))"
 " #f)))"
 "(let-values()"
@@ -50684,7 +50716,7 @@ static const char *startup_source =
 " combine64_0)"
 "(begin"
 " 'read-for-special-compound65"
-"(let-values(((s_467) s57_0))"
+"(let-values(((s_464) s57_0))"
 "(let-values(((start_50) start58_0))"
 "(let-values(((end_40) end59_0))"
 "(let-values(((radix_10) radix60_0))"
@@ -50707,18 +50739,18 @@ static const char *startup_source =
 "(let-values()(fail-extflonum convert-mode_10 v_235))"
 "(let-values()"
 "(let-values(((v2_7)"
-"(let-values(((s176_0) s_467)"
+"(let-values(((s176_0) s_464)"
 "((start177_0) start_50)"
 "((end178_0) end_40)"
 "((radix179_0) radix_10)"
-"((temp180_0) #t)"
+"((temp180_1) #t)"
 "((exactness181_0) exactness_5)"
 "((in-complex182_0) in-complex_3)"
 "((convert-mode183_0) convert-mode_10))"
 "(do-string->number20.1"
 " in-complex182_0"
 " #t"
-" temp180_0"
+" temp180_1"
 " s176_0"
 " start177_0"
 " end178_0"
@@ -50734,7 +50766,7 @@ static const char *startup_source =
 "(let-values()(combine_1 v_235 v2_7)))))))))))))))))))))))"
 "(define-values"
 "(hashes?)"
-"(lambda(s_468 start_51 end_41)"
+"(lambda(s_465 start_51 end_41)"
 "(begin"
 "(let-values(((v*_6 start*_5 stop*_6 step*_5)"
 "(normalise-inputs"
@@ -50742,7 +50774,7 @@ static const char *startup_source =
 "                     \"string\""
 "(lambda(x_82)(string? x_82))"
 "(lambda(x_83)(unsafe-string-length x_83))"
-" s_468"
+" s_465"
 " start_51"
 " end_41"
 " 1)))"
@@ -50768,7 +50800,7 @@ static const char *startup_source =
 " start*_5))))))"
 "(define-values"
 "(replace-hashes)"
-"(lambda(s_469 start_52 end_42)"
+"(lambda(s_466 start_52 end_42)"
 "(begin"
 "(let-values(((new-s_9)(make-string(- end_42 start_52))))"
 "(begin"
@@ -50778,7 +50810,7 @@ static const char *startup_source =
 "                         \"string\""
 "(lambda(x_85)(string? x_85))"
 "(lambda(x_86)(unsafe-string-length x_86))"
-" s_469"
+" s_466"
 " start_52"
 " end_42"
 " 1))"
@@ -50814,8 +50846,8 @@ static const char *startup_source =
 " new-s_9)))))"
 "(define-values"
 "(maybe-substring)"
-"(lambda(s_470 start_54 end_43)"
-"(begin(if(if(= 0 start_54)(= end_43(string-length s_470)) #f) s_470(substring s_470 start_54 end_43)))))"
+"(lambda(s_403 start_54 end_43)"
+"(begin(if(if(= 0 start_54)(= end_43(string-length s_403)) #f) s_403(substring s_403 start_54 end_43)))))"
 "(define-values"
 "(exactness-set?)"
 "(lambda(exactness_6)"
@@ -50830,23 +50862,23 @@ static const char *startup_source =
 "(lambda(c_85 radix_11)"
 "(begin"
 "(let-values(((v_236)(char->integer c_85)))"
-"(let-values(((or-part_280)"
-"(if(>= v_236(char->integer '#\\0))(<(- v_236(char->integer '#\\0)) radix_11) #f)))"
-"(if or-part_280"
-" or-part_280"
-"(if(> radix_11 10)"
 "(let-values(((or-part_359)"
-"(if(>= v_236(char->integer '#\\a))(<(- v_236(-(char->integer '#\\a) 10)) radix_11) #f)))"
+"(if(>= v_236(char->integer '#\\0))(<(- v_236(char->integer '#\\0)) radix_11) #f)))"
 "(if or-part_359"
 " or-part_359"
+"(if(> radix_11 10)"
+"(let-values(((or-part_360)"
+"(if(>= v_236(char->integer '#\\a))(<(- v_236(-(char->integer '#\\a) 10)) radix_11) #f)))"
+"(if or-part_360"
+" or-part_360"
 "(if(>= v_236(char->integer '#\\A))(<(- v_236(-(char->integer '#\\A) 10)) radix_11) #f)))"
 " #f)))))))"
 "(define-values"
 "(fail-bad-number)"
-"(lambda(convert-mode_11 s_471 start_55 end_44)"
+"(lambda(convert-mode_11 s_467 start_55 end_44)"
 "(begin"
 "(if(eq? convert-mode_11 'must-read)"
-"        (let-values () (format \"bad number `~.a`\" (substring s_471 start_55 end_44)))"
+"        (let-values () (format \"bad number `~.a`\" (substring s_467 start_55 end_44)))"
 "(let-values() #f)))))"
 "(define-values"
 "(read-complains)"
@@ -51162,7 +51194,7 @@ static const char *startup_source =
 "(begin"
 "(if(string? num_0)"
 "(let-values()"
-"(let-values(((in23_1) in_25)"
+"(let-values(((in23_2) in_25)"
 "((config24_1) config_24)"
 "                                                                 ((temp25_5) \"~a\")"
 "((num26_0) num_0))"
@@ -51175,7 +51207,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" in23_1"
+" in23_2"
 " config24_1"
 " temp25_5"
 "(list num26_0))))"
@@ -51201,9 +51233,9 @@ static const char *startup_source =
 "(list temp30_2))))"
 "(void))"
 "(wrap"
-"(let-values(((or-part_295) num_0))"
-"(if or-part_295"
-" or-part_295"
+"(let-values(((or-part_296) num_0))"
+"(if or-part_296"
+" or-part_296"
 "(let-values(((or-part_93)"
 "(if(eq? mode_17 'keyword)"
 "(string->keyword str_28)"
@@ -51253,8 +51285,8 @@ static const char *startup_source =
 "(if(not(char? c_89))"
 "(let-values() c_89)"
 "(let-values()"
-"(let-values(((c9_0) c_89)((in10_2) in_29)((config11_0) config_39)((mode12_0) mode_18))"
-"(read-symbol-or-number8.1 #f #f mode12_0 #t c9_0 in10_2 config11_0)))))))"
+"(let-values(((c9_0) c_89)((in10_1) in_29)((config11_0) config_39)((mode12_0) mode_18))"
+"(read-symbol-or-number8.1 #f #f mode12_0 #t c9_0 in10_1 config11_0)))))))"
 "(define-values"
 "(read-vector11.1)"
 "(lambda(length2_0 length4_0 mode1_0 mode3_0 read-one5_0 opener-c6_0 opener7_0 closer8_0 in9_2 config10_1)"
@@ -51917,7 +51949,7 @@ static const char *startup_source =
 "(begin"
 "(if(null? seq_4)"
 "(let-values()"
-"(let-values(((in12_2) in_5)"
+"(let-values(((in12_1) in_5)"
 "((config13_0) config_15)"
 "                                             ((temp14_7) \"missing structure description in `~as` form\")"
 "((dispatch-c15_0) dispatch-c_1))"
@@ -51930,7 +51962,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" in12_2"
+" in12_1"
 " config13_0"
 " temp14_7"
 "(list dispatch-c15_0))))"
@@ -52111,7 +52143,7 @@ static const char *startup_source =
 "((c18_1) c_38)"
 "((temp19_1) '#\\[)"
 "((temp20_2) '#\\])"
-"((in21_0) in_39)"
+"((in21_1) in_39)"
 "((config22_0) config_47)"
 "((v23_0) v_28))"
 "(read-vector11.1"
@@ -52123,7 +52155,7 @@ static const char *startup_source =
 " c18_1"
 " temp19_1"
 " temp20_2"
-" in21_0"
+" in21_1"
 " config22_0)))"
 "(let-values()"
 "(let-values(((in24_0) in_39)"
@@ -52164,9 +52196,9 @@ static const char *startup_source =
 "(if(if(equal? tmp_48 '#\\=) #t(equal? tmp_48 '#\\#))"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_360)(read-config-for-syntax? config_47)))"
-"(if or-part_360"
-" or-part_360"
+"(if(let-values(((or-part_361)(read-config-for-syntax? config_47)))"
+"(if or-part_361"
+" or-part_361"
 "(not(check-parameter 1/read-accept-graph config_47))))"
 "(let-values()"
 "(let-values(((in37_1) in_39)"
@@ -52297,9 +52329,9 @@ static const char *startup_source =
 "(let-values()"
 "(begin0"
 "(hash-ref"
-"(let-values(((or-part_361)"
+"(let-values(((or-part_362)"
 "(read-config-state-graph(read-config-st config_47))))"
-"(if or-part_361 or-part_361 '#hash()))"
+"(if or-part_362 or-part_362 '#hash()))"
 " v_28"
 "(lambda()"
 "(let-values(((in67_0) in_39)"
@@ -52336,7 +52368,7 @@ static const char *startup_source =
 "(let-values(((in77_0) in_39)"
 "((config78_0) config_47)"
 "((c79_0) c_38)"
-"                                                   ((temp80_3) \"bad syntax `~a`\")"
+"                                                   ((temp80_2) \"bad syntax `~a`\")"
 "((temp81_2)(get-accum_0 c_38)))"
 "(reader-error12.1"
 " #f"
@@ -52349,7 +52381,7 @@ static const char *startup_source =
 " #f"
 " in77_0"
 " config78_0"
-" temp80_3"
+" temp80_2"
 "(list temp81_2))))))))))))))))))))))"
 "(define-values"
 "(get-graph-hash)"
@@ -52488,7 +52520,7 @@ static const char *startup_source =
 "((c18_2) c_70)"
 "((temp19_2) '#\\[)"
 "((temp20_3) '#\\])"
-"((in21_1) in_39)"
+"((in21_2) in_39)"
 "((config22_1) config_47)"
 "((config23_2) config_47)"
 "((temp24_7) #f))"
@@ -52507,7 +52539,7 @@ static const char *startup_source =
 " c18_2"
 " temp19_2"
 " temp20_3"
-" in21_1"
+" in21_2"
 " config22_1))"
 " ec_7"
 " mode_20))))"
@@ -52832,7 +52864,7 @@ static const char *startup_source =
 " closer-pos_0))"
 "((closer-c76_0) closer-c_0)"
 "                                                           ((temp77_1) \"expected ~a after value within a hash\")"
-"((temp78_3)(closer-name closer_4 config_49)))"
+"((temp78_2)(closer-name closer_4 config_49)))"
 "(reader-error12.1"
 " #f"
 " #f"
@@ -52845,7 +52877,7 @@ static const char *startup_source =
 " in74_0"
 " temp75_1"
 " temp77_1"
-"(list temp78_3)))))"
+"(list temp78_2)))))"
 "(cons(coerce-key k_41 elem-config_1) v_231))))))))))))))))))))))"
 "(define-values"
 "(read-string5.1)"
@@ -53628,7 +53660,7 @@ static const char *startup_source =
 " in_44)"
 "((config78_1)"
 " config_22)"
-"((temp79_2)"
+"((temp79_1)"
 "                                                                                                                        \"escape sequence `~aU~a` is out of range in string\")"
 "((escaping-c80_0)"
 " escaping-c_0)"
@@ -53655,7 +53687,7 @@ static const char *startup_source =
 " #f"
 " in77_1"
 " config78_1"
-" temp79_2"
+" temp79_1"
 "(list"
 " escaping-c80_0"
 " temp81_3)))))))))))))))))"
@@ -53671,7 +53703,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in85_0) in_44)"
 "((config86_0) config_22)"
-"((temp87_4)"
+"((temp87_3)"
 "                                                                                              \"character `~a` is out of range in byte string\")"
 "((c88_0) c_49))"
 "(reader-error12.1"
@@ -53685,7 +53717,7 @@ static const char *startup_source =
 " #f"
 " in85_0"
 " config86_0"
-" temp87_4"
+" temp87_3"
 "(list c88_0))))))"
 "(void))"
 "(accum-string-add! accum-str_4 c_49)"
@@ -53741,7 +53773,7 @@ static const char *startup_source =
 "(let-values(((in97_0) in_46)"
 "((config98_0) config_50)"
 "((c99_0) c_96)"
-"((temp100_2)"
+"((temp100_3)"
 "                                                                       \"found non-character while reading `#<<`\"))"
 "(reader-error12.1"
 " #f"
@@ -53754,7 +53786,7 @@ static const char *startup_source =
 " #f"
 " in97_0"
 " config98_0"
-" temp100_2"
+" temp100_3"
 "(list))))"
 "(if(char=? c_96 '#\\newline)"
 "(let-values() null)"
@@ -53778,7 +53810,7 @@ static const char *startup_source =
 "((config102_0) config_50)"
 "((c103_0) c_97)"
 "((open-end-pos104_0) open-end-pos_5)"
-"((temp105_2)"
+"((temp105_3)"
 "                                                                            \"found end-of-file before terminating `~a`\")"
 "((temp106_2)"
 "(list->string(cdr full-terminator_0))))"
@@ -53793,14 +53825,14 @@ static const char *startup_source =
 " #f"
 " in101_0"
 " config102_0"
-" temp105_2"
+" temp105_3"
 "(list temp106_2))))))"
 "(if(not(char? c_97))"
 "(let-values()"
 "(let-values(((in107_0) in_46)"
 "((config108_0) config_50)"
 "((c109_0) c_97)"
-"((temp110_3)"
+"((temp110_2)"
 "                                                                          \"found non-character while reading `#<<`\"))"
 "(reader-error12.1"
 " #f"
@@ -53813,7 +53845,7 @@ static const char *startup_source =
 " #f"
 " in107_0"
 " config108_0"
-" temp110_3"
+" temp110_2"
 "(list))))"
 "(if(if(pair? terminator_0)"
 "(char=? c_97(car terminator_0))"
@@ -54006,14 +54038,14 @@ static const char *startup_source =
 " #t))))"
 "(if(integer? v_33)"
 "(let-values()"
-"(if(if(let-values(((or-part_362)(< v_33 55296)))"
-"(if or-part_362 or-part_362(> v_33 57343)))"
+"(if(if(let-values(((or-part_363)(< v_33 55296)))"
+"(if or-part_363 or-part_363(> v_33 57343)))"
 "(<= v_33 1114111)"
 " #f)"
 "(let-values()"
 "(begin(accum-string-abandon! accum-str_6 config_8)(integer->char v_33)))"
 "(let-values()"
-"(let-values(((in21_2) in_4)"
+"(let-values(((in21_3) in_4)"
 "((config22_2) config_8)"
 "                                                         ((temp23_4) \"bad character constant `#\\\\u~a`\")"
 "((temp24_8)"
@@ -54029,7 +54061,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" in21_2"
+" in21_3"
 " config22_2"
 " temp23_4"
 "(list temp24_8))))))"
@@ -54546,9 +54578,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in78_0) in_56)"
 "((config79_0) config_53)"
-"((temp80_4)"
+"((temp80_3)"
 "(if(char? c_100)(string dispatch-c_4 '#\\! c_100)(string dispatch-c_4 '#\\!))))"
-"(bad-syntax-error20.1 #f #f in78_0 config79_0 temp80_4))))"
+"(bad-syntax-error20.1 #f #f in78_0 config79_0 temp80_3))))"
 "(let-values(((temp71_2)(string dispatch-c_4 '#\\!))"
 "((read-recur72_0) read-recur_2)"
 "((in73_0) in_56)"
@@ -54588,7 +54620,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in88_0) in_58)"
 "((config89_0) config_54)"
-"                                                       ((temp90_1) \"`~a` not enabled\")"
+"                                                       ((temp90_2) \"`~a` not enabled\")"
 "((extend-str91_0) extend-str_2))"
 "(reader-error12.1"
 " #f"
@@ -54601,7 +54633,7 @@ static const char *startup_source =
 " #f"
 " in88_0"
 " config89_0"
-" temp90_1"
+" temp90_2"
 "(list extend-str91_0)))))"
 "(values))))"
 "(let-values(((line_10 col_9 pos_121)(port-next-location in_58)))"
@@ -54642,7 +54674,7 @@ static const char *startup_source =
 "(let-values(((in92_0) in_58)"
 "((config93_0) config_54)"
 "((c94_0) c_9)"
-"((temp95_1)"
+"((temp95_2)"
 "                                                                                            \"found non-character while reading `#~a`\")"
 "((extend-str96_0)"
 " extend-str_2))"
@@ -54657,7 +54689,7 @@ static const char *startup_source =
 " #f"
 " in92_0"
 " config93_0"
-" temp95_1"
+" temp95_2"
 "(list extend-str96_0)))))"
 "(if(char-whitespace? c_9)"
 "(let-values()(void))"
@@ -54676,7 +54708,7 @@ static const char *startup_source =
 "(consume-char in_58 c_9)"
 "(let-values(((in97_1) in_58)"
 "((config98_1) config_54)"
-"((temp99_2)"
+"((temp99_3)"
 "(string-append"
 "                                                                                                 \"expected only alphanumeric, `-`, `+`, `_`, or `/`\""
 "                                                                                                 \" characters for `~a`, found `~a`\"))"
@@ -54694,7 +54726,7 @@ static const char *startup_source =
 " #f"
 " in97_1"
 " config98_1"
-" temp99_2"
+" temp99_3"
 "(list"
 " extend-str100_0"
 " c101_0))))))))))))))"
@@ -54733,7 +54765,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in108_0) in_58)"
 "((config109_0) config_54)"
-"((temp110_4)"
+"((temp110_3)"
 "                                                                      \"expected a name that does not start `/` after `~a`\")"
 "((extend-str111_0) extend-str_2))"
 "(reader-error12.1"
@@ -54747,7 +54779,7 @@ static const char *startup_source =
 " #f"
 " in108_0"
 " config109_0"
-" temp110_4"
+" temp110_3"
 "(list extend-str111_0))))"
 "(void))"
 "(values))))"
@@ -54785,7 +54817,7 @@ static const char *startup_source =
 "((reader-path82_0) reader-path_0)"
 "((read-recur83_0) read-recur_3)"
 "((in84_0) in_58)"
-"((temp85_2)(reading-at config_54 line_10 col_9 pos_121))"
+"((temp85_1)(reading-at config_54 line_10 col_9 pos_121))"
 "((get-info?86_0) get-info?_2)"
 "((who87_0) who_28))"
 "(read-extension44.1"
@@ -54800,7 +54832,7 @@ static const char *startup_source =
 " reader-path82_0"
 " read-recur83_0"
 " in84_0"
-" temp85_2))))))))))))))))))))))))"
+" temp85_1))))))))))))))))))))))))"
 "(define-values"
 "(char-lang-nonsep?)"
 "(lambda(c_102)"
@@ -54809,12 +54841,12 @@ static const char *startup_source =
 "(let-values(((or-part_281)(char-alphabetic? c_102)))"
 "(if or-part_281"
 " or-part_281"
-"(let-values(((or-part_363)(char-numeric? c_102)))"
-"(if or-part_363"
-" or-part_363"
-"(let-values(((or-part_305)(char=? '#\\- c_102)))"
-"(if or-part_305"
-" or-part_305"
+"(let-values(((or-part_364)(char-numeric? c_102)))"
+"(if or-part_364"
+" or-part_364"
+"(let-values(((or-part_306)(char=? '#\\- c_102)))"
+"(if or-part_306"
+" or-part_306"
 "(let-values(((or-part_184)(char=? '#\\+ c_102)))"
 "(if or-part_184 or-part_184(char=? '#\\_ c_102)))))))))"
 " #f))))"
@@ -55064,10 +55096,10 @@ static const char *startup_source =
 "(lambda(in_51 config_57 prefix_7 c_49)"
 "(begin"
 "(let-values(((add-prefix_0)"
-"(lambda(s_430)"
+"(lambda(s_427)"
 "(begin"
 " 'add-prefix"
-"                        (if (string=? prefix_7 \"\") (format \"`~a` followed by ~a\" prefix_7 s_430) s_430)))))"
+"                        (if (string=? prefix_7 \"\") (format \"`~a` followed by ~a\" prefix_7 s_427) s_427)))))"
 "(let-values(((in11_2) in_51)"
 "((config12_4) config_57)"
 "((c13_3) c_49)"
@@ -55283,12 +55315,12 @@ static const char *startup_source =
 "(if(check-parameter 1/read-cdot config_61)"
 "(let-values()"
 "(let-values(((line_11 col_10 pos_122)(port-next-location in_64)))"
-"(let-values(((v_181)(read-undotted init-c_16 in_64 config_61)))"
-"(if(1/special-comment? v_181)"
-"(let-values() v_181)"
+"(let-values(((v_243)(read-undotted init-c_16 in_64 config_61)))"
+"(if(1/special-comment? v_243)"
+"(let-values() v_243)"
 "(let-values()"
 "((letrec-values(((loop_114)"
-"(lambda(v_243)"
+"(lambda(v_244)"
 "(begin"
 " 'loop"
 "(let-values(((c_104)"
@@ -55304,9 +55336,9 @@ static const char *startup_source =
 "(if(eq? c_105 'special)(special1.1 'special) c_105)))))"
 "(let-values(((ec_9)(effective-char c_104 config_61)))"
 "(if(not(char? ec_9))"
-"(let-values() v_243)"
+"(let-values() v_244)"
 "(if(char-whitespace? ec_9)"
-"(let-values()(begin(consume-char in_64 c_104)(loop_114 v_243)))"
+"(let-values()(begin(consume-char in_64 c_104)(loop_114 v_244)))"
 "(if(char=? ec_9 '#\\.)"
 "(let-values()"
 "(let-values(((dot-line_2 dot-col_2 dot-pos_5)"
@@ -55326,13 +55358,13 @@ static const char *startup_source =
 "(read-undotted #f in_64 config_61)))"
 "(loop_114"
 "(wrap"
-"(list cdot_0 v_243 post-v_0)"
+"(list cdot_0 v_244 post-v_0)"
 " in_64"
 "(reading-at config_61 line_11 col_10 pos_122)"
 " '#\\.)))))))"
-"(let-values() v_243))))))))))"
+"(let-values() v_244))))))))))"
 " loop_114)"
-" v_181))))))"
+" v_243))))))"
 "(void))))))"
 "(define-values"
 "(read-undotted)"
@@ -55344,15 +55376,15 @@ static const char *startup_source =
 "(let-values() eof)"
 "(if(not(char? c_106))"
 "(let-values()"
-"(let-values(((v_244)(special-value c_106)))"
-"(if(1/special-comment? v_244)"
-"(let-values()(if(read-config-keep-comment? config_56) v_244(read-undotted #f in_62 config_56)))"
-"(let-values()(coerce v_244 in_62(reading-at config_56 line_12 col_11 pos_123))))))"
+"(let-values(((v_245)(special-value c_106)))"
+"(if(1/special-comment? v_245)"
+"(let-values()(if(read-config-keep-comment? config_56) v_245(read-undotted #f in_62 config_56)))"
+"(let-values()(coerce v_245 in_62(reading-at config_56 line_12 col_11 pos_123))))))"
 "(let-values(((c2_8)(readtable-handler config_56 c_106)))"
 "(if c2_8"
 "((lambda(handler_3)"
-"(let-values(((v_245)(readtable-apply handler_3 c_106 in_62 config_56 line_12 col_11 pos_123)))"
-"(retry-special-comment v_245 in_62 config_56)))"
+"(let-values(((v_246)(readtable-apply handler_3 c_106 in_62 config_56 line_12 col_11 pos_123)))"
+"(retry-special-comment v_246 in_62 config_56)))"
 " c2_8)"
 "(let-values()"
 "(let-values(((ec_10)(effective-char c_106 config_56)))"
@@ -55421,7 +55453,7 @@ static const char *startup_source =
 "(if(unsafe-fx< index_4 2)"
 "(if(unsafe-fx< index_4 1)"
 "(let-values()"
-"(let-values(((v_246)"
+"(let-values(((v_247)"
 "(let-values(((c79_1) c_106)"
 "((in80_1) in_62)"
 "((r-config81_0) r-config_0)"
@@ -55442,7 +55474,7 @@ static const char *startup_source =
 " c79_1"
 " in80_1"
 " r-config81_0))))"
-"(retry-special-comment v_246 in_62 config_56)))"
+"(retry-special-comment v_247 in_62 config_56)))"
 "(let-values()(read-dispatch c_106 in_62 r-config_0 config_56)))"
 "(if(unsafe-fx< index_4 3)"
 "                                    (let-values () (read-quote read-one 'quote \"quoting \\\"'\\\"\" c_106 in_62 r-config_0))"
@@ -55460,7 +55492,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in83_0) in_62)"
 "((r-config84_0) r-config_0)"
-"                                                         ((temp85_3) \"illegal use of `~a`\")"
+"                                                         ((temp85_2) \"illegal use of `~a`\")"
 "((c86_0) c_106))"
 "(reader-error12.1"
 " #f"
@@ -55473,7 +55505,7 @@ static const char *startup_source =
 " #f"
 " in83_0"
 " r-config84_0"
-" temp85_3"
+" temp85_2"
 "(list c86_0))))))"
 "(if(unsafe-fx< index_4 5)"
 "(let-values()"
@@ -55531,11 +55563,11 @@ static const char *startup_source =
 "(wrap"
 "(let-values(((read-one91_0) read-one)"
 "((ec92_0) ec_10)"
-"((temp93_4) '#\\()"
-"((temp94_3) '#\\))"
+"((temp93_3) '#\\()"
+"((temp94_2) '#\\))"
 "((in95_0) in_62)"
 "((r-config96_0) r-config_0)"
-"((temp97_3) #t))"
+"((temp97_2) #t))"
 "(read-unwrapped-sequence17.1"
 " #f"
 " #f"
@@ -55543,14 +55575,14 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp97_3"
+" temp97_2"
 " #t"
 " #f"
 " #f"
 " read-one91_0"
 " ec92_0"
-" temp93_4"
-" temp94_3"
+" temp93_3"
+" temp94_2"
 " in95_0"
 " r-config96_0))"
 " in_62"
@@ -55561,7 +55593,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in98_0) in_62)"
 "((r-config99_0) r-config_0)"
-"                                                   ((temp100_3) \"~a\")"
+"                                                   ((temp100_4) \"~a\")"
 "((temp101_3)"
 "(indentation-unexpected-closer-message ec_10 c_106 r-config_0)))"
 "(reader-error12.1"
@@ -55575,24 +55607,24 @@ static const char *startup_source =
 " #f"
 " in98_0"
 " r-config99_0"
-" temp100_3"
+" temp100_4"
 "(list temp101_3))))"
 "(if(unsafe-fx< index_4 8)"
 "(let-values()"
-"(if(let-values(((or-part_364)"
+"(if(let-values(((or-part_365)"
 "(check-parameter 1/read-square-bracket-as-paren config_56)))"
-"(if or-part_364"
-" or-part_364"
+"(if or-part_365"
+" or-part_365"
 "(check-parameter 1/read-square-bracket-with-tag config_56)))"
 "(let-values()"
 "(wrap"
 "(let-values(((read-one102_0) read-one)"
 "((ec103_0) ec_10)"
-"((temp104_3) '#\\[)"
-"((temp105_3) '#\\])"
+"((temp104_4) '#\\[)"
+"((temp105_4) '#\\])"
 "((in106_0) in_62)"
 "((r-config107_0) r-config_0)"
-"((temp108_1) #t))"
+"((temp108_2) #t))"
 "(read-unwrapped-sequence17.1"
 " #f"
 " #f"
@@ -55600,14 +55632,14 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp108_1"
+" temp108_2"
 " #t"
 " #f"
 " #f"
 " read-one102_0"
 " ec103_0"
-" temp104_3"
-" temp105_3"
+" temp104_4"
+" temp105_4"
 " in106_0"
 " r-config107_0))"
 " in_62"
@@ -55616,7 +55648,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in109_0) in_62)"
 "((r-config110_0) r-config_0)"
-"                                                         ((temp111_1) \"illegal use of `~a`\")"
+"                                                         ((temp111_0) \"illegal use of `~a`\")"
 "((c112_0) c_106))"
 "(reader-error12.1"
 " #f"
@@ -55629,13 +55661,13 @@ static const char *startup_source =
 " #f"
 " in109_0"
 " r-config110_0"
-" temp111_1"
+" temp111_0"
 "(list c112_0))))))"
 "(let-values()"
-"(if(let-values(((or-part_365)"
+"(if(let-values(((or-part_366)"
 "(check-parameter 1/read-square-bracket-as-paren config_56)))"
-"(if or-part_365"
-" or-part_365"
+"(if or-part_366"
+" or-part_366"
 "(check-parameter 1/read-square-bracket-with-tag config_56)))"
 "(let-values()"
 "(let-values(((in113_1) in_62)"
@@ -55679,20 +55711,20 @@ static const char *startup_source =
 "(list c120_0))))))))"
 "(if(unsafe-fx< index_4 10)"
 "(let-values()"
-"(if(let-values(((or-part_366)"
+"(if(let-values(((or-part_367)"
 "(check-parameter 1/read-curly-brace-as-paren config_56)))"
-"(if or-part_366"
-" or-part_366"
+"(if or-part_367"
+" or-part_367"
 "(check-parameter 1/read-curly-brace-with-tag config_56)))"
 "(let-values()"
 "(wrap"
 "(let-values(((read-one121_0) read-one)"
 "((ec122_0) ec_10)"
-"((temp123_4) '#\\{)"
-"((temp124_4) '#\\})"
+"((temp123_3) '#\\{)"
+"((temp124_3) '#\\})"
 "((in125_0) in_62)"
 "((r-config126_0) r-config_0)"
-"((temp127_3) #t))"
+"((temp127_4) #t))"
 "(read-unwrapped-sequence17.1"
 " #f"
 " #f"
@@ -55700,14 +55732,14 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp127_3"
+" temp127_4"
 " #t"
 " #f"
 " #f"
 " read-one121_0"
 " ec122_0"
-" temp123_4"
-" temp124_4"
+" temp123_3"
+" temp124_3"
 " in125_0"
 " r-config126_0))"
 " in_62"
@@ -55733,10 +55765,10 @@ static const char *startup_source =
 "(list c131_0))))))"
 "(if(unsafe-fx< index_4 11)"
 "(let-values()"
-"(if(let-values(((or-part_367)"
+"(if(let-values(((or-part_368)"
 "(check-parameter 1/read-curly-brace-as-paren config_56)))"
-"(if or-part_367"
-" or-part_367"
+"(if or-part_368"
+" or-part_368"
 "(check-parameter 1/read-curly-brace-with-tag config_56)))"
 "(let-values()"
 "(let-values(((in132_0) in_62)"
@@ -55763,7 +55795,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in136_0) in_62)"
 "((r-config137_0) r-config_0)"
-"                                                         ((temp138_2) \"illegal use of `~a`\")"
+"                                                         ((temp138_3) \"illegal use of `~a`\")"
 "((c139_0) c_106))"
 "(reader-error12.1"
 " #f"
@@ -55776,7 +55808,7 @@ static const char *startup_source =
 " #f"
 " in136_0"
 " r-config137_0"
-" temp138_2"
+" temp138_3"
 "(list c139_0))))))"
 "(if(unsafe-fx< index_4 12)"
 "(let-values()"
@@ -55786,11 +55818,11 @@ static const char *startup_source =
 "(let-values(((c142_0) c_106)"
 "((in143_0) in_62)"
 "((r-config144_0) r-config_0)"
-"((temp145_2) 'symbol))"
+"((temp145_3) 'symbol))"
 "(read-symbol-or-number8.1"
 " #f"
 " #f"
-" temp145_2"
+" temp145_3"
 " #t"
 " c142_0"
 " in143_0"
@@ -55824,9 +55856,9 @@ static const char *startup_source =
 "(let-values(((line_13)(read-config-line config_62)))"
 "(let-values(((col_12)(read-config-col config_62)))"
 "(let-values(((pos_124)(read-config-pos config_62)))"
-"(let-values(((v_247)"
+"(let-values(((v_248)"
 "(readtable-apply handler_4 c_108 in_67 config_62 line_13 col_12 pos_124)))"
-"(retry-special-comment v_247 in_67 orig-config_0))))))"
+"(retry-special-comment v_248 in_67 orig-config_0))))))"
 " c3_9)"
 "(let-values()"
 "(let-values()"
@@ -55960,8 +55992,8 @@ static const char *startup_source =
 "(let-values()(read-vector-or-graph read-one dispatch-c_5 c_108 in_67 config_62))"
 "(let-values()"
 "(let-values(((read-one161_0) read-one)"
-"((temp162_3) '#\\()"
-"((temp163_2) '#\\()"
+"((temp162_2) '#\\()"
+"((temp163_1) '#\\()"
 "((temp164_0) '#\\))"
 "((in165_0) in_67)"
 "((config166_0) config_62))"
@@ -55971,8 +56003,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " read-one161_0"
-" temp162_3"
-" temp163_2"
+" temp162_2"
+" temp163_1"
 " temp164_0"
 " in165_0"
 " config166_0)))))"
@@ -56007,9 +56039,9 @@ static const char *startup_source =
 "(if(check-parameter 1/read-curly-brace-as-paren config_62)"
 "(let-values()"
 "(let-values(((read-one176_0) read-one)"
-"((temp177_0) '#\\{)"
+"((temp177_1) '#\\{)"
 "((temp178_0) '#\\{)"
-"((temp179_0) '#\\})"
+"((temp179_1) '#\\})"
 "((in180_0) in_67)"
 "((config181_0) config_62))"
 "(read-vector11.1"
@@ -56018,9 +56050,9 @@ static const char *startup_source =
 " #f"
 " #f"
 " read-one176_0"
-" temp177_0"
+" temp177_1"
 " temp178_0"
-" temp179_0"
+" temp179_1"
 " in180_0"
 " config181_0)))"
 "(let-values()"
@@ -56435,11 +56467,11 @@ static const char *startup_source =
 "(list dispatch-c279_0)))))))))))))))))))))))))"
 "(define-values"
 "(retry-special-comment)"
-"(lambda(v_248 in_76 config_63)"
+"(lambda(v_249 in_76 config_63)"
 "(begin"
-"(if(1/special-comment? v_248)"
-"(let-values()(if(read-config-keep-comment? config_63) v_248(read-undotted #f in_76 config_63)))"
-"(let-values() v_248)))))"
+"(if(1/special-comment? v_249)"
+"(let-values()(if(read-config-keep-comment? config_63) v_249(read-undotted #f in_76 config_63)))"
+"(let-values() v_249)))))"
 "(define-values"
 "(1/module-declared?)"
 "(let-values(((module-declared?4_0)"
@@ -56479,11 +56511,11 @@ static const char *startup_source =
 "(void)"
 "(let-values()(raise-argument-error 'module-predefined? module-reference-str mod_7)))"
 "(values))))"
-"(let-values(((ns_112)(1/current-namespace)))"
+"(let-values(((ns_113)(1/current-namespace)))"
 "(let-values(((name_68)"
 "(let-values(((mod39_0) mod_7)((temp40_4) #f))"
 "(reference->resolved-module-path32.1 temp40_4 mod39_0))))"
-"(let-values(((m_24)(namespace->module ns_112 name_68)))"
+"(let-values(((m_24)(namespace->module ns_113 name_68)))"
 "(if m_24(module-is-predefined? m_24) #f))))))))))"
 "(define-values"
 "(module->)"
@@ -56570,7 +56602,7 @@ static const char *startup_source =
 "(begin"
 " 'module->namespace21"
 "(let-values(((mod_18) mod20_0))"
-"(let-values(((ns_113)(if ns19_1 ns18_2(1/current-namespace))))"
+"(let-values(((ns_114)(if ns19_1 ns18_2(1/current-namespace))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -56586,17 +56618,17 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(1/namespace? ns_113)"
+"(if(1/namespace? ns_114)"
 "(void)"
 "(let-values()"
-"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_113)))"
+"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_114)))"
 "(values))))"
 "(let-values(((name_69)"
 "(let-values(((mod49_0) mod_18)((temp50_4) #t))"
 "(reference->resolved-module-path32.1 temp50_4 mod49_0))))"
-"(let-values(((phase_128)(namespace-phase ns_113)))"
+"(let-values(((phase_128)(namespace-phase ns_114)))"
 "(let-values(((m-ns_17)"
-"(let-values(((ns51_1) ns_113)"
+"(let-values(((ns51_1) ns_114)"
 "((name52_0) name_69)"
 "((phase53_0) phase_128))"
 "(namespace->module-namespace82.1"
@@ -56614,7 +56646,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(namespace->module/complain 'module->namespace ns_113 name_69)"
+"(namespace->module/complain 'module->namespace ns_114 name_69)"
 "(raise-arguments-error"
 " 'module->namespace"
 "                                                 \"module not instantiated in the current namespace\""
@@ -56637,7 +56669,7 @@ static const char *startup_source =
 " m-ns_17"
 "(let-values(((temp54_5)(namespace-mpi m-ns_17)))"
 "(make-root-expand-context13.1 #f #f #f #f #f #f #f #f temp54_5)))))"
-"(let-values(((ns46_0) ns_113)"
+"(let-values(((ns46_0) ns_114)"
 "((temp47_2)(namespace-mpi m-ns_17))"
 "((phase48_2) phase_128))"
 "(namespace-module-make-available!112.1 #f #f ns46_0 temp47_2 phase48_2))"
@@ -56653,7 +56685,7 @@ static const char *startup_source =
 " 'namespace-unprotect-module27"
 "(let-values(((insp_12) insp25_0))"
 "(let-values(((mod_21) mod26_0))"
-"(let-values(((ns_114)(if ns24_1 ns23_0(1/current-namespace))))"
+"(let-values(((ns_115)(if ns24_1 ns23_0(1/current-namespace))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -56679,20 +56711,20 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(1/namespace? ns_114)"
+"(if(1/namespace? ns_115)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'namespace-unprotect-module"
 "                                                         \"namespace?\""
-" ns_114)))"
+" ns_115)))"
 "(values))))"
 "(let-values(((name_70)"
 "(let-values(((mod56_0) mod_21)((temp57_0) #f))"
 "(reference->resolved-module-path32.1 temp57_0 mod56_0))))"
-"(let-values(((phase_136)(namespace-phase ns_114)))"
+"(let-values(((phase_136)(namespace-phase ns_115)))"
 "(let-values(((m-ns_15)"
-"(let-values(((ns58_0) ns_114)"
+"(let-values(((ns58_0) ns_115)"
 "((name59_0) name_70)"
 "((phase60_0) phase_136))"
 "(namespace->module-namespace82.1"
@@ -56725,9 +56757,9 @@ static const char *startup_source =
 "((insp_19 mod_23 ns23_1)(namespace-unprotect-module27_0 insp_19 mod_23 ns23_1 #t)))))"
 "(define-values"
 "(namespace->module/complain)"
-"(lambda(who_33 ns_115 name_71)"
+"(lambda(who_33 ns_116 name_71)"
 "(begin"
-"(let-values(((or-part_225)(namespace->module ns_115 name_71)))"
+"(let-values(((or-part_225)(namespace->module ns_116 name_71)))"
 "(if or-part_225"
 " or-part_225"
 "          (raise-arguments-error who_33 \"unknown module in the current namespace\" \"name\" name_71))))))"
@@ -56738,8 +56770,8 @@ static const char *startup_source =
 "(let-values(((or-part_261)(1/module-path? mod_24)))"
 "(if or-part_261"
 " or-part_261"
-"(let-values(((or-part_368)(1/module-path-index? mod_24)))"
-"(if or-part_368 or-part_368(1/resolved-module-path? mod_24))))))))"
+"(let-values(((or-part_369)(1/module-path-index? mod_24)))"
+"(if or-part_369 or-part_369(1/resolved-module-path? mod_24))))))))"
 " (define-values (module-reference-str) \"(or/c module-path? module-path-index? resolved-module-path?)\")"
 "(define-values"
 "(reference->resolved-module-path32.1)"
@@ -56763,8 +56795,8 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(maybe-flush-stdout in_77)"
-"(let-values(((in23_2) in_77)((temp24_9) #t)((src25_0) src_0))"
-"(read*14.1 temp24_9 #f #f #f #f #f #f #f #f src25_0 #t in23_2))))"
+"(let-values(((in23_3) in_77)((temp24_9) #t)((src25_0) src_0))"
+"(read*14.1 temp24_9 #f #f #f #f #f #f #f #f src25_0 #t in23_3))))"
 "(let-values()(values((port-read-handler in_77) in_77 src_0)))))))"
 "(define-values"
 "(read-syntax/recursive$1)"
@@ -56905,8 +56937,8 @@ static const char *startup_source =
 "(read-to-syntax)"
 "(lambda(s-exp_4 srcloc_11 rep_1)"
 "(begin"
-"(let-values(((the-struct_86) empty-syntax))"
-"(if(syntax?$1 the-struct_86)"
+"(let-values(((the-struct_87) empty-syntax))"
+"(if(syntax?$1 the-struct_87)"
 "(let-values(((content63_0)(datum-intern-literal s-exp_4))"
 "((srcloc64_0) srcloc_11)"
 "((props65_0)"
@@ -56918,14 +56950,14 @@ static const char *startup_source =
 "(let-values() original-props))))))"
 "(syntax1.1"
 " content63_0"
-"(syntax-scopes the-struct_86)"
-"(syntax-shifted-multi-scopes the-struct_86)"
-"(syntax-scope-propagations+tamper the-struct_86)"
-"(syntax-mpi-shifts the-struct_86)"
+"(syntax-scopes the-struct_87)"
+"(syntax-shifted-multi-scopes the-struct_87)"
+"(syntax-scope-propagations+tamper the-struct_87)"
+"(syntax-mpi-shifts the-struct_87)"
 " srcloc64_0"
 " props65_0"
-"(syntax-inspector the-struct_86)))"
-"          (raise-argument-error 'struct-copy \"syntax?\" the-struct_86))))))"
+"(syntax-inspector the-struct_87)))"
+"          (raise-argument-error 'struct-copy \"syntax?\" the-struct_87))))))"
 "(define-values(original-props)(syntax-props(syntax-property$1 empty-syntax original-property-sym #t)))"
 "(define-values"
 "(original-square-props)"
@@ -56936,17 +56968,17 @@ static const char *startup_source =
 "(define-values(read-module-declared?)(lambda(mod-path_29)(begin(1/module-declared? mod-path_29 #t))))"
 "(define-values"
 "(read-coerce)"
-"(lambda(for-syntax?_12 v_249 srcloc_12)"
+"(lambda(for-syntax?_12 v_250 srcloc_12)"
 "(begin"
 "(if(not for-syntax?_12)"
-"(let-values()(if(syntax?$1 v_249)(let-values()(syntax->datum$1 v_249))(let-values() v_249)))"
-"(if(syntax?$1 v_249)"
-"(let-values() v_249)"
-"(if(list? v_249)"
+"(let-values()(if(syntax?$1 v_250)(let-values()(syntax->datum$1 v_250))(let-values() v_250)))"
+"(if(syntax?$1 v_250)"
+"(let-values() v_250)"
+"(if(list? v_250)"
 "(let-values()"
 "(read-to-syntax"
 "(reverse$1"
-"(let-values(((lst_269) v_249))"
+"(let-values(((lst_269) v_250))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -56974,13 +57006,13 @@ static const char *startup_source =
 " lst_269))))"
 " srcloc_12"
 " #f))"
-"(if(pair? v_249)"
+"(if(pair? v_250)"
 "(let-values()"
 "(read-to-syntax"
-"(cons(read-coerce #t(car v_249) srcloc_12)(read-coerce #t(cdr v_249) srcloc_12))"
+"(cons(read-coerce #t(car v_250) srcloc_12)(read-coerce #t(cdr v_250) srcloc_12))"
 " srcloc_12"
 " #f))"
-"(let-values()(read-to-syntax v_249 srcloc_12 #f)))))))))"
+"(let-values()(read-to-syntax v_250 srcloc_12 #f)))))))))"
 "(define-values"
 "(read-coerce-key)"
 "(lambda(for-syntax?_13 k_42)"
@@ -57121,10 +57153,10 @@ static const char *startup_source =
 "(define-values"
 "(1/read/recursive)"
 "(let-values(((read/recursive31_0)"
-"(lambda(in23_3 start24_0 readtable25_0 graph?26_0 in27_2 start28_1 readtable29_0 graph?30_0)"
+"(lambda(in23_4 start24_0 readtable25_0 graph?26_0 in27_2 start28_1 readtable29_0 graph?30_0)"
 "(begin"
 " 'read/recursive31"
-"(let-values(((in_20)(if in27_2 in23_3(current-input-port))))"
+"(let-values(((in_20)(if in27_2 in23_4(current-input-port))))"
 "(let-values(((start_38)(if start28_1 start24_0 #f)))"
 "(let-values(((readtable_9)(if readtable29_0 readtable25_0(1/current-readtable))))"
 "(let-values(((graph?_4)(if graph?30_0 graph?26_0 #t)))"
@@ -57154,7 +57186,7 @@ static const char *startup_source =
 "((in_87 start_64 readtable_10 graph?26_1)(read/recursive31_0 in_87 start_64 readtable_10 graph?26_1 #t #t #t #t))"
 "((in_88 start_65 readtable25_1)(read/recursive31_0 in_88 start_65 readtable25_1 #f #t #t #t #f))"
 "((in_89 start24_1)(read/recursive31_0 in_89 start24_1 #f #f #t #t #f #f))"
-"((in23_4)(read/recursive31_0 in23_4 #f #f #f #t #f #f #f)))))"
+"((in23_5)(read/recursive31_0 in23_5 #f #f #f #t #f #f #f)))))"
 "(define-values"
 "(1/read-language)"
 "(let-values(((read-language37_0)"
@@ -57522,14 +57554,14 @@ static const char *startup_source =
 "(lambda(s12_2 context13_0 stop-ids14_0 intdefs8_0 lift-key9_0 intdefs10_0 lift-key11_0)"
 "(begin"
 " 'local-expand/capture-lifts15"
-"(let-values(((s_430) s12_2))"
+"(let-values(((s_427) s12_2))"
 "(let-values(((context_12) context13_0))"
 "(let-values(((stop-ids_5) stop-ids14_0))"
 "(let-values(((intdefs_4)(if intdefs10_0 intdefs8_0 #f)))"
 "(let-values(((lift-key_4)(if lift-key11_0 lift-key9_0(generate-lift-key))))"
 "(let-values()"
 "(let-values(((temp64_4) 'local-expand)"
-"((s65_0) s_430)"
+"((s65_0) s_427)"
 "((context66_0) context_12)"
 "((stop-ids67_0) stop-ids_5)"
 "((intdefs68_0) intdefs_4)"
@@ -57598,17 +57630,17 @@ static const char *startup_source =
 " intdefs75_0"
 " #t)))))))))))"
 "(case-lambda"
-"((s_472 context_17 stop-ids_10)"
-"(begin 'local-transformer-expand(local-transformer-expand22_0 s_472 context_17 stop-ids_10 #f #f)))"
-"((s_473 context_18 stop-ids_11 intdefs17_1)"
-"(local-transformer-expand22_0 s_473 context_18 stop-ids_11 intdefs17_1 #t)))))"
+"((s_468 context_17 stop-ids_10)"
+"(begin 'local-transformer-expand(local-transformer-expand22_0 s_468 context_17 stop-ids_10 #f #f)))"
+"((s_469 context_18 stop-ids_11 intdefs17_1)"
+"(local-transformer-expand22_0 s_469 context_18 stop-ids_11 intdefs17_1 #t)))))"
 "(define-values"
 "(1/local-transformer-expand/capture-lifts)"
 "(let-values(((local-transformer-expand/capture-lifts31_0)"
-"(lambda(s28_2 context29_0 stop-ids30_0 intdefs24_0 lift-key25_0 intdefs26_1 lift-key27_0)"
+"(lambda(s28_1 context29_0 stop-ids30_0 intdefs24_0 lift-key25_0 intdefs26_1 lift-key27_0)"
 "(begin"
 " 'local-transformer-expand/capture-lifts31"
-"(let-values(((s_16) s28_2))"
+"(let-values(((s_16) s28_1))"
 "(let-values(((context_19) context29_0))"
 "(let-values(((stop-ids_12) stop-ids30_0))"
 "(let-values(((intdefs_7)(if intdefs26_1 intdefs24_0 #f)))"
@@ -57642,12 +57674,12 @@ static const char *startup_source =
 " intdefs81_0"
 " #t))))))))))))"
 "(case-lambda"
-"((s_474 context_20 stop-ids_13)"
+"((s_470 context_20 stop-ids_13)"
 "(begin"
 " 'local-transformer-expand/capture-lifts"
-"(local-transformer-expand/capture-lifts31_0 s_474 context_20 stop-ids_13 #f #f #f #f)))"
-"((s_409 context_21 stop-ids_14 intdefs_8 lift-key25_1)"
-"(local-transformer-expand/capture-lifts31_0 s_409 context_21 stop-ids_14 intdefs_8 lift-key25_1 #t #t))"
+"(local-transformer-expand/capture-lifts31_0 s_470 context_20 stop-ids_13 #f #f #f #f)))"
+"((s_406 context_21 stop-ids_14 intdefs_8 lift-key25_1)"
+"(local-transformer-expand/capture-lifts31_0 s_406 context_21 stop-ids_14 intdefs_8 lift-key25_1 #t #t))"
 "((s_87 context_22 stop-ids_15 intdefs24_1)"
 "(local-transformer-expand/capture-lifts31_0 s_87 context_22 stop-ids_15 intdefs24_1 #f #t #f)))))"
 "(define-values"
@@ -57656,17 +57688,17 @@ static const char *startup_source =
 "(lambda(s35_1 opaque-only?33_0 opaque-only?34_0)"
 "(begin"
 " 'syntax-local-expand-expression36"
-"(let-values(((s_475) s35_1))"
+"(let-values(((s_471) s35_1))"
 "(let-values(((opaque-only?_0)(if opaque-only?34_0 opaque-only?33_0 #f)))"
 "(let-values()"
 "(let-values(((exp-s_12)"
-"(let-values(((temp85_4) 'syntax-local-expand-expression)"
-"((s86_1) s_475)"
-"((temp87_5) 'expression)"
+"(let-values(((temp85_3) 'syntax-local-expand-expression)"
+"((s86_1) s_471)"
+"((temp87_4) 'expression)"
 "((null88_0) null)"
 "((temp89_4) #f)"
 "((opaque-only?90_0) opaque-only?_0)"
-"((temp91_1) #t)"
+"((temp91_2) #t)"
 "((temp92_3) #t))"
 "(do-local-expand56.1"
 " #f"
@@ -57675,15 +57707,15 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp91_1"
+" temp91_2"
 " #t"
 " opaque-only?90_0"
 " #t"
 " temp92_3"
 " #t"
-" temp85_4"
+" temp85_3"
 " s86_1"
-" temp87_5"
+" temp87_4"
 " null88_0"
 " temp89_4"
 " #t))))"
@@ -57699,13 +57731,13 @@ static const char *startup_source =
 "(expand-context-binding-layer ctx_74)))"
 " ctx_74)))"
 "(begin"
-"(let-values(((obs_59)(expand-context-observer ctx_74)))"
-"(if obs_59"
-"(let-values()(let-values()(call-expand-observe obs_59 'opaque-expr ae_1)))"
+"(let-values(((obs_57)(expand-context-observer ctx_74)))"
+"(if obs_57"
+"(let-values()(let-values()(call-expand-observe obs_57 'opaque-expr ae_1)))"
 "(void)))"
-"(let-values(((obs_60)(expand-context-observer ctx_74)))"
-"(if obs_60"
-"(let-values()(let-values()(call-expand-observe obs_60 'exit-local exp-s_12)))"
+"(let-values(((obs_58)(expand-context-observer ctx_74)))"
+"(if obs_58"
+"(let-values()(let-values()(call-expand-observe obs_58 'exit-local exp-s_12)))"
 "(void)))"
 "(values(if(not opaque-only?_0) exp-s_12 #f) ae_1))))))))))))"
 "(case-lambda"
@@ -57718,7 +57750,7 @@ static const char *startup_source =
 " capture-lifts?38_0"
 " capture-lifts?44_0"
 " lift-key41_0"
-" lift-key47_0"
+" lift-key47_1"
 " skip-log-exit?43_0"
 " skip-log-exit?49_0"
 " to-parsed-ok?40_0"
@@ -57742,10 +57774,10 @@ static const char *startup_source =
 "(let-values(((as-transformer?_5)(if as-transformer?45_0 as-transformer?39_0 #f)))"
 "(let-values(((to-parsed-ok?_1)(if to-parsed-ok?46_0 to-parsed-ok?40_0 #f)))"
 "(let-values(((lift-key_6)"
-"(if lift-key47_0"
+"(if lift-key47_1"
 " lift-key41_0"
-"(if(let-values(((or-part_369) capture-lifts?_0))"
-"(if or-part_369 or-part_369 as-transformer?_5))"
+"(if(let-values(((or-part_370) capture-lifts?_0))"
+"(if or-part_370 or-part_370 as-transformer?_5))"
 "(generate-lift-key)"
 " #f))))"
 "(let-values(((track-to-be-defined?_1)"
@@ -57810,14 +57842,14 @@ static const char *startup_source =
 "(let-values(((ctx_75)"
 "(let-values(((who93_0) who_34))"
 "(get-current-expand-context17.1 #f #f who93_0 #t))))"
-"(let-values(((phase_140)"
+"(let-values(((phase_141)"
 "(if as-transformer?_5"
 "(add1(expand-context-phase ctx_75))"
 "(expand-context-phase ctx_75))))"
 "(let-values(((local-ctx_0)"
 "(let-values(((ctx94_0) ctx_75)"
 "((context95_0) context_23)"
-"((phase96_0) phase_140)"
+"((phase96_0) phase_141)"
 "((intdefs97_0) intdefs_9)"
 "((stop-ids98_0) stop-ids_16)"
 "((to-parsed-ok?99_0) to-parsed-ok?_1)"
@@ -57839,17 +57871,17 @@ static const char *startup_source =
 "(begin"
 "(namespace-visit-available-modules!"
 "(expand-context-namespace ctx_75)"
-" phase_140)"
+" phase_141)"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_61)"
+"(let-values(((obs_59)"
 "(expand-context-observer local-ctx_0)))"
-"(if obs_61"
+"(if obs_59"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_61"
+" obs_59"
 " 'enter-local"
 " s_392)))"
 "(void)))"
@@ -57869,26 +57901,26 @@ static const char *startup_source =
 "(begin"
 "(if as-transformer?_5"
 "(let-values()"
-"(let-values(((obs_62)"
+"(let-values(((obs_60)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_62"
+"(if obs_60"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_62 'phase-up)))"
+"(call-expand-observe obs_60 'phase-up)))"
 "(void))))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_63)"
+"(let-values(((obs_61)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_63"
+"(if obs_61"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_63"
+" obs_61"
 " 'local-pre"
 " input-s_1)))"
 "(void)))"
@@ -57897,14 +57929,14 @@ static const char *startup_source =
 "(begin"
 "(if stop-ids_16"
 "(let-values()"
-"(let-values(((obs_64)"
+"(let-values(((obs_62)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_64"
+"(if obs_62"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_64"
+" obs_62"
 " 'start)))"
 "(void))))"
 "(void))"
@@ -57916,20 +57948,20 @@ static const char *startup_source =
 "((local-ctx104_0) local-ctx_0)"
 "((context105_0) context_23)"
 "((temp106_4) #f)"
-"((temp107_1) #t)"
+"((temp107_2) #t)"
 "((lift-key108_0) lift-key_6)"
-"((temp109_0) #t)"
-"((temp110_5) #t))"
-"(expand-transformer47.1"
-" temp109_0"
+"((temp109_1) #t)"
+"((temp110_4) #t))"
+"(expand-transformer58.1"
+" temp109_1"
 " #t"
-" temp107_1"
+" temp107_2"
 " #t"
 " context105_0"
 " #t"
 " temp106_4"
 " #t"
-" temp110_5"
+" temp110_4"
 " #t"
 " lift-key108_0"
 " #t"
@@ -57946,7 +57978,7 @@ static const char *startup_source =
 "(eq? 'top-level context_23))"
 "((lift-key116_0) lift-key_6)"
 "((temp117_1) #t))"
-"(expand-transformer47.1"
+"(expand-transformer58.1"
 " #f"
 " #f"
 " temp115_2"
@@ -57969,9 +58001,9 @@ static const char *startup_source =
 "((temp120_4) #t)"
 "((lift-key121_0)"
 " lift-key_6)"
-"((temp122_4) #t))"
-"(expand/capture-lifts30.1"
-" temp122_4"
+"((temp122_3) #t))"
+"(expand/capture-lifts41.1"
+" temp122_3"
 " #t"
 " temp120_4"
 " #t"
@@ -57994,14 +58026,14 @@ static const char *startup_source =
 " local-ctx124_0))))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_65)"
+"(let-values(((obs_63)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_65"
+"(if obs_63"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_65"
+" obs_63"
 " 'local-post"
 " output-s_0)))"
 "(void)))"
@@ -58016,14 +58048,14 @@ static const char *startup_source =
 "(if skip-log-exit?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_66)"
+"(let-values(((obs_64)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_66"
+"(if obs_64"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_66"
+" obs_64"
 " 'exit-local"
 " result-s_8)))"
 "(void)))))"
@@ -58072,62 +58104,62 @@ static const char *startup_source =
 "(let-values()"
 "(taint-dispatch"
 " s_170"
-"(lambda(s_476)(syntax-arm$1 s_476 insp_21))"
+"(lambda(s_472)(syntax-arm$1 s_472 insp_21))"
 "(1/syntax-local-phase-level)))"
 "(let-values()(syntax-arm$1 s_170 insp_21))))))))))))))))"
 "(case-lambda"
 "((s_171)(begin 'syntax-arm(syntax-arm6_0 s_171 #f #f #f #f)))"
 "((s_172 maybe-insp_1 use-mode?2_1)(syntax-arm6_0 s_172 maybe-insp_1 use-mode?2_1 #t #t))"
-"((s_429 maybe-insp1_1)(syntax-arm6_0 s_429 maybe-insp1_1 #f #t #f)))))"
+"((s_426 maybe-insp1_1)(syntax-arm6_0 s_426 maybe-insp1_1 #f #t #f)))))"
 "(define-values"
 "(1/syntax-disarm)"
-"(lambda(s_477 maybe-insp_2)"
+"(lambda(s_473 maybe-insp_2)"
 "(begin"
 " 'syntax-disarm"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_477)"
+"(if(syntax?$1 s_473)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_477)))"
+"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_473)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_370)(not maybe-insp_2)))"
-"(if or-part_370 or-part_370(inspector? maybe-insp_2)))"
+"(if(let-values(((or-part_371)(not maybe-insp_2)))"
+"(if or-part_371 or-part_371(inspector? maybe-insp_2)))"
 "(void)"
 "                              (let-values () (raise-argument-error 'syntax-disarm \"(or/c inspector? #f)\" maybe-insp_2)))"
 "(values))))"
-"(let-values(((insp_22)(inspector-for-taint maybe-insp_2)))(syntax-disarm$1 s_477 insp_22)))))))))"
+"(let-values(((insp_22)(inspector-for-taint maybe-insp_2)))(syntax-disarm$1 s_473 insp_22)))))))))"
 "(define-values"
 "(1/syntax-rearm)"
 "(let-values(((syntax-rearm12_0)"
 "(lambda(s10_0 from-s11_0 use-mode?8_0 use-mode?9_0)"
 "(begin"
 " 'syntax-rearm12"
-"(let-values(((s_428) s10_0))"
+"(let-values(((s_425) s10_0))"
 "(let-values(((from-s_2) from-s11_0))"
 "(let-values(((use-mode?_1)(if use-mode?9_0 use-mode?8_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_428)"
+"(if(syntax?$1 s_425)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" s_428)))"
+"                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" s_425)))"
 "(if(syntax?$1 from-s_2)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" from-s_2)))"
 "(if use-mode?_1"
 "(let-values()"
 "(taint-dispatch"
-" s_428"
-"(lambda(s_478)(syntax-rearm$1 s_478 from-s_2))"
+" s_425"
+"(lambda(s_474)(syntax-rearm$1 s_474 from-s_2))"
 "(1/syntax-local-phase-level)))"
-"(let-values()(syntax-rearm$1 s_428 from-s_2))))))))))))))"
+"(let-values()(syntax-rearm$1 s_425 from-s_2))))))))))))))"
 "(case-lambda"
-"((s_425 from-s_3)(begin 'syntax-rearm(syntax-rearm12_0 s_425 from-s_3 #f #f)))"
+"((s_422 from-s_3)(begin 'syntax-rearm(syntax-rearm12_0 s_422 from-s_3 #f #f)))"
 "((s_5 from-s_4 use-mode?8_1)(syntax-rearm12_0 s_5 from-s_4 use-mode?8_1 #t)))))"
 "(define-values"
 "(1/syntax-taint)"
@@ -58143,11 +58175,11 @@ static const char *startup_source =
 "(inspector-for-taint)"
 "(lambda(maybe-insp_3)"
 "(begin"
-"(let-values(((or-part_371) maybe-insp_3))"
-"(if or-part_371"
-" or-part_371"
-"(let-values(((or-part_362)(current-module-code-inspector)))"
-"(if or-part_362 or-part_362(current-code-inspector))))))))"
+"(let-values(((or-part_372) maybe-insp_3))"
+"(if or-part_372"
+" or-part_372"
+"(let-values(((or-part_363)(current-module-code-inspector)))"
+"(if or-part_363 or-part_363(current-code-inspector))))))))"
 "(define-values"
 "(1/variable-reference->empty-namespace)"
 "(lambda(vr_0)"
@@ -58276,9 +58308,9 @@ static const char *startup_source =
 "                 \"variable reference\""
 " vr_7))"
 "(void))"
-"(let-values(((or-part_292)(namespace-declaration-inspector(1/variable-reference->namespace vr_7))))"
-"(if or-part_292"
-" or-part_292"
+"(let-values(((or-part_293)(namespace-declaration-inspector(1/variable-reference->namespace vr_7))))"
+"(if or-part_293"
+" or-part_293"
 "(raise-arguments-error"
 " 'variable-reference->module-declaration-inspector"
 "                 \"given variable reference is not from a module\")))))))))"
@@ -58562,7 +58594,7 @@ static const char *startup_source =
 "(lambda(eval1_0 main-ids2_0 read-ids3_0 ns7_1)"
 "(begin"
 " 'declare-kernel-module!8"
-"(let-values(((ns_116) ns7_1))"
+"(let-values(((ns_117) ns7_1))"
 "(let-values()"
 "(let-values(((main-ids_0) main-ids2_0))"
 "(let-values(((read-ids_0) read-ids3_0))"
@@ -58579,9 +58611,9 @@ static const char *startup_source =
 " 1/variable-reference-constant?"
 " 'variable-reference-from-unsafe?"
 " 1/variable-reference-from-unsafe?))"
-"((ns57_0) ns_116))"
+"((ns57_0) ns_117))"
 "(copy-runtime-module!26.1 #f #f temp56_2 #t ns57_0 #f #f #f #f temp55_3 #t temp54_6 #t temp53_4))"
-"(let-values(((temp58_3) '#%kernel)((temp59_7) '(#%core #%runtime #%main #%read))((ns60_0) ns_116))"
+"(let-values(((temp58_3) '#%kernel)((temp59_7) '(#%core #%runtime #%main #%read))((ns60_0) ns_117))"
 "(declare-reexporting-module!50.1 ns60_0 #f #f temp58_3 temp59_7)))))))))))"
 "(define-values"
 "(copy-runtime-module!26.1)"
@@ -58603,7 +58635,7 @@ static const char *startup_source =
 " 'copy-runtime-module!26"
 "(let-values(((name_65) name25_0))"
 "(let-values(((to-name_0)(if to18_0 to11_0 name_65)))"
-"(let-values(((ns_117) namespace12_0))"
+"(let-values(((ns_118) namespace12_0))"
 "(let-values(((skip-syms_0)(if skip20_0 skip13_0(seteq))))"
 "(let-values(((alts_0)(if alts21_0 alts14_0 '#hasheq())))"
 "(let-values(((extras_0)(if extras22_0 extras15_0 '#hasheq())))"
@@ -58732,7 +58764,7 @@ static const char *startup_source =
 "(hash-iterate-first ht_164))))))"
 "(let-values(((to-name61_0) to-name_0)"
 "((ht+extras62_0) ht+extras_0)"
-"((ns63_0) ns_117)"
+"((ns63_0) ns_118)"
 "((primitive?64_0) primitive?_9)"
 "((protected?65_0) protected?_10))"
 "(declare-hash-based-module!41.1"
@@ -58764,14 +58796,14 @@ static const char *startup_source =
 " 'declare-hash-based-module!41"
 "(let-values(((name_74) name39_0))"
 "(let-values(((ht_168) ht40_0))"
-"(let-values(((ns_118) namespace29_0))"
+"(let-values(((ns_119) namespace29_0))"
 "(let-values(((primitive?_10)(if primitive?35_0 primitive?30_0 #f)))"
 "(let-values(((protected?_11)(if protected?36_0 protected?31_0 #f)))"
 "(let-values(((protected-syms_0)(if protected37_0 protected32_0 null)))"
 "(let-values(((register-builtin?_0)(if register-builtin?38_0 register-builtin?33_0 #f)))"
 "(let-values()"
 "(let-values(((mpi_52)(1/module-path-index-join(list 'quote name_74) #f)))"
-"(let-values(((ns66_1) ns_118)"
+"(let-values(((ns66_1) ns_119)"
 "((temp67_1)"
 "(let-values(((temp69_3) #t)"
 "((primitive?70_0) primitive?_10)"
@@ -58842,10 +58874,10 @@ static const char *startup_source =
 " sym78_0))))"
 "(values"
 " sym_98"
-"(if(let-values(((or-part_372)"
+"(if(let-values(((or-part_373)"
 " protected?_11))"
-"(if or-part_372"
-" or-part_372"
+"(if or-part_373"
+" or-part_373"
 "(member"
 " sym_98"
 " protected-syms_0)))"
@@ -58873,7 +58905,7 @@ static const char *startup_source =
 "(hash-iterate-first ht_169))))))"
 "((temp75_3)"
 "(lambda(data-box_6"
-" ns_119"
+" ns_120"
 " phase-shift_21"
 " phase-level_23"
 " self_29"
@@ -58904,7 +58936,7 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(namespace-set-variable!"
-" ns_119"
+" ns_120"
 " 0"
 " sym_6"
 " val_31))"
@@ -58965,7 +58997,7 @@ static const char *startup_source =
 "(let-values(((name_75) name48_1))"
 "(let-values(((require-names_0) require-names49_0))"
 "(let-values(((reexport?_0)(if reexport?46_0 reexport?44_0 #t)))"
-"(let-values(((ns_120) namespace45_0))"
+"(let-values(((ns_121) namespace45_0))"
 "(let-values()"
 "(let-values(((mpi_53)(1/module-path-index-join(list 'quote name_75) #f)))"
 "(let-values(((require-mpis_0)"
@@ -59002,12 +59034,12 @@ static const char *startup_source =
 " for-loop_203)"
 " null"
 " lst_204))))))"
-"(let-values(((ns79_1) ns_120)"
-"((temp80_5)"
+"(let-values(((ns79_1) ns_121)"
+"((temp80_4)"
 "(let-values(((temp82_7) #t)"
 "((temp83_3) #t)"
 "((mpi84_0) mpi_53)"
-"((temp85_5)(list(cons 0 require-mpis_0)))"
+"((temp85_4)(list(cons 0 require-mpis_0)))"
 "((temp86_1)"
 "(if reexport?_0"
 "(hasheqv"
@@ -59029,7 +59061,7 @@ static const char *startup_source =
 "(let-values(((table_228)"
 "(let-values(((m_29)"
 "(namespace->module"
-" ns_120"
+" ns_121"
 "(1/module-path-index-resolve"
 " require-mpi_0))))"
 "(begin"
@@ -59134,7 +59166,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp86_1"
-" temp85_5"
+" temp85_4"
 " #t"
 " mpi84_0"
 " #f"
@@ -59144,7 +59176,7 @@ static const char *startup_source =
 " #f"
 " #f)))"
 "((temp81_4)(1/module-path-index-resolve mpi_53)))"
-"(declare-module!58.1 #f #f ns79_1 temp80_5 temp81_4))))))))))))"
+"(declare-module!58.1 #f #f ns79_1 temp80_4 temp81_4))))))))))))"
 "(define-values"
 "(read-primitives)"
 "(hasheq"
@@ -59206,13 +59238,13 @@ static const char *startup_source =
 "(let-values()"
 "(case-lambda"
 "((s_69)(begin 'eval((1/current-eval)(intro s_69))))"
-"((s_183 ns_121)"
+"((s_183 ns_122)"
 "(begin"
-"          (if (1/namespace? ns_121) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_121)))"
+"          (if (1/namespace? ns_122) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_122)))"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_121)"
-"(let-values()((1/current-eval)(intro s_183 ns_121))))))))))"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_122)"
+"(let-values()((1/current-eval)(intro s_183 ns_122))))))))))"
 "(define-values"
 "(1/eval-syntax)"
 "(let-values()"
@@ -59224,13 +59256,13 @@ static const char *startup_source =
 "(begin"
 "            (if (syntax?$1 s_8) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_8)))"
 "((1/current-eval) s_8))))"
-"((s_2 ns_122)"
+"((s_2 ns_123)"
 "(begin"
 "          (if (syntax?$1 s_2) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_2)))"
-"          (if (1/namespace? ns_122) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_122)))"
+"          (if (1/namespace? ns_123) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_123)))"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_122)"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_123)"
 "(let-values()((1/current-eval) s_2)))))))))"
 "(define-values(compile$1)(lambda(s_170)(begin 'compile((1/current-compile)(intro s_170) #f))))"
 "(define-values"
@@ -59246,15 +59278,15 @@ static const char *startup_source =
 "(define-values(1/expand)(lambda(s_9)(begin 'expand(expand$1(intro s_9)(1/current-namespace) #t))))"
 "(define-values"
 "(1/expand-syntax)"
-"(lambda(s_479)"
+"(lambda(s_475)"
 "(begin"
 " 'expand-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_479) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_479)))"
-"(expand$1 s_479(1/current-namespace) #t)))))))"
-"(define-values(1/expand-once)(lambda(s_476)(begin 'expand-once(expand-once$1(intro s_476)))))"
+"            (if (syntax?$1 s_475) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_475)))"
+"(expand$1 s_475(1/current-namespace) #t)))))))"
+"(define-values(1/expand-once)(lambda(s_472)(begin 'expand-once(expand-once$1(intro s_472)))))"
 "(define-values"
 "(1/expand-syntax-once)"
 "(lambda(s_171)"
@@ -59584,8 +59616,8 @@ static const char *startup_source =
 "(check-module-form)"
 "(lambda(exp_0 filename_1)"
 "(begin"
-"(if(let-values(((or-part_309)(eof-object? exp_0)))"
-"(if or-part_309 or-part_309(eof-object?(1/syntax-e exp_0))))"
+"(if(let-values(((or-part_310)(eof-object? exp_0)))"
+"(if or-part_310 or-part_310(eof-object?(1/syntax-e exp_0))))"
 "(let-values()"
 "(if filename_1"
 "(error"
@@ -59732,11 +59764,11 @@ static const char *startup_source =
 "(lambda()((1/current-eval) m-s_0))))))))))))))))))))"
 "(let-values()"
 "(let-values(((add-top-interaction_0)"
-"(lambda(s_429)"
+"(lambda(s_426)"
 "(begin"
 " 'add-top-interaction"
 "(1/namespace-syntax-introduce"
-"(1/datum->syntax #f(cons '#%top-interaction s_429) s_429))))))"
+"(1/datum->syntax #f(cons '#%top-interaction s_426) s_426))))))"
 "(let-values(((path1_0) path_12)"
 "((temp2_8)"
 "(lambda(i_84)"
@@ -59881,9 +59913,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()(begin(file-position i_188 pos_118)(values))))"
 "(let-values(((name-len_0)(read-number i_188)))"
-"(let-values(((v_250)(read-bytes name-len_0 i_188)))"
+"(let-values(((v_251)(read-bytes name-len_0 i_188)))"
 "(begin"
-"(if(if(bytes? v_250)(=(bytes-length v_250) name-len_0) #f)"
+"(if(if(bytes? v_251)(=(bytes-length v_251) name-len_0) #f)"
 "(void)"
 "(let-values()"
 "(error"
@@ -59897,10 +59929,10 @@ static const char *startup_source =
 "(object-name i_188)"
 " pos_118"
 " name-len_0"
-" v_250)))"
-"(if(bytes=? bstr_5 v_250)"
+" v_251)))"
+"(if(bytes=? bstr_5 v_251)"
 "(let-values()(read-number i_188))"
-"(if(bytes<? bstr_5 v_250)"
+"(if(bytes<? bstr_5 v_251)"
 "(let-values()"
 "(begin"
 "(read-number i_188)"
@@ -59932,7 +59964,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_93)"
-"(let-values(((s_463)(unsafe-car lst_93))((rest_44)(unsafe-cdr lst_93)))"
+"(let-values(((s_460)(unsafe-car lst_93))((rest_44)(unsafe-cdr lst_93)))"
 "(let-values(((fold-var_20)"
 "(let-values(((fold-var_64) fold-var_63))"
 "(let-values(((fold-var_70)"
@@ -59941,7 +59973,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((bstr_6)"
 "(string->bytes/utf-8"
-"(symbol->string s_463))))"
+"(symbol->string s_460))))"
 "(let-values(((len_40)"
 "(bytes-length bstr_6)))"
 "(if(< len_40 255)"
@@ -60162,16 +60194,16 @@ static const char *startup_source =
 "(let-values(((so_0)(get-so_0 file_1 #t)))"
 "(let-values(((alt-so_0)(get-so_0 alt-file_0 #t)))"
 "(let-values(((try-main?_0)"
-"(let-values(((or-part_373) main-path-d_0))"
-"(if or-part_373"
-" or-part_373"
+"(let-values(((or-part_374) main-path-d_0))"
+"(if or-part_374"
+" or-part_374"
 "(not alt-path-d_0)))))"
 "(let-values(((try-alt?_0)"
 "(if alt-file_0"
-"(let-values(((or-part_295)"
+"(let-values(((or-part_296)"
 " alt-path-d_0))"
-"(if or-part_295"
-" or-part_295"
+"(if or-part_296"
+" or-part_296"
 "(not main-path-d_0)))"
 " #f)))"
 "(let-values(((with-dir_0)"
@@ -60293,12 +60325,12 @@ static const char *startup_source =
 "(car zo-d_1)"
 " expect-module_0)))))))"
 " c4_3)"
-"(if(let-values(((or-part_360)"
+"(if(let-values(((or-part_361)"
 "(not"
 "(pair?"
 " expect-module_0))))"
-"(if or-part_360"
-" or-part_360"
+"(if or-part_361"
+" or-part_361"
 "(car expect-module_0)))"
 "(let-values()"
 "(let-values(((p_40)"
@@ -60356,7 +60388,7 @@ static const char *startup_source =
 "(if l_80(let-values(((a_71)(1/assoc p_76 l_80)))(if a_71(cdr a_71) #f)) #f)))))))"
 "(define-values"
 "(path-cache-set!)"
-"(lambda(p_77 v_251)"
+"(lambda(p_77 v_252)"
 "(begin"
 "(let-values(((i_189)(modulo(abs(equal-hash-code p_77)) CACHE-N)))"
 "(let-values(((w_2)(vector-ref -path-cache i_189)))"
@@ -60365,37 +60397,37 @@ static const char *startup_source =
 " -path-cache"
 " i_189"
 "(make-weak-box"
-"(cons(cons p_77 v_251)(let-values(((or-part_35) l_67))(if or-part_35 or-part_35 null)))))))))))"
+"(cons(cons p_77 v_252)(let-values(((or-part_35) l_67))(if or-part_35 or-part_35 null)))))))))))"
 "(define-values(-loading-filename)(gensym))"
 "(define-values(-loading-prompt-tag)(make-continuation-prompt-tag 'module-loading))"
 "(define-values(-prev-relto) #f)"
 "(define-values(-prev-relto-dir) #f)"
 "(define-values"
 "(split-relative-string)"
-"(lambda(s_474 coll-mode?_0)"
+"(lambda(s_470 coll-mode?_0)"
 "(begin"
 "(let-values(((l_19)"
 "((letrec-values(((loop_116)"
-"(lambda(s_480)"
+"(lambda(s_476)"
 "(begin"
 " 'loop"
-"(let-values(((len_41)(string-length s_480)))"
+"(let-values(((len_41)(string-length s_476)))"
 "((letrec-values(((iloop_2)"
 "(lambda(i_102)"
 "(begin"
 " 'iloop"
 "(if(= i_102 len_41)"
-"(let-values()(list s_480))"
-"(if(char=? '#\\/(string-ref s_480 i_102))"
+"(let-values()(list s_476))"
+"(if(char=? '#\\/(string-ref s_476 i_102))"
 "(let-values()"
 "(cons"
-"(substring s_480 0 i_102)"
-"(loop_116(substring s_480(add1 i_102)))))"
+"(substring s_476 0 i_102)"
+"(loop_116(substring s_476(add1 i_102)))))"
 "(let-values()(iloop_2(add1 i_102)))))))))"
 " iloop_2)"
 " 0))))))"
 " loop_116)"
-" s_474)))"
+" s_470)))"
 "(if coll-mode?_0"
 " l_19"
 "((letrec-values(((loop_101)"
@@ -60438,14 +60470,14 @@ static const char *startup_source =
 "                               (1/dynamic-require '(lib \"planet/resolver.rkt\") 'planet-module-name-resolver)))))))))"
 "(letrec-values(((standard-module-name-resolver_0)"
 "(case-lambda"
-"((s_475 from-namespace_1)"
+"((s_471 from-namespace_1)"
 "(begin"
 " 'standard-module-name-resolver"
 "(begin"
-"(if(1/resolved-module-path? s_475)"
+"(if(1/resolved-module-path? s_471)"
 "(void)"
 "(let-values()"
-"                                   (raise-argument-error 'standard-module-name-resolver \"resolved-module-path?\" s_475)))"
+"                                   (raise-argument-error 'standard-module-name-resolver \"resolved-module-path?\" s_471)))"
 "(if(let-values(((or-part_135)(not from-namespace_1)))"
 "(if or-part_135 or-part_135(1/namespace? from-namespace_1)))"
 "(void)"
@@ -60454,13 +60486,13 @@ static const char *startup_source =
 " 'standard-module-name-resolver"
 "                                    \"(or/c #f namespace?)\""
 " from-namespace_1)))"
-"(if planet-resolver_0(let-values()(planet-resolver_0 s_475))(void))"
+"(if planet-resolver_0(let-values()(planet-resolver_0 s_471))(void))"
 "(let-values(((hts_1)"
-"(let-values(((or-part_312)"
+"(let-values(((or-part_313)"
 "(registry-table-ref"
 "(1/namespace-module-registry(1/current-namespace)))))"
-"(if or-part_312"
-" or-part_312"
+"(if or-part_313"
+" or-part_313"
 "(let-values(((hts_2)(cons(make-hasheq)(make-hasheq))))"
 "(begin"
 "(registry-table-set!"
@@ -60468,14 +60500,14 @@ static const char *startup_source =
 " hts_2)"
 " hts_2))))))"
 "(begin"
-"(hash-set!(car hts_1) s_475 'declared)"
+"(hash-set!(car hts_1) s_471 'declared)"
 "(if from-namespace_1"
 "(let-values()"
 "(let-values(((root-name_2)"
-"(if(pair?(1/resolved-module-path-name s_475))"
+"(if(pair?(1/resolved-module-path-name s_471))"
 "(1/make-resolved-module-path"
-"(car(1/resolved-module-path-name s_475)))"
-" s_475))"
+"(car(1/resolved-module-path-name s_471)))"
+" s_471))"
 "((from-hts_0)"
 "(registry-table-ref"
 "(1/namespace-module-registry from-namespace_1))))"
@@ -60487,14 +60519,14 @@ static const char *startup_source =
 "(void))))"
 "(void))))"
 "(void)))))))"
-"((s_481 relto_0 stx_18)"
+"((s_477 relto_0 stx_18)"
 "(begin"
 "(log-message"
 "(current-logger)"
 " 'error"
 "                              \"default module name resolver called with three arguments (deprecated)\""
 " #f)"
-"(standard-module-name-resolver_0 s_481 relto_0 stx_18 #t)))"
+"(standard-module-name-resolver_0 s_477 relto_0 stx_18 #t)))"
 "((s_26 relto_1 stx_19 load?_7)"
 "(let-values((()"
 "(begin"
@@ -60584,9 +60616,9 @@ static const char *startup_source =
 "                                                     (if or-part_92 or-part_92 (equal? (cadr s_26) \"..\")))"
 "(if relto_1"
 "(let-values(((p_78)(1/resolved-module-path-name relto_1)))"
-"(let-values(((or-part_374)(symbol? p_78)))"
-"(if or-part_374"
-" or-part_374"
+"(let-values(((or-part_375)(symbol? p_78)))"
+"(if or-part_375"
+" or-part_375"
 "(if(pair? p_78)(symbol?(car p_78)) #f))))"
 " #f)"
 " #f)"
@@ -60625,7 +60657,7 @@ static const char *startup_source =
 "(lambda()"
 "(begin"
 " 'get-dir"
-"(let-values(((or-part_375)"
+"(let-values(((or-part_376)"
 "(if relto_1"
 "(if(eq? relto_1 -prev-relto)"
 " -prev-relto-dir"
@@ -60649,8 +60681,8 @@ static const char *startup_source =
 " base_29))"
 " #f))))"
 " #f)))"
-"(if or-part_375"
-" or-part_375"
+"(if or-part_376"
+" or-part_376"
 "(let-values(((or-part_42)"
 "(current-load-relative-directory)))"
 "(if or-part_42"
@@ -60667,15 +60699,15 @@ static const char *startup_source =
 " 'show-collection-err"
 "(let-values(((msg_2)"
 "(string-append"
-"(let-values(((or-part_376)"
+"(let-values(((or-part_377)"
 "(if stx_19"
 "(if(error-print-source-location)"
 "(format-source-location"
 " stx_19)"
 " #f)"
 " #f)))"
-"(if or-part_376"
-" or-part_376"
+"(if or-part_377"
+" or-part_377"
 "                                                                                    \"standard-module-name-resolver\"))"
 "                                                                                \": \""
 "(regexp-replace"
@@ -60729,8 +60761,8 @@ static const char *startup_source =
 "((s_31)"
 "(if(if(pair? s_26)(eq? 'submod(car s_26)) #f)"
 "(let-values(((v_38)(cadr s_26)))"
-"                                                                 (if (let-values (((or-part_377) (equal? v_38 \".\")))"
-"                                                                       (if or-part_377 or-part_377 (equal? v_38 \"..\")))"
+"                                                                 (if (let-values (((or-part_378) (equal? v_38 \".\")))"
+"                                                                       (if or-part_378 or-part_378 (equal? v_38 \"..\")))"
 "(if relto_1"
 "(let-values(((p_82)"
 "(1/resolved-module-path-name"
@@ -60802,11 +60834,11 @@ static const char *startup_source =
 "(if(string? s_31)"
 "(let-values()"
 "(let-values(((dir_4)(get-dir_0)))"
-"(let-values(((or-part_378)"
+"(let-values(((or-part_379)"
 "(path-cache-get"
 "(cons s_31 dir_4))))"
-"(if or-part_378"
-" or-part_378"
+"(if or-part_379"
+" or-part_379"
 "(let-values(((cols_1 file_4)"
 "(split-relative-string"
 " s_31"
@@ -60897,8 +60929,8 @@ static const char *startup_source =
 "(get-dir_0)))))"
 "(void))))))))"
 "(begin"
-"(if(let-values(((or-part_379)(path? s-parsed_0)))"
-"(if or-part_379 or-part_379(vector? s-parsed_0)))"
+"(if(let-values(((or-part_380)(path? s-parsed_0)))"
+"(if or-part_380 or-part_380(vector? s-parsed_0)))"
 "(void)"
 "(let-values()"
 "(if stx_19"
@@ -60936,11 +60968,11 @@ static const char *startup_source =
 "(vector-ref s-parsed_0 4)"
 "(1/make-resolved-module-path filename_2))))"
 "(let-values(((hts_3)"
-"(let-values(((or-part_380)"
+"(let-values(((or-part_381)"
 "(registry-table-ref"
 "(get-reg_0))))"
-"(if or-part_380"
-" or-part_380"
+"(if or-part_381"
+" or-part_381"
 "(let-values(((hts_4)"
 "(cons"
 "(make-hasheq)"
@@ -60983,11 +61015,11 @@ static const char *startup_source =
 "((nsr_0)(get-reg_0)))"
 "(begin"
 "(for-each2"
-"(lambda(s_438)"
+"(lambda(s_435)"
 "(if(if(equal?"
-"(cdr s_438)"
+"(cdr s_435)"
 " normal-filename_0)"
-"(eq?(car s_438) nsr_0)"
+"(eq?(car s_435) nsr_0)"
 " #f)"
 "(let-values()"
 "(error"
@@ -61082,10 +61114,10 @@ static const char *startup_source =
 "(void))"
 "(if(if(not(vector? s-parsed_0))"
 "(if load?_7"
-"(let-values(((or-part_381)"
+"(let-values(((or-part_382)"
 "(string? s_31)))"
-"(if or-part_381"
-" or-part_381"
+"(if or-part_382"
+" or-part_382"
 "(let-values(((or-part_51)"
 "(symbol? s_31)))"
 "(if or-part_51"
@@ -61183,11 +61215,11 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_67)(expand-context-observer ctx_14)))"
-"(if obs_67"
+"(let-values(((obs_65)(expand-context-observer ctx_14)))"
+"(if obs_65"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_67 'enter-block(datum->syntax$1 #f bodys_7))))"
+"(call-expand-observe obs_65 'enter-block(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
 "(let-values(((inside-sc_0)(new-scope 'intdef)))"
@@ -61225,12 +61257,12 @@ static const char *startup_source =
 " lst_265))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_68)(expand-context-observer ctx_14)))"
-"(if obs_68"
+"(let-values(((obs_66)(expand-context-observer ctx_14)))"
+"(if obs_66"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_68"
+" obs_66"
 " 'block-renames"
 "(datum->syntax$1 #f init-bodys_0)"
 "(datum->syntax$1 #f bodys_7))))"
@@ -61240,9 +61272,9 @@ static const char *startup_source =
 "(let-values(((frame-id_2)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
-"(let-values(((v_252) ctx_14))"
-"(let-values(((the-struct_87) v_252))"
-"(if(expand-context/outer? the-struct_87)"
+"(let-values(((v_253) ctx_14))"
+"(let-values(((the-struct_88) v_253))"
+"(if(expand-context/outer? the-struct_88)"
 "(let-values(((context51_0)(list(make-liberal-define-context)))"
 "((name52_1) #f)"
 "((only-immediate?53_0) #t)"
@@ -61257,27 +61289,27 @@ static const char *startup_source =
 "(cons"
 " frame-id_2"
 "(expand-context-reference-records ctx_14)))"
-"((inner61_0)(root-expand-context/outer-inner v_252)))"
+"((inner61_0)(root-expand-context/outer-inner v_253)))"
 "(expand-context/outer1.1"
 " inner61_0"
 " post-expansion-scope55_0"
 " use-site-scopes58_0"
 " frame-id59_0"
 " context51_0"
-"(expand-context/outer-env the-struct_87)"
+"(expand-context/outer-env the-struct_88)"
 " post-expansion-scope-action56_0"
 " scopes57_0"
 " def-ctx-scopes54_0"
-"(expand-context/outer-binding-layer the-struct_87)"
+"(expand-context/outer-binding-layer the-struct_88)"
 " reference-records60_0"
 " only-immediate?53_0"
-"(expand-context/outer-need-eventually-defined the-struct_87)"
-"(expand-context/outer-current-introduction-scopes the-struct_87)"
+"(expand-context/outer-need-eventually-defined the-struct_88)"
+"(expand-context/outer-current-introduction-scopes the-struct_88)"
 " name52_1))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                   \"expand-context/outer?\""
-" the-struct_87))))))"
+" the-struct_88))))))"
 "(let-values(((maybe-increment-binding-layer_0)"
 "(lambda(ids_28 body-ctx_1)"
 "(begin"
@@ -61334,14 +61366,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_0)(cdr bodys_8)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_69)"
+"(let-values(((obs_67)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_69"
+"(if obs_67"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_69"
+" obs_67"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -61354,10 +61386,10 @@ static const char *startup_source =
 " #f)"
 "(let-values(((v_225)"
 " body-ctx_2))"
-"(let-values(((the-struct_88)"
+"(let-values(((the-struct_89)"
 " v_225))"
 "(if(expand-context/outer?"
-" the-struct_88)"
+" the-struct_89)"
 "(let-values(((name77_0)"
 " name_78)"
 "((inner78_0)"
@@ -61366,36 +61398,36 @@ static const char *startup_source =
 "(expand-context/outer1.1"
 " inner78_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_88)"
+" the-struct_89)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_88)"
+" the-struct_89)"
 "(root-expand-context/outer-frame-id"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-context"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-env"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-scopes"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-binding-layer"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-reference-records"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-only-immediate?"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_88)"
+" the-struct_89)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_88)"
+" the-struct_89)"
 " name77_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                       \"expand-context/outer?\""
-" the-struct_88))))"
+" the-struct_89))))"
 " body-ctx_2)))"
 "(expand7.1"
 " #f"
@@ -61426,38 +61458,38 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_31 begin79_0 e80_0)"
-"(let-values(((s_482)"
+"(let-values(((s_478)"
 " disarmed-exp-body_0))"
 "(let-values(((orig-s_38)"
-" s_482))"
+" s_478))"
 "(let-values(((begin79_1"
 " e80_1)"
-"(let-values(((s_483)"
+"(let-values(((s_479)"
 "(if(syntax?$1"
-" s_482)"
+" s_478)"
 "(syntax-e$1"
-" s_482)"
-" s_482)))"
+" s_478)"
+" s_478)))"
 "(if(pair?"
-" s_483)"
+" s_479)"
 "(let-values(((begin81_0)"
-"(let-values(((s_484)"
+"(let-values(((s_480)"
 "(car"
-" s_483)))"
-" s_484))"
+" s_479)))"
+" s_480))"
 "((e82_0)"
-"(let-values(((s_485)"
+"(let-values(((s_481)"
 "(cdr"
-" s_483)))"
-"(let-values(((s_486)"
+" s_479)))"
+"(let-values(((s_482)"
 "(if(syntax?$1"
-" s_485)"
+" s_481)"
 "(syntax-e$1"
-" s_485)"
-" s_485)))"
+" s_481)"
+" s_481)))"
 "(let-values(((flat-s_24)"
 "(to-syntax-list.1"
-" s_486)))"
+" s_482)))"
 "(if(not"
 " flat-s_24)"
 "(let-values()"
@@ -61490,14 +61522,14 @@ static const char *startup_source =
 "(map2 track_0 e80_0)"
 " rest-bodys_0)))"
 "(begin"
-"(let-values(((obs_70)"
+"(let-values(((obs_68)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_70"
+"(if obs_68"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_70"
+" obs_68"
 " 'splice"
 " splice-bodys_0)))"
 "(void)))"
@@ -61516,14 +61548,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_71)"
+"(let-values(((obs_69)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_71"
+"(if obs_69"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_71"
+" obs_69"
 " 'prim-define-values)))"
 "(void)))"
 "(values))))"
@@ -61538,36 +61570,36 @@ static const char *startup_source =
 "(let-values(((define-values83_1"
 " id84_1"
 " rhs85_1)"
-"(let-values(((s_487)"
+"(let-values(((s_483)"
 "(if(syntax?$1"
 " s_31)"
 "(syntax-e$1"
 " s_31)"
 " s_31)))"
 "(if(pair?"
-" s_487)"
+" s_483)"
 "(let-values(((define-values86_0)"
 "(let-values(((s_49)"
 "(car"
-" s_487)))"
+" s_483)))"
 " s_49))"
 "((id87_0"
 " rhs88_0)"
 "(let-values(((s_32)"
 "(cdr"
-" s_487)))"
-"(let-values(((s_488)"
+" s_483)))"
+"(let-values(((s_484)"
 "(if(syntax?$1"
 " s_32)"
 "(syntax-e$1"
 " s_32)"
 " s_32)))"
 "(if(pair?"
-" s_488)"
+" s_484)"
 "(let-values(((id89_0)"
 "(let-values(((s_310)"
 "(car"
-" s_488)))"
+" s_484)))"
 "(let-values(((s_392)"
 "(if(syntax?$1"
 " s_310)"
@@ -61585,7 +61617,7 @@ static const char *startup_source =
 "                                                                                                                                                                 \"bad syntax\""
 " orig-s_39))"
 "(let-values()"
-"(let-values(((id_107)"
+"(let-values(((id_108)"
 "(let-values(((lst_194)"
 " flat-s_25))"
 "(begin"
@@ -61596,7 +61628,7 @@ static const char *startup_source =
 "(check-list"
 " lst_194)))"
 "((letrec-values(((for-loop_286)"
-"(lambda(id_108"
+"(lambda(id_109"
 " lst_319)"
 "(begin"
 " 'for-loop"
@@ -61608,12 +61640,12 @@ static const char *startup_source =
 "((rest_179)"
 "(unsafe-cdr"
 " lst_319)))"
-"(let-values(((id_70)"
-"(let-values(((id_109)"
-" id_108))"
+"(let-values(((id_71)"
 "(let-values(((id_110)"
+" id_109))"
+"(let-values(((id_111)"
 "(let-values()"
-"(let-values(((id92_2)"
+"(let-values(((id92_1)"
 "(let-values()"
 "(if(let-values(((or-part_141)"
 "(if(syntax?$1"
@@ -61633,43 +61665,43 @@ static const char *startup_source =
 " orig-s_39"
 " s_313)))))"
 "(cons"
-" id92_2"
-" id_109)))))"
-"(values"
+" id92_1"
 " id_110)))))"
+"(values"
+" id_111)))))"
 "(if(not"
 " #f)"
 "(for-loop_286"
-" id_70"
+" id_71"
 " rest_179)"
-" id_70)))"
-" id_108)))))"
+" id_71)))"
+" id_109)))))"
 " for-loop_286)"
 " null"
 " lst_194)))))"
 "(reverse$1"
-" id_107))))))))"
+" id_108))))))))"
 "((rhs90_0)"
-"(let-values(((s_489)"
+"(let-values(((s_485)"
 "(cdr"
-" s_488)))"
-"(let-values(((s_490)"
+" s_484)))"
+"(let-values(((s_486)"
 "(if(syntax?$1"
-" s_489)"
+" s_485)"
 "(syntax-e$1"
-" s_489)"
-" s_489)))"
+" s_485)"
+" s_485)))"
 "(if(pair?"
-" s_490)"
+" s_486)"
 "(let-values(((rhs91_0)"
 "(let-values(((s_54)"
 "(car"
-" s_490)))"
+" s_486)))"
 " s_54))"
 "(()"
 "(let-values(((s_314)"
 "(cdr"
-" s_490)))"
+" s_486)))"
 "(let-values(((s_315)"
 "(if(syntax?$1"
 " s_314)"
@@ -61715,14 +61747,14 @@ static const char *startup_source =
 " body-ctx_2)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_61)"
+"(let-values(((obs_59)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_61"
+"(if obs_59"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_61"
+" obs_59"
 " 'rename-one"
 "(datum->syntax$1"
 " #f"
@@ -61769,7 +61801,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_320)"
-"(let-values(((id_111)"
+"(let-values(((id_112)"
 "(unsafe-car"
 " lst_320))"
 "((rest_180)"
@@ -61782,8 +61814,8 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id97_1)"
-" id_111)"
+"(let-values(((id97_2)"
+" id_112)"
 "((phase98_0)"
 " phase_17)"
 "((counter99_0)"
@@ -61797,7 +61829,7 @@ static const char *startup_source =
 " #t"
 " exp-body101_0"
 " #t"
-" id97_1"
+" id97_2"
 " phase98_0"
 " counter99_0)))"
 " fold-var_292))))"
@@ -61880,12 +61912,12 @@ static const char *startup_source =
 " lst_231"
 " lst_197)))))"
 "(loop_119"
-"(let-values(((v_253)"
+"(let-values(((v_254)"
 " body-ctx_2))"
-"(let-values(((the-struct_89)"
-" v_253))"
+"(let-values(((the-struct_90)"
+" v_254))"
 "(if(expand-context/outer?"
-" the-struct_89)"
+" the-struct_90)"
 "(let-values(((env102_0)"
 " extended-env_0)"
 "((binding-layer103_0)"
@@ -61894,39 +61926,39 @@ static const char *startup_source =
 " body-ctx_2))"
 "((inner104_0)"
 "(root-expand-context/outer-inner"
-" v_253)))"
+" v_254)))"
 "(expand-context/outer1.1"
 " inner104_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_89)"
+" the-struct_90)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_89)"
+" the-struct_90)"
 "(root-expand-context/outer-frame-id"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-context"
-" the-struct_89)"
+" the-struct_90)"
 " env102_0"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-scopes"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_89)"
+" the-struct_90)"
 " binding-layer103_0"
 "(expand-context/outer-reference-records"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-only-immediate?"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_89)"
+" the-struct_90)"
 "(expand-context/outer-name"
-" the-struct_89)))"
+" the-struct_90)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                      \"expand-context/outer?\""
-" the-struct_89))))"
+" the-struct_90))))"
 " rest-bodys_0"
 " null"
 "(cons"
@@ -62131,52 +62163,52 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_72)"
+"(let-values(((obs_70)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_72"
+"(if obs_70"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_72"
+" obs_70"
 " 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_20"
 " define-syntaxes105_0"
-" id106_1"
+" id106_2"
 " rhs107_0)"
 "(let-values(((s_95)"
 " disarmed-exp-body_0))"
 "(let-values(((orig-s_40)"
 " s_95))"
 "(let-values(((define-syntaxes105_1"
-" id106_2"
+" id106_3"
 " rhs107_1)"
-"(let-values(((s_491)"
+"(let-values(((s_487)"
 "(if(syntax?$1"
 " s_95)"
 "(syntax-e$1"
 " s_95)"
 " s_95)))"
 "(if(pair?"
-" s_491)"
+" s_487)"
 "(let-values(((define-syntaxes108_0)"
-"(let-values(((s_492)"
+"(let-values(((s_488)"
 "(car"
-" s_491)))"
-" s_492))"
+" s_487)))"
+" s_488))"
 "((id109_0"
 " rhs110_0)"
-"(let-values(((s_493)"
+"(let-values(((s_489)"
 "(cdr"
-" s_491)))"
+" s_487)))"
 "(let-values(((s_97)"
 "(if(syntax?$1"
-" s_493)"
+" s_489)"
 "(syntax-e$1"
-" s_493)"
-" s_493)))"
+" s_489)"
+" s_489)))"
 "(if(pair?"
 " s_97)"
 "(let-values(((id111_0)"
@@ -62200,7 +62232,7 @@ static const char *startup_source =
 "                                                                                                                                                                   \"bad syntax\""
 " orig-s_40))"
 "(let-values()"
-"(let-values(((id_112)"
+"(let-values(((id_113)"
 "(let-values(((lst_327)"
 " flat-s_26))"
 "(begin"
@@ -62211,88 +62243,88 @@ static const char *startup_source =
 "(check-list"
 " lst_327)))"
 "((letrec-values(((for-loop_292)"
-"(lambda(id_113"
+"(lambda(id_114"
 " lst_35)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_35)"
-"(let-values(((s_494)"
+"(let-values(((s_490)"
 "(unsafe-car"
 " lst_35))"
 "((rest_186)"
 "(unsafe-cdr"
 " lst_35)))"
-"(let-values(((id_114)"
 "(let-values(((id_115)"
-" id_113))"
 "(let-values(((id_116)"
+" id_114))"
+"(let-values(((id_117)"
 "(let-values()"
 "(let-values(((id114_0)"
 "(let-values()"
 "(if(let-values(((or-part_327)"
 "(if(syntax?$1"
-" s_494)"
+" s_490)"
 "(symbol?"
 "(syntax-e$1"
-" s_494))"
+" s_490))"
 " #f)))"
 "(if or-part_327"
 " or-part_327"
 "(symbol?"
-" s_494)))"
-" s_494"
+" s_490)))"
+" s_490"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_40"
-" s_494)))))"
+" s_490)))))"
 "(cons"
 " id114_0"
-" id_115)))))"
-"(values"
 " id_116)))))"
+"(values"
+" id_117)))))"
 "(if(not"
 " #f)"
 "(for-loop_292"
-" id_114"
+" id_115"
 " rest_186)"
-" id_114)))"
-" id_113)))))"
+" id_115)))"
+" id_114)))))"
 " for-loop_292)"
 " null"
 " lst_327)))))"
 "(reverse$1"
-" id_112))))))))"
+" id_113))))))))"
 "((rhs112_0)"
-"(let-values(((s_495)"
+"(let-values(((s_491)"
 "(cdr"
 " s_97)))"
-"(let-values(((s_496)"
+"(let-values(((s_492)"
 "(if(syntax?$1"
-" s_495)"
+" s_491)"
 "(syntax-e$1"
-" s_495)"
-" s_495)))"
+" s_491)"
+" s_491)))"
 "(if(pair?"
-" s_496)"
+" s_492)"
 "(let-values(((rhs113_0)"
 "(let-values(((s_102)"
 "(car"
-" s_496)))"
+" s_492)))"
 " s_102))"
 "(()"
 "(let-values(((s_326)"
 "(cdr"
-" s_496)))"
-"(let-values(((s_497)"
+" s_492)))"
+"(let-values(((s_493)"
 "(if(syntax?$1"
 " s_326)"
 "(syntax-e$1"
 " s_326)"
 " s_326)))"
 "(if(null?"
-" s_497)"
+" s_493)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -62322,22 +62354,22 @@ static const char *startup_source =
 "(values"
 " #t"
 " define-syntaxes105_1"
-" id106_2"
+" id106_3"
 " rhs107_1))))))"
 "(let-values(((ids_30)"
 "(remove-use-site-scopes"
-" id106_1"
+" id106_2"
 " body-ctx_2)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_73)"
+"(let-values(((obs_71)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_73"
+"(if obs_71"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_73"
+" obs_71"
 " 'rename-one"
 "(datum->syntax$1"
 " #f"
@@ -62384,7 +62416,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_329)"
-"(let-values(((id_117)"
+"(let-values(((id_118)"
 "(unsafe-car"
 " lst_329))"
 "((rest_187)"
@@ -62398,7 +62430,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id119_0)"
-" id_117)"
+" id_118)"
 "((phase120_0)"
 " phase_17)"
 "((counter121_0)"
@@ -62430,14 +62462,14 @@ static const char *startup_source =
 " lst_328))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_74)"
+"(let-values(((obs_72)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_74"
+"(if obs_72"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_74"
+" obs_72"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -62448,14 +62480,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_75)"
+"(let-values(((obs_73)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_75"
+"(if obs_73"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_75"
+" obs_73"
 " 'enter-bind)))"
 "(void)))"
 "(values))))"
@@ -62517,7 +62549,7 @@ static const char *startup_source =
 "((rest_189)"
 "(unsafe-cdr"
 " lst_333))"
-"((id_118)"
+"((id_119)"
 "(unsafe-car"
 " lst_334))"
 "((rest_190)"
@@ -62531,7 +62563,7 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_86"
-" id_118"
+" id_119"
 " phase_17"
 " body-ctx_2)"
 "(env-extend"
@@ -62556,21 +62588,21 @@ static const char *startup_source =
 " lst_330"
 " lst_331)))))"
 "(begin"
-"(let-values(((obs_76)"
+"(let-values(((obs_74)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_76"
+"(if obs_74"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_76"
+" obs_74"
 " 'exit-bind)))"
 "(void)))"
 "(loop_119"
-"(let-values(((v_254)"
+"(let-values(((v_255)"
 " body-ctx_2))"
 "(let-values(((the-struct_65)"
-" v_254))"
+" v_255))"
 "(if(expand-context/outer?"
 " the-struct_65)"
 "(let-values(((env124_0)"
@@ -62581,7 +62613,7 @@ static const char *startup_source =
 " body-ctx_2))"
 "((inner126_0)"
 "(root-expand-context/outer-inner"
-" v_254)))"
+" v_255)))"
 "(expand-context/outer1.1"
 " inner126_0"
 "(root-expand-context/outer-post-expansion-scope"
@@ -62733,12 +62765,12 @@ static const char *startup_source =
 "(void))"
 "(values))))"
 "(let-values(((finish-ctx_0)"
-"(let-values(((v_255)"
+"(let-values(((v_256)"
 "(accumulate-def-ctx-scopes"
 " body-ctx_3"
 " def-ctx-scopes_7)))"
-"(let-values(((the-struct_90) v_255))"
-"(if(expand-context/outer? the-struct_90)"
+"(let-values(((the-struct_91) v_256))"
+"(if(expand-context/outer? the-struct_91)"
 "(let-values(((context127_0) 'expression)"
 "((use-site-scopes128_0)(box null))"
 "((scopes129_0)"
@@ -62751,29 +62783,29 @@ static const char *startup_source =
 "((def-ctx-scopes131_0) #f)"
 "((post-expansion-scope132_0) #f)"
 "((inner133_0)"
-"(root-expand-context/outer-inner v_255)))"
+"(root-expand-context/outer-inner v_256)))"
 "(expand-context/outer1.1"
 " inner133_0"
 " post-expansion-scope132_0"
 " use-site-scopes128_0"
-"(root-expand-context/outer-frame-id the-struct_90)"
+"(root-expand-context/outer-frame-id the-struct_91)"
 " context127_0"
-"(expand-context/outer-env the-struct_90)"
+"(expand-context/outer-env the-struct_91)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_90)"
+" the-struct_91)"
 " scopes129_0"
 " def-ctx-scopes131_0"
-"(expand-context/outer-binding-layer the-struct_90)"
-"(expand-context/outer-reference-records the-struct_90)"
+"(expand-context/outer-binding-layer the-struct_91)"
+"(expand-context/outer-reference-records the-struct_91)"
 " only-immediate?130_0"
-"(expand-context/outer-need-eventually-defined the-struct_90)"
+"(expand-context/outer-need-eventually-defined the-struct_91)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_90)"
-"(expand-context/outer-name the-struct_90)))"
+" the-struct_91)"
+"(expand-context/outer-name the-struct_91)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                         \"expand-context/outer?\""
-" the-struct_90))))))"
+" the-struct_91))))))"
 "(let-values(((finish-bodys_0)"
 "(lambda()"
 "(begin"
@@ -62784,28 +62816,28 @@ static const char *startup_source =
 "(if block->list?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_77)"
+"(let-values(((obs_75)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_77"
+"(if obs_75"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_77"
+" obs_75"
 " 'next-group)))"
 "(void)))))"
 "(values))))"
 "(let-values(((last-i_1)(sub1(length done-bodys_1))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_78)"
+"(let-values(((obs_76)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_78"
+"(if obs_76"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_78"
+" obs_76"
 " 'enter-list"
 "(datum->syntax$1"
 " #f"
@@ -62853,14 +62885,14 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_79)"
+"(let-values(((obs_77)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_79"
+"(if obs_77"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_79"
+" obs_77"
 " 'next)))"
 "(void)))"
 "(let-values(((done-body134_0)"
@@ -62871,50 +62903,50 @@ static const char *startup_source =
 " i_190"
 " last-i_1)"
 " #f)"
-"(let-values(((v_256)"
+"(let-values(((v_257)"
 " finish-ctx_0))"
-"(let-values(((the-struct_91)"
-" v_256))"
+"(let-values(((the-struct_92)"
+" v_257))"
 "(if(expand-context/outer?"
-" the-struct_91)"
+" the-struct_92)"
 "(let-values(((name136_0)"
 " name_79)"
 "((inner137_0)"
 "(root-expand-context/outer-inner"
-" v_256)))"
+" v_257)))"
 "(expand-context/outer1.1"
 " inner137_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_91)"
+" the-struct_92)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(root-expand-context/outer-frame-id"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-context"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-env"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-binding-layer"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-reference-records"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-only-immediate?"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_91)"
+" the-struct_92)"
 " name136_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                         \"expand-context/outer?\""
-" the-struct_91))))"
+" the-struct_92))))"
 " finish-ctx_0)))"
 "(expand7.1"
 " #f"
@@ -62941,13 +62973,13 @@ static const char *startup_source =
 " lst_335"
 " start_66))))))"
 "(begin"
-"(let-values(((obs_80)"
+"(let-values(((obs_78)"
 "(expand-context-observer body-ctx_3)))"
-"(if obs_80"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_80"
+" obs_78"
 " 'exit-list"
 "(datum->syntax$1 #f exp-bodys_0))))"
 "(void)))"
@@ -62956,12 +62988,12 @@ static const char *startup_source =
 "(if(if(null? val-idss_1)(null? disappeared-transformer-bindings_0) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_81)(expand-context-observer finish-ctx_0)))"
-"(if obs_81"
+"(let-values(((obs_79)(expand-context-observer finish-ctx_0)))"
+"(if obs_79"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_81"
+" obs_79"
 " 'block->list"
 "(datum->syntax$1 s_231 done-bodys_1))))"
 "(void)))"
@@ -62969,12 +63001,12 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_82)"
+"(let-values(((obs_80)"
 "(expand-context-observer finish-ctx_0)))"
-"(if obs_82"
+"(if obs_80"
 "(let-values()"
 "(log-letrec-values$1"
-" obs_82"
+" obs_80"
 " finish-ctx_0"
 " s_231"
 " val-idss_1"
@@ -62993,14 +63025,14 @@ static const char *startup_source =
 "((frame-id143_0) frame-id_13)"
 "((finish-ctx144_0) finish-ctx_0)"
 "((s145_0) s_231)"
-"((temp146_2)(pair? stx-clauses_1))"
+"((temp146_3)(pair? stx-clauses_1))"
 "((finish-bodys147_0) finish-bodys_0)"
 "((temp148_0) #f))"
 "(expand-and-split-bindings-by-reference48.1"
 " finish-ctx144_0"
 " frame-id143_0"
 " finish-bodys147_0"
-" temp146_2"
+" temp146_3"
 " s145_0"
 " temp142_2"
 " temp148_0"
@@ -63009,13 +63041,13 @@ static const char *startup_source =
 " val-rhss140_0"
 " track-stxs141_0))))"
 "(begin"
-"(let-values(((obs_83)(expand-context-observer body-ctx_3)))"
-"(if obs_83"
+"(let-values(((obs_81)(expand-context-observer body-ctx_3)))"
+"(if obs_81"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_83 'exit-prim exp-s_13)"
-"(call-expand-observe obs_83 'return exp-s_13))))"
+"(call-expand-observe obs_81 'exit-prim exp-s_13)"
+"(call-expand-observe obs_81 'return exp-s_13))))"
 "(void)))"
 "(if(expand-context-to-parsed? body-ctx_3)"
 "(list exp-s_13)"
@@ -63045,12 +63077,12 @@ static const char *startup_source =
 "(let-values(((split?_0) split?30_0))"
 "(let-values(((frame-id_14) frame-id31_0))"
 "(let-values(((ctx_77) ctx32_0))"
-"(let-values(((s_498) source33_0))"
+"(let-values(((s_494) source33_0))"
 "(let-values(((had-stxes?_0) had-stxes?34_0))"
 "(let-values(((get-body_0) get-body35_0))"
 "(let-values(((track?_1) track?36_0))"
 "(let-values()"
-"(let-values(((phase_141)(expand-context-phase ctx_77)))"
+"(let-values(((phase_142)(expand-context-phase ctx_77)))"
 "((letrec-values(((loop_120)"
 "(lambda(idss_2"
 " keyss_1"
@@ -63075,12 +63107,12 @@ static const char *startup_source =
 "(if(expand-context-to-parsed? ctx_77)"
 "(if(null? accum-idss_0)"
 "(parsed-let-values17.1"
-"(keep-properties-only s_498)"
+"(keep-properties-only s_494)"
 " null"
 " null"
 " exp-body_1)"
 "(parsed-letrec-values18.1"
-"(keep-properties-only s_498)"
+"(keep-properties-only s_494)"
 "(reverse$1 accum-idss_0)"
 "(reverse$1"
 "(map2"
@@ -63089,16 +63121,16 @@ static const char *startup_source =
 " accum-rhss_0))"
 " exp-body_1))"
 "(let-values(((track?149_0) track?_2)"
-"((s150_0) s_498)"
+"((s150_0) s_494)"
 "((temp151_3)"
 "(list*"
 "(if(null? accum-idss_0)"
 "(core-id"
 " 'let-values"
-" phase_141)"
+" phase_142)"
 "(core-id"
 " 'letrec-values"
-" phase_141))"
+" phase_142))"
 "(build-clauses"
 " accum-idss_0"
 " accum-rhss_0"
@@ -63110,16 +63142,16 @@ static const char *startup_source =
 " s150_0"
 " temp151_3)))))"
 "(begin"
-"(let-values(((obs_84)"
+"(let-values(((obs_82)"
 "(expand-context-observer ctx_77)))"
-"(if obs_84"
+"(if obs_82"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag? had-stxes?_0 ctx_77)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_84"
+" obs_82"
 " 'tag"
 " result-s_9))"
 "(void)))"
@@ -63128,13 +63160,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_85)"
+"(let-values(((obs_83)"
 "(expand-context-observer"
 " ctx_77)))"
-"(if obs_85"
+"(if obs_83"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_85 'next)))"
+"(call-expand-observe obs_83 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((ids_31)(car idss_2)))"
@@ -63194,7 +63226,7 @@ static const char *startup_source =
 " ctx_77)"
 "(parsed-let-values17.1"
 "(keep-properties-only"
-" s_498)"
+" s_494)"
 "(list ids_31)"
 "(list"
 "(list"
@@ -63204,12 +63236,12 @@ static const char *startup_source =
 "(let-values(((track?154_0)"
 " track?_2)"
 "((s155_0)"
-" s_498)"
+" s_494)"
 "((temp156_0)"
 "(list*"
 "(core-id"
 " 'let-values"
-" phase_141)"
+" phase_142)"
 "(list"
 "(build-clause"
 " ids_31"
@@ -63222,10 +63254,10 @@ static const char *startup_source =
 " s155_0"
 " temp156_0)))))"
 "(begin"
-"(let-values(((obs_86)"
+"(let-values(((obs_84)"
 "(expand-context-observer"
 " ctx_77)))"
-"(if obs_86"
+"(if obs_84"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
@@ -63234,7 +63266,7 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_86"
+" obs_84"
 " 'tag"
 " result-s_10))"
 "(void)))"
@@ -63243,9 +63275,9 @@ static const char *startup_source =
 "(list result-s_10)"
 " result-s_10))))))"
 "(if(if(not forward-references?_0)"
-"(let-values(((or-part_382) split?_0))"
-"(if or-part_382"
-" or-part_382"
+"(let-values(((or-part_383) split?_0))"
+"(if or-part_383"
+" or-part_383"
 "(null?(cdr idss_2))))"
 " #f)"
 "(let-values()"
@@ -63267,7 +63299,7 @@ static const char *startup_source =
 " ctx_77)"
 "(parsed-letrec-values18.1"
 "(keep-properties-only"
-" s_498)"
+" s_494)"
 "(reverse$1"
 "(cons"
 " ids_31"
@@ -63285,12 +63317,12 @@ static const char *startup_source =
 "(let-values(((track?157_0)"
 " track?_2)"
 "((s158_0)"
-" s_498)"
+" s_494)"
 "((temp159_0)"
 "(list*"
 "(core-id"
 " 'letrec-values"
-" phase_141)"
+" phase_142)"
 "(build-clauses"
 "(cons"
 " ids_31"
@@ -63308,10 +63340,10 @@ static const char *startup_source =
 " s158_0"
 " temp159_0)))))"
 "(begin"
-"(let-values(((obs_87)"
+"(let-values(((obs_27)"
 "(expand-context-observer"
 " ctx_77)))"
-"(if obs_87"
+"(if obs_27"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
@@ -63320,7 +63352,7 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_87"
+" obs_27"
 " 'tag"
 " result-s_11))"
 "(void)))"
@@ -63365,25 +63397,25 @@ static const char *startup_source =
 "(if track-stx_1(syntax-track-origin$1 clause_2 track-stx_1) clause_2)))))"
 "(define-values"
 "(no-binds)"
-"(lambda(expr_10 s_499 phase_142)"
+"(lambda(expr_10 s_495 phase_143)"
 "(begin"
-"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_142)))"
+"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_143)))"
 "(datum->syntax$1"
-"(core-id '#%app phase_142)"
-"(list(core-id 'begin phase_142) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
-" s_499)))))"
+"(core-id '#%app phase_143)"
+"(list(core-id 'begin phase_143) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
+" s_495)))))"
 "(define-values"
 "(log-tag?)"
 "(lambda(had-stxes?_1 ctx_78)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_78)) #f))))"
 "(define-values"
 "(log-letrec-values$1)"
-"(lambda(obs_88 ctx_40 s_500 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
+"(lambda(obs_85 ctx_79 s_496 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
 "(begin"
 " 'log-letrec-values"
-"(let-values(((phase_143)(expand-context-phase ctx_40)))"
+"(let-values(((phase_144)(expand-context-phase ctx_79)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
-"(let-values(((lst_246) val-idss_2)((lst_247) val-rhss_2)((lst_285) track-stxs_4))"
+"(let-values(((lst_246) val-idss_2)((lst_247) val-rhss_2)((lst_337) track-stxs_4))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -63393,18 +63425,18 @@ static const char *startup_source =
 "(let-values()(check-list lst_247)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_285)))"
+"(let-values()(check-list lst_337)))"
 "((letrec-values(((for-loop_296)"
-"(lambda(fold-var_315 lst_337 lst_287 lst_288)"
+"(lambda(fold-var_315 lst_338 lst_339 lst_340)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_337)(if(pair? lst_287)(pair? lst_288) #f) #f)"
-"(let-values(((val-ids_0)(unsafe-car lst_337))"
-"((rest_157)(unsafe-cdr lst_337))"
-"((val-rhs_0)(unsafe-car lst_287))"
-"((rest_158)(unsafe-cdr lst_287))"
-"((track-stx_2)(unsafe-car lst_288))"
-"((rest_62)(unsafe-cdr lst_288)))"
+"(if(if(pair? lst_338)(if(pair? lst_339)(pair? lst_340) #f) #f)"
+"(let-values(((val-ids_0)(unsafe-car lst_338))"
+"((rest_192)(unsafe-cdr lst_338))"
+"((val-rhs_0)(unsafe-car lst_339))"
+"((rest_193)(unsafe-cdr lst_339))"
+"((track-stx_2)(unsafe-car lst_340))"
+"((rest_62)(unsafe-cdr lst_340)))"
 "(let-values(((fold-var_316)"
 "(let-values(((fold-var_317) fold-var_315))"
 "(let-values(((fold-var_318)"
@@ -63418,74 +63450,74 @@ static const char *startup_source =
 " fold-var_317))))"
 "(values fold-var_318)))))"
 "(if(not #f)"
-"(for-loop_296 fold-var_316 rest_157 rest_158 rest_62)"
+"(for-loop_296 fold-var_316 rest_192 rest_193 rest_62)"
 " fold-var_316)))"
 " fold-var_315)))))"
 " for-loop_296)"
 " null"
 " lst_246"
 " lst_247"
-" lst_285))))))"
+" lst_337))))))"
 "(let-values(((had-stxes?_2)(not(null? stx-clauses_2))))"
-"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_143)))"
+"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_144)))"
 "(let-values(((lv-s_0)"
 "(datum->syntax$1"
 " #f"
 "(if had-stxes?_2"
 "(list* lv-id_0 stx-clauses_2 clauses_0 done-bodys_2)"
 "(list* lv-id_0 clauses_0 done-bodys_2))"
-" s_500)))"
+" s_496)))"
 "(begin"
-"(call-expand-observe obs_88 'block->letrec(list lv-s_0))"
-"(call-expand-observe obs_88 'visit lv-s_0)"
-"(call-expand-observe obs_88 'resolve lv-id_0)"
-"(call-expand-observe obs_88 'enter-prim lv-s_0)"
+"(call-expand-observe obs_85 'block->letrec(list lv-s_0))"
+"(call-expand-observe obs_85 'visit lv-s_0)"
+"(call-expand-observe obs_85 'resolve lv-id_0)"
+"(call-expand-observe obs_85 'enter-prim lv-s_0)"
 "(if had-stxes?_2"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_88 'prim-letrec-syntaxes+values)"
+"(call-expand-observe obs_85 'prim-letrec-syntaxes+values)"
 "(call-expand-observe"
-" obs_88"
+" obs_85"
 " 'letrec-syntaxes-renames"
 " stx-clauses_2"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_500))"
-"(call-expand-observe obs_88 'prepare-env)"
-"(call-expand-observe obs_88 'next-group)"
+"(datum->syntax$1 #f done-bodys_2 s_496))"
+"(call-expand-observe obs_85 'prepare-env)"
+"(call-expand-observe obs_85 'next-group)"
 "(if(null? val-idss_2)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_88 'prim-letrec-values)"
+"(call-expand-observe obs_85 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_88"
+" obs_85"
 " 'let-renames"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_500)))))))"
+"(datum->syntax$1 #f done-bodys_2 s_496)))))))"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_88 'prim-letrec-values)"
+"(call-expand-observe obs_85 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_88"
+" obs_85"
 " 'let-renames"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_500))))))))))))))"
+"(datum->syntax$1 #f done-bodys_2 s_496))))))))))))))"
 "(define-values"
 "(lambda-clause-expander)"
-"(lambda(s_71 disarmed-s_5 formals_1 bodys_9 ctx_79 log-renames-tag_0)"
+"(lambda(s_71 disarmed-s_5 formals_1 bodys_9 ctx_80 log-renames-tag_0)"
 "(begin"
 "(let-values(((sc_35)(new-scope 'local)))"
-"(let-values(((phase_144)(expand-context-phase ctx_79)))"
+"(let-values(((phase_145)(expand-context-phase ctx_80)))"
 "(let-values(((ids_33)(parse-and-flatten-formals formals_1 sc_35 disarmed-s_5)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ids34_0) ids_33)"
-"((phase35_2) phase_144)"
+"((phase35_2) phase_145)"
 "((s36_0) s_71)"
 "                                         ((temp37_4) \"argument name\"))"
 "(check-no-duplicate-ids8.1 temp37_4 #t ids34_0 phase35_2 s36_0 #f #f))"
 "(values))))"
-"(let-values(((counter_7)(root-expand-context-counter ctx_79)))"
+"(let-values(((counter_7)(root-expand-context-counter ctx_80)))"
 "(let-values(((keys_7)"
 "(reverse$1"
 "(let-values(((lst_88) ids_33))"
@@ -63498,8 +63530,8 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_266)"
-"(let-values(((id_119)(unsafe-car lst_266))"
-"((rest_192)(unsafe-cdr lst_266)))"
+"(let-values(((id_120)(unsafe-car lst_266))"
+"((rest_194)(unsafe-cdr lst_266)))"
 "(let-values(((fold-var_33)"
 "(let-values(((fold-var_34) fold-var_319))"
 "(let-values(((fold-var_154)"
@@ -63507,9 +63539,9 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id38_0)"
-" id_119)"
+" id_120)"
 "((phase39_1)"
-" phase_144)"
+" phase_145)"
 "((counter40_0)"
 " counter_7)"
 "((s41_0)"
@@ -63525,7 +63557,7 @@ static const char *startup_source =
 " fold-var_34))))"
 "(values fold-var_154)))))"
 "(if(not #f)"
-"(for-loop_297 fold-var_33 rest_192)"
+"(for-loop_297 fold-var_33 rest_194)"
 " fold-var_33)))"
 " fold-var_319)))))"
 " for-loop_297)"
@@ -63547,8 +63579,8 @@ static const char *startup_source =
 "(if(if(pair? lst_83)(pair? lst_272) #f)"
 "(let-values(((key_96)(unsafe-car lst_83))"
 "((rest_146)(unsafe-cdr lst_83))"
-"((id_120)(unsafe-car lst_272))"
-"((rest_193)(unsafe-cdr lst_272)))"
+"((id_121)(unsafe-car lst_272))"
+"((rest_195)(unsafe-cdr lst_272)))"
 "(let-values(((env_26)"
 "(let-values(((env_27) env_25))"
 "(let-values(((env_28)"
@@ -63557,14 +63589,14 @@ static const char *startup_source =
 " env_27"
 " key_96"
 "(local-variable1.1"
-" id_120)))))"
+" id_121)))))"
 "(values env_28)))))"
 "(if(not #f)"
-"(for-loop_233 env_26 rest_146 rest_193)"
+"(for-loop_233 env_26 rest_146 rest_195)"
 " env_26)))"
 " env_25)))))"
 " for-loop_233)"
-"(expand-context-env ctx_79)"
+"(expand-context-env ctx_80)"
 " lst_81"
 " lst_91)))))"
 "(let-values(((sc-formals_0)(add-scope formals_1 sc_35)))"
@@ -63603,7 +63635,7 @@ static const char *startup_source =
 " lst_17))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_3)(expand-context-observer ctx_79)))"
+"(let-values(((obs_3)(expand-context-observer ctx_80)))"
 "(if obs_3"
 "(let-values()"
 "(let-values()"
@@ -63615,76 +63647,76 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_4)"
-"(let-values(((v_257) ctx_79))"
-"(let-values(((the-struct_92) v_257))"
-"(if(expand-context/outer? the-struct_92)"
+"(let-values(((v_258) ctx_80))"
+"(let-values(((the-struct_93) v_258))"
+"(if(expand-context/outer? the-struct_93)"
 "(let-values(((env42_0) body-env_0)"
-"((scopes43_1)(cons sc_35(expand-context-scopes ctx_79)))"
+"((scopes43_1)(cons sc_35(expand-context-scopes ctx_80)))"
 "((binding-layer44_0)"
-"(increment-binding-layer ids_33 ctx_79 sc_35))"
+"(increment-binding-layer ids_33 ctx_80 sc_35))"
 "((frame-id45_0) #f)"
-"((inner46_0)(root-expand-context/outer-inner v_257)))"
+"((inner46_0)(root-expand-context/outer-inner v_258)))"
 "(expand-context/outer1.1"
 " inner46_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_92)"
-"(root-expand-context/outer-use-site-scopes the-struct_92)"
+"(root-expand-context/outer-post-expansion-scope the-struct_93)"
+"(root-expand-context/outer-use-site-scopes the-struct_93)"
 " frame-id45_0"
-"(expand-context/outer-context the-struct_92)"
+"(expand-context/outer-context the-struct_93)"
 " env42_0"
-"(expand-context/outer-post-expansion-scope-action the-struct_92)"
+"(expand-context/outer-post-expansion-scope-action the-struct_93)"
 " scopes43_1"
-"(expand-context/outer-def-ctx-scopes the-struct_92)"
+"(expand-context/outer-def-ctx-scopes the-struct_93)"
 " binding-layer44_0"
-"(expand-context/outer-reference-records the-struct_92)"
-"(expand-context/outer-only-immediate? the-struct_92)"
-"(expand-context/outer-need-eventually-defined the-struct_92)"
-"(expand-context/outer-current-introduction-scopes the-struct_92)"
-"(expand-context/outer-name the-struct_92)))"
+"(expand-context/outer-reference-records the-struct_93)"
+"(expand-context/outer-only-immediate? the-struct_93)"
+"(expand-context/outer-need-eventually-defined the-struct_93)"
+"(expand-context/outer-current-introduction-scopes the-struct_93)"
+"(expand-context/outer-name the-struct_93)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                               \"expand-context/outer?\""
-" the-struct_92))))))"
+" the-struct_93))))))"
 "(let-values(((exp-body_2)"
 "(let-values(((sc-bodys47_0) sc-bodys_0)"
 "((body-ctx48_0) body-ctx_4)"
 "((temp49_3)"
-"(let-values(((ctx50_0) ctx_79)((s51_2) s_71)((temp52_5) #t))"
-"(keep-as-needed74.1 #f #f temp52_5 #t #f #f ctx50_0 s51_2))))"
+"(let-values(((ctx50_0) ctx_80)((s51_2) s_71)((temp52_5) #t))"
+"(keep-as-needed85.1 #f #f temp52_5 #t #f #f ctx50_0 s51_2))))"
 "(expand-body7.1 temp49_3 #f #f sc-bodys47_0 body-ctx48_0))))"
 "(values"
-"(if(expand-context-to-parsed? ctx_79)"
+"(if(expand-context-to-parsed? ctx_80)"
 "(unflatten-like-formals keys_7 formals_1)"
 " sc-formals_0)"
 " exp-body_2))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'lambda"
-"(lambda(s_15 ctx_80)"
+"(lambda(s_15 ctx_81)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_5)(expand-context-observer ctx_80)))"
+"(let-values(((obs_5)(expand-context-observer ctx_81)))"
 "(if obs_5(let-values()(let-values()(call-expand-observe obs_5 'prim-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_6)(syntax-disarm$1 s_15)))"
 "(let-values(((ok?_33 lambda53_0 formals54_0 body55_0)"
-"(let-values(((s_433) disarmed-s_6))"
-"(let-values(((orig-s_41) s_433))"
+"(let-values(((s_430) disarmed-s_6))"
+"(let-values(((orig-s_41) s_430))"
 "(let-values(((lambda53_1 formals54_1 body55_1)"
-"(let-values(((s_166)(if(syntax?$1 s_433)(syntax-e$1 s_433) s_433)))"
+"(let-values(((s_166)(if(syntax?$1 s_430)(syntax-e$1 s_430) s_430)))"
 "(if(pair? s_166)"
-"(let-values(((lambda56_0)(let-values(((s_501)(car s_166))) s_501))"
+"(let-values(((lambda56_0)(let-values(((s_497)(car s_166))) s_497))"
 "((formals57_0 body58_0)"
-"(let-values(((s_482)(cdr s_166)))"
-"(let-values(((s_475)"
-"(if(syntax?$1 s_482)"
-"(syntax-e$1 s_482)"
-" s_482)))"
-"(if(pair? s_475)"
+"(let-values(((s_478)(cdr s_166)))"
+"(let-values(((s_471)"
+"(if(syntax?$1 s_478)"
+"(syntax-e$1 s_478)"
+" s_478)))"
+"(if(pair? s_471)"
 "(let-values(((formals59_0)"
-"(let-values(((s_483)(car s_475)))"
-" s_483))"
+"(let-values(((s_479)(car s_471)))"
+" s_479))"
 "((body60_0)"
-"(let-values(((s_67)(cdr s_475)))"
+"(let-values(((s_67)(cdr s_471)))"
 "(let-values(((s_80)"
 "(if(syntax?$1 s_67)"
 "(syntax-e$1 s_67)"
@@ -63712,23 +63744,23 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_41)))))"
 "(values #t lambda53_1 formals54_1 body55_1))))))"
 "(let-values(((rebuild-s_4)"
-"(let-values(((ctx61_0) ctx_80)((s62_0) s_15)((temp63_5) #t))"
-"(keep-as-needed74.1 #f #f #f #f temp63_5 #t ctx61_0 s62_0))))"
+"(let-values(((ctx61_0) ctx_81)((s62_0) s_15)((temp63_5) #t))"
+"(keep-as-needed85.1 #f #f #f #f temp63_5 #t ctx61_0 s62_0))))"
 "(let-values(((formals_2 body_13)"
-"(lambda-clause-expander s_15 disarmed-s_6 formals54_0 body55_0 ctx_80 'lambda-renames)))"
-"(if(expand-context-to-parsed? ctx_80)"
+"(lambda-clause-expander s_15 disarmed-s_6 formals54_0 body55_0 ctx_81 'lambda-renames)))"
+"(if(expand-context-to-parsed? ctx_81)"
 "(parsed-lambda5.1 rebuild-s_4 formals_2 body_13)"
 "(let-values(((rebuild-s64_0) rebuild-s_4)((temp65_5)(list* lambda53_0 formals_2 body_13)))"
 "(rebuild5.1 #f #f rebuild-s64_0 temp65_5)))))))))))"
 "(void"
 "(add-core-form!*"
 " 'λ"
-"(lambda(s_502)"
+"(lambda(s_498)"
 "(let-values(((ok?_34 lam-id66_0 formals67_0 _68_0)"
-"(let-values(((s_503) s_502))"
-"(let-values(((orig-s_42) s_503))"
+"(let-values(((s_499) s_498))"
+"(let-values(((orig-s_42) s_499))"
 "(let-values(((lam-id66_1 formals67_1 _68_1)"
-"(let-values(((s_309)(if(syntax?$1 s_503)(syntax-e$1 s_503) s_503)))"
+"(let-values(((s_309)(if(syntax?$1 s_499)(syntax-e$1 s_499) s_499)))"
 "(if(pair? s_309)"
 "(let-values(((lam-id69_0)(let-values(((s_48)(car s_309))) s_48))"
 "((formals70_0 _71_1)"
@@ -63737,7 +63769,7 @@ static const char *startup_source =
 "(if(syntax?$1 s_49)(syntax-e$1 s_49) s_49)))"
 "(if(pair? s_32)"
 "(let-values(((formals72_0)"
-"(let-values(((s_504)(car s_32))) s_504))"
+"(let-values(((s_500)(car s_32))) s_500))"
 "((_73_0)"
 "(let-values(((s_310)(cdr s_32)))"
 "(let-values(((s_392)"
@@ -63764,57 +63796,57 @@ static const char *startup_source =
 "(values lam-id69_0 formals70_0 _71_1))"
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_42)))))"
 "(values #t lam-id66_1 formals67_1 _68_1))))))"
-"(let-values(((ids_34)(parse-and-flatten-formals formals67_0 #f s_502)))"
-"(let-values(((ctx_81)(let-values(((temp78_0) #t))(get-current-expand-context17.1 temp78_0 #t #f #f))))"
-"(let-values(((phase_145)(if ctx_81(expand-context-phase ctx_81) 0)))"
+"(let-values(((ids_34)(parse-and-flatten-formals formals67_0 #f s_498)))"
+"(let-values(((ctx_82)(let-values(((temp78_0) #t))(get-current-expand-context17.1 temp78_0 #t #f #f))))"
+"(let-values(((phase_146)(if ctx_82(expand-context-phase ctx_82) 0)))"
 "(begin"
-"               (let-values (((ids74_0) ids_34) ((phase75_0) phase_145) ((s76_2) s_502) ((temp77_4) \"argument name\"))"
+"               (let-values (((ids74_0) ids_34) ((phase75_0) phase_146) ((s76_2) s_498) ((temp77_4) \"argument name\"))"
 "(check-no-duplicate-ids8.1 temp77_4 #t ids74_0 phase75_0 s76_2 #f #f))"
 "(datum->syntax$1"
-" s_502"
+" s_498"
 "(cons"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_145) 'lambda lam-id66_0 lam-id66_0)"
-"(cdr(syntax-e$1 s_502)))"
-" s_502"
-" s_502)))))))))"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_146) 'lambda lam-id66_0 lam-id66_0)"
+"(cdr(syntax-e$1 s_498)))"
+" s_498"
+" s_498)))))))))"
 "(void"
 "(add-core-form!*"
 " 'case-lambda"
-"(lambda(s_505 ctx_82)"
+"(lambda(s_501 ctx_83)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_89)(expand-context-observer ctx_82)))"
-"(if obs_89"
-"(let-values()(let-values()(call-expand-observe obs_89 'prim-case-lambda)))"
+"(let-values(((obs_86)(expand-context-observer ctx_83)))"
+"(if obs_86"
+"(let-values()(let-values()(call-expand-observe obs_86 'prim-case-lambda)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_7)(syntax-disarm$1 s_505)))"
+"(let-values(((disarmed-s_7)(syntax-disarm$1 s_501)))"
 "(let-values(((ok?_35 case-lambda79_0 formals80_0 body81_0)"
-"(let-values(((s_506) disarmed-s_7))"
-"(let-values(((orig-s_43) s_506))"
+"(let-values(((s_502) disarmed-s_7))"
+"(let-values(((orig-s_43) s_502))"
 "(let-values(((case-lambda79_1 formals80_1 body81_1)"
-"(let-values(((s_507)(if(syntax?$1 s_506)(syntax-e$1 s_506) s_506)))"
-"(if(pair? s_507)"
-"(let-values(((case-lambda82_0)(let-values(((s_59)(car s_507))) s_59))"
+"(let-values(((s_503)(if(syntax?$1 s_502)(syntax-e$1 s_502) s_502)))"
+"(if(pair? s_503)"
+"(let-values(((case-lambda82_0)(let-values(((s_59)(car s_503))) s_59))"
 "((formals83_0 body84_0)"
-"(let-values(((s_36)(cdr s_507)))"
-"(let-values(((s_508)"
+"(let-values(((s_36)(cdr s_503)))"
+"(let-values(((s_504)"
 "(if(syntax?$1 s_36)"
 "(syntax-e$1 s_36)"
 " s_36)))"
-"(let-values(((flat-s_28)(to-syntax-list.1 s_508)))"
+"(let-values(((flat-s_28)(to-syntax-list.1 s_504)))"
 "(if(not flat-s_28)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_43))"
 "(let-values()"
 "(let-values(((formals_3 body_14)"
-"(let-values(((lst_338) flat-s_28))"
+"(let-values(((lst_341) flat-s_28))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_338)))"
+"(check-list lst_341)))"
 "((letrec-values(((for-loop_298)"
 "(lambda(formals_4"
 " body_15"
@@ -63826,7 +63858,7 @@ static const char *startup_source =
 "(let-values(((s_61)"
 "(unsafe-car"
 " lst_31))"
-"((rest_194)"
+"((rest_196)"
 "(unsafe-cdr"
 " lst_31)))"
 "(let-values(((formals_5"
@@ -63858,7 +63890,7 @@ static const char *startup_source =
 "(let-values(((s_204)"
 "(cdr"
 " s_64)))"
-"(let-values(((s_400)"
+"(let-values(((s_505)"
 "(if(syntax?$1"
 " s_204)"
 "(syntax-e$1"
@@ -63866,7 +63898,7 @@ static const char *startup_source =
 " s_204)))"
 "(let-values(((flat-s_29)"
 "(to-syntax-list.1"
-" s_400)))"
+" s_505)))"
 "(if(not"
 " flat-s_29)"
 "(let-values()"
@@ -63905,7 +63937,7 @@ static const char *startup_source =
 "(for-loop_298"
 " formals_5"
 " body_16"
-" rest_194)"
+" rest_196)"
 "(values"
 " formals_5"
 " body_16))))"
@@ -63915,7 +63947,7 @@ static const char *startup_source =
 " for-loop_298)"
 " null"
 " null"
-" lst_338)))))"
+" lst_341)))))"
 "(values"
 "(reverse$1 formals_3)"
 "(reverse$1 body_14))))))))))"
@@ -63926,16 +63958,16 @@ static const char *startup_source =
 "(let-values(((s_38) disarmed-s_7))"
 "(let-values(((orig-s_44) s_38))"
 "(let-values(((case-lambda87_1 clause88_1)"
-"(let-values(((s_509)(if(syntax?$1 s_38)(syntax-e$1 s_38) s_38)))"
-"(if(pair? s_509)"
-"(let-values(((case-lambda89_0)(let-values(((s_92)(car s_509))) s_92))"
+"(let-values(((s_506)(if(syntax?$1 s_38)(syntax-e$1 s_38) s_38)))"
+"(if(pair? s_506)"
+"(let-values(((case-lambda89_0)(let-values(((s_92)(car s_506))) s_92))"
 "((clause90_0)"
-"(let-values(((s_510)(cdr s_509)))"
-"(let-values(((s_439)"
-"(if(syntax?$1 s_510)"
-"(syntax-e$1 s_510)"
-" s_510)))"
-"(let-values(((flat-s_30)(to-syntax-list.1 s_439)))"
+"(let-values(((s_507)(cdr s_506)))"
+"(let-values(((s_436)"
+"(if(syntax?$1 s_507)"
+"(syntax-e$1 s_507)"
+" s_507)))"
+"(let-values(((flat-s_30)(to-syntax-list.1 s_436)))"
 "(if(not flat-s_30)"
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_44))"
@@ -63944,34 +63976,34 @@ static const char *startup_source =
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_44)))))"
 "(values #t case-lambda87_1 clause88_1))))))"
 "(let-values(((rebuild-s_5)"
-"(let-values(((ctx93_0) ctx_82)((s94_0) s_505)((temp95_2) #t))"
-"(keep-as-needed74.1 #f #f #f #f temp95_2 #t ctx93_0 s94_0))))"
+"(let-values(((ctx93_1) ctx_83)((s94_0) s_501)((temp95_3) #t))"
+"(keep-as-needed85.1 #f #f #f #f temp95_3 #t ctx93_1 s94_0))))"
 "(let-values(((clauses_1)"
 "(reverse$1"
-"(let-values(((lst_339) formals80_0)((lst_340) body81_0)((lst_205) clause88_0))"
+"(let-values(((lst_342) formals80_0)((lst_343) body81_0)((lst_205) clause88_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_339)))"
+"(let-values()(check-list lst_342)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_340)))"
+"(let-values()(check-list lst_343)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_205)))"
 "((letrec-values(((for-loop_122)"
-"(lambda(fold-var_320 lst_275 lst_155 lst_341)"
+"(lambda(fold-var_320 lst_275 lst_155 lst_344)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_275)"
-"(if(pair? lst_155)(pair? lst_341) #f)"
+"(if(pair? lst_155)(pair? lst_344) #f)"
 " #f)"
 "(let-values(((formals_8)(unsafe-car lst_275))"
-"((rest_195)(unsafe-cdr lst_275))"
+"((rest_197)(unsafe-cdr lst_275))"
 "((body_19)(unsafe-car lst_155))"
 "((rest_79)(unsafe-cdr lst_155))"
-"((clause_3)(unsafe-car lst_341))"
-"((rest_196)(unsafe-cdr lst_341)))"
+"((clause_3)(unsafe-car lst_344))"
+"((rest_198)(unsafe-cdr lst_344)))"
 "(let-values(((fold-var_146)"
 "(let-values(((fold-var_321) fold-var_320))"
 "(let-values(((fold-var_322)"
@@ -63980,23 +64012,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_72)"
+"(let-values(((obs_70)"
 "(expand-context-observer"
-" ctx_82)))"
-"(if obs_72"
+" ctx_83)))"
+"(if obs_70"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_72"
+" obs_70"
 " 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((rebuild-clause_0)"
 "(let-values(((ctx96_1)"
-" ctx_82)"
+" ctx_83)"
 "((clause97_0)"
 " clause_3))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -64008,20 +64040,20 @@ static const char *startup_source =
 "(let-values(((exp-formals_0"
 " exp-body_3)"
 "(lambda-clause-expander"
-" s_505"
+" s_501"
 " disarmed-s_7"
 " formals_8"
 " body_19"
-" ctx_82"
+" ctx_83"
 " 'lambda-renames)))"
 "(if(expand-context-to-parsed?"
-" ctx_82)"
+" ctx_83)"
 "(list"
 " exp-formals_0"
 " exp-body_3)"
 "(let-values(((rebuild-clause98_0)"
 " rebuild-clause_0)"
-"((temp99_3)"
+"((temp99_4)"
 "(list*"
 " exp-formals_0"
 " exp-body_3)))"
@@ -64029,25 +64061,25 @@ static const char *startup_source =
 " #f"
 " #f"
 " rebuild-clause98_0"
-" temp99_3)))))))"
+" temp99_4)))))))"
 " fold-var_321))))"
 "(values fold-var_322)))))"
 "(if(not #f)"
-"(for-loop_122 fold-var_146 rest_195 rest_79 rest_196)"
+"(for-loop_122 fold-var_146 rest_197 rest_79 rest_198)"
 " fold-var_146)))"
 " fold-var_320)))))"
 " for-loop_122)"
 " null"
-" lst_339"
-" lst_340"
+" lst_342"
+" lst_343"
 " lst_205))))))"
-"(if(expand-context-to-parsed? ctx_82)"
+"(if(expand-context-to-parsed? ctx_83)"
 "(parsed-case-lambda6.1 rebuild-s_5 clauses_1)"
 "(let-values(((rebuild-s100_0) rebuild-s_5)((temp101_5)(list* case-lambda79_0 clauses_1)))"
 "(rebuild5.1 #f #f rebuild-s100_0 temp101_5))))))))))))"
 "(define-values"
 "(parse-and-flatten-formals)"
-"(lambda(all-formals_0 sc_36 s_511)"
+"(lambda(all-formals_0 sc_36 s_508)"
 "(begin"
 "((letrec-values(((loop_121)"
 "(lambda(formals_9)"
@@ -64062,21 +64094,21 @@ static const char *startup_source =
 "(let-values()(loop_121 p_87))"
 "(if(null? p_87)"
 "(let-values() null)"
-"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_511 p_87))))))"
+"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_508 p_87))))))"
 "(if(pair? formals_9)"
 "(let-values()"
 "(begin"
 "(if(identifier?(car formals_9))"
 "(void)"
 "(let-values()"
-"                                          (raise-syntax-error$1 #f \"not an identifier\" s_511 (car formals_9))))"
+"                                          (raise-syntax-error$1 #f \"not an identifier\" s_508 (car formals_9))))"
 "(cons"
 "(if sc_36(add-scope(car formals_9) sc_36)(car formals_9))"
 "(loop_121(cdr formals_9)))))"
 "(if(null? formals_9)"
 "(let-values() null)"
 "(let-values()"
-"                                      (raise-syntax-error$1 \"bad argument sequence\" s_511 all-formals_0))))))))))"
+"                                      (raise-syntax-error$1 \"bad argument sequence\" s_508 all-formals_0))))))))))"
 " loop_121)"
 " all-formals_0))))"
 "(define-values"
@@ -64116,12 +64148,12 @@ static const char *startup_source =
 "(let-values(((split-by-reference?_0)(if split-by-reference?9_0 split-by-reference?4_0 #f)))"
 "(let-values(((renames-log-tag_0)(if renames-log-tag10_0 renames-log-tag5_0 'let-renames)))"
 "(let-values()"
-"(lambda(s_326 ctx_83)"
+"(lambda(s_326 ctx_84)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_90)(expand-context-observer ctx_83)))"
-"(if obs_90"
-"(let-values()(let-values()(call-expand-observe obs_90 log-tag_0)))"
+"(let-values(((obs_87)(expand-context-observer ctx_84)))"
+"(if obs_87"
+"(let-values()(let-values()(call-expand-observe obs_87 log-tag_0)))"
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_8)(syntax-disarm$1 s_326)))"
@@ -64132,9 +64164,9 @@ static const char *startup_source =
 " id:val105_0"
 " val-rhs106_0"
 " body107_0)"
-"(let-values(((s_423) disarmed-s_8))"
+"(let-values(((s_420) disarmed-s_8))"
 "(if(if syntaxes?_0 #t #f)"
-"(let-values(((orig-s_45) s_423))"
+"(let-values(((orig-s_45) s_420))"
 "(let-values(((letrec-syntaxes+values102_1"
 " id:trans103_1"
 " trans-rhs104_1"
@@ -64142,37 +64174,37 @@ static const char *startup_source =
 " val-rhs106_1"
 " body107_1)"
 "(let-values(((s_124)"
-"(if(syntax?$1 s_423)"
-"(syntax-e$1 s_423)"
-" s_423)))"
+"(if(syntax?$1 s_420)"
+"(syntax-e$1 s_420)"
+" s_420)))"
 "(if(pair? s_124)"
 "(let-values(((letrec-syntaxes+values108_0)"
-"(let-values(((s_512)(car s_124))) s_512))"
+"(let-values(((s_509)(car s_124))) s_509))"
 "((id:trans109_0"
 " trans-rhs110_0"
 " id:val111_0"
 " val-rhs112_0"
 " body113_0)"
 "(let-values(((s_126)(cdr s_124)))"
-"(let-values(((s_513)"
+"(let-values(((s_510)"
 "(if(syntax?$1 s_126)"
 "(syntax-e$1 s_126)"
 " s_126)))"
-"(if(pair? s_513)"
+"(if(pair? s_510)"
 "(let-values(((id:trans114_0"
 " trans-rhs115_0)"
-"(let-values(((s_514)"
+"(let-values(((s_511)"
 "(car"
-" s_513)))"
-"(let-values(((s_515)"
+" s_510)))"
+"(let-values(((s_512)"
 "(if(syntax?$1"
-" s_514)"
+" s_511)"
 "(syntax-e$1"
-" s_514)"
-" s_514)))"
+" s_511)"
+" s_511)))"
 "(let-values(((flat-s_31)"
 "(to-syntax-list.1"
-" s_515)))"
+" s_512)))"
 "(if(not"
 " flat-s_31)"
 "(let-values()"
@@ -64183,7 +64215,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans_0"
 " trans-rhs_0)"
-"(let-values(((lst_342)"
+"(let-values(((lst_345)"
 " flat-s_31))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64191,7 +64223,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_342)))"
+" lst_345)))"
 "((letrec-values(((for-loop_299)"
 "(lambda(id:trans_1"
 " trans-rhs_1"
@@ -64203,7 +64235,7 @@ static const char *startup_source =
 "(let-values(((s_230)"
 "(unsafe-car"
 " lst_2))"
-"((rest_197)"
+"((rest_199)"
 "(unsafe-cdr"
 " lst_2)))"
 "(let-values(((id:trans_2"
@@ -64218,18 +64250,18 @@ static const char *startup_source =
 "(let-values(((id:trans145_0"
 " trans-rhs146_0)"
 "(let-values()"
-"(let-values(((s_516)"
+"(let-values(((s_513)"
 "(if(syntax?$1"
 " s_230)"
 "(syntax-e$1"
 " s_230)"
 " s_230)))"
 "(if(pair?"
-" s_516)"
+" s_513)"
 "(let-values(((id:trans119_0)"
 "(let-values(((s_337)"
 "(car"
-" s_516)))"
+" s_513)))"
 "(let-values(((s_338)"
 "(if(syntax?$1"
 " s_337)"
@@ -64248,7 +64280,7 @@ static const char *startup_source =
 " orig-s_45))"
 "(let-values()"
 "(let-values(((id:trans_5)"
-"(let-values(((lst_343)"
+"(let-values(((lst_346)"
 " flat-s_32))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64256,7 +64288,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_343)))"
+" lst_346)))"
 "((letrec-values(((for-loop_300)"
 "(lambda(id:trans_6"
 " lst_213)"
@@ -64264,10 +64296,10 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_213)"
-"(let-values(((s_517)"
+"(let-values(((s_514)"
 "(unsafe-car"
 " lst_213))"
-"((rest_198)"
+"((rest_200)"
 "(unsafe-cdr"
 " lst_213)))"
 "(let-values(((id:trans_7)"
@@ -64277,23 +64309,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans147_0)"
 "(let-values()"
-"(if(let-values(((or-part_383)"
+"(if(let-values(((or-part_384)"
 "(if(syntax?$1"
-" s_517)"
+" s_514)"
 "(symbol?"
 "(syntax-e$1"
-" s_517))"
+" s_514))"
 " #f)))"
-"(if or-part_383"
-" or-part_383"
+"(if or-part_384"
+" or-part_384"
 "(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:trans147_0"
 " id:trans_8)))))"
@@ -64303,35 +64335,35 @@ static const char *startup_source =
 " #f)"
 "(for-loop_300"
 " id:trans_7"
-" rest_198)"
+" rest_200)"
 " id:trans_7)))"
 " id:trans_6)))))"
 " for-loop_300)"
 " null"
-" lst_343)))))"
+" lst_346)))))"
 "(reverse$1"
 " id:trans_5))))))))"
 "((trans-rhs120_0)"
-"(let-values(((s_518)"
+"(let-values(((s_515)"
 "(cdr"
-" s_516)))"
-"(let-values(((s_519)"
+" s_513)))"
+"(let-values(((s_516)"
 "(if(syntax?$1"
-" s_518)"
+" s_515)"
 "(syntax-e$1"
-" s_518)"
-" s_518)))"
+" s_515)"
+" s_515)))"
 "(if(pair?"
-" s_519)"
+" s_516)"
 "(let-values(((trans-rhs121_0)"
 "(let-values(((s_236)"
 "(car"
-" s_519)))"
+" s_516)))"
 " s_236))"
 "(()"
 "(let-values(((s_237)"
 "(cdr"
-" s_519)))"
+" s_516)))"
 "(let-values(((s_238)"
 "(if(syntax?$1"
 " s_237)"
@@ -64373,7 +64405,7 @@ static const char *startup_source =
 "(for-loop_299"
 " id:trans_2"
 " trans-rhs_2"
-" rest_197)"
+" rest_199)"
 "(values"
 " id:trans_2"
 " trans-rhs_2))))"
@@ -64383,7 +64415,7 @@ static const char *startup_source =
 " for-loop_299)"
 " null"
 " null"
-" lst_342)))))"
+" lst_345)))))"
 "(values"
 "(reverse$1"
 " id:trans_0)"
@@ -64394,7 +64426,7 @@ static const char *startup_source =
 " body118_0)"
 "(let-values(((s_345)"
 "(cdr"
-" s_513)))"
+" s_510)))"
 "(let-values(((s_346)"
 "(if(syntax?$1"
 " s_345)"
@@ -64404,15 +64436,15 @@ static const char *startup_source =
 "(if(pair? s_346)"
 "(let-values(((id:val122_0"
 " val-rhs123_0)"
-"(let-values(((s_520)"
+"(let-values(((s_517)"
 "(car"
 " s_346)))"
 "(let-values(((s_347)"
 "(if(syntax?$1"
-" s_520)"
+" s_517)"
 "(syntax-e$1"
-" s_520)"
-" s_520)))"
+" s_517)"
+" s_517)))"
 "(let-values(((flat-s_33)"
 "(to-syntax-list.1"
 " s_347)))"
@@ -64438,17 +64470,17 @@ static const char *startup_source =
 "((letrec-values(((for-loop_301)"
 "(lambda(id:val_1"
 " val-rhs_2"
-" lst_344)"
+" lst_347)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_344)"
+" lst_347)"
 "(let-values(((s_352)"
 "(unsafe-car"
-" lst_344))"
-"((rest_199)"
+" lst_347))"
+"((rest_201)"
 "(unsafe-cdr"
-" lst_344)))"
+" lst_347)))"
 "(let-values(((id:val_2"
 " val-rhs_3)"
 "(let-values(((id:val_3)"
@@ -64461,18 +64493,18 @@ static const char *startup_source =
 "(let-values(((id:val148_0"
 " val-rhs149_0)"
 "(let-values()"
-"(let-values(((s_521)"
+"(let-values(((s_518)"
 "(if(syntax?$1"
 " s_352)"
 "(syntax-e$1"
 " s_352)"
 " s_352)))"
 "(if(pair?"
-" s_521)"
+" s_518)"
 "(let-values(((id:val125_0)"
 "(let-values(((s_357)"
 "(car"
-" s_521)))"
+" s_518)))"
 "(let-values(((s_358)"
 "(if(syntax?$1"
 " s_357)"
@@ -64491,7 +64523,7 @@ static const char *startup_source =
 " orig-s_45))"
 "(let-values()"
 "(let-values(((id:val_5)"
-"(let-values(((lst_345)"
+"(let-values(((lst_348)"
 " flat-s_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64499,20 +64531,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_345)))"
+" lst_348)))"
 "((letrec-values(((for-loop_302)"
 "(lambda(id:val_6"
-" lst_346)"
+" lst_349)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_346)"
-"(let-values(((s_522)"
+" lst_349)"
+"(let-values(((s_519)"
 "(unsafe-car"
-" lst_346))"
-"((rest_200)"
+" lst_349))"
+"((rest_202)"
 "(unsafe-cdr"
-" lst_346)))"
+" lst_349)))"
 "(let-values(((id:val_7)"
 "(let-values(((id:val_8)"
 " id:val_6))"
@@ -64520,23 +64552,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val150_0)"
 "(let-values()"
-"(if(let-values(((or-part_384)"
+"(if(let-values(((or-part_385)"
 "(if(syntax?$1"
-" s_522)"
+" s_519)"
 "(symbol?"
 "(syntax-e$1"
-" s_522))"
+" s_519))"
 " #f)))"
-"(if or-part_384"
-" or-part_384"
+"(if or-part_385"
+" or-part_385"
 "(symbol?"
-" s_522)))"
-" s_522"
+" s_519)))"
+" s_519"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                     \"not an identifier\""
 " orig-s_45"
-" s_522)))))"
+" s_519)))))"
 "(cons"
 " id:val150_0"
 " id:val_8)))))"
@@ -64546,43 +64578,43 @@ static const char *startup_source =
 " #f)"
 "(for-loop_302"
 " id:val_7"
-" rest_200)"
+" rest_202)"
 " id:val_7)))"
 " id:val_6)))))"
 " for-loop_302)"
 " null"
-" lst_345)))))"
+" lst_348)))))"
 "(reverse$1"
 " id:val_5))))))))"
 "((val-rhs126_0)"
-"(let-values(((s_523)"
+"(let-values(((s_520)"
 "(cdr"
-" s_521)))"
+" s_518)))"
 "(let-values(((s_244)"
 "(if(syntax?$1"
-" s_523)"
+" s_520)"
 "(syntax-e$1"
-" s_523)"
-" s_523)))"
+" s_520)"
+" s_520)))"
 "(if(pair?"
 " s_244)"
 "(let-values(((val-rhs127_0)"
-"(let-values(((s_524)"
+"(let-values(((s_521)"
 "(car"
 " s_244)))"
-" s_524))"
+" s_521))"
 "(()"
-"(let-values(((s_525)"
+"(let-values(((s_522)"
 "(cdr"
 " s_244)))"
-"(let-values(((s_526)"
+"(let-values(((s_523)"
 "(if(syntax?$1"
-" s_525)"
+" s_522)"
 "(syntax-e$1"
-" s_525)"
-" s_525)))"
+" s_522)"
+" s_522)))"
 "(if(null?"
-" s_526)"
+" s_523)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64616,7 +64648,7 @@ static const char *startup_source =
 "(for-loop_301"
 " id:val_2"
 " val-rhs_3"
-" rest_199)"
+" rest_201)"
 "(values"
 " id:val_2"
 " val-rhs_3))))"
@@ -64697,30 +64729,30 @@ 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_527) disarmed-s_8))"
+"(let-values(((s_524) disarmed-s_8))"
 "(if(if(not syntaxes?_0) #t #f)"
-"(let-values(((orig-s_46) s_527))"
+"(let-values(((orig-s_46) s_524))"
 "(let-values(((let-values128_1 id:val129_1 val-rhs130_1 body131_1)"
 "(let-values(((s_250)"
-"(if(syntax?$1 s_527)"
-"(syntax-e$1 s_527)"
-" s_527)))"
+"(if(syntax?$1 s_524)"
+"(syntax-e$1 s_524)"
+" s_524)))"
 "(if(pair? s_250)"
 "(let-values(((let-values132_0)"
 "(let-values(((s_253)(car s_250)))"
 " s_253))"
 "((id:val133_0 val-rhs134_0 body135_0)"
-"(let-values(((s_528)(cdr s_250)))"
-"(let-values(((s_451)"
-"(if(syntax?$1 s_528)"
-"(syntax-e$1 s_528)"
-" s_528)))"
-"(if(pair? s_451)"
+"(let-values(((s_525)(cdr s_250)))"
+"(let-values(((s_448)"
+"(if(syntax?$1 s_525)"
+"(syntax-e$1 s_525)"
+" s_525)))"
+"(if(pair? s_448)"
 "(let-values(((id:val136_0"
 " val-rhs137_0)"
 "(let-values(((s_363)"
 "(car"
-" s_451)))"
+" s_448)))"
 "(let-values(((s_254)"
 "(if(syntax?$1"
 " s_363)"
@@ -64740,7 +64772,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val_10"
 " val-rhs_6)"
-"(let-values(((lst_347)"
+"(let-values(((lst_350)"
 " flat-s_36))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64748,21 +64780,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_347)))"
+" lst_350)))"
 "((letrec-values(((for-loop_303)"
 "(lambda(id:val_11"
 " val-rhs_7"
-" lst_348)"
+" lst_351)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_348)"
+" lst_351)"
 "(let-values(((s_372)"
 "(unsafe-car"
-" lst_348))"
-"((rest_201)"
+" lst_351))"
+"((rest_203)"
 "(unsafe-cdr"
-" lst_348)))"
+" lst_351)))"
 "(let-values(((id:val_12"
 " val-rhs_8)"
 "(let-values(((id:val_13)"
@@ -64775,18 +64807,18 @@ static const char *startup_source =
 "(let-values(((id:val151_0"
 " val-rhs152_0)"
 "(let-values()"
-"(let-values(((s_529)"
+"(let-values(((s_526)"
 "(if(syntax?$1"
 " s_372)"
 "(syntax-e$1"
 " s_372)"
 " s_372)))"
 "(if(pair?"
-" s_529)"
+" s_526)"
 "(let-values(((id:val139_0)"
 "(let-values(((s_376)"
 "(car"
-" s_529)))"
+" s_526)))"
 "(let-values(((s_377)"
 "(if(syntax?$1"
 " s_376)"
@@ -64805,7 +64837,7 @@ static const char *startup_source =
 " orig-s_46))"
 "(let-values()"
 "(let-values(((id:val_15)"
-"(let-values(((lst_349)"
+"(let-values(((lst_352)"
 " flat-s_37))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64813,20 +64845,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_349)))"
+" lst_352)))"
 "((letrec-values(((for-loop_304)"
 "(lambda(id:val_16"
-" lst_350)"
+" lst_353)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_350)"
+" lst_353)"
 "(let-values(((s_381)"
 "(unsafe-car"
-" lst_350))"
-"((rest_202)"
+" lst_353))"
+"((rest_204)"
 "(unsafe-cdr"
-" lst_350)))"
+" lst_353)))"
 "(let-values(((id:val_17)"
 "(let-values(((id:val_18)"
 " id:val_16))"
@@ -64860,18 +64892,18 @@ static const char *startup_source =
 " #f)"
 "(for-loop_304"
 " id:val_17"
-" rest_202)"
+" rest_204)"
 " id:val_17)))"
 " id:val_16)))))"
 " for-loop_304)"
 " null"
-" lst_349)))))"
+" lst_352)))))"
 "(reverse$1"
 " id:val_15))))))))"
 "((val-rhs140_0)"
 "(let-values(((s_384)"
 "(cdr"
-" s_529)))"
+" s_526)))"
 "(let-values(((s_257)"
 "(if(syntax?$1"
 " s_384)"
@@ -64886,17 +64918,17 @@ static const char *startup_source =
 " s_257)))"
 " s_259))"
 "(()"
-"(let-values(((s_530)"
+"(let-values(((s_527)"
 "(cdr"
 " s_257)))"
-"(let-values(((s_531)"
+"(let-values(((s_528)"
 "(if(syntax?$1"
-" s_530)"
+" s_527)"
 "(syntax-e$1"
-" s_530)"
-" s_530)))"
+" s_527)"
+" s_527)))"
 "(if(null?"
-" s_531)"
+" s_528)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64930,7 +64962,7 @@ static const char *startup_source =
 "(for-loop_303"
 " id:val_12"
 " val-rhs_8"
-" rest_201)"
+" rest_203)"
 "(values"
 " id:val_12"
 " val-rhs_8))))"
@@ -64940,22 +64972,22 @@ static const char *startup_source =
 " for-loop_303)"
 " null"
 " null"
-" lst_347)))))"
+" lst_350)))))"
 "(values"
 "(reverse$1"
 " id:val_10)"
 "(reverse$1"
 " val-rhs_6)))))))))"
 "((body138_0)"
-"(let-values(((s_532)"
+"(let-values(((s_529)"
 "(cdr"
-" s_451)))"
+" s_448)))"
 "(let-values(((s_260)"
 "(if(syntax?$1"
-" s_532)"
+" s_529)"
 "(syntax-e$1"
-" s_532)"
-" s_532)))"
+" s_529)"
+" s_529)))"
 "(let-values(((flat-s_38)"
 "(to-syntax-list.1"
 " s_260)))"
@@ -64992,24 +65024,24 @@ static const char *startup_source =
 "(values #t let-values128_1 id:val129_1 val-rhs130_1 body131_1)))"
 "(values #f #f #f #f #f)))))"
 "(let-values(((sc_37)(new-scope 'local)))"
-"(let-values(((phase_146)(expand-context-phase ctx_83)))"
+"(let-values(((phase_147)(expand-context-phase ctx_84)))"
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
-"(let-values(((lst_351)(if syntaxes?_0 id:trans103_0 null)))"
+"(let-values(((lst_354)(if syntaxes?_0 id:trans103_0 null)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_351)))"
+"(let-values()(check-list lst_354)))"
 "((letrec-values(((for-loop_305)"
-"(lambda(fold-var_323 lst_352)"
+"(lambda(fold-var_323 lst_355)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_352)"
+"(if(pair? lst_355)"
 "(let-values(((ids_35)"
-"(unsafe-car lst_352))"
-"((rest_203)"
-"(unsafe-cdr lst_352)))"
+"(unsafe-car lst_355))"
+"((rest_205)"
+"(unsafe-cdr lst_355)))"
 "(let-values(((fold-var_324)"
 "(let-values(((fold-var_325)"
 " fold-var_323))"
@@ -65018,7 +65050,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_353)"
+"(let-values(((lst_356)"
 " ids_35))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65026,88 +65058,9 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_353)))"
+" lst_356)))"
 "((letrec-values(((for-loop_306)"
 "(lambda(fold-var_327"
-" lst_354)"
-"(begin"
-" 'for-loop"
-"(if(pair?"
-" lst_354)"
-"(let-values(((id_121)"
-"(unsafe-car"
-" lst_354))"
-"((rest_204)"
-"(unsafe-cdr"
-" lst_354)))"
-"(let-values(((fold-var_328)"
-"(let-values(((fold-var_329)"
-" fold-var_327))"
-"(let-values(((fold-var_330)"
-"(let-values()"
-"(cons"
-"(let-values()"
-"(add-scope"
-" id_121"
-" sc_37))"
-" fold-var_329))))"
-"(values"
-" fold-var_330)))))"
-"(if(not"
-" #f)"
-"(for-loop_306"
-" fold-var_328"
-" rest_204)"
-" fold-var_328)))"
-" fold-var_327)))))"
-" for-loop_306)"
-" null"
-" lst_353)))))"
-" fold-var_325))))"
-"(values"
-" fold-var_326)))))"
-"(if(not #f)"
-"(for-loop_305 fold-var_324 rest_203)"
-" fold-var_324)))"
-" fold-var_323)))))"
-" for-loop_305)"
-" null"
-" lst_351))))))"
-"(let-values(((val-idss_3)"
-"(reverse$1"
-"(let-values(((lst_355)(if syntaxes?_0 id:val105_0 id:val129_0)))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_355)))"
-"((letrec-values(((for-loop_307)"
-"(lambda(fold-var_331 lst_121)"
-"(begin"
-" 'for-loop"
-"(if(pair? lst_121)"
-"(let-values(((ids_36)"
-"(unsafe-car lst_121))"
-"((rest_205)"
-"(unsafe-cdr lst_121)))"
-"(let-values(((fold-var_332)"
-"(let-values(((fold-var_333)"
-" fold-var_331))"
-"(let-values(((fold-var_334)"
-"(let-values()"
-"(cons"
-"(let-values()"
-"(reverse$1"
-"(let-values(((lst_356)"
-" ids_36))"
-"(begin"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_356)))"
-"((letrec-values(((for-loop_308)"
-"(lambda(fold-var_335"
 " lst_357)"
 "(begin"
 " 'for-loop"
@@ -65119,6 +65072,85 @@ static const char *startup_source =
 "((rest_206)"
 "(unsafe-cdr"
 " lst_357)))"
+"(let-values(((fold-var_328)"
+"(let-values(((fold-var_329)"
+" fold-var_327))"
+"(let-values(((fold-var_330)"
+"(let-values()"
+"(cons"
+"(let-values()"
+"(add-scope"
+" id_122"
+" sc_37))"
+" fold-var_329))))"
+"(values"
+" fold-var_330)))))"
+"(if(not"
+" #f)"
+"(for-loop_306"
+" fold-var_328"
+" rest_206)"
+" fold-var_328)))"
+" fold-var_327)))))"
+" for-loop_306)"
+" null"
+" lst_356)))))"
+" fold-var_325))))"
+"(values"
+" fold-var_326)))))"
+"(if(not #f)"
+"(for-loop_305 fold-var_324 rest_205)"
+" fold-var_324)))"
+" fold-var_323)))))"
+" for-loop_305)"
+" null"
+" lst_354))))))"
+"(let-values(((val-idss_3)"
+"(reverse$1"
+"(let-values(((lst_358)(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_121)"
+"(begin"
+" 'for-loop"
+"(if(pair? lst_121)"
+"(let-values(((ids_36)"
+"(unsafe-car lst_121))"
+"((rest_207)"
+"(unsafe-cdr lst_121)))"
+"(let-values(((fold-var_332)"
+"(let-values(((fold-var_333)"
+" fold-var_331))"
+"(let-values(((fold-var_334)"
+"(let-values()"
+"(cons"
+"(let-values()"
+"(reverse$1"
+"(let-values(((lst_359)"
+" ids_36))"
+"(begin"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
+" lst_359)))"
+"((letrec-values(((for-loop_308)"
+"(lambda(fold-var_335"
+" lst_360)"
+"(begin"
+" 'for-loop"
+"(if(pair?"
+" lst_360)"
+"(let-values(((id_123)"
+"(unsafe-car"
+" lst_360))"
+"((rest_208)"
+"(unsafe-cdr"
+" lst_360)))"
 "(let-values(((fold-var_108)"
 "(let-values(((fold-var_109)"
 " fold-var_335))"
@@ -65127,7 +65159,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_122"
+" id_123"
 " sc_37))"
 " fold-var_109))))"
 "(values"
@@ -65136,42 +65168,42 @@ static const char *startup_source =
 " #f)"
 "(for-loop_308"
 " fold-var_108"
-" rest_206)"
+" rest_208)"
 " fold-var_108)))"
 " fold-var_335)))))"
 " for-loop_308)"
 " null"
-" lst_356)))))"
+" lst_359)))))"
 " fold-var_333))))"
 "(values"
 " fold-var_334)))))"
 "(if(not #f)"
 "(for-loop_307"
 " fold-var_332"
-" rest_205)"
+" rest_207)"
 " fold-var_332)))"
 " fold-var_331)))))"
 " for-loop_307)"
 " null"
-" lst_355))))))"
+" lst_358))))))"
 "(let-values(((val-rhss_3)"
 "(if rec?_1"
 "(reverse$1"
-"(let-values(((lst_358)"
+"(let-values(((lst_361)"
 "(if syntaxes?_0 val-rhs106_0 val-rhs130_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_358)))"
+"(let-values()(check-list lst_361)))"
 "((letrec-values(((for-loop_274)"
-"(lambda(fold-var_337 lst_359)"
+"(lambda(fold-var_337 lst_362)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_359)"
+"(if(pair? lst_362)"
 "(let-values(((rhs_20)"
-"(unsafe-car lst_359))"
-"((rest_207)"
-"(unsafe-cdr lst_359)))"
+"(unsafe-car lst_362))"
+"((rest_209)"
+"(unsafe-cdr lst_362)))"
 "(let-values(((fold-var_338)"
 "(let-values(((fold-var_339)"
 " fold-var_337))"
@@ -65188,17 +65220,17 @@ static const char *startup_source =
 "(if(not #f)"
 "(for-loop_274"
 " fold-var_338"
-" rest_207)"
+" rest_209)"
 " fold-var_338)))"
 " fold-var_337)))))"
 " for-loop_274)"
 " null"
-" lst_358))))"
+" lst_361))))"
 "(if syntaxes?_0 val-rhs106_0 val-rhs130_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((temp142_3)(list trans-idss_2 val-idss_3))"
-"((phase143_0) phase_146)"
+"((phase143_0) phase_147)"
 "((s144_0) s_326))"
 "(check-no-duplicate-ids8.1"
 " #f"
@@ -65209,26 +65241,26 @@ static const char *startup_source =
 " #f"
 " #f))"
 "(values))))"
-"(let-values(((counter_8)(root-expand-context-counter ctx_83)))"
+"(let-values(((counter_8)(root-expand-context-counter ctx_84)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
-"(let-values(((lst_360) trans-idss_2))"
+"(let-values(((lst_363) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_360)))"
+"(let-values()(check-list lst_363)))"
 "((letrec-values(((for-loop_309)"
-"(lambda(fold-var_341 lst_361)"
+"(lambda(fold-var_341 lst_364)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_361)"
+"(if(pair? lst_364)"
 "(let-values(((ids_37)"
 "(unsafe-car"
-" lst_361))"
-"((rest_208)"
+" lst_364))"
+"((rest_210)"
 "(unsafe-cdr"
-" lst_361)))"
+" lst_364)))"
 "(let-values(((fold-var_342)"
 "(let-values(((fold-var_343)"
 " fold-var_341))"
@@ -65237,7 +65269,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_362)"
+"(let-values(((lst_365)"
 " ids_37))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65245,20 +65277,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_362)))"
+" lst_365)))"
 "((letrec-values(((for-loop_310)"
 "(lambda(fold-var_345"
-" lst_363)"
+" lst_366)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_363)"
+" lst_366)"
 "(let-values(((id_26)"
 "(unsafe-car"
-" lst_363))"
-"((rest_209)"
+" lst_366))"
+"((rest_211)"
 "(unsafe-cdr"
-" lst_363)))"
+" lst_366)))"
 "(let-values(((fold-var_346)"
 "(let-values(((fold-var_347)"
 " fold-var_345))"
@@ -65269,7 +65301,7 @@ static const char *startup_source =
 "(let-values(((id154_1)"
 " id_26)"
 "((phase155_0)"
-" phase_146)"
+" phase_147)"
 "((counter156_0)"
 " counter_8)"
 "((frame-id157_0)"
@@ -65291,32 +65323,32 @@ static const char *startup_source =
 " #f)"
 "(for-loop_310"
 " fold-var_346"
-" rest_209)"
+" rest_211)"
 " fold-var_346)))"
 " fold-var_345)))))"
 " for-loop_310)"
 " null"
-" lst_362)))))"
+" lst_365)))))"
 " fold-var_343))))"
 "(values"
 " fold-var_344)))))"
 "(if(not #f)"
 "(for-loop_309"
 " fold-var_342"
-" rest_208)"
+" rest_210)"
 " fold-var_342)))"
 " fold-var_341)))))"
 " for-loop_309)"
 " null"
-" lst_360))))))"
+" lst_363))))))"
 "(let-values(((val-keyss_2)"
 "(reverse$1"
-"(let-values(((lst_364) val-idss_3))"
+"(let-values(((lst_367) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_364)))"
+"(let-values()(check-list lst_367)))"
 "((letrec-values(((for-loop_311)"
 "(lambda(fold-var_349 lst_244)"
 "(begin"
@@ -65325,7 +65357,7 @@ static const char *startup_source =
 "(let-values(((ids_38)"
 "(unsafe-car"
 " lst_244))"
-"((rest_210)"
+"((rest_212)"
 "(unsafe-cdr"
 " lst_244)))"
 "(let-values(((fold-var_350)"
@@ -65336,7 +65368,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_365)"
+"(let-values(((lst_368)"
 " ids_38))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65344,20 +65376,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_365)))"
+" lst_368)))"
 "((letrec-values(((for-loop_312)"
 "(lambda(fold-var_353"
-" lst_366)"
+" lst_369)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_366)"
-"(let-values(((id_123)"
+" lst_369)"
+"(let-values(((id_124)"
 "(unsafe-car"
-" lst_366))"
-"((rest_211)"
+" lst_369))"
+"((rest_213)"
 "(unsafe-cdr"
-" lst_366)))"
+" lst_369)))"
 "(let-values(((fold-var_354)"
 "(let-values(((fold-var_355)"
 " fold-var_353))"
@@ -65366,9 +65398,9 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id159_0)"
-" id_123)"
+" id_124)"
 "((phase160_1)"
-" phase_146)"
+" phase_147)"
 "((counter161_0)"
 " counter_8)"
 "((frame-id162_0)"
@@ -65390,24 +65422,24 @@ static const char *startup_source =
 " #f)"
 "(for-loop_312"
 " fold-var_354"
-" rest_211)"
+" rest_213)"
 " fold-var_354)))"
 " fold-var_353)))))"
 " for-loop_312)"
 " null"
-" lst_365)))))"
+" lst_368)))))"
 " fold-var_351))))"
 "(values"
 " fold-var_352)))))"
 "(if(not #f)"
 "(for-loop_311"
 " fold-var_350"
-" rest_210)"
+" rest_212)"
 " fold-var_350)))"
 " fold-var_349)))))"
 " for-loop_311)"
 " null"
-" lst_364))))))"
+" lst_367))))))"
 "(let-values(((bodys_10)"
 "(reverse$1"
 "(let-values(((lst_145)"
@@ -65452,12 +65484,12 @@ static const char *startup_source =
 " lst_145))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_91)"
-"(expand-context-observer ctx_83)))"
-"(if obs_91"
+"(let-values(((obs_88)"
+"(expand-context-observer ctx_84)))"
+"(if obs_88"
 "(let-values()"
 "(log-let-renames"
-" obs_91"
+" obs_88"
 " renames-log-tag_0"
 " val-idss_3"
 " val-rhss_3"
@@ -65472,54 +65504,54 @@ static const char *startup_source =
 "(if syntaxes?_0"
 "(let-values()"
 "(begin"
-"(let-values(((obs_92)"
+"(let-values(((obs_89)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_92"
+" ctx_84)))"
+"(if obs_89"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_92"
+" obs_89"
 " 'prepare-env)))"
 "(void)))"
-"(prepare-next-phase-namespace ctx_83)))"
+"(prepare-next-phase-namespace ctx_84)))"
 "(void))"
 "(values))))"
 "(let-values(((trans-valss_0)"
 "(reverse$1"
-"(let-values(((lst_367)"
+"(let-values(((lst_370)"
 "(if syntaxes?_0 trans-rhs104_0 '()))"
-"((lst_368) trans-idss_2))"
+"((lst_371) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_367)))"
+"(let-values()(check-list lst_370)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_368)))"
+"(let-values()(check-list lst_371)))"
 "((letrec-values(((for-loop_313)"
 "(lambda(fold-var_359"
-" lst_369"
-" lst_370)"
+" lst_372"
+" lst_373)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_369)"
-"(pair? lst_370)"
+"(if(if(pair? lst_372)"
+"(pair? lst_373)"
 " #f)"
 "(let-values(((rhs_21)"
 "(unsafe-car"
-" lst_369))"
-"((rest_212)"
+" lst_372))"
+"((rest_214)"
 "(unsafe-cdr"
-" lst_369))"
+" lst_372))"
 "((ids_39)"
 "(unsafe-car"
-" lst_370))"
-"((rest_213)"
+" lst_373))"
+"((rest_215)"
 "(unsafe-cdr"
-" lst_370)))"
+" lst_373)))"
 "(let-values(((fold-var_360)"
 "(let-values(((fold-var_361)"
 " fold-var_359))"
@@ -65529,18 +65561,18 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_93)"
+"(let-values(((obs_90)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_93"
+" ctx_84)))"
+"(if obs_90"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_93"
+" obs_90"
 " 'next)"
 "(call-expand-observe"
-" obs_93"
+" obs_90"
 " 'enter-bind))))"
 "(void)))"
 "(values))))"
@@ -65550,16 +65582,16 @@ static const char *startup_source =
 " rhs_21"
 " sc_37)"
 " ids_39"
-" ctx_83)))"
+" ctx_84)))"
 "(begin"
-"(let-values(((obs_94)"
+"(let-values(((obs_91)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_94"
+" ctx_84)))"
+"(if obs_91"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_94"
+" obs_91"
 " 'exit-bind)))"
 "(void)))"
 " trans-val_1))))"
@@ -65569,53 +65601,53 @@ static const char *startup_source =
 "(if(not #f)"
 "(for-loop_313"
 " fold-var_360"
-" rest_212"
-" rest_213)"
+" rest_214"
+" rest_215)"
 " fold-var_360)))"
 " fold-var_359)))))"
 " for-loop_313)"
 " null"
-" lst_367"
-" lst_368))))))"
+" lst_370"
+" lst_371))))))"
 "(let-values(((rec-val-env_0)"
-"(let-values(((lst_371) val-keyss_2)"
-"((lst_372) val-idss_3))"
+"(let-values(((lst_374) val-keyss_2)"
+"((lst_375) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_371)))"
+"(let-values()(check-list lst_374)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_372)))"
+"(let-values()(check-list lst_375)))"
 "((letrec-values(((for-loop_314)"
 "(lambda(env_29"
-" lst_373"
-" lst_374)"
+" lst_376"
+" lst_377)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_373)"
-"(pair? lst_374)"
+"(if(if(pair? lst_376)"
+"(pair? lst_377)"
 " #f)"
 "(let-values(((keys_10)"
 "(unsafe-car"
-" lst_373))"
-"((rest_214)"
+" lst_376))"
+"((rest_216)"
 "(unsafe-cdr"
-" lst_373))"
+" lst_376))"
 "((ids_40)"
 "(unsafe-car"
-" lst_374))"
-"((rest_215)"
+" lst_377))"
+"((rest_217)"
 "(unsafe-cdr"
-" lst_374)))"
+" lst_377)))"
 "(let-values(((env_30)"
 "(let-values(((env_31)"
 " env_29))"
-"(let-values(((lst_375)"
+"(let-values(((lst_286)"
 " keys_10)"
-"((lst_376)"
+"((lst_378)"
 " ids_40))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65623,80 +65655,80 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_375)))"
+" lst_286)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_376)))"
+" lst_378)))"
 "((letrec-values(((for-loop_315)"
 "(lambda(env_32"
-" lst_377"
-" lst_378)"
+" lst_288"
+" lst_379)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_377)"
+" lst_288)"
 "(pair?"
-" lst_378)"
+" lst_379)"
 " #f)"
 "(let-values(((key_97)"
 "(unsafe-car"
-" lst_377))"
-"((rest_216)"
+" lst_288))"
+"((rest_218)"
 "(unsafe-cdr"
-" lst_377))"
-"((id_124)"
+" lst_288))"
+"((id_125)"
 "(unsafe-car"
-" lst_378))"
-"((rest_217)"
+" lst_379))"
+"((rest_219)"
 "(unsafe-cdr"
-" lst_378)))"
-"(let-values(((env_33)"
-"(let-values(((env_34)"
+" lst_379)))"
+"(let-values(((env_5)"
+"(let-values(((env_6)"
 " env_32))"
-"(let-values(((env_35)"
+"(let-values(((env_33)"
 "(let-values()"
 "(env-extend"
-" env_34"
+" env_6"
 " key_97"
 "(local-variable1.1"
-" id_124)))))"
+" id_125)))))"
 "(values"
-" env_35)))))"
+" env_33)))))"
 "(if(not"
 " #f)"
 "(for-loop_315"
-" env_33"
-" rest_216"
-" rest_217)"
-" env_33)))"
+" env_5"
+" rest_218"
+" rest_219)"
+" env_5)))"
 " env_32)))))"
 " for-loop_315)"
 " env_31"
-" lst_375"
-" lst_376))))))"
+" lst_286"
+" lst_378))))))"
 "(if(not #f)"
 "(for-loop_314"
 " env_30"
-" rest_214"
-" rest_215)"
+" rest_216"
+" rest_217)"
 " env_30)))"
 " env_29)))))"
 " for-loop_314)"
-"(expand-context-env ctx_83)"
-" lst_371"
-" lst_372)))))"
+"(expand-context-env ctx_84)"
+" lst_374"
+" lst_375)))))"
 "(let-values(((rec-env_0)"
-"(let-values(((lst_379) trans-keyss_0)"
+"(let-values(((lst_380) trans-keyss_0)"
 "((lst_126) trans-valss_0)"
-"((lst_380) trans-idss_2))"
+"((lst_381) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_379)))"
+"(let-values()(check-list lst_380)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
@@ -65704,48 +65736,48 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_380)))"
+"(let-values()(check-list lst_381)))"
 "((letrec-values(((for-loop_316)"
-"(lambda(env_36"
-" lst_381"
+"(lambda(env_34"
 " lst_382"
-" lst_383)"
+" lst_383"
+" lst_384)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_381)"
-"(if(pair?"
 " lst_382)"
-"(pair?"
+"(if(pair?"
 " lst_383)"
+"(pair?"
+" lst_384)"
 " #f)"
 " #f)"
 "(let-values(((keys_11)"
 "(unsafe-car"
-" lst_381))"
-"((rest_218)"
-"(unsafe-cdr"
-" lst_381))"
-"((vals_9)"
-"(unsafe-car"
 " lst_382))"
-"((rest_219)"
-"(unsafe-cdr"
-" lst_382))"
-"((ids_41)"
-"(unsafe-car"
-" lst_383))"
 "((rest_220)"
 "(unsafe-cdr"
-" lst_383)))"
+" lst_382))"
+"((vals_9)"
+"(unsafe-car"
+" lst_383))"
+"((rest_221)"
+"(unsafe-cdr"
+" lst_383))"
+"((ids_41)"
+"(unsafe-car"
+" lst_384))"
+"((rest_222)"
+"(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_384)"
+"(let-values(((lst_385)"
 " keys_11)"
-"((lst_385)"
+"((lst_386)"
 " vals_9)"
 "((lst_127)"
 " ids_41))"
@@ -65755,32 +65787,32 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_384)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
 " lst_385)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_386)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_127)))"
 "((letrec-values(((for-loop_160)"
-"(lambda(env_40"
+"(lambda(env_38"
 " lst_128"
-" lst_386"
-" lst_387)"
+" lst_387"
+" lst_388)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
 " lst_128)"
 "(if(pair?"
-" lst_386)"
-"(pair?"
 " lst_387)"
+"(pair?"
+" lst_388)"
 " #f)"
 " #f)"
 "(let-values(((key_98)"
@@ -65791,77 +65823,77 @@ static const char *startup_source =
 " lst_128))"
 "((val_87)"
 "(unsafe-car"
-" lst_386))"
-"((rest_221)"
-"(unsafe-cdr"
-" lst_386))"
-"((id_125)"
-"(unsafe-car"
 " lst_387))"
-"((rest_222)"
+"((rest_223)"
 "(unsafe-cdr"
-" lst_387)))"
+" lst_387))"
+"((id_126)"
+"(unsafe-car"
+" lst_388))"
+"((rest_224)"
+"(unsafe-cdr"
+" lst_388)))"
+"(let-values(((env_39)"
+"(let-values(((env_40)"
+" env_38))"
 "(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_125"
-" phase_146"
-" ctx_83)"
+" id_126"
+" phase_147"
+" ctx_84)"
 "(env-extend"
-" env_42"
+" env_40"
 " key_98"
 " val_87)))))"
 "(values"
-" env_43)))))"
+" env_41)))))"
 "(if(not"
 " #f)"
 "(for-loop_160"
-" env_41"
+" env_39"
 " rest_135"
-" rest_221"
-" rest_222)"
-" env_41)))"
-" env_40)))))"
+" rest_223"
+" rest_224)"
+" env_39)))"
+" env_38)))))"
 " for-loop_160)"
-" env_38"
-" lst_384"
+" env_36"
 " lst_385"
+" lst_386"
 " lst_127))))))"
 "(values"
-" env_39)))))"
+" env_37)))))"
 "(if(not #f)"
 "(for-loop_316"
-" env_37"
-" rest_218"
-" rest_219"
-" rest_220)"
-" env_37)))"
-" env_36)))))"
+" env_35"
+" rest_220"
+" rest_221"
+" rest_222)"
+" env_35)))"
+" env_34)))))"
 " for-loop_316)"
 " rec-val-env_0"
-" lst_379"
+" lst_380"
 " lst_126"
-" lst_380)))))"
-"(let-values(((expr-ctx_0)(as-expression-context ctx_83)))"
+" lst_381)))))"
+"(let-values(((expr-ctx_0)(as-expression-context ctx_84)))"
 "(let-values(((orig-rrs_0)"
 "(expand-context-reference-records"
 " expr-ctx_0)))"
 "(let-values(((rec-ctx_0)"
-"(let-values(((v_258) expr-ctx_0))"
-"(let-values(((the-struct_93) v_258))"
+"(let-values(((v_259) expr-ctx_0))"
+"(let-values(((the-struct_94) v_259))"
 "(if(expand-context/outer?"
-" the-struct_93)"
+" the-struct_94)"
 "(let-values(((env164_0) rec-env_0)"
 "((scopes165_0)"
 "(cons"
 " sc_37"
 "(expand-context-scopes"
-" ctx_83)))"
+" ctx_84)))"
 "((reference-records166_0)"
 "(if split-by-reference?_0"
 "(cons"
@@ -65873,53 +65905,53 @@ static const char *startup_source =
 "(cons"
 " trans-idss_2"
 " val-idss_3)"
-" ctx_83"
+" ctx_84"
 " sc_37))"
 "((inner168_0)"
 "(root-expand-context/outer-inner"
-" v_258)))"
+" v_259)))"
 "(expand-context/outer1.1"
 " inner168_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_93)"
+" the-struct_94)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_93)"
+" the-struct_94)"
 "(root-expand-context/outer-frame-id"
-" the-struct_93)"
+" the-struct_94)"
 "(expand-context/outer-context"
-" the-struct_93)"
+" the-struct_94)"
 " env164_0"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_93)"
+" the-struct_94)"
 " scopes165_0"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_93)"
+" the-struct_94)"
 " binding-layer167_0"
 " reference-records166_0"
 "(expand-context/outer-only-immediate?"
-" the-struct_93)"
+" the-struct_94)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_93)"
+" the-struct_94)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_93)"
+" the-struct_94)"
 "(expand-context/outer-name"
-" the-struct_93)))"
+" the-struct_94)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                     \"expand-context/outer?\""
-" the-struct_93))))))"
+" the-struct_94))))))"
 "(let-values(((letrec-values-id_0)"
 "(if(not"
-"(expand-context-to-parsed? ctx_83))"
+"(expand-context-to-parsed? ctx_84))"
 "(if syntaxes?_0"
-"(core-id 'letrec-values phase_146)"
+"(core-id 'letrec-values phase_147)"
 " let-values128_0)"
 " #f)))"
 "(let-values(((rebuild-s_6)"
-"(let-values(((ctx169_0) ctx_83)"
+"(let-values(((ctx169_0) ctx_84)"
 "((s170_1) s_326)"
 "((temp171_1) #t))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " temp171_1"
@@ -65930,16 +65962,16 @@ static const char *startup_source =
 " s170_1))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_84)"
 "(reverse$1"
-"(let-values(((lst_388)"
+"(let-values(((lst_389)"
 " val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_388)))"
+"(check-list lst_389)))"
 "((letrec-values(((for-loop_317)"
 "(lambda(fold-var_120"
 " lst_131)"
@@ -65950,7 +65982,7 @@ static const char *startup_source =
 "(let-values(((val-ids_1)"
 "(unsafe-car"
 " lst_131))"
-"((rest_223)"
+"((rest_225)"
 "(unsafe-cdr"
 " lst_131)))"
 "(let-values(((fold-var_363)"
@@ -65961,7 +65993,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_389)"
+"(let-values(((lst_390)"
 " val-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -65969,20 +66001,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_389)))"
+" lst_390)))"
 "((letrec-values(((for-loop_318)"
 "(lambda(fold-var_366"
-" lst_390)"
+" lst_391)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_390)"
+" lst_391)"
 "(let-values(((val-id_0)"
 "(unsafe-car"
-" lst_390))"
-"((rest_224)"
+" lst_391))"
+"((rest_226)"
 "(unsafe-cdr"
-" lst_390)))"
+" lst_391)))"
 "(let-values(((fold-var_367)"
 "(let-values(((fold-var_124)"
 " fold-var_366))"
@@ -66003,12 +66035,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_318"
 " fold-var_367"
-" rest_224)"
+" rest_226)"
 " fold-var_367)))"
 " fold-var_366)))))"
 " for-loop_318)"
 " null"
-" lst_389)))))"
+" lst_390)))))"
 " fold-var_364))))"
 "(values"
 " fold-var_365)))))"
@@ -66016,24 +66048,24 @@ static const char *startup_source =
 " #f)"
 "(for-loop_317"
 " fold-var_363"
-" rest_223)"
+" rest_225)"
 " fold-var_363)))"
 " fold-var_120)))))"
 " for-loop_317)"
 " null"
-" lst_388))))"
+" lst_389))))"
 " val-idss_3)))"
 "(let-values((()"
 "(begin"
 "(if syntaxes?_0"
 "(let-values()"
-"(let-values(((obs_95)"
+"(let-values(((obs_92)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_95"
+" ctx_84)))"
+"(if obs_92"
 "(let-values()"
 "(log-letrec-values"
-" obs_95"
+" obs_92"
 " val-idss_3"
 " val-rhss_3"
 " bodys_10))"
@@ -66046,10 +66078,10 @@ static const char *startup_source =
 " 'get-body"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_96)"
+"(let-values(((obs_93)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_96"
+" ctx_84)))"
+"(if obs_93"
 "(let-values()"
 "(if(not"
 "(if syntaxes?_0"
@@ -66058,63 +66090,63 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(call-expand-observe"
-" obs_96"
+" obs_93"
 " 'next-group))"
 "(void)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_5)"
-"(let-values(((v_259)"
+"(let-values(((v_260)"
 " rec-ctx_0))"
-"(let-values(((the-struct_94)"
-" v_259))"
+"(let-values(((the-struct_95)"
+" v_260))"
 "(if(expand-context/outer?"
-" the-struct_94)"
+" the-struct_95)"
 "(let-values(((reference-records175_0)"
 " orig-rrs_0)"
 "((inner176_0)"
 "(root-expand-context/outer-inner"
-" v_259)))"
+" v_260)))"
 "(expand-context/outer1.1"
 " inner176_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_94)"
+" the-struct_95)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(root-expand-context/outer-frame-id"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-context"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-env"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-binding-layer"
-" the-struct_94)"
+" the-struct_95)"
 " reference-records175_0"
 "(expand-context/outer-only-immediate?"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-name"
-" the-struct_94)))"
+" the-struct_95)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                   \"expand-context/outer?\""
-" the-struct_94))))))"
+" the-struct_95))))))"
 "(let-values(((bodys172_0)"
 " bodys_10)"
 "((temp173_0)"
 "(let-values(((body-ctx177_0)"
 " body-ctx_5)"
 "((ctx178_0)"
-" ctx_83))"
+" ctx_84))"
 "(as-tail-context23.1"
 " ctx178_0"
 " body-ctx177_0)))"
@@ -66132,11 +66164,11 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((clauses_2)"
 "(reverse$1"
-"(let-values(((lst_391)"
+"(let-values(((lst_392)"
 " val-name-idss_0)"
-"((lst_392)"
-" val-keyss_2)"
 "((lst_393)"
+" val-keyss_2)"
+"((lst_394)"
 " val-rhss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -66144,12 +66176,6 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_391)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
 " lst_392)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -66157,39 +66183,45 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_393)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
+" lst_394)))"
 "((letrec-values(((for-loop_319)"
 "(lambda(fold-var_369"
-" lst_394"
+" lst_395"
 " lst_62"
-" lst_395)"
+" lst_396)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_394)"
+" lst_395)"
 "(if(pair?"
 " lst_62)"
 "(pair?"
-" lst_395)"
+" lst_396)"
 " #f)"
 " #f)"
 "(let-values(((ids_42)"
 "(unsafe-car"
-" lst_394))"
-"((rest_225)"
+" lst_395))"
+"((rest_227)"
 "(unsafe-cdr"
-" lst_394))"
+" lst_395))"
 "((keys_12)"
 "(unsafe-car"
 " lst_62))"
-"((rest_226)"
+"((rest_228)"
 "(unsafe-cdr"
 " lst_62))"
 "((rhs_22)"
 "(unsafe-car"
-" lst_395))"
-"((rest_227)"
+" lst_396))"
+"((rest_229)"
 "(unsafe-cdr"
-" lst_395)))"
+" lst_396)))"
 "(let-values(((fold-var_47)"
 "(let-values(((fold-var_370)"
 " fold-var_369))"
@@ -66199,21 +66231,21 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_97)"
+"(let-values(((obs_94)"
 "(expand-context-observer"
-" ctx_83)))"
-"(if obs_97"
+" ctx_84)))"
+"(if obs_94"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_97"
+" obs_94"
 " 'next)))"
 "(void)))"
 "(values))))"
-"(let-values(((exp-rhs_3)"
+"(let-values(((exp-rhs_4)"
 "(let-values(((rhs179_0)"
 " rhs_22)"
-"((temp180_1)"
+"((temp180_2)"
 "(if rec?_1"
 "(as-named-context"
 " rec-ctx_0"
@@ -66227,15 +66259,15 @@ static const char *startup_source =
 " #f"
 " #f"
 " rhs179_0"
-" temp180_1))))"
+" temp180_2))))"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_84)"
 "(list"
 " keys_12"
-" exp-rhs_3)"
+" exp-rhs_4)"
 "(list"
 " ids_42"
-" exp-rhs_3)))))"
+" exp-rhs_4)))))"
 " fold-var_370))))"
 "(values"
 " fold-var_371)))))"
@@ -66243,16 +66275,16 @@ static const char *startup_source =
 " #f)"
 "(for-loop_319"
 " fold-var_47"
-" rest_225"
-" rest_226"
-" rest_227)"
+" rest_227"
+" rest_228"
+" rest_229)"
 " fold-var_47)))"
 " fold-var_369)))))"
 " for-loop_319)"
 " null"
-" lst_391"
 " lst_392"
-" lst_393))))))"
+" lst_393"
+" lst_394))))))"
 "(let-values(((exp-body_4)"
 "(get-body_1)))"
 "(begin"
@@ -66262,7 +66294,7 @@ static const char *startup_source =
 " frame-id_15))"
 "(void))"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_84)"
 "(if rec?_1"
 "(parsed-letrec-values18.1"
 " rebuild-s_6"
@@ -66295,7 +66327,7 @@ static const char *startup_source =
 " val-rhss_3)"
 "((temp186_1)"
 "(reverse$1"
-"(let-values(((lst_396)"
+"(let-values(((lst_397)"
 " val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -66303,20 +66335,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_396)))"
+" lst_397)))"
 "((letrec-values(((for-loop_320)"
 "(lambda(fold-var_372"
-" lst_397)"
+" lst_398)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_397)"
+" lst_398)"
 "(let-values(((rhs_23)"
 "(unsafe-car"
-" lst_397))"
-"((rest_228)"
+" lst_398))"
+"((rest_230)"
 "(unsafe-cdr"
-" lst_397)))"
+" lst_398)))"
 "(let-values(((fold-var_373)"
 "(let-values(((fold-var_374)"
 " fold-var_372))"
@@ -66332,12 +66364,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_320"
 " fold-var_373"
-" rest_228)"
+" rest_230)"
 " fold-var_373)))"
 " fold-var_372)))))"
 " for-loop_320)"
 " null"
-" lst_396)))))"
+" lst_397)))))"
 "((temp187_2)"
 " #t)"
 "((frame-id188_0)"
@@ -66364,35 +66396,35 @@ static const char *startup_source =
 " val-keyss184_0"
 " val-rhss185_0"
 " temp186_1))))))"
-"(if(expand-context-to-parsed? ctx_83)"
+"(if(expand-context-to-parsed? ctx_84)"
 " result-s_12"
 "(attach-disappeared-transformer-bindings"
 " result-s_12"
 " trans-idss_2)))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(log-let-renames)"
-"(lambda(obs_98 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_38)"
+"(lambda(obs_95 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_38)"
 "(begin"
 "(let-values(((vals+body_0)"
 "(cons"
 "(reverse$1"
-"(let-values(((lst_398) val-idss_4)((lst_399) val-rhss_4))"
+"(let-values(((lst_399) val-idss_4)((lst_400) val-rhss_4))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_398)))"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
 "(let-values()(check-list lst_399)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_400)))"
 "((letrec-values(((for-loop_321)"
-"(lambda(fold-var_376 lst_400 lst_138)"
+"(lambda(fold-var_376 lst_401 lst_138)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_400)(pair? lst_138) #f)"
-"(let-values(((val-ids_2)(unsafe-car lst_400))"
-"((rest_69)(unsafe-cdr lst_400))"
+"(if(if(pair? lst_401)(pair? lst_138) #f)"
+"(let-values(((val-ids_2)(unsafe-car lst_401))"
+"((rest_69)(unsafe-cdr lst_401))"
 "((val-rhs_11)(unsafe-car lst_138))"
-"((rest_229)(unsafe-cdr lst_138)))"
+"((rest_231)(unsafe-cdr lst_138)))"
 "(let-values(((fold-var_136)"
 "(let-values(((fold-var_137) fold-var_376))"
 "(let-values(((fold-var_377)"
@@ -66405,36 +66437,36 @@ static const char *startup_source =
 " fold-var_137))))"
 "(values fold-var_377)))))"
 "(if(not #f)"
-"(for-loop_321 fold-var_136 rest_69 rest_229)"
+"(for-loop_321 fold-var_136 rest_69 rest_231)"
 " fold-var_136)))"
 " fold-var_376)))))"
 " for-loop_321)"
 " null"
-" lst_398"
-" lst_399))))"
+" lst_399"
+" lst_400))))"
 "(datum->syntax$1 #f bodys_11))))"
 "(call-expand-observe"
-" obs_98"
+" obs_95"
 " renames-log-tag_1"
 "(if(not trans-rhss_0)"
 " vals+body_0"
 "(cons"
 "(reverse$1"
-"(let-values(((lst_401) trans-idss_3)((lst_402) trans-rhss_0))"
+"(let-values(((lst_402) trans-idss_3)((lst_403) trans-rhss_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_401)))"
+"(let-values()(check-list lst_402)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_402)))"
+"(let-values()(check-list lst_403)))"
 "((letrec-values(((for-loop_322)"
 "(lambda(fold-var_378 lst_70 lst_147)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_70)(pair? lst_147) #f)"
 "(let-values(((trans-ids_0)(unsafe-car lst_70))"
-"((rest_230)(unsafe-cdr lst_70))"
+"((rest_232)(unsafe-cdr lst_70))"
 "((trans-rhs_5)(unsafe-car lst_147))"
 "((rest_75)(unsafe-cdr lst_147)))"
 "(let-values(((fold-var_379)"
@@ -66450,25 +66482,25 @@ static const char *startup_source =
 "(add-scope trans-rhs_5 sc_38))))"
 " fold-var_380))))"
 "(values fold-var_381)))))"
-"(if(not #f)(for-loop_322 fold-var_379 rest_230 rest_75) fold-var_379)))"
+"(if(not #f)(for-loop_322 fold-var_379 rest_232 rest_75) fold-var_379)))"
 " fold-var_378)))))"
 " for-loop_322)"
 " null"
-" lst_401"
-" lst_402))))"
+" lst_402"
+" lst_403))))"
 " vals+body_0)))))))"
 "(define-values"
 "(log-letrec-values)"
-"(lambda(obs_99 val-idss_5 val-rhss_5 bodys_12)"
+"(lambda(obs_96 val-idss_5 val-rhss_5 bodys_12)"
 "(begin"
 "(begin"
-"(call-expand-observe obs_99 'next-group)"
+"(call-expand-observe obs_96 'next-group)"
 "(if(null? val-idss_5)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_99 'prim-letrec-values)"
-"(log-let-renames obs_99 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
+"(call-expand-observe obs_96 'prim-letrec-values)"
+"(log-let-renames obs_96 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
 "(void"
 "(add-core-form!*"
 " 'let-values"
@@ -66490,30 +66522,30 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_533 ctx_84)"
+"(lambda(s_530 ctx_85)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_100)(expand-context-observer ctx_84)))"
-"(if obs_100"
-"(let-values()(let-values()(call-expand-observe obs_100 'prim-#%stratified)))"
+"(let-values(((obs_97)(expand-context-observer ctx_85)))"
+"(if obs_97"
+"(let-values()(let-values()(call-expand-observe obs_97 'prim-#%stratified)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_9)(syntax-disarm$1 s_533)))"
+"(let-values(((disarmed-s_9)(syntax-disarm$1 s_530)))"
 "(let-values(((ok?_39 #%stratified-body202_0 body203_0)"
-"(let-values(((s_534) disarmed-s_9))"
-"(let-values(((orig-s_47) s_534))"
+"(let-values(((s_531) disarmed-s_9))"
+"(let-values(((orig-s_47) s_531))"
 "(let-values(((#%stratified-body202_1 body203_1)"
-"(let-values(((s_535)(if(syntax?$1 s_534)(syntax-e$1 s_534) s_534)))"
-"(if(pair? s_535)"
+"(let-values(((s_532)(if(syntax?$1 s_531)(syntax-e$1 s_531) s_531)))"
+"(if(pair? s_532)"
 "(let-values(((#%stratified-body204_0)"
-"(let-values(((s_536)(car s_535))) s_536))"
+"(let-values(((s_533)(car s_532))) s_533))"
 "((body205_0)"
-"(let-values(((s_537)(cdr s_535)))"
-"(let-values(((s_538)"
-"(if(syntax?$1 s_537)"
-"(syntax-e$1 s_537)"
-" s_537)))"
-"(let-values(((flat-s_39)(to-syntax-list.1 s_538)))"
+"(let-values(((s_534)(cdr s_532)))"
+"(let-values(((s_535)"
+"(if(syntax?$1 s_534)"
+"(syntax-e$1 s_534)"
+" s_534)))"
+"(let-values(((flat-s_39)(to-syntax-list.1 s_535)))"
 "(if(not flat-s_39)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_47))"
@@ -66525,40 +66557,40 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_47)))))"
 "(values #t #%stratified-body202_1 body203_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx206_0) ctx_84)((s207_0) s_533)((temp208_0) #t))"
-"(keep-as-needed74.1 #f #f temp208_0 #t #f #f ctx206_0 s207_0))))"
+"(let-values(((ctx206_0) ctx_85)((s207_0) s_530)((temp208_0) #t))"
+"(keep-as-needed85.1 #f #f temp208_0 #t #f #f ctx206_0 s207_0))))"
 "(let-values(((exp-body_5)"
 "(let-values(((temp209_1) body203_0)"
-"((ctx210_0) ctx_84)"
+"((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))))"
-"(if(expand-context-to-parsed? ctx_84)"
+"(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)"
 "(if(null?(cdr exp-body_5))"
 "(car exp-body_5)"
-"(list*(core-id 'begin(expand-context-phase ctx_84)) exp-body_5))))"
+"(list*(core-id 'begin(expand-context-phase ctx_85)) exp-body_5))))"
 "(rebuild5.1 #f #f rebuild-s213_0 temp214_1)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_539 ctx_85)"
+"(lambda(s_536 ctx_86)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_101)(expand-context-observer ctx_85)))"
-"(if obs_101(let-values()(let-values()(call-expand-observe obs_101 'prim-#%datum)))(void)))"
+"(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_539)))"
+"(let-values(((disarmed-s_10)(syntax-disarm$1 s_536)))"
 "(let-values(((ok?_40 #%datum215_0 datum216_0)"
-"(let-values(((s_540) disarmed-s_10))"
-"(let-values(((orig-s_48) s_540))"
+"(let-values(((s_537) disarmed-s_10))"
+"(let-values(((orig-s_48) s_537))"
 "(let-values(((#%datum215_1 datum216_1)"
-"(let-values(((s_541)(if(syntax?$1 s_540)(syntax-e$1 s_540) s_540)))"
-"(if(pair? s_541)"
-"(let-values(((#%datum217_0)(let-values(((s_542)(car s_541))) s_542))"
-"((datum218_0)(let-values(((s_543)(cdr s_541))) s_543)))"
+"(let-values(((s_538)(if(syntax?$1 s_537)(syntax-e$1 s_537) s_537)))"
+"(if(pair? s_538)"
+"(let-values(((#%datum217_0)(let-values(((s_539)(car s_538))) s_539))"
+"((datum218_0)(let-values(((s_540)(cdr s_538))) s_540)))"
 "(values #%datum217_0 datum218_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
 "(values #t #%datum215_1 datum216_1))))))"
@@ -66570,35 +66602,35 @@ static const char *startup_source =
 "                                 (raise-syntax-error$1 '#%datum \"keyword misused as an expression\" #f datum_2))"
 "(void))"
 "(values))))"
-"(let-values(((phase_147)(expand-context-phase ctx_85)))"
-"(if(if(expand-context-to-parsed? ctx_85)(free-id-set-empty?(expand-context-stops ctx_85)) #f)"
-"(parsed-quote14.1(keep-properties-only~ s_539)(syntax->datum$1 datum_2))"
-"(let-values(((s219_0) s_539)((temp220_0)(list(core-id 'quote phase_147) datum_2)))"
+"(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_536)(syntax->datum$1 datum_2))"
+"(let-values(((s219_0) s_536)((temp220_0)(list(core-id 'quote phase_148) datum_2)))"
 "(rebuild5.1 #f #f s219_0 temp220_0))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_544 ctx_86)"
+"(lambda(s_541 ctx_87)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_102)(expand-context-observer ctx_86)))"
-"(if obs_102(let-values()(let-values()(call-expand-observe obs_102 'prim-#%app)))(void)))"
+"(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_544)))"
+"(let-values(((disarmed-s_11)(syntax-disarm$1 s_541)))"
 "(let-values(((ok?_41 #%app221_0 e222_0)"
-"(let-values(((s_545) disarmed-s_11))"
-"(let-values(((orig-s_49) s_545))"
+"(let-values(((s_542) disarmed-s_11))"
+"(let-values(((orig-s_49) s_542))"
 "(let-values(((#%app221_1 e222_1)"
-"(let-values(((s_546)(if(syntax?$1 s_545)(syntax-e$1 s_545) s_545)))"
-"(if(pair? s_546)"
-"(let-values(((#%app223_0)(let-values(((s_547)(car s_546))) s_547))"
+"(let-values(((s_543)(if(syntax?$1 s_542)(syntax-e$1 s_542) s_542)))"
+"(if(pair? s_543)"
+"(let-values(((#%app223_0)(let-values(((s_544)(car s_543))) s_544))"
 "((e224_0)"
-"(let-values(((s_548)(cdr s_546)))"
-"(let-values(((s_549)"
-"(if(syntax?$1 s_548)"
-"(syntax-e$1 s_548)"
-" s_548)))"
-"(let-values(((flat-s_40)(to-syntax-list.1 s_549)))"
+"(let-values(((s_545)(cdr s_543)))"
+"(let-values(((s_546)"
+"(if(syntax?$1 s_545)"
+"(syntax-e$1 s_545)"
+" s_545)))"
+"(let-values(((flat-s_40)(to-syntax-list.1 s_546)))"
 "(if(not flat-s_40)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_49))"
@@ -66609,25 +66641,25 @@ static const char *startup_source =
 "(let-values(((es_3) e222_0))"
 "(if(null? es_3)"
 "(let-values()"
-"(let-values(((phase_148)(expand-context-phase ctx_86)))"
-"(if(expand-context-to-parsed? ctx_86)"
-"(parsed-quote14.1(keep-properties-only~ s_544) null)"
-"(let-values(((s225_0) s_544)((temp226_1)(list(core-id 'quote phase_148) null)))"
+"(let-values(((phase_149)(expand-context-phase ctx_87)))"
+"(if(expand-context-to-parsed? ctx_87)"
+"(parsed-quote14.1(keep-properties-only~ s_541) null)"
+"(let-values(((s225_0) s_541)((temp226_1)(list(core-id 'quote phase_149) null)))"
 "(rebuild5.1 #f #f s225_0 temp226_1)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_8)"
-"(let-values(((ctx227_0) ctx_86)"
-"((s228_0) s_544)"
+"(let-values(((ctx227_0) ctx_87)"
+"((s228_0) s_541)"
 "((keep-for-parsed?229_0) keep-for-parsed?_1))"
-"(keep-as-needed74.1 #f #f #f #f keep-for-parsed?229_0 #t ctx227_0 s228_0))))"
+"(keep-as-needed85.1 #f #f #f #f keep-for-parsed?229_0 #t ctx227_0 s228_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_86)"
+"(let-values(((ctx230_0) ctx_87)"
 "((prefixless231_0) prefixless_0)"
 "((keep-for-parsed?232_0) keep-for-parsed?_1))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -66637,19 +66669,19 @@ static const char *startup_source =
 " ctx230_0"
 " prefixless231_0))"
 " #f)))"
-"(let-values(((expr-ctx_1)(as-expression-context ctx_86)))"
+"(let-values(((expr-ctx_1)(as-expression-context ctx_87)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_103)(expand-context-observer expr-ctx_1)))"
-"(if obs_103"
+"(let-values(((obs_100)(expand-context-observer expr-ctx_1)))"
+"(if obs_100"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_103"
+" obs_100"
 " 'enter-list"
-"(datum->syntax$1 #f es_3 s_544))"
-"(call-expand-observe obs_103 'next))))"
+"(datum->syntax$1 #f es_3 s_541))"
+"(call-expand-observe obs_100 'next))))"
 "(void)))"
 "(values))))"
 "(let-values(((rest-es_0)(cdr es_3)))"
@@ -66658,19 +66690,19 @@ static const char *startup_source =
 "(expand7.1 #f #f #f #f temp233_2 expr-ctx234_0))))"
 "(let-values(((exp-es_0)"
 "(reverse$1"
-"(let-values(((lst_403) rest-es_0))"
+"(let-values(((lst_404) rest-es_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_403)))"
+"(let-values()(check-list lst_404)))"
 "((letrec-values(((for-loop_323)"
-"(lambda(fold-var_382 lst_404)"
+"(lambda(fold-var_382 lst_405)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_404)"
-"(let-values(((e_92)(unsafe-car lst_404))"
-"((rest_231)"
-"(unsafe-cdr lst_404)))"
+"(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))"
@@ -66679,14 +66711,14 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_104)"
+"(let-values(((obs_101)"
 "(expand-context-observer"
 " expr-ctx_1)))"
-"(if obs_104"
+"(if obs_101"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_104"
+" obs_101"
 " 'next)))"
 "(void)))"
 "(let-values(((e235_0)"
@@ -66704,13 +66736,13 @@ static const char *startup_source =
 "(values"
 " fold-var_385)))))"
 "(if(not #f)"
-"(for-loop_323 fold-var_383 rest_231)"
+"(for-loop_323 fold-var_383 rest_233)"
 " fold-var_383)))"
 " fold-var_382)))))"
 " for-loop_323)"
 " null"
-" lst_403))))))"
-"(if(expand-context-to-parsed? ctx_86)"
+" lst_404))))))"
+"(if(expand-context-to-parsed? ctx_87)"
 "(let-values()"
 "(parsed-app7.1"
 "(let-values(((or-part_215) rebuild-prefixless_0))"
@@ -66726,12 +66758,12 @@ static const char *startup_source =
 "(rebuild5.1 #f #f rebuild-prefixless239_0 exp-es240_0))"
 " exp-es_1))))"
 "(begin"
-"(let-values(((obs_105)(expand-context-observer expr-ctx_1)))"
-"(if obs_105"
+"(let-values(((obs_102)(expand-context-observer expr-ctx_1)))"
+"(if obs_102"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_105"
+" obs_102"
 " 'exit-list"
 "(datum->syntax$1 #f es_4 rebuild-s_8))))"
 "(void)))"
@@ -66741,35 +66773,35 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_550 ctx_87)"
+"(lambda(s_547 ctx_88)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_106)(expand-context-observer ctx_87)))"
-"(if obs_106(let-values()(let-values()(call-expand-observe obs_106 'prim-quote)))(void)))"
+"(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_551)(syntax-disarm$1 s_550)))"
-"(let-values(((orig-s_50) s_551))"
+"(let-values(((s_548)(syntax-disarm$1 s_547)))"
+"(let-values(((orig-s_50) s_548))"
 "(let-values(((quote241_1 datum242_1)"
-"(let-values(((s_552)(if(syntax?$1 s_551)(syntax-e$1 s_551) s_551)))"
-"(if(pair? s_552)"
-"(let-values(((quote243_0)(let-values(((s_553)(car s_552))) s_553))"
+"(let-values(((s_549)(if(syntax?$1 s_548)(syntax-e$1 s_548) s_548)))"
+"(if(pair? s_549)"
+"(let-values(((quote243_0)(let-values(((s_550)(car s_549))) s_550))"
 "((datum244_0)"
+"(let-values(((s_551)(cdr s_549)))"
+"(let-values(((s_552)"
+"(if(syntax?$1 s_551)"
+"(syntax-e$1 s_551)"
+" s_551)))"
+"(if(pair? s_552)"
+"(let-values(((datum245_0)"
+"(let-values(((s_553)(car s_552))) s_553))"
+"(()"
 "(let-values(((s_554)(cdr s_552)))"
 "(let-values(((s_555)"
 "(if(syntax?$1 s_554)"
 "(syntax-e$1 s_554)"
 " s_554)))"
-"(if(pair? s_555)"
-"(let-values(((datum245_0)"
-"(let-values(((s_556)(car s_555))) s_556))"
-"(()"
-"(let-values(((s_557)(cdr s_555)))"
-"(let-values(((s_558)"
-"(if(syntax?$1 s_557)"
-"(syntax-e$1 s_557)"
-" s_557)))"
-"(if(null? s_558)"
+"(if(null? s_555)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -66780,41 +66812,41 @@ static const char *startup_source =
 "(values quote243_0 datum244_0))"
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_50)))))"
 "(values #t quote241_1 datum242_1))))))"
-"(if(expand-context-to-parsed? ctx_87)"
-"(parsed-quote14.1(keep-properties-only~ s_550)(syntax->datum$1 datum242_0))"
-" s_550))))))"
+"(if(expand-context-to-parsed? ctx_88)"
+"(parsed-quote14.1(keep-properties-only~ s_547)(syntax->datum$1 datum242_0))"
+" s_547))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_559 ctx_88)"
+"(lambda(s_556 ctx_89)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_107)(expand-context-observer ctx_88)))"
-"(if obs_107"
-"(let-values()(let-values()(call-expand-observe obs_107 'prim-quote-syntax)))"
+"(let-values(((obs_104)(expand-context-observer ctx_89)))"
+"(if obs_104"
+"(let-values()(let-values()(call-expand-observe obs_104 'prim-quote-syntax)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_12)(syntax-disarm$1 s_559)))"
+"(let-values(((disarmed-s_12)(syntax-disarm$1 s_556)))"
 "(let-values(((ok?_43 quote-syntax246_0 datum247_0)"
-"(let-values(((s_560) disarmed-s_12))"
-"(if(let-values(((s_561)(if(syntax?$1 s_560)(syntax-e$1 s_560) s_560)))"
+"(let-values(((s_557) disarmed-s_12))"
+"(if(let-values(((s_558)(if(syntax?$1 s_557)(syntax-e$1 s_557) s_557)))"
+"(if(pair? s_558)"
+"(if(let-values(((s_559)(car s_558))) #t)"
+"(let-values(((s_560)(cdr s_558)))"
+"(let-values(((s_561)(if(syntax?$1 s_560)(syntax-e$1 s_560) s_560)))"
 "(if(pair? s_561)"
 "(if(let-values(((s_562)(car s_561))) #t)"
 "(let-values(((s_563)(cdr s_561)))"
 "(let-values(((s_564)(if(syntax?$1 s_563)(syntax-e$1 s_563) s_563)))"
 "(if(pair? s_564)"
-"(if(let-values(((s_565)(car s_564))) #t)"
-"(let-values(((s_566)(cdr s_564)))"
-"(let-values(((s_567)(if(syntax?$1 s_566)(syntax-e$1 s_566) s_566)))"
-"(if(pair? s_567)"
-"(if(let-values(((s_568)(car s_567)))"
-"(let-values(((s_569)"
-"(if(syntax?$1 s_568)(syntax-e$1 s_568) s_568)))"
-"(eq? '#:local s_569)))"
-"(let-values(((s_570)(cdr s_567)))"
-"(let-values(((s_571)"
-"(if(syntax?$1 s_570)(syntax-e$1 s_570) s_570)))"
-"(null? s_571)))"
+"(if(let-values(((s_565)(car s_564)))"
+"(let-values(((s_566)"
+"(if(syntax?$1 s_565)(syntax-e$1 s_565) s_565)))"
+"(eq? '#:local s_566)))"
+"(let-values(((s_567)(cdr s_564)))"
+"(let-values(((s_568)"
+"(if(syntax?$1 s_567)(syntax-e$1 s_567) s_567)))"
+"(null? s_568)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -66823,23 +66855,23 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((quote-syntax246_1 datum247_1)"
-"(let-values(((s_269)(if(syntax?$1 s_560)(syntax-e$1 s_560) s_560)))"
+"(let-values(((s_269)(if(syntax?$1 s_557)(syntax-e$1 s_557) s_557)))"
 "(let-values(((quote-syntax248_0)"
-"(let-values(((s_572)(car s_269))) s_572))"
+"(let-values(((s_569)(car s_269))) s_569))"
 "((datum249_0)"
-"(let-values(((s_573)(cdr s_269)))"
+"(let-values(((s_570)(cdr s_269)))"
 "(let-values(((s_270)"
-"(if(syntax?$1 s_573)"
-"(syntax-e$1 s_573)"
-" s_573)))"
+"(if(syntax?$1 s_570)"
+"(syntax-e$1 s_570)"
+" s_570)))"
 "(let-values(((datum250_0)"
-"(let-values(((s_574)(car s_270))) s_574))"
+"(let-values(((s_571)(car s_270))) s_571))"
 "(()"
-"(let-values(((s_575)(cdr s_270)))"
+"(let-values(((s_572)(cdr s_270)))"
 "(let-values(((s_271)"
-"(if(syntax?$1 s_575)"
-"(syntax-e$1 s_575)"
-" s_575)))"
+"(if(syntax?$1 s_572)"
+"(syntax-e$1 s_572)"
+" s_572)))"
 "(let-values((()"
 "(let-values(((s_272)"
 "(car"
@@ -66852,15 +66884,15 @@ static const char *startup_source =
 " s_272)))"
 "(values))))"
 "(()"
-"(let-values(((s_576)"
+"(let-values(((s_573)"
 "(cdr"
 " s_271)))"
-"(let-values(((s_577)"
+"(let-values(((s_574)"
 "(if(syntax?$1"
-" s_576)"
+" s_573)"
 "(syntax-e$1"
-" s_576)"
-" s_576)))"
+" s_573)"
+" s_573)))"
 "(values)))))"
 "(values))))))"
 "(values datum250_0))))))"
@@ -66872,27 +66904,27 @@ static const char *startup_source =
 "(if(if(not ok?_43) #t #f)"
 "(let-values(((orig-s_51) s_274))"
 "(let-values(((quote-syntax251_1 datum252_1)"
-"(let-values(((s_578)(if(syntax?$1 s_274)(syntax-e$1 s_274) s_274)))"
-"(if(pair? s_578)"
+"(let-values(((s_575)(if(syntax?$1 s_274)(syntax-e$1 s_274) s_274)))"
+"(if(pair? s_575)"
 "(let-values(((quote-syntax253_0)"
-"(let-values(((s_579)(car s_578))) s_579))"
+"(let-values(((s_576)(car s_575))) s_576))"
 "((datum254_0)"
+"(let-values(((s_577)(cdr s_575)))"
+"(let-values(((s_578)"
+"(if(syntax?$1 s_577)"
+"(syntax-e$1 s_577)"
+" s_577)))"
+"(if(pair? s_578)"
+"(let-values(((datum255_0)"
+"(let-values(((s_579)(car s_578)))"
+" s_579))"
+"(()"
 "(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(((datum255_0)"
-"(let-values(((s_582)(car s_581)))"
-" s_582))"
-"(()"
-"(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)"
+"(if(null? s_581)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -66911,47 +66943,47 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(reference-records-all-used!(expand-context-reference-records ctx_88))"
+"(reference-records-all-used!(expand-context-reference-records ctx_89))"
 "(values))))"
 "(let-values(((ok?_45 _256_0 _257_0 kw258_0)"
-"(let-values(((s_585) disarmed-s_12))"
-"(let-values(((orig-s_52) s_585))"
+"(let-values(((s_582) disarmed-s_12))"
+"(let-values(((orig-s_52) s_582))"
 "(let-values(((_256_1 _257_1 kw258_1)"
-"(let-values(((s_586)"
-"(if(syntax?$1 s_585)(syntax-e$1 s_585) s_585)))"
-"(if(pair? s_586)"
+"(let-values(((s_583)"
+"(if(syntax?$1 s_582)(syntax-e$1 s_582) s_582)))"
+"(if(pair? s_583)"
 "(let-values(((_259_0)"
-"(let-values(((s_587)(car s_586))) s_587))"
+"(let-values(((s_584)(car s_583))) s_584))"
 "((_260_0 kw261_0)"
-"(let-values(((s_588)(cdr s_586)))"
+"(let-values(((s_585)(cdr s_583)))"
 "(let-values(((s_282)"
-"(if(syntax?$1 s_588)"
-"(syntax-e$1 s_588)"
-" s_588)))"
+"(if(syntax?$1 s_585)"
+"(syntax-e$1 s_585)"
+" s_585)))"
 "(if(pair? s_282)"
 "(let-values(((_262_0)"
-"(let-values(((s_589)"
+"(let-values(((s_586)"
 "(car s_282)))"
-" s_589))"
+" s_586))"
 "((kw263_0)"
 "(let-values(((s_283)"
 "(cdr s_282)))"
-"(let-values(((s_590)"
+"(let-values(((s_587)"
 "(if(syntax?$1"
 " s_283)"
 "(syntax-e$1"
 " s_283)"
 " s_283)))"
-"(if(pair? s_590)"
+"(if(pair? s_587)"
 "(let-values(((kw264_0)"
 "(let-values(((s_284)"
 "(car"
-" s_590)))"
+" s_587)))"
 " s_284))"
 "(()"
 "(let-values(((s_285)"
 "(cdr"
-" s_590)))"
+" s_587)))"
 "(let-values(((s_286)"
 "(if(syntax?$1"
 " s_285)"
@@ -66978,43 +67010,43 @@ static const char *startup_source =
 "(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))))))"
-"(if(expand-context-to-parsed? ctx_88)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_559) datum247_0)"
-"(let-values(((s265_0) s_559)((temp266_1)(list quote-syntax246_0 datum247_0 kw258_0)))"
+"(if(expand-context-to-parsed? ctx_89)"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_556) datum247_0)"
+"(let-values(((s265_0) s_556)((temp266_1)(list quote-syntax246_0 datum247_0 kw258_0)))"
 "(rebuild5.1 #f #f s265_0 temp266_1))))))"
 "(let-values()"
-"(let-values(((datum-s_0)(remove-scopes datum252_0(expand-context-scopes ctx_88))))"
-"(if(if(expand-context-to-parsed? ctx_88)(free-id-set-empty?(expand-context-stops ctx_88)) #f)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_559) datum-s_0)"
-"(let-values(((s267_0) s_559)((temp268_0)(list quote-syntax251_0 datum-s_0)))"
+"(let-values(((datum-s_0)(remove-scopes datum252_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_556) datum-s_0)"
+"(let-values(((s267_0) s_556)((temp268_0)(list quote-syntax251_0 datum-s_0)))"
 "(rebuild5.1 #f #f s267_0 temp268_0)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
-"(lambda(s_591 ctx_89)"
+"(lambda(s_588 ctx_90)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_108)(expand-context-observer ctx_89)))"
-"(if obs_108(let-values()(let-values()(call-expand-observe obs_108 'prim-if)))(void)))"
+"(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_591)))"
+"(let-values(((disarmed-s_13)(syntax-disarm$1 s_588)))"
 "(let-values(((ok?_46 _269_0 _270_0 _271_0)"
 "(let-values(((s_294) disarmed-s_13))"
 "(if(let-values(((s_295)(if(syntax?$1 s_294)(syntax-e$1 s_294) s_294)))"
 "(if(pair? s_295)"
 "(if(let-values(((s_296)(car s_295))) #t)"
-"(let-values(((s_592)(cdr s_295)))"
-"(let-values(((s_593)(if(syntax?$1 s_592)(syntax-e$1 s_592) s_592)))"
-"(if(pair? s_593)"
-"(if(let-values(((s_297)(car s_593))) #t)"
-"(let-values(((s_298)(cdr s_593)))"
+"(let-values(((s_589)(cdr s_295)))"
+"(let-values(((s_590)(if(syntax?$1 s_589)(syntax-e$1 s_589) s_589)))"
+"(if(pair? s_590)"
+"(if(let-values(((s_297)(car s_590))) #t)"
+"(let-values(((s_298)(cdr s_590)))"
 "(let-values(((s_299)(if(syntax?$1 s_298)(syntax-e$1 s_298) s_298)))"
 "(if(pair? s_299)"
-"(if(let-values(((s_594)(car s_299))) #t)"
-"(let-values(((s_595)(cdr s_299)))"
-"(let-values(((s_596)"
-"(if(syntax?$1 s_595)(syntax-e$1 s_595) s_595)))"
-"(null? s_596)))"
+"(if(let-values(((s_591)(car s_299))) #t)"
+"(let-values(((s_592)(cdr s_299)))"
+"(let-values(((s_593)"
+"(if(syntax?$1 s_592)(syntax-e$1 s_592) s_592)))"
+"(null? s_593)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -67023,37 +67055,37 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((_269_1 _270_1 _271_1)"
-"(let-values(((s_597)(if(syntax?$1 s_294)(syntax-e$1 s_294) s_294)))"
-"(let-values(((_272_0)(let-values(((s_598)(car s_597))) s_598))"
+"(let-values(((s_594)(if(syntax?$1 s_294)(syntax-e$1 s_294) s_294)))"
+"(let-values(((_272_0)(let-values(((s_595)(car s_594))) s_595))"
 "((_273_0 _274_0)"
+"(let-values(((s_596)(cdr s_594)))"
+"(let-values(((s_597)"
+"(if(syntax?$1 s_596)"
+"(syntax-e$1 s_596)"
+" s_596)))"
+"(let-values(((_275_0)"
+"(let-values(((s_598)(car s_597))) s_598))"
+"((_276_0)"
 "(let-values(((s_599)(cdr s_597)))"
 "(let-values(((s_600)"
 "(if(syntax?$1 s_599)"
 "(syntax-e$1 s_599)"
 " s_599)))"
-"(let-values(((_275_0)"
-"(let-values(((s_601)(car s_600))) s_601))"
-"((_276_0)"
-"(let-values(((s_602)(cdr s_600)))"
-"(let-values(((s_603)"
-"(if(syntax?$1 s_602)"
-"(syntax-e$1 s_602)"
-" s_602)))"
 "(let-values(((_277_0)"
-"(let-values(((s_604)"
+"(let-values(((s_601)"
 "(car"
-" s_603)))"
-" s_604))"
+" s_600)))"
+" s_601))"
 "(()"
-"(let-values(((s_605)"
+"(let-values(((s_602)"
 "(cdr"
-" s_603)))"
-"(let-values(((s_606)"
+" s_600)))"
+"(let-values(((s_603)"
 "(if(syntax?$1"
-" s_605)"
+" s_602)"
 "(syntax-e$1"
-" s_605)"
-" s_605)))"
+" s_602)"
+" s_602)))"
 "(values)))))"
 "(values _277_0))))))"
 "(values _275_0 _276_0))))))"
@@ -67063,39 +67095,56 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if ok?_46"
-"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_591))"
+"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_588))"
 "(void))"
 "(values))))"
 "(let-values(((ok?_47 if278_0 tst279_0 thn280_0 els281_0)"
-"(let-values(((s_607) disarmed-s_13))"
-"(let-values(((orig-s_53) s_607))"
+"(let-values(((s_604) disarmed-s_13))"
+"(let-values(((orig-s_53) s_604))"
 "(let-values(((if278_1 tst279_1 thn280_1 els281_1)"
-"(let-values(((s_608)(if(syntax?$1 s_607)(syntax-e$1 s_607) s_607)))"
-"(if(pair? s_608)"
-"(let-values(((if282_0)(let-values(((s_609)(car s_608))) s_609))"
+"(let-values(((s_605)(if(syntax?$1 s_604)(syntax-e$1 s_604) s_604)))"
+"(if(pair? s_605)"
+"(let-values(((if282_0)(let-values(((s_606)(car s_605))) s_606))"
 "((tst283_0 thn284_0 els285_0)"
+"(let-values(((s_607)(cdr s_605)))"
+"(let-values(((s_608)"
+"(if(syntax?$1 s_607)"
+"(syntax-e$1 s_607)"
+" s_607)))"
+"(if(pair? s_608)"
+"(let-values(((tst286_0)"
+"(let-values(((s_609)(car s_608)))"
+" s_609))"
+"((thn287_0 els288_0)"
 "(let-values(((s_610)(cdr s_608)))"
 "(let-values(((s_611)"
 "(if(syntax?$1 s_610)"
 "(syntax-e$1 s_610)"
 " s_610)))"
 "(if(pair? s_611)"
-"(let-values(((tst286_0)"
-"(let-values(((s_612)(car s_611)))"
-" s_612))"
-"((thn287_0 els288_0)"
-"(let-values(((s_613)(cdr s_611)))"
-"(let-values(((s_614)"
-"(if(syntax?$1 s_613)"
-"(syntax-e$1 s_613)"
-" s_613)))"
-"(if(pair? s_614)"
 "(let-values(((thn289_0)"
+"(let-values(((s_612)"
+"(car"
+" s_611)))"
+" s_612))"
+"((els290_0)"
+"(let-values(((s_613)"
+"(cdr"
+" s_611)))"
+"(let-values(((s_614)"
+"(if(syntax?$1"
+" s_613)"
+"(syntax-e$1"
+" s_613)"
+" s_613)))"
+"(if(pair?"
+" s_614)"
+"(let-values(((els291_0)"
 "(let-values(((s_615)"
 "(car"
 " s_614)))"
 " s_615))"
-"((els290_0)"
+"(()"
 "(let-values(((s_616)"
 "(cdr"
 " s_614)))"
@@ -67105,25 +67154,8 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_616)"
 " s_616)))"
-"(if(pair?"
-" s_617)"
-"(let-values(((els291_0)"
-"(let-values(((s_618)"
-"(car"
-" s_617)))"
-" s_618))"
-"(()"
-"(let-values(((s_619)"
-"(cdr"
-" s_617)))"
-"(let-values(((s_620)"
-"(if(syntax?$1"
-" s_619)"
-"(syntax-e$1"
-" s_619)"
-" s_619)))"
 "(if(null?"
-" s_620)"
+" s_617)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67148,21 +67180,21 @@ static const char *startup_source =
 "(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))))))"
-"(let-values(((expr-ctx_2)(as-expression-context ctx_89)))"
+"(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_89))"
+"(let-values(((expr-ctx292_0) expr-ctx_2)((ctx293_0) ctx_90))"
 "(as-tail-context23.1 ctx293_0 expr-ctx292_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx294_0) ctx_89)((s295_0) s_591))"
-"(keep-as-needed74.1 #f #f #f #f #f #f ctx294_0 s295_0))))"
+"(let-values(((ctx294_0) ctx_90)((s295_0) s_588))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx294_0 s295_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((()"
 "(begin"
-"(let-values(((obs_109)(expand-context-observer ctx_89)))"
-"(if obs_109"
-"(let-values()(let-values()(call-expand-observe obs_109 'next)))"
+"(let-values(((obs_106)(expand-context-observer ctx_90)))"
+"(if obs_106"
+"(let-values()(let-values()(call-expand-observe obs_106 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-thn_0)"
@@ -67170,15 +67202,15 @@ static const char *startup_source =
 "(expand7.1 #f #f #f #f temp298_0 tail-ctx299_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_110)(expand-context-observer ctx_89)))"
-"(if obs_110"
-"(let-values()(let-values()(call-expand-observe obs_110 'next)))"
+"(let-values(((obs_107)(expand-context-observer ctx_90)))"
+"(if obs_107"
+"(let-values()(let-values()(call-expand-observe obs_107 'next)))"
 "(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))))"
-"(if(expand-context-to-parsed? ctx_89)"
+"(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)))"
@@ -67186,46 +67218,62 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_621 ctx_90)"
+"(lambda(s_618 ctx_91)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_111)(expand-context-observer ctx_90)))"
-"(if obs_111"
-"(let-values()(let-values()(call-expand-observe obs_111 'prim-with-continuation-mark)))"
+"(let-values(((obs_108)(expand-context-observer ctx_91)))"
+"(if obs_108"
+"(let-values()(let-values()(call-expand-observe obs_108 'prim-with-continuation-mark)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_14)(syntax-disarm$1 s_621)))"
+"(let-values(((disarmed-s_14)(syntax-disarm$1 s_618)))"
 "(let-values(((ok?_48 with-continuation-mark304_0 key305_0 val306_0 body307_0)"
-"(let-values(((s_622) disarmed-s_14))"
-"(let-values(((orig-s_54) s_622))"
+"(let-values(((s_619) disarmed-s_14))"
+"(let-values(((orig-s_54) s_619))"
 "(let-values(((with-continuation-mark304_1 key305_1 val306_1 body307_1)"
-"(let-values(((s_623)(if(syntax?$1 s_622)(syntax-e$1 s_622) s_622)))"
-"(if(pair? s_623)"
+"(let-values(((s_620)(if(syntax?$1 s_619)(syntax-e$1 s_619) s_619)))"
+"(if(pair? s_620)"
 "(let-values(((with-continuation-mark308_0)"
-"(let-values(((s_624)(car s_623))) s_624))"
+"(let-values(((s_621)(car s_620))) s_621))"
 "((key309_0 val310_0 body311_0)"
+"(let-values(((s_622)(cdr s_620)))"
+"(let-values(((s_623)"
+"(if(syntax?$1 s_622)"
+"(syntax-e$1 s_622)"
+" s_622)))"
+"(if(pair? s_623)"
+"(let-values(((key312_0)"
+"(let-values(((s_624)(car s_623)))"
+" s_624))"
+"((val313_0 body314_0)"
 "(let-values(((s_625)(cdr s_623)))"
 "(let-values(((s_626)"
 "(if(syntax?$1 s_625)"
 "(syntax-e$1 s_625)"
 " s_625)))"
 "(if(pair? s_626)"
-"(let-values(((key312_0)"
-"(let-values(((s_627)(car s_626)))"
+"(let-values(((val315_0)"
+"(let-values(((s_627)"
+"(car"
+" s_626)))"
 " s_627))"
-"((val313_0 body314_0)"
-"(let-values(((s_628)(cdr s_626)))"
+"((body316_0)"
+"(let-values(((s_628)"
+"(cdr"
+" s_626)))"
 "(let-values(((s_629)"
-"(if(syntax?$1 s_628)"
-"(syntax-e$1 s_628)"
+"(if(syntax?$1"
+" s_628)"
+"(syntax-e$1"
+" s_628)"
 " s_628)))"
 "(if(pair? s_629)"
-"(let-values(((val315_0)"
+"(let-values(((body317_0)"
 "(let-values(((s_630)"
 "(car"
 " s_629)))"
 " s_630))"
-"((body316_0)"
+"(()"
 "(let-values(((s_631)"
 "(cdr"
 " s_629)))"
@@ -67235,24 +67283,8 @@ static const char *startup_source =
 "(syntax-e$1"
 " s_631)"
 " s_631)))"
-"(if(pair? s_632)"
-"(let-values(((body317_0)"
-"(let-values(((s_633)"
-"(car"
-" s_632)))"
-" s_633))"
-"(()"
-"(let-values(((s_634)"
-"(cdr"
-" s_632)))"
-"(let-values(((s_635)"
-"(if(syntax?$1"
-" s_634)"
-"(syntax-e$1"
-" s_634)"
-" s_634)))"
 "(if(null?"
-" s_635)"
+" s_632)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67274,18 +67306,18 @@ static const char *startup_source =
 "(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))))))"
-"(let-values(((expr-ctx_3)(as-expression-context ctx_90)))"
+"(let-values(((expr-ctx_3)(as-expression-context ctx_91)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx318_0) ctx_90)((s319_0) s_621))"
-"(keep-as-needed74.1 #f #f #f #f #f #f ctx318_0 s319_0))))"
+"(let-values(((ctx318_0) ctx_91)((s319_0) s_618))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx318_0 s319_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((()"
 "(begin"
-"(let-values(((obs_112)(expand-context-observer ctx_90)))"
-"(if obs_112"
-"(let-values()(let-values()(call-expand-observe obs_112 'next)))"
+"(let-values(((obs_109)(expand-context-observer ctx_91)))"
+"(if obs_109"
+"(let-values()(let-values()(call-expand-observe obs_109 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-val_0)"
@@ -67293,18 +67325,18 @@ static const char *startup_source =
 "(expand7.1 #f #f #f #f temp322_0 expr-ctx323_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_113)(expand-context-observer ctx_90)))"
-"(if obs_113"
-"(let-values()(let-values()(call-expand-observe obs_113 'next)))"
+"(let-values(((obs_110)(expand-context-observer ctx_91)))"
+"(if obs_110"
+"(let-values()(let-values()(call-expand-observe obs_110 'next)))"
 "(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_90))"
+"(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))))"
-"(if(expand-context-to-parsed? ctx_90)"
+"(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)))"
@@ -67319,32 +67351,32 @@ 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_636 ctx_91)"
+"(lambda(s_633 ctx_92)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_114)(expand-context-observer ctx_91)))"
-"(if obs_114"
-"(let-values()(let-values()(call-expand-observe obs_114 log-tag_1)))"
+"(let-values(((obs_111)(expand-context-observer ctx_92)))"
+"(if obs_111"
+"(let-values()(let-values()(call-expand-observe obs_111 log-tag_1)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_15)(syntax-disarm$1 s_636)))"
+"(let-values(((disarmed-s_15)(syntax-disarm$1 s_633)))"
 "(let-values(((ok?_49 begin330_0 e331_0)"
-"(let-values(((s_637) disarmed-s_15))"
-"(let-values(((orig-s_55) s_637))"
+"(let-values(((s_634) disarmed-s_15))"
+"(let-values(((orig-s_55) s_634))"
 "(let-values(((begin330_1 e331_1)"
-"(let-values(((s_638)"
-"(if(syntax?$1 s_637)(syntax-e$1 s_637) s_637)))"
-"(if(pair? s_638)"
+"(let-values(((s_635)"
+"(if(syntax?$1 s_634)(syntax-e$1 s_634) s_634)))"
+"(if(pair? s_635)"
 "(let-values(((begin332_0)"
-"(let-values(((s_639)(car s_638))) s_639))"
+"(let-values(((s_636)(car s_635))) s_636))"
 "((e333_0)"
-"(let-values(((s_640)(cdr s_638)))"
-"(let-values(((s_641)"
-"(if(syntax?$1 s_640)"
-"(syntax-e$1 s_640)"
-" s_640)))"
+"(let-values(((s_637)(cdr s_635)))"
+"(let-values(((s_638)"
+"(if(syntax?$1 s_637)"
+"(syntax-e$1 s_637)"
+" s_637)))"
 "(let-values(((flat-s_41)"
-"(to-syntax-list.1 s_641)))"
+"(to-syntax-list.1 s_638)))"
 "(if(not flat-s_41)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -67363,11 +67395,11 @@ static const char *startup_source =
 "(values #t begin330_1 e331_1))))))"
 "(let-values(((expr-ctx_4)"
 "(if last-is-tail?_0"
-"(as-begin-expression-context ctx_91)"
-"(as-expression-context ctx_91))))"
+"(as-begin-expression-context ctx_92)"
+"(as-expression-context ctx_92))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx334_0) ctx_91)((s335_0) s_636))"
-"(keep-as-needed74.1 #f #f #f #f #f #f ctx334_0 s335_0))))"
+"(let-values(((ctx334_0) ctx_92)((s335_0) s_633))"
+"(keep-as-needed85.1 #f #f #f #f #f #f ctx334_0 s335_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_123)"
 "(lambda(es_5 index_6)"
@@ -67376,17 +67408,17 @@ static const char *startup_source =
 "(begin"
 "(if(zero? index_6)"
 "(let-values()"
-"(let-values(((obs_115)"
-"(expand-context-observer ctx_91)))"
-"(if obs_115"
+"(let-values(((obs_112)"
+"(expand-context-observer ctx_92)))"
+"(if obs_112"
 "(let-values()"
 "(begin"
 "(if(zero? list-start-index_0)"
 "(void)"
 "(let-values()"
-"(call-expand-observe obs_115 'next)))"
+"(call-expand-observe obs_112 'next)))"
 "(call-expand-observe"
-" obs_115"
+" obs_112"
 " 'enter-list"
 "(datum->syntax$1 #f es_5 rebuild-s_11))))"
 "(void))))"
@@ -67396,13 +67428,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((rest-es_1)(cdr es_5)))"
 "(begin"
-"(let-values(((obs_116)"
+"(let-values(((obs_113)"
 "(expand-context-observer"
-" ctx_91)))"
-"(if obs_116"
+" ctx_92)))"
+"(if obs_113"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_116 'next)))"
+"(call-expand-observe obs_113 'next)))"
 "(void)))"
 "(cons"
 "(let-values(((temp336_0)(car es_5))"
@@ -67413,7 +67445,7 @@ static const char *startup_source =
 "(let-values(((expr-ctx338_0)"
 " expr-ctx_4)"
 "((ctx339_0)"
-" ctx_91))"
+" ctx_92))"
 "(as-tail-context23.1"
 " ctx339_0"
 " expr-ctx338_0))"
@@ -67430,16 +67462,16 @@ static const char *startup_source =
 " e331_0"
 " list-start-index_0)))"
 "(begin"
-"(let-values(((obs_117)(expand-context-observer ctx_91)))"
-"(if obs_117"
+"(let-values(((obs_114)(expand-context-observer ctx_92)))"
+"(if obs_114"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_117"
+" obs_114"
 " 'exit-list"
 "(datum->syntax$1 #f(list-tail exp-es_2 list-start-index_0) rebuild-s_11))))"
 "(void)))"
-"(if(expand-context-to-parsed? ctx_91)"
+"(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)))))))))))))))))))"
@@ -67452,39 +67484,39 @@ static const char *startup_source =
 "((temp344_0) 0)"
 "((temp345_0) #t))"
 "(make-begin20.1 temp345_0 temp344_0 temp342_0 parsed-begin343_0))))"
-"(lambda(s_642 ctx_92)"
-"(let-values(((context_24)(expand-context-context ctx_92)))"
-"(if(let-values(((or-part_385)(eq? context_24 'top-level)))"
-"(if or-part_385 or-part_385(eq? context_24 'module)))"
+"(lambda(s_639 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)))"
 "(let-values()"
-"(let-values(((disarmed-s_16)(syntax-disarm$1 s_642)))"
+"(let-values(((disarmed-s_16)(syntax-disarm$1 s_639)))"
 "(let-values(((ok?_50 begin346_0)"
-"(let-values(((s_643) disarmed-s_16))"
-"(if(let-values(((s_644)(if(syntax?$1 s_643)(syntax-e$1 s_643) s_643)))"
-"(if(pair? s_644)"
-"(if(let-values(((s_645)(car s_644))) #t)"
-"(let-values(((s_646)(cdr s_644)))"
-"(let-values(((s_647)(if(syntax?$1 s_646)(syntax-e$1 s_646) s_646)))"
-"(null? s_647)))"
+"(let-values(((s_640) disarmed-s_16))"
+"(if(let-values(((s_641)(if(syntax?$1 s_640)(syntax-e$1 s_640) s_640)))"
+"(if(pair? s_641)"
+"(if(let-values(((s_642)(car s_641))) #t)"
+"(let-values(((s_643)(cdr s_641)))"
+"(let-values(((s_644)(if(syntax?$1 s_643)(syntax-e$1 s_643) s_643)))"
+"(null? s_644)))"
 " #f)"
 " #f))"
 "(let-values()"
 "(let-values(((begin346_1)"
-"(let-values(((s_648)(if(syntax?$1 s_643)(syntax-e$1 s_643) s_643)))"
+"(let-values(((s_645)(if(syntax?$1 s_640)(syntax-e$1 s_640) s_640)))"
 "(let-values(((begin347_0)"
-"(let-values(((s_649)(car s_648))) s_649))"
+"(let-values(((s_646)(car s_645))) s_646))"
 "(()"
-"(let-values(((s_650)(cdr s_648)))"
-"(let-values(((s_651)"
-"(if(syntax?$1 s_650)"
-"(syntax-e$1 s_650)"
-" s_650)))"
+"(let-values(((s_647)(cdr s_645)))"
+"(let-values(((s_648)"
+"(if(syntax?$1 s_647)"
+"(syntax-e$1 s_647)"
+" s_647)))"
 "(values)))))"
 "(values begin347_0)))))"
 "(values #t begin346_1)))"
 "(values #f #f)))))"
-"(if ok?_50 s_642(nonempty-begin_0 s_642 ctx_92)))))"
-"(let-values()(nonempty-begin_0 s_642 ctx_92))))))))"
+"(if ok?_50 s_639(nonempty-begin_0 s_639 ctx_93)))))"
+"(let-values()(nonempty-begin_0 s_639 ctx_93))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
@@ -67492,15 +67524,15 @@ static const char *startup_source =
 "(make-begin20.1 temp351_0 temp350_0 temp348_0 parsed-begin0349_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
-"(lambda(id_126 ctx_93)"
+"(lambda(id_127 ctx_94)"
 "(begin"
-"(if(if(expand-context-need-eventually-defined ctx_93)(>=(expand-context-phase ctx_93) 1) #f)"
+"(if(if(expand-context-need-eventually-defined ctx_94)(>=(expand-context-phase ctx_94) 1) #f)"
 "(let-values()"
 "(begin"
 "(hash-update!"
-"(expand-context-need-eventually-defined ctx_93)"
-"(expand-context-phase ctx_93)"
-"(lambda(l_82)(cons id_126 l_82))"
+"(expand-context-need-eventually-defined ctx_94)"
+"(expand-context-phase ctx_94)"
+"(lambda(l_82)(cons id_127 l_82))"
 " null)"
 " #t))"
 "(let-values() #f)))))"
@@ -67511,58 +67543,58 @@ static const char *startup_source =
 "(lambda(s354_0 ctx355_0 implicit-omitted?352_0 implicit-omitted?353_0)"
 "(begin"
 " 'core356"
-"(let-values(((s_652) s354_0))"
-"(let-values(((ctx_94) ctx355_0))"
+"(let-values(((s_649) s354_0))"
+"(let-values(((ctx_95) ctx355_0))"
 "(let-values(((implicit-omitted?_0)(if implicit-omitted?353_0 implicit-omitted?352_0 #f)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_118)(expand-context-observer ctx_94)))"
-"(if obs_118"
+"(let-values(((obs_115)(expand-context-observer ctx_95)))"
+"(if obs_115"
 "(let-values()"
-"(let-values()(call-expand-observe obs_118 'prim-#%top)))"
+"(let-values()(call-expand-observe obs_115 'prim-#%top)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_17)(syntax-disarm$1 s_652)))"
-"(let-values(((id_127)"
+"(let-values(((disarmed-s_17)(syntax-disarm$1 s_649)))"
+"(let-values(((id_128)"
 "(if implicit-omitted?_0"
-"(let-values() s_652)"
+"(let-values() s_649)"
 "(let-values()"
 "(let-values(((ok?_51 #%top358_0 id359_0)"
-"(let-values(((s_653) disarmed-s_17))"
-"(let-values(((orig-s_56) s_653))"
+"(let-values(((s_650) disarmed-s_17))"
+"(let-values(((orig-s_56) s_650))"
 "(let-values(((#%top358_1 id359_1)"
-"(let-values(((s_654)"
-"(if(syntax?$1 s_653)"
-"(syntax-e$1 s_653)"
-" s_653)))"
-"(if(pair? s_654)"
+"(let-values(((s_651)"
+"(if(syntax?$1 s_650)"
+"(syntax-e$1 s_650)"
+" s_650)))"
+"(if(pair? s_651)"
 "(let-values(((#%top360_0)"
-"(let-values(((s_655)"
+"(let-values(((s_652)"
 "(car"
-" s_654)))"
-" s_655))"
+" s_651)))"
+" s_652))"
 "((id361_0)"
-"(let-values(((s_656)"
+"(let-values(((s_653)"
 "(cdr"
-" s_654)))"
-"(if(let-values(((or-part_386)"
+" s_651)))"
+"(if(let-values(((or-part_387)"
 "(if(syntax?$1"
-" s_656)"
+" s_653)"
 "(symbol?"
 "(syntax-e$1"
-" s_656))"
+" s_653))"
 " #f)))"
-"(if or-part_386"
-" or-part_386"
+"(if or-part_387"
+" or-part_387"
 "(symbol?"
-" s_656)))"
-" s_656"
+" s_653)))"
+" s_653"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"not an identifier\""
 " orig-s_56"
-" s_656)))))"
+" s_653)))))"
 "(values #%top360_0 id361_0))"
 "(raise-syntax-error$1"
 " #f"
@@ -67571,8 +67603,8 @@ static const char *startup_source =
 "(values #t #%top358_1 id359_1))))))"
 " id359_0)))))"
 "(let-values(((b_89)"
-"(let-values(((id362_0) id_127)"
-"((temp363_0)(expand-context-phase ctx_94))"
+"(let-values(((id362_0) id_128)"
+"((temp363_0)(expand-context-phase ctx_95))"
 "((temp364_0) 'ambiguous))"
 "(resolve+shift30.1"
 " temp364_0"
@@ -67588,42 +67620,42 @@ static const char *startup_source =
 " id362_0"
 " temp363_0))))"
 "(if(eq? b_89 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_127 ctx_94))"
+"(let-values()(raise-ambiguous-error id_128 ctx_95))"
 "(if(if b_89"
 "(if(module-binding? b_89)"
-"(eq?(module-binding-module b_89)(root-expand-context-self-mpi ctx_94))"
+"(eq?(module-binding-module b_89)(root-expand-context-self-mpi ctx_95))"
 " #f)"
 " #f)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-id2.1 id_127 b_89 #f)"
+"(if(expand-context-to-parsed? ctx_95)"
+"(parsed-id2.1 id_128 b_89 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_89))"
-"(let-values() s_652)"
-"(let-values() id_127))))"
-"(if(register-eventual-variable!? id_127 ctx_94)"
+"(let-values() s_649)"
+"(let-values() id_128))))"
+"(if(register-eventual-variable!? id_128 ctx_95)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-id2.1 id_127 b_89 #f)"
-" id_127))"
+"(if(expand-context-to-parsed? ctx_95)"
+"(parsed-id2.1 id_128 b_89 #f)"
+" id_128))"
 "(let-values()"
-"(if(not(expand-context-allow-unbound? ctx_94))"
+"(if(not(expand-context-allow-unbound? ctx_95))"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" id_127"
+" id_128"
 " #f"
 " null"
-"(syntax-debug-info-string id_127 ctx_94)))"
+"(syntax-debug-info-string id_128 ctx_95)))"
 "(let-values()"
 "(let-values(((tl-id_1)"
 "(add-scope"
-" id_127"
-"(root-expand-context-top-level-bind-scope ctx_94))))"
+" id_128"
+"(root-expand-context-top-level-bind-scope ctx_95))))"
 "(let-values(((tl-b_1)"
 "(let-values(((tl-id365_0) tl-id_1)"
 "((temp366_0)"
-"(expand-context-phase ctx_94)))"
+"(expand-context-phase ctx_95)))"
 "(resolve40.1"
 " #f"
 " #f"
@@ -67637,48 +67669,48 @@ static const char *startup_source =
 " temp366_0))))"
 "(if tl-b_1"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
+"(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_127)"
+"(let-values() id_128)"
 "(let-values()"
 "(let-values(((ok?_52 #%top367_0 id368_0)"
-"(let-values(((s_657) disarmed-s_17))"
-"(let-values(((orig-s_57) s_657))"
+"(let-values(((s_654) disarmed-s_17))"
+"(let-values(((orig-s_57) s_654))"
 "(let-values(((#%top367_1 id368_1)"
-"(let-values(((s_658)"
+"(let-values(((s_655)"
 "(if(syntax?$1"
-" s_657)"
+" s_654)"
 "(syntax-e$1"
-" s_657)"
-" s_657)))"
-"(if(pair? s_658)"
+" s_654)"
+" s_654)))"
+"(if(pair? s_655)"
 "(let-values(((#%top369_0)"
-"(let-values(((s_659)"
+"(let-values(((s_656)"
 "(car"
-" s_658)))"
-" s_659))"
+" s_655)))"
+" s_656))"
 "((id370_0)"
-"(let-values(((s_660)"
+"(let-values(((s_657)"
 "(cdr"
-" s_658)))"
-"(if(let-values(((or-part_387)"
+" s_655)))"
+"(if(let-values(((or-part_388)"
 "(if(syntax?$1"
-" s_660)"
+" s_657)"
 "(symbol?"
 "(syntax-e$1"
-" s_660))"
+" s_657))"
 " #f)))"
-"(if or-part_387"
-" or-part_387"
+"(if or-part_388"
+" or-part_388"
 "(symbol?"
-" s_660)))"
-" s_660"
+" s_657)))"
+" s_657"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                      \"not an identifier\""
 " orig-s_57"
-" s_660)))))"
+" s_657)))))"
 "(values"
 " #%top369_0"
 " id370_0))"
@@ -67687,80 +67719,80 @@ static const char *startup_source =
 "                                                                                                    \"bad syntax\""
 " orig-s_57)))))"
 "(values #t #%top367_1 id368_1))))))"
-"(let-values(((s371_0) s_652)"
-"((temp372_0)(cons #%top367_0 id_127)))"
+"(let-values(((s371_0) s_649)"
+"((temp372_0)(cons #%top367_0 id_128)))"
 "(rebuild5.1 #f #f s371_0 temp372_0)))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-top-id4.1 id_127 b_89 #f)"
-" s_652)))))))))))))))))))))))"
+"(if(expand-context-to-parsed? ctx_95)"
+"(parsed-top-id4.1 id_128 b_89 #f)"
+" s_649)))))))))))))))))))))))"
 "(case-lambda"
-"((s_661 ctx_95)(core356_0 s_661 ctx_95 #f #f))"
-"((s_662 ctx_96 implicit-omitted?352_1)(core356_0 s_662 ctx_96 implicit-omitted?352_1 #t))))))"
+"((s_658 ctx_96)(core356_0 s_658 ctx_96 #f #f))"
+"((s_659 ctx_97 implicit-omitted?352_1)(core356_0 s_659 ctx_97 implicit-omitted?352_1 #t))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
-"(lambda(s_663 ctx_97)"
+"(lambda(s_660 ctx_98)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_119)(expand-context-observer ctx_97)))"
-"(if obs_119(let-values()(let-values()(call-expand-observe obs_119 'prim-set!)))(void)))"
+"(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_663)))"
+"(let-values(((disarmed-s_18)(syntax-disarm$1 s_660)))"
 "(let-values(((ok?_53 set!373_0 id374_0 rhs375_0)"
-"(let-values(((s_664) disarmed-s_18))"
-"(let-values(((orig-s_58) s_664))"
+"(let-values(((s_661) disarmed-s_18))"
+"(let-values(((orig-s_58) s_661))"
 "(let-values(((set!373_1 id374_1 rhs375_1)"
-"(let-values(((s_665)(if(syntax?$1 s_664)(syntax-e$1 s_664) s_664)))"
-"(if(pair? s_665)"
-"(let-values(((set!376_0)(let-values(((s_666)(car s_665))) s_666))"
+"(let-values(((s_662)(if(syntax?$1 s_661)(syntax-e$1 s_661) s_661)))"
+"(if(pair? s_662)"
+"(let-values(((set!376_0)(let-values(((s_663)(car s_662))) s_663))"
 "((id377_0 rhs378_0)"
+"(let-values(((s_664)(cdr s_662)))"
+"(let-values(((s_665)"
+"(if(syntax?$1 s_664)"
+"(syntax-e$1 s_664)"
+" s_664)))"
+"(if(pair? s_665)"
+"(let-values(((id379_0)"
+"(let-values(((s_666)(car s_665)))"
+"(if(let-values(((or-part_389)"
+"(if(syntax?$1 s_666)"
+"(symbol?"
+"(syntax-e$1"
+" s_666))"
+" #f)))"
+"(if or-part_389"
+" or-part_389"
+"(symbol? s_666)))"
+" s_666"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                    \"not an identifier\""
+" orig-s_58"
+" s_666))))"
+"((rhs380_0)"
 "(let-values(((s_667)(cdr s_665)))"
 "(let-values(((s_668)"
 "(if(syntax?$1 s_667)"
 "(syntax-e$1 s_667)"
 " s_667)))"
 "(if(pair? s_668)"
-"(let-values(((id379_0)"
-"(let-values(((s_669)(car s_668)))"
-"(if(let-values(((or-part_388)"
-"(if(syntax?$1 s_669)"
-"(symbol?"
-"(syntax-e$1"
-" s_669))"
-" #f)))"
-"(if or-part_388"
-" or-part_388"
-"(symbol? s_669)))"
-" s_669"
-"(raise-syntax-error$1"
-" #f"
-"                                                                                    \"not an identifier\""
-" orig-s_58"
-" s_669))))"
-"((rhs380_0)"
-"(let-values(((s_670)(cdr s_668)))"
-"(let-values(((s_671)"
-"(if(syntax?$1 s_670)"
-"(syntax-e$1 s_670)"
-" s_670)))"
-"(if(pair? s_671)"
 "(let-values(((rhs381_0)"
-"(let-values(((s_672)"
+"(let-values(((s_669)"
 "(car"
-" s_671)))"
-" s_672))"
+" s_668)))"
+" s_669))"
 "(()"
-"(let-values(((s_673)"
+"(let-values(((s_670)"
 "(cdr"
-" s_671)))"
-"(let-values(((s_674)"
+" s_668)))"
+"(let-values(((s_671)"
 "(if(syntax?$1"
-" s_673)"
+" s_670)"
 "(syntax-e$1"
-" s_673)"
-" s_673)))"
-"(if(null? s_674)"
+" s_670)"
+" s_670)))"
+"(if(null? s_671)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67776,14 +67808,14 @@ static const char *startup_source =
 "(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(((id_128) id374_0))"
+"(let-values(((orig-id_1) id374_0))"
 "((letrec-values(((rename-loop_0)"
 "(lambda(id_129 from-rename?_0)"
 "(begin"
 " 'rename-loop"
 "(let-values(((binding_30)"
 "(let-values(((id382_0) id_129)"
-"((temp383_0)(expand-context-phase ctx_97))"
+"((temp383_0)(expand-context-phase ctx_98))"
 "((temp384_0) 'ambiguous)"
 "((temp385_0) #t))"
 "(resolve+shift30.1"
@@ -67802,31 +67834,31 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if(eq? binding_30 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_129 ctx_97))"
+"(let-values()(raise-ambiguous-error id_129 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_97)"
-"((s388_0) s_663))"
-"(lookup17.1 #f #f #f #f binding386_0 ctx387_0 s388_0))"
+"((ctx387_0) ctx_98)"
+"((s388_0) s_660))"
+"(lookup28.1 #f #f #f #f binding386_0 ctx387_0 s388_0))"
 "(values #f #f #f #f))))"
 "(begin"
-"(let-values(((obs_120)(expand-context-observer ctx_97)))"
-"(if obs_120"
+"(let-values(((obs_117)(expand-context-observer ctx_98)))"
+"(if obs_117"
 "(let-values()"
-"(let-values()(call-expand-observe obs_120 'resolve id_129)))"
+"(let-values()(call-expand-observe obs_117 'resolve id_129)))"
 "(void)))"
-"(if(let-values(((or-part_389)(variable? t_58)))"
-"(if or-part_389"
-" or-part_389"
-"(if(not binding_30)"
-"(let-values(((or-part_390)"
-"(register-eventual-variable!? id_129 ctx_97)))"
+"(if(let-values(((or-part_390)(variable? t_58)))"
 "(if or-part_390"
 " or-part_390"
-"(expand-context-allow-unbound? ctx_97)))"
+"(if(not binding_30)"
+"(let-values(((or-part_391)"
+"(register-eventual-variable!? id_129 ctx_98)))"
+"(if or-part_391"
+" or-part_391"
+"(expand-context-allow-unbound? ctx_98)))"
 " #f)))"
 "(let-values()"
 "(let-values((()"
@@ -67835,24 +67867,24 @@ static const char *startup_source =
 "(not"
 "(eq?"
 "(module-binding-module binding_30)"
-"(root-expand-context-self-mpi ctx_97)))"
+"(root-expand-context-self-mpi ctx_98)))"
 " #f)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                    \"cannot mutate module-required identifier\""
-" s_663"
+" s_660"
 " id_129))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_121)"
-"(expand-context-observer ctx_97)))"
-"(if obs_121"
+"(let-values(((obs_118)"
+"(expand-context-observer ctx_98)))"
+"(if obs_118"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_121 'next)))"
+"(call-expand-observe obs_118 'next)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -67860,8 +67892,8 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_30)"
 "(values))))"
 "(let-values(((rebuild-s_12)"
-"(let-values(((ctx389_0) ctx_97)((s390_0) s_663))"
-"(keep-as-needed74.1"
+"(let-values(((ctx389_0) ctx_98)((s390_0) s_660))"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -67870,16 +67902,16 @@ static const char *startup_source =
 " #f"
 " ctx389_0"
 " s390_0))))"
-"(let-values(((exp-rhs_4)"
+"(let-values(((exp-rhs_5)"
 "(let-values(((temp391_0) rhs375_0)"
 "((temp392_0)"
-"(as-expression-context ctx_97)))"
+"(as-expression-context ctx_98)))"
 "(expand7.1 #f #f #f #f temp391_0 temp392_0))))"
-"(if(expand-context-to-parsed? ctx_97)"
+"(if(expand-context-to-parsed? ctx_98)"
 "(parsed-set!9.1"
 " rebuild-s_12"
 "(parsed-id2.1 id_129 binding_30 #f)"
-" exp-rhs_4)"
+" exp-rhs_5)"
 "(let-values(((rebuild-s393_0) rebuild-s_12)"
 "((temp394_0)"
 "(list"
@@ -67889,86 +67921,98 @@ static const char *startup_source =
 "((temp397_0)"
 "(free-id-set-empty-or-just-module*?"
 "(expand-context-stops"
-" ctx_97))))"
+" ctx_98))))"
 "(substitute-variable6.1"
 " temp397_0"
 " id395_0"
 " t396_0))"
-" exp-rhs_4)))"
+" exp-rhs_5)))"
 "(rebuild5.1 #f #f rebuild-s393_0 temp394_0)))))))))"
 "(if(not binding_30)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" s_663"
+" s_660"
 " id_129"
 " null"
-"(syntax-debug-info-string id_129 ctx_97)))"
+"(syntax-debug-info-string id_129 ctx_98)))"
 "(if(1/set!-transformer? t_58)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_58 ctx_97)"
+"(if(not-in-this-expand-context? t_58 ctx_98)"
 "(let-values()"
 "(let-values(((temp398_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_663"
+" s_660"
 " disarmed-s_18"
 " set!373_0"
 " rhs375_0"
 " id_129"
 " from-rename?_0"
-" ctx_97)"
+" ctx_98)"
 " t_58"
-" ctx_97))"
-"((ctx399_0) ctx_97))"
+" ctx_98))"
+"((ctx399_0) ctx_98))"
 "(expand7.1 #f #f #f #f temp398_0 ctx399_0)))"
 "(let-values()"
 "(let-values(((exp-s_14 re-ctx_1)"
-"(apply-transformer"
-" t_58"
-" insp_24"
-" s_663"
-" id_129"
-" ctx_97"
-" binding_30)))"
-"(if(expand-context-just-once? ctx_97)"
+"(let-values(((t400_0) t_58)"
+"((insp401_0) insp_24)"
+"((s402_0) s_660)"
+"((orig-id403_0) orig-id_1)"
+"((ctx404_0) ctx_98)"
+"((binding405_0) binding_30)"
+"((orig-id406_0) orig-id_1))"
+"(apply-transformer18.1"
+" orig-id406_0"
+" #t"
+" t400_0"
+" insp401_0"
+" s402_0"
+" orig-id403_0"
+" ctx404_0"
+" binding405_0))))"
+"(if(expand-context-just-once? ctx_98)"
 "(let-values() exp-s_14)"
 "(let-values()"
-"(let-values(((exp-s400_0) exp-s_14)"
-"((re-ctx401_0) re-ctx_1))"
-"(expand7.1 #f #f #f #f exp-s400_0 re-ctx401_0))))))))"
+"(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))))))))"
 "(if(1/rename-transformer? t_58)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_58 ctx_97)"
+"(if(not-in-this-expand-context? t_58 ctx_98)"
 "(let-values()"
-"(let-values(((temp402_0)"
+"(let-values(((temp409_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_663"
+" s_660"
 " disarmed-s_18"
 " set!373_0"
 " rhs375_0"
 " id_129"
 " from-rename?_0"
-" ctx_97"
+" ctx_98"
 " t_58)"
 " t_58"
-" ctx_97))"
-"((ctx403_0) ctx_97))"
-"(expand7.1 #f #f #f #f temp402_0 ctx403_0)))"
+" ctx_98))"
+"((ctx410_0) ctx_98))"
+"(expand7.1 #f #f #f #f temp409_0 ctx410_0)))"
 "(let-values()"
 "(rename-loop_0"
-"(rename-transformer-target-in-context t_58 ctx_97)"
+"(syntax-track-origin$1"
+"(rename-transformer-target-in-context t_58 ctx_98)"
+" id_129"
+" id_129)"
 " #t))))"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                      \"cannot mutate syntax identifier\""
-" s_663"
+" s_660"
 " id_129))))))))))))))"
 " rename-loop_0)"
-" id_128"
+" orig-id_1"
 " #f))))))))"
 "(define-values"
 "(substitute-set!-rename)"
@@ -67976,21 +68020,21 @@ 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_675) s25_0))"
+"(let-values(((s_672) 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(((rhs-s_0) rhs-s29_0))"
 "(let-values(((from-rename?_1) from-rename?30_0))"
-"(let-values(((ctx_98) ctx31_0))"
+"(let-values(((ctx_99) ctx31_0))"
 "(let-values(((t_59)(if t24_0 t23_0 #f)))"
 "(let-values()"
-"(if(let-values(((or-part_391) t_59))"
-"(if or-part_391 or-part_391 from-rename?_1))"
+"(if(let-values(((or-part_392) t_59))"
+"(if or-part_392 or-part_392 from-rename?_1))"
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_59"
-"(rename-transformer-target-in-context t_59 ctx_98)"
+"(rename-transformer-target-in-context t_59 ctx_99)"
 " id_130)))"
 "(syntax-rearm$1"
 "(datum->syntax$1"
@@ -67998,302 +68042,302 @@ static const char *startup_source =
 "(list set!-id_0 new-id_1 rhs-s_0)"
 " disarmed-s_19"
 " disarmed-s_19)"
-" s_675)))"
-"(let-values() s_675)))))))))))))))"
+" s_672)))"
+"(let-values() s_672)))))))))))))))"
 "(case-lambda"
-"((s_676 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_99)"
-"(begin(substitute-set!-rename32_0 s_676 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_99 #f #f)))"
-"((s_677 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_100 t23_1)"
-"(substitute-set!-rename32_0 s_677 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_100 t23_1 #t)))))"
+"((s_673 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_100)"
+"(begin(substitute-set!-rename32_0 s_673 disarmed-s_20 set!-id_1 id_131 rhs-s_1 from-rename?_2 ctx_100 #f #f)))"
+"((s_674 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_101 t23_1)"
+"(substitute-set!-rename32_0 s_674 disarmed-s_21 set!-id_2 id_132 rhs-s_2 from-rename?_3 ctx_101 t23_1 #t)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_678 ctx_101)"
+"(lambda(s_675 ctx_102)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_122)(expand-context-observer ctx_101)))"
-"(if obs_122"
-"(let-values()(let-values()(call-expand-observe obs_122 'prim-#%variable-reference)))"
+"(let-values(((obs_119)(expand-context-observer ctx_102)))"
+"(if obs_119"
+"(let-values()(let-values()(call-expand-observe obs_119 'prim-#%variable-reference)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_22)(syntax-disarm$1 s_678)))"
-"(let-values(((ok?_54 #%variable-reference404_0 id405_0)"
-"(let-values(((s_679) disarmed-s_22))"
-"(if(let-values(((s_680)(if(syntax?$1 s_679)(syntax-e$1 s_679) s_679)))"
+"(let-values(((disarmed-s_22)(syntax-disarm$1 s_675)))"
+"(let-values(((ok?_54 #%variable-reference411_0 id412_0)"
+"(let-values(((s_676) disarmed-s_22))"
+"(if(let-values(((s_677)(if(syntax?$1 s_676)(syntax-e$1 s_676) s_676)))"
+"(if(pair? s_677)"
+"(if(let-values(((s_678)(car s_677))) #t)"
+"(let-values(((s_679)(cdr s_677)))"
+"(let-values(((s_680)(if(syntax?$1 s_679)(syntax-e$1 s_679) s_679)))"
 "(if(pair? s_680)"
-"(if(let-values(((s_681)(car s_680))) #t)"
+"(if(let-values(((s_681)(car s_680)))"
+"(let-values(((or-part_393)"
+"(if(syntax?$1 s_681)(symbol?(syntax-e$1 s_681)) #f)))"
+"(if or-part_393 or-part_393(symbol? s_681))))"
 "(let-values(((s_682)(cdr s_680)))"
 "(let-values(((s_683)(if(syntax?$1 s_682)(syntax-e$1 s_682) s_682)))"
-"(if(pair? s_683)"
-"(if(let-values(((s_684)(car s_683)))"
-"(let-values(((or-part_392)"
-"(if(syntax?$1 s_684)(symbol?(syntax-e$1 s_684)) #f)))"
-"(if or-part_392 or-part_392(symbol? s_684))))"
-"(let-values(((s_685)(cdr s_683)))"
-"(let-values(((s_686)(if(syntax?$1 s_685)(syntax-e$1 s_685) s_685)))"
-"(null? s_686)))"
+"(null? s_683)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((#%variable-reference404_1 id405_1)"
-"(let-values(((s_687)(if(syntax?$1 s_679)(syntax-e$1 s_679) s_679)))"
-"(let-values(((#%variable-reference406_0)"
+"(let-values(((#%variable-reference411_1 id412_1)"
+"(let-values(((s_684)(if(syntax?$1 s_676)(syntax-e$1 s_676) s_676)))"
+"(let-values(((#%variable-reference413_0)"
+"(let-values(((s_685)(car s_684))) s_685))"
+"((id414_0)"
+"(let-values(((s_686)(cdr s_684)))"
+"(let-values(((s_687)"
+"(if(syntax?$1 s_686)"
+"(syntax-e$1 s_686)"
+" s_686)))"
+"(let-values(((id415_0)"
 "(let-values(((s_688)(car s_687))) s_688))"
-"((id407_0)"
+"(()"
 "(let-values(((s_689)(cdr s_687)))"
 "(let-values(((s_690)"
 "(if(syntax?$1 s_689)"
 "(syntax-e$1 s_689)"
 " s_689)))"
-"(let-values(((id408_0)"
-"(let-values(((s_691)(car s_690))) s_691))"
-"(()"
-"(let-values(((s_692)(cdr s_690)))"
-"(let-values(((s_693)"
-"(if(syntax?$1 s_692)"
-"(syntax-e$1 s_692)"
-" s_692)))"
 "(values)))))"
-"(values id408_0))))))"
-"(values #%variable-reference406_0 id407_0)))))"
-"(values #t #%variable-reference404_1 id405_1)))"
+"(values id415_0))))))"
+"(values #%variable-reference413_0 id414_0)))))"
+"(values #t #%variable-reference411_1 id412_1)))"
 "(values #f #f #f)))))"
-"(let-values(((ok?_55 #%variable-reference409_0 #%top410_0 id411_0)"
-"(let-values(((s_694) disarmed-s_22))"
+"(let-values(((ok?_55 #%variable-reference416_0 #%top417_0 id418_0)"
+"(let-values(((s_691) disarmed-s_22))"
 "(if(if(not ok?_54)"
+"(let-values(((s_692)(if(syntax?$1 s_691)(syntax-e$1 s_691) s_691)))"
+"(if(pair? s_692)"
+"(if(let-values(((s_693)(car s_692))) #t)"
+"(let-values(((s_694)(cdr s_692)))"
 "(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(((s_698)(if(syntax?$1 s_697)(syntax-e$1 s_697) s_697)))"
-"(if(pair? s_698)"
-"(if(let-values(((s_699)(car s_698)))"
-"(let-values(((s_700)"
-"(if(syntax?$1 s_699)(syntax-e$1 s_699) s_699)))"
-"(if(pair? s_700)"
-"(if(let-values(((s_701)(car s_700))) #t)"
-"(let-values(((s_702)(cdr s_700)))"
-"(let-values(((or-part_393)"
-"(if(syntax?$1 s_702)"
-"(symbol?(syntax-e$1 s_702))"
+"(if(let-values(((s_696)(car s_695)))"
+"(let-values(((s_697)"
+"(if(syntax?$1 s_696)(syntax-e$1 s_696) s_696)))"
+"(if(pair? s_697)"
+"(if(let-values(((s_698)(car s_697))) #t)"
+"(let-values(((s_699)(cdr s_697)))"
+"(let-values(((or-part_394)"
+"(if(syntax?$1 s_699)"
+"(symbol?(syntax-e$1 s_699))"
 " #f)))"
-"(if or-part_393 or-part_393(symbol? s_702))))"
+"(if or-part_394 or-part_394(symbol? s_699))))"
 " #f)"
 " #f)))"
-"(let-values(((s_703)(cdr s_698)))"
-"(let-values(((s_704)(if(syntax?$1 s_703)(syntax-e$1 s_703) s_703)))"
-"(null? s_704)))"
+"(let-values(((s_700)(cdr s_695)))"
+"(let-values(((s_701)(if(syntax?$1 s_700)(syntax-e$1 s_700) s_700)))"
+"(null? s_701)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 " #f)"
 "(let-values()"
-"(let-values(((#%variable-reference409_1 #%top410_1 id411_1)"
-"(let-values(((s_705)(if(syntax?$1 s_694)(syntax-e$1 s_694) s_694)))"
-"(let-values(((#%variable-reference412_0)"
-"(let-values(((s_706)(car s_705))) s_706))"
-"((#%top413_0 id414_0)"
-"(let-values(((s_707)(cdr s_705)))"
+"(let-values(((#%variable-reference416_1 #%top417_1 id418_1)"
+"(let-values(((s_702)(if(syntax?$1 s_691)(syntax-e$1 s_691) s_691)))"
+"(let-values(((#%variable-reference419_0)"
+"(let-values(((s_703)(car s_702))) s_703))"
+"((#%top420_0 id421_0)"
+"(let-values(((s_704)(cdr s_702)))"
+"(let-values(((s_705)"
+"(if(syntax?$1 s_704)"
+"(syntax-e$1 s_704)"
+" s_704)))"
+"(let-values(((#%top422_0 id423_0)"
+"(let-values(((s_706)(car s_705)))"
+"(let-values(((s_707)"
+"(if(syntax?$1 s_706)"
+"(syntax-e$1 s_706)"
+" s_706)))"
+"(let-values(((#%top424_0)"
 "(let-values(((s_708)"
-"(if(syntax?$1 s_707)"
-"(syntax-e$1 s_707)"
-" s_707)))"
-"(let-values(((#%top415_0 id416_0)"
-"(let-values(((s_709)(car s_708)))"
-"(let-values(((s_710)"
-"(if(syntax?$1 s_709)"
-"(syntax-e$1 s_709)"
-" s_709)))"
-"(let-values(((#%top417_0)"
-"(let-values(((s_711)"
 "(car"
-" s_710)))"
-" s_711))"
-"((id418_0)"
-"(let-values(((s_712)"
+" s_707)))"
+" s_708))"
+"((id425_0)"
+"(let-values(((s_709)"
 "(cdr"
-" s_710)))"
-" s_712)))"
-"(values #%top417_0 id418_0)))))"
+" s_707)))"
+" s_709)))"
+"(values #%top424_0 id425_0)))))"
 "(()"
-"(let-values(((s_713)(cdr s_708)))"
-"(let-values(((s_714)"
-"(if(syntax?$1 s_713)"
-"(syntax-e$1 s_713)"
-" s_713)))"
+"(let-values(((s_710)(cdr s_705)))"
+"(let-values(((s_711)"
+"(if(syntax?$1 s_710)"
+"(syntax-e$1 s_710)"
+" s_710)))"
 "(values)))))"
-"(values #%top415_0 id416_0))))))"
-"(values #%variable-reference412_0 #%top413_0 id414_0)))))"
-"(values #t #%variable-reference409_1 #%top410_1 id411_1)))"
+"(values #%top422_0 id423_0))))))"
+"(values #%variable-reference419_0 #%top420_0 id421_0)))))"
+"(values #t #%variable-reference416_1 #%top417_1 id418_1)))"
 "(values #f #f #f #f)))))"
-"(let-values(((ok?_56 #%variable-reference419_0)"
-"(let-values(((s_715) disarmed-s_22))"
-"(if(if(not(let-values(((or-part_394) ok?_54))(if or-part_394 or-part_394 ok?_55)))"
+"(let-values(((ok?_56 #%variable-reference426_0)"
+"(let-values(((s_712) disarmed-s_22))"
+"(if(if(not(let-values(((or-part_395) ok?_54))(if or-part_395 or-part_395 ok?_55)))"
 " #t"
 " #f)"
-"(let-values(((orig-s_59) s_715))"
-"(let-values(((#%variable-reference419_1)"
-"(let-values(((s_716)(if(syntax?$1 s_715)(syntax-e$1 s_715) s_715)))"
-"(if(pair? s_716)"
-"(let-values(((#%variable-reference420_0)"
-"(let-values(((s_717)(car s_716))) s_717))"
+"(let-values(((orig-s_59) s_712))"
+"(let-values(((#%variable-reference426_1)"
+"(let-values(((s_713)(if(syntax?$1 s_712)(syntax-e$1 s_712) s_712)))"
+"(if(pair? s_713)"
+"(let-values(((#%variable-reference427_0)"
+"(let-values(((s_714)(car s_713))) s_714))"
 "(()"
-"(let-values(((s_718)(cdr s_716)))"
-"(let-values(((s_719)"
-"(if(syntax?$1 s_718)"
-"(syntax-e$1 s_718)"
-" s_718)))"
-"(if(null? s_719)"
+"(let-values(((s_715)(cdr s_713)))"
+"(let-values(((s_716)"
+"(if(syntax?$1 s_715)"
+"(syntax-e$1 s_715)"
+" s_715)))"
+"(if(null? s_716)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                        \"bad syntax\""
 " orig-s_59))))))"
-"(values #%variable-reference420_0))"
+"(values #%variable-reference427_0))"
 "                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_59)))))"
-"(values #t #%variable-reference419_1)))"
+"(values #t #%variable-reference426_1)))"
 "(values #f #f)))))"
-"(if(let-values(((or-part_395) ok?_54))(if or-part_395 or-part_395 ok?_55))"
+"(if(let-values(((or-part_396) ok?_54))(if or-part_396 or-part_396 ok?_55))"
 "(let-values()"
-"(let-values(((var-id_0)(if ok?_54 id405_0 id411_0)))"
+"(let-values(((var-id_0)(if ok?_54 id412_0 id418_0)))"
 "(let-values(((binding_31)"
-"(let-values(((var-id421_0) var-id_0)"
-"((temp422_0)(expand-context-phase ctx_101))"
-"((temp423_0) 'ambiguous))"
-"(resolve+shift30.1 temp423_0 #t #f #f #f #f #f #f #f #f var-id421_0 temp422_0))))"
+"(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((()"
 "(begin"
 "(if(eq? binding_31 'ambiguous)"
-"(let-values()(raise-ambiguous-error var-id_0 ctx_101))"
+"(let-values()(raise-ambiguous-error var-id_0 ctx_102))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_396) binding_31))"
-"(if or-part_396 or-part_396(expand-context-allow-unbound? ctx_101)))"
+"(if(let-values(((or-part_397) binding_31))"
+"(if or-part_397 or-part_397(expand-context-allow-unbound? ctx_102)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                              \"unbound identifier\""
-" s_678"
+" s_675"
 " var-id_0"
 " null"
-"(syntax-debug-info-string var-id_0 ctx_101))))"
+"(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(((binding424_0) binding_31)"
-"((ctx425_0) ctx_101)"
-"((var-id426_0) var-id_0)"
-"((s427_0) s_678)"
-"((temp428_0)(expand-context-in-local-expand? ctx_101)))"
-"(lookup17.1 s427_0 #t temp428_0 #t binding424_0 ctx425_0 var-id426_0))"
+"(let-values(((binding431_0) binding_31)"
+"((ctx432_0) ctx_102)"
+"((var-id433_0) var-id_0)"
+"((s434_0) s_675)"
+"((temp435_0)(expand-context-in-local-expand? ctx_102)))"
+"(lookup28.1 s434_0 #t temp435_0 #t binding431_0 ctx432_0 var-id433_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_678))"
+"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_675))"
 "(void))"
-"(if(expand-context-to-parsed? ctx_101)"
+"(if(expand-context-to-parsed? ctx_102)"
 "(parsed-#%variable-reference11.1"
-"(keep-properties-only~ s_678)"
+"(keep-properties-only~ s_675)"
 "(if ok?_55"
 "(let-values()(parsed-top-id4.1 var-id_0 binding_31 #f))"
 "(let-values()(parsed-id2.1 var-id_0 binding_31 #f))))"
-" s_678))))))))"
+" s_675))))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_101)"
-"(parsed-#%variable-reference11.1(keep-properties-only~ s_678) #f)"
-" s_678)))))))))))"
+"(if(expand-context-to-parsed? ctx_102)"
+"(parsed-#%variable-reference11.1(keep-properties-only~ s_675) #f)"
+" s_675)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_720 ctx_102)"
+"(lambda(s_717 ctx_103)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_123)(expand-context-observer ctx_102)))"
-"(if obs_123"
-"(let-values()(let-values()(call-expand-observe obs_123 'prim-#%expression)))"
+"(let-values(((obs_120)(expand-context-observer ctx_103)))"
+"(if obs_120"
+"(let-values()(let-values()(call-expand-observe obs_120 'prim-#%expression)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_23)(syntax-disarm$1 s_720)))"
-"(let-values(((ok?_57 #%expression429_0 e430_0)"
-"(let-values(((s_721) disarmed-s_23))"
-"(let-values(((orig-s_60) s_721))"
-"(let-values(((#%expression429_1 e430_1)"
-"(let-values(((s_722)(if(syntax?$1 s_721)(syntax-e$1 s_721) s_721)))"
+"(let-values(((disarmed-s_23)(syntax-disarm$1 s_717)))"
+"(let-values(((ok?_57 #%expression436_0 e437_0)"
+"(let-values(((s_718) disarmed-s_23))"
+"(let-values(((orig-s_60) s_718))"
+"(let-values(((#%expression436_1 e437_1)"
+"(let-values(((s_719)(if(syntax?$1 s_718)(syntax-e$1 s_718) s_718)))"
+"(if(pair? s_719)"
+"(let-values(((#%expression438_0)"
+"(let-values(((s_720)(car s_719))) s_720))"
+"((e439_0)"
+"(let-values(((s_721)(cdr s_719)))"
+"(let-values(((s_722)"
+"(if(syntax?$1 s_721)"
+"(syntax-e$1 s_721)"
+" s_721)))"
 "(if(pair? s_722)"
-"(let-values(((#%expression431_0)"
-"(let-values(((s_723)(car s_722))) s_723))"
-"((e432_0)"
+"(let-values(((e440_0)"
+"(let-values(((s_723)(car s_722)))"
+" s_723))"
+"(()"
 "(let-values(((s_724)(cdr s_722)))"
 "(let-values(((s_725)"
 "(if(syntax?$1 s_724)"
 "(syntax-e$1 s_724)"
 " s_724)))"
-"(if(pair? s_725)"
-"(let-values(((e433_0)"
-"(let-values(((s_726)(car s_725)))"
-" s_726))"
-"(()"
-"(let-values(((s_727)(cdr s_725)))"
-"(let-values(((s_728)"
-"(if(syntax?$1 s_727)"
-"(syntax-e$1 s_727)"
-" s_727)))"
-"(if(null? s_728)"
+"(if(null? s_725)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
 " orig-s_60))))))"
-"(values e433_0))"
+"(values e440_0))"
 "                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_60))))))"
-"(values #%expression431_0 e432_0))"
+"(values #%expression438_0 e439_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_60)))))"
-"(values #t #%expression429_1 e430_1))))))"
+"(values #t #%expression436_1 e437_1))))))"
 "(let-values(((rebuild-s_13)"
-"(let-values(((ctx434_0) ctx_102)((s435_0) s_720)((temp436_0) #t))"
-"(keep-as-needed74.1 temp436_0 #t #f #f #f #f ctx434_0 s435_0))))"
+"(let-values(((ctx441_0) ctx_103)((s442_0) s_717)((temp443_0) #t))"
+"(keep-as-needed85.1 temp443_0 #t #f #f #f #f ctx441_0 s442_0))))"
 "(let-values(((exp-e_0)"
-"(let-values(((temp437_0) e430_0)"
-"((temp438_0)"
-"(let-values(((temp439_0)(as-expression-context ctx_102))"
-"((ctx440_0) ctx_102))"
-"(as-tail-context23.1 ctx440_0 temp439_0))))"
-"(expand7.1 #f #f #f #f temp437_0 temp438_0))))"
-"(if(expand-context-to-parsed? ctx_102)"
+"(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))))"
+"(if(expand-context-to-parsed? ctx_103)"
 " exp-e_0"
 "(let-values(((tmp_64)"
-"(if(not(expand-context-in-local-expand? ctx_102))"
-"(expand-context-context ctx_102)"
+"(if(not(expand-context-in-local-expand? ctx_103))"
+"(expand-context-context ctx_103)"
 " #f)))"
 "(if(equal? tmp_64 'expression)"
 "(let-values()"
 "(let-values(((result-s_13)(syntax-track-origin$1 exp-e_0 rebuild-s_13)))"
 "(begin"
-"(let-values(((obs_124)(expand-context-observer ctx_102)))"
-"(if obs_124"
-"(let-values()(let-values()(call-expand-observe obs_124 'tag result-s_13)))"
+"(let-values(((obs_121)(expand-context-observer ctx_103)))"
+"(if obs_121"
+"(let-values()(let-values()(call-expand-observe obs_121 'tag result-s_13)))"
 "(void)))"
 " result-s_13)))"
 "(let-values()"
-"(let-values(((rebuild-s441_0) rebuild-s_13)((temp442_0)(list #%expression429_0 exp-e_0)))"
-"(rebuild5.1 #f #f rebuild-s441_0 temp442_0))))))))))))))"
-" (void (add-core-form!* 'unquote (lambda (s_729 ctx_103) (raise-syntax-error$1 #f \"not in quasiquote\" s_729))))"
-" (void (add-core-form!* 'unquote-splicing (lambda (s_730 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_730))))"
+"(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_726 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_726))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_727 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_727))))"
 "(define-values"
 "(binding-for-transformer?)"
-"(lambda(b_41 id_133 at-phase_12 ns_121)"
+"(lambda(b_41 id_133 at-phase_12 ns_122)"
 "(begin"
 "(if(not at-phase_12)"
 "(let-values()"
 "(let-values(((m_30)"
-"(namespace->module ns_121(1/module-path-index-resolve(module-binding-nominal-module b_41)))))"
+"(namespace->module ns_122(1/module-path-index-resolve(module-binding-nominal-module b_41)))))"
 "(let-values(((b/p_4)"
 "(hash-ref"
 "(hash-ref(module-provides m_30)(module-binding-nominal-phase b_41) '#hasheq())"
@@ -68305,7 +68349,7 @@ static const char *startup_source =
 "(let-values(((b1_8) b_41)"
 "((empty-env2_0) empty-env)"
 "((null3_0) null)"
-"((ns4_0) ns_121)"
+"((ns4_0) ns_122)"
 "((at-phase5_0) at-phase_12)"
 "((id6_0) id_133))"
 "(binding-lookup50.1 #f #f #f #f b1_8 empty-env2_0 null3_0 ns4_0 at-phase5_0 id6_0))))"
@@ -68314,9 +68358,9 @@ static const char *startup_source =
 "(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_105)"
+"(lambda(specs_0 orig-s_61 rp_1 self_30 phase_44 ctx_106)"
 "(begin"
-"(let-values(((ns_123)(expand-context-namespace ctx_105)))"
+"(let-values(((ns_124)(expand-context-namespace ctx_106)))"
 "((letrec-values(((loop_112)"
 "(lambda(specs_1 at-phase_13 protected?_15 layer_6)"
 "(begin"
@@ -68332,16 +68376,16 @@ static const char *startup_source =
 "((letrec-values(((for-loop_96)"
 "(lambda(track-stxes_1"
 " exp-specs_1"
-" lst_405)"
+" lst_406)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_405)"
+"(if(pair? lst_406)"
 "(let-values(((spec_0)"
 "(unsafe-car"
-" lst_405))"
-"((rest_232)"
+" lst_406))"
+"((rest_234)"
 "(unsafe-cdr"
-" lst_405)))"
+" lst_406)))"
 "(let-values(((track-stxes_2"
 " exp-specs_2)"
 "(let-values(((track-stxes_3)"
@@ -68457,7 +68501,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " spec_0)"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -68505,32 +68549,32 @@ static const char *startup_source =
 "(let-values(((s_81)"
 "(cdr"
 " s_306)))"
-"(let-values(((s_731)"
+"(let-values(((s_728)"
 "(if(syntax?$1"
 " s_81)"
 "(syntax-e$1"
 " s_81)"
 " s_81)))"
 "(if(pair?"
-" s_731)"
+" s_728)"
 "(let-values(((phase-level9_0)"
 "(let-values(((s_182)"
 "(car"
-" s_731)))"
+" s_728)))"
 " s_182))"
 "((spec10_0)"
-"(let-values(((s_465)"
+"(let-values(((s_462)"
 "(cdr"
-" s_731)))"
-"(let-values(((s_472)"
+" s_728)))"
+"(let-values(((s_468)"
 "(if(syntax?$1"
-" s_465)"
+" s_462)"
 "(syntax-e$1"
-" s_465)"
-" s_465)))"
+" s_462)"
+" s_462)))"
 "(let-values(((flat-s_42)"
 "(to-syntax-list.1"
-" s_472)))"
+" s_468)))"
 "(if(not"
 " flat-s_42)"
 "(let-values()"
@@ -68628,15 +68672,15 @@ static const char *startup_source =
 "(if(pair?"
 " s_23)"
 "(let-values(((for-syntax15_0)"
-"(let-values(((s_432)"
+"(let-values(((s_429)"
 "(car"
 " s_23)))"
-" s_432))"
+" s_429))"
 "((spec16_0)"
 "(let-values(((s_25)"
 "(cdr"
 " s_23)))"
-"(let-values(((s_732)"
+"(let-values(((s_729)"
 "(if(syntax?$1"
 " s_25)"
 "(syntax-e$1"
@@ -68644,7 +68688,7 @@ static const char *startup_source =
 " s_25)))"
 "(let-values(((flat-s_43)"
 "(to-syntax-list.1"
-" s_732)))"
+" s_729)))"
 "(if(not"
 " flat-s_43)"
 "(let-values()"
@@ -68708,23 +68752,23 @@ static const char *startup_source =
 " s_44))"
 "(let-values(((for-label19_1"
 " spec20_1)"
-"(let-values(((s_484)"
+"(let-values(((s_480)"
 "(if(syntax?$1"
 " s_44)"
 "(syntax-e$1"
 " s_44)"
 " s_44)))"
 "(if(pair?"
-" s_484)"
+" s_480)"
 "(let-values(((for-label21_0)"
-"(let-values(((s_481)"
+"(let-values(((s_477)"
 "(car"
-" s_484)))"
-" s_481))"
+" s_480)))"
+" s_477))"
 "((spec22_0)"
 "(let-values(((s_45)"
 "(cdr"
-" s_484)))"
+" s_480)))"
 "(let-values(((s_307)"
 "(if(syntax?$1"
 " s_45)"
@@ -68800,18 +68844,18 @@ static const char *startup_source =
 "(let-values(((ok?_61"
 " protect25_0"
 " p-spec26_0)"
-"(let-values(((s_733)"
+"(let-values(((s_730)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_65)"
-" s_733))"
+" s_730))"
 "(let-values(((protect25_1"
 " p-spec26_1)"
 "(let-values(((s_31)"
 "(if(syntax?$1"
-" s_733)"
+" s_730)"
 "(syntax-e$1"
-" s_733)"
-" s_733)))"
+" s_730)"
+" s_730)))"
 "(if(pair?"
 " s_31)"
 "(let-values(((protect27_0)"
@@ -68823,7 +68867,7 @@ static const char *startup_source =
 "(let-values(((s_309)"
 "(cdr"
 " s_31)))"
-"(let-values(((s_487)"
+"(let-values(((s_483)"
 "(if(syntax?$1"
 " s_309)"
 "(syntax-e$1"
@@ -68831,7 +68875,7 @@ static const char *startup_source =
 " s_309)))"
 "(let-values(((flat-s_45)"
 "(to-syntax-list.1"
-" s_487)))"
+" s_483)))"
 "(if(not"
 " flat-s_45)"
 "(let-values()"
@@ -68885,37 +68929,37 @@ static const char *startup_source =
 " rename31_0"
 " id:from32_0"
 " id:to33_0)"
-"(let-values(((s_734)"
+"(let-values(((s_731)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_66)"
-" s_734))"
+" s_731))"
 "(let-values(((rename31_1"
 " id:from32_1"
 " id:to33_1)"
-"(let-values(((s_490)"
+"(let-values(((s_486)"
 "(if(syntax?$1"
-" s_734)"
+" s_731)"
 "(syntax-e$1"
-" s_734)"
-" s_734)))"
+" s_731)"
+" s_731)))"
 "(if(pair?"
-" s_490)"
+" s_486)"
 "(let-values(((rename34_0)"
 "(let-values(((s_315)"
 "(car"
-" s_490)))"
+" s_486)))"
 " s_315))"
 "((id:from35_0"
 " id:to36_0)"
-"(let-values(((s_399)"
+"(let-values(((s_732)"
 "(cdr"
-" s_490)))"
+" s_486)))"
 "(let-values(((s_316)"
 "(if(syntax?$1"
-" s_399)"
+" s_732)"
 "(syntax-e$1"
-" s_399)"
-" s_399)))"
+" s_732)"
+" s_732)))"
 "(if(pair?"
 " s_316)"
 "(let-values(((id:from37_0)"
@@ -68940,48 +68984,48 @@ static const char *startup_source =
 " orig-s_66"
 " s_33))))"
 "((id:to38_0)"
-"(let-values(((s_735)"
+"(let-values(((s_399)"
 "(cdr"
 " s_316)))"
-"(let-values(((s_736)"
+"(let-values(((s_733)"
 "(if(syntax?$1"
-" s_735)"
+" s_399)"
 "(syntax-e$1"
-" s_735)"
-" s_735)))"
+" s_399)"
+" s_399)))"
 "(if(pair?"
-" s_736)"
+" s_733)"
 "(let-values(((id:to39_0)"
-"(let-values(((s_436)"
+"(let-values(((s_433)"
 "(car"
-" s_736)))"
+" s_733)))"
 "(if(let-values(((or-part_57)"
 "(if(syntax?$1"
-" s_436)"
+" s_433)"
 "(symbol?"
 "(syntax-e$1"
-" s_436))"
+" s_433))"
 " #f)))"
 "(if or-part_57"
 " or-part_57"
 "(symbol?"
-" s_436)))"
-" s_436"
+" s_433)))"
+" s_433"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_66"
-" s_436))))"
+" s_433))))"
 "(()"
-"(let-values(((s_737)"
+"(let-values(((s_734)"
 "(cdr"
-" s_736)))"
+" s_733)))"
 "(let-values(((s_386)"
 "(if(syntax?$1"
-" s_737)"
+" s_734)"
 "(syntax-e$1"
-" s_737)"
-" s_737)))"
+" s_734)"
+" s_734)))"
 "(if(null?"
 " s_386)"
 "(values)"
@@ -69022,7 +69066,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:to33_0)"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69045,19 +69089,19 @@ static const char *startup_source =
 " struct40_0"
 " id:struct41_0"
 " id:field42_0)"
-"(let-values(((s_507)"
+"(let-values(((s_503)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_67)"
-" s_507))"
+" s_503))"
 "(let-values(((struct40_1"
 " id:struct41_1"
 " id:field42_1)"
 "(let-values(((s_36)"
 "(if(syntax?$1"
-" s_507)"
+" s_503)"
 "(syntax-e$1"
-" s_507)"
-" s_507)))"
+" s_503)"
+" s_503)))"
 "(if(pair?"
 " s_36)"
 "(let-values(((struct43_0)"
@@ -69067,55 +69111,55 @@ static const char *startup_source =
 " s_203))"
 "((id:struct44_0"
 " id:field45_0)"
-"(let-values(((s_738)"
+"(let-values(((s_735)"
 "(cdr"
 " s_36)))"
-"(let-values(((s_739)"
+"(let-values(((s_736)"
+"(if(syntax?$1"
+" s_735)"
+"(syntax-e$1"
+" s_735)"
+" s_735)))"
+"(if(pair?"
+" s_736)"
+"(let-values(((id:struct46_0)"
+"(let-values(((s_737)"
+"(car"
+" s_736)))"
+"(if(let-values(((or-part_364)"
+"(if(syntax?$1"
+" s_737)"
+"(symbol?"
+"(syntax-e$1"
+" s_737))"
+" #f)))"
+"(if or-part_364"
+" or-part_364"
+"(symbol?"
+" s_737)))"
+" s_737"
+"(raise-syntax-error$1"
+" #f"
+"                                                                                                                                                                                                                                       \"not an identifier\""
+" orig-s_67"
+" s_737))))"
+"((id:field47_0)"
+"(let-values(((s_738)"
+"(cdr"
+" s_736)))"
+"(let-values(((s_393)"
 "(if(syntax?$1"
 " s_738)"
 "(syntax-e$1"
 " s_738)"
 " s_738)))"
 "(if(pair?"
-" s_739)"
-"(let-values(((id:struct46_0)"
-"(let-values(((s_740)"
-"(car"
-" s_739)))"
-"(if(let-values(((or-part_363)"
-"(if(syntax?$1"
-" s_740)"
-"(symbol?"
-"(syntax-e$1"
-" s_740))"
-" #f)))"
-"(if or-part_363"
-" or-part_363"
-"(symbol?"
-" s_740)))"
-" s_740"
-"(raise-syntax-error$1"
-" #f"
-"                                                                                                                                                                                                                                       \"not an identifier\""
-" orig-s_67"
-" s_740))))"
-"((id:field47_0)"
-"(let-values(((s_741)"
-"(cdr"
-" s_739)))"
-"(let-values(((s_393)"
-"(if(syntax?$1"
-" s_741)"
-"(syntax-e$1"
-" s_741)"
-" s_741)))"
-"(if(pair?"
 " s_393)"
 "(let-values(((id:field48_0)"
 "(let-values(((s_62)"
 "(car"
 " s_393)))"
-"(let-values(((s_415)"
+"(let-values(((s_412)"
 "(if(syntax?$1"
 " s_62)"
 "(syntax-e$1"
@@ -69123,7 +69167,7 @@ static const char *startup_source =
 " s_62)))"
 "(let-values(((flat-s_46)"
 "(to-syntax-list.1"
-" s_415)))"
+" s_412)))"
 "(if(not"
 " flat-s_46)"
 "(let-values()"
@@ -69144,17 +69188,17 @@ static const char *startup_source =
 " lst_315)))"
 "((letrec-values(((for-loop_278)"
 "(lambda(id:field_1"
-" lst_406)"
+" lst_407)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_406)"
+" lst_407)"
 "(let-values(((s_65)"
 "(unsafe-car"
-" lst_406))"
-"((rest_233)"
+" lst_407))"
+"((rest_235)"
 "(unsafe-cdr"
-" lst_406)))"
+" lst_407)))"
 "(let-values(((id:field_2)"
 "(let-values(((id:field_3)"
 " id:field_1))"
@@ -69162,15 +69206,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:field49_0)"
 "(let-values()"
-"(if(let-values(((or-part_397)"
+"(if(let-values(((or-part_398)"
 "(if(syntax?$1"
 " s_65)"
 "(symbol?"
 "(syntax-e$1"
 " s_65))"
 " #f)))"
-"(if or-part_397"
-" or-part_397"
+"(if or-part_398"
+" or-part_398"
 "(symbol?"
 " s_65)))"
 " s_65"
@@ -69188,7 +69232,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_278"
 " id:field_2"
-" rest_233)"
+" rest_235)"
 " id:field_2)))"
 " id:field_1)))))"
 " for-loop_278)"
@@ -69200,14 +69244,14 @@ static const char *startup_source =
 "(let-values(((s_206)"
 "(cdr"
 " s_393)))"
-"(let-values(((s_742)"
+"(let-values(((s_739)"
 "(if(syntax?$1"
 " s_206)"
 "(syntax-e$1"
 " s_206)"
 " s_206)))"
 "(if(null?"
-" s_742)"
+" s_739)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69245,7 +69289,7 @@ static const char *startup_source =
 " orig-s_61"
 " id:field42_0"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69264,29 +69308,29 @@ static const char *startup_source =
 "(let-values(((ok?_64"
 " all-from50_0"
 " mod-path51_0)"
-"(let-values(((s_743)"
+"(let-values(((s_740)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_68)"
-" s_743))"
+" s_740))"
 "(let-values(((all-from50_1"
 " mod-path51_1)"
-"(let-values(((s_744)"
+"(let-values(((s_741)"
 "(if(syntax?$1"
-" s_743)"
+" s_740)"
 "(syntax-e$1"
-" s_743)"
-" s_743)))"
+" s_740)"
+" s_740)))"
 "(if(pair?"
-" s_744)"
+" s_741)"
 "(let-values(((all-from52_0)"
-"(let-values(((s_745)"
+"(let-values(((s_742)"
 "(car"
-" s_744)))"
-" s_745))"
+" s_741)))"
+" s_742))"
 "((mod-path53_0)"
 "(let-values(((s_209)"
 "(cdr"
-" s_744)))"
+" s_741)))"
 "(let-values(((s_210)"
 "(if(syntax?$1"
 " s_209)"
@@ -69296,10 +69340,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_210)"
 "(let-values(((mod-path54_0)"
-"(let-values(((s_746)"
+"(let-values(((s_743)"
 "(car"
 " s_210)))"
-" s_746))"
+" s_743))"
 "(()"
 "(let-values(((s_94)"
 "(cdr"
@@ -69341,10 +69385,10 @@ static const char *startup_source =
 " self_30"
 " null"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15"
-" ctx_105)"
+" ctx_106)"
 "(values"
 " null"
 "(list"
@@ -69375,41 +69419,41 @@ static const char *startup_source =
 "(if(pair?"
 " s_213)"
 "(let-values(((all-from-except58_0)"
-"(let-values(((s_420)"
+"(let-values(((s_417)"
 "(car"
 " s_213)))"
-" s_420))"
+" s_417))"
 "((mod-path59_0"
 " id60_0)"
 "(let-values(((s_163)"
 "(cdr"
 " s_213)))"
-"(let-values(((s_494)"
+"(let-values(((s_490)"
 "(if(syntax?$1"
 " s_163)"
 "(syntax-e$1"
 " s_163)"
 " s_163)))"
 "(if(pair?"
-" s_494)"
+" s_490)"
 "(let-values(((mod-path61_0)"
-"(let-values(((s_402)"
+"(let-values(((s_744)"
 "(car"
-" s_494)))"
-" s_402))"
+" s_490)))"
+" s_744))"
 "((id62_0)"
-"(let-values(((s_747)"
+"(let-values(((s_745)"
 "(cdr"
-" s_494)))"
-"(let-values(((s_748)"
+" s_490)))"
+"(let-values(((s_746)"
 "(if(syntax?$1"
-" s_747)"
+" s_745)"
 "(syntax-e$1"
-" s_747)"
-" s_747)))"
+" s_745)"
+" s_745)))"
 "(let-values(((flat-s_47)"
 "(to-syntax-list.1"
-" s_748)))"
+" s_746)))"
 "(if(not"
 " flat-s_47)"
 "(let-values()"
@@ -69429,54 +69473,54 @@ static const char *startup_source =
 "(check-list"
 " lst_43)))"
 "((letrec-values(((for-loop_58)"
-"(lambda(id_135"
+"(lambda(id_67"
 " lst_44)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_44)"
-"(let-values(((s_497)"
+"(let-values(((s_493)"
 "(unsafe-car"
 " lst_44))"
 "((rest_18)"
 "(unsafe-cdr"
 " lst_44)))"
+"(let-values(((id_135)"
 "(let-values(((id_136)"
+" id_67))"
 "(let-values(((id_137)"
-" id_135))"
-"(let-values(((id_138)"
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
-"(if(let-values(((or-part_398)"
+"(if(let-values(((or-part_399)"
 "(if(syntax?$1"
-" s_497)"
+" s_493)"
 "(symbol?"
 "(syntax-e$1"
-" s_497))"
+" s_493))"
 " #f)))"
-"(if or-part_398"
-" or-part_398"
+"(if or-part_399"
+" or-part_399"
 "(symbol?"
-" s_497)))"
-" s_497"
+" s_493)))"
+" s_493"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                             \"not an identifier\""
 " orig-s_69"
-" s_497)))))"
+" s_493)))))"
 "(cons"
 " id63_0"
-" id_137)))))"
+" id_136)))))"
 "(values"
-" id_138)))))"
+" id_137)))))"
 "(if(not"
 " #f)"
 "(for-loop_58"
-" id_136"
+" id_135"
 " rest_18)"
-" id_136)))"
-" id_135)))))"
+" id_135)))"
+" id_67)))))"
 " for-loop_58)"
 " null"
 " lst_43)))))"
@@ -69509,10 +69553,10 @@ static const char *startup_source =
 " self_30"
 " id57_0"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15"
-" ctx_105)"
+" ctx_106)"
 "(values"
 " null"
 "(list"
@@ -69550,17 +69594,17 @@ static const char *startup_source =
 " s_395)))"
 " s_109))"
 "(()"
-"(let-values(((s_749)"
+"(let-values(((s_747)"
 "(cdr"
 " s_395)))"
-"(let-values(((s_750)"
+"(let-values(((s_748)"
 "(if(syntax?$1"
-" s_749)"
+" s_747)"
 "(syntax-e$1"
-" s_749)"
-" s_749)))"
+" s_747)"
+" s_747)))"
 "(if(null?"
-" s_750)"
+" s_748)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69583,7 +69627,7 @@ static const char *startup_source =
 " null"
 " #f"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69599,25 +69643,25 @@ static const char *startup_source =
 "(let-values(((ok?_67"
 " all-defined-except66_0"
 " id67_0)"
-"(let-values(((s_751)"
+"(let-values(((s_749)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_71)"
-" s_751))"
+" s_749))"
 "(let-values(((all-defined-except66_1"
 " id67_1)"
 "(let-values(((s_220)"
 "(if(syntax?$1"
-" s_751)"
+" s_749)"
 "(syntax-e$1"
-" s_751)"
-" s_751)))"
+" s_749)"
+" s_749)))"
 "(if(pair?"
 " s_220)"
 "(let-values(((all-defined-except68_0)"
-"(let-values(((s_421)"
+"(let-values(((s_418)"
 "(car"
 " s_220)))"
-" s_421))"
+" s_418))"
 "((id69_0)"
 "(let-values(((s_221)"
 "(cdr"
@@ -69639,8 +69683,8 @@ static const char *startup_source =
 "                                                                                                                                                                                                                           \"bad syntax\""
 " orig-s_71))"
 "(let-values()"
-"(let-values(((id_139)"
-"(let-values(((lst_407)"
+"(let-values(((id_138)"
+"(let-values(((lst_408)"
 " flat-s_48))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -69648,23 +69692,23 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_407)))"
+" lst_408)))"
 "((letrec-values(((for-loop_324)"
-"(lambda(id_140"
-" lst_408)"
+"(lambda(id_139"
+" lst_409)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_408)"
+" lst_409)"
 "(let-values(((s_120)"
 "(unsafe-car"
-" lst_408))"
-"((rest_234)"
+" lst_409))"
+"((rest_236)"
 "(unsafe-cdr"
-" lst_408)))"
+" lst_409)))"
+"(let-values(((id_140)"
 "(let-values(((id_141)"
-"(let-values(((id_142)"
-" id_140))"
+" id_139))"
 "(let-values(((id_29)"
 "(let-values()"
 "(let-values(((id70_0)"
@@ -69688,21 +69732,21 @@ static const char *startup_source =
 " s_120)))))"
 "(cons"
 " id70_0"
-" id_142)))))"
+" id_141)))))"
 "(values"
 " id_29)))))"
 "(if(not"
 " #f)"
 "(for-loop_324"
-" id_141"
-" rest_234)"
-" id_141)))"
-" id_140)))))"
+" id_140"
+" rest_236)"
+" id_140)))"
+" id_139)))))"
 " for-loop_324)"
 " null"
-" lst_407)))))"
+" lst_408)))))"
 "(reverse$1"
-" id_139)))))))))"
+" id_138)))))))))"
 "(values"
 " all-defined-except68_0"
 " id69_0))"
@@ -69722,7 +69766,7 @@ static const char *startup_source =
 " id67_0"
 " #f"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69741,68 +69785,68 @@ static const char *startup_source =
 "(let-values(((ok?_68"
 " prefix-all-defined71_0"
 " id:prefix72_0)"
-"(let-values(((s_752)"
+"(let-values(((s_750)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_72)"
-" s_752))"
+" s_750))"
 "(let-values(((prefix-all-defined71_1"
 " id:prefix72_1)"
-"(let-values(((s_753)"
+"(let-values(((s_751)"
 "(if(syntax?$1"
-" s_752)"
+" s_750)"
 "(syntax-e$1"
-" s_752)"
-" s_752)))"
+" s_750)"
+" s_750)))"
 "(if(pair?"
-" s_753)"
+" s_751)"
 "(let-values(((prefix-all-defined73_0)"
-"(let-values(((s_754)"
+"(let-values(((s_752)"
 "(car"
-" s_753)))"
-" s_754))"
+" s_751)))"
+" s_752))"
 "((id:prefix74_0)"
-"(let-values(((s_755)"
+"(let-values(((s_753)"
 "(cdr"
+" s_751)))"
+"(let-values(((s_509)"
+"(if(syntax?$1"
+" s_753)"
+"(syntax-e$1"
+" s_753)"
 " s_753)))"
-"(let-values(((s_512)"
-"(if(syntax?$1"
-" s_755)"
-"(syntax-e$1"
-" s_755)"
-" s_755)))"
 "(if(pair?"
-" s_512)"
+" s_509)"
 "(let-values(((id:prefix75_0)"
-"(let-values(((s_513)"
+"(let-values(((s_510)"
 "(car"
-" s_512)))"
-"(if(let-values(((or-part_399)"
+" s_509)))"
+"(if(let-values(((or-part_400)"
 "(if(syntax?$1"
-" s_513)"
+" s_510)"
 "(symbol?"
 "(syntax-e$1"
-" s_513))"
+" s_510))"
 " #f)))"
-"(if or-part_399"
-" or-part_399"
+"(if or-part_400"
+" or-part_400"
 "(symbol?"
-" s_513)))"
-" s_513"
+" s_510)))"
+" s_510"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                         \"not an identifier\""
 " orig-s_72"
-" s_513))))"
+" s_510))))"
 "(()"
-"(let-values(((s_756)"
+"(let-values(((s_754)"
 "(cdr"
-" s_512)))"
+" s_509)))"
 "(let-values(((s_127)"
 "(if(syntax?$1"
-" s_756)"
+" s_754)"
 "(syntax-e$1"
-" s_756)"
-" s_756)))"
+" s_754)"
+" s_754)))"
 "(if(null?"
 " s_127)"
 "(values)"
@@ -69836,7 +69880,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:prefix72_0)"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69893,15 +69937,15 @@ static const char *startup_source =
 "(let-values(((s_342)"
 "(car"
 " s_339)))"
-"(if(let-values(((or-part_400)"
+"(if(let-values(((or-part_401)"
 "(if(syntax?$1"
 " s_342)"
 "(symbol?"
 "(syntax-e$1"
 " s_342))"
 " #f)))"
-"(if or-part_400"
-" or-part_400"
+"(if or-part_401"
+" or-part_401"
 "(symbol?"
 " s_342)))"
 " s_342"
@@ -69910,11 +69954,11 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                           \"not an identifier\""
 " orig-s_73"
 " s_342))))"
-"((id83_1)"
+"((id83_0)"
 "(let-values(((s_344)"
 "(cdr"
 " s_339)))"
-"(let-values(((s_517)"
+"(let-values(((s_514)"
 "(if(syntax?$1"
 " s_344)"
 "(syntax-e$1"
@@ -69922,7 +69966,7 @@ static const char *startup_source =
 " s_344)))"
 "(let-values(((flat-s_49)"
 "(to-syntax-list.1"
-" s_517)))"
+" s_514)))"
 "(if(not"
 " flat-s_49)"
 "(let-values()"
@@ -69931,7 +69975,7 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                                 \"bad syntax\""
 " orig-s_73))"
 "(let-values()"
-"(let-values(((id_143)"
+"(let-values(((id_142)"
 "(let-values(((lst_4)"
 " flat-s_49))"
 "(begin"
@@ -69942,62 +69986,62 @@ static const char *startup_source =
 "(check-list"
 " lst_4)))"
 "((letrec-values(((for-loop_325)"
-"(lambda(id_144"
-" lst_409)"
+"(lambda(id_143"
+" lst_410)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_409)"
-"(let-values(((s_518)"
+" lst_410)"
+"(let-values(((s_515)"
 "(unsafe-car"
-" lst_409))"
+" lst_410))"
 "((rest_191)"
 "(unsafe-cdr"
-" lst_409)))"
+" lst_410)))"
+"(let-values(((id_144)"
 "(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_289)"
+"(if(let-values(((or-part_290)"
 "(if(syntax?$1"
-" s_518)"
+" s_515)"
 "(symbol?"
 "(syntax-e$1"
-" s_518))"
+" s_515))"
 " #f)))"
-"(if or-part_289"
-" or-part_289"
+"(if or-part_290"
+" or-part_290"
 "(symbol?"
-" s_518)))"
-" s_518"
+" s_515)))"
+" s_515"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_73"
-" s_518)))))"
+" s_515)))))"
 "(cons"
 " id84_2"
-" id_146)))))"
+" id_145)))))"
 "(values"
-" id_147)))))"
+" id_146)))))"
 "(if(not"
 " #f)"
 "(for-loop_325"
-" id_145"
+" id_144"
 " rest_191)"
-" id_145)))"
-" id_144)))))"
+" id_144)))"
+" id_143)))))"
 " for-loop_325)"
 " null"
 " lst_4)))))"
 "(reverse$1"
-" id_143)))))))))"
+" id_142)))))))))"
 "(values"
 " id:prefix82_0"
-" id83_1))"
+" id83_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                         \"bad syntax\""
@@ -70024,7 +70068,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:prefix77_0)"
 " at-phase_13"
-" ns_123"
+" ns_124"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70034,21 +70078,21 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ok?_70"
 " expand85_0"
-" id86_1"
+" id86_0"
 " datum87_0)"
-"(let-values(((s_524)"
+"(let-values(((s_521)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_74)"
-" s_524))"
+" s_521))"
 "(let-values(((expand85_1"
-" id86_2"
+" id86_1"
 " datum87_1)"
 "(let-values(((s_247)"
 "(if(syntax?$1"
-" s_524)"
+" s_521)"
 "(syntax-e$1"
-" s_524)"
-" s_524)))"
+" s_521)"
+" s_521)))"
 "(if(pair?"
 " s_247)"
 "(let-values(((expand88_0)"
@@ -70058,56 +70102,56 @@ static const char *startup_source =
 " s_248))"
 "((id89_1"
 " datum90_0)"
-"(let-values(((s_757)"
+"(let-values(((s_755)"
 "(cdr"
 " s_247)))"
 "(let-values(((s_249)"
 "(if(syntax?$1"
-" s_757)"
+" s_755)"
 "(syntax-e$1"
-" s_757)"
-" s_757)))"
+" s_755)"
+" s_755)))"
 "(if(pair?"
 " s_249)"
 "(let-values(((id91_0"
 " datum92_0)"
-"(let-values(((s_758)"
+"(let-values(((s_756)"
 "(car"
 " s_249)))"
 "(let-values(((s_251)"
 "(if(syntax?$1"
-" s_758)"
+" s_756)"
 "(syntax-e$1"
-" s_758)"
-" s_758)))"
+" s_756)"
+" s_756)))"
 "(if(pair?"
 " s_251)"
 "(let-values(((id93_1)"
-"(let-values(((s_528)"
+"(let-values(((s_525)"
 "(car"
 " s_251)))"
-"(if(let-values(((or-part_401)"
+"(if(let-values(((or-part_402)"
 "(if(syntax?$1"
-" s_528)"
+" s_525)"
 "(symbol?"
 "(syntax-e$1"
-" s_528))"
+" s_525))"
 " #f)))"
-"(if or-part_401"
-" or-part_401"
+"(if or-part_402"
+" or-part_402"
 "(symbol?"
-" s_528)))"
-" s_528"
+" s_525)))"
+" s_525"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                             \"not an identifier\""
 " orig-s_74"
-" s_528))))"
+" s_525))))"
 "((datum94_0)"
-"(let-values(((s_452)"
+"(let-values(((s_449)"
 "(cdr"
 " s_251)))"
-" s_452)))"
+" s_449)))"
 "(values"
 " id93_1"
 " datum94_0))"
@@ -70116,15 +70160,15 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                           \"bad syntax\""
 " orig-s_74)))))"
 "(()"
-"(let-values(((s_453)"
+"(let-values(((s_450)"
 "(cdr"
 " s_249)))"
 "(let-values(((s_362)"
 "(if(syntax?$1"
-" s_453)"
+" s_450)"
 "(syntax-e$1"
-" s_453)"
-" s_453)))"
+" s_450)"
+" s_450)))"
 "(if(null?"
 " s_362)"
 "(values)"
@@ -70150,7 +70194,7 @@ static const char *startup_source =
 "(values"
 " #t"
 " expand85_1"
-" id86_2"
+" id86_1"
 " datum87_1))))))"
 "(let-values(((ok?_71"
 " expand95_0"
@@ -70195,14 +70239,14 @@ static const char *startup_source =
 "(let-values(((s_374)"
 "(cdr"
 " s_371)))"
-"(let-values(((s_759)"
+"(let-values(((s_757)"
 "(if(syntax?$1"
 " s_374)"
 "(syntax-e$1"
 " s_374)"
 " s_374)))"
 "(if(null?"
-" s_759)"
+" s_757)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -70226,24 +70270,24 @@ static const char *startup_source =
 " expand95_1"
 " form96_1))))))"
 "(let-values(((exp-spec_0)"
-"(let-values(((temp104_4)"
+"(let-values(((temp104_5)"
 " form96_0)"
-"((temp105_4)"
-"(let-values(((v_260)"
-" ctx_105))"
-"(let-values(((the-struct_95)"
-" v_260))"
+"((temp105_5)"
+"(let-values(((v_261)"
+" ctx_106))"
+"(let-values(((the-struct_96)"
+" v_261))"
 "(if(expand-context/outer?"
-" the-struct_95)"
+" the-struct_96)"
 "(let-values(((def-ctx-scopes106_0)"
 "(box"
 " null))"
 "((inner107_0)"
-"(let-values(((the-struct_96)"
+"(let-values(((the-struct_97)"
 "(root-expand-context/outer-inner"
-" v_260)))"
+" v_261)))"
 "(if(expand-context/inner?"
-" the-struct_96)"
+" the-struct_97)"
 "(let-values(((stops108_0)"
 "(free-id-set"
 " at-phase_13"
@@ -70253,98 +70297,98 @@ static const char *startup_source =
 " at-phase_13)))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-counter"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/inner-lift-key"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-to-parsed?"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-phase"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-namespace"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-just-once?"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-module-begin-k"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_96)"
+" the-struct_97)"
 " stops108_0"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-lifts"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-lift-envs"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-module-lifts"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-require-lifts"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-requires+provides"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-observer"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-for-serializable?"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_96)))"
+" the-struct_97)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                       \"expand-context/inner?\""
-" the-struct_96)))))"
+" the-struct_97)))))"
 "(expand-context/outer1.1"
 " inner107_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_95)"
+" the-struct_96)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_95)"
+" the-struct_96)"
 "(root-expand-context/outer-frame-id"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-context"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-env"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-scopes"
-" the-struct_95)"
+" the-struct_96)"
 " def-ctx-scopes106_0"
 "(expand-context/outer-binding-layer"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-reference-records"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-only-immediate?"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_95)"
+" the-struct_96)"
 "(expand-context/outer-name"
-" the-struct_95)))"
+" the-struct_96)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                     \"expand-context/outer?\""
-" the-struct_95))))))"
+" the-struct_96))))))"
 "(expand7.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp104_4"
-" temp105_4))))"
+" temp104_5"
+" temp105_5))))"
 "(let-values((()"
 "(begin"
 "(if(if(pair?"
@@ -70372,29 +70416,29 @@ static const char *startup_source =
 "(let-values(((ok?_72"
 " begin100_0"
 " spec101_0)"
-"(let-values(((s_760)"
+"(let-values(((s_758)"
 " exp-spec_0))"
 "(let-values(((orig-s_76)"
-" s_760))"
+" s_758))"
 "(let-values(((begin100_1"
 " spec101_1)"
-"(let-values(((s_761)"
+"(let-values(((s_759)"
 "(if(syntax?$1"
-" s_760)"
+" s_758)"
 "(syntax-e$1"
-" s_760)"
-" s_760)))"
+" s_758)"
+" s_758)))"
 "(if(pair?"
-" s_761)"
+" s_759)"
 "(let-values(((begin102_0)"
 "(let-values(((s_379)"
 "(car"
-" s_761)))"
+" s_759)))"
 " s_379))"
 "((spec103_0)"
 "(let-values(((s_380)"
 "(cdr"
-" s_761)))"
+" s_759)))"
 "(let-values(((s_381)"
 "(if(syntax?$1"
 " s_380)"
@@ -70451,7 +70495,7 @@ static const char *startup_source =
 "(for-loop_96"
 " track-stxes_2"
 " exp-specs_2"
-" rest_232)"
+" rest_234)"
 "(values"
 " track-stxes_2"
 " exp-specs_2))))"
@@ -70471,9 +70515,9 @@ static const char *startup_source =
 " 'raw)))))"
 "(define-values"
 "(parse-identifier!)"
-"(lambda(spec_1 orig-s_77 sym_101 at-phase_5 ns_124 rp_2 protected?_16)"
+"(lambda(spec_1 orig-s_77 sym_101 at-phase_5 ns_125 rp_2 protected?_16)"
 "(begin"
-"(let-values(((b_90)(resolve+shift/extra-inspector spec_1 at-phase_5 ns_124)))"
+"(let-values(((b_90)(resolve+shift/extra-inspector spec_1 at-phase_5 ns_125)))"
 "(let-values((()"
 "(begin"
 "(if b_90"
@@ -70485,7 +70529,7 @@ static const char *startup_source =
 " orig-s_77"
 " spec_1)))"
 "(values))))"
-"(let-values(((as-transformer?_6)(binding-for-transformer? b_90 spec_1 at-phase_5 ns_124)))"
+"(let-values(((as-transformer?_6)(binding-for-transformer? b_90 spec_1 at-phase_5 ns_125)))"
 "(let-values(((immed-b_0)"
 "(let-values(((spec118_0) spec_1)((at-phase119_0) at-phase_5)((temp120_5) #t))"
 "(resolve+shift30.1 #f #f #f #f #f #f temp120_5 #t #f #f spec118_0 at-phase119_0))))"
@@ -70510,7 +70554,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_125 rp_3 protected?_17)"
+"(lambda(id:struct_0 orig-s_78 fields_0 at-phase_14 ns_126 rp_3 protected?_17)"
 "(begin"
 "(let-values(((mk_0)"
 "(lambda(fmt_1)"
@@ -70533,44 +70577,44 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_122)))"
 "((letrec-values(((for-loop_326)"
-"(lambda(lst_410)"
-"(begin"
-" 'for-loop"
-"(if(pair? lst_410)"
-"(let-values(((fmt_3)(unsafe-car lst_410))((rest_235)(unsafe-cdr lst_410)))"
-"(let-values((()"
-"(let-values()"
-"(let-values((()"
-"(let-values()"
-"(begin"
-"(let-values()"
-"(let-values(((id_148)(mk_0 fmt_3)))"
-"(parse-identifier!"
-" id_148"
-" orig-s_78"
-"(syntax-e$1 id_148)"
-" at-phase_14"
-" ns_125"
-" rp_3"
-" protected?_17)))"
-"(values)))))"
-"(values)))))"
-"(if(not #f)(for-loop_326 rest_235)(values))))"
-"(values))))))"
-" for-loop_326)"
-" lst_122)))"
-"(void)"
-"(let-values(((lst_357) fields_0))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_357)))"
-"((letrec-values(((for-loop_327)"
 "(lambda(lst_411)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_411)"
-"(let-values(((field_0)(unsafe-car lst_411))((rest_236)(unsafe-cdr lst_411)))"
+"(let-values(((fmt_3)(unsafe-car lst_411))((rest_237)(unsafe-cdr lst_411)))"
+"(let-values((()"
+"(let-values()"
+"(let-values((()"
+"(let-values()"
+"(begin"
+"(let-values()"
+"(let-values(((id_147)(mk_0 fmt_3)))"
+"(parse-identifier!"
+" id_147"
+" orig-s_78"
+"(syntax-e$1 id_147)"
+" at-phase_14"
+" ns_126"
+" rp_3"
+" protected?_17)))"
+"(values)))))"
+"(values)))))"
+"(if(not #f)(for-loop_326 rest_237)(values))))"
+"(values))))))"
+" for-loop_326)"
+" lst_122)))"
+"(void)"
+"(let-values(((lst_360) 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)"
+"(begin"
+" 'for-loop"
+"(if(pair? lst_412)"
+"(let-values(((field_0)(unsafe-car lst_412))((rest_238)(unsafe-cdr lst_412)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70589,7 +70633,7 @@ static const char *startup_source =
 " orig-s_78"
 "(syntax-e$1 get-id_0)"
 " at-phase_14"
-" ns_125"
+" ns_126"
 " rp_3"
 " protected?_17)"
 "(parse-identifier!"
@@ -70597,19 +70641,19 @@ static const char *startup_source =
 " orig-s_78"
 "(syntax-e$1 set-id_0)"
 " at-phase_14"
-" ns_125"
+" ns_126"
 " rp_3"
 " protected?_17)))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_327 rest_236)(values))))"
+"(if(not #f)(for-loop_327 rest_238)(values))))"
 "(values))))))"
 " for-loop_327)"
-" lst_357)))"
+" lst_360)))"
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
-"(lambda(mod-path-stx_0 orig-s_79 self_31 except-ids_0 at-phase_15 ns_126 rp_4 protected?_18 ctx_106)"
+"(lambda(mod-path-stx_0 orig-s_79 self_31 except-ids_0 at-phase_15 ns_127 rp_4 protected?_18 ctx_107)"
 "(begin"
 "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
@@ -70619,11 +70663,11 @@ static const char *startup_source =
 "(let-values()"
 "                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_79 mod-path-stx_0)))"
 "(values))))"
-"(let-values(((mpi_54)(module-path->mpi/context mod-path_33 ctx_106)))"
-"(parse-all-from-module mpi_54 #f orig-s_79 except-ids_0 #f at-phase_15 ns_126 rp_4 protected?_18)))))))"
+"(let-values(((mpi_54)(module-path->mpi/context mod-path_33 ctx_107)))"
+"(parse-all-from-module mpi_54 #f orig-s_79 except-ids_0 #f at-phase_15 ns_127 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
-"(lambda(mpi_55 matching-stx_0 orig-s_80 except-ids_1 prefix-sym_0 at-phase_16 ns_127 rp_5 protected?_19)"
+"(lambda(mpi_55 matching-stx_0 orig-s_80 except-ids_1 prefix-sym_0 at-phase_16 ns_128 rp_5 protected?_19)"
 "(begin"
 "(let-values(((requireds_2)(extract-module-requires rp_5 mpi_55 at-phase_16)))"
 "(let-values(((phase-desc_0)"
@@ -70659,42 +70703,42 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_240)))"
 "((letrec-values(((for-loop_328)"
-"(lambda(lst_412)"
+"(lambda(lst_413)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_412)"
-"(let-values(((i_191)(unsafe-car lst_412))"
-"((rest_237)(unsafe-cdr lst_412)))"
+"(if(pair? lst_413)"
+"(let-values(((i_191)(unsafe-car lst_413))"
+"((rest_239)(unsafe-cdr lst_413)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((id_149)"
+"(let-values(((id_148)"
 "(required-id i_191)))"
-"(let-values(((phase_149)"
+"(let-values(((phase_150)"
 "(required-phase"
 " i_191)))"
-"(if(let-values(((or-part_402)"
+"(if(let-values(((or-part_403)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
-" phase_149"
+" phase_150"
 " at-phase_16)"
 "(free-identifier=?$1"
-" id_149"
+" id_148"
 "(datum->syntax$1"
 " matching-stx_0"
 "(syntax-e$1"
-" id_149))"
-" phase_149"
-" phase_149)"
+" id_148))"
+" phase_150"
+" phase_150)"
 " #f))"
 " #f)))"
-"(if or-part_402"
-" or-part_402"
-"(let-values(((lst_413)"
+"(if or-part_403"
+" or-part_403"
+"(let-values(((lst_414)"
 " except-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70702,30 +70746,30 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_413)))"
+" lst_414)))"
 "((letrec-values(((for-loop_329)"
 "(lambda(result_125"
-" lst_414)"
+" lst_415)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_414)"
+" lst_415)"
 "(let-values(((except-id_0)"
 "(unsafe-car"
-" lst_414))"
-"((rest_238)"
+" lst_415))"
+"((rest_240)"
 "(unsafe-cdr"
-" lst_414)))"
+" lst_415)))"
 "(let-values(((result_126)"
 "(let-values()"
 "(let-values(((result_127)"
 "(let-values()"
 "(let-values()"
 "(if(free-identifier=?$1"
-" id_149"
+" id_148"
 " except-id_0"
-" phase_149"
-" phase_149)"
+" phase_150"
+" phase_150)"
 "(hash-set!"
 " found_0"
 " except-id_0"
@@ -70742,24 +70786,24 @@ static const char *startup_source =
 " #f)"
 "(for-loop_329"
 " result_126"
-" rest_238)"
+" rest_240)"
 " result_126)))"
 " result_125)))))"
 " for-loop_329)"
 " #f"
-" lst_413)))))"
+" lst_414)))))"
 "(void)"
 "(let-values()"
 "(let-values(((b_91)"
 "(resolve+shift/extra-inspector"
-" id_149"
-" phase_149"
-" ns_127)))"
+" id_148"
+" phase_150"
+" ns_128)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
-" id_149)"
+" id_148)"
 "((phase131_0)"
-" phase_149)"
+" phase_150)"
 "((temp132_0)"
 " #t))"
 "(resolve+shift30.1"
@@ -70777,30 +70821,30 @@ static const char *startup_source =
 " phase131_0))))"
 "(let-values(((rp121_0)"
 " rp_5)"
-"((temp122_5)"
+"((temp122_4)"
 "(add-prefix_1"
 "(syntax-e$1"
-" id_149)))"
+" id_148)))"
 "((phase123_0)"
-" phase_149)"
+" phase_150)"
 "((b124_0)"
 " b_91)"
 "((immed-b125_0)"
 " immed-b_1)"
 "((id126_0)"
-" id_149)"
+" id_148)"
 "((orig-s127_0)"
 " orig-s_80)"
 "((protected?128_0)"
 " protected?_19)"
-"((temp129_3)"
+"((temp129_2)"
 "(required-as-transformer?"
 " i_191)))"
 "(add-provide!109.1"
 " protected?128_0"
-" temp129_3"
+" temp129_2"
 " rp121_0"
-" temp122_5"
+" temp122_4"
 " phase123_0"
 " b124_0"
 " immed-b125_0"
@@ -70808,7 +70852,7 @@ static const char *startup_source =
 " orig-s127_0)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_328 rest_237)(values))))"
+"(if(not #f)(for-loop_328 rest_239)(values))))"
 "(values))))))"
 " for-loop_328)"
 " lst_240)))"
@@ -70835,14 +70879,14 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_404)"
 "(hash-ref"
 " found_0"
 " except-id_1"
 " #f)))"
-"(if or-part_403"
-" or-part_403"
-"(let-values(((lst_415)"
+"(if or-part_404"
+" or-part_404"
+"(let-values(((lst_416)"
 " requireds_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70850,36 +70894,36 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_415)))"
+" lst_416)))"
 "((letrec-values(((for-loop_142)"
 "(lambda(result_128"
-" lst_416)"
+" lst_417)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_416)"
+" lst_417)"
 "(let-values(((i_192)"
 "(unsafe-car"
-" lst_416))"
-"((rest_239)"
+" lst_417))"
+"((rest_241)"
 "(unsafe-cdr"
-" lst_416)))"
+" lst_417)))"
 "(let-values(((result_129)"
 "(let-values()"
 "(let-values(((result_130)"
 "(let-values()"
 "(let-values()"
-"(let-values(((id_150)"
+"(let-values(((id_149)"
 "(required-id"
 " i_192)))"
-"(let-values(((phase_150)"
+"(let-values(((phase_151)"
 "(required-phase"
 " i_192)))"
 "(free-identifier=?$1"
-" id_150"
+" id_149"
 " except-id_1"
-" phase_150"
-" phase_150)))))))"
+" phase_151"
+" phase_151)))))))"
 "(values"
 " result_130)))))"
 "(if(if(not"
@@ -70891,12 +70935,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_142"
 " result_129"
-" rest_239)"
+" rest_241)"
 " result_129)))"
 " result_128)))))"
 " for-loop_142)"
 " #f"
-" lst_415)))))"
+" lst_416)))))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -70924,11 +70968,11 @@ static const char *startup_source =
 "(begin"
 " 'check-body"
 "(begin"
-"(let-values(((lst_417) bodys_14))"
+"(let-values(((lst_418) bodys_14))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_417)))"
+"(let-values()(check-list lst_418)))"
 "((letrec-values(((for-loop_330)"
 "(lambda(lst_85)"
 "(begin"
@@ -70980,7 +71024,7 @@ static const char *startup_source =
 "(if(not #f)(for-loop_330 rest_40)(values))))"
 "(values))))))"
 " for-loop_330)"
-" lst_417)))"
+" lst_418)))"
 "(void)))))"
 "((check-expr_0)"
 "(lambda(e_93 num-results_0 enclosing_15)"
@@ -71012,7 +71056,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_86)"
 "(let-values(((rand_0)(unsafe-car lst_86))"
-"((rest_240)(unsafe-cdr lst_86)))"
+"((rest_242)(unsafe-cdr lst_86)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71025,7 +71069,7 @@ static const char *startup_source =
 " e_93))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_81 rest_240)(values))))"
+"(if(not #f)(for-loop_81 rest_242)(values))))"
 "(values))))))"
 " for-loop_81)"
 " lst_79)))"
@@ -71039,9 +71083,9 @@ static const char *startup_source =
 "(let-values()(check-count 3 num-results_0 enclosing_15))"
 "(if(equal? tmp_66 'gensym)"
 "(let-values()"
-"(if(let-values(((or-part_370)(= 0(length rands_1))))"
-"(if or-part_370"
-" or-part_370"
+"(if(let-values(((or-part_371)(= 0(length rands_1))))"
+"(if or-part_371"
+" or-part_371"
 "(if(= 1(length rands_1))"
 "(quoted-string?(car rands_1))"
 " #f)))"
@@ -71069,12 +71113,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_270)))"
 "((letrec-values(((for-loop_241)"
-"(lambda(lst_418)"
+"(lambda(lst_419)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_418)"
-"(let-values(((clause_4)(unsafe-car lst_418))"
-"((rest_241)(unsafe-cdr lst_418)))"
+"(if(pair? lst_419)"
+"(let-values(((clause_4)(unsafe-car lst_419))"
+"((rest_243)(unsafe-cdr lst_419)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71085,7 +71129,7 @@ static const char *startup_source =
 "(cadr clause_4)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_241 rest_241)(values))))"
+"(if(not #f)(for-loop_241 rest_243)(values))))"
 "(values))))))"
 " for-loop_241)"
 " lst_270)))"
@@ -71105,7 +71149,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair? lst_266)"
 "(let-values(((e_94)(unsafe-car lst_266))"
-"((rest_192)(unsafe-cdr lst_266)))"
+"((rest_194)(unsafe-cdr lst_266)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71116,7 +71160,7 @@ static const char *startup_source =
 " e_94))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_106 rest_192)(values))))"
+"(if(not #f)(for-loop_106 rest_194)(values))))"
 "(values))))))"
 " for-loop_106)"
 " lst_222)))"
@@ -71255,11 +71299,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_151)"
+"(lambda(id_150)"
 "(begin"
-"(if(parsed-id? id_151)"
+"(if(parsed-id? id_150)"
 "(let-values()"
-"(let-values(((b_92)(parsed-id-binding id_151)))"
+"(let-values(((b_92)(parsed-id-binding id_150)))"
 "(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)"
@@ -71277,100 +71321,100 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'module"
-"(lambda(s_185 ctx_107)"
+"(lambda(s_185 ctx_108)"
 "(begin"
-"(if(eq?(expand-context-context ctx_107) 'top-level)"
+"(if(eq?(expand-context-context ctx_108) 'top-level)"
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_125)(expand-context-observer ctx_107)))"
-"(if obs_125(let-values()(let-values()(call-expand-observe obs_125 'prim-module)))(void)))"
+"(let-values(((obs_122)(expand-context-observer ctx_108)))"
+"(if obs_122(let-values()(let-values()(call-expand-observe obs_122 'prim-module)))(void)))"
 "             (raise-syntax-error$1 #f \"allowed only at the top level\" s_185))))"
 "(let-values()"
-"(let-values(((s223_0) s_185)((ctx224_0) ctx_107)((temp225_1) #f))"
+"(let-values(((s223_0) s_185)((ctx224_0) ctx_108)((temp225_1) #f))"
 "(expand-module18.1 #f #f #f #f #f #f #f #f #f #f #f #f #f #f s223_0 ctx224_0 temp225_1)))))))"
 "(void"
 "(add-core-form!*"
 " 'module*"
-"(lambda(s_305 ctx_108)"
+"(lambda(s_305 ctx_109)"
 "(begin"
-"(let-values(((obs_126)(expand-context-observer ctx_108)))"
-"(if obs_126(let-values()(let-values()(call-expand-observe obs_126 'prim-module)))(void)))"
+"(let-values(((obs_123)(expand-context-observer ctx_109)))"
+"(if obs_123(let-values()(let-values()(call-expand-observe obs_123 'prim-module)))(void)))"
 "       (raise-syntax-error$1 #f \"illegal use (not in a module top-level)\" s_305)))))"
 "(void"
 "(add-core-form!*"
 " '#%module-begin"
-"(lambda(s_86 ctx_109)"
+"(lambda(s_86 ctx_110)"
 "(begin"
-"(let-values(((obs_127)(expand-context-observer ctx_109)))"
-"(if obs_127(let-values()(let-values()(call-expand-observe obs_127 'prim-module-begin)))(void)))"
-"(if(eq?(expand-context-context ctx_109) 'module-begin)"
+"(let-values(((obs_124)(expand-context-observer ctx_110)))"
+"(if obs_124(let-values()(let-values()(call-expand-observe obs_124 'prim-module-begin)))(void)))"
+"(if(eq?(expand-context-context ctx_110) 'module-begin)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not in a module-definition context\" s_86)))"
-"(if(expand-context-module-begin-k ctx_109)"
+"(if(expand-context-module-begin-k ctx_110)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not currently transforming a module\" s_86)))"
-"((expand-context-module-begin-k ctx_109)"
+"((expand-context-module-begin-k ctx_110)"
 " s_86"
-"(let-values(((v_261) ctx_109))"
-"(let-values(((the-struct_97) v_261))"
-"(if(expand-context/outer? the-struct_97)"
+"(let-values(((v_262) ctx_110))"
+"(let-values(((the-struct_98) v_262))"
+"(if(expand-context/outer? the-struct_98)"
 "(let-values(((inner226_0)"
-"(let-values(((the-struct_98)(root-expand-context/outer-inner v_261)))"
-"(if(expand-context/inner? the-struct_98)"
+"(let-values(((the-struct_99)(root-expand-context/outer-inner v_262)))"
+"(if(expand-context/inner? the-struct_99)"
 "(let-values(((module-begin-k227_0) #f))"
 "(expand-context/inner2.1"
-"(root-expand-context/inner-self-mpi the-struct_98)"
-"(root-expand-context/inner-module-scopes the-struct_98)"
-"(root-expand-context/inner-top-level-bind-scope the-struct_98)"
-"(root-expand-context/inner-all-scopes-stx the-struct_98)"
-"(root-expand-context/inner-defined-syms the-struct_98)"
-"(root-expand-context/inner-counter the-struct_98)"
-"(root-expand-context/inner-lift-key the-struct_98)"
-"(expand-context/inner-to-parsed? the-struct_98)"
-"(expand-context/inner-phase the-struct_98)"
-"(expand-context/inner-namespace the-struct_98)"
-"(expand-context/inner-just-once? the-struct_98)"
+"(root-expand-context/inner-self-mpi the-struct_99)"
+"(root-expand-context/inner-module-scopes the-struct_99)"
+"(root-expand-context/inner-top-level-bind-scope the-struct_99)"
+"(root-expand-context/inner-all-scopes-stx the-struct_99)"
+"(root-expand-context/inner-defined-syms the-struct_99)"
+"(root-expand-context/inner-counter the-struct_99)"
+"(root-expand-context/inner-lift-key the-struct_99)"
+"(expand-context/inner-to-parsed? the-struct_99)"
+"(expand-context/inner-phase the-struct_99)"
+"(expand-context/inner-namespace the-struct_99)"
+"(expand-context/inner-just-once? the-struct_99)"
 " module-begin-k227_0"
-"(expand-context/inner-allow-unbound? the-struct_98)"
-"(expand-context/inner-in-local-expand? the-struct_98)"
-"(expand-context/inner-stops the-struct_98)"
-"(expand-context/inner-declared-submodule-names the-struct_98)"
-"(expand-context/inner-lifts the-struct_98)"
-"(expand-context/inner-lift-envs the-struct_98)"
-"(expand-context/inner-module-lifts the-struct_98)"
-"(expand-context/inner-require-lifts the-struct_98)"
-"(expand-context/inner-to-module-lifts the-struct_98)"
-"(expand-context/inner-requires+provides the-struct_98)"
-"(expand-context/inner-observer the-struct_98)"
-"(expand-context/inner-for-serializable? the-struct_98)"
-"(expand-context/inner-should-not-encounter-macros? the-struct_98)))"
-"                                (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_98)))))"
+"(expand-context/inner-allow-unbound? the-struct_99)"
+"(expand-context/inner-in-local-expand? the-struct_99)"
+"(expand-context/inner-stops the-struct_99)"
+"(expand-context/inner-declared-submodule-names the-struct_99)"
+"(expand-context/inner-lifts the-struct_99)"
+"(expand-context/inner-lift-envs the-struct_99)"
+"(expand-context/inner-module-lifts the-struct_99)"
+"(expand-context/inner-require-lifts the-struct_99)"
+"(expand-context/inner-to-module-lifts the-struct_99)"
+"(expand-context/inner-requires+provides the-struct_99)"
+"(expand-context/inner-observer the-struct_99)"
+"(expand-context/inner-for-serializable? the-struct_99)"
+"(expand-context/inner-should-not-encounter-macros? the-struct_99)))"
+"                                (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_99)))))"
 "(expand-context/outer1.1"
 " inner226_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_97)"
-"(root-expand-context/outer-use-site-scopes the-struct_97)"
-"(root-expand-context/outer-frame-id the-struct_97)"
-"(expand-context/outer-context the-struct_97)"
-"(expand-context/outer-env the-struct_97)"
-"(expand-context/outer-post-expansion-scope-action the-struct_97)"
-"(expand-context/outer-scopes the-struct_97)"
-"(expand-context/outer-def-ctx-scopes the-struct_97)"
-"(expand-context/outer-binding-layer the-struct_97)"
-"(expand-context/outer-reference-records the-struct_97)"
-"(expand-context/outer-only-immediate? the-struct_97)"
-"(expand-context/outer-need-eventually-defined the-struct_97)"
-"(expand-context/outer-current-introduction-scopes the-struct_97)"
-"(expand-context/outer-name the-struct_97)))"
-"              (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_97)))))))))"
+"(root-expand-context/outer-post-expansion-scope the-struct_98)"
+"(root-expand-context/outer-use-site-scopes the-struct_98)"
+"(root-expand-context/outer-frame-id the-struct_98)"
+"(expand-context/outer-context the-struct_98)"
+"(expand-context/outer-env the-struct_98)"
+"(expand-context/outer-post-expansion-scope-action the-struct_98)"
+"(expand-context/outer-scopes the-struct_98)"
+"(expand-context/outer-def-ctx-scopes the-struct_98)"
+"(expand-context/outer-binding-layer the-struct_98)"
+"(expand-context/outer-reference-records the-struct_98)"
+"(expand-context/outer-only-immediate? the-struct_98)"
+"(expand-context/outer-need-eventually-defined the-struct_98)"
+"(expand-context/outer-current-introduction-scopes the-struct_98)"
+"(expand-context/outer-name the-struct_98)))"
+"              (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_98)))))))))"
 "(void"
 "(add-core-form!*"
 " '#%declare"
-"(lambda(s_731 ctx_110)"
+"(lambda(s_728 ctx_111)"
 "(begin"
-"(let-values(((obs_128)(expand-context-observer ctx_110)))"
-"(if obs_128(let-values()(let-values()(call-expand-observe obs_128 'prim-declare)))(void)))"
-"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_731)))))"
+"(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_728)))))"
 "(define-values"
 "(expand-module18.1)"
 "(lambda(always-produce-compiled?1_0"
@@ -71421,55 +71465,55 @@ static const char *startup_source =
 "(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(((s_504) disarmed-s_24))"
-"(let-values(((orig-s_81) s_504))"
+"(let-values(((s_500) disarmed-s_24))"
+"(let-values(((orig-s_81) s_500))"
 "(let-values(((module228_1"
 " id:module-name229_1"
 " initial-require230_1"
 " body231_1)"
 "(let-values(((s_312)"
-"(if(syntax?$1 s_504)"
-"(syntax-e$1 s_504)"
-" s_504)))"
+"(if(syntax?$1 s_500)"
+"(syntax-e$1 s_500)"
+" s_500)))"
 "(if(pair? s_312)"
 "(let-values(((module232_0)"
-"(let-values(((s_505)(car s_312)))"
-" s_505))"
+"(let-values(((s_501)(car s_312)))"
+" s_501))"
 "((id:module-name233_0"
 " initial-require234_0"
 " body235_0)"
-"(let-values(((s_734)(cdr s_312)))"
-"(let-values(((s_762)"
-"(if(syntax?$1 s_734)"
-"(syntax-e$1 s_734)"
-" s_734)))"
-"(if(pair? s_762)"
+"(let-values(((s_731)(cdr s_312)))"
+"(let-values(((s_760)"
+"(if(syntax?$1 s_731)"
+"(syntax-e$1 s_731)"
+" s_731)))"
+"(if(pair? s_760)"
 "(let-values(((id:module-name236_0)"
-"(let-values(((s_490)"
+"(let-values(((s_486)"
 "(car"
-" s_762)))"
-"(if(let-values(((or-part_378)"
+" s_760)))"
+"(if(let-values(((or-part_379)"
 "(if(syntax?$1"
-" s_490)"
+" s_486)"
 "(symbol?"
 "(syntax-e$1"
-" s_490))"
+" s_486))"
 " #f)))"
-"(if or-part_378"
-" or-part_378"
+"(if or-part_379"
+" or-part_379"
 "(symbol?"
-" s_490)))"
-" s_490"
+" s_486)))"
+" s_486"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                           \"not an identifier\""
 " orig-s_81"
-" s_490))))"
+" s_486))))"
 "((initial-require237_0"
 " body238_0)"
 "(let-values(((s_54)"
 "(cdr"
-" s_762)))"
+" s_760)))"
 "(let-values(((s_314)"
 "(if(syntax?$1"
 " s_54)"
@@ -71537,7 +71581,7 @@ static const char *startup_source =
 "((s254_0) s_16)"
 "((temp255_0) #t)"
 "((temp256_0) #t))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " temp256_0"
@@ -71561,7 +71605,7 @@ static const char *startup_source =
 " s_16"
 " initial-require230_0)))"
 "(values))))"
-"(let-values(((phase_151) 0))"
+"(let-values(((phase_152) 0))"
 "(let-values(((module-name-sym_0)(syntax-e$1 id:module-name229_0)))"
 "(let-values(((outside-scope_1)(new-scope 'module)))"
 "(let-values(((inside-scope_0)(new-multi-scope module-name-sym_0)))"
@@ -71642,7 +71686,7 @@ static const char *startup_source =
 " ns243_0)"
 "(begin"
 " 'make-m-ns244"
-"(let-values(((ns_119) ns243_0))"
+"(let-values(((ns_120) ns243_0))"
 "(let-values(((for-submodule?_1)"
 "(if for-submodule?242_0"
 " for-submodule?241_0"
@@ -71651,7 +71695,7 @@ static const char *startup_source =
 " #f))))"
 "(let-values()"
 "(let-values(((ns262_0)"
-" ns_119)"
+" ns_120)"
 "((self263_0)"
 " self_32)"
 "((root-ctx264_0)"
@@ -71673,115 +71717,115 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp266_2))))"
-"(let-values(((ctx_111)"
+"(let-values(((ctx_112)"
 "(let-values(((v_102)"
 "(copy-root-expand-context"
 " init-ctx_0"
 " root-ctx_6)))"
-"(let-values(((the-struct_99)"
+"(let-values(((the-struct_100)"
 " v_102))"
 "(if(expand-context/outer?"
-" the-struct_99)"
+" the-struct_100)"
 "(let-values(((post-expansion-scope-action267_0)"
 " add-scope)"
 "((inner268_0)"
-"(let-values(((the-struct_100)"
+"(let-values(((the-struct_101)"
 "(root-expand-context/outer-inner"
 " v_102)))"
 "(if(expand-context/inner?"
-" the-struct_100)"
+" the-struct_101)"
 "(let-values(((allow-unbound?269_0)"
 " #f)"
 "((namespace270_0)"
 " m-ns_18)"
 "((phase271_0)"
-" phase_151)"
+" phase_152)"
 "((just-once?272_0)"
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-counter"
-" the-struct_100)"
+" the-struct_101)"
 "(root-expand-context/inner-lift-key"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-to-parsed?"
-" the-struct_100)"
+" the-struct_101)"
 " phase271_0"
 " namespace270_0"
 " just-once?272_0"
 "(expand-context/inner-module-begin-k"
-" the-struct_100)"
+" the-struct_101)"
 " allow-unbound?269_0"
 "(expand-context/inner-in-local-expand?"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-stops"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-lifts"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-lift-envs"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-module-lifts"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-require-lifts"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-requires+provides"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-observer"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-for-serializable?"
-" the-struct_100)"
+" the-struct_101)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_100)))"
+" the-struct_101)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                 \"expand-context/inner?\""
-" the-struct_100)))))"
+" the-struct_101)))))"
 "(expand-context/outer1.1"
 " inner268_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/outer-frame-id"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-context"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-env"
-" the-struct_99)"
+" the-struct_100)"
 " post-expansion-scope-action267_0"
 "(expand-context/outer-scopes"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-binding-layer"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-reference-records"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-only-immediate?"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/outer-name"
-" the-struct_99)))"
+" the-struct_100)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                               \"expand-context/outer?\""
-" the-struct_99))))))"
+" the-struct_100))))))"
 "(let-values(((bodys_15)"
 "(let-values(((scoped-s_0)"
 "(apply-module-scopes_0"
@@ -71791,33 +71835,33 @@ static const char *startup_source =
 " _274_1"
 " _275_1"
 " body276_0)"
-"(let-values(((s_763)"
+"(let-values(((s_761)"
 " scoped-s_0))"
 "(let-values(((orig-s_82)"
-" s_763))"
+" s_761))"
 "(let-values(((_273_2"
 " _274_2"
 " _275_2"
 " body276_1)"
-"(let-values(((s_411)"
+"(let-values(((s_408)"
 "(if(syntax?$1"
-" s_763)"
+" s_761)"
 "(syntax-e$1"
-" s_763)"
-" s_763)))"
+" s_761)"
+" s_761)))"
 "(if(pair?"
-" s_411)"
+" s_408)"
 "(let-values(((_277_1)"
-"(let-values(((s_744)"
+"(let-values(((s_741)"
 "(car"
-" s_411)))"
-" s_744))"
+" s_408)))"
+" s_741))"
 "((_278_0"
 " _279_0"
 " body280_0)"
 "(let-values(((s_208)"
 "(cdr"
-" s_411)))"
+" s_408)))"
 "(let-values(((s_394)"
 "(if(syntax?$1"
 " s_208)"
@@ -71833,15 +71877,15 @@ static const char *startup_source =
 " s_211))"
 "((_282_0"
 " body283_0)"
-"(let-values(((s_746)"
+"(let-values(((s_743)"
 "(cdr"
 " s_394)))"
 "(let-values(((s_94)"
 "(if(syntax?$1"
-" s_746)"
+" s_743)"
 "(syntax-e$1"
-" s_746)"
-" s_746)))"
+" s_743)"
+" s_743)))"
 "(if(pair?"
 " s_94)"
 "(let-values(((_284_0)"
@@ -71986,14 +72030,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_129)"
+"(let-values(((obs_126)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_129"
+"(if obs_126"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_129"
+" obs_126"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -72034,22 +72078,22 @@ static const char *startup_source =
 "(set! again?_0"
 " #t)"
 "(values))))"
-"(let-values(((ctx_112)"
-"(let-values(((v_262)"
+"(let-values(((ctx_113)"
+"(let-values(((v_263)"
 " mb-init-ctx_0))"
-"(let-values(((the-struct_101)"
-" v_262))"
-"(if(expand-context/outer?"
-" the-struct_101)"
-"(let-values(((inner306_0)"
 "(let-values(((the-struct_102)"
-"(root-expand-context/outer-inner"
-" v_262)))"
-"(if(expand-context/inner?"
+" v_263))"
+"(if(expand-context/outer?"
 " the-struct_102)"
+"(let-values(((inner306_0)"
+"(let-values(((the-struct_103)"
+"(root-expand-context/outer-inner"
+" v_263)))"
+"(if(expand-context/inner?"
+" the-struct_103)"
 "(let-values(((module-begin-k307_0)"
 "(lambda(s_302"
-" ctx_113)"
+" ctx_114)"
 "(begin"
 " 'module-begin-k307"
 "(let-values(((new-requires+provides_0)"
@@ -72086,7 +72130,7 @@ static const char *startup_source =
 "(lambda()"
 "(module-begin-k_1"
 " s_302"
-" ctx_113))"
+" ctx_114))"
 "(lambda()"
 "(begin"
 "(set! requires+provides_6"
@@ -72097,106 +72141,106 @@ static const char *startup_source =
 " compiled-module-box310_0))))))))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-counter"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/inner-lift-key"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-to-parsed?"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-phase"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-namespace"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-just-once?"
-" the-struct_102)"
+" the-struct_103)"
 " module-begin-k307_0"
 "(expand-context/inner-allow-unbound?"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-stops"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-lifts"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-lift-envs"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-module-lifts"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-require-lifts"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-requires+provides"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-observer"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-for-serializable?"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_102)))"
+" the-struct_103)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                    \"expand-context/inner?\""
-" the-struct_102)))))"
+" the-struct_103)))))"
 "(expand-context/outer1.1"
 " inner306_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_101)"
+" the-struct_102)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_101)"
+" the-struct_102)"
 "(root-expand-context/outer-frame-id"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-context"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-env"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-scopes"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-binding-layer"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-reference-records"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-only-immediate?"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_101)"
+" the-struct_102)"
 "(expand-context/outer-name"
-" the-struct_101)))"
+" the-struct_102)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                  \"expand-context/outer?\""
-" the-struct_101))))))"
+" the-struct_102))))))"
 "(let-values(((added-s_2)"
 "(add-scope"
 " mb-s_0"
 " inside-scope_0)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_130)"
+"(let-values(((obs_127)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_130"
+" ctx_113)))"
+"(if obs_127"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_130"
+" obs_127"
 " 'rename-one"
 " added-s_2)))"
 "(void)))"
@@ -72230,7 +72274,7 @@ static const char *startup_source =
 "(let-values(((s_121)"
 "(cdr"
 " s_223)))"
-"(let-values(((s_764)"
+"(let-values(((s_762)"
 "(if(syntax?$1"
 " s_121)"
 "(syntax-e$1"
@@ -72238,7 +72282,7 @@ static const char *startup_source =
 " s_121)))"
 "(let-values(((flat-s_53)"
 "(to-syntax-list.1"
-" s_764)))"
+" s_762)))"
 "(if(not"
 " flat-s_53)"
 "(let-values()"
@@ -72263,10 +72307,10 @@ static const char *startup_source =
 " body302_0))"
 "(let-values(((rebuild-mb-s_0)"
 "(let-values(((ctx316_0)"
-" ctx_112)"
+" ctx_113)"
 "((mb-s317_0)"
 " mb-s_0))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -72286,7 +72330,7 @@ static const char *startup_source =
 "(let-values(((expression-expanded-bodys_0)"
 "((letrec-values(((pass-1-and-2-loop_0)"
 "(lambda(bodys_17"
-" phase_152)"
+" phase_153)"
 "(begin"
 " 'pass-1-and-2-loop"
 "(let-values(((def-ctx-scopes_8)"
@@ -72294,14 +72338,14 @@ static const char *startup_source =
 " null)))"
 "(let-values(((to-parsed?_5)"
 "(expand-context-to-parsed?"
-" ctx_112)))"
+" ctx_113)))"
 "(let-values(((partial-body-ctx_0)"
-"(let-values(((v_263)"
-" ctx_112))"
-"(let-values(((the-struct_103)"
-" v_263))"
+"(let-values(((v_264)"
+" ctx_113))"
+"(let-values(((the-struct_104)"
+" v_264))"
 "(if(expand-context/outer?"
-" the-struct_103)"
+" the-struct_104)"
 "(let-values(((context326_0)"
 " 'module)"
 "((def-ctx-scopes327_0)"
@@ -72309,22 +72353,22 @@ static const char *startup_source =
 "((need-eventually-defined328_0)"
 " need-eventually-defined_1)"
 "((inner329_0)"
-"(let-values(((the-struct_104)"
+"(let-values(((the-struct_58)"
 "(root-expand-context/outer-inner"
-" v_263)))"
+" v_264)))"
 "(if(expand-context/inner?"
-" the-struct_104)"
+" the-struct_58)"
 "(let-values(((phase330_0)"
-" phase_152)"
+" phase_153)"
 "((namespace331_0)"
 "(namespace->namespace-at-phase"
 " m-ns_18"
-" phase_152))"
+" phase_153))"
 "((stops332_0)"
 "(free-id-set"
-" phase_152"
+" phase_153"
 "(module-expand-stop-ids"
-" phase_152)))"
+" phase_153)))"
 "((declared-submodule-names333_0)"
 " declared-submodule-names_3)"
 "((lift-key334_0)"
@@ -72344,11 +72388,11 @@ static const char *startup_source =
 " temp339_1)))"
 "((module-lifts336_0)"
 "(make-module-lift-context"
-" phase_152"
+" phase_153"
 " #t))"
 "((require-lifts337_0)"
 "(make-require-lift-context"
-" phase_152"
+" phase_153"
 "(let-values(((m-ns340_0)"
 " m-ns_18)"
 "((self341_0)"
@@ -72364,7 +72408,7 @@ static const char *startup_source =
 " requires+provides342_0))))"
 "((to-module-lifts338_0)"
 "(let-values(((phase344_0)"
-" phase_152)"
+" phase_153)"
 "((module-ends345_0)"
 " module-ends_0)"
 "((temp346_0)"
@@ -72375,86 +72419,86 @@ static const char *startup_source =
 " phase344_0))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_104)"
+" the-struct_58)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_104)"
+" the-struct_58)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_104)"
+" the-struct_58)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_104)"
+" the-struct_58)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_104)"
+" the-struct_58)"
 "(root-expand-context/inner-counter"
-" the-struct_104)"
+" the-struct_58)"
 " lift-key334_0"
 "(expand-context/inner-to-parsed?"
-" the-struct_104)"
+" the-struct_58)"
 " phase330_0"
 " namespace331_0"
 "(expand-context/inner-just-once?"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-module-begin-k"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_104)"
+" the-struct_58)"
 " stops332_0"
 " declared-submodule-names333_0"
 " lifts335_0"
 "(expand-context/inner-lift-envs"
-" the-struct_104)"
+" the-struct_58)"
 " module-lifts336_0"
 " require-lifts337_0"
 " to-module-lifts338_0"
 "(expand-context/inner-requires+provides"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-observer"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-for-serializable?"
-" the-struct_104)"
+" the-struct_58)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_104)))"
+" the-struct_58)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                                  \"expand-context/inner?\""
-" the-struct_104)))))"
+" the-struct_58)))))"
 "(expand-context/outer1.1"
 " inner329_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/outer-frame-id"
-" the-struct_103)"
+" the-struct_104)"
 " context326_0"
 "(expand-context/outer-env"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/outer-scopes"
-" the-struct_103)"
+" the-struct_104)"
 " def-ctx-scopes327_0"
 "(expand-context/outer-binding-layer"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/outer-reference-records"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/outer-only-immediate?"
-" the-struct_103)"
+" the-struct_104)"
 " need-eventually-defined328_0"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/outer-name"
-" the-struct_103)))"
+" the-struct_104)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                \"expand-context/outer?\""
-" the-struct_103))))))"
+" the-struct_104))))))"
 "(let-values(((partially-expanded-bodys_0)"
 "(let-values(((bodys347_0)"
 " bodys_17)"
 "((phase348_0)"
-" phase_152)"
+" phase_153)"
 "((partial-body-ctx349_0)"
 " partial-body-ctx_0)"
 "((m-ns350_0)"
@@ -72502,24 +72546,24 @@ static const char *startup_source =
 " bodys347_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_131)"
+"(let-values(((obs_128)"
 "(expand-context-observer"
 " partial-body-ctx_0)))"
-"(if obs_131"
+"(if obs_128"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_131"
+" obs_128"
 " 'next-group)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_6)"
-"(let-values(((v_264)"
+"(let-values(((v_265)"
 "(accumulate-def-ctx-scopes"
 " partial-body-ctx_0"
 " def-ctx-scopes_8)))"
 "(let-values(((the-struct_105)"
-" v_264))"
+" v_265))"
 "(if(expand-context/outer?"
 " the-struct_105)"
 "(let-values(((def-ctx-scopes363_0)"
@@ -72529,14 +72573,14 @@ static const char *startup_source =
 "((inner365_0)"
 "(let-values(((the-struct_106)"
 "(root-expand-context/outer-inner"
-" v_264)))"
+" v_265)))"
 "(if(expand-context/inner?"
 " the-struct_106)"
 "(let-values(((stops366_0)"
 " empty-free-id-set)"
 "((to-module-lifts367_0)"
 "(let-values(((phase368_0)"
-" phase_152)"
+" phase_153)"
 "((module-ends369_0)"
 " module-ends_0)"
 "((temp370_0)"
@@ -72633,7 +72677,7 @@ static const char *startup_source =
 "(let-values(((partially-expanded-bodys318_0)"
 " partially-expanded-bodys_0)"
 "((phase319_0)"
-" phase_152)"
+" phase_153)"
 "((body-ctx320_0)"
 " body-ctx_6)"
 "((self321_0)"
@@ -72657,24 +72701,24 @@ static const char *startup_source =
 " partially-expanded-bodys318_0))))))))))))"
 " pass-1-and-2-loop_0)"
 " bodys_16"
-" phase_151)))"
+" phase_152)))"
 "(let-values((()"
 "(begin"
 "(check-defined-by-now"
 " need-eventually-defined_1"
 " self_32"
-" ctx_112)"
+" ctx_113)"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_132)"
+"(let-values(((obs_129)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_132"
+" ctx_113)))"
+"(if obs_129"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_132"
+" obs_129"
 " 'next-group)))"
 "(void)))"
 "(values))))"
@@ -72688,11 +72732,11 @@ static const char *startup_source =
 "((m-ns374_0)"
 " m-ns_18)"
 "((phase375_0)"
-" phase_151)"
+" phase_152)"
 "((self376_0)"
 " self_32)"
 "((ctx377_0)"
-" ctx_112))"
+" ctx_113))"
 "(resolve-provides115.1"
 " ctx377_0"
 " declared-submodule-names373_0"
@@ -72729,14 +72773,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_80)"
+"(let-values(((obs_78)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_80"
+" ctx_113)))"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_80"
+" obs_78"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -72750,10 +72794,10 @@ static const char *startup_source =
 " #t"
 " m-ns378_0))))"
 "(let-values(((submod-ctx_0)"
-"(let-values(((v_265)"
-" ctx_112))"
+"(let-values(((v_266)"
+" ctx_113))"
 "(let-values(((the-struct_107)"
-" v_265))"
+" v_266))"
 "(if(expand-context/outer?"
 " the-struct_107)"
 "(let-values(((frame-id380_0)"
@@ -72763,7 +72807,7 @@ static const char *startup_source =
 "((inner382_0)"
 "(let-values(((the-struct_108)"
 "(root-expand-context/outer-inner"
-" v_265)))"
+" v_266)))"
 "(if(expand-context/inner?"
 " the-struct_108)"
 "(let-values(((namespace383_0)"
@@ -72904,7 +72948,7 @@ static const char *startup_source =
 "((declare-enclosing-module396_0)"
 " declare-enclosing-module_0)"
 "((phase397_0)"
-" phase_151)"
+" phase_152)"
 "((self398_0)"
 " self_32)"
 "((requires+provides399_0)"
@@ -72970,10 +73014,10 @@ static const char *startup_source =
 "(let-values()"
 " mb-result-s_0)))))))))))))))))))))))))))))))))"
 "(let-values(((mb-ctx_0)"
-"(let-values(((v_266)"
-" ctx_111))"
+"(let-values(((v_267)"
+" ctx_112))"
 "(let-values(((the-struct_109)"
-" v_266))"
+" v_267))"
 "(if(expand-context/outer?"
 " the-struct_109)"
 "(let-values(((context409_0)"
@@ -72981,7 +73025,7 @@ static const char *startup_source =
 "((inner410_0)"
 "(let-values(((the-struct_110)"
 "(root-expand-context/outer-inner"
-" v_266)))"
+" v_267)))"
 "(if(expand-context/inner?"
 " the-struct_110)"
 "(let-values(((module-begin-k411_0)"
@@ -73096,7 +73140,7 @@ static const char *startup_source =
 "((mb-def-ctx-scopes418_0)"
 " mb-def-ctx-scopes_0)"
 "((phase419_0)"
-" phase_151)"
+" phase_152)"
 "((s420_0)"
 " s_16))"
 "(ensure-module-begin36.1"
@@ -73112,7 +73156,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((mb421_0)"
 " mb_0)"
-"((temp422_1)"
+"((temp422_0)"
 "(accumulate-def-ctx-scopes"
 " mb-ctx_0"
 " mb-def-ctx-scopes_0)))"
@@ -73122,7 +73166,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " mb421_0"
-" temp422_1)))))"
+" temp422_0)))))"
 "(let-values(((requires_6"
 " provides_13)"
 "(extract-requires-and-provides"
@@ -73181,17 +73225,17 @@ static const char *startup_source =
 "(check-list"
 " lst_143)))"
 "((letrec-values(((for-loop_140)"
-"(lambda(lst_419)"
+"(lambda(lst_420)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_419)"
+" lst_420)"
 "(let-values(((mpi_56)"
 "(unsafe-car"
-" lst_419))"
-"((rest_242)"
+" lst_420))"
+"((rest_244)"
 "(unsafe-cdr"
-" lst_419)))"
+" lst_420)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -73205,7 +73249,7 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_140"
-" rest_242)"
+" rest_244)"
 "(values))))"
 "(values))))))"
 " for-loop_140)"
@@ -73256,14 +73300,14 @@ static const char *startup_source =
 " #t)"
 " result-s_17)))"
 "(begin"
-"(let-values(((obs_133)"
+"(let-values(((obs_130)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_133"
+"(if obs_130"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_133"
+" obs_130"
 " 'rename-one"
 " result-s_18)))"
 "(void)))"
@@ -73289,22 +73333,22 @@ static const char *startup_source =
 "(let-values(((module-name-sym_1) module-name-sym21_0))"
 "(let-values(((scopes-s_0) scopes-s22_0))"
 "(let-values()"
-"(let-values(((ctx_114) ctx24_0))"
+"(let-values(((ctx_115) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
-"(let-values(((phase_153) phase26_3))"
-"(let-values(((s_765) s27_2))"
+"(let-values(((phase_154) phase26_3))"
+"(let-values(((s_763) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
 "(begin"
 " 'make-mb-ctx"
-"(let-values(((v_267) ctx_114))"
-"(let-values(((the-struct_111) v_267))"
+"(let-values(((v_268) ctx_115))"
+"(let-values(((the-struct_111) v_268))"
 "(if(expand-context/outer? the-struct_111)"
 "(let-values(((context428_0) 'module-begin)"
 "((only-immediate?429_0) #t)"
 "((def-ctx-scopes430_0) def-ctx-scopes_9)"
-"((inner431_0)(root-expand-context/outer-inner v_267)))"
+"((inner431_0)(root-expand-context/outer-inner v_268)))"
 "(expand-context/outer1.1"
 " inner431_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_111)"
@@ -73329,15 +73373,15 @@ static const char *startup_source =
 "(if(= 1(length bodys_18))"
 "(let-values()"
 "(begin"
-"(let-values(((obs_134)(expand-context-observer ctx_114)))"
-"(if obs_134"
+"(let-values(((obs_131)(expand-context-observer ctx_115)))"
+"(if obs_131"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_134 'rename-one(car bodys_18))))"
+"(call-expand-observe obs_131 'rename-one(car bodys_18))))"
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_153))"
+"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_154))"
 "(let-values()(car bodys_18))"
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
@@ -73352,41 +73396,41 @@ static const char *startup_source =
 " '#%module-begin"
 "(core-form-sym"
 "(syntax-disarm$1 partly-expanded-body_0)"
-" phase_153))"
+" phase_154))"
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
 "(let-values(((temp434_0)(list partly-expanded-body_0))"
-"((s435_1) s_765)"
+"((s435_0) s_763)"
 "((scopes-s436_0) scopes-s_0)"
-"((phase437_0) phase_153)"
+"((phase437_0) phase_154)"
 "((module-name-sym438_0) module-name-sym_1)"
-"((temp439_1)(make-mb-ctx_0))"
+"((temp439_0)(make-mb-ctx_0))"
 "((temp440_0) #f))"
 "(add-module-begin47.1"
 " temp440_0"
 " #t"
 " temp434_0"
-" s435_1"
+" s435_0"
 " scopes-s436_0"
 " phase437_0"
 " module-name-sym438_0"
-" temp439_1)))))))))"
+" temp439_0)))))))))"
 "(let-values()"
 "(let-values(((bodys441_0) bodys_18)"
-"((s442_0) s_765)"
+"((s442_1) s_763)"
 "((scopes-s443_0) scopes-s_0)"
-"((phase444_0) phase_153)"
+"((phase444_0) phase_154)"
 "((module-name-sym445_0) module-name-sym_1)"
-"((temp446_0)(make-mb-ctx_0)))"
+"((temp446_1)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
 " #f"
 " #f"
 " bodys441_0"
-" s442_0"
+" s442_1"
 " scopes-s443_0"
 " phase444_0"
 " module-name-sym445_0"
-" temp446_0))))))"
+" temp446_1))))))"
 "(add-enclosing-name-property mb_1 module-name-sym_1)))))))))))))))"
 "(define-values"
 "(add-module-begin47.1)"
@@ -73403,7 +73447,7 @@ static const char *startup_source =
 "(let-values(((bodys_19) bodys41_0))"
 "(let-values(((s_139) s42_0))"
 "(let-values(((scopes-s_1) scopes-s43_0))"
-"(let-values(((phase_154) phase44_1))"
+"(let-values(((phase_155) phase44_1))"
 "(let-values(((module-name-sym_2) module-name-sym45_0))"
 "(let-values(((mb-ctx_1) mb-ctx46_0))"
 "(let-values(((log-rename-one?_0)(if log-rename-one?40_0 log-rename-one?39_0 #t)))"
@@ -73412,7 +73456,7 @@ static const char *startup_source =
 "(let-values(((mb-id_0)(datum->syntax$1 disarmed-scopes-s_0 '#%module-begin)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((mb-id447_0) mb-id_0)((phase448_0) phase_154))"
+"(if(let-values(((mb-id447_0) mb-id_0)((phase448_0) phase_155))"
 "(resolve40.1 #f #f #f #f #f #f #f #f mb-id447_0 phase448_0))"
 "(void)"
 "(let-values()"
@@ -73425,34 +73469,34 @@ static const char *startup_source =
 "(datum->syntax$1 disarmed-scopes-s_0(list* mb-id_0 bodys_19) s_139 s_139)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_135)(expand-context-observer mb-ctx_1)))"
-"(if obs_135"
+"(let-values(((obs_132)(expand-context-observer mb-ctx_1)))"
+"(if obs_132"
 "(let-values()"
-"(let-values()(call-expand-observe obs_135 'tag mb_2)))"
+"(let-values()(call-expand-observe obs_132 'tag mb_2)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if log-rename-one?_0"
 "(let-values()"
-"(let-values(((obs_136)(expand-context-observer mb-ctx_1)))"
-"(if obs_136"
+"(let-values(((obs_133)(expand-context-observer mb-ctx_1)))"
+"(if obs_133"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_136 'rename-one mb_2)))"
+"(call-expand-observe obs_133 'rename-one mb_2)))"
 "(void))))"
 "(void))"
 "(values))))"
 "(let-values(((partly-expanded-mb_0)"
 "(let-values()"
-"(let-values(((temp449_0)"
+"(let-values(((temp449_1)"
 "(add-enclosing-name-property mb_2 module-name-sym_2))"
 "((mb-ctx450_0) mb-ctx_1))"
-"(expand7.1 #f #f #f #f temp449_0 mb-ctx450_0)))))"
+"(expand7.1 #f #f #f #f temp449_1 mb-ctx450_0)))))"
 "(begin"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_154))"
+"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_155))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -73474,13 +73518,13 @@ static const char *startup_source =
 " enclosing-self_2"
 " enclosing-mod_2)"
 "(begin"
-"(lambda(s_766)"
+"(lambda(s_764)"
 "(let-values()"
 "(let-values(((s-without-enclosing_0)"
 "(if keep-enclosing-scope-at-phase_1"
-" s_766"
+" s_764"
 "(remove-use-site-scopes"
-"(remove-scopes s_766(root-expand-context-module-scopes init-ctx_1))"
+"(remove-scopes s_764(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)))"
@@ -73532,7 +73576,7 @@ static const char *startup_source =
 "(begin"
 " 'partially-expand-bodys81"
 "(let-values(((bodys_20) bodys80_0))"
-"(let-values(((phase_155) phase50_0))"
+"(let-values(((phase_156) phase50_0))"
 "(let-values(((partial-body-ctx_1) ctx51_0))"
 "(let-values(((m-ns_19) namespace52_0))"
 "(let-values(((self_34) self53_0))"
@@ -73549,24 +73593,24 @@ static const char *startup_source =
 "(let-values(((pass-1-and-2-loop_1) loop64_0))"
 "(let-values()"
 "(begin"
-"(namespace-visit-available-modules! m-ns_19 phase_155)"
+"(namespace-visit-available-modules! m-ns_19 phase_156)"
 "((letrec-values(((loop_124)"
 "(lambda(tail?_52 bodys_21)"
 "(begin"
 " 'loop"
 "(if(null? bodys_21)"
 "(let-values()"
-"(if(if tail?_52(not(zero? phase_155)) #f)"
+"(if(if tail?_52(not(zero? phase_156)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_137)"
+"(let-values(((obs_134)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_137"
+"(if obs_134"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_137"
+" obs_134"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -73582,14 +73626,14 @@ static const char *startup_source =
 "(expand-context-to-module-lifts"
 " partial-body-ctx_1)))))"
 "(begin"
-"(let-values(((obs_138)"
+"(let-values(((obs_135)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_138"
+"(if obs_135"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_138"
+" obs_135"
 " 'module-lift-end-loop"
 " bodys_22)))"
 "(void)))"
@@ -73606,14 +73650,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_1)(cdr bodys_21)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_139)"
+"(let-values(((obs_136)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_139"
+"(if obs_136"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_139"
+" obs_136"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -73645,14 +73689,14 @@ static const char *startup_source =
 " exp-body_7"
 " rest-bodys_1))"
 "(void))"
-"(let-values(((obs_140)"
+"(let-values(((obs_137)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_140"
+"(if obs_137"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_140"
+" obs_137"
 " 'rename-one"
 " exp-body_7)))"
 "(void)))"
@@ -73663,7 +73707,7 @@ static const char *startup_source =
 "(let-values(((tmp_67)"
 "(core-form-sym"
 " disarmed-exp-body_1"
-" phase_155)))"
+" phase_156)))"
 "(if(equal?"
 " tmp_67"
 " 'begin)"
@@ -73671,38 +73715,38 @@ static const char *startup_source =
 "(let-values(((ok?_76"
 " begin460_0"
 " e461_0)"
-"(let-values(((s_767)"
+"(let-values(((s_765)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_84)"
-" s_767))"
+" s_765))"
 "(let-values(((begin460_1"
 " e461_1)"
-"(let-values(((s_768)"
+"(let-values(((s_766)"
 "(if(syntax?$1"
-" s_767)"
+" s_765)"
 "(syntax-e$1"
-" s_767)"
-" s_767)))"
+" s_765)"
+" s_765)))"
 "(if(pair?"
-" s_768)"
+" s_766)"
 "(let-values(((begin462_0)"
-"(let-values(((s_769)"
+"(let-values(((s_767)"
 "(car"
-" s_768)))"
-" s_769))"
+" s_766)))"
+" s_767))"
 "((e463_0)"
-"(let-values(((s_770)"
+"(let-values(((s_768)"
 "(cdr"
-" s_768)))"
-"(let-values(((s_771)"
+" s_766)))"
+"(let-values(((s_769)"
 "(if(syntax?$1"
-" s_770)"
+" s_768)"
 "(syntax-e$1"
-" s_770)"
-" s_770)))"
+" s_768)"
+" s_768)))"
 "(let-values(((flat-s_54)"
 "(to-syntax-list.1"
-" s_771)))"
+" s_769)))"
 "(if(not"
 " flat-s_54)"
 "(let-values()"
@@ -73737,14 +73781,14 @@ static const char *startup_source =
 " e461_0)"
 " rest-bodys_1)))"
 "(begin"
-"(let-values(((obs_141)"
+"(let-values(((obs_138)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_141"
+"(if obs_138"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_141"
+" obs_138"
 " 'splice"
 " spliced-bodys_0)))"
 "(void)))"
@@ -73757,22 +73801,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_142)"
+"(let-values(((obs_139)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_142"
+"(if obs_139"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_142"
+" obs_139"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_142"
+" obs_139"
 " 'prim-begin-for-syntax)"
 "(call-expand-observe"
-" obs_142"
+" obs_139"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -73780,7 +73824,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " m-ns_19"
 "(add1"
-" phase_155))))"
+" phase_156))))"
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
@@ -73788,52 +73832,52 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_143)"
+"(let-values(((obs_140)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_143"
+"(if obs_140"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_143"
+" obs_140"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_77"
 " begin-for-syntax464_0"
 " e465_0)"
-"(let-values(((s_772)"
+"(let-values(((s_770)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_85)"
-" s_772))"
+" s_770))"
 "(let-values(((begin-for-syntax464_1"
 " e465_1)"
-"(let-values(((s_773)"
+"(let-values(((s_771)"
 "(if(syntax?$1"
-" s_772)"
+" s_770)"
 "(syntax-e$1"
-" s_772)"
-" s_772)))"
+" s_770)"
+" s_770)))"
 "(if(pair?"
-" s_773)"
+" s_771)"
 "(let-values(((begin-for-syntax466_0)"
-"(let-values(((s_774)"
+"(let-values(((s_772)"
 "(car"
-" s_773)))"
-" s_774))"
+" s_771)))"
+" s_772))"
 "((e467_0)"
-"(let-values(((s_775)"
+"(let-values(((s_773)"
 "(cdr"
-" s_773)))"
-"(let-values(((s_776)"
+" s_771)))"
+"(let-values(((s_774)"
 "(if(syntax?$1"
-" s_775)"
+" s_773)"
 "(syntax-e$1"
-" s_775)"
-" s_775)))"
+" s_773)"
+" s_773)))"
 "(let-values(((flat-s_55)"
 "(to-syntax-list.1"
-" s_776)))"
+" s_774)))"
 "(if(not"
 " flat-s_55)"
 "(let-values()"
@@ -73858,44 +73902,44 @@ static const char *startup_source =
 "(pass-1-and-2-loop_1"
 " e465_0"
 "(add1"
-" phase_155))))"
+" phase_156))))"
 "(begin"
-"(let-values(((obs_144)"
+"(let-values(((obs_141)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_144"
+"(if obs_141"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_144"
+" obs_141"
 " 'next-group)))"
 "(void)))"
 "(namespace-run-available-modules!"
 " m-ns_19"
 "(add1"
-" phase_155))"
+" phase_156))"
 "(eval-nested-bodys"
 " nested-bodys_1"
 "(add1"
-" phase_155)"
+" phase_156)"
 " ct-m-ns_0"
 " self_34"
 " partial-body-ctx_1)"
 "(namespace-visit-available-modules!"
 " m-ns_19"
-" phase_155)"
-"(let-values(((obs_145)"
+" phase_156)"
+"(let-values(((obs_142)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_145"
+"(if obs_142"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_145"
+" obs_142"
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
-"(let-values(((lst_420)"
+"(let-values(((lst_421)"
 " nested-bodys_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -73903,20 +73947,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_420)))"
+" lst_421)))"
 "((letrec-values(((for-loop_332)"
 "(lambda(fold-var_386"
-" lst_421)"
+" lst_422)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_421)"
+" lst_422)"
 "(let-values(((nested-body_0)"
 "(unsafe-car"
-" lst_421))"
-"((rest_243)"
+" lst_422))"
+"((rest_245)"
 "(unsafe-cdr"
-" lst_421)))"
+" lst_422)))"
 "(let-values(((fold-var_387)"
 "(let-values(((fold-var_388)"
 " fold-var_386))"
@@ -73933,12 +73977,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_332"
 " fold-var_387"
-" rest_243)"
+" rest_245)"
 " fold-var_387)))"
 " fold-var_386)))))"
 " for-loop_332)"
 " null"
-" lst_420))))))"
+" lst_421))))))"
 "(datum->syntax$1"
 " #f"
 "(cons"
@@ -73959,19 +74003,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_146)"
+"(let-values(((obs_143)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_146"
+"(if obs_143"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_146"
+" obs_143"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_146"
+" obs_143"
 " 'prim-define-values))))"
 "(void)))"
 "(values))))"
@@ -73979,52 +74023,52 @@ static const char *startup_source =
 " define-values468_0"
 " id469_0"
 " rhs470_0)"
-"(let-values(((s_777)"
+"(let-values(((s_775)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_86)"
-" s_777))"
+" s_775))"
 "(let-values(((define-values468_1"
 " id469_1"
 " rhs470_1)"
-"(let-values(((s_778)"
+"(let-values(((s_776)"
 "(if(syntax?$1"
-" s_777)"
+" s_775)"
 "(syntax-e$1"
-" s_777)"
-" s_777)))"
+" s_775)"
+" s_775)))"
 "(if(pair?"
-" s_778)"
+" s_776)"
 "(let-values(((define-values471_0)"
-"(let-values(((s_779)"
+"(let-values(((s_777)"
 "(car"
-" s_778)))"
-" s_779))"
+" s_776)))"
+" s_777))"
 "((id472_0"
 " rhs473_0)"
 "(let-values(((s_195)"
 "(cdr"
-" s_778)))"
-"(let-values(((s_780)"
+" s_776)))"
+"(let-values(((s_778)"
 "(if(syntax?$1"
 " s_195)"
 "(syntax-e$1"
 " s_195)"
 " s_195)))"
 "(if(pair?"
-" s_780)"
+" s_778)"
 "(let-values(((id474_0)"
-"(let-values(((s_781)"
+"(let-values(((s_779)"
 "(car"
-" s_780)))"
-"(let-values(((s_782)"
+" s_778)))"
+"(let-values(((s_780)"
 "(if(syntax?$1"
-" s_781)"
+" s_779)"
 "(syntax-e$1"
-" s_781)"
-" s_781)))"
+" s_779)"
+" s_779)))"
 "(let-values(((flat-s_56)"
 "(to-syntax-list.1"
-" s_782)))"
+" s_780)))"
 "(if(not"
 " flat-s_56)"
 "(let-values()"
@@ -74033,8 +74077,8 @@ static const char *startup_source =
 "                                                                                                                                                                                               \"bad syntax\""
 " orig-s_86))"
 "(let-values()"
-"(let-values(((id_152)"
-"(let-values(((lst_422)"
+"(let-values(((id_151)"
+"(let-values(((lst_423)"
 " flat-s_56))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74042,90 +74086,90 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_422)))"
+" lst_423)))"
 "((letrec-values(((for-loop_333)"
-"(lambda(id_153"
-" lst_423)"
+"(lambda(id_152"
+" lst_424)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_423)"
-"(let-values(((s_783)"
+" lst_424)"
+"(let-values(((s_781)"
 "(unsafe-car"
-" lst_423))"
-"((rest_244)"
+" lst_424))"
+"((rest_246)"
 "(unsafe-cdr"
-" lst_423)))"
+" lst_424)))"
+"(let-values(((id_153)"
 "(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_404)"
+"(if(let-values(((or-part_405)"
 "(if(syntax?$1"
-" s_783)"
+" s_781)"
 "(symbol?"
 "(syntax-e$1"
-" s_783))"
+" s_781))"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
+"(if or-part_405"
+" or-part_405"
 "(symbol?"
-" s_783)))"
-" s_783"
+" s_781)))"
+" s_781"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                             \"not an identifier\""
 " orig-s_86"
-" s_783)))))"
+" s_781)))))"
 "(cons"
 " id484_0"
-" id_155)))))"
+" id_154)))))"
 "(values"
-" id_156)))))"
+" id_155)))))"
 "(if(not"
 " #f)"
 "(for-loop_333"
-" id_154"
-" rest_244)"
-" id_154)))"
-" id_153)))))"
+" id_153"
+" rest_246)"
+" id_153)))"
+" id_152)))))"
 " for-loop_333)"
 " null"
-" lst_422)))))"
+" lst_423)))))"
 "(reverse$1"
-" id_152))))))))"
+" id_151))))))))"
 "((rhs475_0)"
-"(let-values(((s_784)"
+"(let-values(((s_782)"
 "(cdr"
-" s_780)))"
-"(let-values(((s_785)"
+" s_778)))"
+"(let-values(((s_783)"
 "(if(syntax?$1"
-" s_784)"
+" s_782)"
 "(syntax-e$1"
-" s_784)"
-" s_784)))"
+" s_782)"
+" s_782)))"
 "(if(pair?"
-" s_785)"
+" s_783)"
 "(let-values(((rhs476_0)"
-"(let-values(((s_786)"
+"(let-values(((s_784)"
 "(car"
-" s_785)))"
-" s_786))"
+" s_783)))"
+" s_784))"
 "(()"
-"(let-values(((s_787)"
+"(let-values(((s_785)"
 "(cdr"
-" s_785)))"
-"(let-values(((s_788)"
+" s_783)))"
+"(let-values(((s_786)"
 "(if(syntax?$1"
-" s_787)"
+" s_785)"
 "(syntax-e$1"
-" s_787)"
-" s_787)))"
+" s_785)"
+" s_785)))"
 "(if(null?"
-" s_788)"
+" s_786)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -74166,7 +74210,7 @@ static const char *startup_source =
 "(let-values(((ids477_0)"
 " ids_43)"
 "((phase478_0)"
-" phase_155)"
+" phase_156)"
 "((exp-body479_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids8.1"
@@ -74183,7 +74227,7 @@ static const char *startup_source =
 "(let-values(((ids480_0)"
 " ids_43)"
 "((phase481_0)"
-" phase_155)"
+" phase_156)"
 "((requires+provides482_0)"
 " requires+provides_7)"
 "((exp-body483_0)"
@@ -74202,7 +74246,7 @@ static const char *startup_source =
 "((self487_0)"
 " self_34)"
 "((phase488_0)"
-" phase_155)"
+" phase_156)"
 "((all-scopes-stx489_0)"
 " all-scopes-stx_5)"
 "((frame-id490_0)"
@@ -74230,15 +74274,15 @@ static const char *startup_source =
 "(add-defined-syms!"
 " requires+provides_7"
 " syms_24"
-" phase_155)"
-"(let-values(((obs_147)"
+" phase_156)"
+"(let-values(((obs_144)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_147"
+"(if obs_144"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_147"
+" obs_144"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
@@ -74263,22 +74307,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_148)"
+"(let-values(((obs_145)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_148"
+"(if obs_145"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_148"
+" obs_145"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_148"
+" obs_145"
 " 'prim-define-syntaxes)"
 "(call-expand-observe"
-" obs_148"
+" obs_145"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -74289,14 +74333,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_149)"
+"(let-values(((obs_146)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_149"
+"(if obs_146"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_149"
+" obs_146"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -74304,52 +74348,52 @@ static const char *startup_source =
 " define-syntaxes493_0"
 " id494_0"
 " rhs495_0)"
-"(let-values(((s_789)"
+"(let-values(((s_787)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_87)"
-" s_789))"
+" s_787))"
 "(let-values(((define-syntaxes493_1"
 " id494_1"
 " rhs495_1)"
-"(let-values(((s_790)"
+"(let-values(((s_788)"
 "(if(syntax?$1"
-" s_789)"
+" s_787)"
 "(syntax-e$1"
-" s_789)"
-" s_789)))"
+" s_787)"
+" s_787)))"
 "(if(pair?"
-" s_790)"
+" s_788)"
 "(let-values(((define-syntaxes496_0)"
-"(let-values(((s_791)"
+"(let-values(((s_789)"
 "(car"
-" s_790)))"
-" s_791))"
+" s_788)))"
+" s_789))"
 "((id497_0"
 " rhs498_0)"
-"(let-values(((s_792)"
+"(let-values(((s_790)"
 "(cdr"
+" s_788)))"
+"(let-values(((s_537)"
+"(if(syntax?$1"
+" s_790)"
+"(syntax-e$1"
+" s_790)"
 " s_790)))"
-"(let-values(((s_540)"
-"(if(syntax?$1"
-" s_792)"
-"(syntax-e$1"
-" s_792)"
-" s_792)))"
 "(if(pair?"
-" s_540)"
+" s_537)"
 "(let-values(((id499_0)"
-"(let-values(((s_793)"
+"(let-values(((s_791)"
 "(car"
-" s_540)))"
-"(let-values(((s_541)"
+" s_537)))"
+"(let-values(((s_538)"
 "(if(syntax?$1"
-" s_793)"
+" s_791)"
 "(syntax-e$1"
-" s_793)"
-" s_793)))"
+" s_791)"
+" s_791)))"
 "(let-values(((flat-s_57)"
 "(to-syntax-list.1"
-" s_541)))"
+" s_538)))"
 "(if(not"
 " flat-s_57)"
 "(let-values()"
@@ -74358,8 +74402,8 @@ static const char *startup_source =
 "                                                                                                                                                                                                     \"bad syntax\""
 " orig-s_87))"
 "(let-values()"
-"(let-values(((id_157)"
-"(let-values(((lst_424)"
+"(let-values(((id_156)"
+"(let-values(((lst_425)"
 " flat-s_57))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74367,90 +74411,90 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_424)))"
+" lst_425)))"
 "((letrec-values(((for-loop_334)"
-"(lambda(id_158"
-" lst_425)"
+"(lambda(id_157"
+" lst_426)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_425)"
-"(let-values(((s_544)"
+" lst_426)"
+"(let-values(((s_541)"
 "(unsafe-car"
-" lst_425))"
-"((rest_245)"
+" lst_426))"
+"((rest_247)"
 "(unsafe-cdr"
-" lst_425)))"
+" lst_426)))"
+"(let-values(((id_158)"
 "(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_405)"
+"(if(let-values(((or-part_406)"
 "(if(syntax?$1"
-" s_544)"
+" s_541)"
 "(symbol?"
 "(syntax-e$1"
-" s_544))"
+" s_541))"
 " #f)))"
-"(if or-part_405"
-" or-part_405"
+"(if or-part_406"
+" or-part_406"
 "(symbol?"
-" s_544)))"
-" s_544"
+" s_541)))"
+" s_541"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                   \"not an identifier\""
 " orig-s_87"
-" s_544)))))"
+" s_541)))))"
 "(cons"
 " id509_0"
-" id_160)))))"
+" id_159)))))"
 "(values"
-" id_161)))))"
+" id_160)))))"
 "(if(not"
 " #f)"
 "(for-loop_334"
-" id_159"
-" rest_245)"
-" id_159)))"
-" id_158)))))"
+" id_158"
+" rest_247)"
+" id_158)))"
+" id_157)))))"
 " for-loop_334)"
 " null"
-" lst_424)))))"
+" lst_425)))))"
 "(reverse$1"
-" id_157))))))))"
+" id_156))))))))"
 "((rhs500_0)"
-"(let-values(((s_794)"
+"(let-values(((s_792)"
 "(cdr"
-" s_540)))"
-"(let-values(((s_795)"
+" s_537)))"
+"(let-values(((s_793)"
 "(if(syntax?$1"
-" s_794)"
+" s_792)"
 "(syntax-e$1"
-" s_794)"
-" s_794)))"
+" s_792)"
+" s_792)))"
 "(if(pair?"
-" s_795)"
+" s_793)"
 "(let-values(((rhs501_0)"
-"(let-values(((s_796)"
+"(let-values(((s_794)"
 "(car"
-" s_795)))"
-" s_796))"
+" s_793)))"
+" s_794))"
 "(()"
-"(let-values(((s_797)"
+"(let-values(((s_795)"
 "(cdr"
-" s_795)))"
-"(let-values(((s_798)"
+" s_793)))"
+"(let-values(((s_796)"
 "(if(syntax?$1"
-" s_797)"
+" s_795)"
 "(syntax-e$1"
-" s_797)"
-" s_797)))"
+" s_795)"
+" s_795)))"
 "(if(null?"
-" s_798)"
+" s_796)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -74491,7 +74535,7 @@ static const char *startup_source =
 "(let-values(((ids502_0)"
 " ids_44)"
 "((phase503_0)"
-" phase_155)"
+" phase_156)"
 "((exp-body504_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids8.1"
@@ -74508,7 +74552,7 @@ static const char *startup_source =
 "(let-values(((ids505_0)"
 " ids_44)"
 "((phase506_0)"
-" phase_155)"
+" phase_156)"
 "((requires+provides507_0)"
 " requires+provides_7)"
 "((exp-body508_0)"
@@ -74527,7 +74571,7 @@ static const char *startup_source =
 "((self512_0)"
 " self_34)"
 "((phase513_0)"
-" phase_155)"
+" phase_156)"
 "((all-scopes-stx514_0)"
 " all-scopes-stx_5)"
 "((frame-id515_0)"
@@ -74558,9 +74602,9 @@ static const char *startup_source =
 "(add-defined-syms!"
 " requires+provides_7"
 " syms_25"
-" phase_155)"
+" phase_156)"
 "(values))))"
-"(let-values(((exp-rhs_5"
+"(let-values(((exp-rhs_6"
 " parsed-rhs_2"
 " vals_10)"
 "(let-values(((temp519_0)"
@@ -74568,10 +74612,10 @@ static const char *startup_source =
 "((ids520_0)"
 " ids_44)"
 "((temp521_0)"
-"(let-values(((v_268)"
+"(let-values(((v_269)"
 " partial-body-ctx_1))"
 "(let-values(((the-struct_112)"
-" v_268))"
+" v_269))"
 "(if(expand-context/outer?"
 " the-struct_112)"
 "(let-values(((need-eventually-defined523_0)"
@@ -74579,7 +74623,7 @@ static const char *startup_source =
 "((inner524_0)"
 "(let-values(((the-struct_113)"
 "(root-expand-context/outer-inner"
-" v_268)))"
+" v_269)))"
 "(if(expand-context/inner?"
 " the-struct_113)"
 "(let-values(((lifts525_0)"
@@ -74675,7 +74719,7 @@ static const char *startup_source =
 " the-struct_112)))))"
 "((temp522_0)"
 " #f))"
-"(expand+eval-for-syntaxes-binding63.1"
+"(expand+eval-for-syntaxes-binding74.1"
 " temp522_0"
 " #t"
 " temp519_0"
@@ -74683,11 +74727,11 @@ static const char *startup_source =
 " temp521_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_426)"
+"(let-values(((lst_427)"
 " syms_25)"
-"((lst_427)"
-" vals_10)"
 "((lst_428)"
+" vals_10)"
+"((lst_429)"
 " ids_44))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74695,12 +74739,6 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_426)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
 " lst_427)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -74708,38 +74746,44 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_428)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
+" lst_429)))"
 "((letrec-values(((for-loop_335)"
-"(lambda(lst_429"
-" lst_430"
-" lst_431)"
+"(lambda(lst_430"
+" lst_431"
+" lst_432)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_429)"
-"(if(pair?"
 " lst_430)"
-"(pair?"
+"(if(pair?"
 " lst_431)"
+"(pair?"
+" lst_432)"
 " #f)"
 " #f)"
 "(let-values(((sym_104)"
 "(unsafe-car"
-" lst_429))"
-"((rest_246)"
+" lst_430))"
+"((rest_248)"
 "(unsafe-cdr"
-" lst_429))"
+" lst_430))"
 "((val_88)"
 "(unsafe-car"
-" lst_430))"
-"((rest_247)"
-"(unsafe-cdr"
-" lst_430))"
-"((id_162)"
-"(unsafe-car"
 " lst_431))"
-"((rest_231)"
+"((rest_249)"
 "(unsafe-cdr"
-" lst_431)))"
+" lst_431))"
+"((id_161)"
+"(unsafe-car"
+" lst_432))"
+"((rest_233)"
+"(unsafe-cdr"
+" lst_432)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -74749,12 +74793,12 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_88"
-" id_162"
-" phase_155"
+" id_161"
+" phase_156"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
 " m-ns_19"
-" phase_155"
+" phase_156"
 " sym_104"
 " val_88)))"
 "(values)))))"
@@ -74762,34 +74806,34 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_335"
-" rest_246"
-" rest_247"
-" rest_231)"
+" rest_248"
+" rest_249"
+" rest_233)"
 "(values))))"
 "(values))))))"
 " for-loop_335)"
-" lst_426"
 " lst_427"
-" lst_428)))"
+" lst_428"
+" lst_429)))"
 "(values))))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_150)"
+"(let-values(((obs_147)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_150"
+"(if obs_147"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_150"
+" obs_147"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
 "(list"
 " define-syntaxes493_0"
 " ids_44"
-" exp-rhs_5)))))"
+" exp-rhs_6)))))"
 "(void)))"
 "(values))))"
 "(let-values(((parsed-body_0)"
@@ -74810,7 +74854,7 @@ static const char *startup_source =
 "(list"
 " define-syntaxes493_0"
 " ids_44"
-" exp-rhs_5)))"
+" exp-rhs_6)))"
 "(rebuild5.1"
 " #f"
 " #f"
@@ -74826,19 +74870,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_151)"
+"(let-values(((obs_148)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_151"
+"(if obs_148"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_151"
+" obs_148"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_151"
+" obs_148"
 " 'prim-require))))"
 "(void)))"
 "(values))))"
@@ -74849,38 +74893,38 @@ static const char *startup_source =
 "(let-values(((ok?_80"
 " #%require530_0"
 " req531_0)"
-"(let-values(((s_799)"
+"(let-values(((s_797)"
 " ready-body_0))"
 "(let-values(((orig-s_88)"
-" s_799))"
+" s_797))"
 "(let-values(((#%require530_1"
 " req531_1)"
-"(let-values(((s_800)"
+"(let-values(((s_798)"
 "(if(syntax?$1"
-" s_799)"
+" s_797)"
 "(syntax-e$1"
-" s_799)"
-" s_799)))"
+" s_797)"
+" s_797)))"
 "(if(pair?"
-" s_800)"
+" s_798)"
 "(let-values(((#%require532_0)"
-"(let-values(((s_801)"
+"(let-values(((s_799)"
 "(car"
-" s_800)))"
-" s_801))"
+" s_798)))"
+" s_799))"
 "((req533_0)"
-"(let-values(((s_802)"
+"(let-values(((s_800)"
 "(cdr"
-" s_800)))"
-"(let-values(((s_803)"
+" s_798)))"
+"(let-values(((s_801)"
 "(if(syntax?$1"
-" s_802)"
+" s_800)"
 "(syntax-e$1"
-" s_802)"
-" s_802)))"
+" s_800)"
+" s_800)))"
 "(let-values(((flat-s_58)"
 "(to-syntax-list.1"
-" s_803)))"
+" s_801)))"
 "(if(not"
 " flat-s_58)"
 "(let-values()"
@@ -74911,9 +74955,9 @@ static const char *startup_source =
 "((m-ns537_0)"
 " m-ns_19)"
 "((phase538_0)"
-" phase_155)"
+" phase_156)"
 "((phase539_0)"
-" phase_155)"
+" phase_156)"
 "((requires+provides540_0)"
 " requires+provides_7)"
 "((declared-submodule-names541_0)"
@@ -74945,14 +74989,14 @@ static const char *startup_source =
 " m-ns537_0"
 " phase538_0"
 " requires+provides540_0))"
-"(let-values(((obs_152)"
+"(let-values(((obs_149)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_152"
+"(if obs_149"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_152"
+" obs_149"
 " 'exit-prim"
 " ready-body_0)))"
 "(void)))"
@@ -75022,22 +75066,22 @@ static const char *startup_source =
 " 'module*)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_153)"
+"(let-values(((obs_150)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_153"
+"(if obs_150"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_153"
+" obs_150"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_153"
+" obs_150"
 " 'prim-submodule*)"
 "(call-expand-observe"
-" obs_153"
+" obs_150"
 " 'exit-prim"
 " exp-body_7))))"
 "(void)))"
@@ -75053,38 +75097,38 @@ static const char *startup_source =
 "(let-values(((ok?_81"
 " #%declare551_0"
 " kw552_0)"
-"(let-values(((s_804)"
+"(let-values(((s_802)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_89)"
-" s_804))"
+" s_802))"
 "(let-values(((#%declare551_1"
 " kw552_1)"
-"(let-values(((s_805)"
+"(let-values(((s_803)"
 "(if(syntax?$1"
-" s_804)"
+" s_802)"
 "(syntax-e$1"
-" s_804)"
-" s_804)))"
+" s_802)"
+" s_802)))"
 "(if(pair?"
-" s_805)"
+" s_803)"
 "(let-values(((#%declare553_0)"
-"(let-values(((s_806)"
+"(let-values(((s_804)"
 "(car"
-" s_805)))"
-" s_806))"
+" s_803)))"
+" s_804))"
 "((kw554_0)"
-"(let-values(((s_560)"
+"(let-values(((s_557)"
 "(cdr"
-" s_805)))"
-"(let-values(((s_561)"
+" s_803)))"
+"(let-values(((s_558)"
 "(if(syntax?$1"
-" s_560)"
+" s_557)"
 "(syntax-e$1"
-" s_560)"
-" s_560)))"
+" s_557)"
+" s_557)))"
 "(let-values(((flat-s_59)"
 "(to-syntax-list.1"
-" s_561)))"
+" s_558)))"
 "(if(not"
 " flat-s_59)"
 "(let-values()"
@@ -75107,7 +75151,7 @@ static const char *startup_source =
 " kw552_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_432)"
+"(let-values(((lst_433)"
 " kw552_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -75115,19 +75159,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_432)))"
+" lst_433)))"
 "((letrec-values(((for-loop_336)"
-"(lambda(lst_433)"
+"(lambda(lst_434)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_433)"
+" lst_434)"
 "(let-values(((kw_1)"
 "(unsafe-car"
-" lst_433))"
-"((rest_248)"
+" lst_434))"
+"((rest_250)"
 "(unsafe-cdr"
-" lst_433)))"
+" lst_434)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75179,11 +75223,11 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_336"
-" rest_248)"
+" rest_250)"
 "(values))))"
 "(values))))))"
 " for-loop_336)"
-" lst_432)))"
+" lst_433)))"
 "(values))))"
 "(let-values()"
 "(let-values(((parsed-body_1)"
@@ -75230,21 +75274,21 @@ 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_156)"
+"(lambda(ids_45 rhs_24 phase_157)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
-"(let-values(((lst_434) ids_45))"
+"(let-values(((lst_435) ids_45))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_434)))"
+"(let-values()(check-list lst_435)))"
 "((letrec-values(((for-loop_337)"
-"(lambda(fold-var_390 lst_435)"
+"(lambda(fold-var_390 lst_436)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_435)"
-"(let-values(((id_163)(unsafe-car lst_435))"
-"((rest_249)(unsafe-cdr lst_435)))"
+"(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)"
@@ -75252,20 +75296,20 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_163"
+" id_162"
 " inside-scope_2))"
 " fold-var_392))))"
 "(values fold-var_393)))))"
-"(if(not #f)(for-loop_337 fold-var_391 rest_249) fold-var_391)))"
+"(if(not #f)(for-loop_337 fold-var_391 rest_251) fold-var_391)))"
 " fold-var_390)))))"
 " for-loop_337)"
 " null"
-" lst_434))))))"
+" lst_435))))))"
 "(let-values(((syms_26)"
 "(let-values(((scoped-ids555_0) scoped-ids_0)"
 "((defined-syms556_0) defined-syms_12)"
 "((self557_0) self_35)"
-"((phase558_0) phase_156)"
+"((phase558_0) phase_157)"
 "((all-scopes-stx559_0) all-scopes-stx_6)"
 "((frame-id560_0) frame-id_18)"
 "((requires+provides561_0) requires+provides_8))"
@@ -75284,32 +75328,32 @@ static const char *startup_source =
 " self557_0"
 " phase558_0"
 " all-scopes-stx559_0))))"
-"(let-values(((s_807)"
+"(let-values(((s_805)"
 "(add-scope"
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_156) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_157) 'define-values)"
 " scoped-ids_0"
 " rhs_24))"
 " inside-scope_2)))"
-"(values scoped-ids_0(semi-parsed-define-values2.1 s_807 syms_26 scoped-ids_0 rhs_24)))))))))"
+"(values scoped-ids_0(semi-parsed-define-values2.1 s_805 syms_26 scoped-ids_0 rhs_24)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
-"(lambda(bodys_23 ctx_115)"
+"(lambda(bodys_23 ctx_116)"
 "(begin"
-"(let-values(((sc_39)(root-expand-context-post-expansion-scope ctx_115)))"
+"(let-values(((sc_39)(root-expand-context-post-expansion-scope ctx_116)))"
 "(if sc_39"
 "(reverse$1"
-"(let-values(((lst_436) bodys_23))"
+"(let-values(((lst_437) bodys_23))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_436)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_437)))"
 "((letrec-values(((for-loop_338)"
-"(lambda(fold-var_394 lst_437)"
+"(lambda(fold-var_394 lst_438)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_437)"
-"(let-values(((body_23)(unsafe-car lst_437))((rest_250)(unsafe-cdr lst_437)))"
+"(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)"
@@ -75318,11 +75362,11 @@ static const char *startup_source =
 "(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_250) fold-var_395)))"
+"(if(not #f)(for-loop_338 fold-var_395 rest_252) fold-var_395)))"
 " fold-var_394)))))"
 " for-loop_338)"
 " null"
-" lst_436))))"
+" lst_437))))"
 " bodys_23)))))"
 "(define-values"
 "(finish-expanding-body-expressons99.1)"
@@ -75337,7 +75381,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons99"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys98_0))"
-"(let-values(((phase_157) phase84_0))"
+"(let-values(((phase_158) phase84_0))"
 "(let-values(((body-ctx_7) ctx85_0))"
 "(let-values(((self_36) self86_0))"
 "(let-values(((declared-submodule-names_5) declared-submodule-names87_0))"
@@ -75351,15 +75395,15 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_24)"
 "(let-values()"
-"(if(if tail?_53(not(zero? phase_157)) #f)"
+"(if(if tail?_53(not(zero? phase_158)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_154)(expand-context-observer body-ctx_7)))"
-"(if obs_154"
+"(let-values(((obs_151)(expand-context-observer body-ctx_7)))"
+"(if obs_151"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_154"
+" obs_151"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75375,13 +75419,13 @@ static const char *startup_source =
 "(if(null? bodys_25)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_155)"
+"(let-values(((obs_152)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_155"
+"(if obs_152"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_155"
+" obs_152"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75394,25 +75438,25 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_156)"
+"(let-values(((obs_153)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_156"
+"(if obs_153"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_156 'next)))"
+"(call-expand-observe obs_153 'next)))"
 "(void)))"
 "(values))))"
 "(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_406)"
+"(if(let-values(((or-part_407)"
 "(parsed? body_24)))"
-"(if or-part_406"
-" or-part_406"
-"(let-values(((or-part_407)"
-"(expanded+parsed? body_24)))"
 "(if or-part_407"
 " or-part_407"
+"(let-values(((or-part_408)"
+"(expanded+parsed? body_24)))"
+"(if or-part_408"
+" or-part_408"
 "(semi-parsed-begin-for-syntax?"
 " body_24)))))"
 "(let-values() body_24)"
@@ -75429,86 +75473,86 @@ static const char *startup_source =
 "(let-values(((syms_27)"
 "(semi-parsed-define-values-syms"
 " body_24)))"
-"(let-values(((s_808)"
+"(let-values(((s_806)"
 "(semi-parsed-define-values-s"
 " body_24)))"
 "(let-values(((ok?_82"
 " define-values562_0"
 " _563_0"
 " _564_0)"
-"(let-values(((s_809)"
+"(let-values(((s_807)"
 "(syntax-disarm$1"
-" s_808)))"
+" s_806)))"
 "(if(if(not"
 "(expand-context-to-parsed?"
 " rhs-ctx_2))"
 " #t"
 " #f)"
 "(let-values(((orig-s_90)"
-" s_809))"
+" s_807))"
 "(let-values(((define-values562_1"
 " _563_1"
 " _564_1)"
-"(let-values(((s_810)"
+"(let-values(((s_808)"
 "(if(syntax?$1"
-" s_809)"
+" s_807)"
 "(syntax-e$1"
-" s_809)"
-" s_809)))"
+" s_807)"
+" s_807)))"
 "(if(pair?"
-" s_810)"
+" s_808)"
 "(let-values(((define-values565_0)"
-"(let-values(((s_811)"
+"(let-values(((s_809)"
 "(car"
-" s_810)))"
-" s_811))"
+" s_808)))"
+" s_809))"
 "((_566_0"
 " _567_0)"
-"(let-values(((s_618)"
+"(let-values(((s_615)"
 "(cdr"
-" s_810)))"
-"(let-values(((s_619)"
+" s_808)))"
+"(let-values(((s_616)"
 "(if(syntax?$1"
-" s_618)"
+" s_615)"
 "(syntax-e$1"
-" s_618)"
-" s_618)))"
+" s_615)"
+" s_615)))"
 "(if(pair?"
-" s_619)"
+" s_616)"
 "(let-values(((_568_0)"
-"(let-values(((s_812)"
+"(let-values(((s_810)"
 "(car"
-" s_619)))"
-" s_812))"
+" s_616)))"
+" s_810))"
 "((_569_0)"
-"(let-values(((s_813)"
+"(let-values(((s_811)"
 "(cdr"
-" s_619)))"
-"(let-values(((s_814)"
+" s_616)))"
+"(let-values(((s_812)"
 "(if(syntax?$1"
-" s_813)"
+" s_811)"
 "(syntax-e$1"
-" s_813)"
-" s_813)))"
+" s_811)"
+" s_811)))"
 "(if(pair?"
-" s_814)"
+" s_812)"
 "(let-values(((_570_0)"
-"(let-values(((s_815)"
+"(let-values(((s_813)"
 "(car"
-" s_814)))"
-" s_815))"
+" s_812)))"
+" s_813))"
 "(()"
-"(let-values(((s_816)"
+"(let-values(((s_814)"
 "(cdr"
-" s_814)))"
-"(let-values(((s_817)"
+" s_812)))"
+"(let-values(((s_815)"
 "(if(syntax?$1"
-" s_816)"
+" s_814)"
 "(syntax-e$1"
-" s_816)"
-" s_816)))"
+" s_814)"
+" s_814)))"
 "(if(null?"
-" s_817)"
+" s_815)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -75549,10 +75593,10 @@ static const char *startup_source =
 "(let-values(((rhs-ctx571_0)"
 " rhs-ctx_2)"
 "((s572_0)"
-" s_808)"
+" s_806)"
 "((temp573_0)"
 " #t))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -75567,7 +75611,7 @@ static const char *startup_source =
 " body-ctx_7"
 " body_24)"
 "(values))))"
-"(let-values(((exp-rhs_6)"
+"(let-values(((exp-rhs_7)"
 "(let-values()"
 "(let-values(((temp574_0)"
 "(semi-parsed-define-values-rhs"
@@ -75586,7 +75630,7 @@ static const char *startup_source =
 "(log-defn-exit"
 " body-ctx_7"
 " body_24"
-" exp-rhs_6)"
+" exp-rhs_7)"
 "(values))))"
 "(let-values(((comp-form_0)"
 "(parsed-define-values19.1"
@@ -75595,9 +75639,9 @@ static const char *startup_source =
 " syms_27"
 "(if(expand-context-to-parsed?"
 " rhs-ctx_2)"
-" exp-rhs_6"
+" exp-rhs_7"
 "(let-values(((exp-rhs576_0)"
-" exp-rhs_6)"
+" exp-rhs_7)"
 "((temp577_0)"
 "(as-to-parsed-context"
 " rhs-ctx_2)))"
@@ -75618,7 +75662,7 @@ static const char *startup_source =
 "(list"
 " define-values562_0"
 " ids_46"
-" exp-rhs_6)))"
+" exp-rhs_7)))"
 "(rebuild5.1"
 " #f"
 " #f"
@@ -75631,7 +75675,7 @@ static const char *startup_source =
 "(let-values(((tmp_68)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_157)))"
+" phase_158)))"
 "(if(if(equal? tmp_68 '#%require)"
 " #t"
 "(if(equal? tmp_68 '#%provide)"
@@ -75690,14 +75734,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_157)"
+"(let-values(((obs_154)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_157"
+"(if obs_154"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_157"
+" obs_154"
 " 'module-lift-loop"
 "(append"
 " lifted-requires_0"
@@ -75711,7 +75755,7 @@ static const char *startup_source =
 "(let-values(((exp-lifted-modules_0)"
 "(let-values(((lifted-modules584_0)"
 " lifted-modules_0)"
-"((phase585_0) phase_157)"
+"((phase585_0) phase_158)"
 "((self586_0) self_36)"
 "((body-ctx587_0)"
 " body-ctx_7)"
@@ -75738,14 +75782,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_158)"
+"(let-values(((obs_155)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_158"
+"(if obs_155"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_158"
+" obs_155"
 " 'next)))"
 "(void)))))"
 "(append"
@@ -75762,7 +75806,7 @@ static const char *startup_source =
 " partially-expanded-bodys_1)))))))))))))"
 "(define-values"
 "(check-defined-by-now)"
-"(lambda(need-eventually-defined_3 self_37 ctx_116)"
+"(lambda(need-eventually-defined_3 self_37 ctx_117)"
 "(begin"
 "(begin"
 "(let-values(((ht_171) need-eventually-defined_3))"
@@ -75773,7 +75817,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_193"
-"(let-values(((phase_158 l_84)(hash-iterate-key+value ht_171 i_193)))"
+"(let-values(((phase_159 l_84)(hash-iterate-key+value ht_171 i_193)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75781,24 +75825,24 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(begin"
-"(let-values(((lst_438) l_84))"
+"(let-values(((lst_439) l_84))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_438)))"
+"(let-values()(check-list lst_439)))"
 "((letrec-values(((for-loop_340)"
-"(lambda(lst_439)"
+"(lambda(lst_440)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_439)"
-"(let-values(((id_164)"
+" lst_440)"
+"(let-values(((id_163)"
 "(unsafe-car"
-" lst_439))"
-"((rest_251)"
+" lst_440))"
+"((rest_253)"
 "(unsafe-cdr"
-" lst_439)))"
+" lst_440)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75807,9 +75851,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((b_93)"
 "(let-values(((id592_0)"
-" id_164)"
+" id_163)"
 "((phase593_0)"
-" phase_158))"
+" phase_159))"
 "(resolve+shift30.1"
 " #f"
 " #f"
@@ -75830,7 +75874,7 @@ static const char *startup_source =
 "(module-binding-sym"
 " b_93)"
 "(syntax-e$1"
-" id_164))"
+" id_163))"
 "(eq?"
 "(module-binding-module"
 " b_93)"
@@ -75843,21 +75887,21 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                     \"reference to an unbound identifier\""
-" id_164"
+" id_163"
 " #f"
 " null"
 "(syntax-debug-info-string"
-" id_164"
-" ctx_116))))))"
+" id_163"
+" ctx_117))))))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
 "(for-loop_340"
-" rest_251)"
+" rest_253)"
 "(values))))"
 "(values))))))"
 " for-loop_340)"
-" lst_438)))"
+" lst_439)))"
 "(void)))"
 "(values)))))"
 "(values)))))"
@@ -75868,7 +75912,7 @@ static const char *startup_source =
 "(void)))))"
 "(define-values"
 "(resolve-provides115.1)"
-"(lambda(ctx107_1"
+"(lambda(ctx107_0"
 " declared-submodule-names103_0"
 " namespace104_0"
 " phase105_0"
@@ -75881,27 +75925,27 @@ static const char *startup_source =
 "(let-values(((requires+provides_9) requires-and-provides102_0))"
 "(let-values(((declared-submodule-names_6) declared-submodule-names103_0))"
 "(let-values(((m-ns_20) namespace104_0))"
-"(let-values(((phase_159) phase105_0))"
+"(let-values(((phase_160) phase105_0))"
 "(let-values(((self_38) self106_0))"
-"(let-values(((ctx_117) ctx107_1))"
+"(let-values(((ctx_118) ctx107_0))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_126)"
-"(lambda(bodys_26 phase_160)"
+"(lambda(bodys_26 phase_161)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
 "(let-values() null)"
-"(if(let-values(((or-part_408)(parsed?(car bodys_26))))"
-"(if or-part_408 or-part_408(expanded+parsed?(car bodys_26))))"
+"(if(let-values(((or-part_409)(parsed?(car bodys_26))))"
+"(if or-part_409 or-part_409(expanded+parsed?(car bodys_26))))"
 "(let-values()"
-"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_160)))"
+"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_161)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_26))"
 "(let-values()"
 "(let-values(((nested-bodys_2)"
 "(loop_126"
 "(semi-parsed-begin-for-syntax-body(car bodys_26))"
-"(add1 phase_160))))"
+"(add1 phase_161))))"
 "(cons"
 "(let-values(((the-struct_114)(car bodys_26)))"
 "(if(semi-parsed-begin-for-syntax? the-struct_114)"
@@ -75913,61 +75957,61 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
 " the-struct_114)))"
-"(loop_126(cdr bodys_26) phase_160))))"
+"(loop_126(cdr bodys_26) phase_161))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_26))))"
 "(let-values(((tmp_69)"
-"(core-form-sym disarmed-body_1 phase_160)))"
+"(core-form-sym disarmed-body_1 phase_161)))"
 "(if(equal? tmp_69 '#%provide)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_159)"
+"(let-values(((obs_156)"
 "(expand-context-observer"
-" ctx_117)))"
-"(if obs_159"
+" ctx_118)))"
+"(if obs_156"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_159"
+" obs_156"
 " 'enter-prim"
 "(car bodys_26))"
 "(call-expand-observe"
-" obs_159"
+" obs_156"
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_83 #%provide595_0 spec596_0)"
-"(let-values(((s_640) disarmed-body_1))"
-"(let-values(((orig-s_91) s_640))"
+"(let-values(((s_637) disarmed-body_1))"
+"(let-values(((orig-s_91) s_637))"
 "(let-values(((#%provide595_1"
 " spec596_1)"
-"(let-values(((s_818)"
+"(let-values(((s_816)"
 "(if(syntax?$1"
-" s_640)"
+" s_637)"
 "(syntax-e$1"
-" s_640)"
-" s_640)))"
-"(if(pair? s_818)"
+" s_637)"
+" s_637)))"
+"(if(pair? s_816)"
 "(let-values(((#%provide597_0)"
-"(let-values(((s_819)"
+"(let-values(((s_817)"
 "(car"
-" s_818)))"
-" s_819))"
+" s_816)))"
+" s_817))"
 "((spec598_0)"
-"(let-values(((s_820)"
+"(let-values(((s_818)"
 "(cdr"
-" s_818)))"
-"(let-values(((s_821)"
+" s_816)))"
+"(let-values(((s_819)"
 "(if(syntax?$1"
-" s_820)"
+" s_818)"
 "(syntax-e$1"
-" s_820)"
-" s_820)))"
+" s_818)"
+" s_818)))"
 "(let-values(((flat-s_60)"
 "(to-syntax-list.1"
-" s_821)))"
+" s_819)))"
 "(if(not"
 " flat-s_60)"
 "(let-values()"
@@ -75994,10 +76038,10 @@ static const char *startup_source =
 "(car bodys_26)"
 " requires+provides_9"
 " self_38"
-" phase_160"
-"(let-values(((v_269) ctx_117))"
+" phase_161"
+"(let-values(((v_270) ctx_118))"
 "(let-values(((the-struct_115)"
-" v_269))"
+" v_270))"
 "(if(expand-context/outer?"
 " the-struct_115)"
 "(let-values(((context599_0)"
@@ -76005,15 +76049,15 @@ static const char *startup_source =
 "((inner600_0)"
 "(let-values(((the-struct_116)"
 "(root-expand-context/outer-inner"
-" v_269)))"
+" v_270)))"
 "(if(expand-context/inner?"
 " the-struct_116)"
 "(let-values(((phase601_0)"
-" phase_160)"
+" phase_161)"
 "((namespace602_0)"
 "(namespace->namespace-at-phase"
 " m-ns_20"
-" phase_160))"
+" phase_161))"
 "((requires+provides603_0)"
 " requires+provides_9)"
 "((declared-submodule-names604_0)"
@@ -76102,9 +76146,9 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                                        \"expand-context/outer?\""
 " the-struct_115)))))))"
-"(if(expand-context-to-parsed? ctx_117)"
+"(if(expand-context-to-parsed? ctx_118)"
 "(let-values()"
-"(loop_126(cdr bodys_26) phase_160))"
+"(loop_126(cdr bodys_26) phase_161))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
@@ -76121,14 +76165,14 @@ static const char *startup_source =
 " temp605_0"
 " temp606_0)))))"
 "(begin"
-"(let-values(((obs_160)"
+"(let-values(((obs_157)"
 "(expand-context-observer"
-" ctx_117)))"
-"(if obs_160"
+" ctx_118)))"
+"(if obs_157"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_160"
+" obs_157"
 " 'exit-prim"
 " new-s_10)))"
 "(void)))"
@@ -76136,14 +76180,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_126"
 "(cdr bodys_26)"
-" phase_160))))))))))"
+" phase_161))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_26)"
-"(loop_126(cdr bodys_26) phase_160))))))))))))))"
+"(loop_126(cdr bodys_26) phase_161))))))))))))))"
 " loop_126)"
 " expression-expanded-bodys_1"
-" phase_159)))))))))))))"
+" phase_160)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion139.1)"
 "(lambda(ctx125_0"
@@ -76167,7 +76211,7 @@ static const char *startup_source =
 "(let-values(((self_39) self122_0))"
 "(let-values(((enclosing-self_3) enclosing123_0))"
 "(let-values(((root-ctx_7) root-ctx124_0))"
-"(let-values(((ctx_118) ctx125_0))"
+"(let-values(((ctx_119) ctx125_0))"
 "(let-values(((modules-being-compiled_6) modules-being-compiled126_0))"
 "(let-values(((compiled-module-box_1) fill127_0))"
 "(let-values()"
@@ -76188,8 +76232,8 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_409) enclosing-self_3))"
-"(if or-part_409 or-part_409 self_39)))))"
+"(let-values(((or-part_410) enclosing-self_3))"
+"(if or-part_410 or-part_410 self_39)))))"
 "(let-values(((compiled-module_0)"
 "(let-values(((parsed-mod607_0) parsed-mod_0)"
 "((temp608_0)"
@@ -76213,7 +76257,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f)))"
-"((temp609_0)(expand-context-for-serializable? ctx_118))"
+"((temp609_0)(expand-context-for-serializable? ctx_119))"
 "((modules-being-compiled610_0) modules-being-compiled_6)"
 "((temp611_0) #f))"
 "(compile-module13.1"
@@ -76255,16 +76299,16 @@ static const char *startup_source =
 " compiled-module615_0)))))))))))))))))))))))))"
 "(define-values"
 "(attach-root-expand-context-properties)"
-"(lambda(s_662 root-ctx_8 orig-self_1 new-self_2)"
+"(lambda(s_659 root-ctx_8 orig-self_1 new-self_2)"
 "(begin"
-"(let-values(((s_822)"
-"(syntax-property$1 s_662 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
-"(let-values(((s_823)"
+"(let-values(((s_820)"
+"(syntax-property$1 s_659 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
+"(let-values(((s_821)"
 "(syntax-property$1"
-" s_822"
+" s_820"
 " 'module-body-inside-context"
 "(add-scope empty-syntax(root-expand-context-post-expansion-scope root-ctx_8)))))"
-" s_823)))))"
+" s_821)))))"
 "(define-values"
 "(expand-post-submodules165.1)"
 "(lambda(all-scopes-s147_0"
@@ -76283,7 +76327,7 @@ static const char *startup_source =
 " 'expand-post-submodules165"
 "(let-values(((fully-expanded-bodys-except-post-submodules_2) fully-expanded-bodys-except-post-submodules164_0))"
 "(let-values(((declare-enclosing-module_1) declare-enclosing142_0))"
-"(let-values(((phase_161) phase143_1))"
+"(let-values(((phase_162) phase143_1))"
 "(let-values(((self_40) self144_0))"
 "(let-values(((requires+provides_11) requires-and-provides145_0))"
 "(let-values(((enclosing-is-cross-phase-persistent?_1) enclosing-is-cross-phase-persistent?146_0))"
@@ -76295,7 +76339,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx152_0))"
 "(let-values()"
 "((letrec-values(((loop_127)"
-"(lambda(bodys_27 phase_162)"
+"(lambda(bodys_27 phase_163)"
 "(begin"
 " 'loop"
 "(if(null? bodys_27)"
@@ -76309,37 +76353,37 @@ static const char *startup_source =
 "(semi-parsed-begin-for-syntax-s"
 " body_25)))"
 "(let-values(((ok?_84 begin-for-syntax617_0 _618_0)"
-"(let-values(((s_824)"
+"(let-values(((s_822)"
 "(syntax-disarm$1"
 " body-s_0)))"
-"(let-values(((orig-s_92) s_824))"
+"(let-values(((orig-s_92) s_822))"
 "(let-values(((begin-for-syntax617_1"
 " _618_1)"
-"(let-values(((s_825)"
+"(let-values(((s_823)"
 "(if(syntax?$1"
-" s_824)"
+" s_822)"
 "(syntax-e$1"
-" s_824)"
-" s_824)))"
-"(if(pair? s_825)"
+" s_822)"
+" s_822)))"
+"(if(pair? s_823)"
 "(let-values(((begin-for-syntax619_0)"
-"(let-values(((s_826)"
+"(let-values(((s_824)"
 "(car"
-" s_825)))"
-" s_826))"
+" s_823)))"
+" s_824))"
 "((_620_0)"
-"(let-values(((s_827)"
+"(let-values(((s_825)"
 "(cdr"
-" s_825)))"
-"(let-values(((s_828)"
+" s_823)))"
+"(let-values(((s_826)"
 "(if(syntax?$1"
-" s_827)"
+" s_825)"
 "(syntax-e$1"
-" s_827)"
-" s_827)))"
+" s_825)"
+" s_825)))"
 "(let-values(((flat-s_61)"
 "(to-syntax-list.1"
-" s_828)))"
+" s_826)))"
 "(if(not"
 " flat-s_61)"
 "(let-values()"
@@ -76365,7 +76409,7 @@ static const char *startup_source =
 " submod-ctx_1)"
 "((body-s622_0)"
 " body-s_0))"
-"(keep-as-needed74.1"
+"(keep-as-needed85.1"
 " #f"
 " #f"
 " #f"
@@ -76378,7 +76422,7 @@ static const char *startup_source =
 "(loop_127"
 "(semi-parsed-begin-for-syntax-body"
 " body_25)"
-"(add1 phase_162))))"
+"(add1 phase_163))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -76401,20 +76445,20 @@ static const char *startup_source =
 " rebuild-body-s623_0"
 " temp624_0))"
 " parsed-bfs_0))"
-"(loop_127 rest-bodys_3 phase_162))))))))"
-"(if(let-values(((or-part_410)(parsed? body_25)))"
-"(if or-part_410"
-" or-part_410"
+"(loop_127 rest-bodys_3 phase_163))))))))"
+"(if(let-values(((or-part_411)(parsed? body_25)))"
+"(if or-part_411"
+" or-part_411"
 "(expanded+parsed? body_25)))"
 "(let-values()"
-"(cons body_25(loop_127 rest-bodys_3 phase_162)))"
+"(cons body_25(loop_127 rest-bodys_3 phase_163)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_25)))"
 "(let-values(((tmp_70)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_162)))"
+" phase_163)))"
 "(if(equal? tmp_70 'module*)"
 "(let-values()"
 "(let-values((()"
@@ -76430,60 +76474,60 @@ static const char *startup_source =
 " module*625_0"
 " name626_0"
 " _627_0)"
-"(let-values(((s_829)"
+"(let-values(((s_827)"
 " disarmed-body_2))"
-"(if(let-values(((s_830)"
+"(if(let-values(((s_828)"
 "(if(syntax?$1"
-" s_829)"
+" s_827)"
 "(syntax-e$1"
-" s_829)"
-" s_829)))"
-"(if(pair? s_830)"
-"(if(let-values(((s_831)"
+" s_827)"
+" s_827)))"
+"(if(pair? s_828)"
+"(if(let-values(((s_829)"
 "(car"
-" s_830)))"
+" s_828)))"
 " #t)"
-"(let-values(((s_832)"
+"(let-values(((s_830)"
 "(cdr"
-" s_830)))"
-"(let-values(((s_675)"
+" s_828)))"
+"(let-values(((s_831)"
 "(if(syntax?$1"
-" s_832)"
+" s_830)"
 "(syntax-e$1"
-" s_832)"
-" s_832)))"
+" s_830)"
+" s_830)))"
 "(if(pair?"
-" s_675)"
-"(if(let-values(((s_833)"
+" s_831)"
+"(if(let-values(((s_832)"
 "(car"
-" s_675)))"
+" s_831)))"
 " #t)"
+"(let-values(((s_833)"
+"(cdr"
+" s_831)))"
 "(let-values(((s_834)"
-"(cdr"
-" s_675)))"
-"(let-values(((s_835)"
 "(if(syntax?$1"
-" s_834)"
+" s_833)"
 "(syntax-e$1"
-" s_834)"
-" s_834)))"
+" s_833)"
+" s_833)))"
 "(if(pair?"
-" s_835)"
-"(if(let-values(((s_836)"
+" s_834)"
+"(if(let-values(((s_835)"
 "(car"
-" s_835)))"
-"(let-values(((s_837)"
+" s_834)))"
+"(let-values(((s_836)"
 "(if(syntax?$1"
-" s_836)"
+" s_835)"
 "(syntax-e$1"
-" s_836)"
-" s_836)))"
+" s_835)"
+" s_835)))"
 "(eq?"
 " #f"
-" s_837)))"
-"(let-values(((s_838)"
+" s_836)))"
+"(let-values(((s_837)"
 "(cdr"
-" s_835)))"
+" s_834)))"
 " #t)"
 " #f)"
 " #f)))"
@@ -76495,37 +76539,37 @@ static const char *startup_source =
 "(let-values(((module*625_1"
 " name626_1"
 " _627_1)"
-"(let-values(((s_839)"
+"(let-values(((s_838)"
 "(if(syntax?$1"
-" s_829)"
+" s_827)"
 "(syntax-e$1"
-" s_829)"
-" s_829)))"
+" s_827)"
+" s_827)))"
 "(let-values(((module*628_0)"
-"(let-values(((s_840)"
+"(let-values(((s_839)"
 "(car"
-" s_839)))"
-" s_840))"
+" s_838)))"
+" s_839))"
 "((name629_0"
 " _630_0)"
-"(let-values(((s_841)"
+"(let-values(((s_840)"
 "(cdr"
-" s_839)))"
-"(let-values(((s_677)"
+" s_838)))"
+"(let-values(((s_841)"
 "(if(syntax?$1"
-" s_841)"
+" s_840)"
 "(syntax-e$1"
-" s_841)"
-" s_841)))"
+" s_840)"
+" s_840)))"
 "(let-values(((name631_0)"
 "(let-values(((s_842)"
 "(car"
-" s_677)))"
+" s_841)))"
 " s_842))"
 "((_632_0)"
 "(let-values(((s_843)"
 "(cdr"
-" s_677)))"
+" s_841)))"
 "(let-values(((s_844)"
 "(if(syntax?$1"
 " s_843)"
@@ -76536,7 +76580,7 @@ static const char *startup_source =
 "(let-values(((s_845)"
 "(car"
 " s_844)))"
-"(let-values(((s_678)"
+"(let-values(((s_674)"
 "(if(syntax?$1"
 " s_845)"
 "(syntax-e$1"
@@ -76573,7 +76617,7 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_162)))"
+" phase_163)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
@@ -76635,7 +76679,7 @@ static const char *startup_source =
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_162)))"
+" phase_163)))"
 "(expanded+parsed1.1"
 " s646_0"
 "(expanded+parsed-parsed"
@@ -76647,7 +76691,7 @@ static const char *startup_source =
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_162))))))))"
+" phase_163))))))))"
 "(let-values()"
 "(let-values(((ready-body647_0)"
 " ready-body_2)"
@@ -76686,47 +76730,47 @@ static const char *startup_source =
 " submod_3"
 "(loop_127"
 " rest-bodys_3"
-" phase_162)))))))"
+" phase_163)))))))"
 "(let-values()"
 "(cons"
 " body_25"
 "(loop_127"
 " rest-bodys_3"
-" phase_162)))))))))))))))))"
+" phase_163)))))))))))))))))"
 " loop_127)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_161)))))))))))))))))"
+" phase_162)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
-"(lambda(ctx_119)"
+"(lambda(ctx_120)"
 "(begin"
 "(free-id-set-member?"
-"(expand-context-stops ctx_119)"
-"(expand-context-phase ctx_119)"
-"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_119))))))"
+"(expand-context-stops ctx_120)"
+"(expand-context-phase ctx_120)"
+"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_120))))))"
 "(define-values"
 "(check-ids-unbound173.1)"
 "(lambda(in168_0 ids170_0 phase171_1 requires+provides172_0)"
 "(begin"
 " 'check-ids-unbound173"
 "(let-values(((ids_47) ids170_0))"
-"(let-values(((phase_163) phase171_1))"
+"(let-values(((phase_164) phase171_1))"
 "(let-values(((requires+provides_12) requires+provides172_0))"
-"(let-values(((s_712) in168_0))"
+"(let-values(((s_705) in168_0))"
 "(let-values()"
 "(begin"
-"(let-values(((lst_440) ids_47))"
+"(let-values(((lst_441) ids_47))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_440)))"
+"(let-values()(check-list lst_441)))"
 "((letrec-values(((for-loop_341)"
-"(lambda(lst_441)"
+"(lambda(lst_442)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_441)"
-"(let-values(((id_165)(unsafe-car lst_441))"
-"((rest_252)(unsafe-cdr lst_441)))"
+"(if(pair? lst_442)"
+"(let-values(((id_164)(unsafe-car lst_442))"
+"((rest_254)(unsafe-cdr lst_442)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76735,10 +76779,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((requires+provides655_0)"
 " requires+provides_12)"
-"((id656_0) id_165)"
+"((id656_0) id_164)"
 "((phase657_0)"
-" phase_163)"
-"((s658_0) s_712)"
+" phase_164)"
+"((s658_0) s_705)"
 "((temp659_0) 'module))"
 "(check-not-defined95.1"
 " #f"
@@ -76758,25 +76802,25 @@ static const char *startup_source =
 " phase657_0)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_341 rest_252)(values))))"
+"(if(not #f)(for-loop_341 rest_254)(values))))"
 "(values))))))"
 " for-loop_341)"
-" lst_440)))"
+" lst_441)))"
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_28 phase_164 m-ns_22 self_41 ctx_120)"
+"(lambda(bodys_28 phase_165 m-ns_22 self_41 ctx_121)"
 "(begin"
 "(begin"
-"(let-values(((lst_442) bodys_28))"
+"(let-values(((lst_443) bodys_28))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_442)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_443)))"
 "((letrec-values(((for-loop_342)"
-"(lambda(lst_443)"
+"(lambda(lst_444)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_443)"
-"(let-values(((body_26)(unsafe-car lst_443))((rest_253)(unsafe-cdr lst_443)))"
+"(if(pair? lst_444)"
+"(let-values(((body_26)(unsafe-car lst_444))((rest_255)(unsafe-cdr lst_444)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76798,63 +76842,63 @@ static const char *startup_source =
 " ids_48"
 "(parsed-define-values-rhs"
 " p_88)"
-" phase_164"
+" phase_165"
 " m-ns_22"
-" ctx_120)))"
+" ctx_121)))"
 "(begin"
-"(let-values(((lst_444) ids_48)"
-"((lst_445)"
+"(let-values(((lst_445) ids_48)"
+"((lst_446)"
 "(parsed-define-values-syms"
 " p_88))"
-"((lst_446) vals_11))"
+"((lst_447) vals_11))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_444)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
 "(check-list lst_445)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list lst_446)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list lst_447)))"
 "((letrec-values(((for-loop_343)"
-"(lambda(lst_447"
-" lst_448"
-" lst_449)"
+"(lambda(lst_448"
+" lst_449"
+" lst_450)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_447)"
-"(if(pair?"
 " lst_448)"
-"(pair?"
+"(if(pair?"
 " lst_449)"
+"(pair?"
+" lst_450)"
 " #f)"
 " #f)"
-"(let-values(((id_166)"
-"(unsafe-car"
-" lst_447))"
-"((rest_254)"
-"(unsafe-cdr"
-" lst_447))"
-"((sym_105)"
+"(let-values(((id_165)"
 "(unsafe-car"
 " lst_448))"
-"((rest_255)"
-"(unsafe-cdr"
-" lst_448))"
-"((val_89)"
-"(unsafe-car"
-" lst_449))"
 "((rest_256)"
 "(unsafe-cdr"
-" lst_449)))"
+" lst_448))"
+"((sym_105)"
+"(unsafe-car"
+" lst_449))"
+"((rest_257)"
+"(unsafe-cdr"
+" lst_449))"
+"((val_89)"
+"(unsafe-car"
+" lst_450))"
+"((rest_258)"
+"(unsafe-cdr"
+" lst_450)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76863,7 +76907,7 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_22"
-" phase_164"
+" phase_165"
 " sym_105"
 " val_89))"
 "(values)))))"
@@ -76871,29 +76915,29 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_343"
-" rest_254"
-" rest_255"
-" rest_256)"
+" rest_256"
+" rest_257"
+" rest_258)"
 "(values))))"
 "(values))))))"
 " for-loop_343)"
-" lst_444"
 " lst_445"
-" lst_446)))"
+" lst_446"
+" lst_447)))"
 "(void)))))"
-"(if(let-values(((or-part_411)"
-"(parsed-define-syntaxes?"
-" p_88)))"
-"(if or-part_411"
-" or-part_411"
-"(semi-parsed-begin-for-syntax?"
-" p_88)))"
-"(let-values()(void))"
 "(if(let-values(((or-part_412)"
-"(parsed-#%declare?"
+"(parsed-define-syntaxes?"
 " p_88)))"
 "(if or-part_412"
 " or-part_412"
+"(semi-parsed-begin-for-syntax?"
+" p_88)))"
+"(let-values()(void))"
+"(if(let-values(((or-part_413)"
+"(parsed-#%declare?"
+" p_88)))"
+"(if or-part_413"
+" or-part_413"
 "(syntax?$1 p_88)))"
 "(let-values()(void))"
 "(let-values()"
@@ -76904,7 +76948,7 @@ static const char *startup_source =
 " #f"
 " parameterization-key)"
 " current-expand-context"
-" ctx_120"
+" ctx_121"
 " 1/current-namespace"
 " m-ns_22)"
 "(let-values()"
@@ -76914,7 +76958,7 @@ static const char *startup_source =
 "(let-values(((m-ns660_0)"
 " m-ns_22)"
 "((phase661_0)"
-" phase_164))"
+" phase_165))"
 "(make-compile-context14.1"
 " #f"
 " #f"
@@ -76931,10 +76975,10 @@ static const char *startup_source =
 " m-ns_22)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_342 rest_253)(values))))"
+"(if(not #f)(for-loop_342 rest_255)(values))))"
 "(values))))))"
 " for-loop_342)"
-" lst_442)))"
+" lst_443)))"
 "(void)))))"
 "(define-values"
 "(expand-submodule197.1)"
@@ -76958,7 +77002,7 @@ static const char *startup_source =
 " 'expand-submodule197"
 "(let-values(((s_847) s194_0))"
 "(let-values(((self_42) self195_0))"
-"(let-values(((ctx_121) ctx196_0))"
+"(let-values(((ctx_122) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
 "(let-values(((keep-enclosing-scope-at-phase_2)"
 "(if keep-enclosing-scope-at-phase186_0 keep-enclosing-scope-at-phase177_0 #f)))"
@@ -76980,14 +77024,14 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_161)(expand-context-observer ctx_121)))"
-"(if obs_161"
+"(let-values(((obs_158)(expand-context-observer ctx_122)))"
+"(if obs_158"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_161 'enter-prim s_847)"
+"(call-expand-observe obs_158 'enter-prim s_847)"
 "(call-expand-observe"
-" obs_161"
+" obs_158"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
@@ -77053,18 +77097,18 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_162)(expand-context-observer ctx_121)))"
-"(if obs_162"
+"(let-values(((obs_159)(expand-context-observer ctx_122)))"
+"(if obs_159"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_162 'enter-prim s_847)))"
+"(call-expand-observe obs_159 'enter-prim s_847)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
 "(let-values(((s670_0) s_847)"
 "((temp671_0)"
-"(let-values(((v_270) ctx_121))"
-"(let-values(((the-struct_118) v_270))"
+"(let-values(((v_271) ctx_122))"
+"(let-values(((the-struct_118) v_271))"
 "(if(expand-context/outer? the-struct_118)"
 "(let-values(((context680_0) 'module)"
 "((post-expansion-scope681_0)"
@@ -77072,7 +77116,7 @@ static const char *startup_source =
 "((inner682_0)"
 "(let-values(((the-struct_119)"
 "(root-expand-context/outer-inner"
-" v_270)))"
+" v_271)))"
 "(if(expand-context/inner?"
 " the-struct_119)"
 "(let-values(((stops683_0)"
@@ -77195,18 +77239,18 @@ static const char *startup_source =
 " self672_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_163)"
-"(expand-context-observer ctx_121)))"
-"(if obs_163"
+"(let-values(((obs_160)"
+"(expand-context-observer ctx_122)))"
+"(if obs_160"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_163"
+" obs_160"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))"
 "(values))))"
-"(let-values(((ns_128)(expand-context-namespace ctx_121)))"
+"(let-values(((ns_129)(expand-context-namespace ctx_122)))"
 "(let-values(((module-name_3)(1/module-path-index-resolve self_42)))"
 "(let-values(((root-module-name_1)"
 "(resolved-module-path-root-name module-name_3)))"
@@ -77216,7 +77260,7 @@ static const char *startup_source =
 "(expanded+parsed-parsed submod_5)"
 " submod_5))"
 "((temp685_0)"
-"(let-values(((ns690_0) ns_128)"
+"(let-values(((ns690_0) ns_129)"
 "((self691_0) self_42)"
 "((temp692_0)"
 "(1/resolved-module-path-name"
@@ -77237,7 +77281,7 @@ static const char *startup_source =
 "((temp686_0) #t)"
 "((temp687_0)"
 "(expand-context-for-serializable?"
-" ctx_121))"
+" ctx_122))"
 "((modules-being-compiled688_0)"
 " modules-being-compiled_8)"
 "((temp689_0) #f))"
@@ -77264,7 +77308,7 @@ static const char *startup_source =
 "(extend-parameterization"
 "(continuation-mark-set-first #f parameterization-key)"
 " 1/current-namespace"
-" ns_128"
+" ns_129"
 " 1/current-module-declare-name"
 "(1/make-resolved-module-path root-module-name_1))"
 "(let-values()"
@@ -77282,13 +77326,13 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_164)"
-"(expand-context-observer ctx_121)))"
-"(if obs_164"
+"(let-values(((obs_161)"
+"(expand-context-observer ctx_122)))"
+"(if obs_161"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_164"
+" obs_161"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))))"
@@ -77370,27 +77414,27 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules212"
 "(let-values(((bodys_29) bodys208_0))"
-"(let-values(((phase_165) phase209_0))"
+"(let-values(((phase_166) phase209_0))"
 "(let-values(((self_43) self210_0))"
-"(let-values(((ctx_122) ctx211_0))"
+"(let-values(((ctx_123) ctx211_0))"
 "(let-values(((mpis-to-reset_5) mpis-to-reset200_0))"
 "(let-values(((declared-submodule-names_9) declared-submodule-names201_0))"
 "(let-values(((compiled-submodules_6) compiled-submodules202_0))"
 "(let-values(((modules-being-compiled_9) modules-being-compiled203_0))"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_450) bodys_29))"
+"(let-values(((lst_451) bodys_29))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_450)))"
+"(let-values()(check-list lst_451)))"
 "((letrec-values(((for-loop_344)"
-"(lambda(fold-var_398 lst_451)"
+"(lambda(fold-var_398 lst_452)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_451)"
-"(let-values(((body_27)(unsafe-car lst_451))"
-"((rest_257)(unsafe-cdr lst_451)))"
+"(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)"
@@ -77401,7 +77445,7 @@ static const char *startup_source =
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_27)"
-" phase_165)))"
+" phase_166)))"
 "(if(equal? tmp_71 'module)"
 "(let-values()"
 "(let-values(((body698_0)"
@@ -77409,7 +77453,7 @@ static const char *startup_source =
 "((self699_0)"
 " self_43)"
 "((ctx700_0)"
-" ctx_122)"
+" ctx_123)"
 "((temp701_0)"
 " #f)"
 "((mpis-to-reset702_0)"
@@ -77441,12 +77485,12 @@ static const char *startup_source =
 " fold-var_400))))"
 "(values fold-var_401)))))"
 "(if(not #f)"
-"(for-loop_344 fold-var_399 rest_257)"
+"(for-loop_344 fold-var_399 rest_259)"
 " fold-var_399)))"
 " fold-var_398)))))"
 " for-loop_344)"
 " null"
-" lst_450))))))))))))))))"
+" lst_451))))))))))))))))"
 "(define-values"
 "(make-parse-lifted-require220.1)"
 "(lambda(declared-submodule-names215_0 m-ns217_0 self218_0 requires+provides219_0)"
@@ -77457,7 +77501,7 @@ 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_855 phase_166)"
+"(lambda(s_855 phase_167)"
 "(let-values(((ok?_87 #%require706_0 req707_0)"
 "(let-values(((s_856)(syntax-disarm$1 s_855)))"
 "(let-values(((orig-s_94) s_856))"
@@ -77505,8 +77549,8 @@ static const char *startup_source =
 "((s712_0) s_855)"
 "((self713_0) self_44)"
 "((m-ns714_0) m-ns_23)"
-"((phase715_0) phase_166)"
-"((phase716_0) phase_166)"
+"((phase715_0) phase_167)"
+"((phase716_0) phase_167)"
 "((requires+provides717_0) requires+provides_13)"
 "((declared-submodule-names718_0) declared-submodule-names_10)"
 "((temp719_0) 'require))"
@@ -77548,16 +77592,16 @@ static const char *startup_source =
 "(lambda(lifted-defns_2)"
 "(begin"
 "(reverse$1"
-"(let-values(((lst_452) lifted-defns_2))"
+"(let-values(((lst_453) lifted-defns_2))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_452)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_453)))"
 "((letrec-values(((for-loop_345)"
-"(lambda(fold-var_402 lst_453)"
+"(lambda(fold-var_402 lst_454)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_453)"
-"(let-values(((lifted-defn_0)(unsafe-car lst_453))"
-"((rest_258)(unsafe-cdr lst_453)))"
+"(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)"
@@ -77567,38 +77611,38 @@ static const char *startup_source =
 "(defn-extract-syntax lifted-defn_0))"
 " fold-var_404))))"
 "(values fold-var_405)))))"
-"(if(not #f)(for-loop_345 fold-var_403 rest_258) fold-var_403)))"
+"(if(not #f)(for-loop_345 fold-var_403 rest_260) fold-var_403)))"
 " fold-var_402)))))"
 " for-loop_345)"
 " null"
-" lst_452)))))))"
+" lst_453)))))))"
 "(define-values"
 "(log-lifted-defns)"
 "(lambda(partial-body-ctx_2 lifted-defns_3 exp-body_10 rest-bodys_4)"
 "(begin"
-"(let-values(((obs_165)(expand-context-observer partial-body-ctx_2)))"
-"(if obs_165"
+"(let-values(((obs_162)(expand-context-observer partial-body-ctx_2)))"
+"(if obs_162"
 "(let-values()"
 "(let-values(((s-lifted-defns_0)(lifted-defns-extract-syntax lifted-defns_3)))"
 "(let-values((()"
 "(begin"
-"(call-expand-observe obs_165 'rename-list(cons exp-body_10 rest-bodys_4))"
+"(call-expand-observe obs_162 'rename-list(cons exp-body_10 rest-bodys_4))"
 "(values))))"
-"(let-values((()(begin(call-expand-observe obs_165 'module-lift-loop s-lifted-defns_0)(values))))"
+"(let-values((()(begin(call-expand-observe obs_162 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_454) s-lifted-defns_0))"
+"(let-values(((lst_455) s-lifted-defns_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_454)))"
+"(let-values()(check-list lst_455)))"
 "((letrec-values(((for-loop_346)"
-"(lambda(lst_455)"
+"(lambda(lst_456)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_455)"
-"(let-values(((s-lifted-defn_0)(unsafe-car lst_455))"
-"((rest_259)(unsafe-cdr lst_455)))"
+"(if(pair? lst_456)"
+"(let-values(((s-lifted-defn_0)(unsafe-car lst_456))"
+"((rest_261)(unsafe-cdr lst_456)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -77662,52 +77706,52 @@ static const char *startup_source =
 " _725_1))))))"
 "(begin"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'next)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'visit"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'resolve"
 " define-values724_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'prim-stop)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'exit-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'return"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'rename-one"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'prim-define-values)"
 "(call-expand-observe"
-" obs_165"
+" obs_162"
 " 'exit-prim"
 " s-lifted-defn_0))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_346 rest_259)(values))))"
+"(if(not #f)(for-loop_346 rest_261)(values))))"
 "(values))))))"
 " for-loop_346)"
-" lst_454)))"
+" lst_455)))"
 "(values))))"
 "(let-values()"
 "(let-values(((ok?_89 form-id720_0 _721_0)"
@@ -77725,20 +77769,20 @@ static const char *startup_source =
 "                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_96)))))"
 "(values #t form-id720_1 _721_1))))))"
 "(begin"
-"(call-expand-observe obs_165 'next)"
-"(call-expand-observe obs_165 'visit exp-body_10)"
-"(call-expand-observe obs_165 'resolve form-id720_0)"
-"(call-expand-observe obs_165 'enter-prim exp-body_10)"
-"(call-expand-observe obs_165 'prim-stop)"
-"(call-expand-observe obs_165 'exit-prim exp-body_10)"
-"(call-expand-observe obs_165 'return exp-body_10)))))))))"
+"(call-expand-observe obs_162 'next)"
+"(call-expand-observe obs_162 'visit exp-body_10)"
+"(call-expand-observe obs_162 'resolve form-id720_0)"
+"(call-expand-observe obs_162 'enter-prim exp-body_10)"
+"(call-expand-observe obs_162 'prim-stop)"
+"(call-expand-observe obs_162 'exit-prim exp-body_10)"
+"(call-expand-observe obs_162 'return exp-body_10)))))))))"
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
-"(lambda(ctx_123 defn_1)"
+"(lambda(ctx_124 defn_1)"
 "(begin"
-"(let-values(((obs_166)(expand-context-observer ctx_123)))"
-"(if obs_166"
+"(let-values(((obs_163)(expand-context-observer ctx_124)))"
+"(if obs_163"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
 "(let-values(((ok?_90 define-values728_0 _729_0)"
@@ -77767,30 +77811,30 @@ static const char *startup_source =
 "                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))"
 "(values #t define-values728_1 _729_1))))))"
 "(begin"
-"(call-expand-observe obs_166 'visit s-defn_0)"
-"(call-expand-observe obs_166 'resolve define-values728_0)"
-"(call-expand-observe obs_166 'enter-prim s-defn_0)"
-"(call-expand-observe obs_166 'prim-define-values)))))"
+"(call-expand-observe obs_163 'visit s-defn_0)"
+"(call-expand-observe obs_163 'resolve define-values728_0)"
+"(call-expand-observe obs_163 'enter-prim s-defn_0)"
+"(call-expand-observe obs_163 'prim-define-values)))))"
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
-"(lambda(ctx_124 defn_2 exp-rhs_7)"
+"(lambda(ctx_125 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_124)))"
-"(if obs_167"
+"(let-values(((obs_164)(expand-context-observer ctx_125)))"
+"(if obs_164"
 "(let-values()"
 "(let-values(((s-defn_1)"
 "(datum->syntax$1"
 " #f"
-"(list 'define-values(semi-parsed-define-values-ids defn_2) exp-rhs_7)"
+"(list 'define-values(semi-parsed-define-values-ids defn_2) exp-rhs_8)"
 "(semi-parsed-define-values-s defn_2))))"
-"(begin(call-expand-observe obs_167 'exit-prim s-defn_1)(call-expand-observe obs_167 'return s-defn_1))))"
+"(begin(call-expand-observe obs_164 'exit-prim s-defn_1)(call-expand-observe obs_164 'return s-defn_1))))"
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
-"(lambda(ids_49 s_69 ctx_125)"
+"(lambda(ids_49 s_69 ctx_126)"
 "(begin"
-"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_125)))"
+"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_126)))"
 "(let-values(((tl-ids_2)"
 "(reverse$1"
 "(let-values(((lst_6) ids_49))"
@@ -77803,7 +77847,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_85)"
-"(let-values(((id_167)(unsafe-car lst_85))"
+"(let-values(((id_166)(unsafe-car lst_85))"
 "((rest_40)(unsafe-cdr lst_85)))"
 "(let-values(((fold-var_61)"
 "(let-values(((fold-var_62) fold-var_406))"
@@ -77812,8 +77856,8 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(remove-use-site-scopes"
-" id_167"
-" ctx_125))"
+" id_166"
+" ctx_126))"
 " fold-var_62))))"
 "(values fold-var_407)))))"
 "(if(not #f)(for-loop_104 fold-var_61 rest_40) fold-var_61)))"
@@ -77823,7 +77867,7 @@ static const char *startup_source =
 " lst_6))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_125))((s3_4) s_69))"
+"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_126))((s3_4) s_69))"
 "(check-no-duplicate-ids8.1 #f #f tl-ids1_0 temp2_9 s3_4 #f #f))"
 "(values))))"
 "(let-values(((tmp-bind-ids_0)"
@@ -77838,8 +77882,8 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
-"(let-values(((id_168)(unsafe-car lst_86))"
-"((rest_240)(unsafe-cdr lst_86)))"
+"(let-values(((id_167)(unsafe-car lst_86))"
+"((rest_242)(unsafe-cdr lst_86)))"
 "(let-values(((fold-var_26)"
 "(let-values(((fold-var_152) fold-var_217))"
 "(let-values(((fold-var_220)"
@@ -77847,27 +77891,27 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_168"
+" id_167"
 " top-level-bind-scope_6))"
 " fold-var_152))))"
 "(values fold-var_220)))))"
 "(if(not #f)"
-"(for-loop_347 fold-var_26 rest_240)"
+"(for-loop_347 fold-var_26 rest_242)"
 " fold-var_26)))"
 " fold-var_217)))))"
 " for-loop_347)"
 " null"
 " lst_100))))))"
-"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_125)))))))))"
+"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_126)))))))))"
 "(void"
 "(add-core-form!*"
 " 'define-values"
 "(lambda(s_0 ctx_7)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_168)(expand-context-observer ctx_7)))"
-"(if obs_168"
-"(let-values()(let-values()(call-expand-observe obs_168 'prim-define-values)))"
+"(let-values(((obs_165)(expand-context-observer ctx_7)))"
+"(if obs_165"
+"(let-values()(let-values()(call-expand-observe obs_165 'prim-define-values)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -77907,7 +77951,7 @@ static const char *startup_source =
 "                                                                                            \"bad syntax\""
 " orig-s_98))"
 "(let-values()"
-"(let-values(((id_169)"
+"(let-values(((id_168)"
 "(let-values(((lst_24)"
 " flat-s_64))"
 "(begin"
@@ -77930,10 +77974,10 @@ static const char *startup_source =
 "((rest_141)"
 "(unsafe-cdr"
 " lst_80)))"
-"(let-values(((id_170)"
+"(let-values(((id_169)"
 "(let-values(((id_52)"
 " id_6))"
-"(let-values(((id_171)"
+"(let-values(((id_170)"
 "(let-values()"
 "(let-values(((id10_1)"
 "(let-values()"
@@ -77958,18 +78002,18 @@ static const char *startup_source =
 " id10_1"
 " id_52)))))"
 "(values"
-" id_171)))))"
+" id_170)))))"
 "(if(not"
 " #f)"
 "(for-loop_254"
-" id_170"
+" id_169"
 " rest_141)"
-" id_170)))"
+" id_169)))"
 " id_6)))))"
 " for-loop_254)"
 " null"
 " lst_24)))))"
-"(reverse$1 id_169))))))))"
+"(reverse$1 id_168))))))))"
 "((rhs8_0)"
 "(let-values(((s_85)(cdr s_175)))"
 "(let-values(((s_385)"
@@ -78010,61 +78054,61 @@ static const char *startup_source =
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
 "(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_8)"
+"(let-values(((exp-rhs_9)"
 "(let-values(((temp11_7) rhs3_0)"
 "((temp12_8)(as-named-context(as-expression-context ctx_7) ids_50)))"
 "(expand7.1 #f #f #f #f temp11_7 temp12_8))))"
 "(if(expand-context-to-parsed? ctx_7)"
-"(parsed-define-values19.1 s_0 ids_50 syms_28 exp-rhs_8)"
-"(let-values(((s13_0) s_0)((temp14_9)(list define-values1_0 ids_50 exp-rhs_8)))"
+"(parsed-define-values19.1 s_0 ids_50 syms_28 exp-rhs_9)"
+"(let-values(((s13_0) s_0)((temp14_9)(list define-values1_0 ids_50 exp-rhs_9)))"
 "(rebuild5.1 #f #f s13_0 temp14_9))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'define-syntaxes"
-"(lambda(s_878 ctx_126)"
+"(lambda(s_878 ctx_127)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_126)))"
-"(if obs_169"
-"(let-values()(let-values()(call-expand-observe obs_169 'prim-define-syntaxes)))"
+"(let-values(((obs_166)(expand-context-observer ctx_127)))"
+"(if obs_166"
+"(let-values()(let-values()(call-expand-observe obs_166 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_170)(expand-context-observer ctx_126)))"
-"(if obs_170(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))(void)))"
+"(let-values(((obs_167)(expand-context-observer ctx_127)))"
+"(if obs_167(let-values()(let-values()(call-expand-observe obs_167 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_126) 'top-level)"
+"(if(eq?(expand-context-context ctx_127) 'top-level)"
 "(void)"
 "                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_878)))"
 "(values))))"
 "(let-values(((disarmed-s_26)(syntax-disarm$1 s_878)))"
-"(let-values(((ok?_91 define-syntaxes15_0 id16_2 rhs17_0)"
-"(let-values(((s_431) disarmed-s_26))"
-"(let-values(((orig-s_99) s_431))"
-"(let-values(((define-syntaxes15_1 id16_3 rhs17_1)"
-"(let-values(((s_20)(if(syntax?$1 s_431)(syntax-e$1 s_431) s_431)))"
+"(let-values(((ok?_91 define-syntaxes15_0 id16_1 rhs17_0)"
+"(let-values(((s_428) disarmed-s_26))"
+"(let-values(((orig-s_99) s_428))"
+"(let-values(((define-syntaxes15_1 id16_2 rhs17_1)"
+"(let-values(((s_20)(if(syntax?$1 s_428)(syntax-e$1 s_428) s_428)))"
 "(if(pair? s_20)"
 "(let-values(((define-syntaxes18_0)"
 "(let-values(((s_23)(car s_20))) s_23))"
 "((id19_1 rhs20_0)"
-"(let-values(((s_466)(cdr s_20)))"
+"(let-values(((s_463)(cdr s_20)))"
 "(let-values(((s_24)"
-"(if(syntax?$1 s_466)"
-"(syntax-e$1 s_466)"
-" s_466)))"
+"(if(syntax?$1 s_463)"
+"(syntax-e$1 s_463)"
+" s_463)))"
 "(if(pair? s_24)"
 "(let-values(((id21_0)"
-"(let-values(((s_732)(car s_24)))"
-"(let-values(((s_474)"
-"(if(syntax?$1 s_732)"
-"(syntax-e$1 s_732)"
-" s_732)))"
+"(let-values(((s_729)(car s_24)))"
+"(let-values(((s_470)"
+"(if(syntax?$1 s_729)"
+"(syntax-e$1 s_729)"
+" s_729)))"
 "(let-values(((flat-s_65)"
 "(to-syntax-list.1"
-" s_474)))"
+" s_470)))"
 "(if(not flat-s_65)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -78072,7 +78116,7 @@ static const char *startup_source =
 "                                                                                              \"bad syntax\""
 " orig-s_99))"
 "(let-values()"
-"(let-values(((id_172)"
+"(let-values(((id_171)"
 "(let-values(((lst_180)"
 " flat-s_65))"
 "(begin"
@@ -78083,34 +78127,34 @@ static const char *startup_source =
 "(check-list"
 " lst_180)))"
 "((letrec-values(((for-loop_348)"
-"(lambda(id_173"
-" lst_456)"
+"(lambda(id_172"
+" lst_457)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_456)"
+" lst_457)"
 "(let-values(((s_150)"
 "(unsafe-car"
-" lst_456))"
-"((rest_260)"
+" lst_457))"
+"((rest_262)"
 "(unsafe-cdr"
-" lst_456)))"
-"(let-values(((id_174)"
-"(let-values(((id_96)"
-" id_173))"
+" lst_457)))"
+"(let-values(((id_173)"
 "(let-values(((id_97)"
+" id_172))"
+"(let-values(((id_98)"
 "(let-values()"
 "(let-values(((id24_1)"
 "(let-values()"
-"(if(let-values(((or-part_361)"
+"(if(let-values(((or-part_362)"
 "(if(syntax?$1"
 " s_150)"
 "(symbol?"
 "(syntax-e$1"
 " s_150))"
 " #f)))"
-"(if or-part_361"
-" or-part_361"
+"(if or-part_362"
+" or-part_362"
 "(symbol?"
 " s_150)))"
 " s_150"
@@ -78121,44 +78165,44 @@ static const char *startup_source =
 " s_150)))))"
 "(cons"
 " id24_1"
-" id_96)))))"
-"(values"
 " id_97)))))"
+"(values"
+" id_98)))))"
 "(if(not"
 " #f)"
 "(for-loop_348"
-" id_174"
-" rest_260)"
-" id_174)))"
-" id_173)))))"
+" id_173"
+" rest_262)"
+" id_173)))"
+" id_172)))))"
 " for-loop_348)"
 " null"
 " lst_180)))))"
-"(reverse$1 id_172))))))))"
+"(reverse$1 id_171))))))))"
 "((rhs22_0)"
-"(let-values(((s_501)(cdr s_24)))"
-"(let-values(((s_482)"
-"(if(syntax?$1 s_501)"
-"(syntax-e$1 s_501)"
-" s_501)))"
-"(if(pair? s_482)"
+"(let-values(((s_497)(cdr s_24)))"
+"(let-values(((s_478)"
+"(if(syntax?$1 s_497)"
+"(syntax-e$1 s_497)"
+" s_497)))"
+"(if(pair? s_478)"
 "(let-values(((rhs23_2)"
 "(let-values(((s_169)"
 "(car"
-" s_482)))"
+" s_478)))"
 " s_169))"
 "(()"
 "(let-values(((s_44)"
 "(cdr"
-" s_482)))"
-"(let-values(((s_483)"
+" s_478)))"
+"(let-values(((s_479)"
 "(if(syntax?$1"
 " s_44)"
 "(syntax-e$1"
 " s_44)"
 " s_44)))"
 "(if(null?"
-" s_483)"
+" s_479)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -78176,35 +78220,35 @@ static const char *startup_source =
 " orig-s_99))))))"
 "(values define-syntaxes18_0 id19_1 rhs20_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_99)))))"
-"(values #t define-syntaxes15_1 id16_3 rhs17_1))))))"
-"(let-values(((ids_51 syms_29)(as-expand-time-top-level-bindings id16_2 s_878 ctx_126)))"
-"(let-values(((exp-rhs_9)"
-"(let-values(((temp25_7) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_51)))"
-"(expand-transformer47.1 #f #f #f #f #f #f #f #f #f #f #f #f temp25_7 temp26_6))))"
-"(if(expand-context-to-parsed? ctx_126)"
-"(parsed-define-syntaxes20.1 s_878 ids_51 syms_29 exp-rhs_9)"
-"(let-values(((s27_3) s_878)((temp28_7)(list define-syntaxes15_0 ids_51 exp-rhs_9)))"
+"(values #t define-syntaxes15_1 id16_2 rhs17_1))))))"
+"(let-values(((ids_51 syms_29)(as-expand-time-top-level-bindings id16_1 s_878 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_878 ids_51 syms_29 exp-rhs_10)"
+"(let-values(((s27_3) s_878)((temp28_7)(list define-syntaxes15_0 ids_51 exp-rhs_10)))"
 "(rebuild5.1 #f #f s27_3 temp28_7)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin-for-syntax"
-"(lambda(s_486 ctx_10)"
+"(lambda(s_482 ctx_10)"
 "(let-values((()"
 "(begin"
 "(if(eq?(expand-context-context ctx_10) 'top-level)"
 "(void)"
-"                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_486)))"
+"                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_482)))"
 "(values))))"
 "(let-values(((ok?_92 begin-for-syntax29_0 form30_0)"
-"(let-values(((s_426) s_486))"
-"(let-values(((orig-s_100) s_426))"
+"(let-values(((s_423) s_482))"
+"(let-values(((orig-s_100) s_423))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
-"(let-values(((s_427)(if(syntax?$1 s_426)(syntax-e$1 s_426) s_426)))"
-"(if(pair? s_427)"
+"(let-values(((s_424)(if(syntax?$1 s_423)(syntax-e$1 s_423) s_423)))"
+"(if(pair? s_424)"
 "(let-values(((begin-for-syntax31_0)"
-"(let-values(((s_31)(car s_427))) s_31))"
+"(let-values(((s_31)(car s_424))) s_31))"
 "((form32_0)"
-"(let-values(((s_46)(cdr s_427)))"
+"(let-values(((s_46)(cdr s_424)))"
 "(let-values(((s_151)"
 "(if(syntax?$1 s_46)(syntax-e$1 s_46) s_46)))"
 "(let-values(((flat-s_66)(to-syntax-list.1 s_151)))"
@@ -78217,9 +78261,9 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)(expand-context-observer ctx_10)))"
-"(if obs_171"
-"(let-values()(let-values()(call-expand-observe obs_171 'prim-begin-for-syntax)))"
+"(let-values(((obs_168)(expand-context-observer ctx_10)))"
+"(if obs_168"
+"(let-values()(let-values()(call-expand-observe obs_168 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -78231,7 +78275,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((trans-ctx_1)"
 "(let-values(((ctx33_0) ctx_10)((temp34_5) 'top-level)((temp35_4) #t))"
-"(context->transformer-context55.1 temp35_4 #t ctx33_0 temp34_5 #t))))"
+"(context->transformer-context66.1 temp35_4 #t ctx33_0 temp34_5 #t))))"
 "(let-values(((lift-ctx_7)"
 "(let-values(((temp36_10)(make-top-level-lift trans-ctx_1)))"
 "(make-lift-context6.1 #f #f temp36_10))))"
@@ -78309,7 +78353,7 @@ static const char *startup_source =
 "(call-expand-observe"
 " obs_16"
 " 'enter-list"
-"(datum->syntax$1 #f form30_0 s_486))))"
+"(datum->syntax$1 #f form30_0 s_482))))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-forms_0)"
@@ -78335,20 +78379,20 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 " forms_2"
-" s_486))))"
+" s_482))))"
 "(void)))"
 " forms_2)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_172)"
+"(let-values(((obs_169)"
 "(expand-context-observer"
 " ctx_10)))"
-"(if obs_172"
+"(if obs_169"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_172"
+" obs_169"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -78379,14 +78423,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_173)"
+"(let-values(((obs_18)"
 "(expand-context-observer"
 " ctx_10)))"
-"(if obs_173"
+"(if obs_18"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_173"
+" obs_18"
 " 'module-lift-loop"
 " lifts_14)))"
 "(void)))"
@@ -78416,21 +78460,21 @@ static const char *startup_source =
 " loop_87)"
 " form30_0)))"
 "(if(expand-context-to-parsed? ctx_10)"
-"(parsed-begin-for-syntax21.1 s_486 all-exp-forms_0)"
-"(let-values(((s45_1) s_486)((temp46_4)(cons begin-for-syntax29_0 all-exp-forms_0)))"
-"(rebuild5.1 #f #f s45_1 temp46_4))))))))))))))"
+"(parsed-begin-for-syntax21.1 s_482 all-exp-forms_0)"
+"(let-values(((s45_0) s_482)((temp46_4)(cons begin-for-syntax29_0 all-exp-forms_0)))"
+"(rebuild5.1 #f #f s45_0 temp46_4))))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%require"
-"(lambda(s_33 ctx_127)"
+"(lambda(s_33 ctx_128)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_174)(expand-context-observer ctx_127)))"
-"(if obs_174(let-values()(let-values()(call-expand-observe obs_174 'prim-require)))(void)))"
+"(let-values(((obs_170)(expand-context-observer ctx_128)))"
+"(if obs_170(let-values()(let-values()(call-expand-observe obs_170 'prim-require)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_127) 'top-level)"
+"(if(eq?(expand-context-context ctx_128) 'top-level)"
 "(void)"
 "                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_33)))"
 "(values))))"
@@ -78441,7 +78485,7 @@ static const char *startup_source =
 "(let-values(((#%require47_1 req48_1)"
 "(let-values(((s_58)(if(syntax?$1 s_198)(syntax-e$1 s_198) s_198)))"
 "(if(pair? s_58)"
-"(let-values(((#%require49_0)(let-values(((s_507)(car s_58))) s_507))"
+"(let-values(((#%require49_0)(let-values(((s_503)(car s_58))) s_503))"
 "((req50_0)"
 "(let-values(((s_879)(cdr s_58)))"
 "(let-values(((s_200)"
@@ -78460,18 +78504,18 @@ static const char *startup_source =
 "(begin"
 "(let-values(((temp51_3)"
 "(reverse$1"
-"(let-values(((lst_457) req48_0))"
+"(let-values(((lst_458) req48_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_457)))"
+"(let-values()(check-list lst_458)))"
 "((letrec-values(((for-loop_349)"
 "(lambda(fold-var_295 lst_151)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_151)"
 "(let-values(((req_20)(unsafe-car lst_151))"
-"((rest_261)(unsafe-cdr lst_151)))"
+"((rest_263)(unsafe-cdr lst_151)))"
 "(let-values(((fold-var_408)"
 "(let-values(((fold-var_298) fold-var_295))"
 "(let-values(((fold-var_409)"
@@ -78484,16 +78528,16 @@ static const char *startup_source =
 " fold-var_298))))"
 "(values fold-var_409)))))"
 "(if(not #f)"
-"(for-loop_349 fold-var_408 rest_261)"
+"(for-loop_349 fold-var_408 rest_263)"
 " fold-var_408)))"
 " fold-var_295)))))"
 " for-loop_349)"
 " null"
-" lst_457)))))"
+" lst_458)))))"
 "((s52_0) s_33)"
 "((temp53_5) #f)"
-"((temp54_7)(expand-context-namespace ctx_127))"
-"((temp55_4)(expand-context-phase ctx_127))"
+"((temp54_7)(expand-context-namespace ctx_128))"
+"((temp55_4)(expand-context-phase ctx_128))"
 "((temp56_3)(let-values(((temp59_8) #f))(make-requires+provides8.1 #f #f temp59_8)))"
 "((temp57_1) 'require)"
 "((temp58_4) #t))"
@@ -78522,14 +78566,14 @@ static const char *startup_source =
 " temp54_7"
 " temp55_4"
 " temp56_3))"
-"(if(expand-context-to-parsed? ctx_127)(parsed-require23.1 s_33) s_33))))))))))"
+"(if(expand-context-to-parsed? ctx_128)(parsed-require23.1 s_33) s_33))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%provide"
-"(lambda(s_320 ctx_128)"
+"(lambda(s_320 ctx_129)"
 "(begin"
-"(let-values(((obs_175)(expand-context-observer ctx_128)))"
-"(if obs_175(let-values()(let-values()(call-expand-observe obs_175 'prim-provide)))(void)))"
+"(let-values(((obs_171)(expand-context-observer ctx_129)))"
+"(if obs_171(let-values()(let-values()(call-expand-observe obs_171 'prim-provide)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_320)))))"
 "(define-values(ns)(make-namespace))"
 "(void"
@@ -78646,12 +78690,12 @@ static const char *startup_source =
 "(let-values(((name30_0) name_83)"
 "((ns31_5) ns)"
 "((temp32_5)"
-"(let-values(((or-part_295)"
+"(let-values(((or-part_296)"
 "(eq?"
 " name_83"
 " '#%foreign)))"
-"(if or-part_295"
-" or-part_295"
+"(if or-part_296"
+" or-part_296"
 "(let-values(((or-part_93)"
 "(eq?"
 " name_83"