From 628c1774808c836fc4da19d57514754df0bcf683 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 19 May 2018 07:12:26 -0600
Subject: [PATCH] expander: fix code-inspector management during macro
 expansion

Specifically, don't incorrectly preserve the current macro's code
inspector when triggering another macro via `local-expand`.
---
 pkgs/racket-test-core/tests/racket/macro.rktl |   36 +
 racket/src/expander/expand/main.rkt           |    2 +-
 racket/src/racket/src/startup.inc             | 2937 ++++++++---------
 3 files changed, 1505 insertions(+), 1470 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/macro.rktl b/pkgs/racket-test-core/tests/racket/macro.rktl
index 68e4b1923f..a2366b0408 100644
--- a/pkgs/racket-test-core/tests/racket/macro.rktl
+++ b/pkgs/racket-test-core/tests/racket/macro.rktl
@@ -2119,6 +2119,42 @@
 
 (test 42 dynamic-require ''parent-internal-definition-contexts-do-add-bindings 'result)
 
+;; ----------------------------------------
+;; Make sure that changing the code expander disables syntax
+;; disarming when it should
+
+(parameterize ([current-namespace (make-base-namespace)]
+               [current-code-inspector (current-code-inspector)])
+
+  (eval
+   '(module disarm racket/base
+      (require (for-template racket/base))
+      (define (disarm s)
+        (unless (syntax-tainted? (car (syntax-e (syntax-disarm s #f))))
+          (error "disarm suceeded!"))
+        #''ok)
+      (provide disarm)))
+
+  (eval
+   '(module mapply racket/base
+      (require (for-syntax racket/base))
+      (provide mapply)
+      (define-syntax (mapply stx)
+        (syntax-case stx ()
+          [(_ m) #`(m #,(syntax-protect #'(x)))]))))
+
+  (current-code-inspector (make-inspector (current-code-inspector)))
+
+  (eval
+   '(module orig racket/base
+      (require (for-syntax racket/base
+                           'disarm)
+               'mapply)
+      (define-syntax (m stx)
+        (syntax-case stx ()
+          [(_ e) (disarm #'e)]))
+      (mapply m))))
+
 ;; ----------------------------------------
 
 (report-errs)
diff --git a/racket/src/expander/expand/main.rkt b/racket/src/expander/expand/main.rkt
index d6c1f61888..0564d02e4f 100644
--- a/racket/src/expander/expand/main.rkt
+++ b/racket/src/expander/expand/main.rkt
@@ -424,7 +424,7 @@
                    [current-namespace (namespace->namespace-at-phase
                                        (expand-context-namespace ctx)
                                        (add1 (expand-context-phase ctx)))]
-                   [current-module-code-inspector (or insp-of-t (current-module-code-inspector))])
+                   [current-module-code-inspector (or insp-of-t #;(current-module-code-inspector))])
       (call-with-continuation-barrier
        (lambda ()
          ;; Call the transformer!
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 7b5680d06f..53c2d5b319 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -39516,8 +39516,7 @@ static const char *startup_source =
 "(expand-context-namespace ctx_26)"
 "(add1(expand-context-phase ctx_26)))"
 " current-module-code-inspector"
-"(let-values(((or-part_269) insp-of-t_6))"
-"(if or-part_269 or-part_269(current-module-code-inspector))))"
+" insp-of-t_6)"
 "(let-values()"
 "(call-with-continuation-barrier"
 "(lambda()((transformer->procedure t_57) cleaned-s_1)))))))"
@@ -39538,7 +39537,7 @@ static const char *startup_source =
 " transformed-s_1)))))))))"
 "(define-values"
 "(maybe-add-use-site-scope)"
-"(lambda(s_344 ctx_27 binding_23)"
+"(lambda(s_343 ctx_27 binding_23)"
 "(begin"
 "(if(if(root-expand-context-use-site-scopes ctx_27)"
 "(matching-frame?(root-expand-context-frame-id ctx_27)(binding-frame-id binding_23))"
@@ -39546,24 +39545,24 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((sc_31)(new-scope 'use-site)))"
 "(let-values(((b_79)(root-expand-context-use-site-scopes ctx_27)))"
-"(begin(set-box! b_79(cons sc_31(unbox b_79)))(values(add-scope s_344 sc_31)(list sc_31))))))"
-"(let-values()(values s_344 null))))))"
+"(begin(set-box! b_79(cons sc_31(unbox b_79)))(values(add-scope s_343 sc_31)(list sc_31))))))"
+"(let-values()(values s_343 null))))))"
 "(define-values"
 "(matching-frame?)"
 "(lambda(current-frame-id_0 bind-frame-id_0)"
 "(begin"
 "(if current-frame-id_0"
-"(let-values(((or-part_270)(eq? current-frame-id_0 bind-frame-id_0)))"
-"(if or-part_270 or-part_270(eq? current-frame-id_0 'all)))"
+"(let-values(((or-part_269)(eq? current-frame-id_0 bind-frame-id_0)))"
+"(if or-part_269 or-part_269(eq? current-frame-id_0 'all)))"
 " #f))))"
 "(define-values"
 "(maybe-add-post-expansion-scope)"
-"(lambda(s_241 ctx_28)"
+"(lambda(s_240 ctx_28)"
 "(begin"
 "(if(root-expand-context-post-expansion-scope ctx_28)"
 "(let-values()"
-"((expand-context-post-expansion-scope-action ctx_28) s_241(root-expand-context-post-expansion-scope ctx_28)))"
-"(let-values() s_241)))))"
+"((expand-context-post-expansion-scope-action ctx_28) s_240(root-expand-context-post-expansion-scope ctx_28)))"
+"(let-values() s_240)))))"
 "(define-values"
 "(accumulate-def-ctx-scopes)"
 "(lambda(ctx_29 def-ctx-scopes_3)"
@@ -39599,7 +39598,7 @@ static const char *startup_source =
 " 'lookup62"
 "(let-values(((b_80) b59_0))"
 "(let-values(((ctx_30) ctx60_0))"
-"(let-values(((id_36) id61_0))"
+"(let-values(((id_67) id61_0))"
 "(let-values(((in-s_7) in55_0))"
 "(let-values(((out-of-context-as-variable?_1) out-of-context-as-variable?56_0))"
 "(let-values()"
@@ -39608,7 +39607,7 @@ static const char *startup_source =
 "((temp209_1)(expand-context-lift-envs ctx_30))"
 "((temp210_0)(expand-context-namespace ctx_30))"
 "((temp211_0)(expand-context-phase ctx_30))"
-"((id212_0) id_36)"
+"((id212_0) id_67)"
 "((in-s213_0) in-s_7)"
 "((out-of-context-as-variable?214_0) out-of-context-as-variable?_1))"
 "(binding-lookup50.1"
@@ -39622,19 +39621,19 @@ static const char *startup_source =
 " id212_0)))))))))))"
 "(define-values"
 "(substitute-alternate-id)"
-"(lambda(s_355 alternate-id_3)"
+"(lambda(s_354 alternate-id_3)"
 "(begin"
 "(if(not alternate-id_3)"
-"(let-values() s_355)"
-"(if(syntax-identifier? s_355)"
-"(let-values()(syntax-rearm$1(syntax-track-origin$1 alternate-id_3 s_355) s_355))"
+"(let-values() s_354)"
+"(if(syntax-identifier? s_354)"
+"(let-values()(syntax-rearm$1(syntax-track-origin$1 alternate-id_3 s_354) s_354))"
 "(let-values()"
-"(let-values(((disarmed-s_4)(syntax-disarm$1 s_355)))"
+"(let-values(((disarmed-s_4)(syntax-disarm$1 s_354)))"
 "(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_355)"
-" s_355)"
-" s_355))))))))"
+"(datum->syntax$1 disarmed-s_4(cons alternate-id_3(cdr(syntax-e$1 disarmed-s_4))) s_354)"
+" s_354)"
+" s_354))))))))"
 "(define-values"
 "(register-variable-referenced-if-local!)"
 "(lambda(binding_24)"
@@ -39647,7 +39646,7 @@ static const char *startup_source =
 "(lambda(always-wrap?68_0 begin-form?66_0 expand-lifts?65_0 lift-key67_0 s73_0 ctx74_0)"
 "(begin"
 " 'expand/capture-lifts75"
-"(let-values(((s_360) s73_0))"
+"(let-values(((s_252) s73_0))"
 "(let-values(((ctx_31) ctx74_0))"
 "(let-values(((expand-lifts?_0) expand-lifts?65_0))"
 "(let-values(((begin-form?_0) begin-form?66_0))"
@@ -39697,10 +39696,10 @@ static const char *startup_source =
 "(expand-context-lift-envs"
 " ctx_32)))"
 "((module-lifts221_0)"
-"(if(let-values(((or-part_271)"
+"(if(let-values(((or-part_17)"
 " local?_0))"
-"(if or-part_271"
-" or-part_271"
+"(if or-part_17"
+" or-part_17"
 "(not"
 "(memq"
 " context_6"
@@ -39801,10 +39800,10 @@ static const char *startup_source =
 "(get-and-clear-lifts!"
 "(expand-context-lifts capture-ctx_0))))"
 "(let-values(((with-lifts-s_0)"
-"(if(let-values(((or-part_272)"
+"(if(let-values(((or-part_270)"
 "(pair? lifts_6)))"
-"(if or-part_272"
-" or-part_272"
+"(if or-part_270"
+" or-part_270"
 " always-wrap?_1))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_32)"
@@ -39839,12 +39838,12 @@ static const char *startup_source =
 " exp-s_2"
 " phase_102)))))"
 "(let-values() exp-s_2))))"
-"(if(let-values(((or-part_273)(not expand-lifts?_0)))"
-"(if or-part_273"
-" or-part_273"
-"(let-values(((or-part_274)(null? lifts_6)))"
-"(if or-part_274"
-" or-part_274"
+"(if(let-values(((or-part_271)(not expand-lifts?_0)))"
+"(if or-part_271"
+" or-part_271"
+"(let-values(((or-part_272)(null? lifts_6)))"
+"(if or-part_272"
+" or-part_272"
 "(expand-context-to-parsed? ctx_32)))))"
 "(let-values() with-lifts-s_0)"
 "(let-values()"
@@ -39861,7 +39860,7 @@ static const char *startup_source =
 "(void)))"
 "(loop_92 with-lifts-s_0 #f ctx_32)))))))))))))))"
 " loop_92)"
-" s_360"
+" s_252"
 " always-wrap?_0"
 " ctx_31))))))))))))))"
 "(define-values"
@@ -39999,7 +39998,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " rhs246_0"
 " temp247_0))))"
-"(let-values(((phase_104)(add1(expand-context-phase ctx_35))))"
+"(let-values(((phase_15)(add1(expand-context-phase ctx_35))))"
 "(let-values(((parsed-rhs_0)"
 "(if(expand-context-to-parsed? ctx_35)"
 " exp-rhs_0"
@@ -40021,8 +40020,8 @@ static const char *startup_source =
 " who_16"
 " ids_19"
 " parsed-rhs_0"
-" phase_104"
-"(namespace->namespace-at-phase(expand-context-namespace ctx_35) phase_104)"
+" phase_15"
+"(namespace->namespace-at-phase(expand-context-namespace ctx_35) phase_15)"
 " ctx_35)))))))))))))))"
 "(define-values"
 "(eval-for-syntaxes-binding)"
@@ -40034,14 +40033,14 @@ static const char *startup_source =
 " vals_3))))"
 "(define-values"
 "(eval-for-bindings)"
-"(lambda(who_18 ids_21 p_48 phase_105 ns_75 ctx_37)"
+"(lambda(who_18 ids_21 p_48 phase_104 ns_75 ctx_37)"
 "(begin"
 "(let-values(((compiled_0)"
 "(if(can-direct-eval? p_48 ns_75(root-expand-context-self-mpi ctx_37))"
 " #f"
 "(compile-single"
 " p_48"
-"(let-values(((ns255_0) ns_75)((phase256_0) phase_105))"
+"(let-values(((ns255_0) ns_75)((phase256_0) phase_104))"
 "(make-compile-context14.1 #f unsafe-undefined #f ns255_0 phase256_0 unsafe-undefined))))))"
 "(let-values(((vals_4)"
 "(call-with-values"
@@ -40100,8 +40099,8 @@ static const char *startup_source =
 "(let-values() #f)))))"
 "(if(expand-context-to-parsed? ctx_38)"
 "(let-values()"
-"(if(let-values(((or-part_275) keep-for-parsed?_0))"
-"(if or-part_275 or-part_275 keep-for-error?_0))"
+"(if(let-values(((or-part_273) keep-for-parsed?_0))"
+"(if or-part_273 or-part_273 keep-for-error?_0))"
 "(datum->syntax$1 #f keep-e_0 s_421 s_421)"
 " #f))"
 "(let-values()"
@@ -40110,18 +40109,18 @@ static const char *startup_source =
 " s_421))))))))))))))"
 "(define-values"
 "(attach-disappeared-transformer-bindings)"
-"(lambda(s_153 trans-idss_0)"
+"(lambda(s_422 trans-idss_0)"
 "(begin"
 "(if(null? trans-idss_0)"
-"(let-values() s_153)"
+"(let-values() s_422)"
 "(let-values()"
 "(syntax-property$1"
-" s_153"
+" s_422"
 " 'disappeared-binding"
 "(append"
 "(apply append trans-idss_0)"
-"(let-values(((or-part_197)(syntax-property$1 s_153 'disappeared-binding)))"
-"(if or-part_197 or-part_197 null)))))))))"
+"(let-values(((or-part_274)(syntax-property$1 s_422 'disappeared-binding)))"
+"(if or-part_274 or-part_274 null)))))))))"
 "(define-values"
 "(increment-binding-layer)"
 "(lambda(ids_22 ctx_39 layer-val_0)"
@@ -40130,12 +40129,12 @@ static const char *startup_source =
 "(lambda(ids_23)"
 "(begin"
 " 'loop"
-"(let-values(((or-part_198)(identifier? ids_23)))"
-"(if or-part_198"
-" or-part_198"
+"(let-values(((or-part_275)(identifier? ids_23)))"
+"(if or-part_275"
+" or-part_275"
 "(if(pair? ids_23)"
-"(let-values(((or-part_199)(loop_93(car ids_23))))"
-"(if or-part_199 or-part_199(loop_93(cdr ids_23))))"
+"(let-values(((or-part_198)(loop_93(car ids_23))))"
+"(if or-part_198 or-part_198(loop_93(cdr ids_23))))"
 " #f)))))))"
 " loop_93)"
 " ids_22)"
@@ -40185,7 +40184,7 @@ static const char *startup_source =
 "(if(if(pair? lst_283)"
 "(pair? lst_284)"
 " #f)"
-"(let-values(((id_67)"
+"(let-values(((id_68)"
 "(unsafe-car"
 " lst_283))"
 "((rest_160)"
@@ -40206,7 +40205,7 @@ static const char *startup_source =
 " env_5"
 " key_81"
 "(local-variable1.1"
-" id_67)))))"
+" id_68)))))"
 "(values"
 " env_6)))))"
 "(if(not #f)"
@@ -40254,14 +40253,14 @@ static const char *startup_source =
 "(let-values()(1/rename-transformer-target t_58))))))"
 "(define-values"
 "(maybe-install-free=id-in-context!)"
-"(lambda(val_69 id_68 phase_106 ctx_42)"
+"(lambda(val_69 id_69 phase_105 ctx_42)"
 "(begin"
 "(if(1/rename-transformer? val_69)"
 "(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_69 id_68 phase_106))))"
+"(let-values()(maybe-install-free=id! val_69 id_69 phase_105))))"
 "(void)))))"
 "(define-values"
 "(transfer-srcloc)"
@@ -40346,9 +40345,9 @@ static const char *startup_source =
 " #%variable-reference))"
 "(define-values"
 "(module-expand-stop-ids)"
-"(lambda(phase_107)"
+"(lambda(phase_106)"
 "(begin"
-"(let-values(((p-core-stx_1)(syntax-shift-phase-level$1 core-stx phase_107)))"
+"(let-values(((p-core-stx_1)(syntax-shift-phase-level$1 core-stx phase_106)))"
 "(reverse$1"
 "(let-values(((lst_102) module-stop-syms))"
 "(begin"
@@ -40483,7 +40482,7 @@ static const char *startup_source =
 "(begin"
 " 'syntax-local-bind-syntaxes11"
 "(let-values(((ids_25) ids8_0))"
-"(let-values(((s_422) s9_0))"
+"(let-values(((s_423) s9_0))"
 "(let-values(((intdef_0) intdef10_0))"
 "(let-values(((extra-intdefs_0) extra-intdefs7_0))"
 "(let-values()"
@@ -40499,14 +40498,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_99)(not s_422)))"
-"(if or-part_99 or-part_99(syntax?$1 s_422)))"
+"(if(let-values(((or-part_99)(not s_423)))"
+"(if or-part_99 or-part_99(syntax?$1 s_423)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-local-bind-syntaxes"
 "                                                     \"(or/c syntax? #f)\""
-" s_422)))"
+" s_423)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -40558,7 +40557,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_285)"
-"(let-values(((id_69)"
+"(let-values(((id_70)"
 "(unsafe-car"
 " lst_285))"
 "((rest_163)"
@@ -40574,7 +40573,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(((temp49_1)"
@@ -40676,11 +40675,11 @@ static const char *startup_source =
 " null"
 " lst_163))))))"
 "(let-values(((vals_5)"
-"(if s_422"
+"(if s_423"
 "(let-values()"
 "(let-values(((input-s_0)"
 "(flip-introduction-scopes"
-"(let-values(((s58_0) s_422)"
+"(let-values(((s58_0) s_423)"
 "((all-intdefs59_0)"
 " all-intdefs_0))"
 "(add-intdef-scopes24.1"
@@ -41001,7 +41000,7 @@ static const char *startup_source =
 "(begin"
 " 'internal-definition-context-introduce16"
 "(let-values(((intdef_4) intdef14_0))"
-"(let-values(((s_423) s15_0))"
+"(let-values(((s_424) s15_0))"
 "(let-values(((mode_13) mode13_0))"
 "(let-values()"
 "(begin"
@@ -41012,11 +41011,11 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                   \"internal-definition-context?\""
 " intdef_4)))"
-"(if(syntax?$1 s_423)"
+"(if(syntax?$1 s_424)"
 "(void)"
 "(let-values()"
-"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_423)))"
-"(let-values(((s65_0) s_423)"
+"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_424)))"
+"(let-values(((s65_0) s_424)"
 "((intdef66_0) intdef_4)"
 "((temp67_0) #t)"
 "((temp68_0)"
@@ -41050,13 +41049,13 @@ static const char *startup_source =
 "(void)))))"
 "(define-values"
 "(1/identifier-remove-from-definition-context)"
-"(lambda(id_70 intdef_8)"
+"(lambda(id_71 intdef_8)"
 "(begin"
 " 'identifier-remove-from-definition-context"
 "(begin"
-"(if(identifier? id_70)"
+"(if(identifier? id_71)"
 "(void)"
-"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_70)))"
+"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_71)))"
 "(if(let-values(((or-part_207)(1/internal-definition-context? intdef_8)))"
 "(if or-part_207 or-part_207(if(list? intdef_8)(andmap2 1/internal-definition-context? intdef_8) #f)))"
 "(void)"
@@ -41073,24 +41072,24 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_257)"
-"(lambda(id_71 a_46)"
+"(lambda(id_72 a_46)"
 "(begin"
 " 'for-loop"
 "(if(pair? a_46)"
 "(let-values(((intdef_9)(car a_46)))"
-"(let-values(((id_72)"
-"(let-values(((id_73) id_71))"
-"(let-values(((id_74)"
+"(let-values(((id_73)"
+"(let-values(((id_74) id_72))"
+"(let-values(((id_75)"
 "(let-values()"
 "(1/internal-definition-context-introduce"
 " intdef_9"
-" id_73"
+" id_74"
 " 'remove))))"
-"(values id_74)))))"
-"(if(not #f)(for-loop_257 id_72(cdr a_46)) id_72)))"
-" id_71)))))"
+"(values id_75)))))"
+"(if(not #f)(for-loop_257 id_73(cdr a_46)) id_73)))"
+" id_72)))))"
 " for-loop_257)"
-" id_70"
+" id_71"
 " x_77)))))))"
 "(define-values"
 "(intdefs?)"
@@ -41202,29 +41201,29 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_259)"
-"(lambda(s_424 a_50)"
+"(lambda(s_425 a_50)"
 "(begin"
 " 'for-loop"
 "(if(pair? a_50)"
 "(let-values(((intdef_11)(car a_50)))"
 "(let-values(((s_321)"
-"(let-values(((s_213) s_424))"
+"(let-values(((s_213) s_425))"
 "(if(let-values(((or-part_278) always?_0))"
 "(if or-part_278"
 " or-part_278"
 "(internal-definition-context-add-scope?"
 " intdef_11)))"
-"(let-values(((s_425) s_213))"
-"(let-values(((s_426)"
+"(let-values(((s_426) s_213))"
+"(let-values(((s_427)"
 "(let-values()"
 "(action_0"
-" s_425"
+" s_426"
 "(internal-definition-context-scope"
 " intdef_11)))))"
-"(values s_426)))"
+"(values s_427)))"
 " s_213))))"
 "(if(not #f)(for-loop_259 s_321(cdr a_50)) s_321)))"
-" s_424)))))"
+" s_425)))))"
 " for-loop_259)"
 " s_39"
 " x_81)))))))))))"
@@ -41242,7 +41241,7 @@ static const char *startup_source =
 " 'make-local-expand-context42"
 "(let-values(((ctx_45) ctx41_0))"
 "(let-values(((context_9) context27_0))"
-"(let-values(((phase_108)(if(eq? phase28_1 unsafe-undefined)(expand-context-phase ctx_45) phase28_1)))"
+"(let-values(((phase_107)(if(eq? phase28_1 unsafe-undefined)(expand-context-phase ctx_45) phase28_1)))"
 "(let-values(((intdefs_2) intdefs29_0))"
 "(let-values(((stop-ids_1) stop-ids30_0))"
 "(let-values(((to-parsed-ok?_0) to-parsed-ok?31_0))"
@@ -41255,7 +41254,7 @@ static const char *startup_source =
 " or-part_279"
 "(if(list? context_9)(list?(expand-context-context ctx_45)) #f)))))"
 "(let-values(((all-stop-ids_0)"
-"(if stop-ids_1(stop-ids->all-stop-ids stop-ids_1 phase_108) #f)))"
+"(if stop-ids_1(stop-ids->all-stop-ids stop-ids_1 phase_107) #f)))"
 "(let-values(((def-ctx-scopes_5)"
 "(if(expand-context-def-ctx-scopes ctx_45)"
 "(unbox(expand-context-def-ctx-scopes ctx_45))"
@@ -41336,10 +41335,10 @@ static const char *startup_source =
 " #f)))"
 "((post-expansion-scope-action74_0)"
 "(if(if intdefs_2(not(null? intdefs_2)) #f)"
-"(lambda(s_427 placeholder-sc_0)"
+"(lambda(s_428 placeholder-sc_0)"
 "(begin"
 " 'post-expansion-scope-action74"
-"(let-values(((s80_0) s_427)((intdefs81_0) intdefs_2))"
+"(let-values(((s80_0) s_428)((intdefs81_0) intdefs_2))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
@@ -41368,7 +41367,7 @@ static const char *startup_source =
 "((keep-#%expression?85_0) keep-#%expression?_1)"
 "((stops86_0)"
 "(free-id-set"
-" phase_108"
+" phase_107"
 "(let-values(((or-part_284) all-stop-ids_0))"
 "(if or-part_284 or-part_284 null)))))"
 "(expand-context/inner2.1"
@@ -41425,7 +41424,7 @@ static const char *startup_source =
 " the-struct_66)))))))))))))))))))"
 "(define-values"
 "(flip-introduction-scopes)"
-"(lambda(s_428 ctx_46)(begin(flip-scopes s_428(expand-context-current-introduction-scopes ctx_46)))))"
+"(lambda(s_429 ctx_46)(begin(flip-scopes s_429(expand-context-current-introduction-scopes ctx_46)))))"
 "(define-values"
 "(1/syntax-transforming?)"
 "(lambda()"
@@ -41463,39 +41462,39 @@ static const char *startup_source =
 "(expand-context-context ctx_50)))))"
 "(define-values"
 "(1/syntax-local-introduce)"
-"(lambda(s_429)"
+"(lambda(s_430)"
 "(begin"
 " 'syntax-local-introduce"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_429)"
+"(if(syntax?$1 s_430)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_429)))"
+"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_430)))"
 "(values))))"
 "(let-values(((ctx_9)"
 "(let-values(((temp61_2) 'syntax-local-introduce))"
 "(get-current-expand-context16.1 #f temp61_2))))"
-"(flip-introduction-scopes s_429 ctx_9))))))))"
+"(flip-introduction-scopes s_430 ctx_9))))))))"
 "(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_51)"
 "(let-values(((temp63_1) 'syntax-local-identifier-as-binding))"
 "(get-current-expand-context16.1 #f temp63_1))))"
-"(remove-use-site-scopes id_75 ctx_51))))))))"
+"(remove-use-site-scopes id_76 ctx_51))))))))"
 "(define-values"
 "(1/syntax-local-phase-level)"
 "(lambda()"
@@ -41512,8 +41511,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ctx_53)"
 "(let-values(((who66_0) 'syntax-local-name))(get-current-expand-context16.1 #f who66_0))))"
-"(let-values(((id_76)(expand-context-name ctx_53)))"
-"(if id_76(datum->syntax$1 #f(syntax-e$1 id_76) id_76) #f))))))))"
+"(let-values(((id_77)(expand-context-name ctx_53)))"
+"(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-introducer2_0)"
@@ -41545,20 +41544,20 @@ static const char *startup_source =
 "(lambda(s69_1 mode68_0)"
 "(begin"
 " 'core70"
-"(let-values(((s_430) s69_1))"
+"(let-values(((s_431) s69_1))"
 "(let-values(((mode_14) mode68_0))"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_430)"
+"(if(syntax?$1 s_431)"
 "(void)"
-"                                  (let-values () (raise-argument-error 'syntax-introducer \"syntax?\" s_430)))"
+"                                  (let-values () (raise-argument-error 'syntax-introducer \"syntax?\" s_431)))"
 "(let-values(((tmp_33) mode_14))"
 "(if(equal? tmp_33 'add)"
-"(let-values()(add-scope s_430 sc_33))"
+"(let-values()(add-scope s_431 sc_33))"
 "(if(equal? tmp_33 'remove)"
-"(let-values()(remove-scope s_430 sc_33))"
+"(let-values()(remove-scope s_431 sc_33))"
 "(if(equal? tmp_33 'flip)"
-"(let-values()(flip-scope s_430 sc_33))"
+"(let-values()(flip-scope s_431 sc_33))"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-introducer"
@@ -41689,16 +41688,16 @@ static const char *startup_source =
 "(begin"
 " 'do-syntax-local-value15"
 "(let-values(((who_19) who11_0))"
-"(let-values(((id_77) id12_0))"
+"(let-values(((id_78) id12_0))"
 "(let-values(((intdefs_3) intdefs13_0))"
 "(let-values(((failure-thunk_0) failure-thunk14_0))"
 "(let-values(((immediate?_1) immediate?9_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_77)"
+"(if(identifier? id_78)"
 "(void)"
-"                                    (let-values () (raise-argument-error who_19 \"identifier?\" id_77)))"
+"                                    (let-values () (raise-argument-error who_19 \"identifier?\" id_78)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -41762,7 +41761,7 @@ static const char *startup_source =
 "(let-values(((obs_34)(expand-context-observer ctx_11)))"
 "(if obs_34"
 "(let-values()"
-"(let-values()(call-expand-observe obs_34 'local-value id_77)))"
+"(let-values()(call-expand-observe obs_34 'local-value id_78)))"
 "(void)))"
 "(values))))"
 "(let-values(((phase_70)(expand-context-phase ctx_11)))"
@@ -41871,27 +41870,27 @@ static const char *startup_source =
 "(let-values()(values v_37 #f))"
 "(let-values() v_37)))))))))))))))"
 " loop_95)"
-"(flip-introduction-scopes id_77 ctx_11))))))))))))))))))"
+"(flip-introduction-scopes id_78 ctx_11))))))))))))))))))"
 "(define-values"
 "(1/syntax-local-value)"
 "(let-values(((syntax-local-value21_0)"
 "(lambda(id20_0 failure-thunk18_0 intdef19_0)"
 "(begin"
 " 'syntax-local-value21"
-"(let-values(((id_78) id20_0))"
+"(let-values(((id_79) id20_0))"
 "(let-values(((failure-thunk_1) failure-thunk18_0))"
 "(let-values(((intdef_13) intdef19_0))"
 "(let-values()"
 "(let-values(((temp91_0) 'syntax-local-value)"
 "((temp92_1) #f)"
-"((id93_1) id_78)"
+"((id93_1) id_79)"
 "((intdef94_0) intdef_13)"
 "((failure-thunk95_0) failure-thunk_1))"
 "(do-syntax-local-value15.1 temp92_1 temp91_0 id93_1 intdef94_0 failure-thunk95_0))))))))))"
 "(case-lambda"
-"((id_79)(begin 'syntax-local-value(syntax-local-value21_0 id_79 #f #f)))"
+"((id_80)(begin 'syntax-local-value(syntax-local-value21_0 id_80 #f #f)))"
 "((id_62 failure-thunk_2 intdef19_1)(syntax-local-value21_0 id_62 failure-thunk_2 intdef19_1))"
-"((id_80 failure-thunk18_1)(syntax-local-value21_0 id_80 failure-thunk18_1 #f)))))"
+"((id_81 failure-thunk18_1)(syntax-local-value21_0 id_81 failure-thunk18_1 #f)))))"
 "(define-values"
 "(1/syntax-local-value/immediate)"
 "(let-values(((syntax-local-value/immediate26_0)"
@@ -41914,9 +41913,9 @@ static const char *startup_source =
 " intdef99_0"
 " failure-thunk100_0))))))))))"
 "(case-lambda"
-"((id_81)(begin 'syntax-local-value/immediate(syntax-local-value/immediate26_0 id_81 #f #f)))"
-"((id_82 failure-thunk_4 intdef24_1)(syntax-local-value/immediate26_0 id_82 failure-thunk_4 intdef24_1))"
-"((id_83 failure-thunk23_1)(syntax-local-value/immediate26_0 id_83 failure-thunk23_1 #f)))))"
+"((id_82)(begin 'syntax-local-value/immediate(syntax-local-value/immediate26_0 id_82 #f #f)))"
+"((id_83 failure-thunk_4 intdef24_1)(syntax-local-value/immediate26_0 id_83 failure-thunk_4 intdef24_1))"
+"((id_84 failure-thunk23_1)(syntax-local-value/immediate26_0 id_84 failure-thunk23_1 #f)))))"
 "(define-values"
 "(do-lift-values-expression)"
 "(lambda(who_20 n_29 s_34)"
@@ -41992,7 +41991,7 @@ static const char *startup_source =
 "(let-values()(let-values()(call-expand-observe obs_39 'lift-expr ids_28 s_34)))"
 "(void)))"
 "(map2"
-"(lambda(id_84)(flip-introduction-scopes id_84 ctx_54))"
+"(lambda(id_85)(flip-introduction-scopes id_85 ctx_54))"
 "(add-lifted!"
 " lifts_8"
 " ids_28"
@@ -42075,7 +42074,7 @@ static const char *startup_source =
 "(begin"
 " 'do-local-lift-to-module48"
 "(let-values(((who_21) who46_0))"
-"(let-values(((s_431) s47_0))"
+"(let-values(((s_432) s47_0))"
 "(let-values(((no-target-msg_0) no-target-msg28_0))"
 "(let-values(((intro?_0) intro?29_0))"
 "(let-values(((more-checks_0)(if(eq? more-checks30_0 unsafe-undefined) void more-checks30_0)))"
@@ -42084,11 +42083,11 @@ static const char *startup_source =
 "(let-values(((get-wrt-phase_0) get-wrt-phase33_0))"
 "(let-values(((pre-wrap_0)"
 "(if(eq? pre-wrap34_0 unsafe-undefined)"
-"(lambda(s_432 phase_109 lift-ctx_1)(begin 'pre-wrap s_432))"
+"(lambda(s_433 phase_108 lift-ctx_1)(begin 'pre-wrap s_433))"
 " pre-wrap34_0)))"
 "(let-values(((shift-wrap_0)"
 "(if(eq? shift-wrap35_0 unsafe-undefined)"
-"(lambda(s_209 phase_110 lift-ctx_2)(begin 'shift-wrap s_209))"
+"(lambda(s_209 phase_109 lift-ctx_2)(begin 'shift-wrap s_209))"
 " shift-wrap35_0)))"
 "(let-values(((post-wrap_0)"
 "(if(eq? post-wrap36_0 unsafe-undefined)"
@@ -42097,9 +42096,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_431)"
+"(if(syntax?$1 s_432)"
 "(void)"
-"                                                (let-values () (raise-argument-error who_21 \"syntax?\" s_431)))"
+"                                                (let-values () (raise-argument-error who_21 \"syntax?\" s_432)))"
 "(values))))"
 "(let-values((()(begin(more-checks_0)(values))))"
 "(let-values(((ctx_57)"
@@ -42115,15 +42114,15 @@ static const char *startup_source =
 " who_21"
 " no-target-msg_0"
 "                                                           \"form to lift\""
-" s_431)))"
+" s_432)))"
 "(values))))"
-"(let-values(((phase_111)(expand-context-phase ctx_57)))"
+"(let-values(((phase_110)(expand-context-phase ctx_57)))"
 "(let-values(((wrt-phase_1)(get-wrt-phase_0 lift-ctx_4)))"
 "(let-values(((added-s_0)"
-"(if intro?_0(flip-introduction-scopes s_431 ctx_57) s_431)))"
-"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_111 lift-ctx_4)))"
+"(if intro?_0(flip-introduction-scopes s_432 ctx_57) s_432)))"
+"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_110 lift-ctx_4)))"
 "(let-values(((shift-s_0)"
-"(let-values(((start_40) phase_111)"
+"(let-values(((start_40) phase_110)"
 "((end_30) wrt-phase_1)"
 "((inc_24) -1))"
 "(begin"
@@ -42133,30 +42132,30 @@ static const char *startup_source =
 "(let-values()"
 "(check-range start_40 end_30 inc_24)))"
 "((letrec-values(((for-loop_128)"
-"(lambda(s_433 pos_107)"
+"(lambda(s_434 pos_107)"
 "(begin"
 " 'for-loop"
 "(if(> pos_107 end_30)"
-"(let-values(((phase_112)"
+"(let-values(((phase_111)"
 " pos_107))"
 "(let-values(((s_319)"
-"(let-values(((s_424)"
-" s_433))"
-"(let-values(((s_434)"
+"(let-values(((s_425)"
+" s_434))"
+"(let-values(((s_435)"
 "(let-values()"
 "(shift-wrap_0"
-" s_424"
+" s_425"
 "(sub1"
-" phase_112)"
+" phase_111)"
 " lift-ctx_4))))"
 "(values"
-" s_434)))))"
+" s_435)))))"
 "(if(not #f)"
 "(for-loop_128"
 " s_319"
 "(+ pos_107 inc_24))"
 " s_319)))"
-" s_433)))))"
+" s_434)))))"
 " for-loop_128)"
 " pre-s_0"
 " start_40)))))"
@@ -42188,11 +42187,11 @@ static const char *startup_source =
 "((require-lift-context-wrt-phase116_0) require-lift-context-wrt-phase)"
 "((add-lifted-require!117_0) add-lifted-require!)"
 "((temp118_0)"
-"(lambda(s_109 phase_113 require-lift-ctx_0)"
+"(lambda(s_109 phase_112 require-lift-ctx_0)"
 "(require-spec-shift-for-syntax s_109)))"
 "((temp119_0)"
-"(lambda(s_435 phase_114 require-lift-ctx_1)"
-"(wrap-form '#%require(add-scope s_435 sc_34) phase_114))))"
+"(lambda(s_436 phase_113 require-lift-ctx_1)"
+"(wrap-form '#%require(add-scope s_436 sc_34) phase_113))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-require!117_0"
 " expand-context-require-lifts115_0"
@@ -42221,23 +42220,23 @@ static const char *startup_source =
 " result-s_6))))))))))"
 "(define-values"
 "(1/syntax-local-lift-provide)"
-"(lambda(s_436)"
+"(lambda(s_437)"
 "(begin"
 " 'syntax-local-lift-provide"
 "(let-values()"
 "(let-values()"
 "(let-values(((ctx_59 result-s_7)"
 "(let-values(((who121_0) 'syntax-local-lift-provide)"
-"((s122_1) s_436)"
+"((s122_1) s_437)"
 "                                     ((temp123_0) \"not expanding in a module run-time body\")"
 "((expand-context-to-module-lifts124_0) expand-context-to-module-lifts)"
 "((to-module-lift-context-wrt-phase125_0) to-module-lift-context-wrt-phase)"
 "((add-lifted-to-module-provide!126_0) add-lifted-to-module-provide!)"
 "((temp127_2)"
-"(lambda(s_437 phase_115 to-module-lift-ctx_0)(wrap-form 'for-syntax s_437 #f)))"
+"(lambda(s_438 phase_114 to-module-lift-ctx_0)(wrap-form 'for-syntax s_438 #f)))"
 "((temp128_2)"
-"(lambda(s_115 phase_116 to-module-lift-ctx_1)"
-"(wrap-form '#%provide s_115 phase_116))))"
+"(lambda(s_115 phase_115 to-module-lift-ctx_1)"
+"(wrap-form '#%provide s_115 phase_115))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-to-module-provide!126_0"
 " expand-context-to-module-lifts124_0"
@@ -42270,13 +42269,13 @@ static const char *startup_source =
 "((temp134_1)(lambda(lift-ctx_5) 0))"
 "((add-lifted-to-module-end!135_0) add-lifted-to-module-end!)"
 "((temp136_0)"
-"(lambda(orig-s_32 phase_117 to-module-lift-ctx_2)"
+"(lambda(orig-s_32 phase_116 to-module-lift-ctx_2)"
 "(if(to-module-lift-context-end-as-expressions? to-module-lift-ctx_2)"
-"(wrap-form '#%expression orig-s_32 phase_117)"
+"(wrap-form '#%expression orig-s_32 phase_116)"
 " orig-s_32)))"
 "((temp137_1)"
-"(lambda(s_438 phase_118 to-module-lift-ctx_3)"
-"(wrap-form 'begin-for-syntax s_438 phase_118))))"
+"(lambda(s_439 phase_117 to-module-lift-ctx_3)"
+"(wrap-form 'begin-for-syntax s_439 phase_117))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-to-module-end!135_0"
 " expand-context-to-module-lifts133_0"
@@ -42295,11 +42294,11 @@ static const char *startup_source =
 "(void)))))))))"
 "(define-values"
 "(wrap-form)"
-"(lambda(sym_72 s_123 phase_119)"
+"(lambda(sym_72 s_123 phase_118)"
 "(begin"
 "(datum->syntax$1"
 " #f"
-"(list(datum->syntax$1(if phase_119(syntax-shift-phase-level$1 core-stx phase_119) #f) sym_72) s_123)))))"
+"(list(datum->syntax$1(if phase_118(syntax-shift-phase-level$1 core-stx phase_118) #f) sym_72) s_123)))))"
 "(define-values"
 "(1/syntax-local-module-defined-identifiers)"
 "(lambda()"
@@ -42380,7 +42379,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_166"
-"(let-values(((phase_120 ids_29)"
+"(let-values(((phase_119 ids_29)"
 "(hash-iterate-key+value ht_131 i_166)))"
 "(let-values(((fold-var_203)"
 "(let-values(((fold-var_255) fold-var_254))"
@@ -42388,7 +42387,7 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(cons phase_120 ids_29))"
+"(cons phase_119 ids_29))"
 " fold-var_255))))"
 "(values fold-var_256)))))"
 "(if(not #f)"
@@ -42479,7 +42478,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_167"
-"(let-values(((phase_121 syms_20)"
+"(let-values(((phase_120 syms_20)"
 "(hash-iterate-key+value ht_136 i_167)))"
 "(let-values(((fold-var_258)"
 "(let-values(((fold-var_259) fold-var_257))"
@@ -42488,7 +42487,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_121"
+" phase_120"
 "(reverse$1"
 "(let-values(((ht_137)"
 " syms_20))"
@@ -42589,29 +42588,29 @@ static const char *startup_source =
 "(lambda(id52_1 only-generated?51_0)"
 "(begin"
 " 'syntax-local-get-shadower53"
-"(let-values(((id_85) id52_1))"
+"(let-values(((id_86) id52_1))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_85)"
+"(if(identifier? id_86)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-local-get-shadower"
 "                                                   \"identifier?\""
-" id_85)))"
+" id_86)))"
 "(values))))"
 "(let-values(((ctx_65)"
 "(let-values(((who147_0) 'syntax-local-get-shadower))"
 "(get-current-expand-context16.1 #f who147_0))))"
-"(let-values(((new-id_0)(add-scopes id_85(expand-context-scopes ctx_65))))"
-"(if(syntax-clean? id_85) new-id_0(syntax-taint$1 new-id_0))))))))))))))"
+"(let-values(((new-id_0)(add-scopes id_86(expand-context-scopes ctx_65))))"
+"(if(syntax-clean? id_86) new-id_0(syntax-taint$1 new-id_0))))))))))))))"
 "(case-lambda"
-"((id_86)(begin 'syntax-local-get-shadower(syntax-local-get-shadower53_0 id_86 #f)))"
-"((id_87 only-generated?51_1)(syntax-local-get-shadower53_0 id_87 only-generated?51_1)))))"
+"((id_87)(begin 'syntax-local-get-shadower(syntax-local-get-shadower53_0 id_87 #f)))"
+"((id_88 only-generated?51_1)(syntax-local-get-shadower53_0 id_88 only-generated?51_1)))))"
 "(define-values"
 "(syntax-source-accessor)"
 "(lambda(who_0 srcloc-accessor_0)"
@@ -42719,7 +42718,7 @@ static const char *startup_source =
 "(begin"
 " 'datum->syntax6"
 "(let-values(((stx-c_4) stx-c4_1))"
-"(let-values(((s_439) s5_2))"
+"(let-values(((s_440) s5_2))"
 "(let-values(((stx-l_2) stx-l1_0))"
 "(let-values(((stx-p_1) stx-p2_0))"
 "(let-values()"
@@ -42757,22 +42756,22 @@ static const char *startup_source =
 "(if or-part_292 or-part_292(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_439(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
+"(datum->syntax$1 stx-c_4 s_440(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
 "(case-lambda"
 "((stx-c_5 s_77)(begin 'datum->syntax(datum->syntax6_1 stx-c_5 s_77 #f #f #f)))"
 "((stx-c_6 s_4 stx-l_3 stx-p_2 ignored3_1)(datum->syntax6_1 stx-c_6 s_4 stx-l_3 stx-p_2 ignored3_1))"
-"((stx-c_7 s_440 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_440 stx-l_4 stx-p2_1 #f))"
+"((stx-c_7 s_441 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_441 stx-l_4 stx-p2_1 #f))"
 "((stx-c_8 s_181 stx-l1_1)(datum->syntax6_1 stx-c_8 s_181 stx-l1_1 #f #f)))))"
 "(define-values"
 "(1/syntax->list)"
-"(lambda(s_441)"
+"(lambda(s_442)"
 "(begin"
 " 'syntax->list"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_441) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_441)))"
-"(syntax->list$1 s_441)))))))"
+"            (if (syntax?$1 s_442) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_442)))"
+"(syntax->list$1 s_442)))))))"
 "(define-values"
 "(1/syntax-original?)"
 "(lambda(s_167)"
@@ -42791,7 +42790,7 @@ static const char *startup_source =
 " 'bound-identifier=?11"
 "(let-values(((a_53) a9_0))"
 "(let-values(((b_82) b10_0))"
-"(let-values(((phase_122)"
+"(let-values(((phase_121)"
 "(if(eq? phase8_0 unsafe-undefined)(1/syntax-local-phase-level) phase8_0)))"
 "(let-values()"
 "(let-values()"
@@ -42803,10 +42802,10 @@ static const char *startup_source =
 "(if(identifier? b_82)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'bound-identifier=? \"identifier?\" b_82)))"
-"(if(phase? phase_122)"
+"(if(phase? phase_121)"
 "(void)"
-"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_122)))"
-"(bound-identifier=?$1 a_53 b_82 phase_122))))))))))))"
+"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_121)))"
+"(bound-identifier=?$1 a_53 b_82 phase_121))))))))))))"
 "(case-lambda"
 "((a_54 b_83)(begin 'bound-identifier=?(bound-identifier=?11_0 a_54 b_83 unsafe-undefined)))"
 "((a_55 b_84 phase8_1)(bound-identifier=?11_0 a_55 b_84 phase8_1)))))"
@@ -42861,8 +42860,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-transformer-identifier=? \"identifier?\" b_88)))"
 "(values))))"
-"(let-values(((phase_123)(add1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_60 b_88 phase_123 phase_123)))))))))"
+"(let-values(((phase_122)(add1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_60 b_88 phase_122 phase_122)))))))))"
 "(define-values"
 "(1/free-template-identifier=?)"
 "(lambda(a_61 b_89)"
@@ -42882,8 +42881,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-template-identifier=? \"identifier?\" b_89)))"
 "(values))))"
-"(let-values(((phase_124)(sub1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_61 b_89 phase_124 phase_124)))))))))"
+"(let-values(((phase_123)(sub1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_61 b_89 phase_123 phase_123)))))))))"
 "(define-values"
 "(1/free-label-identifier=?)"
 "(lambda(a_62 b_90)"
@@ -42905,110 +42904,110 @@ static const char *startup_source =
 "(lambda(id21_0 phase19_0 top-level-symbol?20_0)"
 "(begin"
 " 'identifier-binding22"
-"(let-values(((id_88) id21_0))"
-"(let-values(((phase_125)"
+"(let-values(((id_89) id21_0))"
+"(let-values(((phase_124)"
 "(if(eq? phase19_0 unsafe-undefined)(1/syntax-local-phase-level) phase19_0)))"
 "(let-values(((top-level-symbol?_1) top-level-symbol?20_0))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_88)"
+"(if(identifier? id_89)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'identifier-binding \"identifier?\" id_88)))"
-"(if(phase? phase_125)"
+"                                    (let-values () (raise-argument-error 'identifier-binding \"identifier?\" id_89)))"
+"(if(phase? phase_124)"
 "(void)"
-"(let-values()(raise-argument-error 'identifier-binding phase?-string phase_125)))"
-"(identifier-binding$1 id_88 phase_125 top-level-symbol?_1))))))))))))"
+"(let-values()(raise-argument-error 'identifier-binding phase?-string phase_124)))"
+"(identifier-binding$1 id_89 phase_124 top-level-symbol?_1))))))))))))"
 "(case-lambda"
-"((id_89)(begin 'identifier-binding(identifier-binding22_0 id_89 unsafe-undefined #f)))"
+"((id_90)(begin 'identifier-binding(identifier-binding22_0 id_90 unsafe-undefined #f)))"
 "((id_15 phase_83 top-level-symbol?20_1)(identifier-binding22_0 id_15 phase_83 top-level-symbol?20_1))"
-"((id_90 phase19_1)(identifier-binding22_0 id_90 phase19_1 #f)))))"
+"((id_91 phase19_1)(identifier-binding22_0 id_91 phase19_1 #f)))))"
 "(define-values"
 "(1/identifier-transformer-binding)"
 "(let-values(((identifier-transformer-binding26_0)"
 "(lambda(id25_3 phase24_1)"
 "(begin"
 " 'identifier-transformer-binding26"
-"(let-values(((id_91) id25_3))"
-"(let-values(((phase_126)"
+"(let-values(((id_92) id25_3))"
+"(let-values(((phase_125)"
 "(if(eq? phase24_1 unsafe-undefined)(1/syntax-local-phase-level) phase24_1)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_91)"
+"(if(identifier? id_92)"
 "(void)"
 "(let-values()"
-"                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_91)))"
-"(identifier-binding$1 id_91(if phase_126(add1 phase_126) #f))))))))))))"
+"                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_92)))"
+"(identifier-binding$1 id_92(if phase_125(add1 phase_125) #f))))))))))))"
 "(case-lambda"
-"((id_92)(begin 'identifier-transformer-binding(identifier-transformer-binding26_0 id_92 unsafe-undefined)))"
+"((id_93)(begin 'identifier-transformer-binding(identifier-transformer-binding26_0 id_93 unsafe-undefined)))"
 "((id_58 phase24_2)(identifier-transformer-binding26_0 id_58 phase24_2)))))"
 "(define-values"
 "(1/identifier-template-binding)"
-"(lambda(id_93)"
+"(lambda(id_94)"
 "(begin"
 " 'identifier-template-binding"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_93)"
+"(if(identifier? id_94)"
 "(void)"
-"              (let-values () (raise-argument-error 'identifier-template-binding \"identifier?\" id_93)))"
-"(identifier-binding$1 id_93(sub1(1/syntax-local-phase-level)))))))))"
+"              (let-values () (raise-argument-error 'identifier-template-binding \"identifier?\" id_94)))"
+"(identifier-binding$1 id_94(sub1(1/syntax-local-phase-level)))))))))"
 "(define-values"
 "(1/identifier-label-binding)"
-"(lambda(id_77)"
+"(lambda(id_78)"
 "(begin"
 " 'identifier-label-binding"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_77)"
+"(if(identifier? id_78)"
 "(void)"
-"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_77)))"
-"(identifier-binding$1 id_77 #f)))))))"
+"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_78)))"
+"(identifier-binding$1 id_78 #f)))))))"
 "(define-values"
 "(1/identifier-binding-symbol)"
 "(let-values(((identifier-binding-symbol30_0)"
 "(lambda(id29_1 phase28_2)"
 "(begin"
 " 'identifier-binding-symbol30"
-"(let-values(((id_94) id29_1))"
+"(let-values(((id_95) id29_1))"
 "(let-values(((phase_70)"
 "(if(eq? phase28_2 unsafe-undefined)(1/syntax-local-phase-level) phase28_2)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_94)"
+"(if(identifier? id_95)"
 "(void)"
-"                                  (let-values () (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_94)))"
+"                                  (let-values () (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_95)))"
 "(if(phase? phase_70)"
 "(void)"
 "(let-values()"
 "(raise-argument-error 'identifier-binding-symbol phase?-string phase_70)))"
-"(identifier-binding-symbol$1 id_94 phase_70)))))))))))"
+"(identifier-binding-symbol$1 id_95 phase_70)))))))))))"
 "(case-lambda"
-"((id_95)(begin 'identifier-binding-symbol(identifier-binding-symbol30_0 id_95 unsafe-undefined)))"
-"((id_96 phase28_3)(identifier-binding-symbol30_0 id_96 phase28_3)))))"
+"((id_96)(begin 'identifier-binding-symbol(identifier-binding-symbol30_0 id_96 unsafe-undefined)))"
+"((id_97 phase28_3)(identifier-binding-symbol30_0 id_97 phase28_3)))))"
 "(define-values"
 "(1/identifier-prune-lexical-context)"
 "(let-values(((identifier-prune-lexical-context34_0)"
 "(lambda(id33_1 syms32_1)"
 "(begin"
 " 'identifier-prune-lexical-context34"
-"(let-values(((id_97) id33_1))"
+"(let-values(((id_98) id33_1))"
 "(let-values(((syms_21) syms32_1))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_97)"
+"(if(identifier? id_98)"
 "(void)"
 "(let-values()"
-"                                    (raise-argument-error 'identifier-prune-lexical-context \"identifier?\" id_97)))"
+"                                    (raise-argument-error 'identifier-prune-lexical-context \"identifier?\" id_98)))"
 "(if(if(list? syms_21)(andmap2 symbol? syms_21) #f)"
 "(void)"
 "(let-values()"
@@ -43016,10 +43015,10 @@ static const char *startup_source =
 " 'identifier-prune-lexical-context"
 "                                     \"(listof symbol?)\""
 " syms_21)))"
-" id_97))))))))))"
+" id_98))))))))))"
 "(case-lambda"
 "((id_61)(begin 'identifier-prune-lexical-context(identifier-prune-lexical-context34_0 id_61 null)))"
-"((id_98 syms32_2)(identifier-prune-lexical-context34_0 id_98 syms32_2)))))"
+"((id_99 syms32_2)(identifier-prune-lexical-context34_0 id_99 syms32_2)))))"
 "(define-values"
 "(1/syntax-debug-info)"
 "(let-values(((syntax-debug-info39_0)"
@@ -43043,26 +43042,26 @@ static const char *startup_source =
 "(syntax-debug-info$1 s_412 phase_75 all-bindings?_1))))))))))))"
 "(case-lambda"
 "((s_85)(begin 'syntax-debug-info(syntax-debug-info39_0 s_85 unsafe-undefined #f)))"
-"((s_442 phase_127 all-bindings?37_1)(syntax-debug-info39_0 s_442 phase_127 all-bindings?37_1))"
+"((s_443 phase_126 all-bindings?37_1)(syntax-debug-info39_0 s_443 phase_126 all-bindings?37_1))"
 "((s_29 phase36_1)(syntax-debug-info39_0 s_29 phase36_1 #f)))))"
 "(define-values"
 "(1/syntax-shift-phase-level)"
-"(lambda(s_443 phase_128)"
+"(lambda(s_444 phase_127)"
 "(begin"
 " 'syntax-shift-phase-level"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_443)"
+"(if(syntax?$1 s_444)"
 "(void)"
-"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_443)))"
-"(if(phase? phase_128)"
+"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_444)))"
+"(if(phase? phase_127)"
 "(void)"
-"(let-values()(raise-argument-error 'syntax-shift-phase-level phase?-string phase_128)))"
-"(syntax-shift-phase-level$1 s_443 phase_128)))))))"
+"(let-values()(raise-argument-error 'syntax-shift-phase-level phase?-string phase_127)))"
+"(syntax-shift-phase-level$1 s_444 phase_127)))))))"
 "(define-values"
 "(1/syntax-track-origin)"
-"(lambda(new-stx_8 old-stx_4 id_99)"
+"(lambda(new-stx_8 old-stx_4 id_100)"
 "(begin"
 " 'syntax-track-origin"
 "(let-values()"
@@ -43081,11 +43080,11 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_99)"
+"(if(identifier? id_100)"
 "(void)"
-"                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_99)))"
+"                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_100)))"
 "(values))))"
-"(let-values(((s_444)(syntax-track-origin$1 new-stx_8 old-stx_4 id_99)))"
+"(let-values(((s_445)(syntax-track-origin$1 new-stx_8 old-stx_4 id_100)))"
 "(let-values(((ctx_66)"
 "(let-values(((temp60_4) #t))(get-current-expand-context16.1 temp60_4 'unexpected))))"
 "(begin"
@@ -43093,10 +43092,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((obs_44)(expand-context-observer ctx_66)))"
 "(if obs_44"
-"(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_444)))"
+"(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_445)))"
 "(void))))"
 "(void))"
-" s_444)))))))))))"
+" s_445)))))))))))"
 "(define-values"
 "(1/namespace-attach-module)"
 "(let-values(((namespace-attach-module4_0)"
@@ -43191,17 +43190,17 @@ static const char *startup_source =
 "(void)"
 "                                        (let-values () (raise-argument-error who_22 \"namespace?\" dest-namespace_2)))"
 "(values))))"
-"(let-values(((phase_129)(namespace-phase src-namespace_6)))"
+"(let-values(((phase_128)(namespace-phase src-namespace_6)))"
 "(let-values((()"
 "(begin"
-"(if(eqv? phase_129(namespace-phase dest-namespace_2))"
+"(if(eqv? phase_128(namespace-phase dest-namespace_2))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " who_22"
 "                                               \"source and destination namespace phases do not match\""
 "                                               \"source phase\""
-" phase_129"
+" phase_128"
 "                                               \"destination phase\""
 "(namespace-phase dest-namespace_2))))"
 "(values))))"
@@ -43211,7 +43210,7 @@ static const char *startup_source =
 "(begin"
 "((letrec-values(((loop_96)"
 "(lambda(mpi_46"
-" phase_130"
+" phase_129"
 " attach-instances?_1"
 " attach-phase_0)"
 "(begin"
@@ -43230,7 +43229,7 @@ static const char *startup_source =
 " mpi_46)))))"
 "(let-values(((attach-this-instance?_0)"
 "(if attach-instances?_1"
-"(eqv? phase_130 attach-phase_0)"
+"(eqv? phase_129 attach-phase_0)"
 " #f)))"
 "(let-values(((m-ns_12)"
 "(hash-ref"
@@ -43238,7 +43237,7 @@ static const char *startup_source =
 " todo_0"
 " mod-name_19"
 " '#hasheqv())"
-" phase_130"
+" phase_129"
 " missing_0)))"
 "(if(let-values(((or-part_164)"
 "(eq? missing_0 m-ns_12)))"
@@ -43264,9 +43263,9 @@ static const char *startup_source =
 "(if(if(module-cross-phase-persistent?"
 " m_20)"
 "(if(not"
-"(label-phase? phase_130))"
+"(label-phase? phase_129))"
 "(not"
-"(zero-phase? phase_130))"
+"(zero-phase? phase_129))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -43311,7 +43310,7 @@ static const char *startup_source =
 "((mod-name31_0)"
 " mod-name_19)"
 "((phase32_1)"
-" phase_130))"
+" phase_129))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43337,7 +43336,7 @@ static const char *startup_source =
 "((mod-name34_0)"
 " mod-name_19)"
 "((phase35_1)"
-" phase_130))"
+" phase_129))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43373,14 +43372,14 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(if(if(label-phase?"
-" phase_130)"
+" phase_129)"
 "(not"
 "(let-values(((src-namespace36_0)"
 " src-namespace_6)"
 "((mod-name37_0)"
 " mod-name_19)"
 "((phase38_0)"
-" phase_130))"
+" phase_129))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43404,7 +43403,7 @@ static const char *startup_source =
 "((mpi40_0)"
 " mpi_46)"
 "((phase41_1)"
-" phase_130))"
+" phase_129))"
 "(namespace-module-instantiate!96.1"
 " #t"
 " unsafe-undefined"
@@ -43426,7 +43425,7 @@ static const char *startup_source =
 "(lambda(ht_139)"
 "(hash-set"
 " ht_139"
-" phase_130"
+" phase_129"
 " m-ns_13))"
 " '#hasheqv())"
 "(if already?_0"
@@ -43491,7 +43490,7 @@ static const char *startup_source =
 " m_20)"
 " mpi_46)"
 "(phase+"
-" phase_130"
+" phase_129"
 "(car"
 " phase+reqs_1))"
 " attach-instances?_1"
@@ -43583,9 +43582,9 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_16)"
 " mod-path_16)"
 " #f)"
-" phase_129"
+" phase_128"
 " attach-instances?_0"
-" phase_129)"
+" phase_128)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -43618,7 +43617,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_46"
-"(let-values(((phase_131"
+"(let-values(((phase_130"
 " m-ns_15)"
 "(hash-iterate-key+value"
 " ht_141"
@@ -43663,14 +43662,14 @@ static const char *startup_source =
 "(namespace-record-module-instance-attached!"
 " src-namespace_6"
 " mod-name_20"
-" phase_131)"
+" phase_130)"
 "(let-values(((or-part_25)"
 "(let-values(((dest-namespace45_0)"
 " dest-namespace_2)"
 "((mod-name46_0)"
 " mod-name_20)"
 "((phase47_2)"
-" phase_131))"
+" phase_130))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43683,7 +43682,7 @@ static const char *startup_source =
 "(namespace-install-module-namespace!"
 " dest-namespace_2"
 " mod-name_20"
-" phase_131"
+" phase_130"
 " m_21"
 " m-ns_15)))))"
 "(void)))))"
@@ -43839,12 +43838,12 @@ static const char *startup_source =
 " null"
 "(unsafe-immutable-hash-iterate-first ht_143)))))))"
 "(let-values(((add-ns-scopes_0)"
-"(lambda(s_429)"
+"(lambda(s_430)"
 "(begin"
 " 'add-ns-scopes"
 "(let-values(((temp64_2)"
 "(add-scopes"
-"(push-scope s_429 post-scope_1)"
+"(push-scope s_430 post-scope_1)"
 " other-namespace-scopes_0))"
 "((temp65_1)"
 "(root-expand-context-all-scopes-stx root-ctx_5))"
@@ -43882,7 +43881,7 @@ static const char *startup_source =
 "(let-values()(add-ns-scopes_0 s_2)))))))))))))))))))"
 "(case-lambda"
 "((s_78)(begin 'namespace-syntax-introduce(namespace-syntax-introduce3_0 s_78 unsafe-undefined)))"
-"((s_445 ns1_2)(namespace-syntax-introduce3_0 s_445 ns1_2)))))"
+"((s_446 ns1_2)(namespace-syntax-introduce3_0 s_446 ns1_2)))))"
 "(define-values"
 "(namespace-datum-introduce)"
 "(lambda(s_181)(begin(1/namespace-syntax-introduce(1/datum->syntax #f s_181)))))"
@@ -44160,10 +44159,10 @@ static const char *startup_source =
 "(let-values(((var-ns_0 var-phase-level_0 var-sym_6)"
 "(if use-mapping?_0"
 "(let-values()"
-"(let-values(((id_100)(1/datum->syntax #f sym_74)))"
+"(let-values(((id_101)(1/datum->syntax #f sym_74)))"
 "(let-values(((b_14)"
 "(resolve+shift/extra-inspector"
-"(1/namespace-syntax-introduce id_100 ns_11)"
+"(1/namespace-syntax-introduce id_101 ns_11)"
 "(namespace-phase ns_11)"
 " ns_11)))"
 "(let-values((()"
@@ -44186,7 +44185,7 @@ static const char *startup_source =
 "((ns119_0) ns_11)"
 "((temp120_0)"
 "(namespace-phase ns_11))"
-"((id121_0) id_100))"
+"((id121_0) id_101))"
 "(binding-lookup50.1"
 " #f"
 " #f"
@@ -44225,7 +44224,7 @@ static const char *startup_source =
 " b_14"
 " ns_11"
 "(namespace-phase ns_11)"
-" id_100)))"
+" id_101)))"
 "(module-binding-phase b_14)"
 "(module-binding-sym b_14))"
 "(values"
@@ -44298,8 +44297,8 @@ static const char *startup_source =
 "(namespace-phase ns_82)"
 " sym_79)"
 "(values))))"
-"(let-values(((id_101)(1/datum->syntax #f sym_79)))"
-"(let-values(((temp123_1)(1/namespace-syntax-introduce id_101 ns_82))"
+"(let-values(((id_102)(1/datum->syntax #f sym_79)))"
+"(let-values(((temp123_1)(1/namespace-syntax-introduce id_102 ns_82))"
 "((temp124_0)"
 "(let-values(((temp126_0)(namespace-mpi ns_82))"
 "((temp127_3)(namespace-phase ns_82))"
@@ -44397,29 +44396,29 @@ static const char *startup_source =
 "(lambda(s3_1 ns1_4 compile2_0)"
 "(begin"
 " 'eval4"
-"(let-values(((s_446) s3_1))"
+"(let-values(((s_447) s3_1))"
 "(let-values(((ns_87)(if(eq? ns1_4 unsafe-undefined)(1/current-namespace) ns1_4)))"
 "(let-values(((compile_1)"
 "(if(eq? compile2_0 unsafe-undefined)"
 "(lambda(s_75 ns_55)(begin 'compile(1/compile s_75 ns_55 #f)))"
 " compile2_0)))"
 "(let-values()"
-"(if(let-values(((or-part_28)(compiled-in-memory? s_446)))"
+"(if(let-values(((or-part_28)(compiled-in-memory? s_447)))"
 "(if or-part_28"
 " or-part_28"
-"(let-values(((or-part_292)(1/linklet-directory? s_446)))"
-"(if or-part_292 or-part_292(1/linklet-bundle? s_446)))))"
-"(let-values()(eval-compiled s_446 ns_87))"
-"(if(if(syntax?$1 s_446)"
-"(let-values(((or-part_296)(compiled-in-memory?(1/syntax-e s_446))))"
+"(let-values(((or-part_292)(1/linklet-directory? s_447)))"
+"(if or-part_292 or-part_292(1/linklet-bundle? s_447)))))"
+"(let-values()(eval-compiled s_447 ns_87))"
+"(if(if(syntax?$1 s_447)"
+"(let-values(((or-part_296)(compiled-in-memory?(1/syntax-e s_447))))"
 "(if or-part_296"
 " or-part_296"
-"(let-values(((or-part_297)(1/linklet-directory?(1/syntax-e s_446))))"
-"(if or-part_297 or-part_297(1/linklet-bundle?(1/syntax-e s_446))))))"
+"(let-values(((or-part_297)(1/linklet-directory?(1/syntax-e s_447))))"
+"(if or-part_297 or-part_297(1/linklet-bundle?(1/syntax-e s_447))))))"
 " #f)"
-"(let-values()(eval-compiled(1/syntax->datum s_446) ns_87))"
+"(let-values()(eval-compiled(1/syntax->datum s_447) ns_87))"
 "(let-values()"
-"(let-values(((s66_0) s_446)"
+"(let-values(((s66_0) s_447)"
 "((ns67_1) ns_87)"
 "((temp68_1)"
 "(lambda(s_180 ns_88 tail?_52)"
@@ -44427,9 +44426,9 @@ static const char *startup_source =
 "((temp69_0) #f))"
 "(per-top-level54.1 #f #f temp69_0 #t #f temp68_1 #f s66_0 ns67_1)))))))))))))"
 "(case-lambda"
-"((s_445)(begin 'eval(eval4_0 s_445 unsafe-undefined unsafe-undefined)))"
+"((s_446)(begin 'eval(eval4_0 s_446 unsafe-undefined unsafe-undefined)))"
 "((s_76 ns_89 compile2_1)(eval4_0 s_76 ns_89 compile2_1))"
-"((s_441 ns1_5)(eval4_0 s_441 ns1_5 unsafe-undefined)))))"
+"((s_442 ns1_5)(eval4_0 s_442 ns1_5 unsafe-undefined)))))"
 "(define-values"
 "(eval-compiled)"
 "(let-values(((eval-compiled9_0)"
@@ -44470,10 +44469,10 @@ static const char *startup_source =
 "(let-values(((s72_0) s_184)"
 "((ns73_0) ns_93)"
 "((temp74_1)"
-"(lambda(s_447 ns_47 as-tail?_4)"
+"(lambda(s_448 ns_47 as-tail?_4)"
 "(list"
 "(compile-single$1"
-" s_447"
+" s_448"
 " ns_47"
 " expand_0"
 " serializable?_4"
@@ -44503,8 +44502,8 @@ static const char *startup_source =
 " cs77_0))))))))))))))"
 "(case-lambda"
 "((s_11)(begin 'compile(compile16_0 s_11 unsafe-undefined #t unsafe-undefined #f)))"
-"((s_448 ns_94 serializable?_5 expand_1 to-source?14_1)"
-"(compile16_0 s_448 ns_94 serializable?_5 expand_1 to-source?14_1))"
+"((s_449 ns_94 serializable?_5 expand_1 to-source?14_1)"
+"(compile16_0 s_449 ns_94 serializable?_5 expand_1 to-source?14_1))"
 "((s_14 ns_95 serializable?_6 expand13_1)(compile16_0 s_14 ns_95 serializable?_6 expand13_1 #f))"
 "((s_15 ns_96 serializable?12_1)(compile16_0 s_15 ns_96 serializable?12_1 unsafe-undefined #f))"
 "((s_83 ns11_2)(compile16_0 s_83 ns11_2 #t unsafe-undefined #f)))))"
@@ -44518,7 +44517,7 @@ static const char *startup_source =
 "(let-values(((ns_63)(if(eq? ns18_1 unsafe-undefined)(1/current-namespace) ns18_1)))"
 "(let-values()(1/compile s_20 ns_63 #t expand$1 #t))))))))"
 "(case-lambda"
-"((s_449)(begin(compile-to-linklets20_0 s_449 unsafe-undefined)))"
+"((s_450)(begin(compile-to-linklets20_0 s_450 unsafe-undefined)))"
 "((s_22 ns18_2)(compile-to-linklets20_0 s_22 ns18_2)))))"
 "(define-values"
 "(struct:lifted-parsed-begin"
@@ -44549,10 +44548,10 @@ static const char *startup_source =
 "(make-struct-field-accessor -ref_79 1 'last))))"
 "(define-values"
 "(compile-single$1)"
-"(lambda(s_450 ns_97 expand_2 serializable?_7 to-source?_5)"
+"(lambda(s_451 ns_97 expand_2 serializable?_7 to-source?_5)"
 "(begin"
 " 'compile-single"
-"(let-values(((exp-s_4)(expand_2 s_450 ns_97 #f #t serializable?_7)))"
+"(let-values(((exp-s_4)(expand_2 s_451 ns_97 #f #t serializable?_7)))"
 "((letrec-values(((loop_97)"
 "(lambda(exp-s_5)"
 "(begin"
@@ -44643,7 +44642,7 @@ static const char *startup_source =
 "(lambda(s27_1 ns23_0 observable?24_0 to-parsed?25_0 serializable?26_0)"
 "(begin"
 " 'expand28"
-"(let-values(((s_451) s27_1))"
+"(let-values(((s_452) s27_1))"
 "(let-values(((ns_98)(if(eq? ns23_0 unsafe-undefined)(1/current-namespace) ns23_0)))"
 "(let-values(((observable?_0) observable?24_0))"
 "(let-values(((to-parsed?_2) to-parsed?25_0))"
@@ -44659,7 +44658,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s94_0) s_451)"
+"(let-values(((s94_0) s_452)"
 "((ns95_0) ns_98)"
 "((temp96_1)"
 "(lambda(s_312 ns_99 as-tail?_5)"
@@ -44683,12 +44682,12 @@ static const char *startup_source =
 " s94_0"
 " ns95_0))))))))))))))))"
 "(case-lambda"
-"((s_452)(begin 'expand(expand28_0 s_452 unsafe-undefined #f #f #f)))"
-"((s_453 ns_9 observable?_1 to-parsed?_3 serializable?26_1)"
-"(expand28_0 s_453 ns_9 observable?_1 to-parsed?_3 serializable?26_1))"
-"((s_454 ns_100 observable?_2 to-parsed?25_1)(expand28_0 s_454 ns_100 observable?_2 to-parsed?25_1 #f))"
+"((s_453)(begin 'expand(expand28_0 s_453 unsafe-undefined #f #f #f)))"
+"((s_454 ns_9 observable?_1 to-parsed?_3 serializable?26_1)"
+"(expand28_0 s_454 ns_9 observable?_1 to-parsed?_3 serializable?26_1))"
+"((s_455 ns_100 observable?_2 to-parsed?25_1)(expand28_0 s_455 ns_100 observable?_2 to-parsed?25_1 #f))"
 "((s_164 ns_101 observable?24_1)(expand28_0 s_164 ns_101 observable?24_1 #f #f))"
-"((s_455 ns23_1)(expand28_0 s_455 ns23_1 #f #f #f)))))"
+"((s_456 ns23_1)(expand28_0 s_456 ns23_1 #f #f #f)))))"
 "(define-values"
 "(expand-single)"
 "(lambda(s_58 ns_102 observer_3 to-parsed?_4 serializable?_9)"
@@ -44772,7 +44771,7 @@ static const char *startup_source =
 "(let-values(((s114_0) s_66)"
 "((ns115_0) ns_103)"
 "((temp116_0)"
-"(lambda(s_456 ns_104 as-tail?_6)(expand-single-once s_456 ns_104)))"
+"(lambda(s_457 ns_104 as-tail?_6)(expand-single-once s_457 ns_104)))"
 "((cons117_0) cons)"
 "((re-pair118_0) re-pair)"
 "((temp119_1) #t)"
@@ -44792,11 +44791,11 @@ static const char *startup_source =
 "((s_317 ns30_1)(expand-once32_0 s_317 ns30_1)))))"
 "(define-values"
 "(expand-single-once)"
-"(lambda(s_457 ns_83)"
+"(lambda(s_458 ns_83)"
 "(begin"
 "(let-values(((require-lifts_4 lifts_11 exp-s_6)"
 "(expand-capturing-lifts"
-" s_457"
+" s_458"
 "(let-values(((v_126)(let-values(((ns121_0) ns_83))(make-expand-context10.1 #f #f #f ns121_0))))"
 "(let-values(((the-struct_69) v_126))"
 "(if(expand-context/outer? the-struct_69)"
@@ -44865,7 +44864,7 @@ static const char *startup_source =
 "(lambda(s35_0 ns34_0)"
 "(begin"
 " 'expand-to-top-form36"
-"(let-values(((s_458) s35_0))"
+"(let-values(((s_459) s35_0))"
 "(let-values(((ns_105)(if(eq? ns34_0 unsafe-undefined)(1/current-namespace) ns34_0)))"
 "(let-values()"
 "(let-values(((observer_4)(current-expand-observe)))"
@@ -44878,7 +44877,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s127_0) s_458)"
+"(let-values(((s127_0) s_459)"
 "((ns128_0) ns_105)"
 "((temp129_1) #f)"
 "((temp130_0) #f)"
@@ -44895,7 +44894,7 @@ static const char *startup_source =
 " ns128_0)))))))))))))"
 "(case-lambda"
 "((s_158)(begin 'expand-to-top-form(expand-to-top-form36_0 s_158 unsafe-undefined)))"
-"((s_459 ns34_1)(expand-to-top-form36_0 s_459 ns34_1)))))"
+"((s_460 ns34_1)(expand-to-top-form36_0 s_460 ns34_1)))))"
 "(define-values"
 "(per-top-level54.1)"
 "(lambda(combine39_0"
@@ -44923,9 +44922,9 @@ static const char *startup_source =
 "(let-values(((ctx_68)"
 "(let-values(((ns132_0) ns_106)((observer133_0) observer_5))"
 "(make-expand-context10.1 #f observer133_0 #f ns132_0))))"
-"(let-values(((phase_132)(namespace-phase ns_106)))"
+"(let-values(((phase_131)(namespace-phase ns_106)))"
 "((letrec-values(((loop_98)"
-"(lambda(s_460 phase_133 ns_107 as-tail?_7)"
+"(lambda(s_461 phase_132 ns_107 as-tail?_7)"
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
@@ -44939,7 +44938,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_72)"
 "(let-values(((phase135_1)"
-" phase_133)"
+" phase_132)"
 "((namespace136_0)"
 " ns_107)"
 "((just-once?137_0)"
@@ -45030,7 +45029,7 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                           \"expand-context/outer?\""
 " the-struct_71))))))"
-"(let-values(((wb-s_0)(if just-once?_1 s_460 #f)))"
+"(let-values(((wb-s_0)(if just-once?_1 s_461 #f)))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_47)"
@@ -45042,12 +45041,12 @@ static const char *startup_source =
 "(call-expand-observe"
 " obs_47"
 " 'visit"
-" s_460)))"
+" s_461)))"
 "(void)))"
 "(values))))"
 "(let-values(((require-lifts_5 lifts_12 exp-s_7)"
 "(expand-capturing-lifts"
-" s_460"
+" s_461"
 "(let-values(((v_198) tl-ctx_0))"
 "(let-values(((the-struct_73) v_198))"
 "(if(expand-context/outer? the-struct_73)"
@@ -45060,7 +45059,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_74)"
 "(let-values(((phase141_0)"
-" phase_133)"
+" phase_132)"
 "((namespace142_0)"
 " ns_107))"
 "(expand-context/inner2.1"
@@ -45163,7 +45162,7 @@ static const char *startup_source =
 " require-lifts_5"
 " lifts_12))"
 "((exp-s144_0) exp-s_7)"
-"((phase145_0) phase_133))"
+"((phase145_0) phase_132))"
 "(wrap-lifts-as-begin16.1"
 " unsafe-undefined"
 " unsafe-undefined"
@@ -45186,7 +45185,7 @@ static const char *startup_source =
 " new-s_3"
 "(loop_98"
 " new-s_3"
-" phase_133"
+" phase_132"
 " ns_107"
 " as-tail?_7)))))"
 "(if(not single_0)"
@@ -45210,7 +45209,7 @@ static const char *startup_source =
 "(let-values(((tmp_35)"
 "(core-form-sym"
 " disarmed-exp-s_0"
-" phase_133)))"
+" phase_132)))"
 "(if(equal? tmp_35 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -45227,18 +45226,18 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_29 begin146_0 e147_0)"
-"(let-values(((s_461)"
+"(let-values(((s_462)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_33)"
-" s_461))"
+" s_462))"
 "(let-values(((begin146_1"
 " e147_1)"
 "(let-values(((s_223)"
 "(if(syntax?$1"
-" s_461)"
+" s_462)"
 "(syntax-e$1"
-" s_461)"
-" s_461)))"
+" s_462)"
+" s_462)))"
 "(if(pair?"
 " s_223)"
 "(let-values(((begin148_0)"
@@ -45247,15 +45246,15 @@ static const char *startup_source =
 " s_223)))"
 " s_114))"
 "((e149_0)"
-"(let-values(((s_437)"
+"(let-values(((s_438)"
 "(cdr"
 " s_223)))"
 "(let-values(((s_224)"
 "(if(syntax?$1"
-" s_437)"
+" s_438)"
 "(syntax-e$1"
-" s_437)"
-" s_437)))"
+" s_438)"
+" s_438)))"
 "(let-values(((flat-s_21)"
 "(to-syntax-list.1"
 " s_224)))"
@@ -45297,7 +45296,7 @@ static const char *startup_source =
 "(let-values()"
 "(loop_98"
 "(car es_2)"
-" phase_133"
+" phase_132"
 " ns_107"
 " as-tail?_7))"
 "(let-values()"
@@ -45319,14 +45318,14 @@ static const char *startup_source =
 "(loop_98"
 "(car"
 " es_2)"
-" phase_133"
+" phase_132"
 " ns_107"
 " #f)"
 "(begin"
 "(loop_98"
 "(car"
 " es_2)"
-" phase_133"
+" phase_132"
 " ns_107"
 " #f)"
 "(void)))))"
@@ -45380,38 +45379,38 @@ static const char *startup_source =
 "(let-values(((ok?_30"
 " begin-for-syntax150_0"
 " e151_0)"
-"(let-values(((s_462)"
+"(let-values(((s_463)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_34)"
-" s_462))"
+" s_463))"
 "(let-values(((begin-for-syntax150_1"
 " e151_1)"
 "(let-values(((s_126)"
 "(if(syntax?$1"
-" s_462)"
+" s_463)"
 "(syntax-e$1"
-" s_462)"
-" s_462)))"
+" s_463)"
+" s_463)))"
 "(if(pair?"
 " s_126)"
 "(let-values(((begin-for-syntax152_0)"
-"(let-values(((s_463)"
+"(let-values(((s_464)"
 "(car"
 " s_126)))"
-" s_463))"
+" s_464))"
 "((e153_0)"
-"(let-values(((s_464)"
+"(let-values(((s_465)"
 "(cdr"
 " s_126)))"
-"(let-values(((s_465)"
+"(let-values(((s_466)"
 "(if(syntax?$1"
-" s_464)"
+" s_465)"
 "(syntax-e$1"
-" s_464)"
-" s_464)))"
+" s_465)"
+" s_465)))"
 "(let-values(((flat-s_22)"
 "(to-syntax-list.1"
-" s_465)))"
+" s_466)))"
 "(if(not"
 " flat-s_22)"
 "(let-values()"
@@ -45433,7 +45432,7 @@ static const char *startup_source =
 " begin-for-syntax150_1"
 " e151_1))))))"
 "(let-values(((next-phase_0)"
-"(add1 phase_133)))"
+"(add1 phase_132)))"
 "(let-values(((next-ns_0)"
 "(namespace->namespace-at-phase"
 " ns_107"
@@ -45482,7 +45481,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_300)"
-"(let-values(((s_466)"
+"(let-values(((s_467)"
 "(unsafe-car"
 " lst_300))"
 "((rest_113)"
@@ -45507,7 +45506,7 @@ static const char *startup_source =
 " 'next)))"
 "(void)))"
 "(loop_98"
-" s_466"
+" s_467"
 " next-phase_0"
 " next-ns_0"
 " #f)))"
@@ -45558,7 +45557,7 @@ static const char *startup_source =
 " as-tail?_7))))))))))))))))))"
 " loop_98)"
 " s_216"
-" phase_132"
+" phase_131"
 " ns_106"
 " #t)))))))))))))))))"
 "(define-values"
@@ -45567,17 +45566,17 @@ static const char *startup_source =
 "(begin(if(syntax?$1 s_340) s_340(1/namespace-syntax-introduce(1/datum->syntax #f s_340) ns_108)))))"
 "(define-values"
 "(re-pair)"
-"(lambda(form-id_0 s_467 r_44)"
-"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_467)(cons form-id_0 r_44) s_467 s_467) s_467))))"
+"(lambda(form-id_0 s_468 r_44)"
+"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_468)(cons form-id_0 r_44) s_468 s_468) s_468))))"
 "(define-values"
 "(expand-capturing-lifts)"
-"(lambda(s_343 ctx_69)"
+"(lambda(s_343 ctx_27)"
 "(begin"
 "(let-values()"
-"(let-values(((ns_109)(expand-context-namespace ctx_69)))"
+"(let-values(((ns_109)(expand-context-namespace ctx_27)))"
 "(let-values((()(begin(namespace-visit-available-modules! ns_109)(values))))"
 "(let-values(((lift-ctx_6)"
-"(let-values(((temp154_1)(make-top-level-lift ctx_69)))"
+"(let-values(((temp154_1)(make-top-level-lift ctx_27)))"
 "(make-lift-context6.1 #f temp154_1))))"
 "(let-values(((require-lift-ctx_2)"
 "(make-require-lift-context"
@@ -45586,7 +45585,7 @@ static const char *startup_source =
 "(let-values(((exp-s_8)"
 "(let-values(((s155_0) s_343)"
 "((temp156_0)"
-"(let-values(((v_199) ctx_69))"
+"(let-values(((v_199) ctx_27))"
 "(let-values(((the-struct_75) v_199))"
 "(if(expand-context/outer? the-struct_75)"
 "(let-values(((inner157_0)"
@@ -45672,31 +45671,31 @@ static const char *startup_source =
 "(make-parse-top-lifted-require)"
 "(lambda(ns_110)"
 "(begin"
-"(lambda(s_347 phase_134)"
+"(lambda(s_347 phase_133)"
 "(let-values(((ok?_31 #%require161_0 req162_0)"
-"(let-values(((s_468)(syntax-disarm$1 s_347)))"
-"(let-values(((orig-s_35) s_468))"
+"(let-values(((s_469)(syntax-disarm$1 s_347)))"
+"(let-values(((orig-s_35) s_469))"
 "(let-values(((#%require161_1 req162_1)"
-"(let-values(((s_469)(if(syntax?$1 s_468)(syntax-e$1 s_468) s_468)))"
-"(if(pair? s_469)"
-"(let-values(((#%require163_0)(let-values(((s_470)(car s_469))) s_470))"
+"(let-values(((s_470)(if(syntax?$1 s_469)(syntax-e$1 s_469) s_469)))"
+"(if(pair? s_470)"
+"(let-values(((#%require163_0)(let-values(((s_471)(car s_470))) s_471))"
 "((req164_0)"
-"(let-values(((s_471)(cdr s_469)))"
-"(let-values(((s_472)"
-"(if(syntax?$1 s_471)"
-"(syntax-e$1 s_471)"
-" s_471)))"
-"(if(pair? s_472)"
+"(let-values(((s_472)(cdr s_470)))"
+"(let-values(((s_473)"
+"(if(syntax?$1 s_472)"
+"(syntax-e$1 s_472)"
+" s_472)))"
+"(if(pair? s_473)"
 "(let-values(((req165_0)"
-"(let-values(((s_473)(car s_472)))"
-" s_473))"
+"(let-values(((s_474)(car s_473)))"
+" s_474))"
 "(()"
-"(let-values(((s_474)(cdr s_472)))"
-"(let-values(((s_475)"
-"(if(syntax?$1 s_474)"
-"(syntax-e$1 s_474)"
-" s_474)))"
-"(if(null? s_475)"
+"(let-values(((s_475)(cdr s_473)))"
+"(let-values(((s_476)"
+"(if(syntax?$1 s_475)"
+"(syntax-e$1 s_475)"
+" s_475)))"
+"(if(null? s_476)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -45710,8 +45709,8 @@ static const char *startup_source =
 "(let-values(((temp166_0)(list req162_0))"
 "((s167_0) s_347)"
 "((ns168_0) ns_110)"
-"((phase169_1) phase_134)"
-"((phase170_0) phase_134)"
+"((phase169_1) phase_133)"
+"((phase170_0) phase_133)"
 "((temp171_1)(let-values(((temp173_0) #f))(make-requires+provides8.1 #f temp173_0)))"
 "((temp172_0) 'require))"
 "(parse-and-perform-requires!30.1"
@@ -45834,9 +45833,9 @@ static const char *startup_source =
 " exp-s_9))))))))))"
 "(define-values"
 "(log-top-lift-begin-before)"
-"(lambda(ctx_70 require-lifts_7 lifts_14 exp-s_10 ns_111)"
+"(lambda(ctx_69 require-lifts_7 lifts_14 exp-s_10 ns_111)"
 "(begin"
-"(let-values(((obs_56)(expand-context-observer ctx_70)))"
+"(let-values(((obs_56)(expand-context-observer ctx_69)))"
 "(if obs_56"
 "(let-values()"
 "(let-values(((new-s_6)"
@@ -45849,29 +45848,29 @@ static const char *startup_source =
 " temp175_0"
 " exp-s176_0"
 " temp177_0))))"
-"(begin(call-expand-observe obs_56 'lift-loop new-s_6)(log-top-begin-before ctx_70 new-s_6))))"
+"(begin(call-expand-observe obs_56 'lift-loop new-s_6)(log-top-begin-before ctx_69 new-s_6))))"
 "(void))))))"
 "(define-values"
 "(log-top-begin-before)"
-"(lambda(ctx_71 new-s_7)"
+"(lambda(ctx_70 new-s_7)"
 "(begin"
-"(let-values(((obs_57)(expand-context-observer ctx_71)))"
+"(let-values(((obs_57)(expand-context-observer ctx_70)))"
 "(if obs_57"
 "(let-values()"
 "(let-values(((ok?_32 begin178_0 e179_0)"
-"(let-values(((s_476) new-s_7))"
-"(let-values(((orig-s_36) s_476))"
+"(let-values(((s_477) new-s_7))"
+"(let-values(((orig-s_36) s_477))"
 "(let-values(((begin178_1 e179_1)"
-"(let-values(((s_477)(if(syntax?$1 s_476)(syntax-e$1 s_476) s_476)))"
-"(if(pair? s_477)"
-"(let-values(((begin180_0)(let-values(((s_478)(car s_477))) s_478))"
+"(let-values(((s_478)(if(syntax?$1 s_477)(syntax-e$1 s_477) s_477)))"
+"(if(pair? s_478)"
+"(let-values(((begin180_0)(let-values(((s_479)(car s_478))) s_479))"
 "((e181_0)"
-"(let-values(((s_479)(cdr s_477)))"
-"(let-values(((s_480)"
-"(if(syntax?$1 s_479)"
-"(syntax-e$1 s_479)"
-" s_479)))"
-"(let-values(((flat-s_23)(to-syntax-list.1 s_480)))"
+"(let-values(((s_480)(cdr s_478)))"
+"(let-values(((s_481)"
+"(if(syntax?$1 s_480)"
+"(syntax-e$1 s_480)"
+" s_480)))"
+"(let-values(((flat-s_23)(to-syntax-list.1 s_481)))"
 "(if(not flat-s_23)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -45891,25 +45890,25 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(log-top-begin-after)"
-"(lambda(ctx_72 new-s_8)"
+"(lambda(ctx_71 new-s_8)"
 "(begin"
-"(let-values(((obs_58)(expand-context-observer ctx_72)))"
+"(let-values(((obs_58)(expand-context-observer ctx_71)))"
 "(if obs_58"
 "(let-values()"
 "(let-values(((ok?_33 begin182_0 e183_0)"
 "(let-values(((s_392) new-s_8))"
 "(let-values(((orig-s_37) s_392))"
 "(let-values(((begin182_1 e183_1)"
-"(let-values(((s_481)(if(syntax?$1 s_392)(syntax-e$1 s_392) s_392)))"
-"(if(pair? s_481)"
-"(let-values(((begin184_0)(let-values(((s_137)(car s_481))) s_137))"
+"(let-values(((s_482)(if(syntax?$1 s_392)(syntax-e$1 s_392) s_392)))"
+"(if(pair? s_482)"
+"(let-values(((begin184_0)(let-values(((s_137)(car s_482))) s_137))"
 "((e185_0)"
-"(let-values(((s_138)(cdr s_481)))"
-"(let-values(((s_482)"
+"(let-values(((s_138)(cdr s_482)))"
+"(let-values(((s_483)"
 "(if(syntax?$1 s_138)"
 "(syntax-e$1 s_138)"
 " s_138)))"
-"(let-values(((flat-s_24)(to-syntax-list.1 s_482)))"
+"(let-values(((flat-s_24)(to-syntax-list.1 s_483)))"
 "(if(not flat-s_24)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -45920,7 +45919,7 @@ static const char *startup_source =
 "(values begin184_0 e185_0))"
 "                                                (raise-syntax-error$1 #f \"bad syntax\" orig-s_37)))))"
 "(values #t begin182_1 e183_1))))))"
-"(let-values(((obs_59)(expand-context-observer ctx_72)))"
+"(let-values(((obs_59)(expand-context-observer ctx_71)))"
 "(if obs_59"
 "(let-values()"
 "(let-values()"
@@ -45991,13 +45990,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_47 #t)))"
-"(let-values(((phase_107)(namespace-phase ns_112)))"
+"(let-values(((phase_106)(namespace-phase ns_112)))"
 "(if(not sym_70)"
 "(let-values()"
 "(let-values(((ns17_0) ns_112)"
 "((mpi18_0) mpi_47)"
-"((phase19_2) phase_107)"
-"((phase20_1) phase_107)"
+"((phase19_2) phase_106)"
+"((phase20_1) phase_106)"
 "((temp21_1) #f))"
 "(namespace-module-instantiate!96.1"
 " temp21_1"
@@ -46011,8 +46010,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns22_0) ns_112)"
 "((mpi23_0) mpi_47)"
-"((phase24_3) phase_107)"
-"((phase25_0) phase_107))"
+"((phase24_3) phase_106)"
+"((phase25_0) phase_106))"
 "(namespace-module-instantiate!96.1"
 " #t"
 " phase25_0"
@@ -46025,8 +46024,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns26_0) ns_112)"
 "((mpi27_0) mpi_47)"
-"((phase28_4) phase_107)"
-"((phase29_0) phase_107))"
+"((phase28_4) phase_106)"
+"((phase29_0) phase_106))"
 "(namespace-module-visit!104.1"
 " phase29_0"
 " ns26_0"
@@ -46070,8 +46069,8 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns30_2) ns_112)"
 "((mpi31_0) mpi_47)"
-"((phase32_2) phase_107)"
-"((phase33_1) phase_107)"
+"((phase32_2) phase_106)"
+"((phase33_1) phase_106)"
 "((temp34_4) #f))"
 "(namespace-module-instantiate!96.1"
 " temp34_4"
@@ -46094,7 +46093,7 @@ static const char *startup_source =
 " ex-mod-name_0)"
 "((temp37_1)"
 "(phase-"
-" phase_107"
+" phase_106"
 " ex-phase_0))"
 "((temp38_3) #t))"
 "(namespace->module-namespace82.1"
@@ -46188,9 +46187,9 @@ static const char *startup_source =
 "((mpi40_1)"
 " mpi_47)"
 "((phase41_2)"
-" phase_107)"
+" phase_106)"
 "((phase42_0)"
-" phase_107))"
+" phase_106))"
 "(namespace-module-visit!104.1"
 " phase42_0"
 " ns39_0"
@@ -46980,11 +46979,11 @@ static const char *startup_source =
 "(lambda(k_38 v_204)"
 "(hash-set! ht_147 k_38(cons dir_1 v_204))))))"
 "(let-values()"
-"(let-values(((s_483)(string->symbol(car p_66))))"
+"(let-values(((s_484)(string->symbol(car p_66))))"
 "(hash-set!"
 " ht_147"
-" s_483"
-"(cons(box dir_1)(hash-ref ht_147 s_483 null)))))))))"
+" s_484"
+"(cons(box dir_1)(hash-ref ht_147 s_484 null)))))))))"
 "(void)))"
 " v_203)"
 "(hash-for-each"
@@ -48297,8 +48296,8 @@ static const char *startup_source =
 "((config34_0) config_18)"
 "                                     ((temp35_2) \"~a\")"
 "((temp36_3)"
-"(let-values(((s_484)(exn-message exn_3)))"
-"                                        (regexp-replace \"^[a-z-]*: \" s_484 \"\")))"
+"(let-values(((s_485)(exn-message exn_3)))"
+"                                        (regexp-replace \"^[a-z-]*: \" s_485 \"\")))"
 "((temp37_2)(exn-continuation-marks exn_3)))"
 "(reader-error12.1"
 " temp37_2"
@@ -49437,9 +49436,9 @@ static const char *startup_source =
 " convert-mode72_0))))))))))))))"
 "(case-lambda"
 "((s_307)(begin 'string->number(string->number5_0 s_307 10 'number-or-false unsafe-undefined)))"
-"((s_485 radix_1 convert-mode_1 decimal-mode3_1)(string->number5_0 s_485 radix_1 convert-mode_1 decimal-mode3_1))"
+"((s_486 radix_1 convert-mode_1 decimal-mode3_1)(string->number5_0 s_486 radix_1 convert-mode_1 decimal-mode3_1))"
 "((s_186 radix_2 convert-mode2_1)(string->number5_0 s_186 radix_2 convert-mode2_1 unsafe-undefined))"
-"((s_486 radix1_1)(string->number5_0 s_486 radix1_1 'number-or-false unsafe-undefined)))))"
+"((s_487 radix1_1)(string->number5_0 s_487 radix1_1 'number-or-false unsafe-undefined)))))"
 "(define-values"
 "(do-string->number17.1)"
 "(lambda(in-complex8_0 radix-set?7_0 s11_1 start12_0 end13_0 radix14_0 exactness15_0 convert-mode16_0)"
@@ -49828,7 +49827,7 @@ static const char *startup_source =
 "(lambda(in-complex21_0 radix-set?20_0 s24_2 start25_0 end26_0 radix27_0 exactness28_0 convert-mode29_0)"
 "(begin"
 " 'do-string->non-special-number30"
-"(let-values(((s_456) s24_2))"
+"(let-values(((s_457) s24_2))"
 "(let-values(((start_44) start25_0))"
 "(let-values(((end_34) end26_0))"
 "(let-values(((radix_5) radix27_0))"
@@ -49858,7 +49857,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                           \"no digits in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if must-i?_0(not i-pos_3) #f)"
 "(let-values()"
@@ -49866,7 +49865,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                             \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if sign-pos_0"
 "(let-values(((or-part_312)"
@@ -49880,11 +49879,11 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                               \"misplaced sign in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if i-pos_3"
 "(let-values()"
-"(let-values(((s133_0) s_456)"
+"(let-values(((s133_0) s_457)"
 "((start134_0) start_44)"
 "((sign-pos135_0) sign-pos_0)"
 "((sign-pos136_0) sign-pos_0)"
@@ -49911,7 +49910,7 @@ static const char *startup_source =
 " convert-mode144_0)))"
 "(if @-pos_0"
 "(let-values()"
-"(let-values(((s145_0) s_456)"
+"(let-values(((s145_0) s_457)"
 "((start146_0) start_44)"
 "((@-pos147_0) @-pos_0)"
 "((temp148_1)(add1 @-pos_0))"
@@ -49938,7 +49937,7 @@ static const char *startup_source =
 " convert-mode156_0)))"
 "(let-values()"
 "(string->real-number"
-" s_456"
+" s_457"
 " start_44"
 " end_34"
 " dot-pos_1"
@@ -49949,7 +49948,7 @@ static const char *startup_source =
 " exactness_1"
 " convert-mode_3))))))))"
 "(let-values()"
-"(let-values(((c_79)(string-ref s_456 i_173)))"
+"(let-values(((c_79)(string-ref s_457 i_173)))"
 "(if(digit? c_79 radix_5)"
 "(let-values()"
 "(loop_109"
@@ -49984,7 +49983,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                     \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_109"
@@ -50026,7 +50025,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                       \"misplaced `.` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if slash-pos_0"
 "(let-values(((or-part_278)(not sign-pos_0)))"
@@ -50039,7 +50038,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_109"
@@ -50066,7 +50065,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(let-values(((or-part_317)"
 "(if exp-pos_0"
@@ -50090,7 +50089,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                           \"misplaced `/` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_109"
@@ -50167,10 +50166,10 @@ static const char *startup_source =
 "(format"
 "                                                                           \"misplaced `~a` in `~.a`\""
 " c_79"
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if(<(add1 i_173) end_34)"
-"(char-sign?(string-ref s_456(add1 i_173)))"
+"(char-sign?(string-ref s_457(add1 i_173)))"
 " #f)"
 "(let-values()"
 "(loop_109"
@@ -50206,7 +50205,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                             \"cannot mix `@` and `i` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(let-values(((or-part_160) @-pos_0))"
 "(if or-part_160"
@@ -50217,7 +50216,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                               \"too many `@`s in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(= i_173 start_44)"
 "(let-values()"
@@ -50225,7 +50224,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                 \"`@` cannot be at start in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if must-i?_0"
 "(let-values()"
@@ -50233,7 +50232,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                   \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_109"
@@ -50264,7 +50263,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                               \"cannot mix `@` and `i` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(let-values(((or-part_332)"
 "(<(add1 i_173) end_34)))"
@@ -50276,7 +50275,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                 \"`i` must be at the end in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_457 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_109"
@@ -50295,7 +50294,7 @@ static const char *startup_source =
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
-"                                                                              (format \"nul character in `~.a`\" s_456))"
+"                                                                              (format \"nul character in `~.a`\" s_457))"
 "(let-values() #f)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -50636,7 +50635,7 @@ static const char *startup_source =
 " convert-mode_5))))))))))))"
 "(define-values"
 "(string->decimal-number)"
-"(lambda(s_487 start_46 end_36 dot-pos_3 radix_8 exactness_4 convert-mode_6)"
+"(lambda(s_488 start_46 end_36 dot-pos_3 radix_8 exactness_4 convert-mode_6)"
 "(begin"
 "(let-values(((get-exact?_0)"
 "(let-values(((or-part_187)(eq? exactness_4 'exact)))"
@@ -50652,22 +50651,22 @@ static const char *startup_source =
 "(let-values()"
 "(if(eq? convert-mode_6 'must-read)"
 "(let-values()"
-"                                            (format \"misplaced `#` in `~.a`\" (substring s_487 start_46 end_36)))"
+"                                            (format \"misplaced `#` in `~.a`\" (substring s_488 start_46 end_36)))"
 "(let-values() #f)))"
 "(let-values()"
 "(let-values(((n_34)(string->number$1 new-str_0 radix_8)))"
 "(if(not n_34)"
-"(let-values()(fail-bad-number convert-mode_6 s_487 start_46 end_36))"
+"(let-values()(fail-bad-number convert-mode_6 s_488 start_46 end_36))"
 "(if(not get-exact?_0)"
 "(let-values()"
-"(if(if(eqv? n_34 0)(char=?(string-ref s_487 start_46) '#\\-) #f)"
+"(if(if(eqv? n_34 0)(char=?(string-ref s_488 start_46) '#\\-) #f)"
 " -0.0"
 "(exact->inexact n_34)))"
 "(if(if dot-pos_3 get-exact?_0 #f)"
 "(let-values()(/ n_34(expt 10(- end_36 dot-pos_3 1))))"
 "(let-values() n_34))))))))"
 "(let-values()"
-"(let-values(((c_80)(string-ref s_487 i_174)))"
+"(let-values(((c_80)(string-ref s_488 i_174)))"
 "(if(char=? c_80 '#\\.)"
 "(let-values()"
 "(if get-exact?_0"
@@ -50704,7 +50703,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                       \"misplaced `#` in `~.a`\""
-"(substring s_487 start_46 end_36)))"
+"(substring s_488 start_46 end_36)))"
 "(let-values() #f)))))"
 "(let-values()"
 "(begin"
@@ -50716,48 +50715,48 @@ static const char *startup_source =
 " end_36))))))"
 "(define-values"
 "(string->exact-integer-number)"
-"(lambda(s_488 start_47 end_37 radix_9 convert-mode_7)"
+"(lambda(s_489 start_47 end_37 radix_9 convert-mode_7)"
 "(begin"
-"(if(hashes? s_488 start_47 end_37)"
+"(if(hashes? s_489 start_47 end_37)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_488 start_47 end_37)))"
+"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_489 start_47 end_37)))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((n_35)(string->number$1(maybe-substring s_488 start_47 end_37) radix_9)))"
+"(let-values(((n_35)(string->number$1(maybe-substring s_489 start_47 end_37) radix_9)))"
 "(if(not n_35)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"                  (let-values () (format \"bad exponent `~.a`\" (substring s_488 start_47 end_37)))"
+"                  (let-values () (format \"bad exponent `~.a`\" (substring s_489 start_47 end_37)))"
 "(let-values() #f)))"
 "(let-values() n_35))))))))"
 "(define-values"
 "(read-special-number)"
-"(lambda(s_471 start_48 end_38 convert-mode_8)"
+"(lambda(s_472 start_48 end_38 convert-mode_8)"
 "(begin"
 "(if(=(- end_38 start_48) 6)"
-"(if(let-values(((or-part_346)(char=?(string-ref s_471 start_48) '#\\+)))"
-"(if or-part_346 or-part_346(char=?(string-ref s_471 start_48) '#\\-)))"
+"(if(let-values(((or-part_346)(char=?(string-ref s_472 start_48) '#\\+)))"
+"(if or-part_346 or-part_346(char=?(string-ref s_472 start_48) '#\\-)))"
 "(let-values(((or-part_347)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 1))) '#\\i)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 2))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 3))) '#\\f)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 4))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 1))) '#\\i)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 2))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 3))) '#\\f)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 4))) '#\\.)"
 "(let-values(((or-part_348)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\0)"
-"(if(char=?(string-ref s_471 start_48) '#\\+) +inf.0 -inf.0)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\0)"
+"(if(char=?(string-ref s_472 start_48) '#\\+) +inf.0 -inf.0)"
 " #f)))"
 "(if or-part_348"
 " or-part_348"
 "(let-values(((or-part_349)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\f)"
-"(if(char=?(string-ref s_471 start_48) '#\\+) +inf.f -inf.f)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\f)"
+"(if(char=?(string-ref s_472 start_48) '#\\+) +inf.f -inf.f)"
 " #f)))"
 "(if or-part_349"
 " or-part_349"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false))"
-"(if(char=?(string-ref s_471 start_48) '#\\+) '+inf.t '-inf.t)"
+"(if(char=?(string-ref s_472 start_48) '#\\+) '+inf.t '-inf.t)"
 " #f)"
 " #f)))))"
 " #f)"
@@ -50766,19 +50765,19 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_347"
 " or-part_347"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 1))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 2))) '#\\a)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 3))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 4))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 1))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 2))) '#\\a)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 3))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 4))) '#\\.)"
 "(let-values(((or-part_350)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\0) +nan.0 #f)))"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\0) +nan.0 #f)))"
 "(if or-part_350"
 " or-part_350"
 "(let-values(((or-part_351)"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\f) +nan.f #f)))"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\f) +nan.f #f)))"
 "(if or-part_351"
 " or-part_351"
-"(if(char=?(char-downcase(string-ref s_471(+ start_48 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false)) '+nan.t #f)"
 " #f)))))"
 " #f)"
@@ -50808,7 +50807,7 @@ static const char *startup_source =
 " combine61_0)"
 "(begin"
 " 'read-for-special-compound62"
-"(let-values(((s_489) s54_0))"
+"(let-values(((s_490) s54_0))"
 "(let-values(((start_49) start55_0))"
 "(let-values(((end_39) end56_0))"
 "(let-values(((radix_10) radix57_0))"
@@ -50831,7 +50830,7 @@ static const char *startup_source =
 "(let-values()(fail-extflonum convert-mode_10 v_242))"
 "(let-values()"
 "(let-values(((v2_7)"
-"(let-values(((s173_0) s_489)"
+"(let-values(((s173_0) s_490)"
 "((start174_0) start_49)"
 "((end175_0) end_39)"
 "((radix176_0) radix_10)"
@@ -56324,11 +56323,11 @@ static const char *startup_source =
 "(let-values(((name_41)"
 "(let-values(((mod44_0) mod_18)((temp45_2) #t))"
 "(reference->resolved-module-path27.1 temp45_2 mod44_0))))"
-"(let-values(((phase_135)(namespace-phase ns_48)))"
+"(let-values(((phase_134)(namespace-phase ns_48)))"
 "(let-values(((m-ns_17)"
 "(let-values(((ns46_0) ns_48)"
 "((name47_1) name_41)"
-"((phase48_1) phase_135))"
+"((phase48_1) phase_134))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -56371,7 +56370,7 @@ static const char *startup_source =
 " temp49_3)))))"
 "(let-values(((ns41_0) ns_48)"
 "((temp42_3)(namespace-mpi m-ns_17))"
-"((phase43_1) phase_135))"
+"((phase43_1) phase_134))"
 "(namespace-module-make-available!112.1"
 " unsafe-undefined"
 " ns41_0"
@@ -57184,7 +57183,7 @@ static const char *startup_source =
 " stop-ids56_0"
 " intdefs57_0)))))))))))"
 "(case-lambda"
-"((s_446 context_11 stop-ids_3)(begin 'local-expand(local-expand5_0 s_446 context_11 stop-ids_3 '())))"
+"((s_447 context_11 stop-ids_3)(begin 'local-expand(local-expand5_0 s_447 context_11 stop-ids_3 '())))"
 "((s_75 context_12 stop-ids_4 intdefs1_1)(local-expand5_0 s_75 context_12 stop-ids_4 intdefs1_1)))))"
 "(define-values"
 "(1/local-expand/capture-lifts)"
@@ -57192,7 +57191,7 @@ static const char *startup_source =
 "(lambda(s9_1 context10_0 stop-ids11_0 intdefs7_0 lift-key8_0)"
 "(begin"
 " 'local-expand/capture-lifts12"
-"(let-values(((s_490) s9_1))"
+"(let-values(((s_491) s9_1))"
 "(let-values(((context_13) context10_0))"
 "(let-values(((stop-ids_5) stop-ids11_0))"
 "(let-values(((intdefs_5) intdefs7_0))"
@@ -57200,7 +57199,7 @@ static const char *startup_source =
 "(if(eq? lift-key8_0 unsafe-undefined)(generate-lift-key) lift-key8_0)))"
 "(let-values()"
 "(let-values(((temp58_3) 'local-expand)"
-"((s59_0) s_490)"
+"((s59_0) s_491)"
 "((context60_0) context_13)"
 "((stop-ids61_0) stop-ids_5)"
 "((intdefs62_0) intdefs_5)"
@@ -57226,8 +57225,8 @@ static const char *startup_source =
 "(local-expand/capture-lifts12_0 s_41 context_14 stop-ids_6 '() unsafe-undefined)))"
 "((s_86 context_15 stop-ids_7 intdefs_6 lift-key8_1)"
 "(local-expand/capture-lifts12_0 s_86 context_15 stop-ids_7 intdefs_6 lift-key8_1))"
-"((s_430 context_16 stop-ids_8 intdefs7_1)"
-"(local-expand/capture-lifts12_0 s_430 context_16 stop-ids_8 intdefs7_1 unsafe-undefined)))))"
+"((s_431 context_16 stop-ids_8 intdefs7_1)"
+"(local-expand/capture-lifts12_0 s_431 context_16 stop-ids_8 intdefs7_1 unsafe-undefined)))))"
 "(define-values"
 "(1/local-transformer-expand)"
 "(let-values(((local-transformer-expand18_0)"
@@ -57261,8 +57260,8 @@ static const char *startup_source =
 "(case-lambda"
 "((s_187 context_18 stop-ids_10)"
 "(begin 'local-transformer-expand(local-transformer-expand18_0 s_187 context_18 stop-ids_10 '())))"
-"((s_491 context_19 stop-ids_11 intdefs14_1)"
-"(local-transformer-expand18_0 s_491 context_19 stop-ids_11 intdefs14_1)))))"
+"((s_492 context_19 stop-ids_11 intdefs14_1)"
+"(local-transformer-expand18_0 s_492 context_19 stop-ids_11 intdefs14_1)))))"
 "(define-values"
 "(1/local-transformer-expand/capture-lifts)"
 "(let-values(((local-transformer-expand/capture-lifts25_0)"
@@ -57302,22 +57301,22 @@ static const char *startup_source =
 "(begin"
 " 'local-transformer-expand/capture-lifts"
 "(local-transformer-expand/capture-lifts25_0 s_19 context_21 stop-ids_13 '() unsafe-undefined)))"
-"((s_449 context_22 stop-ids_14 intdefs_9 lift-key21_1)"
-"(local-transformer-expand/capture-lifts25_0 s_449 context_22 stop-ids_14 intdefs_9 lift-key21_1))"
-"((s_492 context_23 stop-ids_15 intdefs20_1)"
-"(local-transformer-expand/capture-lifts25_0 s_492 context_23 stop-ids_15 intdefs20_1 unsafe-undefined)))))"
+"((s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1)"
+"(local-transformer-expand/capture-lifts25_0 s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1))"
+"((s_493 context_23 stop-ids_15 intdefs20_1)"
+"(local-transformer-expand/capture-lifts25_0 s_493 context_23 stop-ids_15 intdefs20_1 unsafe-undefined)))))"
 "(define-values"
 "(1/syntax-local-expand-expression)"
 "(let-values(((syntax-local-expand-expression29_0)"
 "(lambda(s28_1 opaque-only?27_0)"
 "(begin"
 " 'syntax-local-expand-expression29"
-"(let-values(((s_493) s28_1))"
+"(let-values(((s_494) s28_1))"
 "(let-values(((opaque-only?_0) opaque-only?27_0))"
 "(let-values()"
 "(let-values(((exp-s_11)"
 "(let-values(((temp79_0) 'syntax-local-expand-expression)"
-"((s80_2) s_493)"
+"((s80_2) s_494)"
 "((temp81_3) 'expression)"
 "((null82_0) null)"
 "((temp83_3) #f)"
@@ -57338,7 +57337,7 @@ static const char *startup_source =
 " temp81_3"
 " null82_0"
 " temp83_3))))"
-"(let-values(((ctx_73)(let-values()(get-current-expand-context16.1 #f 'unexpected))))"
+"(let-values(((ctx_72)(let-values()(get-current-expand-context16.1 #f 'unexpected))))"
 "(let-values(((ae_1)"
 "(flip-introduction-scopes"
 "(datum->syntax$1"
@@ -57346,22 +57345,22 @@ static const char *startup_source =
 "(already-expanded1.1"
 "(if(parsed? exp-s_11)"
 " exp-s_11"
-"(flip-introduction-scopes exp-s_11 ctx_73))"
-"(expand-context-binding-layer ctx_73)))"
-" ctx_73)))"
+"(flip-introduction-scopes exp-s_11 ctx_72))"
+"(expand-context-binding-layer ctx_72)))"
+" ctx_72)))"
 "(begin"
-"(let-values(((obs_60)(expand-context-observer ctx_73)))"
+"(let-values(((obs_60)(expand-context-observer ctx_72)))"
 "(if obs_60"
 "(let-values()(let-values()(call-expand-observe obs_60 'opaque-expr ae_1)))"
 "(void)))"
-"(let-values(((obs_4)(expand-context-observer ctx_73)))"
+"(let-values(((obs_4)(expand-context-observer ctx_72)))"
 "(if obs_4"
 "(let-values()(let-values()(call-expand-observe obs_4 'exit-local exp-s_11)))"
 "(void)))"
 "(values(if(not opaque-only?_0) exp-s_11 #f) ae_1))))))))))))"
 "(case-lambda"
 "((s_46)(begin 'syntax-local-expand-expression(syntax-local-expand-expression29_0 s_46 #f)))"
-"((s_484 opaque-only?27_1)(syntax-local-expand-expression29_0 s_484 opaque-only?27_1)))))"
+"((s_485 opaque-only?27_1)(syntax-local-expand-expression29_0 s_485 opaque-only?27_1)))))"
 "(define-values"
 "(do-local-expand50.1)"
 "(lambda(as-transformer?32_0"
@@ -57398,7 +57397,7 @@ static const char *startup_source =
 "(let-values(((skip-log-exit?_0) skip-log-exit?37_0))"
 "(let-values()"
 "(let-values()"
-"(let-values(((s_494)(datum->syntax$1 #f s-or-s-exp_0)))"
+"(let-values(((s_495)(datum->syntax$1 #f s-or-s-exp_0)))"
 "(let-values((()"
 "(begin"
 "(if(let-values(((or-part_366)(list? context_24)))"
@@ -57443,15 +57442,15 @@ static const char *startup_source =
 " intdefs-or-false?-string"
 " intdefs_10)))"
 "(values))))"
-"(let-values(((ctx_74)"
+"(let-values(((ctx_73)"
 "(let-values(((who88_0) who_34))"
 "(get-current-expand-context16.1 #f who88_0))))"
 "(let-values(((phase_91)"
 "(if as-transformer?_6"
-"(add1(expand-context-phase ctx_74))"
-"(expand-context-phase ctx_74))))"
+"(add1(expand-context-phase ctx_73))"
+"(expand-context-phase ctx_73))))"
 "(let-values(((local-ctx_0)"
-"(let-values(((ctx89_0) ctx_74)"
+"(let-values(((ctx89_0) ctx_73)"
 "((context90_0) context_24)"
 "((phase91_0) phase_91)"
 "((intdefs92_0) intdefs_10)"
@@ -57463,9 +57462,9 @@ static const char *startup_source =
 "(if or-part_169"
 " or-part_169"
 "(if(expand-context-in-local-expand?"
-" ctx_74)"
+" ctx_73)"
 "(expand-context-keep-#%expression?"
-" ctx_74)"
+" ctx_73)"
 " #f))))"
 "((track-to-be-defined?96_0)"
 " track-to-be-defined?_1))"
@@ -57481,7 +57480,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(namespace-visit-available-modules!"
-"(expand-context-namespace ctx_74)"
+"(expand-context-namespace ctx_73)"
 " phase_91)"
 "(values))))"
 "(let-values((()"
@@ -57494,12 +57493,12 @@ static const char *startup_source =
 "(call-expand-observe"
 " obs_7"
 " 'enter-local"
-" s_494)))"
+" s_495)))"
 "(void)))"
 "(values))))"
 "(let-values(((input-s_1)"
 "(let-values(((temp97_2)"
-"(flip-introduction-scopes s_494 ctx_74))"
+"(flip-introduction-scopes s_495 ctx_73))"
 "((intdefs98_0) intdefs_10))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
@@ -57643,7 +57642,7 @@ static const char *startup_source =
 " output-s_0"
 "(flip-introduction-scopes"
 " output-s_0"
-" ctx_74))))"
+" ctx_73))))"
 "(begin"
 "(if skip-log-exit?_0"
 "(void)"
@@ -57704,25 +57703,25 @@ static const char *startup_source =
 "(let-values()"
 "(taint-dispatch"
 " s_2"
-"(lambda(s_439)(syntax-arm$1 s_439 insp_21))"
+"(lambda(s_440)(syntax-arm$1 s_440 insp_21))"
 "(1/syntax-local-phase-level)))"
 "(let-values()(syntax-arm$1 s_2 insp_21))))))))))))))))"
 "(case-lambda"
-"((s_495)(begin 'syntax-arm(syntax-arm4_0 s_495 #f #f)))"
-"((s_446 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_446 maybe-insp_1 use-mode?2_1))"
+"((s_496)(begin 'syntax-arm(syntax-arm4_0 s_496 #f #f)))"
+"((s_447 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_447 maybe-insp_1 use-mode?2_1))"
 "((s_75 maybe-insp1_1)(syntax-arm4_0 s_75 maybe-insp1_1 #f)))))"
 "(define-values"
 "(1/syntax-disarm)"
-"(lambda(s_496 maybe-insp_2)"
+"(lambda(s_497 maybe-insp_2)"
 "(begin"
 " 'syntax-disarm"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_496)"
+"(if(syntax?$1 s_497)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_496)))"
+"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_497)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -57731,7 +57730,7 @@ static const char *startup_source =
 "(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_496 insp_22)))))))))"
+"(let-values(((insp_22)(inspector-for-taint maybe-insp_2)))(syntax-disarm$1 s_497 insp_22)))))))))"
 "(define-values"
 "(1/syntax-rearm)"
 "(let-values(((syntax-rearm9_0)"
@@ -57760,7 +57759,7 @@ static const char *startup_source =
 "(let-values()(syntax-rearm$1 s_180 from-s_2))))))))))))))"
 "(case-lambda"
 "((s_181 from-s_3)(begin 'syntax-rearm(syntax-rearm9_0 s_181 from-s_3 #f)))"
-"((s_441 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_441 from-s_4 use-mode?6_1)))))"
+"((s_442 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_442 from-s_4 use-mode?6_1)))))"
 "(define-values"
 "(1/syntax-taint)"
 "(lambda(s_5)"
@@ -58826,26 +58825,26 @@ static const char *startup_source =
 "(define-values(compile$1)(lambda(s_177)(begin 'compile((1/current-compile)(intro s_177) #f))))"
 "(define-values"
 "(1/compile-syntax)"
-"(lambda(s_497)"
+"(lambda(s_498)"
 "(begin"
 " 'compile-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_497) (void) (let-values () (raise-argument-error 'compile-syntax \"syntax?\" s_497)))"
-"((1/current-compile) s_497 #f)))))))"
+"            (if (syntax?$1 s_498) (void) (let-values () (raise-argument-error 'compile-syntax \"syntax?\" s_498)))"
+"((1/current-compile) s_498 #f)))))))"
 "(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_439)"
+"(lambda(s_440)"
 "(begin"
 " 'expand-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_439) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_439)))"
-"(expand$1 s_439(1/current-namespace) #t)))))))"
-"(define-values(1/expand-once)(lambda(s_446)(begin 'expand-once(expand-once$1(intro s_446)))))"
+"            (if (syntax?$1 s_440) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_440)))"
+"(expand$1 s_440(1/current-namespace) #t)))))))"
+"(define-values(1/expand-once)(lambda(s_447)(begin 'expand-once(expand-once$1(intro s_447)))))"
 "(define-values"
 "(1/expand-syntax-once)"
 "(lambda(s_178)"
@@ -59325,11 +59324,11 @@ static const char *startup_source =
 "(lambda()((1/current-eval) m-s_0))))))))))))))))))))"
 "(let-values()"
 "(let-values(((add-top-interaction_0)"
-"(lambda(s_496)"
+"(lambda(s_497)"
 "(begin"
 " 'add-top-interaction"
 "(1/namespace-syntax-introduce"
-"(1/datum->syntax #f(cons '#%top-interaction s_496) s_496))))))"
+"(1/datum->syntax #f(cons '#%top-interaction s_497) s_497))))))"
 "(let-values(((path1_0) path_12)"
 "((temp2_8)"
 "(lambda(i_183)"
@@ -59965,7 +59964,7 @@ static const char *startup_source =
 "(define-values(-prev-relto-dir) #f)"
 "(define-values"
 "(split-relative-string)"
-"(lambda(s_498 coll-mode?_0)"
+"(lambda(s_499 coll-mode?_0)"
 "(begin"
 "(let-values(((l_85)"
 "((letrec-values(((loop_118)"
@@ -59988,7 +59987,7 @@ static const char *startup_source =
 " iloop_2)"
 " 0))))))"
 " loop_118)"
-" s_498)))"
+" s_499)))"
 "(if coll-mode?_0"
 " l_85"
 "((letrec-values(((loop_101)"
@@ -60080,18 +60079,18 @@ static const char *startup_source =
 "(void))))"
 "(void))))"
 "(void)))))))"
-"((s_450 relto_0 stx_18)"
+"((s_451 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_450 relto_0 stx_18 #t)))"
-"((s_499 relto_1 stx_19 load?_7)"
+"(standard-module-name-resolver_0 s_451 relto_0 stx_18 #t)))"
+"((s_500 relto_1 stx_19 load?_7)"
 "(let-values((()"
 "(begin"
-"(if(1/module-path? s_499)"
+"(if(1/module-path? s_500)"
 "(void)"
 "(let-values()"
 "(if(syntax?$1 stx_19)"
@@ -60099,7 +60098,7 @@ static const char *startup_source =
 "(raise-argument-error"
 " 'standard-module-name-resolver"
 "                                                  \"module-path?\""
-" s_499))))"
+" s_500))))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -60162,19 +60161,19 @@ static const char *startup_source =
 " loop_119)"
 " null"
 " orig-l_10)))))"
-"(if(if(pair? s_499)(eq?(car s_499) 'quote) #f)"
-"(let-values()(1/make-resolved-module-path(cadr s_499)))"
-"(if(if(pair? s_499)"
-"(if(eq?(car s_499) 'submod)"
-"(if(pair?(cadr s_499))(eq?(caadr s_499) 'quote) #f)"
+"(if(if(pair? s_500)(eq?(car s_500) 'quote) #f)"
+"(let-values()(1/make-resolved-module-path(cadr s_500)))"
+"(if(if(pair? s_500)"
+"(if(eq?(car s_500) 'submod)"
+"(if(pair?(cadr s_500))(eq?(caadr s_500) 'quote) #f)"
 " #f)"
 " #f)"
 "(let-values()"
-"(1/make-resolved-module-path(flatten-sub-path_0(cadadr s_499)(cddr s_499))))"
-"(if(if(pair? s_499)"
-"(if(eq?(car s_499) 'submod)"
-"                                               (if (let-values (((or-part_102) (equal? (cadr s_499) \".\")))"
-"                                                     (if or-part_102 or-part_102 (equal? (cadr s_499) \"..\")))"
+"(1/make-resolved-module-path(flatten-sub-path_0(cadadr s_500)(cddr s_500))))"
+"(if(if(pair? s_500)"
+"(if(eq?(car s_500) 'submod)"
+"                                               (if (let-values (((or-part_102) (equal? (cadr s_500) \".\")))"
+"                                                     (if or-part_102 or-part_102 (equal? (cadr s_500) \"..\")))"
 "(if relto_1"
 "(let-values(((p_78)(1/resolved-module-path-name relto_1)))"
 "(let-values(((or-part_369)(symbol? p_78)))"
@@ -60191,27 +60190,27 @@ static const char *startup_source =
 "(flatten-sub-path_0"
 "(if(pair? rp_0)(car rp_0) rp_0)"
 "(let-values(((r_47)"
-"                                                             (if (equal? (cadr s_499) \"..\") (cdr s_499) (cddr s_499))))"
+"                                                             (if (equal? (cadr s_500) \"..\") (cdr s_500) (cddr s_500))))"
 "(if(pair? rp_0)(append(cdr rp_0) r_47) r_47))))))"
-"(if(if(pair? s_499)(eq?(car s_499) 'planet) #f)"
+"(if(if(pair? s_500)(eq?(car s_500) 'planet) #f)"
 "(let-values()"
 "(begin"
 "(prep-planet-resolver!_0)"
-"(planet-resolver_0 s_499 relto_1 stx_19 load?_7 #f orig-paramz)))"
-"(if(if(pair? s_499)"
-"(if(eq?(car s_499) 'submod)"
-"(if(pair?(cadr s_499))(eq?(caadr s_499) 'planet) #f)"
+"(planet-resolver_0 s_500 relto_1 stx_19 load?_7 #f orig-paramz)))"
+"(if(if(pair? s_500)"
+"(if(eq?(car s_500) 'submod)"
+"(if(pair?(cadr s_500))(eq?(caadr s_500) 'planet) #f)"
 " #f)"
 " #f)"
 "(let-values()"
 "(begin"
 "(prep-planet-resolver!_0)"
 "(planet-resolver_0"
-"(cadr s_499)"
+"(cadr s_500)"
 " relto_1"
 " stx_19"
 " load?_7"
-"(cddr s_499)"
+"(cddr s_500)"
 " orig-paramz)))"
 "(let-values()"
 "(let-values(((get-dir_0)"
@@ -60276,40 +60275,40 @@ static const char *startup_source =
 " msg_1"
 "(format"
 "                                                                                  \"\\n  for module path: ~s\\n\""
-" s_499)))))"
+" s_500)))))"
 "(raise"
 "(if stx_19"
 "(1/make-exn:fail:syntax:missing-module"
 " msg_2"
 "(current-continuation-marks)"
 "(list stx_19)"
-" s_499)"
+" s_500)"
 "(1/make-exn:fail:filesystem:missing-module"
 " msg_2"
 "(current-continuation-marks)"
-" s_499)))))))"
+" s_500)))))))"
 "((ss->rkt_0)"
-"(lambda(s_500)"
+"(lambda(s_501)"
 "(begin"
 " 'ss->rkt"
-"(let-values(((len_43)(string-length s_500)))"
+"(let-values(((len_43)(string-length s_501)))"
 "(if(if(>= len_43 3)"
 "(if(equal?"
 " '#\\."
-"(string-ref s_500(- len_43 3)))"
+"(string-ref s_501(- len_43 3)))"
 "(if(equal?"
 " '#\\s"
-"(string-ref s_500(- len_43 2)))"
+"(string-ref s_501(- len_43 2)))"
 "(equal?"
 " '#\\s"
-"(string-ref s_500(- len_43 1)))"
+"(string-ref s_501(- len_43 1)))"
 " #f)"
 " #f)"
 " #f)"
 "(string-append"
-"(substring s_500 0(- len_43 3))"
+"(substring s_501 0(- len_43 3))"
 "                                                                      \".rkt\")"
-" s_500)))))"
+" s_501)))))"
 "((path-ss->rkt_0)"
 "(lambda(p_81)"
 "(begin"
@@ -60319,9 +60318,9 @@ static const char *startup_source =
 "                                                                   (if (regexp-match '#rx\"[.]ss$\" (path->bytes name_78))"
 "                                                                     (path-replace-extension p_81 #\".rkt\")"
 " p_81)))))"
-"((s_501)"
-"(if(if(pair? s_499)(eq? 'submod(car s_499)) #f)"
-"(let-values(((v_259)(cadr s_499)))"
+"((s_502)"
+"(if(if(pair? s_500)(eq? 'submod(car s_500)) #f)"
+"(let-values(((v_259)(cadr s_500)))"
 "                                                                 (if (let-values (((or-part_371) (equal? v_259 \".\")))"
 "                                                                       (if or-part_371 or-part_371 (equal? v_259 \"..\")))"
 "(if relto_1"
@@ -60332,19 +60331,19 @@ static const char *startup_source =
 "(error"
 " 'standard-module-name-resolver"
 "                                                                      \"no base path for relative submodule path: ~.s\""
-" s_499))"
+" s_500))"
 " v_259))"
-" s_499))"
+" s_500))"
 "((subm-path_0)"
-"(if(if(pair? s_499)(eq? 'submod(car s_499)) #f)"
+"(if(if(pair? s_500)(eq? 'submod(car s_500)) #f)"
 "(let-values(((p_82)"
 "(if(if(let-values(((or-part_168)"
 "(equal?"
-"(cadr s_499)"
+"(cadr s_500)"
 "                                                                                                    \".\")))"
 "(if or-part_168"
 " or-part_168"
-"                                                                                         (equal? (cadr s_499) \"..\")))"
+"                                                                                         (equal? (cadr s_500) \"..\")))"
 " relto_1"
 " #f)"
 "(let-values(((p_83)"
@@ -60352,10 +60351,10 @@ static const char *startup_source =
 " relto_1))"
 "((r_48)"
 "(if(equal?"
-"(cadr s_499)"
+"(cadr s_500)"
 "                                                                                                  \"..\")"
-"(cdr s_499)"
-"(cddr s_499))))"
+"(cdr s_500)"
+"(cddr s_500))))"
 "(if(pair? p_83)"
 "(flatten-sub-path_0"
 "(car p_83)"
@@ -60363,22 +60362,22 @@ static const char *startup_source =
 "(flatten-sub-path_0 p_83 r_48)))"
 "(flatten-sub-path_0"
 "                                                                                \".\""
-"                                                                                (if (equal? (cadr s_499) \"..\")"
-"(cdr s_499)"
-"(cddr s_499))))))"
+"                                                                                (if (equal? (cadr s_500) \"..\")"
+"(cdr s_500)"
+"(cddr s_500))))))"
 "(if(pair? p_82)(cdr p_82) #f))"
 " #f)))"
 "(let-values(((s-parsed_0)"
-"(if(symbol? s_501)"
+"(if(symbol? s_502)"
 "(let-values()"
 "(let-values(((or-part_46)"
 "(path-cache-get"
-"(cons s_501(get-reg_0)))))"
+"(cons s_502(get-reg_0)))))"
 "(if or-part_46"
 " or-part_46"
 "(let-values(((cols_0 file_3)"
 "(split-relative-string"
-"(symbol->string s_501)"
+"(symbol->string s_502)"
 " #f)))"
 "(let-values(((f-file_0)"
 "(if(null? cols_0)"
@@ -60392,17 +60391,17 @@ static const char *startup_source =
 "(if(null? cols_0) null(cdr cols_0))"
 " f-file_0"
 " #t))))))"
-"(if(string? s_501)"
+"(if(string? s_502)"
 "(let-values()"
 "(let-values(((dir_4)(get-dir_0)))"
 "(let-values(((or-part_372)"
 "(path-cache-get"
-"(cons s_501 dir_4))))"
+"(cons s_502 dir_4))))"
 "(if or-part_372"
 " or-part_372"
 "(let-values(((cols_1 file_4)"
 "(split-relative-string"
-" s_501"
+" s_502"
 " #f)))"
 "(if(null? cols_1)"
 "(build-path dir_4(ss->rkt_0 file_4))"
@@ -60419,26 +60418,26 @@ static const char *startup_source =
 "(let-values() s_56))))"
 " cols_1)"
 "(list(ss->rkt_0 file_4))))))))))"
-"(if(path? s_501)"
+"(if(path? s_502)"
 "(let-values()"
 "(path-ss->rkt_0"
 "(simplify-path"
-"(if(complete-path? s_501)"
-" s_501"
-"(path->complete-path s_501(get-dir_0))))))"
-"(if(eq?(car s_501) 'lib)"
+"(if(complete-path? s_502)"
+" s_502"
+"(path->complete-path s_502(get-dir_0))))))"
+"(if(eq?(car s_502) 'lib)"
 "(let-values()"
 "(let-values(((or-part_85)"
 "(path-cache-get"
-"(cons s_501(get-reg_0)))))"
+"(cons s_502(get-reg_0)))))"
 "(if or-part_85"
 " or-part_85"
 "(let-values(((cols_2 file_5)"
 "(split-relative-string"
-"(cadr s_501)"
+"(cadr s_502)"
 " #f)))"
 "(let-values(((old-style?_0)"
-"(if(null?(cddr s_501))"
+"(if(null?(cddr s_502))"
 "(if(null? cols_2)"
 "(regexp-match?"
 "                                                                                                  '#rx\"[.]\""
@@ -60461,7 +60460,7 @@ static const char *startup_source =
 "(if old-style?_0"
 "(append"
 "(if(null?"
-"(cddr s_501))"
+"(cddr s_502))"
 "                                                                                                      '(\"mzlib\")"
 "(apply"
 " append"
@@ -60470,7 +60469,7 @@ static const char *startup_source =
 "(split-relative-string"
 " p_2"
 " #t))"
-"(cddr s_501))))"
+"(cddr s_502))))"
 " cols_2)"
 "(if(null? cols_2)"
 "(list file_5)"
@@ -60481,12 +60480,12 @@ static const char *startup_source =
 "(cdr cols_3)"
 " f-file_1"
 " #t))))))))"
-"(if(eq?(car s_501) 'file)"
+"(if(eq?(car s_502) 'file)"
 "(let-values()"
 "(path-ss->rkt_0"
 "(simplify-path"
 "(path->complete-path"
-"(expand-user-path(cadr s_501))"
+"(expand-user-path(cadr s_502))"
 "(get-dir_0)))))"
 "(void))))))))"
 "(begin"
@@ -60504,7 +60503,7 @@ static const char *startup_source =
 "(raise-argument-error"
 " 'standard-module-name-resolver"
 "                                                            \"module-path?\""
-" s_501))))"
+" s_502))))"
 "(let-values(((filename_2)"
 "(if(vector? s-parsed_0)"
 "(vector-ref s-parsed_0 0)"
@@ -60637,12 +60636,12 @@ static const char *startup_source =
 " p_84"
 " stx_19))"
 " values)"
-"(if(symbol? s_501)"
-"(let-values() s_501)"
-"(if(if(pair? s_501)"
-"(eq?(car s_501) 'lib)"
+"(if(symbol? s_502)"
+"(let-values() s_502)"
+"(if(if(pair? s_502)"
+"(eq?(car s_502) 'lib)"
 " #f)"
-"(let-values() s_501)"
+"(let-values() s_502)"
 "(let-values()"
 "(if(1/resolved-module-path?"
 " root-modname_0)"
@@ -60676,23 +60675,23 @@ static const char *startup_source =
 "(if(if(not(vector? s-parsed_0))"
 "(if load?_7"
 "(let-values(((or-part_374)"
-"(string? s_501)))"
+"(string? s_502)))"
 "(if or-part_374"
 " or-part_374"
 "(let-values(((or-part_375)"
-"(symbol? s_501)))"
+"(symbol? s_502)))"
 "(if or-part_375"
 " or-part_375"
-"(if(pair? s_501)"
-"(eq?(car s_501) 'lib)"
+"(if(pair? s_502)"
+"(eq?(car s_502) 'lib)"
 " #f)))))"
 " #f)"
 " #f)"
 "(let-values()"
 "(path-cache-set!"
-"(if(string? s_501)"
-"(cons s_501(get-dir_0))"
-"(cons s_501(get-reg_0)))"
+"(if(string? s_502)"
+"(cons s_502(get-dir_0))"
+"(cons s_502(get-reg_0)))"
 "(vector"
 " filename_2"
 " normal-filename_0"
@@ -60719,7 +60718,7 @@ static const char *startup_source =
 "(let-values()(c_113 e_88 #t))))))))))"
 "(define-values"
 "(default-compile-handler)"
-"(lambda(s_502 immediate-eval?_0)(begin(1/compile s_502(1/current-namespace)(not immediate-eval?_0)))))"
+"(lambda(s_503 immediate-eval?_0)(begin(1/compile s_503(1/current-namespace)(not immediate-eval?_0)))))"
 "(define-values"
 "(default-read-interaction)"
 "(lambda(src_10 in_90)"
@@ -60759,10 +60758,10 @@ static const char *startup_source =
 "(hash 'boot boot 'seal seal 'get-original-parameterization get-original-parameterization))"
 "(define-values"
 "(prepare-next-phase-namespace)"
-"(lambda(ctx_75)"
+"(lambda(ctx_74)"
 "(begin"
-"(let-values(((phase_42)(add1(expand-context-phase ctx_75))))"
-"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_75) phase_42)))"
+"(let-values(((phase_42)(add1(expand-context-phase ctx_74))))"
+"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_74) phase_42)))"
 "(namespace-visit-available-modules! ns_59 phase_42))))))"
 "(define-values"
 "(expand-body7.1)"
@@ -60770,13 +60769,13 @@ static const char *startup_source =
 "(begin"
 " 'expand-body7"
 "(let-values(((bodys_7) bodys5_0))"
-"(let-values(((ctx_76) ctx6_0))"
-"(let-values(((s_490) source1_0))"
+"(let-values(((ctx_75) ctx6_0))"
+"(let-values(((s_491) source1_0))"
 "(let-values(((stratified?_0) stratified?2_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_65)(expand-context-observer ctx_76)))"
+"(let-values(((obs_65)(expand-context-observer ctx_75)))"
 "(if obs_65"
 "(let-values()"
 "(let-values()"
@@ -60818,7 +60817,7 @@ static const char *startup_source =
 " lst_22))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_66)(expand-context-observer ctx_76)))"
+"(let-values(((obs_66)(expand-context-observer ctx_75)))"
 "(if obs_66"
 "(let-values()"
 "(let-values()"
@@ -60829,11 +60828,11 @@ static const char *startup_source =
 "(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_136)(expand-context-phase ctx_76)))"
+"(let-values(((phase_135)(expand-context-phase ctx_75)))"
 "(let-values(((frame-id_7)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
-"(let-values(((v_260) ctx_76))"
+"(let-values(((v_260) ctx_75))"
 "(let-values(((the-struct_90) v_260))"
 "(if(expand-context/outer? the-struct_90)"
 "(let-values(((context51_0)(list(make-liberal-define-context)))"
@@ -60843,13 +60842,13 @@ static const char *startup_source =
 "((post-expansion-scope55_0) inside-sc_0)"
 "((post-expansion-scope-action56_0) add-scope)"
 "((scopes57_1)"
-"(cons inside-sc_0(expand-context-scopes ctx_76)))"
+"(cons inside-sc_0(expand-context-scopes ctx_75)))"
 "((use-site-scopes58_0)(box null))"
 "((frame-id59_0) frame-id_7)"
 "((reference-records60_0)"
 "(cons"
 " frame-id_7"
-"(expand-context-reference-records ctx_76)))"
+"(expand-context-reference-records ctx_75)))"
 "((inner61_0)(root-expand-context/outer-inner v_260)))"
 "(expand-context/outer1.1"
 " inner61_0"
@@ -60877,10 +60876,10 @@ static const char *startup_source =
 " 'maybe-increment-binding-layer"
 "(if(eq?"
 "(expand-context-binding-layer body-ctx_1)"
-"(expand-context-binding-layer ctx_76))"
+"(expand-context-binding-layer ctx_75))"
 "(increment-binding-layer ids_30 body-ctx_1 inside-sc_0)"
 "(expand-context-binding-layer body-ctx_1))))))"
-"(let-values(((name_80)(expand-context-name ctx_76)))"
+"(let-values(((name_80)(expand-context-name ctx_75)))"
 "((letrec-values(((loop_120)"
 "(lambda(body-ctx_2"
 " bodys_8"
@@ -60905,7 +60904,7 @@ static const char *startup_source =
 "((temp68_6)(reverse$1 track-stxs_0))"
 "((temp69_4)(reverse$1 stx-clauses_0))"
 "((temp70_5)(reverse$1 done-bodys_0))"
-"((s71_0) s_490)"
+"((s71_0) s_491)"
 "((stratified?72_0) stratified?_0)"
 "((name73_0) name_80)"
 "((temp74_4)(reverse$1 trans-idss_1)))"
@@ -61001,7 +61000,7 @@ static const char *startup_source =
 "(let-values(((tmp_63)"
 "(core-form-sym"
 " disarmed-exp-body_0"
-" phase_136)))"
+" phase_135)))"
 "(if(equal? tmp_63 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -61018,35 +61017,35 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_34 begin79_0 e80_0)"
-"(let-values(((s_503)"
+"(let-values(((s_504)"
 " disarmed-exp-body_0))"
 "(let-values(((orig-s_38)"
-" s_503))"
+" s_504))"
 "(let-values(((begin79_1"
 " e80_1)"
-"(let-values(((s_504)"
+"(let-values(((s_505)"
 "(if(syntax?$1"
-" s_503)"
-"(syntax-e$1"
-" s_503)"
-" s_503)))"
-"(if(pair?"
 " s_504)"
+"(syntax-e$1"
+" s_504)"
+" s_504)))"
+"(if(pair?"
+" s_505)"
 "(let-values(((begin81_0)"
 "(let-values(((s_176)"
 "(car"
-" s_504)))"
+" s_505)))"
 " s_176))"
 "((e82_0)"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(cdr"
-" s_504)))"
+" s_505)))"
 "(let-values(((s_46)"
 "(if(syntax?$1"
-" s_450)"
+" s_451)"
 "(syntax-e$1"
-" s_450)"
-" s_450)))"
+" s_451)"
+" s_451)))"
 "(let-values(((flat-s_25)"
 "(to-syntax-list.1"
 " s_46)))"
@@ -61139,33 +61138,33 @@ static const char *startup_source =
 "(if(pair?"
 " s_51)"
 "(let-values(((define-values86_0)"
-"(let-values(((s_451)"
+"(let-values(((s_452)"
 "(car"
 " s_51)))"
-" s_451))"
+" s_452))"
 "((id87_0"
 " rhs88_0)"
-"(let-values(((s_505)"
+"(let-values(((s_506)"
 "(cdr"
 " s_51)))"
-"(let-values(((s_506)"
-"(if(syntax?$1"
-" s_505)"
-"(syntax-e$1"
-" s_505)"
-" s_505)))"
-"(if(pair?"
-" s_506)"
-"(let-values(((id89_1)"
 "(let-values(((s_507)"
-"(car"
+"(if(syntax?$1"
+" s_506)"
+"(syntax-e$1"
+" s_506)"
 " s_506)))"
+"(if(pair?"
+" s_507)"
+"(let-values(((id89_1)"
+"(let-values(((s_508)"
+"(car"
+" s_507)))"
 "(let-values(((s_53)"
 "(if(syntax?$1"
-" s_507)"
+" s_508)"
 "(syntax-e$1"
-" s_507)"
-" s_507)))"
+" s_508)"
+" s_508)))"
 "(let-values(((flat-s_26)"
 "(to-syntax-list.1"
 " s_53)))"
@@ -61188,7 +61187,7 @@ static const char *startup_source =
 "(check-list"
 " lst_190)))"
 "((letrec-values(((for-loop_202)"
-"(lambda(id_80"
+"(lambda(id_81"
 " lst_13)"
 "(begin"
 " 'for-loop"
@@ -61200,9 +61199,9 @@ static const char *startup_source =
 "((rest_104)"
 "(unsafe-cdr"
 " lst_13)))"
-"(let-values(((id_102)"
 "(let-values(((id_103)"
-" id_80))"
+"(let-values(((id_104)"
+" id_81))"
 "(let-values(((id_8)"
 "(let-values()"
 "(let-values(((id92_0)"
@@ -61226,16 +61225,16 @@ static const char *startup_source =
 " s_312)))))"
 "(cons"
 " id92_0"
-" id_103)))))"
+" id_104)))))"
 "(values"
 " id_8)))))"
 "(if(not"
 " #f)"
 "(for-loop_202"
-" id_102"
+" id_103"
 " rest_104)"
-" id_102)))"
-" id_80)))))"
+" id_103)))"
+" id_81)))))"
 " for-loop_202)"
 " null"
 " lst_190)))))"
@@ -61244,32 +61243,32 @@ static const char *startup_source =
 "((rhs90_0)"
 "(let-values(((s_33)"
 "(cdr"
-" s_506)))"
-"(let-values(((s_508)"
+" s_507)))"
+"(let-values(((s_509)"
 "(if(syntax?$1"
 " s_33)"
 "(syntax-e$1"
 " s_33)"
 " s_33)))"
 "(if(pair?"
-" s_508)"
+" s_509)"
 "(let-values(((rhs91_0)"
 "(let-values(((s_95)"
 "(car"
-" s_508)))"
+" s_509)))"
 " s_95))"
 "(()"
 "(let-values(((s_57)"
 "(cdr"
-" s_508)))"
-"(let-values(((s_509)"
+" s_509)))"
+"(let-values(((s_510)"
 "(if(syntax?$1"
 " s_57)"
 "(syntax-e$1"
 " s_57)"
 " s_57)))"
 "(if(null?"
-" s_509)"
+" s_510)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -61327,7 +61326,7 @@ static const char *startup_source =
 "(let-values(((ids93_0)"
 " ids_31)"
 "((phase94_1)"
-" phase_136)"
+" phase_135)"
 "((exp-body95_0)"
 " exp-body_0)"
 "((dups96_0)"
@@ -61340,7 +61339,7 @@ static const char *startup_source =
 " dups96_0))))"
 "(let-values(((counter_5)"
 "(root-expand-context-counter"
-" ctx_76)))"
+" ctx_75)))"
 "(let-values(((keys_5)"
 "(reverse$1"
 "(let-values(((lst_308)"
@@ -61359,7 +61358,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_309)"
-"(let-values(((id_104)"
+"(let-values(((id_105)"
 "(unsafe-car"
 " lst_309))"
 "((rest_182)"
@@ -61373,9 +61372,9 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id97_0)"
-" id_104)"
+" id_105)"
 "((phase98_0)"
-" phase_136)"
+" phase_135)"
 "((counter99_0)"
 " counter_5)"
 "((frame-id100_0)"
@@ -61436,7 +61435,7 @@ static const char *startup_source =
 "((rest_170)"
 "(unsafe-cdr"
 " lst_310))"
-"((id_105)"
+"((id_106)"
 "(unsafe-car"
 " lst_294))"
 "((rest_183)"
@@ -61451,7 +61450,7 @@ static const char *startup_source =
 " env_19"
 " key_88"
 "(local-variable1.1"
-" id_105)))))"
+" id_106)))))"
 "(values"
 " env_20)))))"
 "(if(not"
@@ -61648,8 +61647,8 @@ static const char *startup_source =
 "(let-values()"
 "(no-binds"
 " done-body_2"
-" s_490"
-" phase_136))"
+" s_491"
+" phase_135))"
 " fold-var_294))))"
 "(values"
 " fold-var_39)))))"
@@ -61741,45 +61740,45 @@ static const char *startup_source =
 "(let-values(((define-syntaxes105_1"
 " id106_1"
 " rhs107_1)"
-"(let-values(((s_510)"
+"(let-values(((s_511)"
 "(if(syntax?$1"
 " s_213)"
 "(syntax-e$1"
 " s_213)"
 " s_213)))"
 "(if(pair?"
-" s_510)"
+" s_511)"
 "(let-values(((define-syntaxes108_0)"
 "(let-values(((s_216)"
 "(car"
-" s_510)))"
+" s_511)))"
 " s_216))"
 "((id109_0"
 " rhs110_0)"
-"(let-values(((s_511)"
-"(cdr"
-" s_510)))"
 "(let-values(((s_512)"
-"(if(syntax?$1"
-" s_511)"
-"(syntax-e$1"
-" s_511)"
+"(cdr"
 " s_511)))"
-"(if(pair?"
-" s_512)"
-"(let-values(((id111_0)"
 "(let-values(((s_513)"
-"(car"
-" s_512)))"
-"(let-values(((s_514)"
 "(if(syntax?$1"
-" s_513)"
+" s_512)"
 "(syntax-e$1"
+" s_512)"
+" s_512)))"
+"(if(pair?"
 " s_513)"
+"(let-values(((id111_0)"
+"(let-values(((s_514)"
+"(car"
 " s_513)))"
+"(let-values(((s_515)"
+"(if(syntax?$1"
+" s_514)"
+"(syntax-e$1"
+" s_514)"
+" s_514)))"
 "(let-values(((flat-s_27)"
 "(to-syntax-list.1"
-" s_514)))"
+" s_515)))"
 "(if(not"
 " flat-s_27)"
 "(let-values()"
@@ -61788,7 +61787,7 @@ static const char *startup_source =
 "                                                                                                                                                                   \"bad syntax\""
 " orig-s_7))"
 "(let-values()"
-"(let-values(((id_106)"
+"(let-values(((id_107)"
 "(let-values(((lst_315)"
 " flat-s_27))"
 "(begin"
@@ -61799,63 +61798,63 @@ static const char *startup_source =
 "(check-list"
 " lst_315)))"
 "((letrec-values(((for-loop_286)"
-"(lambda(id_107"
+"(lambda(id_108"
 " lst_316)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_316)"
-"(let-values(((s_515)"
+"(let-values(((s_516)"
 "(unsafe-car"
 " lst_316))"
 "((rest_187)"
 "(unsafe-cdr"
 " lst_316)))"
 "(let-values(((id_64)"
-"(let-values(((id_108)"
-" id_107))"
 "(let-values(((id_109)"
+" id_108))"
+"(let-values(((id_110)"
 "(let-values()"
 "(let-values(((id114_0)"
 "(let-values()"
 "(if(let-values(((or-part_133)"
 "(if(syntax?$1"
-" s_515)"
+" s_516)"
 "(symbol?"
 "(syntax-e$1"
-" s_515))"
+" s_516))"
 " #f)))"
 "(if or-part_133"
 " or-part_133"
 "(symbol?"
-" s_515)))"
-" s_515"
+" s_516)))"
+" s_516"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_7"
-" s_515)))))"
+" s_516)))))"
 "(cons"
 " id114_0"
-" id_108)))))"
-"(values"
 " id_109)))))"
+"(values"
+" id_110)))))"
 "(if(not"
 " #f)"
 "(for-loop_286"
 " id_64"
 " rest_187)"
 " id_64)))"
-" id_107)))))"
+" id_108)))))"
 " for-loop_286)"
 " null"
 " lst_315)))))"
 "(reverse$1"
-" id_106))))))))"
+" id_107))))))))"
 "((rhs112_0)"
 "(let-values(((s_102)"
 "(cdr"
-" s_512)))"
+" s_513)))"
 "(let-values(((s_103)"
 "(if(syntax?$1"
 " s_102)"
@@ -61938,7 +61937,7 @@ static const char *startup_source =
 "(let-values(((ids115_0)"
 " ids_32)"
 "((phase116_0)"
-" phase_136)"
+" phase_135)"
 "((exp-body117_0)"
 " exp-body_0)"
 "((dups118_0)"
@@ -61951,7 +61950,7 @@ static const char *startup_source =
 " dups118_0))))"
 "(let-values(((counter_6)"
 "(root-expand-context-counter"
-" ctx_76)))"
+" ctx_75)))"
 "(let-values(((keys_6)"
 "(reverse$1"
 "(let-values(((lst_317)"
@@ -61970,7 +61969,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_318)"
-"(let-values(((id_110)"
+"(let-values(((id_111)"
 "(unsafe-car"
 " lst_318))"
 "((rest_188)"
@@ -61984,9 +61983,9 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id119_0)"
-" id_110)"
+" id_111)"
 "((phase120_0)"
-" phase_136)"
+" phase_135)"
 "((counter121_0)"
 " counter_6)"
 "((frame-id122_0)"
@@ -62028,7 +62027,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
-" ctx_76)"
+" ctx_75)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -62102,7 +62101,7 @@ static const char *startup_source =
 "((rest_190)"
 "(unsafe-cdr"
 " lst_322))"
-"((id_111)"
+"((id_112)"
 "(unsafe-car"
 " lst_323))"
 "((rest_191)"
@@ -62116,8 +62115,8 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_41"
-" id_111"
-" phase_136"
+" id_112"
+" phase_135"
 " body-ctx_2)"
 "(env-extend"
 " env_23"
@@ -62242,7 +62241,7 @@ static const char *startup_source =
 "(cons"
 "(core-id"
 " '#%stratified-body"
-" phase_136)"
+" phase_135)"
 "(cons"
 " exp-body_0"
 " rest-bodys_0)))))"
@@ -62628,13 +62627,13 @@ static const char *startup_source =
 "(let-values(((track-stxs_2) track-stxs47_0))"
 "(let-values(((split?_0) split?30_0))"
 "(let-values(((frame-id_14) frame-id31_0))"
-"(let-values(((ctx_77) ctx32_0))"
+"(let-values(((ctx_76) ctx32_0))"
 "(let-values(((s_366) 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_137)(expand-context-phase ctx_77)))"
+"(let-values(((phase_136)(expand-context-phase ctx_76)))"
 "((letrec-values(((loop_27)"
 "(lambda(idss_2"
 " keyss_1"
@@ -62656,7 +62655,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((exp-body_1)(get-body_0)))"
 "(let-values(((result-s_9)"
-"(if(expand-context-to-parsed? ctx_77)"
+"(if(expand-context-to-parsed? ctx_76)"
 "(if(null? accum-idss_0)"
 "(parsed-let-values17.1"
 "(keep-properties-only s_366)"
@@ -62679,10 +62678,10 @@ static const char *startup_source =
 "(if(null? accum-idss_0)"
 "(core-id"
 " 'let-values"
-" phase_137)"
+" phase_136)"
 "(core-id"
 " 'letrec-values"
-" phase_137))"
+" phase_136))"
 "(build-clauses"
 " accum-idss_0"
 " accum-rhss_0"
@@ -62694,11 +62693,11 @@ static const char *startup_source =
 " temp151_1)))))"
 "(begin"
 "(let-values(((obs_81)"
-"(expand-context-observer ctx_77)))"
+"(expand-context-observer ctx_76)))"
 "(if obs_81"
 "(let-values()"
 "(if(if can-log?_0"
-"(log-tag? had-stxes?_0 ctx_77)"
+"(log-tag? had-stxes?_0 ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
@@ -62713,7 +62712,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_82)"
 "(expand-context-observer"
-" ctx_77)))"
+" ctx_76)))"
 "(if obs_82"
 "(let-values()"
 "(let-values()"
@@ -62725,7 +62724,7 @@ static const char *startup_source =
 "(let-values(((temp152_1)(car rhss_2))"
 "((temp153_1)"
 "(as-named-context"
-" ctx_77"
+" ctx_76"
 " ids_33)))"
 "(expand9.1"
 " #f"
@@ -62773,7 +62772,7 @@ static const char *startup_source =
 " #f)))"
 "(let-values(((result-s_10)"
 "(if(expand-context-to-parsed?"
-" ctx_77)"
+" ctx_76)"
 "(parsed-let-values17.1"
 "(keep-properties-only"
 " s_366)"
@@ -62791,7 +62790,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'let-values"
-" phase_137)"
+" phase_136)"
 "(list"
 "(build-clause"
 " ids_33"
@@ -62805,13 +62804,13 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_83)"
 "(expand-context-observer"
-" ctx_77)))"
+" ctx_76)))"
 "(if obs_83"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
 " had-stxes?_0"
-" ctx_77)"
+" ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
@@ -62845,7 +62844,7 @@ static const char *startup_source =
 " #f)))"
 "(let-values(((result-s_11)"
 "(if(expand-context-to-parsed?"
-" ctx_77)"
+" ctx_76)"
 "(parsed-letrec-values18.1"
 "(keep-properties-only"
 " s_366)"
@@ -62871,7 +62870,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'letrec-values"
-" phase_137)"
+" phase_136)"
 "(build-clauses"
 "(cons"
 " ids_33"
@@ -62890,13 +62889,13 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_84)"
 "(expand-context-observer"
-" ctx_77)))"
+" ctx_76)))"
 "(if obs_84"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
 " had-stxes?_0"
-" ctx_77)"
+" ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
@@ -62945,22 +62944,22 @@ 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_516 phase_138)"
+"(lambda(expr_10 s_517 phase_137)"
 "(begin"
-"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_138)))"
+"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_137)))"
 "(datum->syntax$1"
-"(core-id '#%app phase_138)"
-"(list(core-id 'begin phase_138) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
-" s_516)))))"
+"(core-id '#%app phase_137)"
+"(list(core-id 'begin phase_137) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
+" s_517)))))"
 "(define-values"
 "(log-tag?)"
-"(lambda(had-stxes?_1 ctx_78)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_78)) #f))))"
+"(lambda(had-stxes?_1 ctx_77)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_77)) #f))))"
 "(define-values"
 "(log-letrec-values$1)"
-"(lambda(obs_85 ctx_79 s_396 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
+"(lambda(obs_85 ctx_78 s_396 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
 "(begin"
 " 'log-letrec-values"
-"(let-values(((phase_139)(expand-context-phase ctx_79)))"
+"(let-values(((phase_138)(expand-context-phase ctx_78)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
 "(let-values(((lst_324) val-idss_2)((lst_325) val-rhss_2)((lst_326) track-stxs_4))"
@@ -63007,7 +63006,7 @@ static const char *startup_source =
 " lst_325"
 " lst_326))))))"
 "(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_139)))"
+"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_138)))"
 "(let-values(((lv-s_0)"
 "(datum->syntax$1"
 " #f"
@@ -63052,10 +63051,10 @@ static const char *startup_source =
 "(datum->syntax$1 #f done-bodys_2 s_396))))))))))))))"
 "(define-values"
 "(lambda-clause-expander)"
-"(lambda(s_74 disarmed-s_5 formals_1 bodys_9 ctx_80 log-renames-tag_0)"
+"(lambda(s_74 disarmed-s_5 formals_1 bodys_9 ctx_79 log-renames-tag_0)"
 "(begin"
 "(let-values(((sc_36)(new-scope 'local)))"
-"(let-values(((phase_82)(expand-context-phase ctx_80)))"
+"(let-values(((phase_82)(expand-context-phase ctx_79)))"
 "(let-values(((ids_35)(parse-and-flatten-formals formals_1 sc_36 disarmed-s_5)))"
 "(let-values((()"
 "(begin"
@@ -63065,7 +63064,7 @@ static const char *startup_source =
 "                                         ((temp36_8) \"argument name\"))"
 "(check-no-duplicate-ids7.1 temp36_8 ids33_0 phase34_1 s35_1 unsafe-undefined))"
 "(values))))"
-"(let-values(((counter_7)(root-expand-context-counter ctx_80)))"
+"(let-values(((counter_7)(root-expand-context-counter ctx_79)))"
 "(let-values(((keys_7)"
 "(reverse$1"
 "(let-values(((lst_88) ids_35))"
@@ -63078,7 +63077,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_159)"
-"(let-values(((id_112)(unsafe-car lst_159))"
+"(let-values(((id_113)(unsafe-car lst_159))"
 "((rest_83)(unsafe-cdr lst_159)))"
 "(let-values(((fold-var_33)"
 "(let-values(((fold-var_34) fold-var_150))"
@@ -63087,7 +63086,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id37_0)"
-" id_112)"
+" id_113)"
 "((phase38_1)"
 " phase_82)"
 "((counter39_0)"
@@ -63125,7 +63124,7 @@ static const char *startup_source =
 "(if(if(pair? lst_82)(pair? lst_58) #f)"
 "(let-values(((key_90)(unsafe-car lst_82))"
 "((rest_196)(unsafe-cdr lst_82))"
-"((id_113)(unsafe-car lst_58))"
+"((id_114)(unsafe-car lst_58))"
 "((rest_197)(unsafe-cdr lst_58)))"
 "(let-values(((env_26)"
 "(let-values(((env_27) env_25))"
@@ -63135,14 +63134,14 @@ static const char *startup_source =
 " env_27"
 " key_90"
 "(local-variable1.1"
-" id_113)))))"
+" id_114)))))"
 "(values env_28)))))"
 "(if(not #f)"
 "(for-loop_49 env_26 rest_196 rest_197)"
 " env_26)))"
 " env_25)))))"
 " for-loop_49)"
-"(expand-context-env ctx_80)"
+"(expand-context-env ctx_79)"
 " lst_80"
 " lst_91)))))"
 "(let-values(((sc-formals_0)(add-scope formals_1 sc_36)))"
@@ -63181,7 +63180,7 @@ static const char *startup_source =
 " lst_17))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_86)(expand-context-observer ctx_80)))"
+"(let-values(((obs_86)(expand-context-observer ctx_79)))"
 "(if obs_86"
 "(let-values()"
 "(let-values()"
@@ -63193,13 +63192,13 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_4)"
-"(let-values(((v_266) ctx_80))"
+"(let-values(((v_266) ctx_79))"
 "(let-values(((the-struct_96) v_266))"
 "(if(expand-context/outer? the-struct_96)"
 "(let-values(((env41_0) body-env_0)"
-"((scopes42_0)(cons sc_36(expand-context-scopes ctx_80)))"
+"((scopes42_0)(cons sc_36(expand-context-scopes ctx_79)))"
 "((binding-layer43_0)"
-"(increment-binding-layer ids_35 ctx_80 sc_36))"
+"(increment-binding-layer ids_35 ctx_79 sc_36))"
 "((frame-id44_0) #f)"
 "((inner45_0)(root-expand-context/outer-inner v_266)))"
 "(expand-context/outer1.1"
@@ -63226,29 +63225,29 @@ static const char *startup_source =
 "(let-values(((sc-bodys46_0) sc-bodys_0)"
 "((body-ctx47_0) body-ctx_4)"
 "((temp48_4)"
-"(let-values(((ctx49_0) ctx_80)((s50_0) s_74)((temp51_3) #t))"
+"(let-values(((ctx49_0) ctx_79)((s50_0) s_74)((temp51_3) #t))"
 "(keep-as-needed119.1 #f temp51_3 #f ctx49_0 s50_0))))"
 "(expand-body7.1 temp48_4 #f sc-bodys46_0 body-ctx47_0))))"
 "(values"
-"(if(expand-context-to-parsed? ctx_80)"
+"(if(expand-context-to-parsed? ctx_79)"
 "(unflatten-like-formals keys_7 formals_1)"
 " sc-formals_0)"
 " exp-body_2))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'lambda"
-"(lambda(s_13 ctx_81)"
+"(lambda(s_13 ctx_80)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_87)(expand-context-observer ctx_81)))"
+"(let-values(((obs_87)(expand-context-observer ctx_80)))"
 "(if obs_87(let-values()(let-values()(call-expand-observe obs_87 'prim-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_6)(syntax-disarm$1 s_13)))"
 "(let-values(((ok?_37 lambda52_0 formals53_0 body54_0)"
-"(let-values(((s_493) disarmed-s_6))"
-"(let-values(((orig-s_40) s_493))"
+"(let-values(((s_494) disarmed-s_6))"
+"(let-values(((orig-s_40) s_494))"
 "(let-values(((lambda52_1 formals53_1 body54_1)"
-"(let-values(((s_172)(if(syntax?$1 s_493)(syntax-e$1 s_493) s_493)))"
+"(let-values(((s_172)(if(syntax?$1 s_494)(syntax-e$1 s_494) s_494)))"
 "(if(pair? s_172)"
 "(let-values(((lambda55_0)(let-values(((s_45)(car s_172))) s_45))"
 "((formals56_0 body57_0)"
@@ -63263,13 +63262,13 @@ static const char *startup_source =
 " s_175))"
 "((body59_0)"
 "(let-values(((s_176)(cdr s_174)))"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(if(syntax?$1 s_176)"
 "(syntax-e$1 s_176)"
 " s_176)))"
 "(let-values(((flat-s_28)"
 "(to-syntax-list.1"
-" s_450)))"
+" s_451)))"
 "(if(not flat-s_28)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -63290,11 +63289,11 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_40)))))"
 "(values #t lambda52_1 formals53_1 body54_1))))))"
 "(let-values(((rebuild-s_4)"
-"(let-values(((ctx60_1) ctx_81)((s61_0) s_13)((temp62_2) #t))"
+"(let-values(((ctx60_1) ctx_80)((s61_0) s_13)((temp62_2) #t))"
 "(keep-as-needed119.1 #f #f temp62_2 ctx60_1 s61_0))))"
 "(let-values(((formals_2 body_11)"
-"(lambda-clause-expander s_13 disarmed-s_6 formals53_0 body54_0 ctx_81 'lambda-renames)))"
-"(if(expand-context-to-parsed? ctx_81)"
+"(lambda-clause-expander s_13 disarmed-s_6 formals53_0 body54_0 ctx_80 'lambda-renames)))"
+"(if(expand-context-to-parsed? ctx_80)"
 "(parsed-lambda5.1 rebuild-s_4 formals_2 body_11)"
 "(let-values(((rebuild-s63_0) rebuild-s_4)((temp64_4)(list* lambda52_0 formals_2 body_11)))"
 "(rebuild5.1 #t rebuild-s63_0 temp64_4)))))))))))"
@@ -63303,16 +63302,16 @@ static const char *startup_source =
 " 'λ"
 "(lambda(s_26)"
 "(let-values(((ok?_38 lam-id65_0 formals66_0 _67_0)"
-"(let-values(((s_517) s_26))"
-"(let-values(((orig-s_41) s_517))"
+"(let-values(((s_518) s_26))"
+"(let-values(((orig-s_41) s_518))"
 "(let-values(((lam-id65_1 formals66_1 _67_1)"
-"(let-values(((s_500)(if(syntax?$1 s_517)(syntax-e$1 s_517) s_517)))"
-"(if(pair? s_500)"
-"(let-values(((lam-id68_0)(let-values(((s_505)(car s_500))) s_505))"
+"(let-values(((s_501)(if(syntax?$1 s_518)(syntax-e$1 s_518) s_518)))"
+"(if(pair? s_501)"
+"(let-values(((lam-id68_0)(let-values(((s_506)(car s_501))) s_506))"
 "((formals69_0 _70_0)"
-"(let-values(((s_506)(cdr s_500)))"
+"(let-values(((s_507)(cdr s_501)))"
 "(let-values(((s_52)"
-"(if(syntax?$1 s_506)(syntax-e$1 s_506) s_506)))"
+"(if(syntax?$1 s_507)(syntax-e$1 s_507) s_507)))"
 "(if(pair? s_52)"
 "(let-values(((formals71_0)"
 "(let-values(((s_53)(car s_52))) s_53))"
@@ -63343,8 +63342,8 @@ static const char *startup_source =
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_41)))))"
 "(values #t lam-id65_1 formals66_1 _67_1))))))"
 "(let-values(((ids_36)(parse-and-flatten-formals formals66_0 #f s_26)))"
-"(let-values(((ctx_74)(let-values(((temp77_4) #t))(get-current-expand-context16.1 temp77_4 'unexpected))))"
-"(let-values(((phase_91)(if ctx_74(expand-context-phase ctx_74) 0)))"
+"(let-values(((ctx_73)(let-values(((temp77_4) #t))(get-current-expand-context16.1 temp77_4 'unexpected))))"
+"(let-values(((phase_91)(if ctx_73(expand-context-phase ctx_73) 0)))"
 "(begin"
 "               (let-values (((ids73_0) ids_36) ((phase74_2) phase_91) ((s75_0) s_26) ((temp76_6) \"argument name\"))"
 "(check-no-duplicate-ids7.1 temp76_6 ids73_0 phase74_2 s75_0 unsafe-undefined))"
@@ -63358,29 +63357,29 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'case-lambda"
-"(lambda(s_453 ctx_82)"
+"(lambda(s_454 ctx_81)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_88)(expand-context-observer ctx_82)))"
+"(let-values(((obs_88)(expand-context-observer ctx_81)))"
 "(if obs_88"
 "(let-values()(let-values()(call-expand-observe obs_88 'prim-case-lambda)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_7)(syntax-disarm$1 s_453)))"
+"(let-values(((disarmed-s_7)(syntax-disarm$1 s_454)))"
 "(let-values(((ok?_39 case-lambda78_0 formals79_0 body80_0)"
-"(let-values(((s_518) disarmed-s_7))"
-"(let-values(((orig-s_42) s_518))"
+"(let-values(((s_519) disarmed-s_7))"
+"(let-values(((orig-s_42) s_519))"
 "(let-values(((case-lambda78_1 formals79_1 body80_1)"
-"(let-values(((s_416)(if(syntax?$1 s_518)(syntax-e$1 s_518) s_518)))"
+"(let-values(((s_416)(if(syntax?$1 s_519)(syntax-e$1 s_519) s_519)))"
 "(if(pair? s_416)"
-"(let-values(((case-lambda81_0)(let-values(((s_519)(car s_416))) s_519))"
+"(let-values(((case-lambda81_0)(let-values(((s_520)(car s_416))) s_520))"
 "((formals82_0 body83_0)"
 "(let-values(((s_407)(cdr s_416)))"
-"(let-values(((s_520)"
+"(let-values(((s_521)"
 "(if(syntax?$1 s_407)"
 "(syntax-e$1 s_407)"
 " s_407)))"
-"(let-values(((flat-s_30)(to-syntax-list.1 s_520)))"
+"(let-values(((flat-s_30)(to-syntax-list.1 s_521)))"
 "(if(not flat-s_30)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_42))"
@@ -63419,32 +63418,32 @@ static const char *startup_source =
 "(let-values(((formals90_0"
 " body91_0)"
 "(let-values()"
-"(let-values(((s_521)"
+"(let-values(((s_522)"
 "(if(syntax?$1"
 " s_208)"
 "(syntax-e$1"
 " s_208)"
 " s_208)))"
 "(if(pair?"
-" s_521)"
+" s_522)"
 "(let-values(((formals84_0)"
-"(let-values(((s_522)"
-"(car"
-" s_521)))"
-" s_522))"
-"((body85_0)"
 "(let-values(((s_523)"
-"(cdr"
-" s_521)))"
+"(car"
+" s_522)))"
+" s_523))"
+"((body85_0)"
 "(let-values(((s_524)"
+"(cdr"
+" s_522)))"
+"(let-values(((s_525)"
 "(if(syntax?$1"
-" s_523)"
+" s_524)"
 "(syntax-e$1"
-" s_523)"
-" s_523)))"
+" s_524)"
+" s_524)))"
 "(let-values(((flat-s_31)"
 "(to-syntax-list.1"
-" s_524)))"
+" s_525)))"
 "(if(not"
 " flat-s_31)"
 "(let-values()"
@@ -63501,20 +63500,20 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_42)))))"
 "(values #t case-lambda78_1 formals79_1 body80_1))))))"
 "(let-values(((ok?_40 case-lambda86_0 clause87_0)"
-"(let-values(((s_525) disarmed-s_7))"
-"(let-values(((orig-s_43) s_525))"
+"(let-values(((s_526) disarmed-s_7))"
+"(let-values(((orig-s_43) s_526))"
 "(let-values(((case-lambda86_1 clause87_1)"
-"(let-values(((s_458)(if(syntax?$1 s_525)(syntax-e$1 s_525) s_525)))"
-"(if(pair? s_458)"
+"(let-values(((s_459)(if(syntax?$1 s_526)(syntax-e$1 s_526) s_526)))"
+"(if(pair? s_459)"
 "(let-values(((case-lambda88_0)"
-"(let-values(((s_210)(car s_458))) s_210))"
+"(let-values(((s_210)(car s_459))) s_210))"
 "((clause89_0)"
-"(let-values(((s_526)(cdr s_458)))"
-"(let-values(((s_527)"
-"(if(syntax?$1 s_526)"
-"(syntax-e$1 s_526)"
-" s_526)))"
-"(let-values(((flat-s_32)(to-syntax-list.1 s_527)))"
+"(let-values(((s_527)(cdr s_459)))"
+"(let-values(((s_528)"
+"(if(syntax?$1 s_527)"
+"(syntax-e$1 s_527)"
+" s_527)))"
+"(let-values(((flat-s_32)(to-syntax-list.1 s_528)))"
 "(if(not flat-s_32)"
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_43))"
@@ -63523,7 +63522,7 @@ static const char *startup_source =
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_43)))))"
 "(values #t case-lambda86_1 clause87_1))))))"
 "(let-values(((rebuild-s_5)"
-"(let-values(((ctx92_0) ctx_82)((s93_0) s_453)((temp94_2) #t))"
+"(let-values(((ctx92_0) ctx_81)((s93_0) s_454)((temp94_2) #t))"
 "(keep-as-needed119.1 #f #f temp94_2 ctx92_0 s93_0))))"
 "(let-values(((clauses_1)"
 "(reverse$1"
@@ -63561,7 +63560,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_89)"
 "(expand-context-observer"
-" ctx_82)))"
+" ctx_81)))"
 "(if obs_89"
 "(let-values()"
 "(let-values()"
@@ -63572,7 +63571,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((rebuild-clause_0)"
 "(let-values(((ctx95_0)"
-" ctx_82)"
+" ctx_81)"
 "((clause96_0)"
 " clause_3))"
 "(keep-as-needed119.1"
@@ -63584,14 +63583,14 @@ static const char *startup_source =
 "(let-values(((exp-formals_0"
 " exp-body_3)"
 "(lambda-clause-expander"
-" s_453"
+" s_454"
 " disarmed-s_7"
 " formals_8"
 " body_17"
-" ctx_82"
+" ctx_81"
 " 'lambda-renames)))"
 "(if(expand-context-to-parsed?"
-" ctx_82)"
+" ctx_81)"
 "(list"
 " exp-formals_0"
 " exp-body_3)"
@@ -63616,13 +63615,13 @@ static const char *startup_source =
 " lst_112"
 " lst_200"
 " lst_113))))))"
-"(if(expand-context-to-parsed? ctx_82)"
+"(if(expand-context-to-parsed? ctx_81)"
 "(parsed-case-lambda6.1 rebuild-s_5 clauses_1)"
 "(let-values(((rebuild-s99_0) rebuild-s_5)((temp100_2)(list* case-lambda78_0 clauses_1)))"
 "(rebuild5.1 #t rebuild-s99_0 temp100_2))))))))))))"
 "(define-values"
 "(parse-and-flatten-formals)"
-"(lambda(all-formals_0 sc_37 s_528)"
+"(lambda(all-formals_0 sc_37 s_529)"
 "(begin"
 "((letrec-values(((loop_121)"
 "(lambda(formals_9)"
@@ -63637,21 +63636,21 @@ static const char *startup_source =
 "(let-values()(loop_121 p_85))"
 "(if(null? p_85)"
 "(let-values() null)"
-"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_528 p_85))))))"
+"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_529 p_85))))))"
 "(if(pair? formals_9)"
 "(let-values()"
 "(begin"
 "(if(identifier?(car formals_9))"
 "(void)"
 "(let-values()"
-"                                          (raise-syntax-error$1 #f \"not an identifier\" s_528 (car formals_9))))"
+"                                          (raise-syntax-error$1 #f \"not an identifier\" s_529 (car formals_9))))"
 "(cons"
 "(if sc_37(add-scope(car formals_9) sc_37)(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_528 all-formals_0))))))))))"
+"                                      (raise-syntax-error$1 \"bad argument sequence\" s_529 all-formals_0))))))))))"
 " loop_121)"
 " all-formals_0))))"
 "(define-values"
@@ -63683,10 +63682,10 @@ static const char *startup_source =
 "(let-values(((split-by-reference?_0) split-by-reference?4_0))"
 "(let-values(((renames-log-tag_0) renames-log-tag5_0))"
 "(let-values()"
-"(lambda(s_104 ctx_83)"
+"(lambda(s_104 ctx_82)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_53)(expand-context-observer ctx_83)))"
+"(let-values(((obs_53)(expand-context-observer ctx_82)))"
 "(if obs_53"
 "(let-values()(let-values()(call-expand-observe obs_53 log-tag_0)))"
 "(void)))"
@@ -63708,19 +63707,19 @@ static const char *startup_source =
 " id:val104_1"
 " val-rhs105_1"
 " body106_1)"
-"(let-values(((s_529)"
+"(let-values(((s_530)"
 "(if(syntax?$1 s_127)"
 "(syntax-e$1 s_127)"
 " s_127)))"
-"(if(pair? s_529)"
+"(if(pair? s_530)"
 "(let-values(((letrec-syntaxes+values107_0)"
-"(let-values(((s_530)(car s_529))) s_530))"
+"(let-values(((s_531)(car s_530))) s_531))"
 "((id:trans108_0"
 " trans-rhs109_0"
 " id:val110_0"
 " val-rhs111_0"
 " body112_0)"
-"(let-values(((s_230)(cdr s_529)))"
+"(let-values(((s_230)(cdr s_530)))"
 "(let-values(((s_231)"
 "(if(syntax?$1 s_230)"
 "(syntax-e$1 s_230)"
@@ -63785,18 +63784,18 @@ static const char *startup_source =
 "(let-values(((id:trans144_0"
 " trans-rhs145_0)"
 "(let-values()"
-"(let-values(((s_531)"
+"(let-values(((s_532)"
 "(if(syntax?$1"
 " s_334)"
 "(syntax-e$1"
 " s_334)"
 " s_334)))"
 "(if(pair?"
-" s_531)"
+" s_532)"
 "(let-values(((id:trans118_0)"
 "(let-values(((s_340)"
 "(car"
-" s_531)))"
+" s_532)))"
 "(let-values(((s_341)"
 "(if(syntax?$1"
 " s_340)"
@@ -63831,7 +63830,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_213)"
-"(let-values(((s_532)"
+"(let-values(((s_533)"
 "(unsafe-car"
 " lst_213))"
 "((rest_203)"
@@ -63846,21 +63845,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_340)"
 "(if(syntax?$1"
-" s_532)"
+" s_533)"
 "(symbol?"
 "(syntax-e$1"
-" s_532))"
+" s_533))"
 " #f)))"
 "(if or-part_340"
 " or-part_340"
 "(symbol?"
-" s_532)))"
-" s_532"
+" s_533)))"
+" s_533"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_44"
-" s_532)))))"
+" s_533)))))"
 "(cons"
 " id:trans146_0"
 " id:trans_8)))))"
@@ -63881,24 +63880,24 @@ static const char *startup_source =
 "((trans-rhs119_0)"
 "(let-values(((s_242)"
 "(cdr"
-" s_531)))"
-"(let-values(((s_533)"
+" s_532)))"
+"(let-values(((s_534)"
 "(if(syntax?$1"
 " s_242)"
 "(syntax-e$1"
 " s_242)"
 " s_242)))"
 "(if(pair?"
-" s_533)"
+" s_534)"
 "(let-values(((trans-rhs120_0)"
 "(let-values(((s_243)"
 "(car"
-" s_533)))"
+" s_534)))"
 " s_243))"
 "(()"
 "(let-values(((s_244)"
 "(cdr"
-" s_533)))"
+" s_534)))"
 "(let-values(((s_245)"
 "(if(syntax?$1"
 " s_244)"
@@ -63959,27 +63958,27 @@ static const char *startup_source =
 "((id:val115_0"
 " val-rhs116_0"
 " body117_0)"
-"(let-values(((s_534)"
+"(let-values(((s_535)"
 "(cdr"
 " s_231)))"
 "(let-values(((s_347)"
 "(if(syntax?$1"
-" s_534)"
-"(syntax-e$1"
-" s_534)"
-" s_534)))"
-"(if(pair? s_347)"
-"(let-values(((id:val121_0"
-" val-rhs122_0)"
-"(let-values(((s_535)"
-"(car"
-" s_347)))"
-"(let-values(((s_246)"
-"(if(syntax?$1"
 " s_535)"
 "(syntax-e$1"
 " s_535)"
 " s_535)))"
+"(if(pair? s_347)"
+"(let-values(((id:val121_0"
+" val-rhs122_0)"
+"(let-values(((s_536)"
+"(car"
+" s_347)))"
+"(let-values(((s_246)"
+"(if(syntax?$1"
+" s_536)"
+"(syntax-e$1"
+" s_536)"
+" s_536)))"
 "(let-values(((flat-s_35)"
 "(to-syntax-list.1"
 " s_246)))"
@@ -64010,7 +64009,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_339)"
-"(let-values(((s_536)"
+"(let-values(((s_537)"
 "(unsafe-car"
 " lst_339))"
 "((rest_204)"
@@ -64028,27 +64027,27 @@ static const char *startup_source =
 "(let-values(((id:val147_0"
 " val-rhs148_0)"
 "(let-values()"
-"(let-values(((s_537)"
-"(if(syntax?$1"
-" s_536)"
-"(syntax-e$1"
-" s_536)"
-" s_536)))"
-"(if(pair?"
-" s_537)"
-"(let-values(((id:val124_0)"
-"(let-values(((s_472)"
-"(car"
-" s_537)))"
 "(let-values(((s_538)"
 "(if(syntax?$1"
-" s_472)"
+" s_537)"
 "(syntax-e$1"
-" s_472)"
-" s_472)))"
+" s_537)"
+" s_537)))"
+"(if(pair?"
+" s_538)"
+"(let-values(((id:val124_0)"
+"(let-values(((s_473)"
+"(car"
+" s_538)))"
+"(let-values(((s_539)"
+"(if(syntax?$1"
+" s_473)"
+"(syntax-e$1"
+" s_473)"
+" s_473)))"
 "(let-values(((flat-s_36)"
 "(to-syntax-list.1"
-" s_538)))"
+" s_539)))"
 "(if(not"
 " flat-s_36)"
 "(let-values()"
@@ -64074,7 +64073,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_123)"
-"(let-values(((s_539)"
+"(let-values(((s_540)"
 "(unsafe-car"
 " lst_123))"
 "((rest_62)"
@@ -64089,21 +64088,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_377)"
 "(if(syntax?$1"
-" s_539)"
+" s_540)"
 "(symbol?"
 "(syntax-e$1"
-" s_539))"
+" s_540))"
 " #f)))"
 "(if or-part_377"
 " or-part_377"
 "(symbol?"
-" s_539)))"
-" s_539"
+" s_540)))"
+" s_540"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                     \"not an identifier\""
 " orig-s_44"
-" s_539)))))"
+" s_540)))))"
 "(cons"
 " id:val149_0"
 " id:val_8)))))"
@@ -64124,7 +64123,7 @@ static const char *startup_source =
 "((val-rhs125_0)"
 "(let-values(((s_353)"
 "(cdr"
-" s_537)))"
+" s_538)))"
 "(let-values(((s_248)"
 "(if(syntax?$1"
 " s_353)"
@@ -64139,15 +64138,15 @@ static const char *startup_source =
 " s_248)))"
 " s_355))"
 "(()"
-"(let-values(((s_540)"
+"(let-values(((s_541)"
 "(cdr"
 " s_248)))"
 "(let-values(((s_356)"
 "(if(syntax?$1"
-" s_540)"
+" s_541)"
 "(syntax-e$1"
-" s_540)"
-" s_540)))"
+" s_541)"
+" s_541)))"
 "(if(null?"
 " s_356)"
 "(values)"
@@ -64277,17 +64276,17 @@ static const char *startup_source =
 "(let-values(((s_257)(car s_254)))"
 " s_257))"
 "((id:val132_0 val-rhs133_0 body134_0)"
-"(let-values(((s_541)(cdr s_254)))"
-"(let-values(((s_542)"
-"(if(syntax?$1 s_541)"
-"(syntax-e$1 s_541)"
-" s_541)))"
-"(if(pair? s_542)"
+"(let-values(((s_542)(cdr s_254)))"
+"(let-values(((s_417)"
+"(if(syntax?$1 s_542)"
+"(syntax-e$1 s_542)"
+" s_542)))"
+"(if(pair? s_417)"
 "(let-values(((id:val135_0"
 " val-rhs136_0)"
 "(let-values(((s_543)"
 "(car"
-" s_542)))"
+" s_417)))"
 "(let-values(((s_258)"
 "(if(syntax?$1"
 " s_543)"
@@ -64516,7 +64515,7 @@ static const char *startup_source =
 "((body137_0)"
 "(let-values(((s_261)"
 "(cdr"
-" s_542)))"
+" s_417)))"
 "(let-values(((s_262)"
 "(if(syntax?$1"
 " s_261)"
@@ -64559,7 +64558,7 @@ static const char *startup_source =
 "(values #t let-values127_1 id:val128_1 val-rhs129_1 body130_1)))"
 "(values #f #f #f #f #f)))))"
 "(let-values(((sc_38)(new-scope 'local)))"
-"(let-values(((phase_81)(expand-context-phase ctx_83)))"
+"(let-values(((phase_81)(expand-context-phase ctx_82)))"
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
@@ -64601,7 +64600,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_347)"
-"(let-values(((id_114)"
+"(let-values(((id_115)"
 "(unsafe-car"
 " lst_347))"
 "((rest_208)"
@@ -64615,7 +64614,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_114"
+" id_115"
 " sc_38))"
 " fold-var_316))))"
 "(values"
@@ -64680,7 +64679,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_351)"
-"(let-values(((id_115)"
+"(let-values(((id_116)"
 "(unsafe-car"
 " lst_351))"
 "((rest_210)"
@@ -64694,7 +64693,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_115"
+" id_116"
 " sc_38))"
 " fold-var_324))))"
 "(values"
@@ -64960,7 +64959,7 @@ static const char *startup_source =
 " s143_0"
 " unsafe-undefined))"
 "(values))))"
-"(let-values(((counter_8)(root-expand-context-counter ctx_83)))"
+"(let-values(((counter_8)(root-expand-context-counter ctx_82)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
 "(let-values(((lst_354) trans-idss_2))"
@@ -65004,7 +65003,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_357)"
-"(let-values(((id_116)"
+"(let-values(((id_117)"
 "(unsafe-car"
 " lst_357))"
 "((rest_213)"
@@ -65018,7 +65017,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id174_0)"
-" id_116)"
+" id_117)"
 "((phase175_0)"
 " phase_81)"
 "((counter176_0)"
@@ -65101,7 +65100,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_360)"
-"(let-values(((id_117)"
+"(let-values(((id_118)"
 "(unsafe-car"
 " lst_360))"
 "((rest_215)"
@@ -65115,7 +65114,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(let-values(((id179_0)"
-" id_117)"
+" id_118)"
 "((phase180_0)"
 " phase_81)"
 "((counter181_0)"
@@ -65200,7 +65199,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((obs_90)"
-"(expand-context-observer ctx_83)))"
+"(expand-context-observer ctx_82)))"
 "(if obs_90"
 "(let-values()"
 "(log-let-renames"
@@ -65221,7 +65220,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_91)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_91"
 "(let-values()"
 "(let-values()"
@@ -65229,7 +65228,7 @@ static const char *startup_source =
 " obs_91"
 " 'prepare-env)))"
 "(void)))"
-"(prepare-next-phase-namespace ctx_83)))"
+"(prepare-next-phase-namespace ctx_82)))"
 "(void))"
 "(values))))"
 "(let-values(((trans-valss_0)"
@@ -65280,7 +65279,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_92)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_92"
 "(let-values()"
 "(let-values()"
@@ -65300,11 +65299,11 @@ static const char *startup_source =
 " rhs_21"
 " sc_38)"
 " ids_41"
-" ctx_83)))"
+" ctx_82)))"
 "(begin"
 "(let-values(((obs_93)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_93"
 "(let-values()"
 "(let-values()"
@@ -65398,7 +65397,7 @@ static const char *startup_source =
 "((rest_221)"
 "(unsafe-cdr"
 " lst_371))"
-"((id_118)"
+"((id_119)"
 "(unsafe-car"
 " lst_372))"
 "((rest_222)"
@@ -65413,7 +65412,7 @@ static const char *startup_source =
 " env_34"
 " key_91"
 "(local-variable1.1"
-" id_118)))))"
+" id_119)))))"
 "(values"
 " env_35)))))"
 "(if(not"
@@ -65436,7 +65435,7 @@ static const char *startup_source =
 " env_30)))"
 " env_29)))))"
 " for-loop_309)"
-"(expand-context-env ctx_83)"
+"(expand-context-env ctx_82)"
 " lst_366"
 " lst_135)))))"
 "(let-values(((rec-env_0)"
@@ -65546,7 +65545,7 @@ static const char *startup_source =
 "((rest_227)"
 "(unsafe-cdr"
 " lst_383))"
-"((id_119)"
+"((id_120)"
 "(unsafe-car"
 " lst_384))"
 "((rest_228)"
@@ -65560,9 +65559,9 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_86"
-" id_119"
+" id_120"
 " phase_81"
-" ctx_83)"
+" ctx_82)"
 "(env-extend"
 " env_42"
 " key_92"
@@ -65599,7 +65598,7 @@ static const char *startup_source =
 " lst_374"
 " lst_375)))))"
 "(let-values(((expr-ctx_0)"
-"(as-expression-context ctx_83)))"
+"(as-expression-context ctx_82)))"
 "(let-values(((orig-rrs_0)"
 "(expand-context-reference-records"
 " expr-ctx_0)))"
@@ -65614,7 +65613,7 @@ static const char *startup_source =
 "(cons"
 " sc_38"
 "(expand-context-scopes"
-" ctx_83)))"
+" ctx_82)))"
 "((reference-records186_0)"
 "(if split-by-reference?_0"
 "(cons"
@@ -65626,7 +65625,7 @@ static const char *startup_source =
 "(cons"
 " trans-idss_2"
 " val-idss_3)"
-" ctx_83"
+" ctx_82"
 " sc_38))"
 "((inner188_0)"
 "(root-expand-context/outer-inner"
@@ -65664,13 +65663,13 @@ static const char *startup_source =
 "(let-values(((letrec-values-id_0)"
 "(if(not"
 "(expand-context-to-parsed?"
-" ctx_83))"
+" ctx_82))"
 "(if syntaxes?_0"
 "(core-id 'letrec-values phase_81)"
 " let-values127_0)"
 " #f)))"
 "(let-values(((rebuild-s_6)"
-"(let-values(((ctx189_0) ctx_83)"
+"(let-values(((ctx189_0) ctx_82)"
 "((s190_1) s_104)"
 "((temp191_1) #t))"
 "(keep-as-needed119.1"
@@ -65681,7 +65680,7 @@ static const char *startup_source =
 " s190_1))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_82)"
 "(reverse$1"
 "(let-values(((lst_251)"
 " val-idss_3))"
@@ -65780,7 +65779,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((obs_94)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_94"
 "(let-values()"
 "(log-letrec-values"
@@ -65799,7 +65798,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_95)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_95"
 "(let-values()"
 "(if(not"
@@ -65865,7 +65864,7 @@ static const char *startup_source =
 "(let-values(((body-ctx197_0)"
 " body-ctx_5)"
 "((ctx198_0)"
-" ctx_83))"
+" ctx_82))"
 "(as-tail-context22.1"
 " ctx198_0"
 " body-ctx197_0)))"
@@ -65969,7 +65968,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_96)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_82)))"
 "(if obs_96"
 "(let-values()"
 "(let-values()"
@@ -65996,7 +65995,7 @@ static const char *startup_source =
 " rhs199_0"
 " temp200_0))))"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_82)"
 "(list"
 " keys_12"
 " exp-rhs_4)"
@@ -66035,7 +66034,7 @@ static const char *startup_source =
 " frame-id_15))"
 "(void))"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_82)"
 "(if rec?_1"
 "(parsed-letrec-values18.1"
 " rebuild-s_6"
@@ -66093,7 +66092,7 @@ static const char *startup_source =
 " val-keyss204_0"
 " val-rhss205_0"
 " val-clauses206_0))))))"
-"(if(expand-context-to-parsed? ctx_83)"
+"(if(expand-context-to-parsed? ctx_82)"
 " result-s_12"
 "(attach-disappeared-transformer-bindings"
 " result-s_12"
@@ -66219,10 +66218,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_568 ctx_84)"
+"(lambda(s_568 ctx_83)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_99)(expand-context-observer ctx_84)))"
+"(let-values(((obs_99)(expand-context-observer ctx_83)))"
 "(if obs_99"
 "(let-values()(let-values()(call-expand-observe obs_99 'prim-#%stratified)))"
 "(void)))"
@@ -66254,29 +66253,29 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
 "(values #t #%stratified-body222_1 body223_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx226_0) ctx_84)((s227_1) s_568)((temp228_0) #t))"
+"(let-values(((ctx226_0) ctx_83)((s227_1) s_568)((temp228_0) #t))"
 "(keep-as-needed119.1 #f temp228_0 #f ctx226_0 s227_1))))"
 "(let-values(((exp-body_5)"
 "(let-values(((temp229_3) body223_0)"
-"((ctx230_0) ctx_84)"
+"((ctx230_0) ctx_83)"
 "((temp231_1) #t)"
 "((rebuild-s232_0) rebuild-s_7))"
 "(expand-body7.1 rebuild-s232_0 temp231_1 temp229_3 ctx230_0))))"
-"(if(expand-context-to-parsed? ctx_84)"
+"(if(expand-context-to-parsed? ctx_83)"
 "(parsed-begin12.1 rebuild-s_7 exp-body_5)"
 "(let-values(((rebuild-s233_0) rebuild-s_7)"
 "((temp234_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_83)) exp-body_5))))"
 "(rebuild5.1 #t rebuild-s233_0 temp234_1)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_574 ctx_85)"
+"(lambda(s_574 ctx_84)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_100)(expand-context-observer ctx_85)))"
+"(let-values(((obs_100)(expand-context-observer ctx_84)))"
 "(if obs_100(let-values()(let-values()(call-expand-observe obs_100 'prim-#%datum)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_10)(syntax-disarm$1 s_574)))"
@@ -66299,18 +66298,18 @@ static const char *startup_source =
 "                                 (raise-syntax-error$1 '#%datum \"keyword misused as an expression\" #f datum_2))"
 "(void))"
 "(values))))"
-"(let-values(((phase_140)(expand-context-phase ctx_85)))"
-"(if(if(expand-context-to-parsed? ctx_85)(free-id-set-empty?(expand-context-stops ctx_85)) #f)"
+"(let-values(((phase_139)(expand-context-phase ctx_84)))"
+"(if(if(expand-context-to-parsed? ctx_84)(free-id-set-empty?(expand-context-stops ctx_84)) #f)"
 "(parsed-quote14.1(keep-properties-only~ s_574)(syntax->datum$1 datum_2))"
-"(let-values(((s239_0) s_574)((temp240_0)(list(core-id 'quote phase_140) datum_2)))"
+"(let-values(((s239_0) s_574)((temp240_0)(list(core-id 'quote phase_139) datum_2)))"
 "(rebuild5.1 #t s239_0 temp240_0))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_579 ctx_86)"
+"(lambda(s_579 ctx_85)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_101)(expand-context-observer ctx_86)))"
+"(let-values(((obs_101)(expand-context-observer ctx_85)))"
 "(if obs_101(let-values()(let-values()(call-expand-observe obs_101 'prim-#%app)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_11)(syntax-disarm$1 s_579)))"
@@ -66338,27 +66337,27 @@ static const char *startup_source =
 "(let-values(((es_3) e242_0))"
 "(if(null? es_3)"
 "(let-values()"
-"(let-values(((phase_141)(expand-context-phase ctx_86)))"
-"(if(expand-context-to-parsed? ctx_86)"
+"(let-values(((phase_140)(expand-context-phase ctx_85)))"
+"(if(expand-context-to-parsed? ctx_85)"
 "(parsed-quote14.1(keep-properties-only~ s_579) null)"
-"(let-values(((s245_0) s_579)((temp246_1)(list(core-id 'quote phase_141) null)))"
+"(let-values(((s245_0) s_579)((temp246_1)(list(core-id 'quote phase_140) null)))"
 "(rebuild5.1 #t s245_0 temp246_1)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_8)"
-"(let-values(((ctx247_0) ctx_86)"
+"(let-values(((ctx247_0) ctx_85)"
 "((s248_0) s_579)"
 "((keep-for-parsed?249_0) keep-for-parsed?_1))"
 "(keep-as-needed119.1 #f #f keep-for-parsed?249_0 ctx247_0 s248_0))))"
 "(let-values(((prefixless_0)(cdr(syntax-e$1 disarmed-s_11))))"
 "(let-values(((rebuild-prefixless_0)"
 "(if(syntax?$1 prefixless_0)"
-"(let-values(((ctx250_0) ctx_86)"
+"(let-values(((ctx250_0) ctx_85)"
 "((prefixless251_0) prefixless_0)"
 "((keep-for-parsed?252_0) keep-for-parsed?_1))"
 "(keep-as-needed119.1 #f #f keep-for-parsed?252_0 ctx250_0 prefixless251_0))"
 " #f)))"
-"(let-values(((expr-ctx_1)(as-expression-context ctx_86)))"
+"(let-values(((expr-ctx_1)(as-expression-context ctx_85)))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_102)(expand-context-observer expr-ctx_1)))"
@@ -66430,7 +66429,7 @@ static const char *startup_source =
 " for-loop_317)"
 " null"
 " lst_401))))))"
-"(if(expand-context-to-parsed? ctx_86)"
+"(if(expand-context-to-parsed? ctx_85)"
 "(let-values()"
 "(parsed-app7.1"
 "(let-values(((or-part_379) rebuild-prefixless_0))"
@@ -66461,10 +66460,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_585 ctx_87)"
+"(lambda(s_585 ctx_86)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_105)(expand-context-observer ctx_87)))"
+"(let-values(((obs_105)(expand-context-observer ctx_86)))"
 "(if obs_105(let-values()(let-values()(call-expand-observe obs_105 'prim-quote)))(void)))"
 "(values))))"
 "(let-values(((ok?_48 quote261_0 datum262_0)"
@@ -66500,16 +66499,16 @@ static const char *startup_source =
 "(values quote263_0 datum264_0))"
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
 "(values #t quote261_1 datum262_1))))))"
-"(if(expand-context-to-parsed? ctx_87)"
+"(if(expand-context-to-parsed? ctx_86)"
 "(parsed-quote14.1(keep-properties-only~ s_585)(syntax->datum$1 datum262_0))"
 " s_585))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_592 ctx_88)"
+"(lambda(s_592 ctx_87)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_106)(expand-context-observer ctx_88)))"
+"(let-values(((obs_106)(expand-context-observer ctx_87)))"
 "(if obs_106"
 "(let-values()(let-values()(call-expand-observe obs_106 'prim-quote-syntax)))"
 "(void)))"
@@ -66631,7 +66630,7 @@ 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_87))"
 "(values))))"
 "(let-values(((ok?_51 _276_0 _277_0 kw278_0)"
 "(let-values(((s_615) disarmed-s_12))"
@@ -66698,27 +66697,27 @@ static const char *startup_source =
 "(values _279_0 _280_0 kw281_0))"
 "                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
 "(values #t _276_1 _277_1 kw278_1))))))"
-"(if(expand-context-to-parsed? ctx_88)"
+"(if(expand-context-to-parsed? ctx_87)"
 "(parsed-quote-syntax15.1(keep-properties-only~ s_592) datum267_0)"
 "(let-values(((s285_0) s_592)((temp286_0)(list quote-syntax266_0 datum267_0 kw278_0)))"
 "(rebuild5.1 #t s285_0 temp286_0))))))"
 "(let-values()"
-"(let-values(((use-site-scopes_2)(root-expand-context-use-site-scopes ctx_88)))"
+"(let-values(((use-site-scopes_2)(root-expand-context-use-site-scopes ctx_87)))"
 "(let-values(((datum-s_0)"
 "(remove-scopes"
-"(remove-scopes datum272_0(expand-context-scopes ctx_88))"
+"(remove-scopes datum272_0(expand-context-scopes ctx_87))"
 "(if use-site-scopes_2(unbox use-site-scopes_2) '()))))"
-"(if(if(expand-context-to-parsed? ctx_88)(free-id-set-empty?(expand-context-stops ctx_88)) #f)"
+"(if(if(expand-context-to-parsed? ctx_87)(free-id-set-empty?(expand-context-stops ctx_87)) #f)"
 "(parsed-quote-syntax15.1(keep-properties-only~ s_592) datum-s_0)"
 "(let-values(((s287_0) s_592)((temp288_0)(list quote-syntax271_0 datum-s_0)))"
 "(rebuild5.1 #t s287_0 temp288_0))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
-"(lambda(s_626 ctx_89)"
+"(lambda(s_626 ctx_88)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_107)(expand-context-observer ctx_89)))"
+"(let-values(((obs_107)(expand-context-observer ctx_88)))"
 "(if obs_107(let-values()(let-values()(call-expand-observe obs_107 'prim-if)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_13)(syntax-disarm$1 s_626)))"
@@ -66872,19 +66871,19 @@ static const char *startup_source =
 "(values if302_0 tst303_0 thn304_0 els305_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_54)))))"
 "(values #t if298_1 tst299_1 thn300_1 els301_1))))))"
-"(let-values(((expr-ctx_2)(as-expression-context ctx_89)))"
+"(let-values(((expr-ctx_2)(as-expression-context ctx_88)))"
 "(let-values(((tail-ctx_0)"
-"(let-values(((expr-ctx312_0) expr-ctx_2)((ctx313_0) ctx_89))"
+"(let-values(((expr-ctx312_0) expr-ctx_2)((ctx313_0) ctx_88))"
 "(as-tail-context22.1 ctx313_0 expr-ctx312_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx314_0) ctx_89)((s315_0) s_626))"
+"(let-values(((ctx314_0) ctx_88)((s315_0) s_626))"
 "(keep-as-needed119.1 #f #f #f ctx314_0 s315_0))))"
 "(let-values(((exp-tst_0)"
 "(let-values(((temp316_0) tst299_0)((expr-ctx317_0) expr-ctx_2))"
 "(expand9.1 #f #f #f temp316_0 expr-ctx317_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_108)(expand-context-observer ctx_89)))"
+"(let-values(((obs_108)(expand-context-observer ctx_88)))"
 "(if obs_108"
 "(let-values()(let-values()(call-expand-observe obs_108 'next)))"
 "(void)))"
@@ -66894,7 +66893,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp318_0 tail-ctx319_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_109)(expand-context-observer ctx_89)))"
+"(let-values(((obs_109)(expand-context-observer ctx_88)))"
 "(if obs_109"
 "(let-values()(let-values()(call-expand-observe obs_109 'next)))"
 "(void)))"
@@ -66902,7 +66901,7 @@ static const char *startup_source =
 "(let-values(((exp-els_0)"
 "(let-values(((temp320_0) els301_0)((tail-ctx321_0) tail-ctx_0))"
 "(expand9.1 #f #f #f temp320_0 tail-ctx321_0))))"
-"(if(expand-context-to-parsed? ctx_89)"
+"(if(expand-context-to-parsed? ctx_88)"
 "(parsed-if8.1 rebuild-s_9 exp-tst_0 exp-thn_0 exp-els_0)"
 "(let-values(((rebuild-s322_0) rebuild-s_9)"
 "((temp323_0)(list if298_0 exp-tst_0 exp-thn_0 exp-els_0)))"
@@ -66910,10 +66909,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_662 ctx_90)"
+"(lambda(s_662 ctx_89)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_110)(expand-context-observer ctx_90)))"
+"(let-values(((obs_110)(expand-context-observer ctx_89)))"
 "(if obs_110"
 "(let-values()(let-values()(call-expand-observe obs_110 'prim-with-continuation-mark)))"
 "(void)))"
@@ -66998,16 +66997,16 @@ static const char *startup_source =
 "(values with-continuation-mark328_0 key329_0 val330_0 body331_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_55)))))"
 "(values #t with-continuation-mark324_1 key325_1 val326_1 body327_1))))))"
-"(let-values(((expr-ctx_3)(as-expression-context ctx_90)))"
+"(let-values(((expr-ctx_3)(as-expression-context ctx_89)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx338_0) ctx_90)((s339_0) s_662))"
+"(let-values(((ctx338_0) ctx_89)((s339_0) s_662))"
 "(keep-as-needed119.1 #f #f #f ctx338_0 s339_0))))"
 "(let-values(((exp-key_0)"
 "(let-values(((temp340_0) key325_0)((expr-ctx341_0) expr-ctx_3))"
 "(expand9.1 #f #f #f temp340_0 expr-ctx341_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_111)(expand-context-observer ctx_90)))"
+"(let-values(((obs_111)(expand-context-observer ctx_89)))"
 "(if obs_111"
 "(let-values()(let-values()(call-expand-observe obs_111 'next)))"
 "(void)))"
@@ -67017,7 +67016,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp342_0 expr-ctx343_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_112)(expand-context-observer ctx_90)))"
+"(let-values(((obs_112)(expand-context-observer ctx_89)))"
 "(if obs_112"
 "(let-values()(let-values()(call-expand-observe obs_112 'next)))"
 "(void)))"
@@ -67025,10 +67024,10 @@ static const char *startup_source =
 "(let-values(((exp-body_6)"
 "(let-values(((temp344_0) body327_0)"
 "((temp345_0)"
-"(let-values(((expr-ctx346_0) expr-ctx_3)((ctx347_0) ctx_90))"
+"(let-values(((expr-ctx346_0) expr-ctx_3)((ctx347_0) ctx_89))"
 "(as-tail-context22.1 ctx347_0 expr-ctx346_0))))"
 "(expand9.1 #f #f #f temp344_0 temp345_0))))"
-"(if(expand-context-to-parsed? ctx_90)"
+"(if(expand-context-to-parsed? ctx_89)"
 "(parsed-with-continuation-mark10.1 rebuild-s_10 exp-key_0 exp-val_0 exp-body_6)"
 "(let-values(((rebuild-s348_0) rebuild-s_10)"
 "((temp349_0)(list with-continuation-mark324_0 exp-key_0 exp-val_0 exp-body_6)))"
@@ -67043,10 +67042,10 @@ 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_677 ctx_91)"
+"(lambda(s_677 ctx_90)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_113)(expand-context-observer ctx_91)))"
+"(let-values(((obs_113)(expand-context-observer ctx_90)))"
 "(if obs_113"
 "(let-values()(let-values()(call-expand-observe obs_113 log-tag_1)))"
 "(void)))"
@@ -67087,10 +67086,10 @@ static const char *startup_source =
 "(values #t begin350_1 e351_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_90)"
+"(as-expression-context ctx_90))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx354_0) ctx_91)((s355_0) s_677))"
+"(let-values(((ctx354_0) ctx_90)((s355_0) s_677))"
 "(keep-as-needed119.1 #f #f #f ctx354_0 s355_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_123)"
@@ -67101,7 +67100,7 @@ static const char *startup_source =
 "(if(zero? index_6)"
 "(let-values()"
 "(let-values(((obs_114)"
-"(expand-context-observer ctx_91)))"
+"(expand-context-observer ctx_90)))"
 "(if obs_114"
 "(let-values()"
 "(begin"
@@ -67122,7 +67121,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_115)"
 "(expand-context-observer"
-" ctx_91)))"
+" ctx_90)))"
 "(if obs_115"
 "(let-values()"
 "(let-values()"
@@ -67137,7 +67136,7 @@ static const char *startup_source =
 "(let-values(((expr-ctx358_0)"
 " expr-ctx_4)"
 "((ctx359_0)"
-" ctx_91))"
+" ctx_90))"
 "(as-tail-context22.1"
 " ctx359_0"
 " expr-ctx358_0))"
@@ -67148,7 +67147,7 @@ static const char *startup_source =
 " e351_0"
 " list-start-index_0)))"
 "(begin"
-"(let-values(((obs_116)(expand-context-observer ctx_91)))"
+"(let-values(((obs_116)(expand-context-observer ctx_90)))"
 "(if obs_116"
 "(let-values()"
 "(let-values()"
@@ -67157,7 +67156,7 @@ static const char *startup_source =
 " '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_90)"
 "(parsed-begin_0 rebuild-s_11 exp-es_2)"
 "(let-values(((rebuild-s360_0) rebuild-s_11)((temp361_0)(cons begin350_0 exp-es_2)))"
 "(rebuild5.1 #t rebuild-s360_0 temp361_0)))))))))))))))))))"
@@ -67170,8 +67169,8 @@ static const char *startup_source =
 "((temp364_0) 0)"
 "((temp365_0) #t))"
 "(make-begin20.1 temp365_0 temp364_0 temp362_0 parsed-begin363_0))))"
-"(lambda(s_683 ctx_92)"
-"(let-values(((context_25)(expand-context-context ctx_92)))"
+"(lambda(s_683 ctx_91)"
+"(let-values(((context_25)(expand-context-context ctx_91)))"
 "(if(let-values(((or-part_380)(eq? context_25 'top-level)))"
 "(if or-part_380 or-part_380(eq? context_25 'module)))"
 "(let-values()"
@@ -67201,8 +67200,8 @@ static const char *startup_source =
 "(values begin367_0)))))"
 "(values #t begin366_1)))"
 "(values #f #f)))))"
-"(if ok?_56 s_683(nonempty-begin_0 s_683 ctx_92)))))"
-"(let-values()(nonempty-begin_0 s_683 ctx_92))))))))"
+"(if ok?_56 s_683(nonempty-begin_0 s_683 ctx_91)))))"
+"(let-values()(nonempty-begin_0 s_683 ctx_91))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
@@ -67210,15 +67209,15 @@ static const char *startup_source =
 "(make-begin20.1 temp371_0 temp370_0 temp368_0 parsed-begin0369_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
-"(lambda(id_120 ctx_93)"
+"(lambda(id_121 ctx_92)"
 "(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_92)(>=(expand-context-phase ctx_92) 1) #f)"
 "(let-values()"
 "(begin"
 "(hash-update!"
-"(expand-context-need-eventually-defined ctx_93)"
-"(expand-context-phase ctx_93)"
-"(lambda(l_87)(cons id_120 l_87))"
+"(expand-context-need-eventually-defined ctx_92)"
+"(expand-context-phase ctx_92)"
+"(lambda(l_87)(cons id_121 l_87))"
 " null)"
 " #t))"
 "(let-values() #f)))))"
@@ -67230,19 +67229,19 @@ static const char *startup_source =
 "(begin"
 " 'core375"
 "(let-values(((s_693) s373_0))"
-"(let-values(((ctx_94) ctx374_0))"
+"(let-values(((ctx_93) ctx374_0))"
 "(let-values(((implicit-omitted?_0) implicit-omitted?372_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_117)(expand-context-observer ctx_94)))"
+"(let-values(((obs_117)(expand-context-observer ctx_93)))"
 "(if obs_117"
 "(let-values()"
 "(let-values()(call-expand-observe obs_117 'prim-#%top)))"
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_17)(syntax-disarm$1 s_693)))"
-"(let-values(((id_121)"
+"(let-values(((id_122)"
 "(if implicit-omitted?_0"
 "(let-values() s_693)"
 "(let-values()"
@@ -67289,8 +67288,8 @@ static const char *startup_source =
 "(values #t #%top377_1 id378_1))))))"
 " id378_0)))))"
 "(let-values(((b_92)"
-"(let-values(((id381_0) id_121)"
-"((temp382_0)(expand-context-phase ctx_94))"
+"(let-values(((id381_0) id_122)"
+"((temp382_0)(expand-context-phase ctx_93))"
 "((temp383_0) 'ambiguous))"
 "(resolve+shift28.1"
 " temp383_0"
@@ -67301,49 +67300,49 @@ static const char *startup_source =
 " id381_0"
 " temp382_0))))"
 "(if(eq? b_92 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_121 ctx_94))"
+"(let-values()(raise-ambiguous-error id_122 ctx_93))"
 "(if(if b_92"
 "(if(module-binding? b_92)"
-"(eq?(module-binding-module b_92)(root-expand-context-self-mpi ctx_94))"
+"(eq?(module-binding-module b_92)(root-expand-context-self-mpi ctx_93))"
 " #f)"
 " #f)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-id2.1 id_121 b_92 #f)"
+"(if(expand-context-to-parsed? ctx_93)"
+"(parsed-id2.1 id_122 b_92 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_92))"
 "(let-values() s_693)"
-"(let-values() id_121))))"
-"(if(register-eventual-variable!? id_121 ctx_94)"
+"(let-values() id_122))))"
+"(if(register-eventual-variable!? id_122 ctx_93)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-id2.1 id_121 b_92 #f)"
-" id_121))"
+"(if(expand-context-to-parsed? ctx_93)"
+"(parsed-id2.1 id_122 b_92 #f)"
+" id_122))"
 "(let-values()"
-"(if(not(expand-context-allow-unbound? ctx_94))"
+"(if(not(expand-context-allow-unbound? ctx_93))"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" id_121"
+" id_122"
 " #f"
 " null"
-"(syntax-debug-info-string id_121 ctx_94)))"
+"(syntax-debug-info-string id_122 ctx_93)))"
 "(let-values()"
 "(let-values(((tl-id_1)"
 "(add-scope"
-" id_121"
-"(root-expand-context-top-level-bind-scope ctx_94))))"
+" id_122"
+"(root-expand-context-top-level-bind-scope ctx_93))))"
 "(let-values(((tl-b_1)"
 "(let-values(((tl-id384_0) tl-id_1)"
 "((temp385_0)"
-"(expand-context-phase ctx_94)))"
+"(expand-context-phase ctx_93)))"
 "(resolve40.1 #f #f null #f tl-id384_0 temp385_0))))"
 "(if tl-b_1"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
+"(if(expand-context-to-parsed? ctx_93)"
 "(parsed-top-id4.1 tl-id_1 tl-b_1 #f)"
 "(if implicit-omitted?_0"
-"(let-values() id_121)"
+"(let-values() id_122)"
 "(let-values()"
 "(let-values(((ok?_58 #%top386_0 id387_0)"
 "(let-values(((s_698) disarmed-s_17))"
@@ -67391,22 +67390,22 @@ static const char *startup_source =
 " orig-s_58)))))"
 "(values #t #%top386_1 id387_1))))))"
 "(let-values(((s390_0) s_693)"
-"((temp391_0)(cons #%top386_0 id_121)))"
+"((temp391_0)(cons #%top386_0 id_122)))"
 "(rebuild5.1 #t s390_0 temp391_0)))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_94)"
-"(parsed-top-id4.1 id_121 b_92 #f)"
+"(if(expand-context-to-parsed? ctx_93)"
+"(parsed-top-id4.1 id_122 b_92 #f)"
 " s_693)))))))))))))))))))))))"
 "(case-lambda"
-"((s_702 ctx_95)(core375_0 s_702 ctx_95 #f))"
-"((s_703 ctx_96 implicit-omitted?372_1)(core375_0 s_703 ctx_96 implicit-omitted?372_1))))))"
+"((s_702 ctx_94)(core375_0 s_702 ctx_94 #f))"
+"((s_703 ctx_95 implicit-omitted?372_1)(core375_0 s_703 ctx_95 implicit-omitted?372_1))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
-"(lambda(s_704 ctx_97)"
+"(lambda(s_704 ctx_96)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_118)(expand-context-observer ctx_97)))"
+"(let-values(((obs_118)(expand-context-observer ctx_96)))"
 "(if obs_118(let-values()(let-values()(call-expand-observe obs_118 'prim-set!)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_18)(syntax-disarm$1 s_704)))"
@@ -67481,12 +67480,12 @@ static const char *startup_source =
 "(values #t set!392_1 id393_1 rhs394_1))))))"
 "(let-values(((orig-id_1) id393_0))"
 "((letrec-values(((rename-loop_0)"
-"(lambda(id_122 from-rename?_0)"
+"(lambda(id_123 from-rename?_0)"
 "(begin"
 " 'rename-loop"
 "(let-values(((binding_28)"
-"(let-values(((id401_0) id_122)"
-"((temp402_0)(expand-context-phase ctx_97))"
+"(let-values(((id401_0) id_123)"
+"((temp402_0)(expand-context-phase ctx_96))"
 "((temp403_0) 'ambiguous)"
 "((temp404_0) #t))"
 "(resolve+shift28.1"
@@ -67500,31 +67499,31 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if(eq? binding_28 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_122 ctx_97))"
+"(let-values()(raise-ambiguous-error id_123 ctx_96))"
 "(void))"
 "(values))))"
 "(let-values(((t_62 primitive?_11 insp_24 protected?_12)"
 "(if binding_28"
 "(let-values(((binding405_0) binding_28)"
-"((ctx406_0) ctx_97)"
+"((ctx406_0) ctx_96)"
 "((s407_0) s_704))"
 "(lookup62.1 #f #f binding405_0 ctx406_0 s407_0))"
 "(values #f #f #f #f))))"
 "(begin"
-"(let-values(((obs_119)(expand-context-observer ctx_97)))"
+"(let-values(((obs_119)(expand-context-observer ctx_96)))"
 "(if obs_119"
 "(let-values()"
-"(let-values()(call-expand-observe obs_119 'resolve id_122)))"
+"(let-values()(call-expand-observe obs_119 'resolve id_123)))"
 "(void)))"
 "(if(let-values(((or-part_384)(variable? t_62)))"
 "(if or-part_384"
 " or-part_384"
 "(if(not binding_28)"
 "(let-values(((or-part_385)"
-"(register-eventual-variable!? id_122 ctx_97)))"
+"(register-eventual-variable!? id_123 ctx_96)))"
 "(if or-part_385"
 " or-part_385"
-"(expand-context-allow-unbound? ctx_97)))"
+"(expand-context-allow-unbound? ctx_96)))"
 " #f)))"
 "(let-values()"
 "(let-values((()"
@@ -67533,20 +67532,20 @@ static const char *startup_source =
 "(not"
 "(eq?"
 "(module-binding-module binding_28)"
-"(root-expand-context-self-mpi ctx_97)))"
+"(root-expand-context-self-mpi ctx_96)))"
 " #f)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                    \"cannot mutate module-required identifier\""
 " s_704"
-" id_122))"
+" id_123))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_120)"
-"(expand-context-observer ctx_97)))"
+"(expand-context-observer ctx_96)))"
 "(if obs_120"
 "(let-values()"
 "(let-values()"
@@ -67558,28 +67557,28 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_28)"
 "(values))))"
 "(let-values(((rebuild-s_12)"
-"(let-values(((ctx408_0) ctx_97)((s409_0) s_704))"
+"(let-values(((ctx408_0) ctx_96)((s409_0) s_704))"
 "(keep-as-needed119.1 #f #f #f ctx408_0 s409_0))))"
 "(let-values(((exp-rhs_5)"
 "(let-values(((temp410_0) rhs394_0)"
 "((temp411_0)"
-"(as-expression-context ctx_97)))"
+"(as-expression-context ctx_96)))"
 "(expand9.1 #f #f #f temp410_0 temp411_0))))"
-"(if(expand-context-to-parsed? ctx_97)"
+"(if(expand-context-to-parsed? ctx_96)"
 "(parsed-set!9.1"
 " rebuild-s_12"
-"(parsed-id2.1 id_122 binding_28 #f)"
+"(parsed-id2.1 id_123 binding_28 #f)"
 " exp-rhs_5)"
 "(let-values(((rebuild-s412_0) rebuild-s_12)"
 "((temp413_0)"
 "(list"
 " set!392_0"
-"(let-values(((id414_0) id_122)"
+"(let-values(((id414_0) id_123)"
 "((t415_0) t_62)"
 "((temp416_0)"
 "(free-id-set-empty-or-just-module*?"
 "(expand-context-stops"
-" ctx_97))))"
+" ctx_96))))"
 "(substitute-variable6.1"
 " temp416_0"
 " id414_0"
@@ -67592,12 +67591,12 @@ static const char *startup_source =
 " #f"
 "                                                  \"unbound identifier\""
 " s_704"
-" id_122"
+" id_123"
 " null"
-"(syntax-debug-info-string id_122 ctx_97)))"
+"(syntax-debug-info-string id_123 ctx_96)))"
 "(if(1/set!-transformer? t_62)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_62 ctx_97)"
+"(if(not-in-this-expand-context? t_62 ctx_96)"
 "(let-values()"
 "(let-values(((temp417_0)"
 "(avoid-current-expand-context"
@@ -67606,12 +67605,12 @@ static const char *startup_source =
 " disarmed-s_18"
 " set!392_0"
 " rhs394_0"
-" id_122"
+" id_123"
 " from-rename?_0"
-" ctx_97)"
+" ctx_96)"
 " t_62"
-" ctx_97))"
-"((ctx418_0) ctx_97))"
+" ctx_96))"
+"((ctx418_0) ctx_96))"
 "(expand9.1 #f #f #f temp417_0 ctx418_0)))"
 "(let-values()"
 "(let-values(((exp-s_13 re-ctx_1)"
@@ -67619,7 +67618,7 @@ static const char *startup_source =
 "((insp420_0) insp_24)"
 "((s421_0) s_704)"
 "((orig-id422_0) orig-id_1)"
-"((ctx423_0) ctx_97)"
+"((ctx423_0) ctx_96)"
 "((binding424_0) binding_28)"
 "((orig-id425_0) orig-id_1))"
 "(apply-transformer52.1"
@@ -67630,7 +67629,7 @@ static const char *startup_source =
 " orig-id422_0"
 " ctx423_0"
 " binding424_0))))"
-"(if(expand-context-just-once? ctx_97)"
+"(if(expand-context-just-once? ctx_96)"
 "(let-values() exp-s_13)"
 "(let-values()"
 "(let-values(((exp-s426_0) exp-s_13)"
@@ -67638,7 +67637,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f exp-s426_0 re-ctx427_0))))))))"
 "(if(1/rename-transformer? t_62)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_62 ctx_97)"
+"(if(not-in-this-expand-context? t_62 ctx_96)"
 "(let-values()"
 "(let-values(((temp428_0)"
 "(avoid-current-expand-context"
@@ -67647,27 +67646,27 @@ static const char *startup_source =
 " disarmed-s_18"
 " set!392_0"
 " rhs394_0"
-" id_122"
+" id_123"
 " from-rename?_0"
-" ctx_97"
+" ctx_96"
 " t_62)"
 " t_62"
-" ctx_97))"
-"((ctx429_0) ctx_97))"
+" ctx_96))"
+"((ctx429_0) ctx_96))"
 "(expand9.1 #f #f #f temp428_0 ctx429_0)))"
 "(let-values()"
 "(rename-loop_0"
 "(syntax-track-origin$1"
-"(rename-transformer-target-in-context t_62 ctx_97)"
-" id_122"
-" id_122)"
+"(rename-transformer-target-in-context t_62 ctx_96)"
+" id_123"
+" id_123)"
 " #t))))"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                      \"cannot mutate syntax identifier\""
 " s_704"
-" id_122))))))))))))))"
+" id_123))))))))))))))"
 " rename-loop_0)"
 " orig-id_1"
 " #f))))))))"
@@ -67680,10 +67679,10 @@ static const char *startup_source =
 "(let-values(((s_716) s24_3))"
 "(let-values(((disarmed-s_19) disarmed-s25_0))"
 "(let-values(((set!-id_0) set!-id26_0))"
-"(let-values(((id_123) id27_0))"
+"(let-values(((id_124) id27_0))"
 "(let-values(((rhs-s_0) rhs-s28_0))"
 "(let-values(((from-rename?_1) from-rename?29_0))"
-"(let-values(((ctx_98) ctx30_0))"
+"(let-values(((ctx_97) ctx30_0))"
 "(let-values(((t_63) t23_0))"
 "(let-values()"
 "(if(let-values(((or-part_386) t_63))"
@@ -67691,8 +67690,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_63"
-"(rename-transformer-target-in-context t_63 ctx_98)"
-" id_123)))"
+"(rename-transformer-target-in-context t_63 ctx_97)"
+" id_124)))"
 "(syntax-rearm$1"
 "(datum->syntax$1"
 " disarmed-s_19"
@@ -67702,17 +67701,17 @@ static const char *startup_source =
 " s_716)))"
 "(let-values() s_716)))))))))))))))"
 "(case-lambda"
-"((s_717 disarmed-s_20 set!-id_1 id_124 rhs-s_1 from-rename?_2 ctx_99)"
-"(begin(substitute-set!-rename31_0 s_717 disarmed-s_20 set!-id_1 id_124 rhs-s_1 from-rename?_2 ctx_99 #f)))"
-"((s_718 disarmed-s_21 set!-id_2 id_125 rhs-s_2 from-rename?_3 ctx_100 t23_1)"
-"(substitute-set!-rename31_0 s_718 disarmed-s_21 set!-id_2 id_125 rhs-s_2 from-rename?_3 ctx_100 t23_1)))))"
+"((s_717 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_98)"
+"(begin(substitute-set!-rename31_0 s_717 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_98 #f)))"
+"((s_718 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_99 t23_1)"
+"(substitute-set!-rename31_0 s_718 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_99 t23_1)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_719 ctx_101)"
+"(lambda(s_719 ctx_100)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_121)(expand-context-observer ctx_101)))"
+"(let-values(((obs_121)(expand-context-observer ctx_100)))"
 "(if obs_121"
 "(let-values()(let-values()(call-expand-observe obs_121 'prim-#%variable-reference)))"
 "(void)))"
@@ -67862,19 +67861,19 @@ static const char *startup_source =
 "(let-values(((var-id_0)(if ok?_60 id431_0 id437_0)))"
 "(let-values(((binding_29)"
 "(let-values(((var-id447_0) var-id_0)"
-"((temp448_0)(expand-context-phase ctx_101))"
+"((temp448_0)(expand-context-phase ctx_100))"
 "((temp449_0) 'ambiguous))"
 "(resolve+shift28.1 temp449_0 #f null unsafe-undefined #f var-id447_0 temp448_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_29 'ambiguous)"
-"(let-values()(raise-ambiguous-error var-id_0 ctx_101))"
+"(let-values()(raise-ambiguous-error var-id_0 ctx_100))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if(let-values(((or-part_391) binding_29))"
-"(if or-part_391 or-part_391(expand-context-allow-unbound? ctx_101)))"
+"(if or-part_391 or-part_391(expand-context-allow-unbound? ctx_100)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
@@ -67883,15 +67882,15 @@ static const char *startup_source =
 " s_719"
 " var-id_0"
 " null"
-"(syntax-debug-info-string var-id_0 ctx_101))))"
+"(syntax-debug-info-string var-id_0 ctx_100))))"
 "(values))))"
 "(let-values(((t_64 primitive?_12 insp-of-t_7 protected?_13)"
 "(if binding_29"
 "(let-values(((binding450_0) binding_29)"
-"((ctx451_0) ctx_101)"
+"((ctx451_0) ctx_100)"
 "((var-id452_0) var-id_0)"
 "((s453_0) s_719)"
-"((temp454_0)(expand-context-in-local-expand? ctx_101)))"
+"((temp454_0)(expand-context-in-local-expand? ctx_100)))"
 "(lookup62.1 s453_0 temp454_0 binding450_0 ctx451_0 var-id452_0))"
 "(values #f #f #f #f))))"
 "(begin"
@@ -67899,7 +67898,7 @@ static const char *startup_source =
 "(let-values()"
 "                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_719))"
 "(void))"
-"(if(expand-context-to-parsed? ctx_101)"
+"(if(expand-context-to-parsed? ctx_100)"
 "(parsed-#%variable-reference11.1"
 "(keep-properties-only~ s_719)"
 "(if ok?_61"
@@ -67907,16 +67906,16 @@ static const char *startup_source =
 "(let-values()(parsed-id2.1 var-id_0 binding_29 #f))))"
 " s_719))))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_101)"
+"(if(expand-context-to-parsed? ctx_100)"
 "(parsed-#%variable-reference11.1(keep-properties-only~ s_719) #f)"
 " s_719)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_761 ctx_102)"
+"(lambda(s_761 ctx_101)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_122)(expand-context-observer ctx_102)))"
+"(let-values(((obs_122)(expand-context-observer ctx_101)))"
 "(if obs_122"
 "(let-values()(let-values()(call-expand-observe obs_122 'prim-#%expression)))"
 "(void)))"
@@ -67958,38 +67957,38 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_61)))))"
 "(values #t #%expression455_1 e456_1))))))"
 "(let-values(((rebuild-s_13)"
-"(let-values(((ctx460_0) ctx_102)((s461_0) s_761)((temp462_0) #t))"
+"(let-values(((ctx460_0) ctx_101)((s461_0) s_761)((temp462_0) #t))"
 "(keep-as-needed119.1 temp462_0 #f #f ctx460_0 s461_0))))"
 "(let-values(((exp-e_0)"
 "(let-values(((temp463_0) e456_0)"
 "((temp464_0)"
-"(let-values(((temp465_0)(as-expression-context ctx_102))"
-"((ctx466_0) ctx_102))"
+"(let-values(((temp465_0)(as-expression-context ctx_101))"
+"((ctx466_0) ctx_101))"
 "(as-tail-context22.1 ctx466_0 temp465_0))))"
 "(expand9.1 #f #f #f temp463_0 temp464_0))))"
-"(if(expand-context-to-parsed? ctx_102)"
+"(if(expand-context-to-parsed? ctx_101)"
 " exp-e_0"
 "(if(let-values(((or-part_392)"
-"(if(expand-context-in-local-expand? ctx_102)"
-"(expand-context-keep-#%expression? ctx_102)"
+"(if(expand-context-in-local-expand? ctx_101)"
+"(expand-context-keep-#%expression? ctx_101)"
 " #f)))"
-"(if or-part_392 or-part_392(eq? 'top-level(expand-context-context ctx_102))))"
+"(if or-part_392 or-part_392(eq? 'top-level(expand-context-context ctx_101))))"
 "(let-values()"
 "(let-values(((rebuild-s467_0) rebuild-s_13)((temp468_0)(list #%expression455_0 exp-e_0)))"
 "(rebuild5.1 #t rebuild-s467_0 temp468_0)))"
 "(let-values()"
 "(let-values(((result-s_13)(syntax-track-origin$1 exp-e_0 rebuild-s_13)))"
 "(begin"
-"(let-values(((obs_123)(expand-context-observer ctx_102)))"
+"(let-values(((obs_123)(expand-context-observer ctx_101)))"
 "(if obs_123"
 "(let-values()(let-values()(call-expand-observe obs_123 'tag result-s_13)))"
 "(void)))"
 " result-s_13)))))))))))))"
-" (void (add-core-form!* 'unquote (lambda (s_770 ctx_103) (raise-syntax-error$1 #f \"not in quasiquote\" s_770))))"
-" (void (add-core-form!* 'unquote-splicing (lambda (s_771 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))"
+" (void (add-core-form!* 'unquote (lambda (s_770 ctx_102) (raise-syntax-error$1 #f \"not in quasiquote\" s_770))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_771 ctx_103) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))"
 "(define-values"
 "(binding-for-transformer?)"
-"(lambda(b_42 id_126 at-phase_12 ns_123)"
+"(lambda(b_42 id_127 at-phase_12 ns_123)"
 "(begin"
 "(if(not at-phase_12)"
 "(let-values()"
@@ -68008,16 +68007,16 @@ static const char *startup_source =
 "((null3_0) null)"
 "((ns4_2) ns_123)"
 "((at-phase5_0) at-phase_12)"
-"((id6_0) id_126))"
+"((id6_0) id_127))"
 "(binding-lookup50.1 #f #f b1_8 empty-env2_0 null3_0 ns4_2 at-phase5_0 id6_0))))"
 "(not(variable? val_14))))))))"
 "(define-values(layers) '(raw phaseless id))"
 "(define-values(provide-form-name) 'provide)"
 "(define-values"
 "(parse-and-expand-provides!)"
-"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_43 ctx_105)"
+"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_43 ctx_104)"
 "(begin"
-"(let-values(((ns_125)(expand-context-namespace ctx_105)))"
+"(let-values(((ns_125)(expand-context-namespace ctx_104)))"
 "((letrec-values(((loop_115)"
 "(lambda(specs_1 at-phase_13 protected?_15 layer_6)"
 "(begin"
@@ -68197,32 +68196,32 @@ static const char *startup_source =
 "(if(pair?"
 " s_772)"
 "(let-values(((for-meta6_0)"
-"(let-values(((s_486)"
+"(let-values(((s_487)"
 "(car"
 " s_772)))"
-" s_486))"
+" s_487))"
 "((phase-level7_0"
 " spec8_0)"
-"(let-values(((s_447)"
+"(let-values(((s_448)"
 "(cdr"
 " s_772)))"
-"(let-values(((s_491)"
+"(let-values(((s_492)"
 "(if(syntax?$1"
-" s_447)"
+" s_448)"
 "(syntax-e$1"
-" s_447)"
-" s_447)))"
+" s_448)"
+" s_448)))"
 "(if(pair?"
-" s_491)"
+" s_492)"
 "(let-values(((phase-level9_0)"
 "(let-values(((s_773)"
 "(car"
-" s_491)))"
+" s_492)))"
 " s_773))"
 "((spec10_0)"
 "(let-values(((s_774)"
 "(cdr"
-" s_491)))"
+" s_492)))"
 "(let-values(((s_81)"
 "(if(syntax?$1"
 " s_774)"
@@ -68313,18 +68312,18 @@ static const char *startup_source =
 "(let-values(((ok?_65"
 " for-syntax13_0"
 " spec14_0)"
-"(let-values(((s_449)"
+"(let-values(((s_450)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_64)"
-" s_449))"
+" s_450))"
 "(let-values(((for-syntax13_1"
 " spec14_1)"
 "(let-values(((s_24)"
 "(if(syntax?$1"
-" s_449)"
+" s_450)"
 "(syntax-e$1"
-" s_449)"
-" s_449)))"
+" s_450)"
+" s_450)))"
 "(if(pair?"
 " s_24)"
 "(let-values(((for-syntax15_0)"
@@ -68401,25 +68400,25 @@ static const char *startup_source =
 "(let-values(((ok?_66"
 " for-label19_0"
 " spec20_0)"
-"(let-values(((s_499)"
+"(let-values(((s_500)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_65)"
-" s_499))"
+" s_500))"
 "(let-values(((for-label19_1"
 " spec20_1)"
 "(let-values(((s_308)"
 "(if(syntax?$1"
-" s_499)"
+" s_500)"
 "(syntax-e$1"
-" s_499)"
-" s_499)))"
+" s_500)"
+" s_500)))"
 "(if(pair?"
 " s_308)"
 "(let-values(((for-label21_0)"
-"(let-values(((s_442)"
+"(let-values(((s_443)"
 "(car"
 " s_308)))"
-" s_442))"
+" s_443))"
 "((spec22_0)"
 "(let-values(((s_27)"
 "(cdr"
@@ -68513,20 +68512,20 @@ static const char *startup_source =
 "(if(pair?"
 " s_776)"
 "(let-values(((protect27_0)"
-"(let-values(((s_505)"
+"(let-values(((s_506)"
 "(car"
 " s_776)))"
-" s_505))"
+" s_506))"
 "((p-spec28_0)"
-"(let-values(((s_506)"
+"(let-values(((s_507)"
 "(cdr"
 " s_776)))"
 "(let-values(((s_52)"
 "(if(syntax?$1"
-" s_506)"
+" s_507)"
 "(syntax-e$1"
-" s_506)"
-" s_506)))"
+" s_507)"
+" s_507)))"
 "(let-values(((flat-s_49)"
 "(to-syntax-list.1"
 " s_52)))"
@@ -68742,19 +68741,19 @@ static const char *startup_source =
 " struct40_0"
 " id:struct41_0"
 " id:field42_0)"
-"(let-values(((s_520)"
+"(let-values(((s_521)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_68)"
-" s_520))"
+" s_521))"
 "(let-values(((struct40_1"
 " id:struct41_1"
 " id:field42_1)"
 "(let-values(((s_206)"
 "(if(syntax?$1"
-" s_520)"
+" s_521)"
 "(syntax-e$1"
-" s_520)"
-" s_520)))"
+" s_521)"
+" s_521)))"
 "(if(pair?"
 " s_206)"
 "(let-values(((struct43_0)"
@@ -68800,24 +68799,24 @@ static const char *startup_source =
 "(let-values(((s_780)"
 "(cdr"
 " s_317)))"
-"(let-values(((s_431)"
+"(let-values(((s_432)"
 "(if(syntax?$1"
 " s_780)"
 "(syntax-e$1"
 " s_780)"
 " s_780)))"
 "(if(pair?"
-" s_431)"
+" s_432)"
 "(let-values(((id:field48_0)"
-"(let-values(((s_521)"
+"(let-values(((s_522)"
 "(car"
-" s_431)))"
+" s_432)))"
 "(let-values(((s_781)"
 "(if(syntax?$1"
-" s_521)"
+" s_522)"
 "(syntax-e$1"
-" s_521)"
-" s_521)))"
+" s_522)"
+" s_522)))"
 "(let-values(((flat-s_50)"
 "(to-syntax-list.1"
 " s_781)))"
@@ -68894,17 +68893,17 @@ static const char *startup_source =
 "(reverse$1"
 " id:field_0))))))))"
 "(()"
-"(let-values(((s_526)"
-"(cdr"
-" s_431)))"
 "(let-values(((s_527)"
+"(cdr"
+" s_432)))"
+"(let-values(((s_528)"
 "(if(syntax?$1"
-" s_526)"
-"(syntax-e$1"
-" s_526)"
-" s_526)))"
-"(if(null?"
 " s_527)"
+"(syntax-e$1"
+" s_527)"
+" s_527)))"
+"(if(null?"
+" s_528)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68976,20 +68975,20 @@ static const char *startup_source =
 "(if(pair?"
 " s_321)"
 "(let-values(((all-from52_0)"
-"(let-values(((s_425)"
+"(let-values(((s_426)"
 "(car"
 " s_321)))"
-" s_425))"
+" s_426))"
 "((mod-path53_0)"
-"(let-values(((s_426)"
+"(let-values(((s_427)"
 "(cdr"
 " s_321)))"
 "(let-values(((s_214)"
 "(if(syntax?$1"
-" s_426)"
+" s_427)"
 "(syntax-e$1"
-" s_426)"
-" s_426)))"
+" s_427)"
+" s_427)))"
 "(if(pair?"
 " s_214)"
 "(let-values(((mod-path54_0)"
@@ -69041,7 +69040,7 @@ static const char *startup_source =
 " ns_125"
 " rp_1"
 " protected?_15"
-" ctx_105)"
+" ctx_104)"
 "(values"
 " null"
 "(list"
@@ -69115,7 +69114,7 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                               \"bad syntax\""
 " orig-s_70))"
 "(let-values()"
-"(let-values(((id_127)"
+"(let-values(((id_128)"
 "(let-values(((lst_405)"
 " flat-s_51))"
 "(begin"
@@ -69126,7 +69125,7 @@ static const char *startup_source =
 "(check-list"
 " lst_405)))"
 "((letrec-values(((for-loop_319)"
-"(lambda(id_128"
+"(lambda(id_129"
 " lst_406)"
 "(begin"
 " 'for-loop"
@@ -69138,10 +69137,10 @@ static const char *startup_source =
 "((rest_241)"
 "(unsafe-cdr"
 " lst_406)))"
-"(let-values(((id_129)"
 "(let-values(((id_130)"
-" id_128))"
 "(let-values(((id_131)"
+" id_129))"
+"(let-values(((id_132)"
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
@@ -69164,21 +69163,21 @@ static const char *startup_source =
 " s_786)))))"
 "(cons"
 " id63_0"
-" id_130)))))"
-"(values"
 " id_131)))))"
+"(values"
+" id_132)))))"
 "(if(not"
 " #f)"
 "(for-loop_319"
-" id_129"
+" id_130"
 " rest_241)"
-" id_129)))"
-" id_128)))))"
+" id_130)))"
+" id_129)))))"
 " for-loop_319)"
 " null"
 " lst_405)))))"
 "(reverse$1"
-" id_127)))))))))"
+" id_128)))))))))"
 "(values"
 " mod-path61_0"
 " id62_0))"
@@ -69209,7 +69208,7 @@ static const char *startup_source =
 " ns_125"
 " rp_1"
 " protected?_15"
-" ctx_105)"
+" ctx_104)"
 "(values"
 " null"
 "(list"
@@ -69242,22 +69241,22 @@ static const char *startup_source =
 "(if(pair?"
 " s_787)"
 "(let-values(((all-defined65_0)"
-"(let-values(((s_437)"
+"(let-values(((s_438)"
 "(car"
 " s_787)))"
-" s_437))"
+" s_438))"
 "(()"
 "(let-values(((s_224)"
 "(cdr"
 " s_787)))"
-"(let-values(((s_427)"
+"(let-values(((s_428)"
 "(if(syntax?$1"
 " s_224)"
 "(syntax-e$1"
 " s_224)"
 " s_224)))"
 "(if(null?"
-" s_427)"
+" s_428)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69319,7 +69318,7 @@ static const char *startup_source =
 "(let-values(((s_790)"
 "(cdr"
 " s_788)))"
-"(let-values(((s_462)"
+"(let-values(((s_463)"
 "(if(syntax?$1"
 " s_790)"
 "(syntax-e$1"
@@ -69327,7 +69326,7 @@ static const char *startup_source =
 " s_790)))"
 "(let-values(((flat-s_52)"
 "(to-syntax-list.1"
-" s_462)))"
+" s_463)))"
 "(if(not"
 " flat-s_52)"
 "(let-values()"
@@ -69336,7 +69335,7 @@ static const char *startup_source =
 "                                                                                                                                                                                                                           \"bad syntax\""
 " orig-s_72))"
 "(let-values()"
-"(let-values(((id_132)"
+"(let-values(((id_133)"
 "(let-values(((lst_204)"
 " flat-s_52))"
 "(begin"
@@ -69347,59 +69346,59 @@ static const char *startup_source =
 "(check-list"
 " lst_204)))"
 "((letrec-values(((for-loop_135)"
-"(lambda(id_133"
+"(lambda(id_134"
 " lst_407)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_407)"
-"(let-values(((s_463)"
+"(let-values(((s_464)"
 "(unsafe-car"
 " lst_407))"
 "((rest_242)"
 "(unsafe-cdr"
 " lst_407)))"
-"(let-values(((id_134)"
 "(let-values(((id_135)"
-" id_133))"
 "(let-values(((id_136)"
+" id_134))"
+"(let-values(((id_137)"
 "(let-values()"
 "(let-values(((id70_0)"
 "(let-values()"
 "(if(let-values(((or-part_287)"
 "(if(syntax?$1"
-" s_463)"
+" s_464)"
 "(symbol?"
 "(syntax-e$1"
-" s_463))"
+" s_464))"
 " #f)))"
 "(if or-part_287"
 " or-part_287"
 "(symbol?"
-" s_463)))"
-" s_463"
+" s_464)))"
+" s_464"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                         \"not an identifier\""
 " orig-s_72"
-" s_463)))))"
+" s_464)))))"
 "(cons"
 " id70_0"
-" id_135)))))"
-"(values"
 " id_136)))))"
+"(values"
+" id_137)))))"
 "(if(not"
 " #f)"
 "(for-loop_135"
-" id_134"
+" id_135"
 " rest_242)"
-" id_134)))"
-" id_133)))))"
+" id_135)))"
+" id_134)))))"
 " for-loop_135)"
 " null"
 " lst_204)))))"
 "(reverse$1"
-" id_132)))))))))"
+" id_133)))))))))"
 "(values"
 " all-defined-except68_0"
 " id69_0))"
@@ -69569,10 +69568,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_792)"
 "(let-values(((prefix-all-defined-except79_0)"
-"(let-values(((s_533)"
+"(let-values(((s_534)"
 "(car"
 " s_792)))"
-" s_533))"
+" s_534))"
 "((id:prefix80_0"
 " id81_0)"
 "(let-values(((s_793)"
@@ -69587,26 +69586,26 @@ static const char *startup_source =
 "(if(pair?"
 " s_243)"
 "(let-values(((id:prefix82_0)"
-"(let-values(((s_534)"
+"(let-values(((s_535)"
 "(car"
 " s_243)))"
 "(if(let-values(((or-part_343)"
 "(if(syntax?$1"
-" s_534)"
+" s_535)"
 "(symbol?"
 "(syntax-e$1"
-" s_534))"
+" s_535))"
 " #f)))"
 "(if or-part_343"
 " or-part_343"
 "(symbol?"
-" s_534)))"
-" s_534"
+" s_535)))"
+" s_535"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
 " orig-s_74"
-" s_534))))"
+" s_535))))"
 "((id83_0)"
 "(let-values(((s_348)"
 "(cdr"
@@ -69628,7 +69627,7 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                                 \"bad syntax\""
 " orig-s_74))"
 "(let-values()"
-"(let-values(((id_86)"
+"(let-values(((id_87)"
 "(let-values(((lst_408)"
 " flat-s_53))"
 "(begin"
@@ -69651,10 +69650,10 @@ static const char *startup_source =
 "((rest_243)"
 "(unsafe-cdr"
 " lst_409)))"
-"(let-values(((id_137)"
 "(let-values(((id_138)"
-" id_36))"
 "(let-values(((id_139)"
+" id_36))"
+"(let-values(((id_140)"
 "(let-values()"
 "(let-values(((id84_3)"
 "(let-values()"
@@ -69677,21 +69676,21 @@ static const char *startup_source =
 " s_795)))))"
 "(cons"
 " id84_3"
-" id_138)))))"
-"(values"
 " id_139)))))"
+"(values"
+" id_140)))))"
 "(if(not"
 " #f)"
 "(for-loop_320"
-" id_137"
+" id_138"
 " rest_243)"
-" id_137)))"
+" id_138)))"
 " id_36)))))"
 " for-loop_320)"
 " null"
 " lst_408)))))"
 "(reverse$1"
-" id_86)))))))))"
+" id_87)))))))))"
 "(values"
 " id:prefix82_0"
 " id83_0))"
@@ -69927,7 +69926,7 @@ static const char *startup_source =
 " form96_0)"
 "((temp105_4)"
 "(let-values(((v_268)"
-" ctx_105))"
+" ctx_104))"
 "(let-values(((the-struct_99)"
 " v_268))"
 "(if(expand-context/outer?"
@@ -70241,11 +70240,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((id_140)(mk_0 fmt_3)))"
+"(let-values(((id_141)(mk_0 fmt_3)))"
 "(parse-identifier!"
-" id_140"
+" id_141"
 " orig-s_79"
-"(syntax-e$1 id_140)"
+"(syntax-e$1 id_141)"
 " at-phase_15"
 " ns_127"
 " rp_3"
@@ -70306,7 +70305,7 @@ static const char *startup_source =
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
-"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_106)"
+"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_105)"
 "(begin"
 "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
@@ -70316,7 +70315,7 @@ static const char *startup_source =
 "(let-values()"
 "                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_80 mod-path-stx_0)))"
 "(values))))"
-"(let-values(((mpi_54)(module-path->mpi/context mod-path_33 ctx_106)))"
+"(let-values(((mpi_54)(module-path->mpi/context mod-path_33 ctx_105)))"
 "(parse-all-from-module mpi_54 #f orig-s_80 except-ids_0 #f at-phase_16 ns_128 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
@@ -70368,25 +70367,25 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((id_141)"
+"(let-values(((id_142)"
 "(required-id i_187)))"
-"(let-values(((phase_142)"
+"(let-values(((phase_141)"
 "(required-phase"
 " i_187)))"
 "(if(let-values(((or-part_399)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
-" phase_142"
+" phase_141"
 " at-phase_17)"
 "(free-identifier=?$1"
-" id_141"
+" id_142"
 "(datum->syntax$1"
 " matching-stx_0"
 "(syntax-e$1"
-" id_141))"
-" phase_142"
-" phase_142)"
+" id_142))"
+" phase_141"
+" phase_141)"
 " #f))"
 " #f)))"
 "(if or-part_399"
@@ -70419,10 +70418,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(if(free-identifier=?$1"
-" id_141"
+" id_142"
 " except-id_0"
-" phase_142"
-" phase_142)"
+" phase_141"
+" phase_141)"
 "(hash-set!"
 " found_0"
 " except-id_0"
@@ -70449,14 +70448,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((b_94)"
 "(resolve+shift/extra-inspector"
-" id_141"
-" phase_142"
+" id_142"
+" phase_141"
 " ns_129)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
-" id_141)"
+" id_142)"
 "((phase131_0)"
-" phase_142)"
+" phase_141)"
 "((temp132_2)"
 " #t))"
 "(resolve+shift28.1"
@@ -70472,15 +70471,15 @@ static const char *startup_source =
 "((temp122_1)"
 "(add-prefix_1"
 "(syntax-e$1"
-" id_141)))"
+" id_142)))"
 "((phase123_0)"
-" phase_142)"
+" phase_141)"
 "((b124_0)"
 " b_94)"
 "((immed-b125_0)"
 " immed-b_1)"
 "((id126_1)"
-" id_141)"
+" id_142)"
 "((orig-s127_0)"
 " orig-s_81)"
 "((protected?128_0)"
@@ -70561,17 +70560,17 @@ static const char *startup_source =
 "(let-values(((result_134)"
 "(let-values()"
 "(let-values()"
-"(let-values(((id_142)"
+"(let-values(((id_143)"
 "(required-id"
 " i_188)))"
-"(let-values(((phase_143)"
+"(let-values(((phase_142)"
 "(required-phase"
 " i_188)))"
 "(free-identifier=?$1"
-" id_142"
+" id_143"
 " except-id_1"
-" phase_143"
-" phase_143)))))))"
+" phase_142"
+" phase_142)))))))"
 "(values"
 " result_134)))))"
 "(if(if(not"
@@ -70949,11 +70948,11 @@ static const char *startup_source =
 "(lambda(e_94)(begin(if(parsed-quote? e_94)(string?(parsed-quote-datum e_94)) #f))))"
 "(define-values"
 "(cross-phase-primitive-name)"
-"(lambda(id_143)"
+"(lambda(id_144)"
 "(begin"
-"(if(parsed-id? id_143)"
+"(if(parsed-id? id_144)"
 "(let-values()"
-"(let-values(((b_86)(parsed-id-binding id_143)))"
+"(let-values(((b_86)(parsed-id-binding id_144)))"
 "(if(module-binding? b_86)"
 "(if(eq? runtime-module-name(1/module-path-index-resolve(module-binding-module b_86)))"
 "(module-binding-sym b_86)"
@@ -70971,42 +70970,42 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'module"
-"(lambda(s_43 ctx_107)"
+"(lambda(s_43 ctx_106)"
 "(begin"
-"(if(eq?(expand-context-context ctx_107) 'top-level)"
+"(if(eq?(expand-context-context ctx_106) 'top-level)"
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_124)(expand-context-observer ctx_107)))"
+"(let-values(((obs_124)(expand-context-observer ctx_106)))"
 "(if obs_124(let-values()(let-values()(call-expand-observe obs_124 'prim-module)))(void)))"
 "             (raise-syntax-error$1 #f \"allowed only at the top level\" s_43))))"
 "(let-values()"
-"(let-values(((s223_0) s_43)((ctx224_0) ctx_107)((temp225_2) #f))"
+"(let-values(((s223_0) s_43)((ctx224_0) ctx_106)((temp225_2) #f))"
 "(expand-module18.1 #f #f #f #f #f unsafe-undefined #f s223_0 ctx224_0 temp225_2)))))))"
 "(void"
 "(add-core-form!*"
 " 'module*"
-"(lambda(s_306 ctx_108)"
+"(lambda(s_306 ctx_107)"
 "(begin"
-"(let-values(((obs_125)(expand-context-observer ctx_108)))"
+"(let-values(((obs_125)(expand-context-observer ctx_107)))"
 "(if obs_125(let-values()(let-values()(call-expand-observe obs_125 'prim-module)))(void)))"
 "       (raise-syntax-error$1 #f \"illegal use (not in a module top-level)\" s_306)))))"
 "(void"
 "(add-core-form!*"
 " '#%module-begin"
-"(lambda(s_90 ctx_109)"
+"(lambda(s_90 ctx_108)"
 "(begin"
-"(let-values(((obs_126)(expand-context-observer ctx_109)))"
+"(let-values(((obs_126)(expand-context-observer ctx_108)))"
 "(if obs_126(let-values()(let-values()(call-expand-observe obs_126 'prim-module-begin)))(void)))"
-"(if(eq?(expand-context-context ctx_109) 'module-begin)"
+"(if(eq?(expand-context-context ctx_108) 'module-begin)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not in a module-definition context\" s_90)))"
-"(if(expand-context-module-begin-k ctx_109)"
+"(if(expand-context-module-begin-k ctx_108)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not currently transforming a module\" s_90)))"
-"((expand-context-module-begin-k ctx_109)"
+"((expand-context-module-begin-k ctx_108)"
 " s_90"
-"(let-values(((v_269) ctx_109))"
+"(let-values(((v_269) ctx_108))"
 "(let-values(((the-struct_101) v_269))"
 "(if(expand-context/outer? the-struct_101)"
 "(let-values(((inner226_0)"
@@ -71061,9 +71060,9 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%declare"
-"(lambda(s_803 ctx_110)"
+"(lambda(s_803 ctx_109)"
 "(begin"
-"(let-values(((obs_127)(expand-context-observer ctx_110)))"
+"(let-values(((obs_127)(expand-context-observer ctx_109)))"
 "(if obs_127(let-values()(let-values()(call-expand-observe obs_127 'prim-declare)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_803)))))"
 "(define-values"
@@ -71110,18 +71109,18 @@ static const char *startup_source =
 " id:module-name229_1"
 " initial-require230_1"
 " body231_1)"
-"(let-values(((s_506)"
+"(let-values(((s_507)"
 "(if(syntax?$1 s_51)"
 "(syntax-e$1 s_51)"
 " s_51)))"
-"(if(pair? s_506)"
+"(if(pair? s_507)"
 "(let-values(((module232_0)"
-"(let-values(((s_54)(car s_506)))"
+"(let-values(((s_54)(car s_507)))"
 " s_54))"
 "((id:module-name233_0"
 " initial-require234_0"
 " body235_0)"
-"(let-values(((s_310)(cdr s_506)))"
+"(let-values(((s_310)(cdr s_507)))"
 "(let-values(((s_92)"
 "(if(syntax?$1 s_310)"
 "(syntax-e$1 s_310)"
@@ -71153,24 +71152,24 @@ static const char *startup_source =
 "(let-values(((s_55)"
 "(cdr"
 " s_92)))"
-"(let-values(((s_452)"
+"(let-values(((s_453)"
 "(if(syntax?$1"
 " s_55)"
 "(syntax-e$1"
 " s_55)"
 " s_55)))"
 "(if(pair?"
-" s_452)"
+" s_453)"
 "(let-values(((initial-require239_0)"
 "(let-values(((s_56)"
 "(car"
-" s_452)))"
+" s_453)))"
 " s_56))"
 "((body240_0)"
 "(let-values(((s_33)"
 "(cdr"
-" s_452)))"
-"(let-values(((s_508)"
+" s_453)))"
+"(let-values(((s_509)"
 "(if(syntax?$1"
 " s_33)"
 "(syntax-e$1"
@@ -71178,7 +71177,7 @@ static const char *startup_source =
 " s_33)))"
 "(let-values(((flat-s_55)"
 "(to-syntax-list.1"
-" s_508)))"
+" s_509)))"
 "(if(not"
 " flat-s_55)"
 "(let-values()"
@@ -71236,7 +71235,7 @@ static const char *startup_source =
 " s_804"
 " initial-require230_0)))"
 "(values))))"
-"(let-values(((phase_144) 0))"
+"(let-values(((phase_143) 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)))"
@@ -71343,7 +71342,7 @@ static const char *startup_source =
 "(make-m-ns244_0"
 " unsafe-undefined"
 " temp266_0))))"
-"(let-values(((ctx_111)"
+"(let-values(((ctx_110)"
 "(let-values(((v_262)"
 "(copy-root-expand-context"
 " init-ctx_0"
@@ -71365,7 +71364,7 @@ static const char *startup_source =
 "((namespace270_0)"
 " m-ns_19)"
 "((phase271_0)"
-" phase_144)"
+" phase_143)"
 "((just-once?272_0)"
 " #f))"
 "(expand-context/inner2.1"
@@ -71463,46 +71462,46 @@ static const char *startup_source =
 " _274_0"
 " _275_0"
 " body276_0)"
-"(let-values(((s_523)"
+"(let-values(((s_524)"
 " scoped-s_0))"
 "(let-values(((orig-s_83)"
-" s_523))"
+" s_524))"
 "(let-values(((_273_1"
 " _274_1"
 " _275_1"
 " body276_1)"
 "(let-values(((s_209)"
 "(if(syntax?$1"
-" s_523)"
+" s_524)"
 "(syntax-e$1"
-" s_523)"
-" s_523)))"
+" s_524)"
+" s_524)))"
 "(if(pair?"
 " s_209)"
 "(let-values(((_277_2)"
-"(let-values(((s_526)"
+"(let-values(((s_527)"
 "(car"
 " s_209)))"
-" s_526))"
+" s_527))"
 "((_278_0"
 " _279_1"
 " body280_0)"
-"(let-values(((s_527)"
+"(let-values(((s_528)"
 "(cdr"
 " s_209)))"
 "(let-values(((s_96)"
 "(if(syntax?$1"
-" s_527)"
+" s_528)"
 "(syntax-e$1"
-" s_527)"
-" s_527)))"
+" s_528)"
+" s_528)))"
 "(if(pair?"
 " s_96)"
 "(let-values(((_281_0)"
-"(let-values(((s_459)"
+"(let-values(((s_460)"
 "(car"
 " s_96)))"
-" s_459))"
+" s_460))"
 "((_282_1"
 " body283_0)"
 "(let-values(((s_71)"
@@ -71704,7 +71703,7 @@ static const char *startup_source =
 "(set! again?_0"
 " #t)"
 "(values))))"
-"(let-values(((ctx_112)"
+"(let-values(((ctx_111)"
 "(let-values(((v_132)"
 " mb-init-ctx_0))"
 "(let-values(((the-struct_43)"
@@ -71718,8 +71717,8 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_103)"
 "(let-values(((module-begin-k307_0)"
-"(lambda(s_436"
-" ctx_113)"
+"(lambda(s_437"
+" ctx_112)"
 "(begin"
 " 'module-begin-k307"
 "(let-values(((new-requires+provides_0)"
@@ -71760,8 +71759,8 @@ static const char *startup_source =
 " defined-syms315_0)))"
 "(lambda()"
 "(module-begin-k_1"
-" s_436"
-" ctx_113))"
+" s_437"
+" ctx_112))"
 "(lambda()"
 "(begin"
 "(set! requires+provides_6"
@@ -71870,7 +71869,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_20)"
 "(expand-context-observer"
-" ctx_112)))"
+" ctx_111)))"
 "(if obs_20"
 "(let-values()"
 "(let-values()"
@@ -71886,18 +71885,18 @@ static const char *startup_source =
 "(let-values(((ok?_80"
 " #%module-begin301_0"
 " body302_0)"
-"(let-values(((s_427)"
+"(let-values(((s_428)"
 " disarmed-mb-s_0))"
 "(let-values(((orig-s_84)"
-" s_427))"
+" s_428))"
 "(let-values(((#%module-begin301_1"
 " body302_1)"
 "(let-values(((s_118)"
 "(if(syntax?$1"
-" s_427)"
+" s_428)"
 "(syntax-e$1"
-" s_427)"
-" s_427)))"
+" s_428)"
+" s_428)))"
 "(if(pair?"
 " s_118)"
 "(let-values(((#%module-begin303_0)"
@@ -71942,7 +71941,7 @@ static const char *startup_source =
 " body302_0))"
 "(let-values(((rebuild-mb-s_0)"
 "(let-values(((ctx318_0)"
-" ctx_112)"
+" ctx_111)"
 "((mb-s319_0)"
 " mb-s_0))"
 "(keep-as-needed119.1"
@@ -71962,7 +71961,7 @@ static const char *startup_source =
 "(let-values(((expression-expanded-bodys_0)"
 "((letrec-values(((pass-1-and-2-loop_0)"
 "(lambda(bodys_17"
-" phase_145)"
+" phase_144)"
 "(begin"
 " 'pass-1-and-2-loop"
 "(let-values(((def-ctx-scopes_8)"
@@ -71970,10 +71969,10 @@ static const char *startup_source =
 " null)))"
 "(let-values(((to-parsed?_5)"
 "(expand-context-to-parsed?"
-" ctx_112)))"
+" ctx_111)))"
 "(let-values(((partial-body-ctx_0)"
 "(let-values(((v_270)"
-" ctx_112))"
+" ctx_111))"
 "(let-values(((the-struct_104)"
 " v_270))"
 "(if(expand-context/outer?"
@@ -71991,16 +71990,16 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_105)"
 "(let-values(((phase332_0)"
-" phase_145)"
+" phase_144)"
 "((namespace333_0)"
 "(namespace->namespace-at-phase"
 " m-ns_19"
-" phase_145))"
+" phase_144))"
 "((stops334_0)"
 "(free-id-set"
-" phase_145"
+" phase_144"
 "(module-expand-stop-ids"
-" phase_145)))"
+" phase_144)))"
 "((declared-submodule-names335_0)"
 " declared-submodule-names_3)"
 "((lift-key336_0)"
@@ -72019,11 +72018,11 @@ static const char *startup_source =
 " temp341_0)))"
 "((module-lifts338_0)"
 "(make-module-lift-context"
-" phase_145"
+" phase_144"
 " #t))"
 "((require-lifts339_0)"
 "(make-require-lift-context"
-" phase_145"
+" phase_144"
 "(let-values(((m-ns342_0)"
 " m-ns_19)"
 "((self343_0)"
@@ -72039,7 +72038,7 @@ static const char *startup_source =
 " requires+provides344_0))))"
 "((to-module-lifts340_0)"
 "(let-values(((phase346_0)"
-" phase_145)"
+" phase_144)"
 "((module-ends347_0)"
 " module-ends_0)"
 "((temp348_0)"
@@ -72131,7 +72130,7 @@ static const char *startup_source =
 "(let-values(((bodys349_0)"
 " bodys_17)"
 "((phase350_0)"
-" phase_145)"
+" phase_144)"
 "((partial-body-ctx351_0)"
 " partial-body-ctx_0)"
 "((m-ns352_0)"
@@ -72213,7 +72212,7 @@ static const char *startup_source =
 " empty-free-id-set)"
 "((to-module-lifts369_0)"
 "(let-values(((phase370_0)"
-" phase_145)"
+" phase_144)"
 "((module-ends371_0)"
 " module-ends_0)"
 "((temp372_0)"
@@ -72312,7 +72311,7 @@ static const char *startup_source =
 "(let-values(((partially-expanded-bodys320_0)"
 " partially-expanded-bodys_0)"
 "((phase321_0)"
-" phase_145)"
+" phase_144)"
 "((body-ctx322_0)"
 " body-ctx_6)"
 "((self323_0)"
@@ -72336,20 +72335,20 @@ static const char *startup_source =
 " partially-expanded-bodys320_0))))))))))))"
 " pass-1-and-2-loop_0)"
 " bodys_16"
-" phase_144)))"
+" phase_143)))"
 "(let-values((()"
 "(begin"
 "(check-defined-by-now"
 " need-eventually-defined_1"
 " self_32"
-" ctx_112"
+" ctx_111"
 " requires+provides_6)"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_131)"
 "(expand-context-observer"
-" ctx_112)))"
+" ctx_111)))"
 "(if obs_131"
 "(let-values()"
 "(let-values()"
@@ -72368,11 +72367,11 @@ static const char *startup_source =
 "((m-ns376_0)"
 " m-ns_19)"
 "((phase377_0)"
-" phase_144)"
+" phase_143)"
 "((self378_0)"
 " self_32)"
 "((ctx379_0)"
-" ctx_112))"
+" ctx_111))"
 "(resolve-provides115.1"
 " ctx379_0"
 " declared-submodule-names375_0"
@@ -72411,7 +72410,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_132)"
 "(expand-context-observer"
-" ctx_112)))"
+" ctx_111)))"
 "(if obs_132"
 "(let-values()"
 "(let-values()"
@@ -72430,7 +72429,7 @@ static const char *startup_source =
 " m-ns380_0))))"
 "(let-values(((submod-ctx_0)"
 "(let-values(((v_271)"
-" ctx_112))"
+" ctx_111))"
 "(let-values(((the-struct_107)"
 " v_271))"
 "(if(expand-context/outer?"
@@ -72585,7 +72584,7 @@ static const char *startup_source =
 "((declare-enclosing-module398_0)"
 " declare-enclosing-module_0)"
 "((phase399_0)"
-" phase_144)"
+" phase_143)"
 "((self400_0)"
 " self_32)"
 "((requires+provides401_0)"
@@ -72651,7 +72650,7 @@ static const char *startup_source =
 " mb-result-s_0)))))))))))))))))))))))))))))))))"
 "(let-values(((mb-ctx_0)"
 "(let-values(((v_272)"
-" ctx_111))"
+" ctx_110))"
 "(let-values(((the-struct_24)"
 " v_272))"
 "(if(expand-context/outer?"
@@ -72782,7 +72781,7 @@ static const char *startup_source =
 "((mb-def-ctx-scopes424_0)"
 " mb-def-ctx-scopes_0)"
 "((phase425_0)"
-" phase_144)"
+" phase_143)"
 "((s426_0)"
 " s_804))"
 "(ensure-module-begin36.1"
@@ -73014,16 +73013,16 @@ 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_113) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
-"(let-values(((phase_146) phase26_3))"
+"(let-values(((phase_145) phase26_3))"
 "(let-values(((s_382) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
 "(begin"
 " 'make-mb-ctx"
-"(let-values(((v_274) ctx_114))"
+"(let-values(((v_274) ctx_113))"
 "(let-values(((the-struct_111) v_274))"
 "(if(expand-context/outer? the-struct_111)"
 "(let-values(((context436_0) 'module-begin)"
@@ -73054,7 +73053,7 @@ static const char *startup_source =
 "(if(= 1(length bodys_18))"
 "(let-values()"
 "(begin"
-"(let-values(((obs_134)(expand-context-observer ctx_114)))"
+"(let-values(((obs_134)(expand-context-observer ctx_113)))"
 "(if obs_134"
 "(let-values()"
 "(let-values()"
@@ -73062,7 +73061,7 @@ static const char *startup_source =
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_146))"
+"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_145))"
 "(let-values()(car bodys_18))"
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
@@ -73077,13 +73076,13 @@ static const char *startup_source =
 " '#%module-begin"
 "(core-form-sym"
 "(syntax-disarm$1 partly-expanded-body_0)"
-" phase_146))"
+" phase_145))"
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
 "(let-values(((temp442_0)(list partly-expanded-body_0))"
 "((s443_0) s_382)"
 "((scopes-s444_0) scopes-s_0)"
-"((phase445_0) phase_146)"
+"((phase445_0) phase_145)"
 "((module-name-sym446_0) module-name-sym_1)"
 "((temp447_0)(make-mb-ctx_0))"
 "((temp448_1) #f))"
@@ -73099,7 +73098,7 @@ static const char *startup_source =
 "(let-values(((bodys449_0) bodys_18)"
 "((s450_0) s_382)"
 "((scopes-s451_0) scopes-s_0)"
-"((phase452_0) phase_146)"
+"((phase452_0) phase_145)"
 "((module-name-sym453_0) module-name-sym_1)"
 "((temp454_1)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
@@ -73119,7 +73118,7 @@ static const char *startup_source =
 "(let-values(((bodys_19) bodys41_0))"
 "(let-values(((s_807) s42_0))"
 "(let-values(((scopes-s_1) scopes-s43_0))"
-"(let-values(((phase_147) phase44_0))"
+"(let-values(((phase_146) phase44_0))"
 "(let-values(((module-name-sym_2) module-name-sym45_0))"
 "(let-values(((mb-ctx_1) mb-ctx46_0))"
 "(let-values(((log-rename-one?_0) log-rename-one?39_0))"
@@ -73128,7 +73127,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-id455_0) mb-id_0)((phase456_0) phase_147))"
+"(if(let-values(((mb-id455_0) mb-id_0)((phase456_0) phase_146))"
 "(resolve40.1 #f #f null #f mb-id455_0 phase456_0))"
 "(void)"
 "(let-values()"
@@ -73168,7 +73167,7 @@ static const char *startup_source =
 "(begin"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_147))"
+"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_146))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -73744,7 +73743,7 @@ static const char *startup_source =
 "                                                                                                                                                                                               \"bad syntax\""
 " orig-s_87))"
 "(let-values()"
-"(let-values(((id_144)"
+"(let-values(((id_145)"
 "(let-values(((lst_70)"
 " flat-s_60))"
 "(begin"
@@ -73755,7 +73754,7 @@ static const char *startup_source =
 "(check-list"
 " lst_70)))"
 "((letrec-values(((for-loop_332)"
-"(lambda(id_145"
+"(lambda(id_146"
 " lst_427)"
 "(begin"
 " 'for-loop"
@@ -73767,10 +73766,10 @@ static const char *startup_source =
 "((rest_254)"
 "(unsafe-cdr"
 " lst_427)))"
-"(let-values(((id_146)"
 "(let-values(((id_147)"
-" id_145))"
 "(let-values(((id_148)"
+" id_146))"
+"(let-values(((id_149)"
 "(let-values()"
 "(let-values(((id495_0)"
 "(let-values()"
@@ -73793,21 +73792,21 @@ static const char *startup_source =
 " s_826)))))"
 "(cons"
 " id495_0"
-" id_147)))))"
-"(values"
 " id_148)))))"
+"(values"
+" id_149)))))"
 "(if(not"
 " #f)"
 "(for-loop_332"
-" id_146"
+" id_147"
 " rest_254)"
-" id_146)))"
-" id_145)))))"
+" id_147)))"
+" id_146)))))"
 " for-loop_332)"
 " null"
 " lst_70)))))"
 "(reverse$1"
-" id_144))))))))"
+" id_145))))))))"
 "((rhs483_0)"
 "(let-values(((s_827)"
 "(cdr"
@@ -74070,7 +74069,7 @@ static const char *startup_source =
 "                                                                                                                                                                                                     \"bad syntax\""
 " orig-s_88))"
 "(let-values()"
-"(let-values(((id_149)"
+"(let-values(((id_150)"
 "(let-values(((lst_428)"
 " flat-s_61))"
 "(begin"
@@ -74081,7 +74080,7 @@ static const char *startup_source =
 "(check-list"
 " lst_428)))"
 "((letrec-values(((for-loop_333)"
-"(lambda(id_150"
+"(lambda(id_151"
 " lst_429)"
 "(begin"
 " 'for-loop"
@@ -74093,10 +74092,10 @@ static const char *startup_source =
 "((rest_255)"
 "(unsafe-cdr"
 " lst_429)))"
-"(let-values(((id_151)"
 "(let-values(((id_152)"
-" id_150))"
 "(let-values(((id_153)"
+" id_151))"
+"(let-values(((id_154)"
 "(let-values()"
 "(let-values(((id524_0)"
 "(let-values()"
@@ -74119,21 +74118,21 @@ static const char *startup_source =
 " s_839)))))"
 "(cons"
 " id524_0"
-" id_152)))))"
-"(values"
 " id_153)))))"
+"(values"
+" id_154)))))"
 "(if(not"
 " #f)"
 "(for-loop_333"
-" id_151"
+" id_152"
 " rest_255)"
-" id_151)))"
-" id_150)))))"
+" id_152)))"
+" id_151)))))"
 " for-loop_333)"
 " null"
 " lst_428)))))"
 "(reverse$1"
-" id_149))))))))"
+" id_150))))))))"
 "((rhs511_0)"
 "(let-values(((s_840)"
 "(cdr"
@@ -74453,7 +74452,7 @@ static const char *startup_source =
 "((rest_257)"
 "(unsafe-cdr"
 " lst_434))"
-"((id_154)"
+"((id_155)"
 "(unsafe-car"
 " lst_435))"
 "((rest_258)"
@@ -74468,7 +74467,7 @@ static const char *startup_source =
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_87"
-" id_154"
+" id_155"
 " phase_49"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
@@ -74935,7 +74934,7 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_35 frame-id_18 inside-scope_2 all-scopes-stx_6 defined-syms_13 requires+provides_8)"
 "(begin"
-"(lambda(ids_47 rhs_23 phase_148)"
+"(lambda(ids_47 rhs_23 phase_147)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
 "(let-values(((lst_438) ids_47))"
@@ -74948,7 +74947,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_439)"
-"(let-values(((id_155)(unsafe-car lst_439))"
+"(let-values(((id_156)(unsafe-car lst_439))"
 "((rest_260)(unsafe-cdr lst_439)))"
 "(let-values(((fold-var_377)"
 "(let-values(((fold-var_378) fold-var_376))"
@@ -74957,7 +74956,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_155"
+" id_156"
 " inside-scope_2))"
 " fold-var_378))))"
 "(values fold-var_379)))))"
@@ -74970,7 +74969,7 @@ static const char *startup_source =
 "(let-values(((scoped-ids571_0) scoped-ids_0)"
 "((defined-syms572_0) defined-syms_13)"
 "((self573_0) self_35)"
-"((phase574_0) phase_148)"
+"((phase574_0) phase_147)"
 "((all-scopes-stx575_0) all-scopes-stx_6)"
 "((frame-id576_0) frame-id_18)"
 "((requires+provides577_0) requires+provides_8))"
@@ -74990,16 +74989,16 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_148) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_147) 'define-values)"
 " scoped-ids_0"
 " rhs_23))"
 " inside-scope_2)))"
 "(values scoped-ids_0(semi-parsed-define-values2.1 s_292 syms_24 scoped-ids_0 rhs_23)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
-"(lambda(bodys_23 ctx_115)"
+"(lambda(bodys_23 ctx_114)"
 "(begin"
-"(let-values(((sc_40)(root-expand-context-post-expansion-scope ctx_115)))"
+"(let-values(((sc_40)(root-expand-context-post-expansion-scope ctx_114)))"
 "(if sc_40"
 "(reverse$1"
 "(let-values(((lst_440) bodys_23))"
@@ -75038,7 +75037,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons99"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys98_0))"
-"(let-values(((phase_149) phase84_0))"
+"(let-values(((phase_148) 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))"
@@ -75052,7 +75051,7 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_24)"
 "(let-values()"
-"(if(if tail?_54(not(zero? phase_149)) #f)"
+"(if(if tail?_54(not(zero? phase_148)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_154)(expand-context-observer body-ctx_7)))"
@@ -75326,7 +75325,7 @@ static const char *startup_source =
 "(let-values(((tmp_66)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_149)))"
+" phase_148)))"
 "(if(if(equal? tmp_66 '#%require)"
 " #t"
 "(if(equal? tmp_66 '#%provide)"
@@ -75404,7 +75403,7 @@ static const char *startup_source =
 "(let-values(((exp-lifted-modules_0)"
 "(let-values(((lifted-modules600_0)"
 " lifted-modules_0)"
-"((phase601_0) phase_149)"
+"((phase601_0) phase_148)"
 "((self602_0) self_36)"
 "((body-ctx603_0)"
 " body-ctx_7)"
@@ -75455,7 +75454,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 requires+provides_9)"
+"(lambda(need-eventually-defined_3 self_37 ctx_115 requires+provides_9)"
 "(begin"
 "(begin"
 "(let-values(((ht_162) need-eventually-defined_3))"
@@ -75466,7 +75465,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_189"
-"(let-values(((phase_150 l_89)(hash-iterate-key+value ht_162 i_189)))"
+"(let-values(((phase_149 l_89)(hash-iterate-key+value ht_162 i_189)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75486,7 +75485,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_443)"
-"(let-values(((id_156)"
+"(let-values(((id_157)"
 "(unsafe-car"
 " lst_443))"
 "((rest_262)"
@@ -75500,9 +75499,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((b_95)"
 "(let-values(((id608_0)"
-" id_156)"
+" id_157)"
 "((phase609_0)"
-" phase_150))"
+" phase_149))"
 "(resolve+shift28.1"
 " #f"
 " #f"
@@ -75519,7 +75518,7 @@ static const char *startup_source =
 "(module-binding-sym"
 " b_95)"
 "(syntax-e$1"
-" id_156))"
+" id_157))"
 "(eq?"
 "(module-binding-module"
 " b_95)"
@@ -75533,7 +75532,7 @@ static const char *startup_source =
 " requires+provides_9"
 "(module-binding-sym"
 " b_95)"
-" phase_150)"
+" phase_149)"
 " #f)))"
 "(if(eq?"
 " bound-kind_0"
@@ -75557,20 +75556,20 @@ static const char *startup_source =
 "(format"
 "                                                                                                                                                           \"\\n  at phase: ~a\""
 "(let-values(((tmp_67)"
-" phase_150))"
+" phase_149))"
 "(if(equal?"
 " tmp_67"
 " 1)"
 "(let-values()"
 "                                                                                                                                                                 \"1; the transformer environment\")"
 "(let-values()"
-" phase_150)))))"
-" id_156"
+" phase_149)))))"
+" id_157"
 " #f"
 " null"
 "(syntax-debug-info-string"
-" id_156"
-" ctx_116))))))))"
+" id_157"
+" ctx_115))))))))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
@@ -75603,13 +75602,13 @@ static const char *startup_source =
 "(let-values(((requires+provides_10) requires-and-provides102_0))"
 "(let-values(((declared-submodule-names_6) declared-submodule-names103_0))"
 "(let-values(((m-ns_21) namespace104_0))"
-"(let-values(((phase_151) phase105_0))"
+"(let-values(((phase_150) phase105_0))"
 "(let-values(((self_38) self106_0))"
-"(let-values(((ctx_117) ctx107_1))"
+"(let-values(((ctx_116) ctx107_1))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_126)"
-"(lambda(bodys_26 phase_152)"
+"(lambda(bodys_26 phase_151)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
@@ -75617,13 +75616,13 @@ static const char *startup_source =
 "(if(let-values(((or-part_407)(parsed?(car bodys_26))))"
 "(if or-part_407 or-part_407(expanded+parsed?(car bodys_26))))"
 "(let-values()"
-"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_152)))"
+"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_151)))"
 "(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_152))))"
+"(add1 phase_151))))"
 "(cons"
 "(let-values(((the-struct_114)(car bodys_26)))"
 "(if(semi-parsed-begin-for-syntax? the-struct_114)"
@@ -75635,18 +75634,18 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
 " the-struct_114)))"
-"(loop_126(cdr bodys_26) phase_152))))"
+"(loop_126(cdr bodys_26) phase_151))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_26))))"
 "(let-values(((tmp_68)"
-"(core-form-sym disarmed-body_1 phase_152)))"
+"(core-form-sym disarmed-body_1 phase_151)))"
 "(if(equal? tmp_68 '#%provide)"
 "(let-values()"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_159)"
 "(expand-context-observer"
-" ctx_117)))"
+" ctx_116)))"
 "(if obs_159"
 "(let-values()"
 "(let-values()"
@@ -75716,8 +75715,8 @@ static const char *startup_source =
 "(car bodys_26)"
 " requires+provides_10"
 " self_38"
-" phase_152"
-"(let-values(((v_276) ctx_117))"
+" phase_151"
+"(let-values(((v_276) ctx_116))"
 "(let-values(((the-struct_115)"
 " v_276))"
 "(if(expand-context/outer?"
@@ -75731,11 +75730,11 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_116)"
 "(let-values(((phase617_0)"
-" phase_152)"
+" phase_151)"
 "((namespace618_0)"
 "(namespace->namespace-at-phase"
 " m-ns_21"
-" phase_152))"
+" phase_151))"
 "((requires+provides619_0)"
 " requires+provides_10)"
 "((declared-submodule-names620_0)"
@@ -75826,9 +75825,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_116)"
 "(let-values()"
-"(loop_126(cdr bodys_26) phase_152))"
+"(loop_126(cdr bodys_26) phase_151))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
@@ -75846,7 +75845,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_160)"
 "(expand-context-observer"
-" ctx_117)))"
+" ctx_116)))"
 "(if obs_160"
 "(let-values()"
 "(let-values()"
@@ -75859,14 +75858,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_126"
 "(cdr bodys_26)"
-" phase_152))))))))))"
+" phase_151))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_26)"
-"(loop_126(cdr bodys_26) phase_152))))))))))))))"
+"(loop_126(cdr bodys_26) phase_151))))))))))))))"
 " loop_126)"
 " expression-expanded-bodys_1"
-" phase_151)))))))))))))"
+" phase_150)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion139.1)"
 "(lambda(ctx125_0"
@@ -75890,7 +75889,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_117) ctx125_0))"
 "(let-values(((modules-being-compiled_6) modules-being-compiled126_0))"
 "(let-values(((compiled-module-box_1) fill127_0))"
 "(let-values()"
@@ -75930,7 +75929,7 @@ static const char *startup_source =
 " m-ns628_0"
 " unsafe-undefined"
 " unsafe-undefined)))"
-"((temp625_0)(expand-context-for-serializable? ctx_118))"
+"((temp625_0)(expand-context-for-serializable? ctx_117))"
 "((modules-being-compiled626_0) modules-being-compiled_6)"
 "((temp627_0) #f))"
 "(compile-module13.1"
@@ -75992,7 +75991,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_153) phase143_0))"
+"(let-values(((phase_152) phase143_0))"
 "(let-values(((self_40) self144_0))"
 "(let-values(((requires+provides_12) requires-and-provides145_0))"
 "(let-values(((enclosing-is-cross-phase-persistent?_1) enclosing-is-cross-phase-persistent?146_0))"
@@ -76004,7 +76003,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx152_0))"
 "(let-values()"
 "((letrec-values(((loop_127)"
-"(lambda(bodys_27 phase_154)"
+"(lambda(bodys_27 phase_153)"
 "(begin"
 " 'loop"
 "(if(null? bodys_27)"
@@ -76084,7 +76083,7 @@ static const char *startup_source =
 "(loop_127"
 "(semi-parsed-begin-for-syntax-body"
 " body_23)"
-"(add1 phase_154))))"
+"(add1 phase_153))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -76106,20 +76105,20 @@ static const char *startup_source =
 " rebuild-body-s639_0"
 " temp640_0))"
 " parsed-bfs_0))"
-"(loop_127 rest-bodys_3 phase_154))))))))"
+"(loop_127 rest-bodys_3 phase_153))))))))"
 "(if(let-values(((or-part_409)(parsed? body_23)))"
 "(if or-part_409"
 " or-part_409"
 "(expanded+parsed? body_23)))"
 "(let-values()"
-"(cons body_23(loop_127 rest-bodys_3 phase_154)))"
+"(cons body_23(loop_127 rest-bodys_3 phase_153)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_23)))"
 "(let-values(((tmp_69)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_154)))"
+" phase_153)))"
 "(if(equal? tmp_69 'module*)"
 "(let-values()"
 "(let-values((()"
@@ -76278,7 +76277,7 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_154)))"
+" phase_153)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
@@ -76336,7 +76335,7 @@ static const char *startup_source =
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_154)))"
+" phase_153)))"
 "(expanded+parsed1.1"
 " s662_0"
 "(expanded+parsed-parsed"
@@ -76348,7 +76347,7 @@ static const char *startup_source =
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_154))))))))"
+" phase_153))))))))"
 "(let-values()"
 "(let-values(((ready-body663_0)"
 " ready-body_2)"
@@ -76383,31 +76382,31 @@ static const char *startup_source =
 " submod_3"
 "(loop_127"
 " rest-bodys_3"
-" phase_154)))))))"
+" phase_153)))))))"
 "(let-values()"
 "(cons"
 " body_23"
 "(loop_127"
 " rest-bodys_3"
-" phase_154)))))))))))))))))"
+" phase_153)))))))))))))))))"
 " loop_127)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_153)))))))))))))))))"
+" phase_152)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
-"(lambda(ctx_119)"
+"(lambda(ctx_118)"
 "(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_118)"
+"(expand-context-phase ctx_118)"
+"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_118))))))"
 "(define-values"
 "(check-ids-unbound173.1)"
 "(lambda(in168_0 ids170_0 phase171_0 requires+provides172_0)"
 "(begin"
 " 'check-ids-unbound173"
 "(let-values(((ids_49) ids170_0))"
-"(let-values(((phase_155) phase171_0))"
+"(let-values(((phase_154) phase171_0))"
 "(let-values(((requires+provides_13) requires+provides172_0))"
 "(let-values(((s_894) in168_0))"
 "(let-values()"
@@ -76422,7 +76421,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_445)"
-"(let-values(((id_125)(unsafe-car lst_445))"
+"(let-values(((id_126)(unsafe-car lst_445))"
 "((rest_263)(unsafe-cdr lst_445)))"
 "(let-values((()"
 "(let-values()"
@@ -76432,9 +76431,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((requires+provides671_0)"
 " requires+provides_13)"
-"((id672_0) id_125)"
+"((id672_0) id_126)"
 "((phase673_0)"
-" phase_155)"
+" phase_154)"
 "((s674_0) s_894)"
 "((temp675_0) 'module))"
 "(check-not-defined95.1"
@@ -76457,7 +76456,7 @@ static const char *startup_source =
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_28 phase_156 m-ns_23 self_41 ctx_120)"
+"(lambda(bodys_28 phase_155 m-ns_23 self_41 ctx_119)"
 "(begin"
 "(begin"
 "(let-values(((lst_446) bodys_28))"
@@ -76491,9 +76490,9 @@ static const char *startup_source =
 " ids_50"
 "(parsed-define-values-rhs"
 " p_87)"
-" phase_156"
+" phase_155"
 " m-ns_23"
-" ctx_120)))"
+" ctx_119)))"
 "(begin"
 "(let-values(((lst_448) ids_50)"
 "((lst_449)"
@@ -76530,7 +76529,7 @@ static const char *startup_source =
 " lst_453)"
 " #f)"
 " #f)"
-"(let-values(((id_157)"
+"(let-values(((id_158)"
 "(unsafe-car"
 " lst_451))"
 "((rest_265)"
@@ -76556,7 +76555,7 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_23"
-" phase_156"
+" phase_155"
 " sym_110"
 " val_88))"
 "(values)))))"
@@ -76597,7 +76596,7 @@ static const char *startup_source =
 " #f"
 " parameterization-key)"
 " current-expand-context"
-" ctx_120"
+" ctx_119"
 " 1/current-namespace"
 " m-ns_23)"
 "(let-values()"
@@ -76607,7 +76606,7 @@ static const char *startup_source =
 "(let-values(((m-ns676_0)"
 " m-ns_23)"
 "((phase677_0)"
-" phase_156))"
+" phase_155))"
 "(make-compile-context14.1"
 " #f"
 " unsafe-undefined"
@@ -76641,7 +76640,7 @@ static const char *startup_source =
 " 'expand-submodule197"
 "(let-values(((s_730) s194_0))"
 "(let-values(((self_42) self195_0))"
-"(let-values(((ctx_121) ctx196_0))"
+"(let-values(((ctx_120) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
 "(let-values(((keep-enclosing-scope-at-phase_2) keep-enclosing-scope-at-phase177_0))"
 "(let-values(((enclosing-r+p_2) enclosing-requires+provides178_0))"
@@ -76657,7 +76656,7 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_161)(expand-context-observer ctx_121)))"
+"(let-values(((obs_161)(expand-context-observer ctx_120)))"
 "(if obs_161"
 "(let-values()"
 "(let-values()"
@@ -76730,7 +76729,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_162)(expand-context-observer ctx_121)))"
+"(let-values(((obs_162)(expand-context-observer ctx_120)))"
 "(if obs_162"
 "(let-values()"
 "(let-values()"
@@ -76740,7 +76739,7 @@ static const char *startup_source =
 "(let-values(((submod_5)"
 "(let-values(((s686_0) s_730)"
 "((temp687_0)"
-"(let-values(((v_277) ctx_121))"
+"(let-values(((v_277) ctx_120))"
 "(let-values(((the-struct_118) v_277))"
 "(if(expand-context/outer? the-struct_118)"
 "(let-values(((context696_0) 'module)"
@@ -76868,7 +76867,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((obs_163)"
-"(expand-context-observer ctx_121)))"
+"(expand-context-observer ctx_120)))"
 "(if obs_163"
 "(let-values()"
 "(let-values()"
@@ -76878,7 +76877,7 @@ static const char *startup_source =
 "(extract-syntax submod_5))))"
 "(void)))"
 "(values))))"
-"(let-values(((ns_131)(expand-context-namespace ctx_121)))"
+"(let-values(((ns_131)(expand-context-namespace ctx_120)))"
 "(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)))"
@@ -76903,7 +76902,7 @@ static const char *startup_source =
 "((temp702_0) #t)"
 "((temp703_0)"
 "(expand-context-for-serializable?"
-" ctx_121))"
+" ctx_120))"
 "((modules-being-compiled704_0)"
 " modules-being-compiled_8)"
 "((temp705_0) #f))"
@@ -76941,7 +76940,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(let-values(((obs_164)"
-"(expand-context-observer ctx_121)))"
+"(expand-context-observer ctx_120)))"
 "(if obs_164"
 "(let-values()"
 "(let-values()"
@@ -77028,9 +77027,9 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules212"
 "(let-values(((bodys_29) bodys208_0))"
-"(let-values(((phase_157) phase209_0))"
+"(let-values(((phase_156) phase209_0))"
 "(let-values(((self_43) self210_0))"
-"(let-values(((ctx_122) ctx211_0))"
+"(let-values(((ctx_121) 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))"
@@ -77059,7 +77058,7 @@ static const char *startup_source =
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_25)"
-" phase_157)))"
+" phase_156)))"
 "(if(equal? tmp_70 'module)"
 "(let-values()"
 "(let-values(((body714_0)"
@@ -77067,7 +77066,7 @@ static const char *startup_source =
 "((self715_0)"
 " self_43)"
 "((ctx716_0)"
-" ctx_122)"
+" ctx_121)"
 "((temp717_0)"
 " #f)"
 "((mpis-to-reset718_0)"
@@ -77111,7 +77110,7 @@ static const char *startup_source =
 "(let-values(((requires+provides_14) requires+provides219_0))"
 "(let-values(((declared-submodule-names_10) declared-submodule-names215_0))"
 "(let-values()"
-"(lambda(s_901 phase_158)"
+"(lambda(s_901 phase_157)"
 "(let-values(((ok?_92 #%require722_0 req723_0)"
 "(let-values(((s_902)(syntax-disarm$1 s_901)))"
 "(let-values(((orig-s_95) s_902))"
@@ -77159,8 +77158,8 @@ static const char *startup_source =
 "((s728_0) s_901)"
 "((self729_0) self_44)"
 "((m-ns730_0) m-ns_24)"
-"((phase731_0) phase_158)"
-"((phase732_0) phase_158)"
+"((phase731_0) phase_157)"
+"((phase732_0) phase_157)"
 "((requires+provides733_0) requires+provides_14)"
 "((declared-submodule-names734_0) declared-submodule-names_10)"
 "((temp735_0) 'require))"
@@ -77380,9 +77379,9 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
-"(lambda(ctx_123 defn_1)"
+"(lambda(ctx_122 defn_1)"
 "(begin"
-"(let-values(((obs_166)(expand-context-observer ctx_123)))"
+"(let-values(((obs_166)(expand-context-observer ctx_122)))"
 "(if obs_166"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
@@ -77419,9 +77418,9 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
-"(lambda(ctx_124 defn_2 exp-rhs_8)"
+"(lambda(ctx_123 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_124)))"
+"(let-values(((obs_167)(expand-context-observer ctx_123)))"
 "(if obs_167"
 "(let-values()"
 "(let-values(((s-defn_1)"
@@ -77433,9 +77432,9 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
-"(lambda(ids_51 s_72 ctx_125)"
+"(lambda(ids_51 s_72 ctx_124)"
 "(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_124)))"
 "(let-values(((tl-ids_2)"
 "(reverse$1"
 "(let-values(((lst_84) ids_51))"
@@ -77458,7 +77457,7 @@ static const char *startup_source =
 "(let-values()"
 "(remove-use-site-scopes"
 " id_50"
-" ctx_125))"
+" ctx_124))"
 " fold-var_62))))"
 "(values fold-var_393)))))"
 "(if(not #f)(for-loop_103 fold-var_61 rest_40) fold-var_61)))"
@@ -77468,7 +77467,7 @@ static const char *startup_source =
 " lst_84))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_125))((s3_3) s_72))"
+"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_124))((s3_3) s_72))"
 "(check-no-duplicate-ids7.1 unsafe-undefined tl-ids1_0 temp2_9 s3_3 unsafe-undefined))"
 "(values))))"
 "(let-values(((tmp-bind-ids_0)"
@@ -77483,7 +77482,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
-"(let-values(((id_158)(unsafe-car lst_86))"
+"(let-values(((id_159)(unsafe-car lst_86))"
 "((rest_250)(unsafe-cdr lst_86)))"
 "(let-values(((fold-var_26)"
 "(let-values(((fold-var_394) fold-var_216))"
@@ -77492,7 +77491,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(add-scope"
-" id_158"
+" id_159"
 " top-level-bind-scope_6))"
 " fold-var_394))))"
 "(values fold-var_219)))))"
@@ -77503,7 +77502,7 @@ static const char *startup_source =
 " for-loop_80)"
 " null"
 " lst_460))))))"
-"(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_124)))))))))"
 "(void"
 "(add-core-form!*"
 " 'define-values"
@@ -77523,10 +77522,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((disarmed-s_25)(syntax-disarm$1 s_0)))"
 "(let-values(((ok?_26 define-values1_0 id2_1 rhs3_0)"
-"(let-values(((s_490) s_0))"
-"(let-values(((orig-s_99) s_490))"
+"(let-values(((s_491) s_0))"
+"(let-values(((orig-s_99) s_491))"
 "(let-values(((define-values1_1 id2_2 rhs3_1)"
-"(let-values(((s_76)(if(syntax?$1 s_490)(syntax-e$1 s_490) s_490)))"
+"(let-values(((s_76)(if(syntax?$1 s_491)(syntax-e$1 s_491) s_491)))"
 "(if(pair? s_76)"
 "(let-values(((define-values4_0)"
 "(let-values(((s_413)(car s_76))) s_413))"
@@ -77564,7 +77563,7 @@ static const char *startup_source =
 "(check-list"
 " lst_80)))"
 "((letrec-values(((for-loop_96)"
-"(lambda(id_159"
+"(lambda(id_160"
 " lst_81)"
 "(begin"
 " 'for-loop"
@@ -77576,10 +77575,10 @@ static const char *startup_source =
 "((rest_121)"
 "(unsafe-cdr"
 " lst_81)))"
-"(let-values(((id_160)"
 "(let-values(((id_161)"
-" id_159))"
-"(let-values(((id_113)"
+"(let-values(((id_162)"
+" id_160))"
+"(let-values(((id_114)"
 "(let-values()"
 "(let-values(((id10_1)"
 "(let-values()"
@@ -77602,16 +77601,16 @@ static const char *startup_source =
 " s_88)))))"
 "(cons"
 " id10_1"
-" id_161)))))"
+" id_162)))))"
 "(values"
-" id_113)))))"
+" id_114)))))"
 "(if(not"
 " #f)"
 "(for-loop_96"
-" id_160"
+" id_161"
 " rest_121)"
-" id_160)))"
-" id_159)))))"
+" id_161)))"
+" id_160)))))"
 " for-loop_96)"
 " null"
 " lst_80)))))"
@@ -77667,22 +77666,22 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'define-syntaxes"
-"(lambda(s_186 ctx_126)"
+"(lambda(s_186 ctx_125)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_126)))"
+"(let-values(((obs_169)(expand-context-observer ctx_125)))"
 "(if obs_169"
 "(let-values()(let-values()(call-expand-observe obs_169 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_170)(expand-context-observer ctx_126)))"
+"(let-values(((obs_170)(expand-context-observer ctx_125)))"
 "(if obs_170(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_126) 'top-level)"
+"(if(eq?(expand-context-context ctx_125) 'top-level)"
 "(void)"
 "                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_186)))"
 "(values))))"
@@ -77694,7 +77693,7 @@ static const char *startup_source =
 "(let-values(((s_22)(if(syntax?$1 s_18)(syntax-e$1 s_18) s_18)))"
 "(if(pair? s_22)"
 "(let-values(((define-syntaxes18_0)"
-"(let-values(((s_492)(car s_22))) s_492))"
+"(let-values(((s_493)(car s_22))) s_493))"
 "((id19_1 rhs20_0)"
 "(let-values(((s_25)(cdr s_22)))"
 "(let-values(((s_305)"
@@ -77718,7 +77717,7 @@ static const char *startup_source =
 "                                                                                              \"bad syntax\""
 " orig-s_100))"
 "(let-values()"
-"(let-values(((id_162)"
+"(let-values(((id_163)"
 "(let-values(((lst_461)"
 " flat-s_69))"
 "(begin"
@@ -77729,7 +77728,7 @@ static const char *startup_source =
 "(check-list"
 " lst_461)))"
 "((letrec-values(((for-loop_2)"
-"(lambda(id_163"
+"(lambda(id_164"
 " lst_462)"
 "(begin"
 " 'for-loop"
@@ -77741,10 +77740,10 @@ static const char *startup_source =
 "((rest_271)"
 "(unsafe-cdr"
 " lst_462)))"
-"(let-values(((id_164)"
 "(let-values(((id_165)"
-" id_163))"
 "(let-values(((id_166)"
+" id_164))"
+"(let-values(((id_167)"
 "(let-values()"
 "(let-values(((id24_0)"
 "(let-values()"
@@ -77767,20 +77766,20 @@ static const char *startup_source =
 " s_926)))))"
 "(cons"
 " id24_0"
-" id_165)))))"
-"(values"
 " id_166)))))"
+"(values"
+" id_167)))))"
 "(if(not"
 " #f)"
 "(for-loop_2"
-" id_164"
+" id_165"
 " rest_271)"
-" id_164)))"
-" id_163)))))"
+" id_165)))"
+" id_164)))))"
 " for-loop_2)"
 " null"
 " lst_461)))))"
-"(reverse$1 id_162))))))))"
+"(reverse$1 id_163))))))))"
 "((rhs22_0)"
 "(let-values(((s_927)(cdr s_305)))"
 "(let-values(((s_175)"
@@ -77789,22 +77788,22 @@ static const char *startup_source =
 " s_927)))"
 "(if(pair? s_175)"
 "(let-values(((rhs23_2)"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(car"
 " s_175)))"
-" s_450))"
+" s_451))"
 "(()"
 "(let-values(((s_46)"
 "(cdr"
 " s_175)))"
-"(let-values(((s_484)"
+"(let-values(((s_485)"
 "(if(syntax?$1"
 " s_46)"
 "(syntax-e$1"
 " s_46)"
 " s_46)))"
 "(if(null?"
-" s_484)"
+" s_485)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -77823,37 +77822,37 @@ static const char *startup_source =
 "(values define-syntaxes18_0 id19_1 rhs20_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_100)))))"
 "(values #t define-syntaxes15_1 id16_2 rhs17_1))))))"
-"(let-values(((ids_53 syms_27)(as-expand-time-top-level-bindings id16_1 s_186 ctx_126)))"
+"(let-values(((ids_53 syms_27)(as-expand-time-top-level-bindings id16_1 s_186 ctx_125)))"
 "(let-values(((exp-rhs_10)"
-"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_53)))"
+"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_125 ids_53)))"
 "(expand-transformer92.1 #f #f 'expression #t #f unsafe-undefined temp25_8 temp26_6))))"
-"(if(expand-context-to-parsed? ctx_126)"
+"(if(expand-context-to-parsed? ctx_125)"
 "(parsed-define-syntaxes20.1 s_186 ids_53 syms_27 exp-rhs_10)"
 "(let-values(((s27_3) s_186)((temp28_4)(list define-syntaxes15_0 ids_53 exp-rhs_10)))"
 "(rebuild5.1 #t s27_3 temp28_4)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin-for-syntax"
-"(lambda(s_308 ctx_111)"
+"(lambda(s_308 ctx_110)"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_111) 'top-level)"
+"(if(eq?(expand-context-context ctx_110) 'top-level)"
 "(void)"
 "                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_308)))"
 "(values))))"
 "(let-values(((ok?_38 begin-for-syntax29_0 form30_0)"
-"(let-values(((s_494) s_308))"
-"(let-values(((orig-s_101) s_494))"
+"(let-values(((s_495) s_308))"
+"(let-values(((orig-s_101) s_495))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
-"(let-values(((s_48)(if(syntax?$1 s_494)(syntax-e$1 s_494) s_494)))"
+"(let-values(((s_48)(if(syntax?$1 s_495)(syntax-e$1 s_495) s_495)))"
 "(if(pair? s_48)"
 "(let-values(((begin-for-syntax31_0)(let-values(((s_51)(car s_48))) s_51))"
 "((form32_0)"
-"(let-values(((s_500)(cdr s_48)))"
+"(let-values(((s_501)(cdr s_48)))"
 "(let-values(((s_776)"
-"(if(syntax?$1 s_500)"
-"(syntax-e$1 s_500)"
-" s_500)))"
+"(if(syntax?$1 s_501)"
+"(syntax-e$1 s_501)"
+" s_501)))"
 "(let-values(((flat-s_70)(to-syntax-list.1 s_776)))"
 "(if(not flat-s_70)"
 "(let-values()"
@@ -77864,20 +77863,20 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)(expand-context-observer ctx_111)))"
+"(let-values(((obs_171)(expand-context-observer ctx_110)))"
 "(if obs_171"
 "(let-values()(let-values()(call-expand-observe obs_171 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_172)(expand-context-observer ctx_111)))"
+"(let-values(((obs_172)(expand-context-observer ctx_110)))"
 "(if obs_172"
 "(let-values()(let-values()(call-expand-observe obs_172 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values(((trans-ctx_1)"
-"(let-values(((ctx33_0) ctx_111)((temp34_7) 'top-level)((temp35_7) #t))"
+"(let-values(((ctx33_0) ctx_110)((temp34_7) 'top-level)((temp35_7) #t))"
 "(context->transformer-context99.1 temp35_7 ctx33_0 temp34_7))))"
 "(let-values(((lift-ctx_7)"
 "(let-values(((temp36_9)(make-top-level-lift trans-ctx_1)))"
@@ -77950,7 +77949,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((obs_173)"
-"(expand-context-observer ctx_111)))"
+"(expand-context-observer ctx_110)))"
 "(if obs_173"
 "(let-values()"
 "(let-values()"
@@ -77973,7 +77972,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_174)"
 "(expand-context-observer"
-" ctx_111)))"
+" ctx_110)))"
 "(if obs_174"
 "(let-values()"
 "(let-values()"
@@ -77991,7 +77990,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_175)"
 "(expand-context-observer"
-" ctx_111)))"
+" ctx_110)))"
 "(if obs_175"
 "(let-values()"
 "(let-values()"
@@ -78028,7 +78027,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_176)"
 "(expand-context-observer"
-" ctx_111)))"
+" ctx_110)))"
 "(if obs_176"
 "(let-values()"
 "(let-values()"
@@ -78060,22 +78059,22 @@ static const char *startup_source =
 " exp-forms_0)))))))))))))"
 " loop_65)"
 " form30_0)))"
-"(if(expand-context-to-parsed? ctx_111)"
+"(if(expand-context-to-parsed? ctx_110)"
 "(parsed-begin-for-syntax21.1 s_308 all-exp-forms_0)"
 "(let-values(((s45_0) s_308)((temp46_2)(cons begin-for-syntax29_0 all-exp-forms_0)))"
 "(rebuild5.1 #t s45_0 temp46_2))))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%require"
-"(lambda(s_928 ctx_127)"
+"(lambda(s_928 ctx_126)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_177)(expand-context-observer ctx_127)))"
+"(let-values(((obs_177)(expand-context-observer ctx_126)))"
 "(if obs_177(let-values()(let-values()(call-expand-observe obs_177 'prim-require)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_127) 'top-level)"
+"(if(eq?(expand-context-context ctx_126) 'top-level)"
 "(void)"
 "                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_928)))"
 "(values))))"
@@ -78140,8 +78139,8 @@ static const char *startup_source =
 " lst_32)))))"
 "((s52_0) s_928)"
 "((temp53_6) #f)"
-"((temp54_6)(expand-context-namespace ctx_127))"
-"((temp55_5)(expand-context-phase ctx_127))"
+"((temp54_6)(expand-context-namespace ctx_126))"
+"((temp55_5)(expand-context-phase ctx_126))"
 "((temp56_5)(let-values(((temp59_8) #f))(make-requires+provides8.1 #f temp59_8)))"
 "((temp57_3) 'require)"
 "((temp58_5) #t))"
@@ -78161,13 +78160,13 @@ static const char *startup_source =
 " temp54_6"
 " temp55_5"
 " temp56_5))"
-"(if(expand-context-to-parsed? ctx_127)(parsed-require23.1 s_928) s_928))))))))))"
+"(if(expand-context-to-parsed? ctx_126)(parsed-require23.1 s_928) s_928))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%provide"
-"(lambda(s_780 ctx_128)"
+"(lambda(s_780 ctx_127)"
 "(begin"
-"(let-values(((obs_178)(expand-context-observer ctx_128)))"
+"(let-values(((obs_178)(expand-context-observer ctx_127)))"
 "(if obs_178(let-values()(let-values()(call-expand-observe obs_178 'prim-provide)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_780)))))"
 "(define-values(ns)(make-namespace))"