diff --git a/pkgs/racket-test-core/tests/racket/macro.rktl b/pkgs/racket-test-core/tests/racket/macro.rktl
index 95673e8215..8544934312 100644
--- a/pkgs/racket-test-core/tests/racket/macro.rktl
+++ b/pkgs/racket-test-core/tests/racket/macro.rktl
@@ -981,6 +981,34 @@
 
 (err/rt-test (syntax-local-lift-require 'abc #'def))
 
+(for ([lift-attempt+rx:expected-error
+       (in-list
+        (list (cons '(syntax-local-lift-require 'racket #'body)
+                    #rx"could not find target context")
+              (cons '(syntax-local-lift-expression #'body)
+                    #rx"no lift target")
+              (cons '(syntax-local-lift-module  #'(module m racket/base))
+                    #rx"not currently transforming within a module declaration or top level")
+              (cons '(syntax-local-lift-module-end-declaration  #'(define done #t))
+                    #rx"not currently transforming an expression within a module declaration")
+              (cons '(syntax-local-lift-provide #'cons)
+                    #rx"not expanding in a module run-time body")))])
+  (define lift-attempt (car lift-attempt+rx:expected-error))
+  (define rx:expected-error (cdr lift-attempt+rx:expected-error))
+  (err/rt-test
+   (expand `(module m racket/base
+              (require (for-syntax racket/base))
+              
+              (provide #%module-begin)
+              
+              (define-syntax (#%module-begin stx)
+                (syntax-case stx ()
+                  [(_ body) ,lift-attempt]))
+              
+              (module* test (submod "..")
+              body)))
+   (lambda (exn) (regexp-match? rx:expected-error (exn-message exn)))))
+
 ;; ----------------------------------------
 
 (let ()
diff --git a/racket/src/expander/expand/module.rkt b/racket/src/expander/expand/module.rkt
index 10d5d90dd2..5e9cf62cc1 100644
--- a/racket/src/expander/expand/module.rkt
+++ b/racket/src/expander/expand/module.rkt
@@ -468,7 +468,11 @@
      (struct*-copy expand-context ctx
                    [context 'module-begin]
                    [module-begin-k module-begin-k]
-                   [in-local-expand? #f]))
+                   [in-local-expand? #f]
+                   [lifts #f]
+                   [module-lifts #f]
+                   [to-module-lifts #f]
+                   [require-lifts #f]))
    
    (define mb-scopes-s
      (if keep-enclosing-scope-at-phase
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 1d28b04336..3b9b845979 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -74122,6 +74122,14 @@ static const char *startup_source =
 "(let-values(((module-begin-k411_0)"
 " module-begin-k_1)"
 "((in-local-expand?412_0)"
+" #f)"
+"((lifts413_0)"
+" #f)"
+"((module-lifts414_0)"
+" #f)"
+"((to-module-lifts415_0)"
+" #f)"
+"((require-lifts416_0)"
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -74156,16 +74164,12 @@ static const char *startup_source =
 " the-struct_113)"
 "(expand-context/inner-declared-submodule-names"
 " the-struct_113)"
-"(expand-context/inner-lifts"
-" the-struct_113)"
+" lifts413_0"
 "(expand-context/inner-lift-envs"
 " the-struct_113)"
-"(expand-context/inner-module-lifts"
-" the-struct_113)"
-"(expand-context/inner-require-lifts"
-" the-struct_113)"
-"(expand-context/inner-to-module-lifts"
-" the-struct_113)"
+" module-lifts414_0"
+" require-lifts416_0"
+" to-module-lifts415_0"
 "(expand-context/inner-requires+provides"
 " the-struct_113)"
 "(expand-context/inner-observer"
@@ -74220,36 +74224,36 @@ static const char *startup_source =
 "(box"
 " null)))"
 "(let-values(((mb_0)"
-"(let-values(((bodys413_0)"
+"(let-values(((bodys417_0)"
 " bodys_4)"
-"((module-name-sym414_0)"
+"((module-name-sym418_0)"
 " module-name-sym_0)"
-"((mb-scopes-s415_0)"
+"((mb-scopes-s419_0)"
 " mb-scopes-s_0)"
-"((m-ns416_0)"
+"((m-ns420_0)"
 " m-ns_18)"
-"((mb-ctx417_0)"
+"((mb-ctx421_0)"
 " mb-ctx_0)"
-"((mb-def-ctx-scopes418_0)"
+"((mb-def-ctx-scopes422_0)"
 " mb-def-ctx-scopes_0)"
-"((phase419_0)"
+"((phase423_0)"
 " phase_156)"
-"((s420_0)"
+"((s424_0)"
 " s_482))"
 "(ensure-module-begin36.1"
-" mb-ctx417_0"
-" mb-def-ctx-scopes418_0"
-" m-ns416_0"
-" module-name-sym414_0"
-" phase419_0"
-" s420_0"
-" mb-scopes-s415_0"
-" bodys413_0))))"
+" mb-ctx421_0"
+" mb-def-ctx-scopes422_0"
+" m-ns420_0"
+" module-name-sym418_0"
+" phase423_0"
+" s424_0"
+" mb-scopes-s419_0"
+" bodys417_0))))"
 "(let-values(((expanded-mb_0)"
 "(let-values()"
-"(let-values(((mb421_0)"
+"(let-values(((mb425_0)"
 " mb_0)"
-"((temp422_0)"
+"((temp426_0)"
 "(accumulate-def-ctx-scopes"
 " mb-ctx_0"
 " mb-def-ctx-scopes_0)))"
@@ -74260,8 +74264,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" mb421_0"
-" temp422_0)))))"
+" mb425_0"
+" temp426_0)))))"
 "(let-values(((requires_6"
 " provides_13)"
 "(extract-requires-and-provides"
@@ -74269,11 +74273,11 @@ static const char *startup_source =
 " self_14"
 " self_14)))"
 "(let-values(((result-form_0)"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_147)"
 "(expand-context-to-parsed?"
 " init-ctx_0)))"
-"(if or-part_403"
-" or-part_403"
+"(if or-part_147"
+" or-part_147"
 " always-produce-compiled?_0))"
 "(parsed-module25.1"
 " rebuild-s_14"
@@ -74351,9 +74355,9 @@ static const char *startup_source =
 " lst_423)))"
 "(void)"
 "(let-values(((result-s_15)"
-"(let-values(((rebuild-s423_0)"
+"(let-values(((rebuild-s427_0)"
 " rebuild-s_14)"
-"((temp424_0)"
+"((temp428_0)"
 "(list"
 " module228_0"
 " id:module-name229_0"
@@ -74363,21 +74367,21 @@ static const char *startup_source =
 "(rebuild5.1"
 " #f"
 " #f"
-" rebuild-s423_0"
-" temp424_0))))"
+" rebuild-s427_0"
+" temp428_0))))"
 "(let-values(((result-s_16)"
-"(let-values(((result-s425_0)"
+"(let-values(((result-s429_0)"
 " result-s_15)"
-"((self426_0)"
+"((self430_0)"
 " self_14)"
-"((generic-self427_0)"
+"((generic-self431_0)"
 " generic-self_0))"
 "(syntax-module-path-index-shift15.1"
 " #f"
 " #f"
-" result-s425_0"
-" self426_0"
-" generic-self427_0"
+" result-s429_0"
+" self430_0"
+" generic-self431_0"
 " #f"
 " #f))))"
 "(let-values(((result-s_17)"
@@ -74431,7 +74435,7 @@ static const char *startup_source =
 "(let-values(((ctx_114) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
 "(let-values(((phase_158) phase26_3))"
-"(let-values(((s_138) s27_2))"
+"(let-values(((s_139) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
@@ -74440,23 +74444,23 @@ static const char *startup_source =
 "(let-values(((v_273) ctx_114))"
 "(let-values(((the-struct_114) v_273))"
 "(if(expand-context/outer? the-struct_114)"
-"(let-values(((context428_0) 'module-begin)"
-"((only-immediate?429_0) #t)"
-"((def-ctx-scopes430_0) def-ctx-scopes_9)"
-"((inner431_0)(root-expand-context/outer-inner v_273)))"
+"(let-values(((context432_0) 'module-begin)"
+"((only-immediate?433_0) #t)"
+"((def-ctx-scopes434_0) def-ctx-scopes_9)"
+"((inner435_0)(root-expand-context/outer-inner v_273)))"
 "(expand-context/outer1.1"
-" inner431_0"
+" inner435_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_114)"
 "(root-expand-context/outer-use-site-scopes the-struct_114)"
 "(root-expand-context/outer-frame-id the-struct_114)"
-" context428_0"
+" context432_0"
 "(expand-context/outer-env the-struct_114)"
 "(expand-context/outer-post-expansion-scope-action the-struct_114)"
 "(expand-context/outer-scopes the-struct_114)"
-" def-ctx-scopes430_0"
+" def-ctx-scopes434_0"
 "(expand-context/outer-binding-layer the-struct_114)"
 "(expand-context/outer-reference-records the-struct_114)"
-" only-immediate?429_0"
+" only-immediate?433_0"
 "(expand-context/outer-need-eventually-defined the-struct_114)"
 "(expand-context/outer-current-introduction-scopes the-struct_114)"
 "(expand-context/outer-name the-struct_114)))"
@@ -74481,11 +74485,11 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
 "(let-values()"
-"(let-values(((temp432_0)"
+"(let-values(((temp436_0)"
 "(add-enclosing-name-property"
 "(car bodys_17)"
 " module-name-sym_1))"
-"((temp433_0)(make-mb-ctx_0)))"
+"((temp437_0)(make-mb-ctx_0)))"
 "(expand9.1"
 " #f"
 " #f"
@@ -74493,8 +74497,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp432_0"
-" temp433_0)))))"
+" temp436_0"
+" temp437_0)))))"
 "(if(eq?"
 " '#%module-begin"
 "(core-form-sym"
@@ -74502,38 +74506,38 @@ static const char *startup_source =
 " phase_158))"
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
-"(let-values(((temp434_0)(list partly-expanded-body_0))"
-"((s435_0) s_138)"
-"((scopes-s436_0) scopes-s_0)"
-"((phase437_0) phase_158)"
-"((module-name-sym438_0) module-name-sym_1)"
-"((temp439_0)(make-mb-ctx_0))"
-"((temp440_0) #f))"
+"(let-values(((temp438_0)(list partly-expanded-body_0))"
+"((s439_0) s_139)"
+"((scopes-s440_0) scopes-s_0)"
+"((phase441_0) phase_158)"
+"((module-name-sym442_0) module-name-sym_1)"
+"((temp443_0)(make-mb-ctx_0))"
+"((temp444_0) #f))"
 "(add-module-begin47.1"
-" temp440_0"
+" temp444_0"
 " #t"
-" temp434_0"
-" s435_0"
-" scopes-s436_0"
-" phase437_0"
-" module-name-sym438_0"
-" temp439_0)))))))))"
+" temp438_0"
+" s439_0"
+" scopes-s440_0"
+" phase441_0"
+" module-name-sym442_0"
+" temp443_0)))))))))"
 "(let-values()"
-"(let-values(((bodys441_0) bodys_17)"
-"((s442_0) s_138)"
-"((scopes-s443_0) scopes-s_0)"
-"((phase444_0) phase_158)"
-"((module-name-sym445_0) module-name-sym_1)"
-"((temp446_0)(make-mb-ctx_0)))"
+"(let-values(((bodys445_0) bodys_17)"
+"((s446_0) s_139)"
+"((scopes-s447_0) scopes-s_0)"
+"((phase448_0) phase_158)"
+"((module-name-sym449_0) module-name-sym_1)"
+"((temp450_1)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
 " #f"
 " #f"
-" bodys441_0"
-" s442_0"
-" scopes-s443_0"
-" phase444_0"
-" module-name-sym445_0"
-" temp446_0))))))"
+" bodys445_0"
+" s446_0"
+" scopes-s447_0"
+" phase448_0"
+" module-name-sym449_0"
+" temp450_1))))))"
 "(add-enclosing-name-property mb_1 module-name-sym_1)))))))))))))))"
 "(define-values"
 "(add-module-begin47.1)"
@@ -74559,8 +74563,8 @@ static const char *startup_source =
 "(let-values(((mb-id_0)(datum->syntax$1 disarmed-scopes-s_0 '#%module-begin)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((mb-id447_0) mb-id_0)((phase448_0) phase_159))"
-"(resolve40.1 #f #f #f #f #f #f #f #f mb-id447_0 phase448_0))"
+"(if(let-values(((mb-id451_0) mb-id_0)((phase452_0) phase_159))"
+"(resolve40.1 #f #f #f #f #f #f #f #f mb-id451_0 phase452_0))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -74592,10 +74596,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((partly-expanded-mb_0)"
 "(let-values()"
-"(let-values(((temp449_0)"
+"(let-values(((temp453_0)"
 "(add-enclosing-name-property mb_2 module-name-sym_2))"
-"((mb-ctx450_0) mb-ctx_1))"
-"(expand9.1 #f #f #f #f #f #f temp449_0 mb-ctx450_0)))))"
+"((mb-ctx454_0) mb-ctx_1))"
+"(expand9.1 #f #f #f #f #f #f temp453_0 mb-ctx454_0)))))"
 "(begin"
 "(if(eq?"
 " '#%module-begin"
@@ -74634,29 +74638,29 @@ static const char *startup_source =
 "(let-values(((s-with-suitable-enclosing_0)"
 "(if keep-enclosing-scope-at-phase_1"
 "(let-values()"
-"(let-values(((s-with-edges455_0) s-with-edges_0)"
-"((enclosing-self456_0) enclosing-self_2)"
-"((enclosing-mod457_0) enclosing-mod_2))"
+"(let-values(((s-with-edges459_0) s-with-edges_0)"
+"((enclosing-self460_0) enclosing-self_2)"
+"((enclosing-mod461_0) enclosing-mod_2))"
 "(syntax-module-path-index-shift15.1"
 " #f"
 " #f"
-" s-with-edges455_0"
-" enclosing-self456_0"
-" enclosing-mod457_0"
+" s-with-edges459_0"
+" enclosing-self460_0"
+" enclosing-mod461_0"
 " #f"
 " #f)))"
 "(let-values() s-with-edges_0))))"
-"(let-values(((s-with-suitable-enclosing451_0) s-with-suitable-enclosing_0)"
-"((temp452_0)(make-generic-self-module-path-index self_32))"
-"((self453_0) self_32)"
-"((temp454_0)(current-code-inspector)))"
+"(let-values(((s-with-suitable-enclosing455_0) s-with-suitable-enclosing_0)"
+"((temp456_1)(make-generic-self-module-path-index self_32))"
+"((self457_0) self_32)"
+"((temp458_0)(current-code-inspector)))"
 "(syntax-module-path-index-shift15.1"
 " #f"
 " #f"
-" s-with-suitable-enclosing451_0"
-" temp452_0"
-" self453_0"
-" temp454_0"
+" s-with-suitable-enclosing455_0"
+" temp456_1"
+" self457_0"
+" temp458_0"
 " #t))))))))))"
 "(define-values"
 "(partially-expand-bodys81.1)"
@@ -74679,7 +74683,7 @@ static const char *startup_source =
 "(begin"
 " 'partially-expand-bodys81"
 "(let-values(((bodys_19) bodys80_0))"
-"(let-values(((phase_53) phase50_0))"
+"(let-values(((phase_160) phase50_0))"
 "(let-values(((partial-body-ctx_1) ctx51_0))"
 "(let-values(((m-ns_19) namespace52_0))"
 "(let-values(((self_33) self53_0))"
@@ -74696,14 +74700,14 @@ static const char *startup_source =
 "(let-values(((pass-1-and-2-loop_1) loop64_0))"
 "(let-values()"
 "(begin"
-"(namespace-visit-available-modules! m-ns_19 phase_53)"
+"(namespace-visit-available-modules! m-ns_19 phase_160)"
 "((letrec-values(((loop_125)"
 "(lambda(tail?_52 bodys_20)"
 "(begin"
 " 'loop"
 "(if(null? bodys_20)"
 "(let-values()"
-"(if(if tail?_52(not(zero? phase_53)) #f)"
+"(if(if tail?_52(not(zero? phase_160)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_138)"
@@ -74766,9 +74770,9 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((exp-body_7)"
 "(let-values()"
-"(let-values(((temp458_0)"
+"(let-values(((temp462_0)"
 "(car bodys_20))"
-"((partial-body-ctx459_0)"
+"((partial-body-ctx463_0)"
 " partial-body-ctx_1))"
 "(expand9.1"
 " #f"
@@ -74777,8 +74781,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp458_0"
-" partial-body-ctx459_0)))))"
+" temp462_0"
+" partial-body-ctx463_0)))))"
 "(let-values(((disarmed-exp-body_1)"
 "(syntax-disarm$1 exp-body_7)))"
 "(let-values(((lifted-defns_0)"
@@ -74812,43 +74816,43 @@ static const char *startup_source =
 "(let-values(((tmp_65)"
 "(core-form-sym"
 " disarmed-exp-body_1"
-" phase_53)))"
+" phase_160)))"
 "(if(equal?"
 " tmp_65"
 " 'begin)"
 "(let-values()"
 "(let-values(((ok?_80"
-" begin460_0"
-" e461_1)"
+" begin464_0"
+" e465_0)"
 "(let-values(((s_818)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_85)"
 " s_818))"
-"(let-values(((begin460_1"
-" e461_2)"
-"(let-values(((s_819)"
+"(let-values(((begin464_1"
+" e465_1)"
+"(let-values(((s_153)"
 "(if(syntax?$1"
 " s_818)"
 "(syntax-e$1"
 " s_818)"
 " s_818)))"
 "(if(pair?"
-" s_819)"
-"(let-values(((begin462_0)"
-"(let-values(((s_820)"
+" s_153)"
+"(let-values(((begin466_0)"
+"(let-values(((s_819)"
 "(car"
-" s_819)))"
-" s_820))"
-"((e463_0)"
-"(let-values(((s_153)"
+" s_153)))"
+" s_819))"
+"((e467_0)"
+"(let-values(((s_820)"
 "(cdr"
-" s_819)))"
+" s_153)))"
 "(let-values(((s_821)"
 "(if(syntax?$1"
-" s_153)"
+" s_820)"
 "(syntax-e$1"
-" s_153)"
-" s_153)))"
+" s_820)"
+" s_820)))"
 "(let-values(((flat-s_56)"
 "(to-syntax-list.1"
 " s_821)))"
@@ -74862,16 +74866,16 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_56)))))))"
 "(values"
-" begin462_0"
-" e463_0))"
+" begin466_0"
+" e467_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                             \"bad syntax\""
 " orig-s_85)))))"
 "(values"
 " #t"
-" begin460_1"
-" e461_2))))))"
+" begin464_1"
+" e465_1))))))"
 "(let-values(((track_1)"
 "(lambda(e_96)"
 "(begin"
@@ -74883,7 +74887,7 @@ static const char *startup_source =
 "(append"
 "(map2"
 " track_1"
-" e461_1)"
+" e465_0)"
 " rest-bodys_1)))"
 "(begin"
 "(let-values(((obs_142)"
@@ -74929,7 +74933,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " m-ns_19"
 "(add1"
-" phase_53))))"
+" phase_160))))"
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
@@ -74949,14 +74953,14 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_81"
-" begin-for-syntax464_0"
-" e465_0)"
+" begin-for-syntax468_0"
+" e469_0)"
 "(let-values(((s_822)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_86)"
 " s_822))"
-"(let-values(((begin-for-syntax464_1"
-" e465_1)"
+"(let-values(((begin-for-syntax468_1"
+" e469_1)"
 "(let-values(((s_823)"
 "(if(syntax?$1"
 " s_822)"
@@ -74965,12 +74969,12 @@ static const char *startup_source =
 " s_822)))"
 "(if(pair?"
 " s_823)"
-"(let-values(((begin-for-syntax466_0)"
+"(let-values(((begin-for-syntax470_0)"
 "(let-values(((s_824)"
 "(car"
 " s_823)))"
 " s_824))"
-"((e467_0)"
+"((e471_0)"
 "(let-values(((s_825)"
 "(cdr"
 " s_823)))"
@@ -74993,21 +74997,21 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_57)))))))"
 "(values"
-" begin-for-syntax466_0"
-" e467_0))"
+" begin-for-syntax470_0"
+" e471_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                       \"bad syntax\""
 " orig-s_86)))))"
 "(values"
 " #t"
-" begin-for-syntax464_1"
-" e465_1))))))"
+" begin-for-syntax468_1"
+" e469_1))))))"
 "(let-values(((nested-bodys_1)"
 "(pass-1-and-2-loop_1"
-" e465_0"
+" e469_0"
 "(add1"
-" phase_53))))"
+" phase_160))))"
 "(begin"
 "(let-values(((obs_145)"
 "(expand-context-observer"
@@ -75022,17 +75026,17 @@ static const char *startup_source =
 "(namespace-run-available-modules!"
 " m-ns_19"
 "(add1"
-" phase_53))"
+" phase_160))"
 "(eval-nested-bodys"
 " nested-bodys_1"
 "(add1"
-" phase_53)"
+" phase_160)"
 " ct-m-ns_0"
 " self_33"
 " partial-body-ctx_1)"
 "(namespace-visit-available-modules!"
 " m-ns_19"
-" phase_53)"
+" phase_160)"
 "(let-values(((obs_146)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
@@ -75044,7 +75048,7 @@ static const char *startup_source =
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
-"(let-values(((lst_425)"
+"(let-values(((lst_255)"
 " nested-bodys_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -75052,46 +75056,46 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_425)))"
+" lst_255)))"
 "((letrec-values(((for-loop_332)"
 "(lambda(fold-var_382"
-" lst_426)"
+" lst_425)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_426)"
+" lst_425)"
 "(let-values(((nested-body_0)"
 "(unsafe-car"
-" lst_426))"
+" lst_425))"
 "((rest_245)"
 "(unsafe-cdr"
-" lst_426)))"
+" lst_425)))"
+"(let-values(((fold-var_361)"
 "(let-values(((fold-var_383)"
-"(let-values(((fold-var_384)"
 " fold-var_382))"
-"(let-values(((fold-var_359)"
+"(let-values(((fold-var_384)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(extract-syntax"
 " nested-body_0))"
-" fold-var_384))))"
+" fold-var_383))))"
 "(values"
-" fold-var_359)))))"
+" fold-var_384)))))"
 "(if(not"
 " #f)"
 "(for-loop_332"
-" fold-var_383"
+" fold-var_361"
 " rest_245)"
-" fold-var_383)))"
+" fold-var_361)))"
 " fold-var_382)))))"
 " for-loop_332)"
 " null"
-" lst_425))))))"
+" lst_255))))))"
 "(datum->syntax$1"
 " #f"
 "(cons"
-" begin-for-syntax464_0"
+" begin-for-syntax468_0"
 " s-nested-bodys_0)"
 " exp-body_7)))))"
 "(void)))"
@@ -75125,16 +75129,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_82"
-" define-values468_0"
-" id469_0"
-" rhs470_0)"
+" define-values472_0"
+" id473_0"
+" rhs474_0)"
 "(let-values(((s_827)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_87)"
 " s_827))"
-"(let-values(((define-values468_1"
-" id469_1"
-" rhs470_1)"
+"(let-values(((define-values472_1"
+" id473_1"
+" rhs474_1)"
 "(let-values(((s_828)"
 "(if(syntax?$1"
 " s_827)"
@@ -75143,13 +75147,13 @@ static const char *startup_source =
 " s_827)))"
 "(if(pair?"
 " s_828)"
-"(let-values(((define-values471_0)"
+"(let-values(((define-values475_0)"
 "(let-values(((s_829)"
 "(car"
 " s_828)))"
 " s_829))"
-"((id472_0"
-" rhs473_0)"
+"((id476_0"
+" rhs477_0)"
 "(let-values(((s_830)"
 "(cdr"
 " s_828)))"
@@ -75161,7 +75165,7 @@ static const char *startup_source =
 " s_830)))"
 "(if(pair?"
 " s_831)"
-"(let-values(((id474_0)"
+"(let-values(((id478_0)"
 "(let-values(((s_832)"
 "(car"
 " s_831)))"
@@ -75183,7 +75187,7 @@ static const char *startup_source =
 " orig-s_87))"
 "(let-values()"
 "(let-values(((id_147)"
-"(let-values(((lst_427)"
+"(let-values(((lst_426)"
 " flat-s_58))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -75191,36 +75195,36 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_427)))"
+" lst_426)))"
 "((letrec-values(((for-loop_333)"
 "(lambda(id_148"
-" lst_148)"
+" lst_427)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_148)"
+" lst_427)"
 "(let-values(((s_834)"
 "(unsafe-car"
-" lst_148))"
+" lst_427))"
 "((rest_246)"
 "(unsafe-cdr"
-" lst_148)))"
+" lst_427)))"
 "(let-values(((id_149)"
 "(let-values(((id_150)"
 " id_148))"
 "(let-values(((id_151)"
 "(let-values()"
-"(let-values(((id487_0)"
+"(let-values(((id491_0)"
 "(let-values()"
-"(if(let-values(((or-part_404)"
+"(if(let-values(((or-part_403)"
 "(if(syntax?$1"
 " s_834)"
 "(symbol?"
 "(syntax-e$1"
 " s_834))"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
+"(if or-part_403"
+" or-part_403"
 "(symbol?"
 " s_834)))"
 " s_834"
@@ -75230,7 +75234,7 @@ static const char *startup_source =
 " orig-s_87"
 " s_834)))))"
 "(cons"
-" id487_0"
+" id491_0"
 " id_150)))))"
 "(values"
 " id_151)))))"
@@ -75243,10 +75247,10 @@ static const char *startup_source =
 " id_148)))))"
 " for-loop_333)"
 " null"
-" lst_427)))))"
+" lst_426)))))"
 "(reverse$1"
 " id_147))))))))"
-"((rhs475_0)"
+"((rhs479_0)"
 "(let-values(((s_835)"
 "(cdr"
 " s_831)))"
@@ -75258,7 +75262,7 @@ static const char *startup_source =
 " s_835)))"
 "(if(pair?"
 " s_836)"
-"(let-values(((rhs476_0)"
+"(let-values(((rhs480_0)"
 "(let-values(((s_837)"
 "(car"
 " s_836)))"
@@ -75281,113 +75285,113 @@ static const char *startup_source =
 "                                                                                                                                                                                                               \"bad syntax\""
 " orig-s_87))))))"
 "(values"
-" rhs476_0))"
+" rhs480_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                           \"bad syntax\""
 " orig-s_87))))))"
 "(values"
-" id474_0"
-" rhs475_0))"
+" id478_0"
+" rhs479_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                       \"bad syntax\""
 " orig-s_87))))))"
 "(values"
-" define-values471_0"
-" id472_0"
-" rhs473_0))"
+" define-values475_0"
+" id476_0"
+" rhs477_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                   \"bad syntax\""
 " orig-s_87)))))"
 "(values"
 " #t"
-" define-values468_1"
-" id469_1"
-" rhs470_1))))))"
+" define-values472_1"
+" id473_1"
+" rhs474_1))))))"
 "(let-values(((ids_45)"
 "(remove-use-site-scopes"
-" id469_0"
+" id473_0"
 " partial-body-ctx_1)))"
 "(let-values((()"
 "(begin"
-"(let-values(((ids477_0)"
+"(let-values(((ids481_0)"
 " ids_45)"
-"((phase478_0)"
-" phase_53)"
-"((exp-body479_0)"
+"((phase482_0)"
+" phase_160)"
+"((exp-body483_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids8.1"
 " #f"
 " #f"
-" ids477_0"
-" phase478_0"
-" exp-body479_0"
+" ids481_0"
+" phase482_0"
+" exp-body483_0"
 " #f"
 " #f))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((ids480_0)"
+"(let-values(((ids484_0)"
 " ids_45)"
-"((phase481_0)"
-" phase_53)"
-"((requires+provides482_0)"
+"((phase485_0)"
+" phase_160)"
+"((requires+provides486_0)"
 " requires+provides_7)"
-"((exp-body483_0)"
+"((exp-body487_0)"
 " exp-body_7))"
 "(check-ids-unbound173.1"
-" exp-body483_0"
-" ids480_0"
-" phase481_0"
-" requires+provides482_0))"
+" exp-body487_0"
+" ids484_0"
+" phase485_0"
+" requires+provides486_0))"
 "(values))))"
 "(let-values(((syms_23)"
-"(let-values(((ids488_0)"
+"(let-values(((ids492_0)"
 " ids_45)"
-"((defined-syms489_0)"
+"((defined-syms493_0)"
 " defined-syms_12)"
-"((self490_0)"
+"((self494_0)"
 " self_33)"
-"((phase491_0)"
-" phase_53)"
-"((all-scopes-stx492_0)"
+"((phase495_0)"
+" phase_160)"
+"((all-scopes-stx496_0)"
 " all-scopes-stx_5)"
-"((frame-id493_0)"
+"((frame-id497_0)"
 " frame-id_16)"
-"((requires+provides494_0)"
+"((requires+provides498_0)"
 " requires+provides_7)"
-"((exp-body495_0)"
+"((exp-body499_0)"
 " exp-body_7))"
 "(select-defined-syms-and-bind!16.1"
 " #f"
 " #f"
-" frame-id493_0"
-" exp-body495_0"
+" frame-id497_0"
+" exp-body499_0"
 " #t"
-" requires+provides494_0"
+" requires+provides498_0"
 " #t"
 " #f"
 " #f"
-" ids488_0"
-" defined-syms489_0"
-" self490_0"
-" phase491_0"
-" all-scopes-stx492_0))))"
+" ids492_0"
+" defined-syms493_0"
+" self494_0"
+" phase495_0"
+" all-scopes-stx496_0))))"
 "(begin"
-"(let-values(((requires+provides484_0)"
+"(let-values(((requires+provides488_0)"
 " requires+provides_7)"
-"((syms485_0)"
+"((syms489_0)"
 " syms_23)"
-"((phase486_0)"
-" phase_53))"
+"((phase490_0)"
+" phase_160))"
 "(add-defined-syms!103.1"
 " #f"
 " #f"
-" requires+provides484_0"
-" syms485_0"
-" phase486_0))"
+" requires+provides488_0"
+" syms489_0"
+" phase490_0))"
 "(let-values(((obs_148)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
@@ -75400,9 +75404,9 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-" define-values468_0"
+" define-values472_0"
 " ids_45"
-" rhs470_0)"
+" rhs474_0)"
 " exp-body_7))))"
 "(void)))"
 "(cons"
@@ -75410,7 +75414,7 @@ static const char *startup_source =
 " exp-body_7"
 " syms_23"
 " ids_45"
-" rhs470_0)"
+" rhs474_0)"
 "(loop_125"
 " tail?_52"
 " rest-bodys_1))))))))))"
@@ -75458,16 +75462,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_83"
-" define-syntaxes496_0"
-" id497_0"
-" rhs498_0)"
+" define-syntaxes500_0"
+" id501_0"
+" rhs502_0)"
 "(let-values(((s_840)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_88)"
 " s_840))"
-"(let-values(((define-syntaxes496_1"
-" id497_1"
-" rhs498_1)"
+"(let-values(((define-syntaxes500_1"
+" id501_1"
+" rhs502_1)"
 "(let-values(((s_841)"
 "(if(syntax?$1"
 " s_840)"
@@ -75476,13 +75480,13 @@ static const char *startup_source =
 " s_840)))"
 "(if(pair?"
 " s_841)"
-"(let-values(((define-syntaxes499_0)"
+"(let-values(((define-syntaxes503_0)"
 "(let-values(((s_842)"
 "(car"
 " s_841)))"
 " s_842))"
-"((id500_0"
-" rhs501_0)"
+"((id504_0"
+" rhs505_0)"
 "(let-values(((s_843)"
 "(cdr"
 " s_841)))"
@@ -75494,7 +75498,7 @@ static const char *startup_source =
 " s_843)))"
 "(if(pair?"
 " s_844)"
-"(let-values(((id502_0)"
+"(let-values(((id506_0)"
 "(let-values(((s_845)"
 "(car"
 " s_844)))"
@@ -75543,17 +75547,17 @@ static const char *startup_source =
 " id_153))"
 "(let-values(((id_156)"
 "(let-values()"
-"(let-values(((id516_0)"
+"(let-values(((id520_0)"
 "(let-values()"
-"(if(let-values(((or-part_405)"
+"(if(let-values(((or-part_404)"
 "(if(syntax?$1"
 " s_847)"
 "(symbol?"
 "(syntax-e$1"
 " s_847))"
 " #f)))"
-"(if or-part_405"
-" or-part_405"
+"(if or-part_404"
+" or-part_404"
 "(symbol?"
 " s_847)))"
 " s_847"
@@ -75563,7 +75567,7 @@ static const char *startup_source =
 " orig-s_88"
 " s_847)))))"
 "(cons"
-" id516_0"
+" id520_0"
 " id_155)))))"
 "(values"
 " id_156)))))"
@@ -75579,7 +75583,7 @@ static const char *startup_source =
 " lst_428)))))"
 "(reverse$1"
 " id_152))))))))"
-"((rhs503_0)"
+"((rhs507_0)"
 "(let-values(((s_848)"
 "(cdr"
 " s_844)))"
@@ -75591,171 +75595,171 @@ static const char *startup_source =
 " s_848)))"
 "(if(pair?"
 " s_849)"
-"(let-values(((rhs504_0)"
-"(let-values(((s_566)"
+"(let-values(((rhs508_0)"
+"(let-values(((s_850)"
 "(car"
 " s_849)))"
-" s_566))"
+" s_850))"
 "(()"
-"(let-values(((s_850)"
+"(let-values(((s_851)"
 "(cdr"
 " s_849)))"
-"(let-values(((s_851)"
+"(let-values(((s_852)"
 "(if(syntax?$1"
-" s_850)"
-"(syntax-e$1"
-" s_850)"
-" s_850)))"
-"(if(null?"
 " s_851)"
+"(syntax-e$1"
+" s_851)"
+" s_851)))"
+"(if(null?"
+" s_852)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                     \"bad syntax\""
 " orig-s_88))))))"
 "(values"
-" rhs504_0))"
+" rhs508_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                 \"bad syntax\""
 " orig-s_88))))))"
 "(values"
-" id502_0"
-" rhs503_0))"
+" id506_0"
+" rhs507_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                             \"bad syntax\""
 " orig-s_88))))))"
 "(values"
-" define-syntaxes499_0"
-" id500_0"
-" rhs501_0))"
+" define-syntaxes503_0"
+" id504_0"
+" rhs505_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                         \"bad syntax\""
 " orig-s_88)))))"
 "(values"
 " #t"
-" define-syntaxes496_1"
-" id497_1"
-" rhs498_1))))))"
+" define-syntaxes500_1"
+" id501_1"
+" rhs502_1))))))"
 "(let-values(((ids_46)"
 "(remove-use-site-scopes"
-" id497_0"
+" id501_0"
 " partial-body-ctx_1)))"
 "(let-values((()"
 "(begin"
-"(let-values(((ids505_0)"
+"(let-values(((ids509_0)"
 " ids_46)"
-"((phase506_0)"
-" phase_53)"
-"((exp-body507_0)"
+"((phase510_0)"
+" phase_160)"
+"((exp-body511_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids8.1"
 " #f"
 " #f"
-" ids505_0"
-" phase506_0"
-" exp-body507_0"
+" ids509_0"
+" phase510_0"
+" exp-body511_0"
 " #f"
 " #f))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((ids508_0)"
+"(let-values(((ids512_0)"
 " ids_46)"
-"((phase509_0)"
-" phase_53)"
-"((requires+provides510_0)"
+"((phase513_0)"
+" phase_160)"
+"((requires+provides514_0)"
 " requires+provides_7)"
-"((exp-body511_0)"
+"((exp-body515_0)"
 " exp-body_7))"
 "(check-ids-unbound173.1"
-" exp-body511_0"
-" ids508_0"
-" phase509_0"
-" requires+provides510_0))"
+" exp-body515_0"
+" ids512_0"
+" phase513_0"
+" requires+provides514_0))"
 "(values))))"
 "(let-values(((syms_24)"
-"(let-values(((ids517_0)"
+"(let-values(((ids521_0)"
 " ids_46)"
-"((defined-syms518_0)"
+"((defined-syms522_0)"
 " defined-syms_12)"
-"((self519_0)"
+"((self523_0)"
 " self_33)"
-"((phase520_0)"
-" phase_53)"
-"((all-scopes-stx521_0)"
+"((phase524_0)"
+" phase_160)"
+"((all-scopes-stx525_0)"
 " all-scopes-stx_5)"
-"((frame-id522_0)"
+"((frame-id526_0)"
 " frame-id_16)"
-"((requires+provides523_0)"
+"((requires+provides527_0)"
 " requires+provides_7)"
-"((exp-body524_0)"
+"((exp-body528_0)"
 " exp-body_7)"
-"((temp525_0)"
+"((temp529_0)"
 " #t))"
 "(select-defined-syms-and-bind!16.1"
-" temp525_0"
+" temp529_0"
 " #t"
-" frame-id522_0"
-" exp-body524_0"
+" frame-id526_0"
+" exp-body528_0"
 " #t"
-" requires+provides523_0"
+" requires+provides527_0"
 " #t"
 " #f"
 " #f"
-" ids517_0"
-" defined-syms518_0"
-" self519_0"
-" phase520_0"
-" all-scopes-stx521_0))))"
+" ids521_0"
+" defined-syms522_0"
+" self523_0"
+" phase524_0"
+" all-scopes-stx525_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((requires+provides512_0)"
+"(let-values(((requires+provides516_0)"
 " requires+provides_7)"
-"((syms513_0)"
+"((syms517_0)"
 " syms_24)"
-"((phase514_0)"
-" phase_53)"
-"((temp515_0)"
+"((phase518_0)"
+" phase_160)"
+"((temp519_0)"
 " #t))"
 "(add-defined-syms!103.1"
-" temp515_0"
+" temp519_0"
 " #t"
-" requires+provides512_0"
-" syms513_0"
-" phase514_0))"
+" requires+provides516_0"
+" syms517_0"
+" phase518_0))"
 "(values))))"
 "(let-values(((exp-rhs_6"
 " parsed-rhs_2"
 " vals_10)"
-"(let-values(((temp526_0)"
+"(let-values(((temp530_0)"
 " 'define-syntaxes)"
-"((temp527_0)"
-" rhs498_0)"
-"((ids528_0)"
+"((temp531_0)"
+" rhs502_0)"
+"((ids532_0)"
 " ids_46)"
-"((temp529_0)"
+"((temp533_0)"
 "(let-values(((v_274)"
 " partial-body-ctx_1))"
 "(let-values(((the-struct_115)"
 " v_274))"
 "(if(expand-context/outer?"
 " the-struct_115)"
-"(let-values(((need-eventually-defined531_0)"
+"(let-values(((need-eventually-defined535_0)"
 " need-eventually-defined_2)"
-"((inner532_0)"
+"((inner536_0)"
 "(let-values(((the-struct_116)"
 "(root-expand-context/outer-inner"
 " v_274)))"
 "(if(expand-context/inner?"
 " the-struct_116)"
-"(let-values(((lifts533_0)"
+"(let-values(((lifts537_0)"
 " #f)"
-"((module-lifts534_0)"
+"((module-lifts538_0)"
 " #f)"
-"((to-module-lifts535_0)"
+"((to-module-lifts539_0)"
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -75792,13 +75796,13 @@ static const char *startup_source =
 " the-struct_116)"
 "(expand-context/inner-declared-submodule-names"
 " the-struct_116)"
-" lifts533_0"
+" lifts537_0"
 "(expand-context/inner-lift-envs"
 " the-struct_116)"
-" module-lifts534_0"
+" module-lifts538_0"
 "(expand-context/inner-require-lifts"
 " the-struct_116)"
-" to-module-lifts535_0"
+" to-module-lifts539_0"
 "(expand-context/inner-requires+provides"
 " the-struct_116)"
 "(expand-context/inner-observer"
@@ -75812,7 +75816,7 @@ static const char *startup_source =
 "                                                                                                                                                                                     \"expand-context/inner?\""
 " the-struct_116)))))"
 "(expand-context/outer1.1"
-" inner532_0"
+" inner536_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_115)"
 "(root-expand-context/outer-use-site-scopes"
@@ -75835,7 +75839,7 @@ static const char *startup_source =
 " the-struct_115)"
 "(expand-context/outer-only-immediate?"
 " the-struct_115)"
-" need-eventually-defined531_0"
+" need-eventually-defined535_0"
 "(expand-context/outer-current-introduction-scopes"
 " the-struct_115)"
 "(expand-context/outer-name"
@@ -75844,15 +75848,15 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                                                                                                                   \"expand-context/outer?\""
 " the-struct_115)))))"
-"((temp530_0)"
+"((temp534_0)"
 " #f))"
 "(expand+eval-for-syntaxes-binding109.1"
-" temp530_0"
+" temp534_0"
 " #t"
-" temp526_0"
-" temp527_0"
-" ids528_0"
-" temp529_0))))"
+" temp530_0"
+" temp531_0"
+" ids532_0"
+" temp533_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((lst_430)"
@@ -75894,7 +75898,7 @@ static const char *startup_source =
 " lst_435)"
 " #f)"
 " #f)"
-"(let-values(((sym_109)"
+"(let-values(((sym_47)"
 "(unsafe-car"
 " lst_433))"
 "((rest_248)"
@@ -75922,12 +75926,12 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_87"
 " id_157"
-" phase_53"
+" phase_160"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
 " m-ns_19"
-" phase_53"
-" sym_109"
+" phase_160"
+" sym_47"
 " val_87)))"
 "(values)))))"
 "(values)))))"
@@ -75959,7 +75963,7 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-" define-syntaxes496_0"
+" define-syntaxes500_0"
 " ids_46"
 " exp-rhs_6)))))"
 "(void)))"
@@ -75976,18 +75980,18 @@ static const char *startup_source =
 " partial-body-ctx_1)"
 " parsed-body_0"
 "(expanded+parsed1.1"
-"(let-values(((exp-body536_0)"
+"(let-values(((exp-body540_0)"
 " exp-body_7)"
-"((temp537_0)"
+"((temp541_0)"
 "(list"
-" define-syntaxes496_0"
+" define-syntaxes500_0"
 " ids_46"
 " exp-rhs_6)))"
 "(rebuild5.1"
 " #f"
 " #f"
-" exp-body536_0"
-" temp537_0))"
+" exp-body540_0"
+" temp541_0))"
 " parsed-body_0))"
 "(loop_125"
 " tail?_52"
@@ -76019,40 +76023,40 @@ static const char *startup_source =
 " disarmed-exp-body_1"
 " partial-body-ctx_1)))"
 "(let-values(((ok?_84"
-" #%require538_0"
-" req539_0)"
-"(let-values(((s_576)"
+" #%require542_0"
+" req543_0)"
+"(let-values(((s_853)"
 " ready-body_0))"
 "(let-values(((orig-s_89)"
-" s_576))"
-"(let-values(((#%require538_1"
-" req539_1)"
-"(let-values(((s_852)"
-"(if(syntax?$1"
-" s_576)"
-"(syntax-e$1"
-" s_576)"
-" s_576)))"
-"(if(pair?"
-" s_852)"
-"(let-values(((#%require540_0)"
-"(let-values(((s_853)"
-"(car"
-" s_852)))"
 " s_853))"
-"((req541_0)"
+"(let-values(((#%require542_1"
+" req543_1)"
 "(let-values(((s_854)"
-"(cdr"
-" s_852)))"
-"(let-values(((s_855)"
 "(if(syntax?$1"
-" s_854)"
+" s_853)"
 "(syntax-e$1"
+" s_853)"
+" s_853)))"
+"(if(pair?"
 " s_854)"
+"(let-values(((#%require544_0)"
+"(let-values(((s_855)"
+"(car"
 " s_854)))"
+" s_855))"
+"((req545_0)"
+"(let-values(((s_856)"
+"(cdr"
+" s_854)))"
+"(let-values(((s_857)"
+"(if(syntax?$1"
+" s_856)"
+"(syntax-e$1"
+" s_856)"
+" s_856)))"
 "(let-values(((flat-s_60)"
 "(to-syntax-list.1"
-" s_855)))"
+" s_857)))"
 "(if(not"
 " flat-s_60)"
 "(let-values()"
@@ -76063,60 +76067,60 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_60)))))))"
 "(values"
-" #%require540_0"
-" req541_0))"
+" #%require544_0"
+" req545_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                         \"bad syntax\""
 " orig-s_89)))))"
 "(values"
 " #t"
-" #%require538_1"
-" req539_1))))))"
+" #%require542_1"
+" req543_1))))))"
 "(begin"
-"(let-values(((temp542_0)"
-" req539_0)"
-"((exp-body543_0)"
+"(let-values(((temp546_0)"
+" req543_0)"
+"((exp-body547_0)"
 " exp-body_7)"
-"((self544_0)"
+"((self548_0)"
 " self_33)"
-"((m-ns545_0)"
+"((m-ns549_0)"
 " m-ns_19)"
-"((phase546_0)"
-" phase_53)"
-"((phase547_0)"
-" phase_53)"
-"((requires+provides548_0)"
+"((phase550_0)"
+" phase_160)"
+"((phase551_0)"
+" phase_160)"
+"((requires+provides552_0)"
 " requires+provides_7)"
-"((declared-submodule-names549_0)"
+"((declared-submodule-names553_0)"
 " declared-submodule-names_4)"
-"((temp550_0)"
+"((temp554_0)"
 " 'module))"
 "(parse-and-perform-requires!30.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" declared-submodule-names549_0"
+" declared-submodule-names553_0"
 " #t"
 " #f"
 " #f"
-" phase547_0"
+" phase551_0"
 " #t"
 " #f"
 " #f"
-" self544_0"
+" self548_0"
 " #t"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp550_0"
-" temp542_0"
-" exp-body543_0"
-" m-ns545_0"
-" phase546_0"
-" requires+provides548_0))"
+" temp554_0"
+" temp546_0"
+" exp-body547_0"
+" m-ns549_0"
+" phase550_0"
+" requires+provides552_0))"
 "(let-values(((obs_153)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
@@ -76151,39 +76155,39 @@ static const char *startup_source =
 " exp-body_7"
 " partial-body-ctx_1)))"
 "(let-values(((submod_2)"
-"(let-values(((ready-body551_0)"
+"(let-values(((ready-body555_0)"
 " ready-body_1)"
-"((self552_0)"
+"((self556_0)"
 " self_33)"
-"((partial-body-ctx553_0)"
+"((partial-body-ctx557_0)"
 " partial-body-ctx_1)"
-"((temp554_0)"
+"((temp558_0)"
 " #f)"
-"((declared-submodule-names555_0)"
+"((declared-submodule-names559_0)"
 " declared-submodule-names_4)"
-"((mpis-to-reset556_0)"
+"((mpis-to-reset560_0)"
 " mpis-to-reset_1)"
-"((compiled-submodules557_0)"
+"((compiled-submodules561_0)"
 " compiled-submodules_2)"
-"((modules-being-compiled558_0)"
+"((modules-being-compiled562_0)"
 " modules-being-compiled_4))"
 "(expand-submodule197.1"
-" compiled-submodules557_0"
-" declared-submodule-names555_0"
+" compiled-submodules561_0"
+" declared-submodule-names559_0"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp554_0"
+" temp558_0"
 " #f"
 " #f"
-" modules-being-compiled558_0"
-" mpis-to-reset556_0"
-" ready-body551_0"
-" self552_0"
-" partial-body-ctx553_0))))"
+" modules-being-compiled562_0"
+" mpis-to-reset560_0"
+" ready-body555_0"
+" self556_0"
+" partial-body-ctx557_0))))"
 "(cons"
 " submod_2"
 "(loop_125"
@@ -76223,40 +76227,40 @@ static const char *startup_source =
 " '#%declare)"
 "(let-values()"
 "(let-values(((ok?_85"
-" #%declare559_0"
-" kw560_0)"
-"(let-values(((s_856)"
+" #%declare563_0"
+" kw564_0)"
+"(let-values(((s_858)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_90)"
-" s_856))"
-"(let-values(((#%declare559_1"
-" kw560_1)"
-"(let-values(((s_857)"
-"(if(syntax?$1"
-" s_856)"
-"(syntax-e$1"
-" s_856)"
-" s_856)))"
-"(if(pair?"
-" s_857)"
-"(let-values(((#%declare561_0)"
-"(let-values(((s_858)"
-"(car"
-" s_857)))"
 " s_858))"
-"((kw562_0)"
+"(let-values(((#%declare563_1"
+" kw564_1)"
 "(let-values(((s_859)"
-"(cdr"
-" s_857)))"
-"(let-values(((s_860)"
 "(if(syntax?$1"
-" s_859)"
+" s_858)"
 "(syntax-e$1"
+" s_858)"
+" s_858)))"
+"(if(pair?"
 " s_859)"
+"(let-values(((#%declare565_0)"
+"(let-values(((s_860)"
+"(car"
 " s_859)))"
+" s_860))"
+"((kw566_0)"
+"(let-values(((s_861)"
+"(cdr"
+" s_859)))"
+"(let-values(((s_862)"
+"(if(syntax?$1"
+" s_861)"
+"(syntax-e$1"
+" s_861)"
+" s_861)))"
 "(let-values(((flat-s_61)"
 "(to-syntax-list.1"
-" s_860)))"
+" s_862)))"
 "(if(not"
 " flat-s_61)"
 "(let-values()"
@@ -76267,20 +76271,20 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_61)))))))"
 "(values"
-" #%declare561_0"
-" kw562_0))"
+" #%declare565_0"
+" kw566_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                             \"bad syntax\""
 " orig-s_90)))))"
 "(values"
 " #t"
-" #%declare559_1"
-" kw560_1))))))"
+" #%declare563_1"
+" kw564_1))))))"
 "(let-values((()"
 "(begin"
 "(let-values(((lst_436)"
-" kw560_0))"
+" kw564_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -76402,7 +76406,7 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_34 frame-id_17 inside-scope_2 all-scopes-stx_6 defined-syms_13 requires+provides_8)"
 "(begin"
-"(lambda(ids_47 rhs_23 phase_160)"
+"(lambda(ids_47 rhs_23 phase_161)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
 "(let-values(((lst_438) ids_47))"
@@ -76434,38 +76438,38 @@ static const char *startup_source =
 " null"
 " lst_438))))))"
 "(let-values(((syms_25)"
-"(let-values(((scoped-ids563_0) scoped-ids_0)"
-"((defined-syms564_0) defined-syms_13)"
-"((self565_0) self_34)"
-"((phase566_0) phase_160)"
-"((all-scopes-stx567_0) all-scopes-stx_6)"
-"((frame-id568_0) frame-id_17)"
-"((requires+provides569_0) requires+provides_8))"
+"(let-values(((scoped-ids567_0) scoped-ids_0)"
+"((defined-syms568_0) defined-syms_13)"
+"((self569_0) self_34)"
+"((phase570_0) phase_161)"
+"((all-scopes-stx571_0) all-scopes-stx_6)"
+"((frame-id572_0) frame-id_17)"
+"((requires+provides573_0) requires+provides_8))"
 "(select-defined-syms-and-bind!16.1"
 " #f"
 " #f"
-" frame-id568_0"
+" frame-id572_0"
 " #f"
 " #f"
-" requires+provides569_0"
+" requires+provides573_0"
 " #t"
 " #f"
 " #f"
-" scoped-ids563_0"
-" defined-syms564_0"
-" self565_0"
-" phase566_0"
-" all-scopes-stx567_0))))"
-"(let-values(((s_290)"
+" scoped-ids567_0"
+" defined-syms568_0"
+" self569_0"
+" phase570_0"
+" all-scopes-stx571_0))))"
+"(let-values(((s_595)"
 "(add-scope"
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_160) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_161) 'define-values)"
 " scoped-ids_0"
 " rhs_23))"
 " inside-scope_2)))"
-"(values scoped-ids_0(semi-parsed-define-values2.1 s_290 syms_25 scoped-ids_0 rhs_23)))))))))"
+"(values scoped-ids_0(semi-parsed-define-values2.1 s_595 syms_25 scoped-ids_0 rhs_23)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
 "(lambda(bodys_22 ctx_115)"
@@ -76509,7 +76513,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons99"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys98_0))"
-"(let-values(((phase_161) phase84_0))"
+"(let-values(((phase_162) phase84_0))"
 "(let-values(((body-ctx_7) ctx85_0))"
 "(let-values(((self_35) self86_0))"
 "(let-values(((declared-submodule-names_5) declared-submodule-names87_0))"
@@ -76523,7 +76527,7 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_23)"
 "(let-values()"
-"(if(if tail?_53(not(zero? phase_161)) #f)"
+"(if(if tail?_53(not(zero? phase_162)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_155)(expand-context-observer body-ctx_7)))"
@@ -76577,14 +76581,14 @@ static const char *startup_source =
 "(let-values(((body_24)(car bodys_23)))"
 "(let-values(((rest-bodys_2)(cdr bodys_23)))"
 "(let-values(((exp-body_8)"
-"(if(let-values(((or-part_406)"
+"(if(let-values(((or-part_405)"
 "(parsed? body_24)))"
+"(if or-part_405"
+" or-part_405"
+"(let-values(((or-part_406)"
+"(expanded+parsed? body_24)))"
 "(if or-part_406"
 " or-part_406"
-"(let-values(((or-part_407)"
-"(expanded+parsed? body_24)))"
-"(if or-part_407"
-" or-part_407"
 "(semi-parsed-begin-for-syntax?"
 " body_24)))))"
 "(let-values() body_24)"
@@ -76601,138 +76605,138 @@ static const char *startup_source =
 "(let-values(((syms_26)"
 "(semi-parsed-define-values-syms"
 " body_24)))"
-"(let-values(((s_861)"
+"(let-values(((s_623)"
 "(semi-parsed-define-values-s"
 " body_24)))"
 "(let-values(((ok?_86"
-" define-values570_0"
-" _571_0"
-" _572_0)"
-"(let-values(((s_862)"
+" define-values574_0"
+" _575_0"
+" _576_0)"
+"(let-values(((s_863)"
 "(syntax-disarm$1"
-" s_861)))"
+" s_623)))"
 "(if(if(not"
 "(expand-context-to-parsed?"
 " rhs-ctx_2))"
 " #t"
 " #f)"
 "(let-values(((orig-s_91)"
-" s_862))"
-"(let-values(((define-values570_1"
-" _571_1"
-" _572_1)"
-"(let-values(((s_863)"
-"(if(syntax?$1"
-" s_862)"
-"(syntax-e$1"
-" s_862)"
-" s_862)))"
-"(if(pair?"
-" s_863)"
-"(let-values(((define-values573_0)"
+" s_863))"
+"(let-values(((define-values574_1"
+" _575_1"
+" _576_1)"
 "(let-values(((s_864)"
-"(car"
+"(if(syntax?$1"
+" s_863)"
+"(syntax-e$1"
+" s_863)"
 " s_863)))"
-" s_864))"
-"((_574_0"
-" _575_0)"
+"(if(pair?"
+" s_864)"
+"(let-values(((define-values577_0)"
 "(let-values(((s_865)"
-"(cdr"
-" s_863)))"
+"(car"
+" s_864)))"
+" s_865))"
+"((_578_0"
+" _579_0)"
 "(let-values(((s_866)"
-"(if(syntax?$1"
-" s_865)"
-"(syntax-e$1"
-" s_865)"
-" s_865)))"
-"(if(pair?"
-" s_866)"
-"(let-values(((_576_0)"
+"(cdr"
+" s_864)))"
 "(let-values(((s_867)"
-"(car"
-" s_866)))"
-" s_867))"
-"((_577_0)"
-"(let-values(((s_868)"
-"(cdr"
-" s_866)))"
-"(let-values(((s_869)"
 "(if(syntax?$1"
-" s_868)"
+" s_866)"
 "(syntax-e$1"
-" s_868)"
-" s_868)))"
+" s_866)"
+" s_866)))"
 "(if(pair?"
-" s_869)"
-"(let-values(((_578_0)"
-"(let-values(((s_870)"
+" s_867)"
+"(let-values(((_580_0)"
+"(let-values(((s_868)"
 "(car"
-" s_869)))"
-" s_870))"
-"(()"
-"(let-values(((s_871)"
+" s_867)))"
+" s_868))"
+"((_581_0)"
+"(let-values(((s_869)"
 "(cdr"
-" s_869)))"
-"(let-values(((s_872)"
+" s_867)))"
+"(let-values(((s_870)"
 "(if(syntax?$1"
-" s_871)"
+" s_869)"
 "(syntax-e$1"
-" s_871)"
-" s_871)))"
-"(if(null?"
+" s_869)"
+" s_869)))"
+"(if(pair?"
+" s_870)"
+"(let-values(((_582_0)"
+"(let-values(((s_871)"
+"(car"
+" s_870)))"
+" s_871))"
+"(()"
+"(let-values(((s_872)"
+"(cdr"
+" s_870)))"
+"(let-values(((s_873)"
+"(if(syntax?$1"
 " s_872)"
+"(syntax-e$1"
+" s_872)"
+" s_872)))"
+"(if(null?"
+" s_873)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                       \"bad syntax\""
 " orig-s_91))))))"
 "(values"
-" _578_0))"
+" _582_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                   \"bad syntax\""
 " orig-s_91))))))"
 "(values"
-" _576_0"
-" _577_0))"
+" _580_0"
+" _581_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                               \"bad syntax\""
 " orig-s_91))))))"
 "(values"
-" define-values573_0"
-" _574_0"
-" _575_0))"
+" define-values577_0"
+" _578_0"
+" _579_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                           \"bad syntax\""
 " orig-s_91)))))"
 "(values"
 " #t"
-" define-values570_1"
-" _571_1"
-" _572_1)))"
+" define-values574_1"
+" _575_1"
+" _576_1)))"
 "(values"
 " #f"
 " #f"
 " #f"
 " #f)))))"
 "(let-values(((rebuild-s_15)"
-"(let-values(((rhs-ctx579_0)"
+"(let-values(((rhs-ctx583_0)"
 " rhs-ctx_2)"
-"((s580_0)"
-" s_861)"
-"((temp581_0)"
+"((s584_0)"
+" s_623)"
+"((temp585_0)"
 " #t))"
 "(keep-as-needed120.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp581_0"
+" temp585_0"
 " #t"
-" rhs-ctx579_0"
-" s580_0))))"
+" rhs-ctx583_0"
+" s584_0))))"
 "(let-values((()"
 "(begin"
 "(log-defn-enter"
@@ -76741,10 +76745,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((exp-rhs_7)"
 "(let-values()"
-"(let-values(((temp582_0)"
+"(let-values(((temp586_0)"
 "(semi-parsed-define-values-rhs"
 " body_24))"
-"((rhs-ctx583_0)"
+"((rhs-ctx587_0)"
 " rhs-ctx_2))"
 "(expand9.1"
 " #f"
@@ -76753,8 +76757,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp582_0"
-" rhs-ctx583_0)))))"
+" temp586_0"
+" rhs-ctx587_0)))))"
 "(let-values((()"
 "(begin"
 "(log-defn-exit"
@@ -76770,9 +76774,9 @@ static const char *startup_source =
 "(if(expand-context-to-parsed?"
 " rhs-ctx_2)"
 " exp-rhs_7"
-"(let-values(((exp-rhs584_0)"
+"(let-values(((exp-rhs588_0)"
 " exp-rhs_7)"
-"((temp585_0)"
+"((temp589_0)"
 "(as-to-parsed-context"
 " rhs-ctx_2)))"
 "(expand9.1"
@@ -76782,24 +76786,24 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" exp-rhs584_0"
-" temp585_0))))))"
+" exp-rhs588_0"
+" temp589_0))))))"
 "(if(expand-context-to-parsed?"
 " rhs-ctx_2)"
 " comp-form_0"
 "(expanded+parsed1.1"
-"(let-values(((rebuild-s586_0)"
+"(let-values(((rebuild-s590_0)"
 " rebuild-s_15)"
-"((temp587_0)"
+"((temp591_0)"
 "(list"
-" define-values570_0"
+" define-values574_0"
 " ids_48"
 " exp-rhs_7)))"
 "(rebuild5.1"
 " #f"
 " #f"
-" rebuild-s586_0"
-" temp587_0))"
+" rebuild-s590_0"
+" temp591_0))"
 " comp-form_0)))))))))))))"
 "(let-values()"
 "(let-values(((disarmed-body_0)"
@@ -76807,7 +76811,7 @@ static const char *startup_source =
 "(let-values(((tmp_66)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_161)))"
+" phase_162)))"
 "(if(if(equal? tmp_66 '#%require)"
 " #t"
 "(if(equal? tmp_66 '#%provide)"
@@ -76817,9 +76821,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(let-values(((exp-body_9)"
-"(let-values(((body588_0)"
+"(let-values(((body592_0)"
 " body_24)"
-"((temp589_0)"
+"((temp593_0)"
 "(as-expression-context"
 " body-ctx_7)))"
 "(expand9.1"
@@ -76829,16 +76833,16 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" body588_0"
-" temp589_0))))"
+" body592_0"
+" temp593_0))))"
 "(if(expand-context-to-parsed?"
 " body-ctx_7)"
 " exp-body_9"
 "(expanded+parsed1.1"
 " exp-body_9"
-"(let-values(((exp-body590_0)"
+"(let-values(((exp-body594_0)"
 " exp-body_9)"
-"((temp591_0)"
+"((temp595_0)"
 "(as-to-parsed-context"
 " body-ctx_7)))"
 "(expand9.1"
@@ -76848,8 +76852,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" exp-body590_0"
-" temp591_0)))))))))))))))"
+" exp-body594_0"
+" temp595_0)))))))))))))))"
 "(let-values(((lifted-defns_1)"
 "(get-and-clear-lifts!"
 "(expand-context-lifts body-ctx_7))))"
@@ -76889,43 +76893,43 @@ static const char *startup_source =
 "(void)))))"
 "(values))))"
 "(let-values(((exp-lifted-modules_0)"
-"(let-values(((lifted-modules592_0)"
+"(let-values(((lifted-modules596_0)"
 " lifted-modules_0)"
-"((phase593_0) phase_161)"
-"((self594_0) self_35)"
-"((body-ctx595_0)"
+"((phase597_0) phase_162)"
+"((self598_0) self_35)"
+"((body-ctx599_0)"
 " body-ctx_7)"
-"((mpis-to-reset596_0)"
+"((mpis-to-reset600_0)"
 " mpis-to-reset_2)"
-"((declared-submodule-names597_0)"
+"((declared-submodule-names601_0)"
 " declared-submodule-names_5)"
-"((compiled-submodules598_0)"
+"((compiled-submodules602_0)"
 " compiled-submodules_3)"
-"((modules-being-compiled599_0)"
+"((modules-being-compiled603_0)"
 " modules-being-compiled_5))"
 "(expand-non-module*-submodules212.1"
-" compiled-submodules598_0"
-" declared-submodule-names597_0"
-" modules-being-compiled599_0"
-" mpis-to-reset596_0"
-" lifted-modules592_0"
-" phase593_0"
-" self594_0"
-" body-ctx595_0))))"
+" compiled-submodules602_0"
+" declared-submodule-names601_0"
+" modules-being-compiled603_0"
+" mpis-to-reset600_0"
+" lifted-modules596_0"
+" phase597_0"
+" self598_0"
+" body-ctx599_0))))"
 "(let-values(((exp-lifted-defns_0)"
 "(loop_126 #f lifted-defns_1)))"
 "(begin"
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_109)"
+"(let-values(((obs_159)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_109"
+"(if obs_159"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_109"
+" obs_159"
 " 'next)))"
 "(void)))))"
 "(append"
@@ -76953,7 +76957,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_193"
-"(let-values(((phase_162 l_89)(hash-iterate-key+value ht_169 i_193)))"
+"(let-values(((phase_163 l_89)(hash-iterate-key+value ht_169 i_193)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76986,10 +76990,10 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(let-values(((b_97)"
-"(let-values(((id600_0)"
+"(let-values(((id604_0)"
 " id_159)"
-"((phase601_0)"
-" phase_162))"
+"((phase605_0)"
+" phase_163))"
 "(resolve+shift30.1"
 " #f"
 " #f"
@@ -77001,8 +77005,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" id600_0"
-" phase601_0))))"
+" id604_0"
+" phase605_0))))"
 "(let-values(((bound-here?_0)"
 "(if b_97"
 "(if(module-binding?"
@@ -77025,7 +77029,7 @@ static const char *startup_source =
 " requires+provides_9"
 "(module-binding-sym"
 " b_97)"
-" phase_162)"
+" phase_163)"
 " #f)))"
 "(if(eq?"
 " bound-kind_0"
@@ -77049,14 +77053,14 @@ static const char *startup_source =
 "(format"
 "                                                                                                                                                           \"\\n  at phase: ~a\""
 "(let-values(((tmp_67)"
-" phase_162))"
+" phase_163))"
 "(if(equal?"
 " tmp_67"
 " 1)"
 "(let-values()"
 "                                                                                                                                                                 \"1; the transformer environment\")"
 "(let-values()"
-" phase_162)))))"
+" phase_163)))))"
 " id_159"
 " #f"
 " null"
@@ -77095,93 +77099,93 @@ 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_20) namespace104_0))"
-"(let-values(((phase_163) phase105_0))"
+"(let-values(((phase_164) phase105_0))"
 "(let-values(((self_37) self106_0))"
 "(let-values(((ctx_117) ctx107_0))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_127)"
-"(lambda(bodys_25 phase_164)"
+"(lambda(bodys_25 phase_165)"
 "(begin"
 " 'loop"
 "(if(null? bodys_25)"
 "(let-values() null)"
-"(if(let-values(((or-part_408)(parsed?(car bodys_25))))"
-"(if or-part_408 or-part_408(expanded+parsed?(car bodys_25))))"
+"(if(let-values(((or-part_407)(parsed?(car bodys_25))))"
+"(if or-part_407 or-part_407(expanded+parsed?(car bodys_25))))"
 "(let-values()"
-"(cons(car bodys_25)(loop_127(cdr bodys_25) phase_164)))"
+"(cons(car bodys_25)(loop_127(cdr bodys_25) phase_165)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_25))"
 "(let-values()"
 "(let-values(((nested-bodys_2)"
 "(loop_127"
 "(semi-parsed-begin-for-syntax-body(car bodys_25))"
-"(add1 phase_164))))"
+"(add1 phase_165))))"
 "(cons"
 "(let-values(((the-struct_117)(car bodys_25)))"
 "(if(semi-parsed-begin-for-syntax? the-struct_117)"
-"(let-values(((body602_0) nested-bodys_2))"
+"(let-values(((body606_0) nested-bodys_2))"
 "(semi-parsed-begin-for-syntax3.1"
 "(semi-parsed-begin-for-syntax-s the-struct_117)"
-" body602_0))"
+" body606_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
 " the-struct_117)))"
-"(loop_127(cdr bodys_25) phase_164))))"
+"(loop_127(cdr bodys_25) phase_165))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_25))))"
 "(let-values(((tmp_68)"
-"(core-form-sym disarmed-body_1 phase_164)))"
+"(core-form-sym disarmed-body_1 phase_165)))"
 "(if(equal? tmp_68 '#%provide)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_159)"
+"(let-values(((obs_160)"
 "(expand-context-observer"
 " ctx_117)))"
-"(if obs_159"
+"(if obs_160"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_159"
+" obs_160"
 " 'enter-prim"
 "(car bodys_25))"
 "(call-expand-observe"
-" obs_159"
+" obs_160"
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
-"(let-values(((ok?_87 #%provide603_0 spec604_0)"
-"(let-values(((s_873) disarmed-body_1))"
-"(let-values(((orig-s_92) s_873))"
-"(let-values(((#%provide603_1"
-" spec604_1)"
-"(let-values(((s_874)"
+"(let-values(((ok?_87 #%provide607_0 spec608_0)"
+"(let-values(((s_874) disarmed-body_1))"
+"(let-values(((orig-s_92) s_874))"
+"(let-values(((#%provide607_1"
+" spec608_1)"
+"(let-values(((s_667)"
 "(if(syntax?$1"
-" s_873)"
+" s_874)"
 "(syntax-e$1"
-" s_873)"
-" s_873)))"
-"(if(pair? s_874)"
-"(let-values(((#%provide605_0)"
+" s_874)"
+" s_874)))"
+"(if(pair? s_667)"
+"(let-values(((#%provide609_0)"
 "(let-values(((s_875)"
 "(car"
-" s_874)))"
-" s_875))"
-"((spec606_0)"
-"(let-values(((s_667)"
-"(cdr"
-" s_874)))"
-"(let-values(((s_876)"
-"(if(syntax?$1"
-" s_667)"
-"(syntax-e$1"
-" s_667)"
 " s_667)))"
+" s_875))"
+"((spec610_0)"
+"(let-values(((s_876)"
+"(cdr"
+" s_667)))"
+"(let-values(((s_877)"
+"(if(syntax?$1"
+" s_876)"
+"(syntax-e$1"
+" s_876)"
+" s_876)))"
 "(let-values(((flat-s_62)"
 "(to-syntax-list.1"
-" s_876)))"
+" s_877)))"
 "(if(not"
 " flat-s_62)"
 "(let-values()"
@@ -77192,45 +77196,45 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_62)))))))"
 "(values"
-" #%provide605_0"
-" spec606_0))"
+" #%provide609_0"
+" spec610_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                     \"bad syntax\""
 " orig-s_92)))))"
 "(values"
 " #t"
-" #%provide603_1"
-" spec604_1))))))"
+" #%provide607_1"
+" spec608_1))))))"
 "(let-values(((track-stxes_10 specs_2)"
 "(parse-and-expand-provides!"
-" spec604_0"
+" spec608_0"
 "(car bodys_25)"
 " requires+provides_10"
 " self_37"
-" phase_164"
+" phase_165"
 "(let-values(((v_275) ctx_117))"
 "(let-values(((the-struct_118)"
 " v_275))"
 "(if(expand-context/outer?"
 " the-struct_118)"
-"(let-values(((context607_0)"
+"(let-values(((context611_0)"
 " 'top-level)"
-"((inner608_0)"
+"((inner612_0)"
 "(let-values(((the-struct_119)"
 "(root-expand-context/outer-inner"
 " v_275)))"
 "(if(expand-context/inner?"
 " the-struct_119)"
-"(let-values(((phase609_0)"
-" phase_164)"
-"((namespace610_0)"
+"(let-values(((phase613_0)"
+" phase_165)"
+"((namespace614_0)"
 "(namespace->namespace-at-phase"
 " m-ns_20"
-" phase_164))"
-"((requires+provides611_0)"
+" phase_165))"
+"((requires+provides615_0)"
 " requires+provides_10)"
-"((declared-submodule-names612_0)"
+"((declared-submodule-names616_0)"
 " declared-submodule-names_6))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -77249,8 +77253,8 @@ static const char *startup_source =
 " the-struct_119)"
 "(expand-context/inner-to-parsed?"
 " the-struct_119)"
-" phase609_0"
-" namespace610_0"
+" phase613_0"
+" namespace614_0"
 "(expand-context/inner-just-once?"
 " the-struct_119)"
 "(expand-context/inner-module-begin-k"
@@ -77263,7 +77267,7 @@ static const char *startup_source =
 " the-struct_119)"
 "(expand-context/inner-stops"
 " the-struct_119)"
-" declared-submodule-names612_0"
+" declared-submodule-names616_0"
 "(expand-context/inner-lifts"
 " the-struct_119)"
 "(expand-context/inner-lift-envs"
@@ -77274,7 +77278,7 @@ static const char *startup_source =
 " the-struct_119)"
 "(expand-context/inner-to-module-lifts"
 " the-struct_119)"
-" requires+provides611_0"
+" requires+provides615_0"
 "(expand-context/inner-observer"
 " the-struct_119)"
 "(expand-context/inner-for-serializable?"
@@ -77286,14 +77290,14 @@ static const char *startup_source =
 "                                                                                                          \"expand-context/inner?\""
 " the-struct_119)))))"
 "(expand-context/outer1.1"
-" inner608_0"
+" inner612_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_118)"
 "(root-expand-context/outer-use-site-scopes"
 " the-struct_118)"
 "(root-expand-context/outer-frame-id"
 " the-struct_118)"
-" context607_0"
+" context611_0"
 "(expand-context/outer-env"
 " the-struct_118)"
 "(expand-context/outer-post-expansion-scope-action"
@@ -77320,31 +77324,31 @@ static const char *startup_source =
 " the-struct_118)))))))"
 "(if(expand-context-to-parsed? ctx_117)"
 "(let-values()"
-"(loop_127(cdr bodys_25) phase_164))"
+"(loop_127(cdr bodys_25) phase_165))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
 " track-stxes_10"
-"(let-values(((temp613_0)"
+"(let-values(((temp617_0)"
 "(car bodys_25))"
-"((temp614_0)"
+"((temp618_0)"
 "(list*"
-" #%provide603_0"
+" #%provide607_0"
 " specs_2)))"
 "(rebuild5.1"
 " #f"
 " #f"
-" temp613_0"
-" temp614_0)))))"
+" temp617_0"
+" temp618_0)))))"
 "(begin"
-"(let-values(((obs_160)"
+"(let-values(((obs_161)"
 "(expand-context-observer"
 " ctx_117)))"
-"(if obs_160"
+"(if obs_161"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_160"
+" obs_161"
 " 'exit-prim"
 " new-s_10)))"
 "(void)))"
@@ -77352,14 +77356,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_127"
 "(cdr bodys_25)"
-" phase_164))))))))))"
+" phase_165))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_25)"
-"(loop_127(cdr bodys_25) phase_164))))))))))))))"
+"(loop_127(cdr bodys_25) phase_165))))))))))))))"
 " loop_127)"
 " expression-expanded-bodys_1"
-" phase_163)))))))))))))"
+" phase_164)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion139.1)"
 "(lambda(ctx125_0"
@@ -77404,47 +77408,47 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_409) enclosing-self_3))"
-"(if or-part_409 or-part_409 self_38)))))"
+"(let-values(((or-part_408) enclosing-self_3))"
+"(if or-part_408 or-part_408 self_38)))))"
 "(let-values(((compiled-module_0)"
-"(let-values(((parsed-mod615_0) parsed-mod_0)"
-"((temp616_0)"
-"(let-values(((m-ns620_0) m-ns_21)"
-"((enclosing-self621_0) enclosing-self_3)"
-"((temp622_0)"
+"(let-values(((parsed-mod619_0) parsed-mod_0)"
+"((temp620_0)"
+"(let-values(((m-ns624_0) m-ns_21)"
+"((enclosing-self625_0) enclosing-self_3)"
+"((temp626_0)"
 "(if enclosing-self_3"
 "(1/resolved-module-path-name"
 " module-name_2)"
 " #f)))"
 "(make-compile-context14.1"
-" temp622_0"
+" temp626_0"
 " #t"
 " #f"
 " #f"
-" enclosing-self621_0"
+" enclosing-self625_0"
 " #t"
-" m-ns620_0"
+" m-ns624_0"
 " #t"
 " #f"
 " #f"
 " #f"
 " #f)))"
-"((temp617_0)(expand-context-for-serializable? ctx_118))"
-"((modules-being-compiled618_0) modules-being-compiled_6)"
-"((temp619_0) #f))"
+"((temp621_0)(expand-context-for-serializable? ctx_118))"
+"((modules-being-compiled622_0) modules-being-compiled_6)"
+"((temp623_0) #f))"
 "(compile-module13.1"
 " #f"
 " #f"
-" modules-being-compiled618_0"
+" modules-being-compiled622_0"
 " #t"
-" temp619_0"
+" temp623_0"
 " #t"
-" temp617_0"
+" temp621_0"
 " #t"
 " #f"
 " #f"
-" parsed-mod615_0"
-" temp616_0))))"
+" parsed-mod619_0"
+" temp620_0))))"
 "(let-values((()"
 "(begin"
 "(set-box! compiled-module-box_1 compiled-module_0)"
@@ -77460,27 +77464,27 @@ static const char *startup_source =
 " 1/current-module-declare-name"
 "(1/make-resolved-module-path root-module-name_0))"
 "(let-values()"
-"(let-values(((compiled-module623_0) compiled-module_0)((temp624_0) #f))"
+"(let-values(((compiled-module627_0) compiled-module_0)((temp628_0) #f))"
 "(eval-module8.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp624_0"
+" temp628_0"
 " #t"
-" compiled-module623_0)))))))))))))))))))))))))"
+" compiled-module627_0)))))))))))))))))))))))))"
 "(define-values"
 "(attach-root-expand-context-properties)"
-"(lambda(s_877 root-ctx_8 orig-self_1 new-self_2)"
+"(lambda(s_878 root-ctx_8 orig-self_1 new-self_2)"
 "(begin"
-"(let-values(((s_878)"
-"(syntax-property$1 s_877 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
 "(let-values(((s_879)"
+"(syntax-property$1 s_878 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
+"(let-values(((s_688)"
 "(syntax-property$1"
-" s_878"
+" s_879"
 " 'module-body-inside-context"
 "(add-scope empty-syntax(root-expand-context-post-expansion-scope root-ctx_8)))))"
-" s_879)))))"
+" s_688)))))"
 "(define-values"
 "(expand-post-submodules165.1)"
 "(lambda(all-scopes-s147_0"
@@ -77499,7 +77503,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_165) phase143_1))"
+"(let-values(((phase_166) phase143_1))"
 "(let-values(((self_39) 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))"
@@ -77511,7 +77515,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx152_0))"
 "(let-values()"
 "((letrec-values(((loop_128)"
-"(lambda(bodys_26 phase_166)"
+"(lambda(bodys_26 phase_167)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
@@ -77524,13 +77528,13 @@ static const char *startup_source =
 "(let-values(((body-s_0)"
 "(semi-parsed-begin-for-syntax-s"
 " body_25)))"
-"(let-values(((ok?_88 begin-for-syntax625_0 _626_0)"
+"(let-values(((ok?_88 begin-for-syntax629_0 _630_0)"
 "(let-values(((s_880)"
 "(syntax-disarm$1"
 " body-s_0)))"
 "(let-values(((orig-s_93) s_880))"
-"(let-values(((begin-for-syntax625_1"
-" _626_1)"
+"(let-values(((begin-for-syntax629_1"
+" _630_1)"
 "(let-values(((s_881)"
 "(if(syntax?$1"
 " s_880)"
@@ -77538,12 +77542,12 @@ static const char *startup_source =
 " s_880)"
 " s_880)))"
 "(if(pair? s_881)"
-"(let-values(((begin-for-syntax627_0)"
+"(let-values(((begin-for-syntax631_0)"
 "(let-values(((s_882)"
 "(car"
 " s_881)))"
 " s_882))"
-"((_628_0)"
+"((_632_0)"
 "(let-values(((s_883)"
 "(cdr"
 " s_881)))"
@@ -77566,20 +77570,20 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_63)))))))"
 "(values"
-" begin-for-syntax627_0"
-" _628_0))"
+" begin-for-syntax631_0"
+" _632_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                         \"bad syntax\""
 " orig-s_93)))))"
 "(values"
 " #t"
-" begin-for-syntax625_1"
-" _626_1))))))"
+" begin-for-syntax629_1"
+" _630_1))))))"
 "(let-values(((rebuild-body-s_0)"
-"(let-values(((submod-ctx629_0)"
+"(let-values(((submod-ctx633_0)"
 " submod-ctx_1)"
-"((body-s630_0)"
+"((body-s634_0)"
 " body-s_0))"
 "(keep-as-needed120.1"
 " #f"
@@ -77588,13 +77592,13 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" submod-ctx629_0"
-" body-s630_0))))"
+" submod-ctx633_0"
+" body-s634_0))))"
 "(let-values(((nested-bodys_3)"
 "(loop_128"
 "(semi-parsed-begin-for-syntax-body"
 " body_25)"
-"(add1 phase_166))))"
+"(add1 phase_167))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -77604,33 +77608,33 @@ static const char *startup_source =
 " submod-ctx_1)"
 " parsed-bfs_0"
 "(expanded+parsed1.1"
-"(let-values(((rebuild-body-s631_0)"
+"(let-values(((rebuild-body-s635_0)"
 " rebuild-body-s_0)"
-"((temp632_0)"
+"((temp636_0)"
 "(list*"
-" begin-for-syntax625_0"
+" begin-for-syntax629_0"
 "(syntax-only"
 " nested-bodys_3))))"
 "(rebuild5.1"
 " #f"
 " #f"
-" rebuild-body-s631_0"
-" temp632_0))"
+" rebuild-body-s635_0"
+" temp636_0))"
 " parsed-bfs_0))"
-"(loop_128 rest-bodys_3 phase_166))))))))"
-"(if(let-values(((or-part_410)(parsed? body_25)))"
-"(if or-part_410"
-" or-part_410"
+"(loop_128 rest-bodys_3 phase_167))))))))"
+"(if(let-values(((or-part_409)(parsed? body_25)))"
+"(if or-part_409"
+" or-part_409"
 "(expanded+parsed? body_25)))"
 "(let-values()"
-"(cons body_25(loop_128 rest-bodys_3 phase_166)))"
+"(cons body_25(loop_128 rest-bodys_3 phase_167)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_25)))"
 "(let-values(((tmp_69)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_166)))"
+" phase_167)))"
 "(if(equal? tmp_69 'module*)"
 "(let-values()"
 "(let-values((()"
@@ -77643,52 +77647,52 @@ static const char *startup_source =
 " body_25"
 " submod-ctx_1)))"
 "(let-values(((ok?_89"
-" module*633_0"
-" name634_0"
-" _635_0)"
-"(let-values(((s_705)"
+" module*637_0"
+" name638_0"
+" _639_0)"
+"(let-values(((s_706)"
 " disarmed-body_2))"
 "(if(let-values(((s_885)"
 "(if(syntax?$1"
-" s_705)"
-"(syntax-e$1"
-" s_705)"
-" s_705)))"
-"(if(pair? s_885)"
-"(if(let-values(((s_886)"
-"(car"
-" s_885)))"
-" #t)"
-"(let-values(((s_887)"
-"(cdr"
-" s_885)))"
-"(let-values(((s_706)"
-"(if(syntax?$1"
-" s_887)"
-"(syntax-e$1"
-" s_887)"
-" s_887)))"
-"(if(pair?"
 " s_706)"
-"(if(let-values(((s_888)"
+"(syntax-e$1"
+" s_706)"
+" s_706)))"
+"(if(pair? s_885)"
+"(if(let-values(((s_707)"
 "(car"
-" s_706)))"
+" s_885)))"
 " #t)"
-"(let-values(((s_707)"
+"(let-values(((s_886)"
 "(cdr"
-" s_706)))"
+" s_885)))"
+"(let-values(((s_887)"
+"(if(syntax?$1"
+" s_886)"
+"(syntax-e$1"
+" s_886)"
+" s_886)))"
+"(if(pair?"
+" s_887)"
+"(if(let-values(((s_708)"
+"(car"
+" s_887)))"
+" #t)"
+"(let-values(((s_888)"
+"(cdr"
+" s_887)))"
 "(let-values(((s_889)"
 "(if(syntax?$1"
-" s_707)"
+" s_888)"
 "(syntax-e$1"
-" s_707)"
-" s_707)))"
+" s_888)"
+" s_888)))"
 "(if(pair?"
 " s_889)"
 "(if(let-values(((s_890)"
 "(car"
 " s_889)))"
-"(let-values(((s_708)"
+"(let-values(((s_891)"
 "(if(syntax?$1"
 " s_890)"
 "(syntax-e$1"
@@ -77696,8 +77700,8 @@ static const char *startup_source =
 " s_890)))"
 "(eq?"
 " #f"
-" s_708)))"
-"(let-values(((s_891)"
+" s_891)))"
+"(let-values(((s_892)"
 "(cdr"
 " s_889)))"
 " #t)"
@@ -77708,76 +77712,76 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((module*633_1"
-" name634_1"
-" _635_1)"
-"(let-values(((s_892)"
-"(if(syntax?$1"
-" s_705)"
-"(syntax-e$1"
-" s_705)"
-" s_705)))"
-"(let-values(((module*636_0)"
+"(let-values(((module*637_1"
+" name638_1"
+" _639_1)"
 "(let-values(((s_893)"
-"(car"
-" s_892)))"
-" s_893))"
-"((name637_0"
-" _638_0)"
+"(if(syntax?$1"
+" s_706)"
+"(syntax-e$1"
+" s_706)"
+" s_706)))"
+"(let-values(((module*640_0)"
 "(let-values(((s_894)"
-"(cdr"
-" s_892)))"
+"(car"
+" s_893)))"
+" s_894))"
+"((name641_0"
+" _642_0)"
 "(let-values(((s_895)"
-"(if(syntax?$1"
-" s_894)"
-"(syntax-e$1"
-" s_894)"
-" s_894)))"
-"(let-values(((name639_0)"
+"(cdr"
+" s_893)))"
 "(let-values(((s_896)"
-"(car"
+"(if(syntax?$1"
+" s_895)"
+"(syntax-e$1"
+" s_895)"
 " s_895)))"
-" s_896))"
-"((_640_0)"
+"(let-values(((name643_0)"
 "(let-values(((s_897)"
-"(cdr"
-" s_895)))"
-"(let-values(((s_898)"
-"(if(syntax?$1"
-" s_897)"
-"(syntax-e$1"
-" s_897)"
-" s_897)))"
-"(let-values((()"
-"(let-values(((s_899)"
 "(car"
-" s_898)))"
-"(let-values(((s_900)"
-"(if(syntax?$1"
-" s_899)"
-"(syntax-e$1"
-" s_899)"
-" s_899)))"
-"(values))))"
-"((_641_0)"
-"(let-values(((s_901)"
+" s_896)))"
+" s_897))"
+"((_644_0)"
+"(let-values(((s_898)"
 "(cdr"
+" s_896)))"
+"(let-values(((s_899)"
+"(if(syntax?$1"
+" s_898)"
+"(syntax-e$1"
+" s_898)"
 " s_898)))"
-" s_901)))"
+"(let-values((()"
+"(let-values(((s_900)"
+"(car"
+" s_899)))"
+"(let-values(((s_901)"
+"(if(syntax?$1"
+" s_900)"
+"(syntax-e$1"
+" s_900)"
+" s_900)))"
+"(values))))"
+"((_645_0)"
+"(let-values(((s_709)"
+"(cdr"
+" s_899)))"
+" s_709)))"
 "(values"
-" _641_0))))))"
+" _645_0))))))"
 "(values"
-" name639_0"
-" _640_0))))))"
+" name643_0"
+" _644_0))))))"
 "(values"
-" module*636_0"
-" name637_0"
-" _638_0)))))"
+" module*640_0"
+" name641_0"
+" _642_0)))))"
 "(values"
 " #t"
-" module*633_1"
-" name634_1"
-" _635_1)))"
+" module*637_1"
+" name638_1"
+" _639_1)))"
 "(values"
 " #f"
 " #f"
@@ -77789,53 +77793,53 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_166)))"
+" phase_167)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
 " neg-phase_0)))"
 "(let-values(((submod_4)"
-"(let-values(((shifted-s642_0)"
+"(let-values(((shifted-s646_0)"
 " shifted-s_0)"
-"((self643_0)"
+"((self647_0)"
 " self_39)"
-"((submod-ctx644_0)"
+"((submod-ctx648_0)"
 " submod-ctx_1)"
-"((temp645_0)"
+"((temp649_0)"
 " #t)"
-"((neg-phase646_0)"
+"((neg-phase650_0)"
 " neg-phase_0)"
-"((all-scopes-s647_0)"
+"((all-scopes-s651_0)"
 " all-scopes-s_1)"
-"((requires+provides648_0)"
+"((requires+provides652_0)"
 " requires+provides_12)"
-"((enclosing-is-cross-phase-persistent?649_0)"
+"((enclosing-is-cross-phase-persistent?653_0)"
 " enclosing-is-cross-phase-persistent?_1)"
-"((mpis-to-reset650_0)"
+"((mpis-to-reset654_0)"
 " mpis-to-reset_3)"
-"((declared-submodule-names651_0)"
+"((declared-submodule-names655_0)"
 " declared-submodule-names_7)"
-"((compiled-submodules652_0)"
+"((compiled-submodules656_0)"
 " compiled-submodules_4)"
-"((modules-being-compiled653_0)"
+"((modules-being-compiled657_0)"
 " modules-being-compiled_7))"
 "(expand-submodule197.1"
-" compiled-submodules652_0"
-" declared-submodule-names651_0"
-" all-scopes-s647_0"
+" compiled-submodules656_0"
+" declared-submodule-names655_0"
+" all-scopes-s651_0"
 " #t"
-" enclosing-is-cross-phase-persistent?649_0"
+" enclosing-is-cross-phase-persistent?653_0"
 " #t"
-" requires+provides648_0"
+" requires+provides652_0"
 " #t"
-" temp645_0"
-" neg-phase646_0"
+" temp649_0"
+" neg-phase650_0"
 " #t"
-" modules-being-compiled653_0"
-" mpis-to-reset650_0"
-" shifted-s642_0"
-" self643_0"
-" submod-ctx644_0))))"
+" modules-being-compiled657_0"
+" mpis-to-reset654_0"
+" shifted-s646_0"
+" self647_0"
+" submod-ctx648_0))))"
 "(if(parsed?"
 " submod_4)"
 "(let-values()"
@@ -77847,13 +77851,13 @@ static const char *startup_source =
 " submod_4))"
 "(if(expanded+parsed?"
 " the-struct_120)"
-"(let-values(((s654_0)"
+"(let-values(((s658_0)"
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_166)))"
+" phase_167)))"
 "(expanded+parsed1.1"
-" s654_0"
+" s658_0"
 "(expanded+parsed-parsed"
 " the-struct_120)))"
 "(raise-argument-error"
@@ -77863,55 +77867,55 @@ static const char *startup_source =
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_166))))))))"
+" phase_167))))))))"
 "(let-values()"
-"(let-values(((ready-body655_0)"
+"(let-values(((ready-body659_0)"
 " ready-body_2)"
-"((self656_0)"
+"((self660_0)"
 " self_39)"
-"((submod-ctx657_0)"
+"((submod-ctx661_0)"
 " submod-ctx_1)"
-"((temp658_0)"
+"((temp662_0)"
 " #t)"
-"((mpis-to-reset659_0)"
+"((mpis-to-reset663_0)"
 " mpis-to-reset_3)"
-"((declared-submodule-names660_0)"
+"((declared-submodule-names664_0)"
 " declared-submodule-names_7)"
-"((compiled-submodules661_0)"
+"((compiled-submodules665_0)"
 " compiled-submodules_4)"
-"((modules-being-compiled662_0)"
+"((modules-being-compiled666_0)"
 " modules-being-compiled_7))"
 "(expand-submodule197.1"
-" compiled-submodules661_0"
-" declared-submodule-names660_0"
+" compiled-submodules665_0"
+" declared-submodule-names664_0"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp658_0"
+" temp662_0"
 " #f"
 " #f"
-" modules-being-compiled662_0"
-" mpis-to-reset659_0"
-" ready-body655_0"
-" self656_0"
-" submod-ctx657_0))))))"
+" modules-being-compiled666_0"
+" mpis-to-reset663_0"
+" ready-body659_0"
+" self660_0"
+" submod-ctx661_0))))))"
 "(cons"
 " submod_3"
 "(loop_128"
 " rest-bodys_3"
-" phase_166)))))))"
+" phase_167)))))))"
 "(let-values()"
 "(cons"
 " body_25"
 "(loop_128"
 " rest-bodys_3"
-" phase_166)))))))))))))))))"
+" phase_167)))))))))))))))))"
 " loop_128)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_165)))))))))))))))))"
+" phase_166)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
 "(lambda(ctx_119)"
@@ -77926,9 +77930,9 @@ static const char *startup_source =
 "(begin"
 " 'check-ids-unbound173"
 "(let-values(((ids_49) ids170_0))"
-"(let-values(((phase_167) phase171_1))"
+"(let-values(((phase_168) phase171_1))"
 "(let-values(((requires+provides_13) requires+provides172_0))"
-"(let-values(((s_721) in168_0))"
+"(let-values(((s_902) in168_0))"
 "(let-values()"
 "(begin"
 "(let-values(((lst_444) ids_49))"
@@ -77949,13 +77953,13 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((requires+provides663_0)"
+"(let-values(((requires+provides667_0)"
 " requires+provides_13)"
-"((id664_0) id_160)"
-"((phase665_0)"
-" phase_167)"
-"((s666_0) s_721)"
-"((temp667_0) 'module))"
+"((id668_0) id_160)"
+"((phase669_0)"
+" phase_168)"
+"((s670_0) s_902)"
+"((temp671_0) 'module))"
 "(check-not-defined95.1"
 " #f"
 " #f"
@@ -77963,15 +77967,15 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" s666_0"
+" s670_0"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp667_0"
-" requires+provides663_0"
-" id664_0"
-" phase665_0)))"
+" temp671_0"
+" requires+provides667_0"
+" id668_0"
+" phase669_0)))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)(for-loop_341 rest_255)(values))))"
@@ -77981,7 +77985,7 @@ static const char *startup_source =
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_27 phase_168 m-ns_22 self_40 ctx_120)"
+"(lambda(bodys_27 phase_169 m-ns_22 self_40 ctx_120)"
 "(begin"
 "(begin"
 "(let-values(((lst_446) bodys_27))"
@@ -78015,7 +78019,7 @@ static const char *startup_source =
 " ids_50"
 "(parsed-define-values-rhs"
 " p_89)"
-" phase_168"
+" phase_169"
 " m-ns_22"
 " ctx_120)))"
 "(begin"
@@ -78060,7 +78064,7 @@ static const char *startup_source =
 "((rest_257)"
 "(unsafe-cdr"
 " lst_451))"
-"((sym_110)"
+"((sym_109)"
 "(unsafe-car"
 " lst_452))"
 "((rest_258)"
@@ -78080,8 +78084,8 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_22"
-" phase_168"
-" sym_110"
+" phase_169"
+" sym_109"
 " val_88))"
 "(values)))))"
 "(values)))))"
@@ -78098,19 +78102,19 @@ static const char *startup_source =
 " lst_449"
 " lst_450)))"
 "(void)))))"
-"(if(let-values(((or-part_411)"
+"(if(let-values(((or-part_410)"
 "(parsed-define-syntaxes?"
 " p_89)))"
-"(if or-part_411"
-" or-part_411"
+"(if or-part_410"
+" or-part_410"
 "(semi-parsed-begin-for-syntax?"
 " p_89)))"
 "(let-values()(void))"
-"(if(let-values(((or-part_412)"
+"(if(let-values(((or-part_411)"
 "(parsed-#%declare?"
 " p_89)))"
-"(if or-part_412"
-" or-part_412"
+"(if or-part_411"
+" or-part_411"
 "(syntax?$1 p_89)))"
 "(let-values()(void))"
 "(let-values()"
@@ -78128,10 +78132,10 @@ static const char *startup_source =
 "(eval-single-top"
 "(compile-single"
 " p_89"
-"(let-values(((m-ns668_0)"
+"(let-values(((m-ns672_0)"
 " m-ns_22)"
-"((phase669_0)"
-" phase_168))"
+"((phase673_0)"
+" phase_169))"
 "(make-compile-context14.1"
 " #f"
 " #f"
@@ -78139,9 +78143,9 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" m-ns668_0"
+" m-ns672_0"
 " #t"
-" phase669_0"
+" phase673_0"
 " #t"
 " #f"
 " #f)))"
@@ -78173,7 +78177,7 @@ static const char *startup_source =
 " ctx196_0)"
 "(begin"
 " 'expand-submodule197"
-"(let-values(((s_902) s194_0))"
+"(let-values(((s_903) s194_0))"
 "(let-values(((self_41) self195_0))"
 "(let-values(((ctx_121) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
@@ -78197,59 +78201,59 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_161)(expand-context-observer ctx_121)))"
-"(if obs_161"
+"(let-values(((obs_162)(expand-context-observer ctx_121)))"
+"(if obs_162"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_161 'enter-prim s_902)"
+"(call-expand-observe obs_162 'enter-prim s_903)"
 "(call-expand-observe"
-" obs_161"
+" obs_162"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
-"(let-values(((ok?_90 module670_0 name671_0 _672_0)"
-"(let-values(((s_758) s_902))"
-"(let-values(((orig-s_94) s_758))"
-"(let-values(((module670_1 name671_1 _672_1)"
-"(let-values(((s_903)"
-"(if(syntax?$1 s_758)"
-"(syntax-e$1 s_758)"
-" s_758)))"
-"(if(pair? s_903)"
-"(let-values(((module673_0)"
-"(let-values(((s_763)(car s_903)))"
-" s_763))"
-"((name674_0 _675_0)"
-"(let-values(((s_764)(cdr s_903)))"
-"(let-values(((s_904)"
-"(if(syntax?$1"
-" s_764)"
-"(syntax-e$1 s_764)"
-" s_764)))"
-"(if(pair? s_904)"
-"(let-values(((name676_0)"
-"(let-values(((s_905)"
-"(car"
+"(let-values(((ok?_90 module674_0 name675_0 _676_0)"
+"(let-values(((s_904) s_903))"
+"(let-values(((orig-s_94) s_904))"
+"(let-values(((module674_1 name675_1 _676_1)"
+"(let-values(((s_763)"
+"(if(syntax?$1 s_904)"
+"(syntax-e$1 s_904)"
 " s_904)))"
+"(if(pair? s_763)"
+"(let-values(((module677_0)"
+"(let-values(((s_905)(car s_763)))"
 " s_905))"
-"((_677_0)"
-"(let-values(((s_906)"
-"(cdr"
-" s_904)))"
+"((name678_0 _679_0)"
+"(let-values(((s_906)(cdr s_763)))"
+"(let-values(((s_907)"
+"(if(syntax?$1"
+" s_906)"
+"(syntax-e$1 s_906)"
 " s_906)))"
-"(values name676_0 _677_0))"
+"(if(pair? s_907)"
+"(let-values(((name680_0)"
+"(let-values(((s_908)"
+"(car"
+" s_907)))"
+" s_908))"
+"((_681_0)"
+"(let-values(((s_909)"
+"(cdr"
+" s_907)))"
+" s_909)))"
+"(values name680_0 _681_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                           \"bad syntax\""
 " orig-s_94))))))"
-"(values module673_0 name674_0 _675_0))"
+"(values module677_0 name678_0 _679_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                       \"bad syntax\""
 " orig-s_94)))))"
-"(values #t module670_1 name671_1 _672_1))))))"
-"(let-values(((name_80)(syntax-e$1 name671_0)))"
+"(values #t module674_1 name675_1 _676_1))))))"
+"(let-values(((name_80)(syntax-e$1 name675_0)))"
 "(let-values((()"
 "(begin"
 "(if(hash-ref declared-submodule-names_8 name_80 #f)"
@@ -78257,7 +78261,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"submodule already declared with the same name\""
-" s_902"
+" s_903"
 " name_80))"
 "(void))"
 "(values))))"
@@ -78266,33 +78270,33 @@ static const char *startup_source =
 "(hash-set!"
 " declared-submodule-names_8"
 " name_80"
-"(syntax-e$1 module670_0))"
+"(syntax-e$1 module674_0))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_162)(expand-context-observer ctx_121)))"
-"(if obs_162"
+"(let-values(((obs_163)(expand-context-observer ctx_121)))"
+"(if obs_163"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_162 'enter-prim s_902)))"
+"(call-expand-observe obs_163 'enter-prim s_903)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
-"(let-values(((s678_0) s_902)"
-"((temp679_0)"
+"(let-values(((s682_0) s_903)"
+"((temp683_0)"
 "(let-values(((v_276) ctx_121))"
 "(let-values(((the-struct_121) v_276))"
 "(if(expand-context/outer? the-struct_121)"
-"(let-values(((context688_0) 'module)"
-"((post-expansion-scope689_0)"
+"(let-values(((context692_0) 'module)"
+"((post-expansion-scope693_0)"
 " #f)"
-"((inner690_0)"
+"((inner694_0)"
 "(let-values(((the-struct_122)"
 "(root-expand-context/outer-inner"
 " v_276)))"
 "(if(expand-context/inner?"
 " the-struct_122)"
-"(let-values(((stops691_0)"
+"(let-values(((stops695_0)"
 " empty-free-id-set))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -78325,7 +78329,7 @@ static const char *startup_source =
 " the-struct_122)"
 "(expand-context/inner-keep-#%expression?"
 " the-struct_122)"
-" stops691_0"
+" stops695_0"
 "(expand-context/inner-declared-submodule-names"
 " the-struct_122)"
 "(expand-context/inner-lifts"
@@ -78351,13 +78355,13 @@ static const char *startup_source =
 "                                                                                                 \"expand-context/inner?\""
 " the-struct_122)))))"
 "(expand-context/outer1.1"
-" inner690_0"
-" post-expansion-scope689_0"
+" inner694_0"
+" post-expansion-scope693_0"
 "(root-expand-context/outer-use-site-scopes"
 " the-struct_121)"
 "(root-expand-context/outer-frame-id"
 " the-struct_121)"
-" context688_0"
+" context692_0"
 "(expand-context/outer-env"
 " the-struct_121)"
 "(expand-context/outer-post-expansion-scope-action"
@@ -78382,45 +78386,45 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                               \"expand-context/outer?\""
 " the-struct_121)))))"
-"((self680_0) self_41)"
-"((temp681_0) #t)"
-"((keep-enclosing-scope-at-phase682_0)"
+"((self684_0) self_41)"
+"((temp685_0) #t)"
+"((keep-enclosing-scope-at-phase686_0)"
 " keep-enclosing-scope-at-phase_2)"
-"((enclosing-all-scopes-stx683_0)"
+"((enclosing-all-scopes-stx687_0)"
 " enclosing-all-scopes-stx_1)"
-"((enclosing-r+p684_0) enclosing-r+p_2)"
-"((enclosing-is-cross-phase-persistent?685_0)"
+"((enclosing-r+p688_0) enclosing-r+p_2)"
+"((enclosing-is-cross-phase-persistent?689_0)"
 " enclosing-is-cross-phase-persistent?_2)"
-"((mpis-to-reset686_0) mpis-to-reset_4)"
-"((modules-being-compiled687_0)"
+"((mpis-to-reset690_0) mpis-to-reset_4)"
+"((modules-being-compiled691_0)"
 " modules-being-compiled_8))"
 "(expand-module18.1"
-" temp681_0"
+" temp685_0"
 " #t"
-" enclosing-all-scopes-stx683_0"
+" enclosing-all-scopes-stx687_0"
 " #t"
-" enclosing-is-cross-phase-persistent?685_0"
+" enclosing-is-cross-phase-persistent?689_0"
 " #t"
-" enclosing-r+p684_0"
+" enclosing-r+p688_0"
 " #t"
-" keep-enclosing-scope-at-phase682_0"
+" keep-enclosing-scope-at-phase686_0"
 " #t"
-" modules-being-compiled687_0"
+" modules-being-compiled691_0"
 " #t"
-" mpis-to-reset686_0"
+" mpis-to-reset690_0"
 " #t"
-" s678_0"
-" temp679_0"
-" self680_0))))"
+" s682_0"
+" temp683_0"
+" self684_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_163)"
+"(let-values(((obs_164)"
 "(expand-context-observer ctx_121)))"
-"(if obs_163"
+"(if obs_164"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))"
@@ -78430,49 +78434,49 @@ static const char *startup_source =
 "(let-values(((root-module-name_1)"
 "(resolved-module-path-root-name module-name_3)))"
 "(let-values(((compiled-submodule_0)"
-"(let-values(((temp692_0)"
+"(let-values(((temp696_0)"
 "(if(expanded+parsed? submod_5)"
 "(expanded+parsed-parsed submod_5)"
 " submod_5))"
-"((temp693_0)"
-"(let-values(((ns698_0) ns_131)"
-"((self699_0) self_41)"
-"((temp700_0)"
+"((temp697_0)"
+"(let-values(((ns702_0) ns_131)"
+"((self703_0) self_41)"
+"((temp704_0)"
 "(1/resolved-module-path-name"
 " module-name_3)))"
 "(make-compile-context14.1"
-" temp700_0"
+" temp704_0"
 " #t"
 " #f"
 " #f"
-" self699_0"
+" self703_0"
 " #t"
-" ns698_0"
+" ns702_0"
 " #t"
 " #f"
 " #f"
 " #f"
 " #f)))"
-"((temp694_0) #t)"
-"((temp695_0)"
+"((temp698_0) #t)"
+"((temp699_0)"
 "(expand-context-for-serializable?"
 " ctx_121))"
-"((modules-being-compiled696_0)"
+"((modules-being-compiled700_0)"
 " modules-being-compiled_8)"
-"((temp697_0) #f))"
+"((temp701_0) #f))"
 "(compile-module13.1"
-" temp694_0"
+" temp698_0"
 " #t"
-" modules-being-compiled696_0"
+" modules-being-compiled700_0"
 " #t"
-" temp697_0"
+" temp701_0"
 " #t"
-" temp695_0"
+" temp699_0"
 " #t"
 " #f"
 " #f"
-" temp692_0"
-" temp693_0))))"
+" temp696_0"
+" temp697_0))))"
 "(begin"
 "(hash-set!"
 " compiled-submodules_5"
@@ -78487,27 +78491,27 @@ static const char *startup_source =
 " 1/current-module-declare-name"
 "(1/make-resolved-module-path root-module-name_1))"
 "(let-values()"
-"(let-values(((compiled-submodule701_0)"
+"(let-values(((compiled-submodule705_0)"
 " compiled-submodule_0)"
-"((temp702_0) #f))"
+"((temp706_0) #f))"
 "(eval-module8.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp702_0"
+" temp706_0"
 " #t"
-" compiled-submodule701_0))))"
+" compiled-submodule705_0))))"
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_124)"
+"(let-values(((obs_165)"
 "(expand-context-observer ctx_121)))"
-"(if obs_124"
+"(if obs_165"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_124"
+" obs_165"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))))"
@@ -78517,15 +78521,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((the-struct_123) submod_5))"
 "(if(expanded+parsed? the-struct_123)"
-"(let-values(((parsed703_0)"
+"(let-values(((parsed707_0)"
 "(let-values(((the-struct_124)"
 "(expanded+parsed-parsed"
 " submod_5)))"
 "(if(parsed-module? the-struct_124)"
-"(let-values(((star?704_0) #t))"
+"(let-values(((star?708_0) #t))"
 "(parsed-module25.1"
 "(parsed-s the-struct_124)"
-" star?704_0"
+" star?708_0"
 "(parsed-module-name-id"
 " the-struct_124)"
 "(parsed-module-self"
@@ -78550,7 +78554,7 @@ static const char *startup_source =
 " the-struct_124)))))"
 "(expanded+parsed1.1"
 "(expanded+parsed-s the-struct_123)"
-" parsed703_0))"
+" parsed707_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                     \"expanded+parsed?\""
@@ -78558,10 +78562,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((the-struct_125) submod_5))"
 "(if(parsed-module? the-struct_125)"
-"(let-values(((star?705_0) #t))"
+"(let-values(((star?709_0) #t))"
 "(parsed-module25.1"
 "(parsed-s the-struct_125)"
-" star?705_0"
+" star?709_0"
 "(parsed-module-name-id the-struct_125)"
 "(parsed-module-self the-struct_125)"
 "(parsed-module-requires the-struct_125)"
@@ -78589,7 +78593,7 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules212"
 "(let-values(((bodys_28) bodys208_0))"
-"(let-values(((phase_169) phase209_0))"
+"(let-values(((phase_170) phase209_0))"
 "(let-values(((self_42) self210_0))"
 "(let-values(((ctx_122) ctx211_0))"
 "(let-values(((mpis-to-reset_5) mpis-to-reset200_0))"
@@ -78620,42 +78624,42 @@ static const char *startup_source =
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_27)"
-" phase_169)))"
+" phase_170)))"
 "(if(equal? tmp_70 'module)"
 "(let-values()"
-"(let-values(((body706_0)"
+"(let-values(((body710_0)"
 " body_27)"
-"((self707_0)"
+"((self711_0)"
 " self_42)"
-"((ctx708_0)"
+"((ctx712_0)"
 " ctx_122)"
-"((temp709_0)"
+"((temp713_0)"
 " #f)"
-"((mpis-to-reset710_0)"
+"((mpis-to-reset714_0)"
 " mpis-to-reset_5)"
-"((declared-submodule-names711_0)"
+"((declared-submodule-names715_0)"
 " declared-submodule-names_9)"
-"((compiled-submodules712_0)"
+"((compiled-submodules716_0)"
 " compiled-submodules_6)"
-"((modules-being-compiled713_0)"
+"((modules-being-compiled717_0)"
 " modules-being-compiled_9))"
 "(expand-submodule197.1"
-" compiled-submodules712_0"
-" declared-submodule-names711_0"
+" compiled-submodules716_0"
+" declared-submodule-names715_0"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp709_0"
+" temp713_0"
 " #f"
 " #f"
-" modules-being-compiled713_0"
-" mpis-to-reset710_0"
-" body706_0"
-" self707_0"
-" ctx708_0)))"
+" modules-being-compiled717_0"
+" mpis-to-reset714_0"
+" body710_0"
+" self711_0"
+" ctx712_0)))"
 "(let-values() body_27))))"
 " fold-var_395))))"
 "(values fold-var_396)))))"
@@ -78676,84 +78680,84 @@ 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_907 phase_170)"
-"(let-values(((ok?_91 #%require714_0 req715_0)"
-"(let-values(((s_908)(syntax-disarm$1 s_907)))"
-"(let-values(((orig-s_95) s_908))"
-"(let-values(((#%require714_1 req715_1)"
-"(let-values(((s_909)"
-"(if(syntax?$1 s_908)(syntax-e$1 s_908) s_908)))"
-"(if(pair? s_909)"
-"(let-values(((#%require716_0)"
-"(let-values(((s_910)(car s_909))) s_910))"
-"((req717_0)"
-"(let-values(((s_911)(cdr s_909)))"
+"(lambda(s_910 phase_171)"
+"(let-values(((ok?_91 #%require718_0 req719_0)"
+"(let-values(((s_911)(syntax-disarm$1 s_910)))"
+"(let-values(((orig-s_95) s_911))"
+"(let-values(((#%require718_1 req719_1)"
 "(let-values(((s_912)"
-"(if(syntax?$1 s_911)"
-"(syntax-e$1 s_911)"
-" s_911)))"
+"(if(syntax?$1 s_911)(syntax-e$1 s_911) s_911)))"
 "(if(pair? s_912)"
-"(let-values(((req718_0)"
-"(let-values(((s_913)"
-"(car s_912)))"
-" s_913))"
-"(()"
-"(let-values(((s_914)"
-"(cdr s_912)))"
+"(let-values(((#%require720_0)"
+"(let-values(((s_913)(car s_912))) s_913))"
+"((req721_0)"
+"(let-values(((s_914)(cdr s_912)))"
 "(let-values(((s_915)"
-"(if(syntax?$1"
-" s_914)"
-"(syntax-e$1"
-" s_914)"
+"(if(syntax?$1 s_914)"
+"(syntax-e$1 s_914)"
 " s_914)))"
-"(if(null? s_915)"
+"(if(pair? s_915)"
+"(let-values(((req722_0)"
+"(let-values(((s_916)"
+"(car s_915)))"
+" s_916))"
+"(()"
+"(let-values(((s_917)"
+"(cdr s_915)))"
+"(let-values(((s_918)"
+"(if(syntax?$1"
+" s_917)"
+"(syntax-e$1"
+" s_917)"
+" s_917)))"
+"(if(null? s_918)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                               \"bad syntax\""
 " orig-s_95))))))"
-"(values req718_0))"
+"(values req722_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                           \"bad syntax\""
 " orig-s_95))))))"
-"(values #%require716_0 req717_0))"
+"(values #%require720_0 req721_0))"
 "                                                      (raise-syntax-error$1 #f \"bad syntax\" orig-s_95)))))"
-"(values #t #%require714_1 req715_1))))))"
-"(let-values(((temp719_0)(list req715_0))"
-"((s720_0) s_907)"
-"((self721_0) self_43)"
-"((m-ns722_0) m-ns_23)"
-"((phase723_0) phase_170)"
-"((phase724_0) phase_170)"
-"((requires+provides725_0) requires+provides_14)"
-"((declared-submodule-names726_0) declared-submodule-names_10)"
-"((temp727_0) 'require))"
+"(values #t #%require718_1 req719_1))))))"
+"(let-values(((temp723_0)(list req719_0))"
+"((s724_0) s_910)"
+"((self725_0) self_43)"
+"((m-ns726_0) m-ns_23)"
+"((phase727_0) phase_171)"
+"((phase728_0) phase_171)"
+"((requires+provides729_0) requires+provides_14)"
+"((declared-submodule-names730_0) declared-submodule-names_10)"
+"((temp731_0) 'require))"
 "(parse-and-perform-requires!30.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" declared-submodule-names726_0"
+" declared-submodule-names730_0"
 " #t"
 " #f"
 " #f"
-" phase724_0"
+" phase728_0"
 " #t"
 " #f"
 " #f"
-" self721_0"
+" self725_0"
 " #t"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp727_0"
-" temp719_0"
-" s720_0"
-" m-ns722_0"
-" phase723_0"
-" requires+provides725_0))))))))))))"
+" temp731_0"
+" temp723_0"
+" s724_0"
+" m-ns726_0"
+" phase727_0"
+" requires+provides729_0))))))))))))"
 "(define-values"
 "(defn-extract-syntax)"
 "(lambda(defn_0)"
@@ -78795,15 +78799,15 @@ static const char *startup_source =
 "(log-lifted-defns)"
 "(lambda(partial-body-ctx_2 lifted-defns_3 exp-body_10 rest-bodys_4)"
 "(begin"
-"(let-values(((obs_164)(expand-context-observer partial-body-ctx_2)))"
-"(if obs_164"
+"(let-values(((obs_166)(expand-context-observer partial-body-ctx_2)))"
+"(if obs_166"
 "(let-values()"
 "(let-values(((s-lifted-defns_0)(lifted-defns-extract-syntax lifted-defns_3)))"
 "(let-values((()"
 "(begin"
-"(call-expand-observe obs_164 'rename-list(cons exp-body_10 rest-bodys_4))"
+"(call-expand-observe obs_166 'rename-list(cons exp-body_10 rest-bodys_4))"
 "(values))))"
-"(let-values((()(begin(call-expand-observe obs_164 'module-lift-loop s-lifted-defns_0)(values))))"
+"(let-values((()(begin(call-expand-observe obs_166 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
 "(let-values(((lst_458) s-lifted-defns_0))"
@@ -78825,40 +78829,40 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(let-values(((ok?_92"
-" define-values732_0"
-" _733_0)"
-"(let-values(((s_916)"
+" define-values736_0"
+" _737_0)"
+"(let-values(((s_919)"
 " s-lifted-defn_0))"
 "(let-values(((orig-s_96)"
-" s_916))"
-"(let-values(((define-values732_1"
-" _733_1)"
-"(let-values(((s_917)"
-"(if(syntax?$1"
-" s_916)"
-"(syntax-e$1"
-" s_916)"
-" s_916)))"
-"(if(pair?"
-" s_917)"
-"(let-values(((define-values734_0)"
-"(let-values(((s_918)"
-"(car"
-" s_917)))"
-" s_918))"
-"((_735_0)"
-"(let-values(((s_919)"
-"(cdr"
-" s_917)))"
+" s_919))"
+"(let-values(((define-values736_1"
+" _737_1)"
 "(let-values(((s_920)"
 "(if(syntax?$1"
 " s_919)"
 "(syntax-e$1"
 " s_919)"
 " s_919)))"
+"(if(pair?"
+" s_920)"
+"(let-values(((define-values738_0)"
+"(let-values(((s_921)"
+"(car"
+" s_920)))"
+" s_921))"
+"((_739_0)"
+"(let-values(((s_922)"
+"(cdr"
+" s_920)))"
+"(let-values(((s_923)"
+"(if(syntax?$1"
+" s_922)"
+"(syntax-e$1"
+" s_922)"
+" s_922)))"
 "(let-values(((flat-s_64)"
 "(to-syntax-list.1"
-" s_920)))"
+" s_923)))"
 "(if(not"
 " flat-s_64)"
 "(let-values()"
@@ -78869,56 +78873,56 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_64)))))))"
 "(values"
-" define-values734_0"
-" _735_0))"
+" define-values738_0"
+" _739_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                         \"bad syntax\""
 " orig-s_96)))))"
 "(values"
 " #t"
-" define-values732_1"
-" _733_1))))))"
+" define-values736_1"
+" _737_1))))))"
 "(begin"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'next)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'visit"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'resolve"
-" define-values732_0)"
+" define-values736_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'prim-stop)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'exit-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'return"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'rename-one"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'prim-define-values)"
 "(call-expand-observe"
-" obs_164"
+" obs_166"
 " 'exit-prim"
 " s-lifted-defn_0))))"
 "(values)))))"
@@ -78929,52 +78933,52 @@ static const char *startup_source =
 " lst_458)))"
 "(values))))"
 "(let-values()"
-"(let-values(((ok?_93 form-id728_0 _729_0)"
-"(let-values(((s_921) exp-body_10))"
-"(let-values(((orig-s_97) s_921))"
-"(let-values(((form-id728_1 _729_1)"
-"(let-values(((s_922)"
-"(if(syntax?$1 s_921)(syntax-e$1 s_921) s_921)))"
-"(if(pair? s_922)"
-"(let-values(((form-id730_0)"
-"(let-values(((s_923)(car s_922))) s_923))"
-"((_731_0)"
-"(let-values(((s_924)(cdr s_922))) s_924)))"
-"(values form-id730_0 _731_0))"
+"(let-values(((ok?_93 form-id732_0 _733_0)"
+"(let-values(((s_924) exp-body_10))"
+"(let-values(((orig-s_97) s_924))"
+"(let-values(((form-id732_1 _733_1)"
+"(let-values(((s_925)"
+"(if(syntax?$1 s_924)(syntax-e$1 s_924) s_924)))"
+"(if(pair? s_925)"
+"(let-values(((form-id734_0)"
+"(let-values(((s_926)(car s_925))) s_926))"
+"((_735_0)"
+"(let-values(((s_927)(cdr s_925))) s_927)))"
+"(values form-id734_0 _735_0))"
 "                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))"
-"(values #t form-id728_1 _729_1))))))"
+"(values #t form-id732_1 _733_1))))))"
 "(begin"
-"(call-expand-observe obs_164 'next)"
-"(call-expand-observe obs_164 'visit exp-body_10)"
-"(call-expand-observe obs_164 'resolve form-id728_0)"
-"(call-expand-observe obs_164 'enter-prim exp-body_10)"
-"(call-expand-observe obs_164 'prim-stop)"
-"(call-expand-observe obs_164 'exit-prim exp-body_10)"
-"(call-expand-observe obs_164 'return exp-body_10)))))))))"
+"(call-expand-observe obs_166 'next)"
+"(call-expand-observe obs_166 'visit exp-body_10)"
+"(call-expand-observe obs_166 'resolve form-id732_0)"
+"(call-expand-observe obs_166 'enter-prim exp-body_10)"
+"(call-expand-observe obs_166 'prim-stop)"
+"(call-expand-observe obs_166 'exit-prim exp-body_10)"
+"(call-expand-observe obs_166 'return exp-body_10)))))))))"
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
 "(lambda(ctx_123 defn_1)"
 "(begin"
-"(let-values(((obs_165)(expand-context-observer ctx_123)))"
-"(if obs_165"
+"(let-values(((obs_167)(expand-context-observer ctx_123)))"
+"(if obs_167"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
-"(let-values(((ok?_94 define-values736_0 _737_0)"
-"(let-values(((s_925) s-defn_0))"
-"(let-values(((orig-s_98) s_925))"
-"(let-values(((define-values736_1 _737_1)"
-"(let-values(((s_926)(if(syntax?$1 s_925)(syntax-e$1 s_925) s_925)))"
-"(if(pair? s_926)"
-"(let-values(((define-values738_0)"
-"(let-values(((s_927)(car s_926))) s_927))"
-"((_739_0)"
-"(let-values(((s_928)(cdr s_926)))"
-"(let-values(((s_929)"
-"(if(syntax?$1 s_928)"
-"(syntax-e$1 s_928)"
-" s_928)))"
-"(let-values(((flat-s_65)(to-syntax-list.1 s_929)))"
+"(let-values(((ok?_94 define-values740_0 _741_0)"
+"(let-values(((s_928) s-defn_0))"
+"(let-values(((orig-s_98) s_928))"
+"(let-values(((define-values740_1 _741_1)"
+"(let-values(((s_929)(if(syntax?$1 s_928)(syntax-e$1 s_928) s_928)))"
+"(if(pair? s_929)"
+"(let-values(((define-values742_0)"
+"(let-values(((s_930)(car s_929))) s_930))"
+"((_743_0)"
+"(let-values(((s_931)(cdr s_929)))"
+"(let-values(((s_932)"
+"(if(syntax?$1 s_931)"
+"(syntax-e$1 s_931)"
+" s_931)))"
+"(let-values(((flat-s_65)(to-syntax-list.1 s_932)))"
 "(if(not flat-s_65)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -78982,28 +78986,28 @@ static const char *startup_source =
 "                                                                           \"bad syntax\""
 " orig-s_98))"
 "(let-values() flat-s_65)))))))"
-"(values define-values738_0 _739_0))"
+"(values define-values742_0 _743_0))"
 "                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
-"(values #t define-values736_1 _737_1))))))"
+"(values #t define-values740_1 _741_1))))))"
 "(begin"
-"(call-expand-observe obs_165 'visit s-defn_0)"
-"(call-expand-observe obs_165 'resolve define-values736_0)"
-"(call-expand-observe obs_165 'enter-prim s-defn_0)"
-"(call-expand-observe obs_165 'prim-define-values)))))"
+"(call-expand-observe obs_167 'visit s-defn_0)"
+"(call-expand-observe obs_167 'resolve define-values740_0)"
+"(call-expand-observe obs_167 'enter-prim s-defn_0)"
+"(call-expand-observe obs_167 'prim-define-values)))))"
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
 "(lambda(ctx_124 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_166)(expand-context-observer ctx_124)))"
-"(if obs_166"
+"(let-values(((obs_168)(expand-context-observer ctx_124)))"
+"(if obs_168"
 "(let-values()"
 "(let-values(((s-defn_1)"
 "(datum->syntax$1"
 " #f"
 "(list 'define-values(semi-parsed-define-values-ids defn_2) exp-rhs_8)"
 "(semi-parsed-define-values-s defn_2))))"
-"(begin(call-expand-observe obs_166 'exit-prim s-defn_1)(call-expand-observe obs_166 'return s-defn_1))))"
+"(begin(call-expand-observe obs_168 'exit-prim s-defn_1)(call-expand-observe obs_168 'return s-defn_1))))"
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
@@ -79084,9 +79088,9 @@ static const char *startup_source =
 "(lambda(s_0 ctx_7)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_7)))"
-"(if obs_167"
-"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-values)))"
+"(let-values(((obs_169)(expand-context-observer ctx_7)))"
+"(if obs_169"
+"(let-values()(let-values()(call-expand-observe obs_169 'prim-define-values)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -79251,8 +79255,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_168)(expand-context-observer ctx_126)))"
-"(if obs_168(let-values()(let-values()(call-expand-observe obs_168 'prepare-env)))(void)))"
+"(let-values(((obs_170)(expand-context-observer ctx_126)))"
+"(if obs_170(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -79268,7 +79272,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_930)(car s_22))) s_930))"
+"(let-values(((s_933)(car s_22))) s_933))"
 "((id19_1 rhs20_0)"
 "(let-values(((s_25)(cdr s_22)))"
 "(let-values(((s_500)"
@@ -79277,11 +79281,11 @@ static const char *startup_source =
 " s_25)))"
 "(if(pair? s_500)"
 "(let-values(((id21_0)"
-"(let-values(((s_931)(car s_500)))"
+"(let-values(((s_934)(car s_500)))"
 "(let-values(((s_90)"
-"(if(syntax?$1 s_931)"
-"(syntax-e$1 s_931)"
-" s_931)))"
+"(if(syntax?$1 s_934)"
+"(syntax-e$1 s_934)"
+" s_934)))"
 "(let-values(((flat-s_67)"
 "(to-syntax-list.1"
 " s_90)))"
@@ -79309,7 +79313,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_461)"
-"(let-values(((s_932)"
+"(let-values(((s_935)"
 "(unsafe-car"
 " lst_461))"
 "((rest_263)"
@@ -79324,21 +79328,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_210)"
 "(if(syntax?$1"
-" s_932)"
+" s_935)"
 "(symbol?"
 "(syntax-e$1"
-" s_932))"
+" s_935))"
 " #f)))"
 "(if or-part_210"
 " or-part_210"
 "(symbol?"
-" s_932)))"
-" s_932"
+" s_935)))"
+" s_935"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                            \"not an identifier\""
 " orig-s_100"
-" s_932)))))"
+" s_935)))))"
 "(cons"
 " id24_1"
 " id_168)))))"
@@ -79416,10 +79420,10 @@ static const char *startup_source =
 "                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_483)))"
 "(values))))"
 "(let-values(((ok?_37 begin-for-syntax29_0 form30_0)"
-"(let-values(((s_933) s_483))"
-"(let-values(((orig-s_101) s_933))"
+"(let-values(((s_936) s_483))"
+"(let-values(((orig-s_101) s_936))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
-"(let-values(((s_49)(if(syntax?$1 s_933)(syntax-e$1 s_933) s_933)))"
+"(let-values(((s_49)(if(syntax?$1 s_936)(syntax-e$1 s_936) s_936)))"
 "(if(pair? s_49)"
 "(let-values(((begin-for-syntax31_0)(let-values(((s_51)(car s_49))) s_51))"
 "((form32_0)"
@@ -79436,16 +79440,16 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_127)))"
-"(if obs_169"
-"(let-values()(let-values()(call-expand-observe obs_169 'prim-begin-for-syntax)))"
+"(let-values(((obs_171)(expand-context-observer ctx_127)))"
+"(if obs_171"
+"(let-values()(let-values()(call-expand-observe obs_171 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_170)(expand-context-observer ctx_127)))"
-"(if obs_170"
-"(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))"
+"(let-values(((obs_172)(expand-context-observer ctx_127)))"
+"(if obs_172"
+"(let-values()(let-values()(call-expand-observe obs_172 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values(((trans-ctx_1)"
@@ -79521,13 +79525,13 @@ static const char *startup_source =
 " 'loop"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)"
+"(let-values(((obs_173)"
 "(expand-context-observer ctx_127)))"
-"(if obs_171"
+"(if obs_173"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_171"
+" obs_173"
 " 'enter-list"
 "(datum->syntax$1 #f form30_0 s_483))))"
 "(void)))"
@@ -79543,14 +79547,14 @@ static const char *startup_source =
 "(reverse$1"
 " accum_1)))"
 "(begin"
-"(let-values(((obs_172)"
+"(let-values(((obs_174)"
 "(expand-context-observer"
 " ctx_127)))"
-"(if obs_172"
+"(if obs_174"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_172"
+" obs_174"
 " 'exit-list"
 "(datum->syntax$1"
 " #f"
@@ -79753,8 +79757,8 @@ static const char *startup_source =
 " '#%provide"
 "(lambda(s_786 ctx_129)"
 "(begin"
-"(let-values(((obs_173)(expand-context-observer ctx_129)))"
-"(if obs_173(let-values()(let-values()(call-expand-observe obs_173 'prim-provide)))(void)))"
+"(let-values(((obs_175)(expand-context-observer ctx_129)))"
+"(if obs_175(let-values()(let-values()(call-expand-observe obs_175 'prim-provide)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_786)))))"
 "(define-values(ns)(make-namespace))"
 "(void"