diff --git a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
index a986631f7f..3c642db05c 100644
--- a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
+++ b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
@@ -377,6 +377,14 @@ If @racket[opaque-only?] is true, then the first result is @racket[#f]
 instead of the expanded expression. Obtaining only the second, opaque
 result can be more efficient in some expansion contexts.
 
+Unlike @racket[local-expand], @racket[syntax-local-expand-expression]
+normally produces an expanded expression that contains no
+@racket[#%expression] forms. However, if
+@racket[syntax-local-expand-expression] is used within an expansion
+that is triggered by an enclosing @racket[local-expand] call, then the
+result of @racket[syntax-local-expand-expression] can include
+@racket[#%expression] forms.
+
 @transform-time[]
 
 @history[#:changed "6.90.0.13" @elem{Added the @racket[opaque-only?] argument.}]}
diff --git a/pkgs/racket-test-core/tests/racket/macro.rktl b/pkgs/racket-test-core/tests/racket/macro.rktl
index 1072ceba1c..ff7b58700a 100644
--- a/pkgs/racket-test-core/tests/racket/macro.rktl
+++ b/pkgs/racket-test-core/tests/racket/macro.rktl
@@ -1951,6 +1951,23 @@
 
 (test '(#f value) dynamic-require ''internal-definition-context-introduce-always-adds-scope 'result)
 
+
+;; ----------------------------------------
+;; Make sure `#%expression` doesn't appear in fully
+;; expanded forms
+
+(let ([stx (expand '(module m racket/base
+                      (require racket/class)
+                      (define c
+                        (class object%
+                          (super-new)))))])
+  (test #f 'any-#%expression? (let loop ([e stx])
+                                (cond
+                                  [(eq? e '#%expression) #t]
+                                  [(syntax? e) (loop (syntax-e e))]
+                                  [(pair? e) (or (loop (car e)) (loop (cdr e)))]
+                                  [else #f]))))
+
 ;; ----------------------------------------
 
 (report-errs)
diff --git a/racket/src/expander/expand/context.rkt b/racket/src/expander/expand/context.rkt
index 2b7bd53237..bdb41d0680 100644
--- a/racket/src/expander/expand/context.rkt
+++ b/racket/src/expander/expand/context.rkt
@@ -53,6 +53,7 @@
           * need-eventually-defined ; phase(>=1) -> variables expanded before binding
           allow-unbound? ; allow reference to unbound identifiers as variables
           in-local-expand? ; #t via `local-expand`
+          keep-#%expression? ; if `in-local-expand?`, keep `#%expression` forms
           stops      ; free-id-set; non-empty => `def-ctx-scopes` is a box
           * current-introduction-scopes ; scopes for current macro expansion
           declared-submodule-names ; mutable hash table: symbol -> 'module or 'module*
@@ -98,6 +99,7 @@
                   #f   ; need-eventually-defined
                   #t   ; allow-unbound?
                   #f   ; in-local-expand?
+                  #f   ; keep-#%expression?
                   empty-free-id-set ; stops
                   null ; current-introduction-scopes
                   #hasheq() ; declared-submodule-names
diff --git a/racket/src/expander/expand/definition-context.rkt b/racket/src/expander/expand/definition-context.rkt
index 30a01c7b38..21c0b5f163 100644
--- a/racket/src/expander/expand/definition-context.rkt
+++ b/racket/src/expander/expand/definition-context.rkt
@@ -218,7 +218,8 @@
                                    #:intdefs intdefs
                                    #:stop-ids [stop-ids #f]
                                    #:to-parsed-ok? [to-parsed-ok? #f]
-                                   #:track-to-be-defined? [track-to-be-defined? #f])
+                                   #:track-to-be-defined? [track-to-be-defined? #f]
+                                   #:keep-#%expression? [keep-#%expression? #t])
   (define same-kind? (or (eq? context
                               (expand-context-context ctx))
                          (and (list? context)
@@ -270,6 +271,7 @@
                                 #f)]
                 [just-once? #f]
                 [in-local-expand? #t]
+                [keep-#%expression? keep-#%expression?]
                 [stops (free-id-set phase (or all-stop-ids null))]
                 [current-introduction-scopes null]
                 [need-eventually-defined (let ([ht (expand-context-need-eventually-defined ctx)])
diff --git a/racket/src/expander/expand/expr.rkt b/racket/src/expander/expand/expr.rkt
index 5e5952e77b..d9eb417e9d 100644
--- a/racket/src/expander/expand/expr.rkt
+++ b/racket/src/expander/expand/expr.rkt
@@ -755,15 +755,17 @@
                                                  #:wrt ctx)))
    (if (expand-context-to-parsed? ctx)
        exp-e
-       (case (and (not (expand-context-in-local-expand? ctx))
-                  (expand-context-context ctx))
-         [(expression)
+       (cond
+         [(or (and (expand-context-in-local-expand? ctx)
+                   (expand-context-keep-#%expression? ctx))
+              (eq? 'top-level (expand-context-context ctx)))
+          (rebuild
+           rebuild-s
+           `(,(m '#%expression) ,exp-e))]
+         [else
           (define result-s (syntax-track-origin exp-e rebuild-s))
           (log-expand ctx 'tag result-s)
-          result-s]
-         [else (rebuild
-                rebuild-s
-                `(,(m '#%expression) ,exp-e))]))))
+          result-s]))))
 
 ;; ----------------------------------------
 
diff --git a/racket/src/expander/expand/local-expand.rkt b/racket/src/expander/expand/local-expand.rkt
index 4e97d6bc55..e1621e5f26 100644
--- a/racket/src/expander/expand/local-expand.rkt
+++ b/racket/src/expander/expand/local-expand.rkt
@@ -44,7 +44,8 @@
   (define exp-s (do-local-expand 'syntax-local-expand-expression s 'expression null #f
                                  #:to-parsed-ok? opaque-only?
                                  #:skip-log-exit? #t
-                                 #:track-to-be-defined? #t))
+                                 #:track-to-be-defined? #t
+                                 #:keep-#%expression? #f))
   (define ctx (get-current-expand-context))
   ;; Move introduction scope from the already-expanded syntax object to
   ;; its wrapper. The expander will later check that the wrapper ends up
@@ -67,6 +68,7 @@
                          #:capture-lifts? [capture-lifts? #f]
                          #:as-transformer? [as-transformer? #f]
                          #:to-parsed-ok? [to-parsed-ok? #f]
+                         #:keep-#%expression? [keep-#%expression? #t]
                          #:lift-key [lift-key (and (or capture-lifts?
                                                        as-transformer?)
                                                    (generate-lift-key))]
@@ -102,6 +104,9 @@
                                                 #:intdefs intdefs
                                                 #:stop-ids stop-ids
                                                 #:to-parsed-ok? to-parsed-ok?
+                                                #:keep-#%expression? (or keep-#%expression?
+                                                                         (and (expand-context-in-local-expand? ctx)
+                                                                              (expand-context-keep-#%expression? ctx)))
                                                 #:track-to-be-defined? track-to-be-defined?))
 
    (namespace-visit-available-modules! (expand-context-namespace ctx) phase)
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index e1a58c159c..5187ac42c2 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -15182,6 +15182,7 @@ static const char *startup_source =
 " expand-context/inner-module-begin-k"
 " expand-context/inner-allow-unbound?"
 " expand-context/inner-in-local-expand?"
+" expand-context/inner-keep-#%expression?"
 " expand-context/inner-stops"
 " expand-context/inner-declared-submodule-names"
 " expand-context/inner-lifts"
@@ -15199,13 +15200,13 @@ static const char *startup_source =
 "(make-struct-type"
 " 'expand-context/inner"
 " struct:root-expand-context/inner"
-" 18"
+" 19"
 " 0"
 " #f"
 "(list(cons prop:authentic #t))"
 "(current-inspector)"
 " #f"
-" '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)"
+" '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18)"
 " #f"
 " 'expand-context/inner)))))"
 "(values"
@@ -15219,17 +15220,18 @@ static const char *startup_source =
 "(make-struct-field-accessor -ref_39 4 'module-begin-k)"
 "(make-struct-field-accessor -ref_39 5 'allow-unbound?)"
 "(make-struct-field-accessor -ref_39 6 'in-local-expand?)"
-"(make-struct-field-accessor -ref_39 7 'stops)"
-"(make-struct-field-accessor -ref_39 8 'declared-submodule-names)"
-"(make-struct-field-accessor -ref_39 9 'lifts)"
-"(make-struct-field-accessor -ref_39 10 'lift-envs)"
-"(make-struct-field-accessor -ref_39 11 'module-lifts)"
-"(make-struct-field-accessor -ref_39 12 'require-lifts)"
-"(make-struct-field-accessor -ref_39 13 'to-module-lifts)"
-"(make-struct-field-accessor -ref_39 14 'requires+provides)"
-"(make-struct-field-accessor -ref_39 15 'observer)"
-"(make-struct-field-accessor -ref_39 16 'for-serializable?)"
-"(make-struct-field-accessor -ref_39 17 'should-not-encounter-macros?))))"
+"(make-struct-field-accessor -ref_39 7 'keep-#%expression?)"
+"(make-struct-field-accessor -ref_39 8 'stops)"
+"(make-struct-field-accessor -ref_39 9 'declared-submodule-names)"
+"(make-struct-field-accessor -ref_39 10 'lifts)"
+"(make-struct-field-accessor -ref_39 11 'lift-envs)"
+"(make-struct-field-accessor -ref_39 12 'module-lifts)"
+"(make-struct-field-accessor -ref_39 13 'require-lifts)"
+"(make-struct-field-accessor -ref_39 14 'to-module-lifts)"
+"(make-struct-field-accessor -ref_39 15 'requires+provides)"
+"(make-struct-field-accessor -ref_39 16 'observer)"
+"(make-struct-field-accessor -ref_39 17 'for-serializable?)"
+"(make-struct-field-accessor -ref_39 18 'should-not-encounter-macros?))))"
 "(define-values"
 "(expand-context/make)"
 "(lambda(self-mpi_2"
@@ -15258,6 +15260,7 @@ static const char *startup_source =
 " need-eventually-defined_0"
 " allow-unbound?_0"
 " in-local-expand?_0"
+" keep-#%expression?_0"
 " stops_0"
 " current-introduction-scopes_0"
 " declared-submodule-names_0"
@@ -15288,6 +15291,7 @@ static const char *startup_source =
 " module-begin-k_0"
 " allow-unbound?_0"
 " in-local-expand?_0"
+" keep-#%expression?_0"
 " stops_0"
 " declared-submodule-names_0"
 " lifts_0"
@@ -15354,38 +15358,41 @@ static const char *startup_source =
 "(expand-context-in-local-expand?)"
 "(lambda(v_115)(begin(expand-context/inner-in-local-expand?(root-expand-context/outer-inner v_115)))))"
 "(define-values"
+"(expand-context-keep-#%expression?)"
+"(lambda(v_116)(begin(expand-context/inner-keep-#%expression?(root-expand-context/outer-inner v_116)))))"
+"(define-values"
 "(expand-context-stops)"
-"(lambda(v_116)(begin(expand-context/inner-stops(root-expand-context/outer-inner v_116)))))"
+"(lambda(v_117)(begin(expand-context/inner-stops(root-expand-context/outer-inner v_117)))))"
 "(define-values"
 "(expand-context-declared-submodule-names)"
-"(lambda(v_117)(begin(expand-context/inner-declared-submodule-names(root-expand-context/outer-inner v_117)))))"
+"(lambda(v_118)(begin(expand-context/inner-declared-submodule-names(root-expand-context/outer-inner v_118)))))"
 "(define-values"
 "(expand-context-lifts)"
-"(lambda(v_118)(begin(expand-context/inner-lifts(root-expand-context/outer-inner v_118)))))"
+"(lambda(v_119)(begin(expand-context/inner-lifts(root-expand-context/outer-inner v_119)))))"
 "(define-values"
 "(expand-context-lift-envs)"
-"(lambda(v_119)(begin(expand-context/inner-lift-envs(root-expand-context/outer-inner v_119)))))"
+"(lambda(v_120)(begin(expand-context/inner-lift-envs(root-expand-context/outer-inner v_120)))))"
 "(define-values"
 "(expand-context-module-lifts)"
-"(lambda(v_120)(begin(expand-context/inner-module-lifts(root-expand-context/outer-inner v_120)))))"
+"(lambda(v_121)(begin(expand-context/inner-module-lifts(root-expand-context/outer-inner v_121)))))"
 "(define-values"
 "(expand-context-require-lifts)"
-"(lambda(v_121)(begin(expand-context/inner-require-lifts(root-expand-context/outer-inner v_121)))))"
+"(lambda(v_122)(begin(expand-context/inner-require-lifts(root-expand-context/outer-inner v_122)))))"
 "(define-values"
 "(expand-context-to-module-lifts)"
-"(lambda(v_122)(begin(expand-context/inner-to-module-lifts(root-expand-context/outer-inner v_122)))))"
+"(lambda(v_123)(begin(expand-context/inner-to-module-lifts(root-expand-context/outer-inner v_123)))))"
 "(define-values"
 "(expand-context-requires+provides)"
-"(lambda(v_123)(begin(expand-context/inner-requires+provides(root-expand-context/outer-inner v_123)))))"
+"(lambda(v_124)(begin(expand-context/inner-requires+provides(root-expand-context/outer-inner v_124)))))"
 "(define-values"
 "(expand-context-observer)"
-"(lambda(v_124)(begin(expand-context/inner-observer(root-expand-context/outer-inner v_124)))))"
+"(lambda(v_125)(begin(expand-context/inner-observer(root-expand-context/outer-inner v_125)))))"
 "(define-values"
 "(expand-context-for-serializable?)"
-"(lambda(v_125)(begin(expand-context/inner-for-serializable?(root-expand-context/outer-inner v_125)))))"
+"(lambda(v_126)(begin(expand-context/inner-for-serializable?(root-expand-context/outer-inner v_126)))))"
 "(define-values"
 "(expand-context-should-not-encounter-macros?)"
-"(lambda(v_126)(begin(expand-context/inner-should-not-encounter-macros?(root-expand-context/outer-inner v_126)))))"
+"(lambda(v_127)(begin(expand-context/inner-should-not-encounter-macros?(root-expand-context/outer-inner v_127)))))"
 "(define-values"
 "(make-expand-context10.1)"
 "(lambda(for-serializable?4_0 for-serializable?7_0 observer5_0 observer8_0 to-parsed?3_0 to-parsed?6_0 ns9_0)"
@@ -15424,6 +15431,7 @@ static const char *startup_source =
 " #f"
 " #t"
 " #f"
+" #f"
 " empty-free-id-set"
 " null"
 " '#hasheq()"
@@ -15441,15 +15449,15 @@ static const char *startup_source =
 "(copy-root-expand-context)"
 "(lambda(ctx_1 root-ctx_2)"
 "(begin"
-"(let-values(((v_127) ctx_1))"
-"(let-values(((the-struct_39) v_127))"
+"(let-values(((v_128) ctx_1))"
+"(let-values(((the-struct_39) v_128))"
 "(if(expand-context/outer? the-struct_39)"
 "(let-values(((post-expansion-scope28_0)(root-expand-context-post-expansion-scope root-ctx_2))"
 "((use-site-scopes29_0)(root-expand-context-use-site-scopes root-ctx_2))"
 "((frame-id30_1)(root-expand-context-frame-id root-ctx_2))"
 "((binding-layer31_0)(root-expand-context-frame-id root-ctx_2))"
 "((inner32_0)"
-"(let-values(((the-struct_40)(root-expand-context/outer-inner v_127)))"
+"(let-values(((the-struct_40)(root-expand-context/outer-inner v_128)))"
 "(if(expand-context/inner? the-struct_40)"
 "(let-values(((self-mpi33_0)(root-expand-context-self-mpi root-ctx_2))"
 "((module-scopes34_0)(root-expand-context-module-scopes root-ctx_2))"
@@ -15474,6 +15482,7 @@ static const char *startup_source =
 "(expand-context/inner-module-begin-k the-struct_40)"
 "(expand-context/inner-allow-unbound? the-struct_40)"
 "(expand-context/inner-in-local-expand? the-struct_40)"
+"(expand-context/inner-keep-#%expression? the-struct_40)"
 "(expand-context/inner-stops the-struct_40)"
 "(expand-context/inner-declared-submodule-names the-struct_40)"
 "(expand-context/inner-lifts the-struct_40)"
@@ -15520,14 +15529,14 @@ static const char *startup_source =
 "(current-expand-observe)"
 "(make-parameter"
 " #f"
-"(lambda(v_128)"
+"(lambda(v_129)"
 "(begin"
-"(if(let-values(((or-part_159)(not v_128)))"
-"(if or-part_159 or-part_159(if(procedure? v_128)(procedure-arity-includes? v_128 2) #f)))"
+"(if(let-values(((or-part_159)(not v_129)))"
+"(if or-part_159 or-part_159(if(procedure? v_129)(procedure-arity-includes? v_129 2) #f)))"
 "(void)"
 "(let-values()"
-"           (raise-argument-error 'current-expand-observe \"(or/c (procedure-arity-includes/c 2) #f)\" v_128)))"
-" v_128))))"
+"           (raise-argument-error 'current-expand-observe \"(or/c (procedure-arity-includes/c 2) #f)\" v_129)))"
+" v_129))))"
 "(define-values"
 "(as-expression-context)"
 "(lambda(ctx_2)"
@@ -15535,47 +15544,19 @@ static const char *startup_source =
 "(if(if(eq? 'expression(expand-context-context ctx_2))(not(expand-context-name ctx_2)) #f)"
 "(let-values() ctx_2)"
 "(let-values()"
-"(let-values(((v_129) ctx_2))"
-"(let-values(((the-struct_19) v_129))"
-"(if(expand-context/outer? the-struct_19)"
+"(let-values(((v_130) ctx_2))"
+"(let-values(((the-struct_41) v_130))"
+"(if(expand-context/outer? the-struct_41)"
 "(let-values(((context40_0) 'expression)"
 "((name41_0) #f)"
 "((post-expansion-scope42_0) #f)"
-"((inner43_0)(root-expand-context/outer-inner v_129)))"
+"((inner43_0)(root-expand-context/outer-inner v_130)))"
 "(expand-context/outer1.1"
 " inner43_0"
 " post-expansion-scope42_0"
-"(root-expand-context/outer-use-site-scopes the-struct_19)"
-"(root-expand-context/outer-frame-id the-struct_19)"
-" context40_0"
-"(expand-context/outer-env the-struct_19)"
-"(expand-context/outer-post-expansion-scope-action the-struct_19)"
-"(expand-context/outer-scopes the-struct_19)"
-"(expand-context/outer-def-ctx-scopes the-struct_19)"
-"(expand-context/outer-binding-layer the-struct_19)"
-"(expand-context/outer-reference-records the-struct_19)"
-"(expand-context/outer-only-immediate? the-struct_19)"
-"(expand-context/outer-need-eventually-defined the-struct_19)"
-"(expand-context/outer-current-introduction-scopes the-struct_19)"
-" name41_0))"
-"                (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_19)))))))))"
-"(define-values"
-"(as-begin-expression-context)"
-"(lambda(ctx_3)"
-"(begin"
-"(if(not(expand-context-name ctx_3))"
-"(let-values() ctx_3)"
-"(let-values()"
-"(let-values(((v_130) ctx_3))"
-"(let-values(((the-struct_41) v_130))"
-"(if(expand-context/outer? the-struct_41)"
-"(let-values(((name44_0) #f)((inner45_0)(root-expand-context/outer-inner v_130)))"
-"(expand-context/outer1.1"
-" inner45_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_41)"
 "(root-expand-context/outer-use-site-scopes the-struct_41)"
 "(root-expand-context/outer-frame-id the-struct_41)"
-"(expand-context/outer-context the-struct_41)"
+" context40_0"
 "(expand-context/outer-env the-struct_41)"
 "(expand-context/outer-post-expansion-scope-action the-struct_41)"
 "(expand-context/outer-scopes the-struct_41)"
@@ -15585,25 +15566,21 @@ static const char *startup_source =
 "(expand-context/outer-only-immediate? the-struct_41)"
 "(expand-context/outer-need-eventually-defined the-struct_41)"
 "(expand-context/outer-current-introduction-scopes the-struct_41)"
-" name44_0))"
+" name41_0))"
 "                (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_41)))))))))"
 "(define-values"
-"(as-tail-context23.1)"
-"(lambda(wrt20_0 ctx22_0)"
+"(as-begin-expression-context)"
+"(lambda(ctx_3)"
 "(begin"
-" 'as-tail-context23"
-"(let-values(((ctx_4) ctx22_0))"
-"(let-values(((wrt-ctx_0) wrt20_0))"
+"(if(not(expand-context-name ctx_3))"
+"(let-values() ctx_3)"
 "(let-values()"
-"(if(expand-context-name wrt-ctx_0)"
-"(let-values()"
-"(let-values(((v_131) ctx_4))"
+"(let-values(((v_131) ctx_3))"
 "(let-values(((the-struct_42) v_131))"
 "(if(expand-context/outer? the-struct_42)"
-"(let-values(((name46_0)(expand-context-name wrt-ctx_0))"
-"((inner47_0)(root-expand-context/outer-inner v_131)))"
+"(let-values(((name44_0) #f)((inner45_0)(root-expand-context/outer-inner v_131)))"
 "(expand-context/outer1.1"
-" inner47_0"
+" inner45_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_42)"
 "(root-expand-context/outer-use-site-scopes the-struct_42)"
 "(root-expand-context/outer-frame-id the-struct_42)"
@@ -15617,8 +15594,40 @@ static const char *startup_source =
 "(expand-context/outer-only-immediate? the-struct_42)"
 "(expand-context/outer-need-eventually-defined the-struct_42)"
 "(expand-context/outer-current-introduction-scopes the-struct_42)"
+" name44_0))"
+"                (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_42)))))))))"
+"(define-values"
+"(as-tail-context23.1)"
+"(lambda(wrt20_0 ctx22_0)"
+"(begin"
+" 'as-tail-context23"
+"(let-values(((ctx_4) ctx22_0))"
+"(let-values(((wrt-ctx_0) wrt20_0))"
+"(let-values()"
+"(if(expand-context-name wrt-ctx_0)"
+"(let-values()"
+"(let-values(((v_132) ctx_4))"
+"(let-values(((the-struct_21) v_132))"
+"(if(expand-context/outer? the-struct_21)"
+"(let-values(((name46_0)(expand-context-name wrt-ctx_0))"
+"((inner47_0)(root-expand-context/outer-inner v_132)))"
+"(expand-context/outer1.1"
+" inner47_0"
+"(root-expand-context/outer-post-expansion-scope the-struct_21)"
+"(root-expand-context/outer-use-site-scopes the-struct_21)"
+"(root-expand-context/outer-frame-id the-struct_21)"
+"(expand-context/outer-context the-struct_21)"
+"(expand-context/outer-env the-struct_21)"
+"(expand-context/outer-post-expansion-scope-action the-struct_21)"
+"(expand-context/outer-scopes the-struct_21)"
+"(expand-context/outer-def-ctx-scopes the-struct_21)"
+"(expand-context/outer-binding-layer the-struct_21)"
+"(expand-context/outer-reference-records the-struct_21)"
+"(expand-context/outer-only-immediate? the-struct_21)"
+"(expand-context/outer-need-eventually-defined the-struct_21)"
+"(expand-context/outer-current-introduction-scopes the-struct_21)"
 " name46_0))"
-"                      (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_42)))))"
+"                      (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_21)))))"
 "(let-values() ctx_4))))))))"
 "(define-values"
 "(as-named-context)"
@@ -15626,10 +15635,10 @@ static const char *startup_source =
 "(begin"
 "(if(if(pair? ids_1)(null?(cdr ids_1)) #f)"
 "(let-values()"
-"(let-values(((v_132) ctx_5))"
-"(let-values(((the-struct_43) v_132))"
+"(let-values(((v_133) ctx_5))"
+"(let-values(((the-struct_43) v_133))"
 "(if(expand-context/outer? the-struct_43)"
-"(let-values(((name48_0)(car ids_1))((inner49_0)(root-expand-context/outer-inner v_132)))"
+"(let-values(((name48_0)(car ids_1))((inner49_0)(root-expand-context/outer-inner v_133)))"
 "(expand-context/outer1.1"
 " inner49_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_43)"
@@ -15652,11 +15661,11 @@ static const char *startup_source =
 "(as-to-parsed-context)"
 "(lambda(ctx_6)"
 "(begin"
-"(let-values(((v_133) ctx_6))"
-"(let-values(((the-struct_44) v_133))"
+"(let-values(((v_134) ctx_6))"
+"(let-values(((the-struct_44) v_134))"
 "(if(expand-context/outer? the-struct_44)"
 "(let-values(((inner50_0)"
-"(let-values(((the-struct_45)(root-expand-context/outer-inner v_133)))"
+"(let-values(((the-struct_45)(root-expand-context/outer-inner v_134)))"
 "(if(expand-context/inner? the-struct_45)"
 "(let-values(((to-parsed?51_0) #t)"
 "((observer52_0) #f)"
@@ -15676,6 +15685,7 @@ static const char *startup_source =
 "(expand-context/inner-module-begin-k the-struct_45)"
 "(expand-context/inner-allow-unbound? the-struct_45)"
 "(expand-context/inner-in-local-expand? the-struct_45)"
+"(expand-context/inner-keep-#%expression? the-struct_45)"
 "(expand-context/inner-stops the-struct_45)"
 "(expand-context/inner-declared-submodule-names the-struct_45)"
 "(expand-context/inner-lifts the-struct_45)"
@@ -16675,7 +16685,7 @@ static const char *startup_source =
 " null"
 "(unsafe-immutable-hash-iterate-first ht_81))))))"
 "((<2_0) <)"
-"((temp3_2)(lambda(v_134)(vector-ref v_134 0))))"
+"((temp3_2)(lambda(v_135)(vector-ref v_135 0))))"
 "(sort7.1 #f #f temp3_2 #t temp1_1 <2_0)))))"
 "(define-values"
 "(raise-ambiguous-error)"
@@ -17149,12 +17159,12 @@ static const char *startup_source =
 "              (let-values (((what_2) (if what2_0 what1_0 \"binding name\")))"
 "(let-values()"
 "((letrec-values(((loop_34)"
-"(lambda(v_135 ht_82)"
+"(lambda(v_136 ht_82)"
 "(begin"
 " 'loop"
-"(if(identifier? v_135)"
+"(if(identifier? v_136)"
 "(let-values()"
-"(let-values(((l_49)(hash-ref ht_82(syntax-e$1 v_135) null)))"
+"(let-values(((l_49)(hash-ref ht_82(syntax-e$1 v_136) null)))"
 "(begin"
 "(let-values(((lst_77) l_49))"
 "(begin"
@@ -17177,7 +17187,7 @@ static const char *startup_source =
 "(let-values()"
 "(if(bound-identifier=?$1"
 " id_14"
-" v_135"
+" v_136"
 " phase_47)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -17186,7 +17196,7 @@ static const char *startup_source =
 "                                                                                                                        \"duplicate \""
 " what_2)"
 " s_190"
-" v_135))"
+" v_136))"
 "(void)))"
 "(values)))))"
 "(values)))))"
@@ -17197,9 +17207,9 @@ static const char *startup_source =
 " for-loop_97)"
 " lst_77)))"
 "(void)"
-"(hash-set ht_82(syntax-e$1 v_135)(cons v_135 l_49)))))"
-"(if(pair? v_135)"
-"(let-values()(loop_34(cdr v_135)(loop_34(car v_135) ht_82)))"
+"(hash-set ht_82(syntax-e$1 v_136)(cons v_136 l_49)))))"
+"(if(pair? v_136)"
+"(let-values()(loop_34(cdr v_136)(loop_34(car v_136) ht_82)))"
 "(let-values() ht_82)))))))"
 " loop_34)"
 " ids_2"
@@ -17495,12 +17505,12 @@ static const char *startup_source =
 "(lambda(mpis_2)"
 "(begin"
 "(let-values(((unique-list_0)"
-"(lambda(v_136)"
+"(lambda(v_137)"
 "(begin"
 " 'unique-list"
-"(if(pair? v_136)"
+"(if(pair? v_137)"
 "(reverse$1"
-"(let-values(((lst_103) v_136))"
+"(let-values(((lst_103) v_137))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -17527,7 +17537,7 @@ static const char *startup_source =
 " for-loop_114)"
 " null"
 " lst_103))))"
-" v_136)))))"
+" v_137)))))"
 "(let-values(((positions_1)(module-path-index-table-positions mpis_2)))"
 "(let-values(((gen-order_0)(make-hasheqv)))"
 "(let-values(((rev-positions_0)"
@@ -17632,7 +17642,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_95"
-"(let-values(((k_20 v_137)"
+"(let-values(((k_20 v_138)"
 "(hash-iterate-key+value ht_84 i_95)))"
 "(let-values(((table_15)"
 "(let-values(((table_121) table_120))"
@@ -17642,7 +17652,7 @@ static const char *startup_source =
 " val_38)"
 "(let-values()"
 "(values"
-" v_137"
+" v_138"
 " k_20))))"
 "(hash-set"
 " table_121"
@@ -17663,7 +17673,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                          (raise-argument-error 'for/vector \"exact-nonnegative-integer?\" len_12)))"
-"(let-values(((v_138)(make-vector len_12 0)))"
+"(let-values(((v_139)(make-vector len_12 0)))"
 "(begin"
 "(if(zero? len_12)"
 "(void)"
@@ -17687,7 +17697,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_138"
+" v_139"
 " i_98"
 "(let-values()"
 "(let-values(((mpi_27)"
@@ -17743,7 +17753,7 @@ static const char *startup_source =
 " for-loop_28)"
 " 0"
 " start_17)))))"
-" v_138))))))"
+" v_139))))))"
 "(list"
 " 'deserialize-module-path-indexes"
 "(list 'quote gens_0)"
@@ -17857,7 +17867,7 @@ static const char *startup_source =
 "(if(exact-nonnegative-integer? len_14)"
 "(void)"
 "                (let-values () (raise-argument-error 'for/vector \"exact-nonnegative-integer?\" len_14)))"
-"(let-values(((v_139)(make-vector len_14 0)))"
+"(let-values(((v_140)(make-vector len_14 0)))"
 "(begin"
 "(if(zero? len_14)"
 "(void)"
@@ -17879,7 +17889,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_139"
+" v_140"
 " i_105"
 "(let-values()"
 "(vector*-ref gen_0 p_32)))"
@@ -17894,7 +17904,7 @@ static const char *startup_source =
 " for-loop_118)"
 " 0"
 " 0)))))"
-" v_139)))))))))"
+" v_140)))))))))"
 "(define-values"
 "(mpis-as-vector)"
 "(lambda(mpis_3)"
@@ -18028,11 +18038,11 @@ static const char *startup_source =
 "(lambda(syntax-support?2_0 syntax-support?3_0 v4_0 mpis5_0)"
 "(begin"
 " 'generate-deserialize6"
-"(let-values(((v_140) v4_0))"
+"(let-values(((v_141) v4_0))"
 "(let-values(((mpis_6) mpis5_0))"
 "(let-values(((syntax-support?_0)(if syntax-support?3_0 syntax-support?2_0 #t)))"
 "(let-values()"
-"(let-values(((reachable-scopes_4)(find-reachable-scopes v_140)))"
+"(let-values(((reachable-scopes_4)(find-reachable-scopes v_141)))"
 "(let-values(((state_24)(make-serialize-state reachable-scopes_4)))"
 "(let-values(((mutables_0)(make-hasheq)))"
 "(let-values(((objs_0)(make-hasheq)))"
@@ -18041,64 +18051,64 @@ static const char *startup_source =
 "(let-values(((frontier_0) null))"
 "(letrec-values(((add-frontier!_0)"
 "(case-lambda"
-"((v_103)(begin 'add-frontier!(set! frontier_0(cons v_103 frontier_0))))"
-"((kind_3 v_105)(add-frontier!_0 v_105)))))"
+"((v_142)(begin 'add-frontier!(set! frontier_0(cons v_142 frontier_0))))"
+"((kind_3 v_99)(add-frontier!_0 v_99)))))"
 "(let-values((()"
 "(begin"
 "((letrec-values(((frontier-loop_0)"
-"(lambda(v_107)"
+"(lambda(v_101)"
 "(begin"
 " 'frontier-loop"
 "(begin"
 "((letrec-values(((loop_81)"
-"(lambda(v_109)"
+"(lambda(v_103)"
 "(begin"
 " 'loop"
 "(if(let-values(((or-part_171)"
 "(interned-literal?"
-" v_109)))"
+" v_103)))"
 "(if or-part_171"
 " or-part_171"
 "(1/module-path-index?"
-" v_109)))"
+" v_103)))"
 "(let-values()(void))"
 "(if(hash-ref"
 " objs_0"
-" v_109"
+" v_103"
 " #f)"
 "(let-values()"
 "(if(hash-ref"
 " mutables_0"
-" v_109"
+" v_103"
 " #f)"
 "(void)"
 "(let-values()"
 "(hash-set!"
 " shares_0"
-" v_109"
+" v_103"
 " #t))))"
 "(let-values()"
 "(begin"
 "(if(serialize-fill!?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(begin"
 "(hash-set!"
 " mutables_0"
-" v_109"
+" v_103"
 "(hash-count"
 " mutables_0))"
 "((serialize-fill!-ref"
-" v_109)"
-" v_109"
+" v_103)"
+" v_103"
 " add-frontier!_0"
 " state_24)))"
 "(if(serialize?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "((serialize-ref"
-" v_109)"
-" v_109"
+" v_103)"
+" v_103"
 "(case-lambda"
 "((sub-v_0)"
 "(loop_81"
@@ -18109,31 +18119,31 @@ static const char *startup_source =
 " sub-v_1)))"
 " state_24))"
 "(if(pair?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(begin"
 "(loop_81"
 "(car"
-" v_109))"
+" v_103))"
 "(loop_81"
 "(cdr"
-" v_109))))"
+" v_103))))"
 "(if(vector?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(if(let-values(((or-part_172)"
 "(immutable?"
-" v_109)))"
+" v_103)))"
 "(if or-part_172"
 " or-part_172"
 "(zero?"
 "(vector-length"
-" v_109))))"
+" v_103))))"
 "(begin"
 "(let-values(((vec_38"
 " len_16)"
 "(let-values(((vec_39)"
-" v_109))"
+" v_103))"
 "(begin"
 "(check-vector"
 " vec_39)"
@@ -18178,14 +18188,14 @@ static const char *startup_source =
 "(begin"
 "(hash-set!"
 " mutables_0"
-" v_109"
+" v_103"
 "(hash-count"
 " mutables_0))"
 "(begin"
 "(let-values(((vec_40"
 " len_17)"
 "(let-values(((vec_41)"
-" v_109))"
+" v_103))"
 "(begin"
 "(check-vector"
 " vec_41)"
@@ -18228,31 +18238,31 @@ static const char *startup_source =
 " 0)))"
 "(void)))))"
 "(if(box?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(if(immutable?"
-" v_109)"
+" v_103)"
 "(loop_81"
 "(unbox"
-" v_109))"
+" v_103))"
 "(begin"
 "(hash-set!"
 " mutables_0"
-" v_109"
+" v_103"
 "(hash-count"
 " mutables_0))"
 "(add-frontier!_0"
 "(unbox"
-" v_109)))))"
+" v_103)))))"
 "(if(hash?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(if(immutable?"
-" v_109)"
+" v_103)"
 "(begin"
 "(let-values(((lst_74)"
 "(sorted-hash-keys"
-" v_109)))"
+" v_103)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -18283,7 +18293,7 @@ static const char *startup_source =
 " k_21)"
 "(loop_81"
 "(hash-ref"
-" v_109"
+" v_103"
 " k_21))))"
 "(values)))))"
 "(values)))))"
@@ -18299,13 +18309,13 @@ static const char *startup_source =
 "(begin"
 "(hash-set!"
 " mutables_0"
-" v_109"
+" v_103"
 "(hash-count"
 " mutables_0))"
 "(begin"
 "(let-values(((lst_108)"
 "(sorted-hash-keys"
-" v_109)))"
+" v_103)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -18336,7 +18346,7 @@ static const char *startup_source =
 " k_22)"
 "(add-frontier!_0"
 "(hash-ref"
-" v_109"
+" v_103"
 " k_22))))"
 "(values)))))"
 "(values)))))"
@@ -18350,7 +18360,7 @@ static const char *startup_source =
 " lst_108)))"
 "(void)))))"
 "(if(prefab-struct-key"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(begin"
 "(let-values(((v*_2"
@@ -18367,7 +18377,7 @@ static const char *startup_source =
 "(unsafe-vector-length"
 " x_43))"
 "(struct->vector"
-" v_109)"
+" v_103)"
 " 1"
 " #f"
 " 1)))"
@@ -18406,7 +18416,7 @@ static const char *startup_source =
 " start*_1)))"
 "(void)))"
 "(if(srcloc?"
-" v_109)"
+" v_103)"
 "(let-values()"
 "(begin"
 "(let-values(((v*_3"
@@ -18423,7 +18433,7 @@ static const char *startup_source =
 "(unsafe-vector-length"
 " x_45))"
 "(struct->vector"
-" v_109)"
+" v_103)"
 " 1"
 " #f"
 " 1)))"
@@ -18465,13 +18475,13 @@ static const char *startup_source =
 "(void))))))))))"
 "(hash-set!"
 " objs_0"
-" v_109"
+" v_103"
 " obj-step_0)"
 "(set! obj-step_0"
 "(add1"
 " obj-step_0))))))))))"
 " loop_81)"
-" v_107)"
+" v_101)"
 "(if(null? frontier_0)"
 "(void)"
 "(let-values()"
@@ -18517,7 +18527,7 @@ static const char *startup_source =
 " lst_110)))"
 "(void))))))))))"
 " frontier-loop_0)"
-" v_140)"
+" v_141)"
 "(values))))"
 "(let-values(((num-mutables_0)(hash-count mutables_0)))"
 "(let-values(((share-step-positions_0)"
@@ -18619,12 +18629,12 @@ static const char *startup_source =
 "(lambda(pos_26)"
 "(begin"
 " 'quoted?"
-"(let-values(((v_141)"
+"(let-values(((v_143)"
 "(list-ref"
 " stream_0"
 "(- stream-size_0(add1 pos_26)))))"
-"(let-values(((or-part_158)(not(keyword? v_141))))"
-"(if or-part_158 or-part_158(eq? '#:quote v_141))))))))"
+"(let-values(((or-part_173)(not(keyword? v_143))))"
+"(if or-part_173 or-part_173(eq? '#:quote v_143))))))))"
 "(let-values(((ser-reset!_0)"
 "(lambda(pos_27)"
 "(begin"
@@ -18643,20 +18653,20 @@ static const char *startup_source =
 "(set! stream-size_0 0))))))"
 "(letrec-values(((ser-push!_15)"
 "(case-lambda"
-"((v_142)"
+"((v_144)"
 "(begin"
 " 'ser-push!"
-"(if(hash-ref shares_0 v_142 #f)"
+"(if(hash-ref shares_0 v_144 #f)"
 "(let-values()"
 "(let-values(((n_21)"
 "(hash-ref"
 " share-step-positions_0"
-"(hash-ref objs_0 v_142))))"
+"(hash-ref objs_0 v_144))))"
 "(begin"
 "(ser-push!_15 'tag '#:ref)"
 "(ser-push!_15 'exact n_21))))"
 "(let-values(((c1_25)"
-"(hash-ref mutables_0 v_142 #f)))"
+"(hash-ref mutables_0 v_144 #f)))"
 "(if c1_25"
 "((lambda(n_22)"
 "(begin"
@@ -18664,49 +18674,49 @@ static const char *startup_source =
 "(ser-push!_15 'exact n_22)))"
 " c1_25)"
 "(let-values()"
-"(ser-push-encoded!_0 v_142)))))))"
-"((kind_4 v_143)"
+"(ser-push-encoded!_0 v_144)))))))"
+"((kind_4 v_145)"
 "(let-values(((tmp_17) kind_4))"
 "(if(equal? tmp_17 'exact)"
 "(let-values()"
 "(begin"
-"(set! stream_0(cons v_143 stream_0))"
+"(set! stream_0(cons v_145 stream_0))"
 "(set! stream-size_0(add1 stream-size_0))))"
 "(if(equal? tmp_17 'tag)"
-"(let-values()(ser-push!_15 'exact v_143))"
+"(let-values()(ser-push!_15 'exact v_145))"
 "(if(equal? tmp_17 'reference)"
 "(let-values()"
-"(if(hash-ref shares_0 v_143 #f)"
+"(if(hash-ref shares_0 v_145 #f)"
 "(let-values()"
 "(let-values(((n_23)"
 "(hash-ref"
 " share-step-positions_0"
 "(hash-ref"
 " objs_0"
-" v_143))))"
+" v_145))))"
 "(ser-push!_15 'exact n_23)))"
 "(let-values(((c2_1)"
 "(hash-ref"
 " mutables_0"
-" v_143"
+" v_145"
 " #f)))"
 "(if c2_1"
 "((lambda(n_24)"
 "(ser-push!_15 'exact n_24))"
 " c2_1)"
 "(let-values()"
-"(ser-push!_15 v_143))))))"
-"(let-values()(ser-push!_15 v_143)))))))))"
+"(ser-push!_15 v_145))))))"
+"(let-values()(ser-push!_15 v_145)))))))))"
 "((ser-push-encoded!_0)"
-"(lambda(v_144)"
+"(lambda(v_146)"
 "(begin"
 " 'ser-push-encoded!"
-"(if(keyword? v_144)"
+"(if(keyword? v_146)"
 "(let-values()"
 "(begin"
 "(ser-push!_15 'tag '#:quote)"
-"(ser-push!_15 'exact v_144)))"
-"(if(1/module-path-index? v_144)"
+"(ser-push!_15 'exact v_146)))"
+"(if(1/module-path-index? v_146)"
 "(let-values()"
 "(begin"
 "(ser-push!_15 'tag '#:mpi)"
@@ -18714,16 +18724,16 @@ static const char *startup_source =
 " 'exact"
 "(add-module-path-index!/pos"
 " mpis_6"
-" v_144))))"
-"(if(serialize? v_144)"
+" v_146))))"
+"(if(serialize? v_146)"
 "(let-values()"
-"((serialize-ref v_144)"
-" v_144"
+"((serialize-ref v_146)"
+" v_146"
 " ser-push!_15"
 " state_24))"
-"(if(if(list? v_144)"
-"(if(pair? v_144)"
-"(pair?(cdr v_144))"
+"(if(if(list? v_146)"
+"(if(pair? v_146)"
+"(pair?(cdr v_146))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -18739,11 +18749,11 @@ static const char *startup_source =
 "(begin"
 "(ser-push!_15"
 " 'exact"
-"(length v_144))"
+"(length v_146))"
 "(values))))"
 "(let-values(((all-quoted?_0)"
 "(let-values(((lst_114)"
-" v_144))"
+" v_146))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -18797,9 +18807,9 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))"
-"(if(pair? v_144)"
+"(if(pair? v_146)"
 "(let-values()"
 "(let-values(((start-pos_1)"
 "(next-push-position_0)))"
@@ -18814,12 +18824,12 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(ser-push!_15"
-"(car v_144))"
+"(car v_146))"
 "(values))))"
 "(let-values(((d-pos_0)"
 "(next-push-position_0)))"
 "(begin"
-"(ser-push!_15(cdr v_144))"
+"(ser-push!_15(cdr v_146))"
 "(if(if(quoted?_0 a-pos_0)"
 "(quoted?_0 d-pos_0)"
 " #f)"
@@ -18830,9 +18840,9 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))))"
-"(if(box? v_144)"
+"(if(box? v_146)"
 "(let-values()"
 "(let-values(((start-pos_2)"
 "(next-push-position_0)))"
@@ -18845,7 +18855,7 @@ static const char *startup_source =
 "(let-values(((v-pos_0)"
 "(next-push-position_0)))"
 "(begin"
-"(ser-push!_15(unbox v_144))"
+"(ser-push!_15(unbox v_146))"
 "(if(quoted?_0 v-pos_0)"
 "(let-values()"
 "(begin"
@@ -18854,9 +18864,9 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))"
-"(if(vector? v_144)"
+"(if(vector? v_146)"
 "(let-values()"
 "(let-values(((start-pos_3)"
 "(next-push-position_0)))"
@@ -18871,13 +18881,13 @@ static const char *startup_source =
 "(ser-push!_15"
 " 'exact"
 "(vector-length"
-" v_144))"
+" v_146))"
 "(values))))"
 "(let-values(((all-quoted?_5)"
 "(let-values(((vec_42"
 " len_18)"
 "(let-values(((vec_43)"
-" v_144))"
+" v_146))"
 "(begin"
 "(check-vector"
 " vec_43)"
@@ -18935,15 +18945,15 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))"
-"(if(hash? v_144)"
+"(if(hash? v_146)"
 "(let-values()"
 "(let-values(((start-pos_4)"
 "(next-push-position_0)))"
 "(let-values(((as-set?_0)"
 "(let-values(((ht_87)"
-" v_144))"
+" v_146))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -18996,21 +19006,21 @@ static const char *startup_source =
 " 'tag"
 "(if as-set?_0"
 "(if(hash-eq?"
-" v_144)"
+" v_146)"
 "(let-values()"
 " '#:seteq)"
 "(if(hash-eqv?"
-" v_144)"
+" v_146)"
 "(let-values()"
 " '#:seteqv)"
 "(let-values()"
 " '#:set)))"
 "(if(hash-eq?"
-" v_144)"
+" v_146)"
 "(let-values()"
 " '#:hasheq)"
 "(if(hash-eqv?"
-" v_144)"
+" v_146)"
 "(let-values()"
 " '#:hasheqv)"
 "(let-values()"
@@ -19021,11 +19031,11 @@ static const char *startup_source =
 "(ser-push!_15"
 " 'exact"
 "(hash-count"
-" v_144))"
+" v_146))"
 "(values))))"
 "(let-values(((ks_0)"
 "(sorted-hash-keys"
-" v_144)))"
+" v_146)))"
 "(let-values(((all-quoted?_10)"
 "(let-values(((lst_47)"
 " ks_0))"
@@ -19069,15 +19079,15 @@ static const char *startup_source =
 "(let-values()"
 "(ser-push!_15"
 "(hash-ref"
-" v_144"
+" v_146"
 " k_23))))"
 "(if all-quoted?_13"
 "(if(quoted?_0"
 " k-pos_0)"
-"(let-values(((or-part_173)"
+"(let-values(((or-part_174)"
 " as-set?_0))"
-"(if or-part_173"
-" or-part_173"
+"(if or-part_174"
+" or-part_174"
 "(quoted?_0"
 " v-pos_1)))"
 " #f)"
@@ -19102,16 +19112,16 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))))"
 "(let-values(((c3_0)"
 "(prefab-struct-key"
-" v_144)))"
+" v_146)))"
 "(if c3_0"
 "((lambda(k_24)"
 "(let-values(((vec_44)"
 "(struct->vector"
-" v_144)))"
+" v_146)))"
 "(let-values(((start-pos_5)"
 "(next-push-position_0)))"
 "(let-values((()"
@@ -19202,91 +19212,91 @@ static const char *startup_source =
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))"
+" v_146)))"
 "(void)))))))))"
 " c3_0)"
-"(if(srcloc? v_144)"
+"(if(srcloc? v_146)"
 "(let-values()"
 "(begin"
 "(ser-push!_15"
 " 'tag"
 " '#:srcloc)"
 "(ser-push!_15"
-"(srcloc-source v_144))"
+"(srcloc-source v_146))"
 "(ser-push!_15"
-"(srcloc-line v_144))"
+"(srcloc-line v_146))"
 "(ser-push!_15"
-"(srcloc-column v_144))"
+"(srcloc-column v_146))"
 "(ser-push!_15"
-"(srcloc-position v_144))"
+"(srcloc-position v_146))"
 "(ser-push!_15"
-"(srcloc-span v_144))))"
+"(srcloc-span v_146))))"
 "(let-values()"
 "(begin"
 "(ser-push-optional-quote!_0)"
 "(ser-push!_15"
 " 'exact"
-" v_144)))))))))))))))))"
+" v_146)))))))))))))))))"
 "((ser-push-optional-quote!_0)"
 "(lambda()(begin 'ser-push-optional-quote!(void)))))"
 "(let-values(((ser-shell!_0)"
-"(lambda(v_145)"
+"(lambda(v_147)"
 "(begin"
 " 'ser-shell!"
-"(if(serialize-fill!? v_145)"
+"(if(serialize-fill!? v_147)"
 "(let-values()"
-"((serialize-ref v_145)"
-" v_145"
+"((serialize-ref v_147)"
+" v_147"
 " ser-push!_15"
 " state_24))"
-"(if(box? v_145)"
+"(if(box? v_147)"
 "(let-values()(ser-push!_15 'tag '#:box))"
-"(if(vector? v_145)"
+"(if(vector? v_147)"
 "(let-values()"
 "(begin"
 "(ser-push!_15 'tag '#:vector)"
 "(ser-push!_15"
 " 'exact"
-"(vector-length v_145))))"
-"(if(hash? v_145)"
+"(vector-length v_147))))"
+"(if(hash? v_147)"
 "(let-values()"
 "(ser-push!_15"
 " 'tag"
-"(if(hash-eq? v_145)"
+"(if(hash-eq? v_147)"
 "(let-values() '#:hasheq)"
-"(if(hash-eqv? v_145)"
+"(if(hash-eqv? v_147)"
 "(let-values() '#:hasheqv)"
 "(let-values() '#:hash)))))"
 "(let-values()"
 "(error"
 " 'ser-shell"
 "                                                                               \"unknown mutable: ~e\""
-" v_145))))))))))"
+" v_147))))))))))"
 "(let-values(((ser-shell-fill!_0)"
-"(lambda(v_146)"
+"(lambda(v_148)"
 "(begin"
 " 'ser-shell-fill!"
-"(if(serialize-fill!? v_146)"
+"(if(serialize-fill!? v_148)"
 "(let-values()"
-"((serialize-fill!-ref v_146)"
-" v_146"
+"((serialize-fill!-ref v_148)"
+" v_148"
 " ser-push!_15"
 " state_24))"
-"(if(box? v_146)"
+"(if(box? v_148)"
 "(let-values()"
 "(begin"
 "(ser-push!_15 'tag '#:set-box!)"
-"(ser-push!_15(unbox v_146))))"
-"(if(vector? v_146)"
+"(ser-push!_15(unbox v_148))))"
+"(if(vector? v_148)"
 "(let-values()"
 "(begin"
 "(ser-push!_15 'tag '#:set-vector!)"
 "(ser-push!_15"
 " 'exact"
-"(vector-length v_146))"
+"(vector-length v_148))"
 "(let-values(((vec_45 len_19)"
 "(let-values(((vec_46)"
-" v_146))"
+" v_148))"
 "(begin"
 "(check-vector vec_46)"
 "(values"
@@ -19302,7 +19312,7 @@ static const char *startup_source =
 "(if(unsafe-fx<"
 " pos_29"
 " len_19)"
-"(let-values(((v_147)"
+"(let-values(((v_149)"
 "(unsafe-vector-ref"
 " vec_45"
 " pos_29)))"
@@ -19313,7 +19323,7 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(ser-push!_15"
-" v_147))"
+" v_149))"
 "(values)))))"
 "(values)))))"
 "(if(not"
@@ -19327,7 +19337,7 @@ static const char *startup_source =
 " for-loop_135)"
 " 0)))"
 "(void)))"
-"(if(hash? v_146)"
+"(if(hash? v_148)"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -19339,11 +19349,11 @@ static const char *startup_source =
 "(begin"
 "(ser-push!_15"
 " 'exact"
-"(hash-count v_146))"
+"(hash-count v_148))"
 "(values))))"
 "(let-values(((ks_1)"
 "(sorted-hash-keys"
-" v_146)))"
+" v_148)))"
 "(begin"
 "(let-values(((lst_117) ks_1))"
 "(begin"
@@ -19375,7 +19385,7 @@ static const char *startup_source =
 " k_25)"
 "(ser-push!_15"
 "(hash-ref"
-" v_146"
+" v_148"
 " k_25))))"
 "(values)))))"
 "(values)))))"
@@ -19392,7 +19402,7 @@ static const char *startup_source =
 "(error"
 " 'ser-shell-fill"
 "                                                                                 \"unknown mutable: ~e\""
-" v_146))))))))))"
+" v_148))))))))))"
 "(let-values(((rev-mutables_0)"
 "(let-values(((ht_88) mutables_0))"
 "(begin"
@@ -19406,7 +19416,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if i_111"
 "(let-values(((k_26"
-" v_148)"
+" v_150)"
 "(hash-iterate-key+value"
 " ht_88"
 " i_111)))"
@@ -19419,7 +19429,7 @@ static const char *startup_source =
 " val_41)"
 "(let-values()"
 "(values"
-" v_148"
+" v_150"
 " k_26))))"
 "(hash-set"
 " table_127"
@@ -19645,7 +19655,7 @@ static const char *startup_source =
 "(list"
 " 'quote"
 "(begin"
-"(ser-push!_15 v_140)"
+"(ser-push!_15 v_141)"
 "(reap-stream!_0))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(sorted-hash-keys)"
@@ -19780,13 +19790,13 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(if(< pos_44 end_18)(unsafe-fx< pos_45 len_20) #f)"
-"(let-values(((v_149)(unsafe-vector-ref vec_47 pos_45)))"
+"(let-values(((v_151)(unsafe-vector-ref vec_47 pos_45)))"
 "(let-values(((pos_46)"
 "(let-values(((pos_47) pos_43))"
 "(let-values(((pos_48)"
 "(let-values()"
 "(decode-fill!"
-" v_149"
+" v_151"
 " mutable-fill-vec_0"
 " pos_47"
 " mpis_7"
@@ -20042,7 +20052,7 @@ static const char *startup_source =
 "(let-values()(values(vector*-ref mpis_9(vector*-ref vec_50(add1 pos_50)))(+ pos_50 2)))"
 "(if(unsafe-fx< index_0 11)"
 "(let-values()"
-"(let-values(((v_150 next-pos_18)"
+"(let-values(((v_152 next-pos_18)"
 "(decode"
 " vec_50"
 "(add1 pos_50)"
@@ -20050,7 +20060,7 @@ static const char *startup_source =
 " inspector_6"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(values(box-immutable v_150) next-pos_18)))"
+"(values(box-immutable v_152) next-pos_18)))"
 "(if(unsafe-fx< index_0 12)"
 "(let-values()"
 "(let-values(((a_38 next-pos_19)"
@@ -20089,9 +20099,9 @@ static const char *startup_source =
 "(let-values(((pos_54) pos_51))"
 "(let-values(((pos_55)"
 "(let-values()"
-"(let-values(((v_151"
+"(let-values(((v_153"
 " next-pos_22)"
-"(let-values(((v_152"
+"(let-values(((v_154"
 " next-pos_23)"
 "(decode"
 " vec_50"
@@ -20101,13 +20111,13 @@ static const char *startup_source =
 " bulk-binding-registry_7"
 " shared_2)))"
 "(values"
-" v_152"
+" v_154"
 " next-pos_23))))"
 "(begin"
 "(vector-set!"
 " r_29"
 " i_123"
-" v_151)"
+" v_153)"
 " next-pos_22)))))"
 "(values pos_55)))))"
 "(if(not #f)"
@@ -20159,7 +20169,7 @@ static const char *startup_source =
 " inspector_6"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(let-values(((v_153"
+"(let-values(((v_155"
 " next-pos_25)"
 "(decode"
 " vec_50"
@@ -20169,7 +20179,7 @@ static const char *startup_source =
 " bulk-binding-registry_7"
 " shared_2)))"
 "(values"
-"(hash-set ht_94 k_27 v_153)"
+"(hash-set ht_94 k_27 v_155)"
 " next-pos_25))))))"
 "(values ht_95 pos_60)))))"
 "(if(not #f)"
@@ -20257,7 +20267,7 @@ static const char *startup_source =
 "((pos_69) pos_66))"
 "(let-values(((r_34 pos_70)"
 "(let-values()"
-"(let-values(((v_154"
+"(let-values(((v_156"
 " next-pos_29)"
 "(decode"
 " vec_50"
@@ -20268,7 +20278,7 @@ static const char *startup_source =
 " shared_2)))"
 "(values"
 "(cons"
-" v_154"
+" v_156"
 " r_33)"
 " next-pos_29)))))"
 "(values r_34 pos_70)))))"
@@ -20616,7 +20626,7 @@ static const char *startup_source =
 " next-pos_65)))))))))))))))))"
 "(define-values"
 "(decode-fill!)"
-"(lambda(v_155 vec_51 pos_71 mpis_10 inspector_7 bulk-binding-registry_8 shared_3)"
+"(lambda(v_157 vec_51 pos_71 mpis_10 inspector_7 bulk-binding-registry_8 shared_3)"
 "(begin"
 "(let-values(((tmp_22)(vector*-ref vec_51 pos_71)))"
 "(if(equal? tmp_22 #f)"
@@ -20625,7 +20635,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((c_21 next-pos_66)"
 "(decode vec_51(add1 pos_71) mpis_10 inspector_7 bulk-binding-registry_8 shared_3)))"
-"(begin(set-box! v_155 c_21) next-pos_66)))"
+"(begin(set-box! v_157 c_21) next-pos_66)))"
 "(if(equal? tmp_22 '#:set-vector!)"
 "(let-values()"
 "(let-values(((len_25)(vector*-ref vec_51(add1 pos_71))))"
@@ -20653,7 +20663,7 @@ static const char *startup_source =
 " bulk-binding-registry_8"
 " shared_3)))"
 "(begin"
-"(vector-set! v_155 i_124 c_22)"
+"(vector-set! v_157 i_124 c_22)"
 " next-pos_67)))))"
 "(values pos_76)))))"
 "(if(not #f)(for-loop_149 pos_74(+ pos_73 inc_17)) pos_74)))"
@@ -20696,7 +20706,7 @@ static const char *startup_source =
 " bulk-binding-registry_8"
 " shared_3)))"
 "(begin"
-"(hash-set! v_155 key_51 val_43)"
+"(hash-set! v_157 key_51 val_43)"
 " done-pos_2))))))"
 "(values pos_81)))))"
 "(if(not #f)(for-loop_150 pos_79(+ pos_78 inc_18)) pos_79)))"
@@ -20708,18 +20718,18 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((c_23 next-pos_69)"
 "(decode vec_51(add1 pos_71) mpis_10 inspector_7 bulk-binding-registry_8 shared_3)))"
-"(begin(deserialize-scope-fill! v_155 c_23) next-pos_69)))"
+"(begin(deserialize-scope-fill! v_157 c_23) next-pos_69)))"
 "(if(equal? tmp_22 '#:representative-scope-fill!)"
 "(let-values()"
 "(let-values(((a_39 next-pos_70)"
 "(decode vec_51(add1 pos_71) mpis_10 inspector_7 bulk-binding-registry_8 shared_3)))"
 "(let-values(((d_25 done-pos_3)"
 "(decode vec_51 next-pos_70 mpis_10 inspector_7 bulk-binding-registry_8 shared_3)))"
-"(begin(deserialize-representative-scope-fill! v_155 a_39 d_25) done-pos_3))))"
+"(begin(deserialize-representative-scope-fill! v_157 a_39 d_25) done-pos_3))))"
 "                    (let-values () (error 'deserialize \"bad fill encoding: ~v\" (vector*-ref vec_51 pos_71)))))))))))))"
 "(define-values"
 "(find-reachable-scopes)"
-"(lambda(v_156)"
+"(lambda(v_158)"
 "(begin"
 "(let-values(((seen_22)(make-hasheq)))"
 "(let-values(((reachable-scopes_5)(seteq)))"
@@ -20727,22 +20737,22 @@ static const char *startup_source =
 "(let-values(((scope-triggers_0)(make-hasheq)))"
 "(begin"
 "((letrec-values(((loop_82)"
-"(lambda(v_157)"
+"(lambda(v_159)"
 "(begin"
 " 'loop"
-"(if(interned-literal? v_157)"
+"(if(interned-literal? v_159)"
 "(let-values()(void))"
-"(if(hash-ref seen_22 v_157 #f)"
+"(if(hash-ref seen_22 v_159 #f)"
 "(let-values()(void))"
 "(let-values()"
 "(begin"
-"(hash-set! seen_22 v_157 #t)"
-"(if(scope-with-bindings? v_157)"
+"(hash-set! seen_22 v_159 #t)"
+"(if(scope-with-bindings? v_159)"
 "(let-values()"
 "(begin"
-"(set! reachable-scopes_5(set-add reachable-scopes_5 v_157))"
-"((reach-scopes-ref v_157) v_157 loop_82)"
-"(let-values(((lst_118)(hash-ref scope-triggers_0 v_157 null)))"
+"(set! reachable-scopes_5(set-add reachable-scopes_5 v_159))"
+"((reach-scopes-ref v_159) v_159 loop_82)"
+"(let-values(((lst_118)(hash-ref scope-triggers_0 v_159 null)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -20773,9 +20783,9 @@ static const char *startup_source =
 " for-loop_151)"
 " lst_118)))"
 "(void)"
-"(hash-remove! scope-triggers_0 v_157)"
-"((scope-with-bindings-ref v_157)"
-" v_157"
+"(hash-remove! scope-triggers_0 v_159)"
+"((scope-with-bindings-ref v_159)"
+" v_159"
 " get-reachable-scopes_4"
 " loop_82"
 "(lambda(sc-unreachable_0 b_66)"
@@ -20784,15 +20794,15 @@ static const char *startup_source =
 " sc-unreachable_0"
 "(lambda(l_51)(cons b_66 l_51))"
 " null)))))"
-"(if(reach-scopes? v_157)"
-"(let-values()((reach-scopes-ref v_157) v_157 loop_82))"
-"(if(pair? v_157)"
-"(let-values()(begin(loop_82(car v_157))(loop_82(cdr v_157))))"
-"(if(vector? v_157)"
+"(if(reach-scopes? v_159)"
+"(let-values()((reach-scopes-ref v_159) v_159 loop_82))"
+"(if(pair? v_159)"
+"(let-values()(begin(loop_82(car v_159))(loop_82(cdr v_159))))"
+"(if(vector? v_159)"
 "(let-values()"
 "(begin"
 "(let-values(((vec_52 len_27)"
-"(let-values(((vec_53) v_157))"
+"(let-values(((vec_53) v_159))"
 "(begin"
 "(check-vector vec_53)"
 "(values"
@@ -20827,12 +20837,12 @@ static const char *startup_source =
 " for-loop_152)"
 " 0)))"
 "(void)))"
-"(if(box? v_157)"
-"(let-values()(loop_82(unbox v_157)))"
-"(if(hash? v_157)"
+"(if(box? v_159)"
+"(let-values()(loop_82(unbox v_159)))"
+"(if(hash? v_159)"
 "(let-values()"
 "(begin"
-"(let-values(((ht_96) v_157))"
+"(let-values(((ht_96) v_159))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -20843,7 +20853,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_125"
-"(let-values(((k_30 v_158)"
+"(let-values(((k_30 v_160)"
 "(hash-iterate-key+value"
 " ht_96"
 " i_125)))"
@@ -20857,7 +20867,7 @@ static const char *startup_source =
 "(loop_82"
 " k_30)"
 "(loop_82"
-" v_158)))"
+" v_160)))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
@@ -20870,7 +20880,7 @@ static const char *startup_source =
 " for-loop_153)"
 "(hash-iterate-first ht_96))))"
 "(void)))"
-"(if(prefab-struct-key v_157)"
+"(if(prefab-struct-key v_159)"
 "(let-values()"
 "(begin"
 "(let-values(((v*_5 start*_4 stop*_5 step*_4)"
@@ -20880,7 +20890,7 @@ static const char *startup_source =
 "(lambda(x_49)(vector? x_49))"
 "(lambda(x_50)"
 "(unsafe-vector-length x_50))"
-"(struct->vector v_157)"
+"(struct->vector v_159)"
 " 1"
 " #f"
 " 1)))"
@@ -20913,11 +20923,11 @@ static const char *startup_source =
 " for-loop_154)"
 " start*_4)))"
 "(void)))"
-"(if(srcloc? v_157)"
-"(let-values()(loop_82(srcloc-source v_157)))"
+"(if(srcloc? v_159)"
+"(let-values()(loop_82(srcloc-source v_159)))"
 "(let-values()(void))))))))))))))))))"
 " loop_82)"
-" v_156)"
+" v_158)"
 " reachable-scopes_5))))))))"
 "(define-values"
 "(deserialize-imports)"
@@ -21944,11 +21954,11 @@ static const char *startup_source =
 " out-sym_0))))))"
 "(let-values(((already-defined?_0)"
 "(if(if check-and-remove?_0"
-"(let-values(((or-part_174)"
+"(let-values(((or-part_175)"
 "(not"
 " shortcut-table_0)))"
-"(if or-part_174"
-" or-part_174"
+"(if or-part_175"
+" or-part_175"
 "(hash-ref"
 " shortcut-table_0"
 " sym_32"
@@ -22768,8 +22778,8 @@ static const char *startup_source =
 "(extract-module-definitions)"
 "(lambda(r+p_12)"
 "(begin"
-"(let-values(((or-part_175)(extract-module-requires r+p_12(requires+provides-self r+p_12) 0)))"
-"(if or-part_175 or-part_175 null)))))"
+"(let-values(((or-part_176)(extract-module-requires r+p_12(requires+provides-self r+p_12) 0)))"
+"(if or-part_176 or-part_176 null)))))"
 "(define-values"
 "(extract-all-module-requires)"
 "(lambda(r+p_13 mod-name_12 phase_53)"
@@ -23012,8 +23022,8 @@ static const char *startup_source =
 "(hash-set"
 " at-phase_9"
 " sym_42"
-"(if(let-values(((or-part_176) as-protected?_0))"
-"(if or-part_176 or-part_176 as-transformer?_3))"
+"(if(let-values(((or-part_177) as-protected?_0))"
+"(if or-part_177 or-part_177 as-transformer?_3))"
 "(provided1.1 plain-binding_0 as-protected?_0 as-transformer?_3)"
 " plain-binding_0))))"
 "(if(same-binding? b_69 binding_13)"
@@ -23537,10 +23547,10 @@ static const char *startup_source =
 " req_0)))"
 "(loop_84"
 " spec121_0"
-"(let-values(((or-part_177)"
+"(let-values(((or-part_178)"
 " top-req_0))"
-"(if or-part_177"
-" or-part_177"
+"(if or-part_178"
+" or-part_178"
 " req_0))"
 "(phase+"
 " phase-shift_10"
@@ -23617,10 +23627,10 @@ static const char *startup_source =
 " spec128_1))))))"
 "(loop_84"
 " spec128_0"
-"(let-values(((or-part_178)"
+"(let-values(((or-part_179)"
 " top-req_0))"
-"(if or-part_178"
-" or-part_178"
+"(if or-part_179"
+" or-part_179"
 " req_0))"
 "(phase+"
 " phase-shift_10"
@@ -23777,10 +23787,10 @@ static const char *startup_source =
 " spec136_1))))))"
 "(loop_84"
 " spec136_0"
-"(let-values(((or-part_179)"
+"(let-values(((or-part_180)"
 " top-req_0))"
-"(if or-part_179"
-" or-part_179"
+"(if or-part_180"
+" or-part_180"
 " req_0))"
 "(phase+"
 " phase-shift_10"
@@ -23899,10 +23909,10 @@ static const char *startup_source =
 " req_0)))"
 "(loop_84"
 " spec141_0"
-"(let-values(((or-part_180)"
+"(let-values(((or-part_181)"
 " top-req_0))"
-"(if or-part_180"
-" or-part_180"
+"(if or-part_181"
+" or-part_181"
 " req_0))"
 " phase-shift_10"
 " p_34"
@@ -24012,15 +24022,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id155_0)"
 "(let-values()"
-"(if(let-values(((or-part_181)"
+"(if(let-values(((or-part_182)"
 "(if(syntax?$1"
 " s_227)"
 "(symbol?"
 "(syntax-e$1"
 " s_227))"
 " #f)))"
-"(if or-part_181"
-" or-part_181"
+"(if or-part_182"
+" or-part_182"
 "(symbol?"
 " s_227)))"
 " s_227"
@@ -24069,10 +24079,10 @@ static const char *startup_source =
 "(loop_84"
 "(list"
 " spec148_0)"
-"(let-values(((or-part_182)"
+"(let-values(((or-part_183)"
 " top-req_0))"
-"(if or-part_182"
-" or-part_182"
+"(if or-part_183"
+" or-part_183"
 " req_0))"
 " phase-shift_10"
 " just-meta_0"
@@ -24132,15 +24142,15 @@ static const char *startup_source =
 "(let-values(((s_233)"
 "(car"
 " s_232)))"
-"(if(let-values(((or-part_183)"
+"(if(let-values(((or-part_184)"
 "(if(syntax?$1"
 " s_233)"
 "(symbol?"
 "(syntax-e$1"
 " s_233))"
 " #f)))"
-"(if or-part_183"
-" or-part_183"
+"(if or-part_184"
+" or-part_184"
 "(symbol?"
 " s_233)))"
 " s_233"
@@ -24212,10 +24222,10 @@ static const char *startup_source =
 "(loop_84"
 "(list"
 " spec158_0)"
-"(let-values(((or-part_184)"
+"(let-values(((or-part_185)"
 " top-req_0))"
-"(if or-part_184"
-" or-part_184"
+"(if or-part_185"
+" or-part_185"
 " req_0))"
 " phase-shift_10"
 " just-meta_0"
@@ -24327,15 +24337,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id173_0)"
 "(let-values()"
-"(if(let-values(((or-part_185)"
+"(if(let-values(((or-part_186)"
 "(if(syntax?$1"
 " s_247)"
 "(symbol?"
 "(syntax-e$1"
 " s_247))"
 " #f)))"
-"(if or-part_185"
-" or-part_185"
+"(if or-part_186"
+" or-part_186"
 "(symbol?"
 " s_247)))"
 " s_247"
@@ -24384,10 +24394,10 @@ static const char *startup_source =
 "(loop_84"
 "(list"
 " spec166_0)"
-"(let-values(((or-part_186)"
+"(let-values(((or-part_187)"
 " top-req_0))"
-"(if or-part_186"
-" or-part_186"
+"(if or-part_187"
+" or-part_187"
 " req_0))"
 " phase-shift_10"
 " just-meta_0"
@@ -24451,15 +24461,15 @@ static const char *startup_source =
 "(let-values(((s_253)"
 "(car"
 " s_252)))"
-"(if(let-values(((or-part_187)"
+"(if(let-values(((or-part_188)"
 "(if(syntax?$1"
 " s_253)"
 "(symbol?"
 "(syntax-e$1"
 " s_253))"
 " #f)))"
-"(if or-part_187"
-" or-part_187"
+"(if or-part_188"
+" or-part_188"
 "(symbol?"
 " s_253)))"
 " s_253"
@@ -24604,10 +24614,10 @@ static const char *startup_source =
 "(loop_84"
 "(list"
 " spec176_0)"
-"(let-values(((or-part_188)"
+"(let-values(((or-part_189)"
 " top-req_0))"
-"(if or-part_188"
-" or-part_188"
+"(if or-part_189"
+" or-part_189"
 " req_0))"
 " phase-shift_10"
 " just-meta_0"
@@ -24690,15 +24700,15 @@ static const char *startup_source =
 "(let-values(((s_267)"
 "(car"
 " s_266)))"
-"(if(let-values(((or-part_189)"
+"(if(let-values(((or-part_190)"
 "(if(syntax?$1"
 " s_267)"
 "(symbol?"
 "(syntax-e$1"
 " s_267))"
 " #f)))"
-"(if or-part_189"
-" or-part_189"
+"(if or-part_190"
+" or-part_190"
 "(symbol?"
 " s_267)))"
 " s_267"
@@ -24796,10 +24806,10 @@ static const char *startup_source =
 "(loop_84"
 "(list"
 " spec189_0)"
-"(let-values(((or-part_190)"
+"(let-values(((or-part_191)"
 " top-req_0))"
-"(if or-part_190"
-" or-part_190"
+"(if or-part_191"
+" or-part_191"
 " req_0))"
 " phase-shift_10"
 " just-meta_0"
@@ -24816,11 +24826,11 @@ static const char *startup_source =
 " req_0)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_191)"
+"(if(let-values(((or-part_192)"
 "(1/module-path?"
 " maybe-mp_0)))"
-"(if or-part_191"
-" or-part_191"
+"(if or-part_192"
+" or-part_192"
 "(1/resolved-module-path?"
 " maybe-mp_0)))"
 "(void)"
@@ -24833,10 +24843,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_192)"
+"(if(let-values(((or-part_193)"
 " adjust_0))"
-"(if or-part_192"
-" or-part_192"
+"(if or-part_193"
+" or-part_193"
 "(not"
 "(eq?"
 " just-meta_0"
@@ -24873,10 +24883,10 @@ static const char *startup_source =
 "((self204_0)"
 " self_11)"
 "((temp205_0)"
-"(let-values(((or-part_193)"
+"(let-values(((or-part_194)"
 " req_0))"
-"(if or-part_193"
-" or-part_193"
+"(if or-part_194"
+" or-part_194"
 " top-req_0)))"
 "((m-ns206_0)"
 " m-ns_8)"
@@ -25182,10 +25192,10 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if(not"
-"(let-values(((or-part_194)"
+"(let-values(((or-part_195)"
 " visit?_2))"
-"(if or-part_194"
-" or-part_194"
+"(if or-part_195"
+" or-part_195"
 " run?_2)))"
 "(let-values()"
 "(let-values(((m-ns260_0) m-ns_10)"
@@ -25204,10 +25214,10 @@ static const char *startup_source =
 "(void))"
 "(values))))"
 "(let-values(((can-bulk-bind?_0)"
-"(if(let-values(((or-part_195)"
+"(if(let-values(((or-part_196)"
 "(not adjust_1)))"
-"(if or-part_195"
-" or-part_195"
+"(if or-part_196"
+" or-part_196"
 "(let-values(((or-part_125)"
 "(adjust-prefix?"
 " adjust_1)))"
@@ -25343,11 +25353,11 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "((temp251_0)"
-"(if(let-values(((or-part_196)"
+"(if(let-values(((or-part_197)"
 "(not"
 " can-bulk-bind?_0)))"
-"(if or-part_196"
-" or-part_196"
+"(if or-part_197"
+" or-part_197"
 " copy-variable-phase-level_1))"
 "(lambda(binding_16"
 " as-transformer?_4)"
@@ -25736,12 +25746,12 @@ static const char *startup_source =
 " i_136)))"
 "(let-values((()"
 "(let-values()"
-"(if(let-values(((or-part_197)"
+"(if(let-values(((or-part_198)"
 "(eq?"
 " just-meta_2"
 " 'all)))"
-"(if or-part_197"
-" or-part_197"
+"(if or-part_198"
+" or-part_198"
 "(eqv?"
 " just-meta_2"
 " provide-phase-level_5)))"
@@ -25767,10 +25777,10 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values(((lst_150)"
-"(let-values(((or-part_198)"
+"(let-values(((or-part_199)"
 " only-syms_0))"
-"(if or-part_198"
-" or-part_198"
+"(if or-part_199"
+" or-part_199"
 "(hash-keys"
 " provides_7)))))"
 "(begin"
@@ -25874,7 +25884,7 @@ static const char *startup_source =
 " in-stx_2)"
 "((temp304_0)"
 "(bulk-binding14.1"
-"(let-values(((or-part_199)"
+"(let-values(((or-part_200)"
 "(if(not"
 " bulk-prefix_2)"
 "(if(zero?"
@@ -25883,8 +25893,8 @@ static const char *startup_source =
 " provides_7"
 " #f)"
 " #f)))"
-"(if or-part_199"
-" or-part_199"
+"(if or-part_200"
+" or-part_200"
 "(if(not"
 "(registered-bulk-provide?"
 " bulk-binding-registry_9"
@@ -26756,9 +26766,9 @@ static const char *startup_source =
 "(let-values(((variable-uses_0)(header-require-var-to-import-sym header_2)))"
 "(let-values(((prev-var-sym_0)(hash-ref variable-uses_0 key_8 #f)))"
 "(let-values(((var-sym_0)"
-"(let-values(((or-part_200) prev-var-sym_0))"
-"(if or-part_200"
-" or-part_200"
+"(let-values(((or-part_201) prev-var-sym_0))"
+"(if or-part_201"
+" or-part_201"
 "(let-values(((sym_52)(select-fresh(variable-use-sym key_8) header_2)))"
 "(begin"
 "(hash-set! variable-uses_0 key_8 sym_52)"
@@ -26820,14 +26830,14 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_157"
 " or-part_157"
-"(let-values(((or-part_201)"
+"(let-values(((or-part_202)"
 "(eq?"
 "(module-use-module"
 " mu_2)"
 "(compile-context-self"
 " cctx_0))))"
-"(if or-part_201"
-" or-part_201"
+"(if or-part_202"
+" or-part_202"
 "(top-level-module-path-index?"
 "(module-use-module"
 " mu_2))))))"
@@ -27007,10 +27017,10 @@ static const char *startup_source =
 "(let-values(((table_148)"
 "(let-values(((table_149)"
 " table_147))"
-"(if(let-values(((or-part_202)"
+"(if(let-values(((or-part_203)"
 " extra-inspectors_1))"
-"(if or-part_202"
-" or-part_202"
+"(if or-part_203"
+" or-part_203"
 " cross-linklet-inlining?_0))"
 "(let-values(((table_150)"
 " table_149))"
@@ -27071,10 +27081,10 @@ static const char *startup_source =
 "(if(let-values(((mod_2)"
 "(module-use-module"
 "(variable-use-module-use vu_3))))"
-"(let-values(((or-part_203)"
+"(let-values(((or-part_204)"
 "(eq? mod_2(compile-context-self cctx_0))))"
-"(if or-part_203"
-" or-part_203"
+"(if or-part_204"
+" or-part_204"
 "(top-level-module-path-index? mod_2))))"
 "(let-values(((fold-var_153) fold-var_152))"
 "(let-values(((fold-var_154)"
@@ -27243,7 +27253,7 @@ static const char *startup_source =
 "(correlated-property)"
 "(case-lambda"
 "((e_31 k_31)(begin(syntax-property$2 e_31 k_31)))"
-"((e_32 k_32 v_159)(syntax-property$2 e_32 k_32 v_159))))"
+"((e_32 k_32 v_161)(syntax-property$2 e_32 k_32 v_161))))"
 "(define-values"
 "(to-syntax-list.1$1)"
 "(lambda(s_306)"
@@ -27623,26 +27633,26 @@ static const char *startup_source =
 "(lambda(s_307 inferred-name_0 orig-s_21)"
 "(begin"
 "(letrec-values(((simplify-name_0)"
-"(lambda(v_160)"
+"(lambda(v_162)"
 "(begin"
 " 'simplify-name"
-"(if(pair? v_160)"
+"(if(pair? v_162)"
 "(let-values()"
-"(let-values(((n1_0)(simplify-name_0(car v_160))))"
-"(let-values(((n2_0)(simplify-name_0(cdr v_160))))(if(eq? n1_0 n2_0) n1_0 v_160))))"
-"(let-values() v_160))))))"
+"(let-values(((n1_0)(simplify-name_0(car v_162))))"
+"(let-values(((n2_0)(simplify-name_0(cdr v_162))))(if(eq? n1_0 n2_0) n1_0 v_162))))"
+"(let-values() v_162))))))"
 "(let-values(((name_45)"
-"(let-values(((or-part_204)"
-"(let-values(((v_161)"
+"(let-values(((or-part_205)"
+"(let-values(((v_163)"
 "(simplify-name_0(syntax-property$1 orig-s_21 'inferred-name))))"
-"(if(let-values(((or-part_131)(symbol? v_161)))"
+"(if(let-values(((or-part_131)(symbol? v_163)))"
 "(if or-part_131"
 " or-part_131"
-"(let-values(((or-part_205)(syntax?$1 v_161)))"
-"(if or-part_205 or-part_205(void? v_161)))))"
-" v_161"
+"(let-values(((or-part_206)(syntax?$1 v_163)))"
+"(if or-part_206 or-part_206(void? v_163)))))"
+" v_163"
 " #f))))"
-"(if or-part_204 or-part_204 inferred-name_0))))"
+"(if or-part_205 or-part_205 inferred-name_0))))"
 "(let-values(((named-s_0)"
 "(if name_45"
 "(correlated-property"
@@ -27804,9 +27814,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((normal-b_0)(parsed-id-binding p_42)))"
 "(let-values(((b_72)"
-"(let-values(((or-part_206) normal-b_0))"
-"(if or-part_206"
-" or-part_206"
+"(let-values(((or-part_207) normal-b_0))"
+"(if or-part_207"
+" or-part_207"
 "(let-values(((temp45_0)(compile-context-self cctx_9))"
 "((temp46_0)(compile-context-phase cctx_9))"
 "((temp47_0)(syntax-e$1(parsed-s p_42))))"
@@ -27871,10 +27881,10 @@ static const char *startup_source =
 "(module-binding-extra-inspector b_72)))"
 "(if or-part_103"
 " or-part_103"
-"(let-values(((or-part_207)"
+"(let-values(((or-part_208)"
 "(parsed-id-inspector p_42)))"
-"(if or-part_207"
-" or-part_207"
+"(if or-part_208"
+" or-part_208"
 "(if(parsed-s p_42)"
 "(syntax-inspector(parsed-s p_42))"
 " #f)))))))"
@@ -27946,8 +27956,8 @@ static const char *startup_source =
 "(extra-inspectors-merge)"
 "(lambda(extra-inspectors-1_0 extra-inspectors-2_0)"
 "(begin"
-"(if(let-values(((or-part_208)(not extra-inspectors-1_0)))"
-"(if or-part_208 or-part_208(not extra-inspectors-2_0)))"
+"(if(let-values(((or-part_209)(not extra-inspectors-1_0)))"
+"(if or-part_209 or-part_209(not extra-inspectors-2_0)))"
 "(let-values() #f)"
 "(if(if(set? extra-inspectors-1_0)(set? extra-inspectors-2_0) #f)"
 "(let-values()(set-union extra-inspectors-1_0 extra-inspectors-2_0))"
@@ -28210,7 +28220,7 @@ static const char *startup_source =
 "(let-values(((add-extra-insp?_0)"
 "(if extra-inspector_5(inspector-superior? extra-inspector_5 now-inspector_0) #f)))"
 "(let-values(((new-extra-inspectorss_0)"
-"(if(let-values(((or-part_209) add-insp?_0))(if or-part_209 or-part_209 add-extra-insp?_0))"
+"(if(let-values(((or-part_210) add-insp?_0))(if or-part_210 or-part_210 add-extra-insp?_0))"
 "(let-values()"
 "(let-values(((lst_181) imports_1))"
 "(begin"
@@ -28303,8 +28313,8 @@ static const char *startup_source =
 " extra-inspectorss_9)))"
 " extra-inspectorss_8)))))"
 " for-loop_199)"
-"(let-values(((or-part_210) extra-inspectorss_7))"
-"(if or-part_210 or-part_210(seteq)))"
+"(let-values(((or-part_211) extra-inspectorss_7))"
+"(if or-part_211 or-part_211(seteq)))"
 " lst_183)))))))"
 "(module-use*1.1 mpi_44 phase_73 new-extra-inspectorss_0 #f))))))))"
 "(define-values"
@@ -28446,13 +28456,13 @@ static const char *startup_source =
 "(lambda(phase_75)"
 "(begin"
 " 'find-or-create-header!"
-"(let-values(((or-part_204)"
+"(let-values(((or-part_205)"
 "(hash-ref"
 " phase-to-header_0"
 " phase_75"
 " #f)))"
-"(if or-part_204"
-" or-part_204"
+"(if or-part_205"
+" or-part_205"
 "(let-values(((header_7)"
 "(make-header"
 " mpis_15"
@@ -29220,16 +29230,16 @@ static const char *startup_source =
 "(find-or-create-header!_0"
 "(add1"
 " phase_78))))"
-"(if(let-values(((or-part_211)"
+"(if(let-values(((or-part_212)"
 "(parsed-#%declare?"
 " body_3)))"
-"(if or-part_211"
-" or-part_211"
-"(let-values(((or-part_212)"
-"(parsed-module?"
-" body_3)))"
 "(if or-part_212"
 " or-part_212"
+"(let-values(((or-part_213)"
+"(parsed-module?"
+" body_3)))"
+"(if or-part_213"
+" or-part_213"
 "(parsed-require?"
 " body_3)))))"
 "(let-values()"
@@ -29970,8 +29980,8 @@ static const char *startup_source =
 "(propagate-inline-property)"
 "(lambda(e_37 orig-s_22)"
 "(begin"
-"(let-values(((v_162)(syntax-property$1 orig-s_22 'compiler-hint:cross-module-inline)))"
-"(if v_162(correlated-property e_37 'compiler-hint:cross-module-inline v_162) e_37)))))"
+"(let-values(((v_164)(syntax-property$1 orig-s_22 'compiler-hint:cross-module-inline)))"
+"(if v_164(correlated-property e_37 'compiler-hint:cross-module-inline v_164) e_37)))))"
 "(define-values"
 "(make-module-use-to-linklet)"
 "(lambda(cross-linklet-inlining?_2 ns_57 get-module-linklet-info_1 init-mu*s_0)"
@@ -30026,10 +30036,10 @@ static const char *startup_source =
 "(let-values(((mu*_7) mu*-or-instance_0))"
 "(let-values(((mod-name_16)(1/module-path-index-resolve(module-use-module mu*_7))))"
 "(let-values(((mli_0)"
-"(let-values(((or-part_213)"
+"(let-values(((or-part_214)"
 "(get-module-linklet-info_1 mod-name_16(module-use-phase mu*_7))))"
-"(if or-part_213"
-" or-part_213"
+"(if or-part_214"
+" or-part_214"
 "(namespace->module-linklet-info"
 " ns_57"
 " mod-name_16"
@@ -30055,8 +30065,8 @@ static const char *startup_source =
 "(1/linklet-import-variables"
 "(module-linklet-info-linklet-or-instance mli_0)))"
 "((lst_217)"
-"(let-values(((or-part_214) extra-inspectorsss_3))"
-"(if or-part_214 or-part_214 mus_2))))"
+"(let-values(((or-part_215) extra-inspectorsss_3))"
+"(if or-part_215 or-part_215 mus_2))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -30725,8 +30735,8 @@ static const char *startup_source =
 " e18_1))))))"
 "(let-values(((n-args_0)"
 "(length e18_0)))"
-"(if(let-values(((or-part_215)"
 "(if(let-values(((or-part_216)"
+"(if(let-values(((or-part_217)"
 "(if(known-struct-op?"
 " d_19)"
 "(if(eq?"
@@ -30739,8 +30749,8 @@ static const char *startup_source =
 " n-args_0)"
 " #f)"
 " #f)))"
-"(if or-part_216"
-" or-part_216"
+"(if or-part_217"
+" or-part_217"
 "(if(known-function?"
 " d_19)"
 "(if(known-function-pure?"
@@ -30802,8 +30812,8 @@ static const char *startup_source =
 " #t"
 " lst_223)))"
 " #f)))"
-"(if or-part_215"
-" or-part_215"
+"(if or-part_216"
+" or-part_216"
 "(if(known-function-of-satisfying?"
 " d_19)"
 "(if(="
@@ -30906,24 +30916,24 @@ static const char *startup_source =
 "(if or-part_68"
 " or-part_68"
 "(if(symbol? v_4)"
-"(let-values(((or-part_217)"
+"(let-values(((or-part_218)"
 "(hash-ref"
 " locals_2"
 " v_4"
 " #f)))"
-"(if or-part_217"
-" or-part_217"
-"(let-values(((or-part_218)"
-"(lookup-defn"
-" defns_1"
-" v_4)))"
 "(if or-part_218"
 " or-part_218"
 "(let-values(((or-part_219)"
-"(built-in-symbol?"
+"(lookup-defn"
+" defns_1"
 " v_4)))"
 "(if or-part_219"
 " or-part_219"
+"(let-values(((or-part_220)"
+"(built-in-symbol?"
+" v_4)))"
+"(if or-part_220"
+" or-part_220"
 "(ready-variable?_0"
 " v_4)))))))"
 " #f)))"
@@ -31930,20 +31940,20 @@ static const char *startup_source =
 " quot59_1"
 " datum60_1)))"
 "(values #f #f #f #f)))))"
-"(if(let-values(((or-part_220)"
+"(if(let-values(((or-part_221)"
 "(if ok?_22"
 "(if(eq? 'quote quot59_0)"
-"(let-values(((or-part_221)"
+"(let-values(((or-part_222)"
 "(symbol?"
 " datum60_0)))"
-"(if or-part_221"
-" or-part_221"
+"(if or-part_222"
+" or-part_222"
 "(string?"
 " datum60_0)))"
 " #f)"
 " #f)))"
-"(if or-part_220"
-" or-part_220"
+"(if or-part_221"
+" or-part_221"
 "(null?(cdr(correlated-e e_40)))))"
 " 1"
 " #f)))"
@@ -31990,15 +32000,15 @@ static const char *startup_source =
 "(if(let-values(((s_358)"
 "(car"
 " s_248)))"
-"(let-values(((or-part_222)"
+"(let-values(((or-part_223)"
 "(if(1/syntax?"
 " s_358)"
 "(symbol?"
 "(syntax-e$2"
 " s_358))"
 " #f)))"
-"(if or-part_222"
-" or-part_222"
+"(if or-part_223"
+" or-part_223"
 "(symbol?"
 " s_358))))"
 "(let-values(((s_359)"
@@ -32015,15 +32025,15 @@ static const char *startup_source =
 "(if(let-values(((s_361)"
 "(car"
 " s_360)))"
-"(let-values(((or-part_223)"
+"(let-values(((or-part_224)"
 "(if(1/syntax?"
 " s_361)"
 "(symbol?"
 "(syntax-e$2"
 " s_361))"
 " #f)))"
-"(if or-part_223"
-" or-part_223"
+"(if or-part_224"
+" or-part_224"
 "(symbol?"
 " s_361))))"
 "(let-values(((s_362)"
@@ -32236,13 +32246,13 @@ static const char *startup_source =
 "(if ok?_23"
 "(let-values()"
 "(let-values(((c2_2)"
-"(let-values(((or-part_224)"
+"(let-values(((or-part_225)"
 "(hash-ref"
 " locals_2"
 " id:rator70_0"
 " #f)))"
-"(if or-part_224"
-" or-part_224"
+"(if or-part_225"
+" or-part_225"
 "(lookup-defn"
 " defns_1"
 " id:rator70_0)))))"
@@ -32464,8 +32474,8 @@ static const char *startup_source =
 " locals_0)))"
 "(not"
 "(if actual-results_0"
-"(let-values(((or-part_225)(not expected-results_0)))"
-"(if or-part_225 or-part_225(= actual-results_0 expected-results_0)))"
+"(let-values(((or-part_226)(not expected-results_0)))"
+"(if or-part_226 or-part_226(= actual-results_0 expected-results_0)))"
 " #f)))))))))))))"
 "(define-values"
 "(satisfies?)"
@@ -32664,11 +32674,11 @@ static const char *startup_source =
 "(let-values(((lst_242)(cdr l_58))"
 "((lst_243)"
 "(list"
-"(lambda(v_163)(quoted? symbol? v_163))"
-"(lambda(v_164)(is-lambda? v_164 2 defns_3))"
-"(lambda(v_165)(ok-make-struct-type-property-super? v_165 defns_3))"
-"(lambda(v_166)"
-"(let-values(((v103_0) v_166)((temp104_0) 1)((defns105_0) defns_3))"
+"(lambda(v_165)(quoted? symbol? v_165))"
+"(lambda(v_166)(is-lambda? v_166 2 defns_3))"
+"(lambda(v_167)(ok-make-struct-type-property-super? v_167 defns_3))"
+"(lambda(v_168)"
+"(let-values(((v103_0) v_168)((temp104_0) 1)((defns105_0) defns_3))"
 "(any-side-effects?9.1 defns105_0 #t #f #f #f #f v103_0 temp104_0))))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_242)))"
@@ -32700,17 +32710,17 @@ static const char *startup_source =
 " #f)))))"
 "(define-values"
 "(ok-make-struct-type-property-super?)"
-"(lambda(v_167 defns_4)"
+"(lambda(v_169 defns_4)"
 "(begin"
-"(let-values(((or-part_226)(quoted? null? v_167)))"
-"(if or-part_226"
-" or-part_226"
-"(let-values(((or-part_227)(eq? 'null(correlated-e v_167))))"
+"(let-values(((or-part_227)(quoted? null? v_169)))"
 "(if or-part_227"
 " or-part_227"
-"(if(pair?(correlated-e v_167))"
-"(if(eq?(correlated-e(car(correlated-e v_167))) 'list)"
-"(if(let-values(((lst_246)(cdr(correlated->list v_167))))"
+"(let-values(((or-part_228)(eq? 'null(correlated-e v_169))))"
+"(if or-part_228"
+" or-part_228"
+"(if(pair?(correlated-e v_169))"
+"(if(eq?(correlated-e(car(correlated-e v_169))) 'list)"
+"(if(let-values(((lst_246)(cdr(correlated->list v_169))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -32738,7 +32748,7 @@ static const char *startup_source =
 " 'cons"
 "(correlated-e"
 "(car prop+val_1)))"
-"(if(let-values(((or-part_228)"
+"(if(let-values(((or-part_229)"
 "(memq"
 "(correlated-e"
 "(list-ref"
@@ -32747,8 +32757,8 @@ static const char *startup_source =
 " '(prop:procedure"
 " prop:equal+hash"
 " prop:custom-write))))"
-"(if or-part_228"
-" or-part_228"
+"(if or-part_229"
+" or-part_229"
 "(known-property?"
 "(lookup-defn"
 " defns_4"
@@ -32788,9 +32798,9 @@ static const char *startup_source =
 " #t"
 " lst_246)))"
 "(="
-"(sub1(correlated-length v_167))"
+"(sub1(correlated-length v_169))"
 "(set-count"
-"(let-values(((lst_248)(cdr(correlated->list v_167))))"
+"(let-values(((lst_248)(cdr(correlated->list v_169))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -32841,21 +32851,21 @@ static const char *startup_source =
 "(field-count-expr-to-field-count init-field-count-expr_0)"
 "(field-count-expr-to-field-count auto-field-count-expr_0))))"
 "(let-values(((immutables-expr_0)"
-"(let-values(((or-part_229)(if(>(length l_59) 9)(list-ref l_59 9) #f)))"
-"(if or-part_229 or-part_229 'null))))"
+"(let-values(((or-part_230)(if(>(length l_59) 9)(list-ref l_59 9) #f)))"
+"(if or-part_230 or-part_230 'null))))"
 "(let-values(((super-expr_0)(if(>(length l_59) 2)(list-ref l_59 2) #f)))"
 "(if(>=(length l_59) 5)"
 "(if(<=(length l_59) 12)"
 "(let-values(((lst_250)(cdr l_59))"
 "((lst_251)"
 "(list"
-"(lambda(v_168)(quoted? symbol? v_168))"
-"(lambda(v_169)(super-ok? v_169 defns_5))"
-"(lambda(v_170)(field-count-expr-to-field-count v_170))"
-"(lambda(v_171)(field-count-expr-to-field-count v_171))"
-"(lambda(v_172)"
+"(lambda(v_170)(quoted? symbol? v_170))"
+"(lambda(v_171)(super-ok? v_171 defns_5))"
+"(lambda(v_172)(field-count-expr-to-field-count v_172))"
+"(lambda(v_173)(field-count-expr-to-field-count v_173))"
+"(lambda(v_174)"
 "(not"
-"(let-values(((v109_0) v_172)"
+"(let-values(((v109_0) v_174)"
 "((temp110_0) 1)"
 "((ready-variable?111_0) ready-variable?_1)"
 "((defns112_0) defns_5))"
@@ -32868,11 +32878,11 @@ static const char *startup_source =
 " #t"
 " v109_0"
 " temp110_0))))"
-"(lambda(v_173)"
-"(known-good-struct-properties? v_173 immutables-expr_0 super-expr_0 defns_5))"
-"(lambda(v_174)(inspector-or-false? v_174))"
-"(lambda(v_175)(procedure-spec? v_175 num-fields_0))"
-"(lambda(v_176)(immutables-ok? v_176 init-field-count-expr_0)))))"
+"(lambda(v_175)"
+"(known-good-struct-properties? v_175 immutables-expr_0 super-expr_0 defns_5))"
+"(lambda(v_176)(inspector-or-false? v_176))"
+"(lambda(v_177)(procedure-spec? v_177 num-fields_0))"
+"(lambda(v_178)(immutables-ok? v_178 init-field-count-expr_0)))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -32913,9 +32923,9 @@ static const char *startup_source =
 "(super-ok?)"
 "(lambda(e_67 defns_6)"
 "(begin"
-"(let-values(((or-part_230)(quoted? false? e_67)))"
-"(if or-part_230"
-" or-part_230"
+"(let-values(((or-part_231)(quoted? false? e_67)))"
+"(if or-part_231"
+" or-part_231"
 "(let-values(((o_0)(lookup-defn defns_6(correlated-e e_67))))"
 "(if o_0(if(known-struct-op? o_0)(eq? 'struct-type(known-struct-op-type o_0)) #f) #f)))))))"
 "(define-values"
@@ -32926,49 +32936,49 @@ static const char *startup_source =
 "(+(field-count-expr-to-field-count(list-ref l_60 3))(field-count-expr-to-field-count(list-ref l_60 4)))))))"
 "(define-values"
 "(quoted?)"
-"(lambda(val?_0 v_177)"
+"(lambda(val?_0 v_179)"
 "(begin"
-"(let-values(((or-part_231)"
-"(if(pair?(correlated-e v_177))"
-"(if(eq?(correlated-e(car(correlated-e v_177))) 'quote)"
-"(val?_0(correlated-e(correlated-cadr v_177)))"
+"(let-values(((or-part_232)"
+"(if(pair?(correlated-e v_179))"
+"(if(eq?(correlated-e(car(correlated-e v_179))) 'quote)"
+"(val?_0(correlated-e(correlated-cadr v_179)))"
 " #f)"
 " #f)))"
-"(if or-part_231 or-part_231(val?_0(correlated-e v_177)))))))"
+"(if or-part_232 or-part_232(val?_0(correlated-e v_179)))))))"
 "(define-values"
 "(quoted-value)"
-"(lambda(v_178)"
-"(begin(if(pair?(correlated-e v_178))(correlated-e(correlated-cadr v_178))(correlated-e v_178)))))"
-"(define-values(false?)(lambda(v_179)(begin(eq?(correlated-e v_179) #f))))"
+"(lambda(v_180)"
+"(begin(if(pair?(correlated-e v_180))(correlated-e(correlated-cadr v_180))(correlated-e v_180)))))"
+"(define-values(false?)(lambda(v_181)(begin(eq?(correlated-e v_181) #f))))"
 "(define-values"
 "(field-count-expr-to-field-count)"
-"(lambda(v_180)(begin(if(quoted? exact-nonnegative-integer? v_180)(quoted-value v_180) #f))))"
+"(lambda(v_182)(begin(if(quoted? exact-nonnegative-integer? v_182)(quoted-value v_182) #f))))"
 "(define-values"
 "(inspector-or-false?)"
-"(lambda(v_181)"
+"(lambda(v_183)"
 "(begin"
-"(let-values(((or-part_232)(quoted? false? v_181)))"
-"(if or-part_232"
-" or-part_232"
-"(let-values(((or-part_233)(if(quoted? symbol? v_181)(eq? 'prefab(quoted-value v_181)) #f)))"
+"(let-values(((or-part_233)(quoted? false? v_183)))"
 "(if or-part_233"
 " or-part_233"
-"(if(= 1(correlated-length v_181))"
-"(eq? 'current-inspector(correlated-e(car(correlated-e v_181))))"
+"(let-values(((or-part_234)(if(quoted? symbol? v_183)(eq? 'prefab(quoted-value v_183)) #f)))"
+"(if or-part_234"
+" or-part_234"
+"(if(= 1(correlated-length v_183))"
+"(eq? 'current-inspector(correlated-e(car(correlated-e v_183))))"
 " #f))))))))"
 "(define-values"
 "(known-good-struct-properties?)"
-"(lambda(v_182 immutables-expr_1 super-expr_1 defns_7)"
+"(lambda(v_184 immutables-expr_1 super-expr_1 defns_7)"
 "(begin"
-"(let-values(((or-part_234)(quoted? null? v_182)))"
-"(if or-part_234"
-" or-part_234"
-"(let-values(((or-part_235)(eq? 'null(correlated-e v_182))))"
+"(let-values(((or-part_235)(quoted? null? v_184)))"
 "(if or-part_235"
 " or-part_235"
-"(if(pair?(correlated-e v_182))"
-"(if(eq?(correlated-e(car(correlated-e v_182))) 'list)"
-"(if(let-values(((lst_254)(cdr(correlated->list v_182))))"
+"(let-values(((or-part_236)(eq? 'null(correlated-e v_184))))"
+"(if or-part_236"
+" or-part_236"
+"(if(pair?(correlated-e v_184))"
+"(if(eq?(correlated-e(car(correlated-e v_184))) 'list)"
+"(if(let-values(((lst_254)(cdr(correlated->list v_184))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -33015,9 +33025,9 @@ static const char *startup_source =
 " #t"
 " lst_254)))"
 "(="
-"(sub1(correlated-length v_182))"
+"(sub1(correlated-length v_184))"
 "(set-count"
-"(let-values(((lst_256)(cdr(correlated->list v_182))))"
+"(let-values(((lst_256)(cdr(correlated->list v_184))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -33064,12 +33074,12 @@ static const char *startup_source =
 "(let-values(((tmp_27) prop-name_0))"
 "(if(equal? tmp_27 'prop:evt)"
 "(let-values()"
-"(let-values(((or-part_236)(is-lambda? val-expr_0 1 defns_8)))"
-"(if or-part_236 or-part_236(immutable-field? val-expr_0 immutables-expr_2))))"
-"(if(equal? tmp_27 'prop:procedure)"
-"(let-values()"
 "(let-values(((or-part_237)(is-lambda? val-expr_0 1 defns_8)))"
 "(if or-part_237 or-part_237(immutable-field? val-expr_0 immutables-expr_2))))"
+"(if(equal? tmp_27 'prop:procedure)"
+"(let-values()"
+"(let-values(((or-part_238)(is-lambda? val-expr_0 1 defns_8)))"
+"(if or-part_238 or-part_238(immutable-field? val-expr_0 immutables-expr_2))))"
 "(if(equal? tmp_27 'prop:custom-write)"
 "(let-values()(is-lambda? val-expr_0 3 defns_8))"
 "(if(equal? tmp_27 'prop:equal+hash)"
@@ -33105,26 +33115,26 @@ static const char *startup_source =
 "(lambda(expr_9 arity_0 defns_9)"
 "(begin"
 "(let-values(((lookup_0)(lookup-defn defns_9 expr_9)))"
-"(let-values(((or-part_238)"
+"(let-values(((or-part_239)"
 "(if lookup_0"
 "(if(known-function? lookup_0)"
-"(let-values(((or-part_239)(not arity_0)))"
-"(if or-part_239 or-part_239(arity-includes?(known-function-arity lookup_0) arity_0)))"
+"(let-values(((or-part_240)(not arity_0)))"
+"(if or-part_240 or-part_240(arity-includes?(known-function-arity lookup_0) arity_0)))"
 " #f)"
 " #f)))"
-"(if or-part_238"
-" or-part_238"
-"(let-values(((or-part_240)"
+"(if or-part_239"
+" or-part_239"
+"(let-values(((or-part_241)"
 "(if(pair?(correlated-e expr_9))"
 "(if(eq? 'case-lambda(car(correlated-e expr_9)))(not arity_0) #f)"
 " #f)))"
-"(if or-part_240"
-" or-part_240"
-"(if(pair?(correlated-e expr_9))"
-"(if(eq? 'lambda(car(correlated-e expr_9)))"
-"(let-values(((or-part_241)(not arity_0)))"
 "(if or-part_241"
 " or-part_241"
+"(if(pair?(correlated-e expr_9))"
+"(if(eq? 'lambda(car(correlated-e expr_9)))"
+"(let-values(((or-part_242)(not arity_0)))"
+"(if or-part_242"
+" or-part_242"
 "((letrec-values(((loop_91)"
 "(lambda(args_4 arity_1)"
 "(begin"
@@ -33145,9 +33155,9 @@ static const char *startup_source =
 "(arity-includes?)"
 "(lambda(a_40 n_25)"
 "(begin"
-"(let-values(((or-part_242)(equal? a_40 n_25)))"
-"(if or-part_242"
-" or-part_242"
+"(let-values(((or-part_243)(equal? a_40 n_25)))"
+"(if or-part_243"
+" or-part_243"
 "(if(list? a_40)"
 "(let-values(((lst_258) a_40))"
 "(begin"
@@ -33188,28 +33198,28 @@ static const char *startup_source =
 "(let-values(((tmp_28)(if(pair?(correlated-e e_69))(correlated-e(car(correlated-e e_69))) #f)))"
 "(if(equal? tmp_28 'quote)"
 "(let-values()"
-"(let-values(((v_183)(correlated-cadr e_69)))"
-"(let-values(((or-part_243)"
-"(if(correlated-length v_183)"
-"(let-values(((l_62)(map2 correlated-e(correlated->list v_183))))"
+"(let-values(((v_185)(correlated-cadr e_69)))"
+"(let-values(((or-part_244)"
+"(if(correlated-length v_185)"
+"(let-values(((l_62)(map2 correlated-e(correlated->list v_185))))"
 "(if(andmap2 exact-nonnegative-integer? l_62)"
 "(if(=(length l_62)(set-count(list->set l_62))) l_62 #f)"
 " #f))"
 " #f)))"
-"(if or-part_243 or-part_243 fail-v_0))))"
+"(if or-part_244 or-part_244 fail-v_0))))"
 "(let-values() fail-v_0))))))"
 "(define-values"
 "(procedure-spec?)"
 "(lambda(e_70 field-count_1)"
 "(begin"
-"(let-values(((or-part_244)(quoted? false? e_70)))"
-"(if or-part_244"
-" or-part_244"
-"(let-values(((or-part_245)"
+"(let-values(((or-part_245)(quoted? false? e_70)))"
+"(if or-part_245"
+" or-part_245"
+"(let-values(((or-part_246)"
 "(if(quoted? exact-nonnegative-integer? e_70)"
 "(if field-count_1(<(quoted-value e_70) field-count_1) #f)"
 " #f)))"
-"(if or-part_245 or-part_245(is-lambda? e_70 #f '#hasheq()))))))))"
+"(if or-part_246 or-part_246(is-lambda? e_70 #f '#hasheq()))))))))"
 "(define-values"
 "(immutables-ok?)"
 "(lambda(e_71 init-field-count-expr_1)"
@@ -33247,16 +33257,16 @@ static const char *startup_source =
 "(begin"
 "(let-values(((l_64)(correlated->list e_72)))"
 "(let-values(((a_42)"
-"(if(let-values(((or-part_246)(=(length l_64) 3)))"
-"(if or-part_246 or-part_246(=(length l_64) 4)))"
-"(let-values(((or-part_247)(hash-ref locals_17(correlated-e(list-ref l_64 1)) #f)))"
-"(if or-part_247 or-part_247(lookup-defn defns_10(correlated-e(list-ref l_64 1)))))"
+"(if(let-values(((or-part_247)(=(length l_64) 3)))"
+"(if or-part_247 or-part_247(=(length l_64) 4)))"
+"(let-values(((or-part_248)(hash-ref locals_17(correlated-e(list-ref l_64 1)) #f)))"
+"(if or-part_248 or-part_248(lookup-defn defns_10(correlated-e(list-ref l_64 1)))))"
 " #f)))"
 "(if(known-struct-op? a_42)"
 "(if(eq?(known-struct-op-type a_42) type_1)"
 "(if(<(field-count-expr-to-field-count(list-ref l_64 2))(known-struct-op-field-count a_42))"
-"(let-values(((or-part_248)(=(length l_64) 3)))"
-"(if or-part_248 or-part_248(quoted? symbol?(list-ref l_64 3))))"
+"(let-values(((or-part_249)(=(length l_64) 3)))"
+"(if or-part_249 or-part_249(quoted? symbol?(list-ref l_64 3))))"
 " #f)"
 " #f)"
 " #f))))))"
@@ -33678,9 +33688,9 @@ static const char *startup_source =
 "(begin"
 "(if prev-id_0"
 "(if(not(bound-identifier=?$1 prev-id_0 id_55 phase_76))"
-"(let-values(((or-part_249)(not top-level-bind-scope_5)))"
-"(if or-part_249"
-" or-part_249"
+"(let-values(((or-part_250)(not top-level-bind-scope_5)))"
+"(if or-part_250"
+" or-part_250"
 "(not"
 "(bound-identifier=?$1"
 "(remove-scope prev-id_0 top-level-bind-scope_5)"
@@ -33985,11 +33995,11 @@ static const char *startup_source =
 "(begin"
 "(let-values(((outside-mpi_0)(root-expand-context-self-mpi root-context_0)))"
 "(let-values(((inside-mpi_0)(make-self-module-path-index(module-path-index-resolved outside-mpi_0))))"
-"(let-values(((v_184) root-context_0))"
-"(let-values(((the-struct_52) v_184))"
+"(let-values(((v_186) root-context_0))"
+"(let-values(((the-struct_52) v_186))"
 "(if(root-expand-context/outer? the-struct_52)"
 "(let-values(((inner16_0)"
-"(let-values(((the-struct_53)(root-expand-context/outer-inner v_184)))"
+"(let-values(((the-struct_53)(root-expand-context/outer-inner v_186)))"
 "(if(root-expand-context/inner? the-struct_53)"
 "(let-values(((self-mpi17_0) inside-mpi_0)"
 "((all-scopes-stx18_0)"
@@ -34146,20 +34156,20 @@ static const char *startup_source =
 "(namespace-inspector"
 "(module-instance-namespace"
 " mi_16))))"
-"(if(let-values(((or-part_250)"
+"(if(let-values(((or-part_251)"
 "(inspector-superior?"
 " insp_10"
 " guard-insp_3)))"
-"(if or-part_250"
-" or-part_250"
-"(let-values(((or-part_251)"
+"(if or-part_251"
+" or-part_251"
+"(let-values(((or-part_252)"
 "(if extra-inspector_0"
 "(inspector-superior?"
 " extra-inspector_0"
 " guard-insp_3)"
 " #f)))"
-"(if or-part_251"
-" or-part_251"
+"(if or-part_252"
+" or-part_252"
 "(if extra-inspectorsss_4"
 "(if extra-inspectorss_14"
 "(extra-inspectors-allow?"
@@ -34217,15 +34227,15 @@ static const char *startup_source =
 "(let-values() #t)"
 "(let-values()"
 "(let-values(((access_3)"
-"(let-values(((or-part_252)(module-access m_16)))"
-"(if or-part_252 or-part_252(module-compute-access! m_16)))))"
+"(let-values(((or-part_253)(module-access m_16)))"
+"(if or-part_253 or-part_253(module-compute-access! m_16)))))"
 "(let-values(((a_44)(hash-ref(hash-ref access_3 phase_90 '#hasheq()) sym_60 'unexported)))"
-"(if(let-values(((or-part_253)(eq? a_44 'unexported)))"
-"(if or-part_253 or-part_253(eq? a_44 'protected)))"
+"(if(let-values(((or-part_254)(eq? a_44 'unexported)))"
+"(if or-part_254 or-part_254(eq? a_44 'protected)))"
 "(let-values()"
 "(let-values(((guard-insp_4)(namespace-inspector(module-instance-namespace mi_17))))"
-"(let-values(((or-part_254)(if insp_11(inspector-superior? insp_11 guard-insp_4) #f)))"
-"(if or-part_254 or-part_254(inspector-superior?(current-code-inspector) guard-insp_4)))))"
+"(let-values(((or-part_255)(if insp_11(inspector-superior? insp_11 guard-insp_4) #f)))"
+"(if or-part_255 or-part_255(inspector-superior?(current-code-inspector) guard-insp_4)))))"
 "(let-values() #t))))))))))"
 "(define-values(module-cache)(make-weak-hasheq))"
 "(define-values"
@@ -34302,7 +34312,7 @@ static const char *startup_source =
 "(let-values(((phase-level_17)"
 " pos_98))"
 "(let-values(((table_186)"
-"(let-values(((v_185)"
+"(let-values(((v_187)"
 "(hash-ref"
 " h_1"
 " phase-level_17"
@@ -34317,7 +34327,7 @@ static const char *startup_source =
 "(let-values(((table_188)"
 "(let-values(((table_189)"
 " table_187))"
-"(if v_185"
+"(if v_187"
 "(let-values(((table_190)"
 " table_189))"
 "(let-values(((table_191)"
@@ -34328,7 +34338,7 @@ static const char *startup_source =
 "(values"
 " phase-level_17"
 "(1/eval-linklet"
-" v_185)))))"
+" v_187)))))"
 "(hash-set"
 " table_190"
 " key_68"
@@ -35642,9 +35652,9 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_208)(symbol? name_54)))"
-"(if or-part_208"
-" or-part_208"
+"(if(let-values(((or-part_209)(symbol? name_54)))"
+"(if or-part_209"
+" or-part_209"
 "(if(pair? name_54)(if(list? name_54)(andmap2 symbol? name_54) #f) #f)))"
 "(void)"
 "(let-values()"
@@ -36653,10 +36663,10 @@ static const char *startup_source =
 "(hash-set"
 " bundle_2"
 " 'decl"
-"(let-values(((or-part_255)"
+"(let-values(((or-part_256)"
 " declaration-linklet_0))"
-"(if or-part_255"
-" or-part_255"
+"(if or-part_256"
+" or-part_256"
 " 'in-memory)))))"
 "(let-values(((bundle_4)"
 "(if data-linklet_0"
@@ -37850,7 +37860,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                    (raise-argument-error 'for/vector \"exact-nonnegative-integer?\" len_33)))"
-"(let-values(((v_186)(make-vector len_33 0)))"
+"(let-values(((v_188)(make-vector len_33 0)))"
 "(begin"
 "(if(zero? len_33)"
 "(void)"
@@ -37875,7 +37885,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_186"
+" v_188"
 " i_164"
 "(let-values()"
 "(swap-top-level-scopes"
@@ -37899,7 +37909,7 @@ static const char *startup_source =
 " for-loop_252)"
 " 0"
 " 0)))))"
-" v_186)))))))))"
+" v_188)))))))))"
 "(1/make-instance"
 " 'link"
 " #f"
@@ -38401,12 +38411,12 @@ static const char *startup_source =
 "(lambda(module-lifts_2 s_420 phase_103)"
 "(begin"
 "(begin"
-"(if(let-values(((or-part_212)"
+"(if(let-values(((or-part_213)"
 "(if(module-lift-context? module-lifts_2)"
 "(module-lift-context-module*-ok? module-lifts_2)"
 " #f)))"
-"(if or-part_212"
-" or-part_212"
+"(if or-part_213"
+" or-part_213"
 "(if(lift-context? module-lifts_2)(lift-context-module*-ok? module-lifts_2) #f)))"
 "(void)"
 "(let-values()"
@@ -38791,8 +38801,8 @@ static const char *startup_source =
 "(let-values(((c1_29)(hash-ref key->arity key_81 #f)))"
 "(if c1_29"
 "((lambda(arity_2)"
-"(if(let-values(((or-part_219)(eq? arity_2 'any)))"
-"(if or-part_219 or-part_219(eqv?(length args_5) arity_2)))"
+"(if(let-values(((or-part_220)(eq? arity_2 'any)))"
+"(if or-part_220 or-part_220(eqv?(length args_5) arity_2)))"
 "(void)"
 "                 (let-values () (error 'call-expand-observe \"wrong arity for ~s: ~e\" key_81 args_5))))"
 " c1_29)"
@@ -38990,9 +39000,9 @@ static const char *startup_source =
 "(let-values(((i_26)(unsafe-car lst_279))((rest_151)(unsafe-cdr lst_279)))"
 "(let-values(((fold-var_227)"
 "(let-values(((fold-var_228) fold-var_5))"
-"(if(let-values(((or-part_256)(parsed? i_26)))"
-"(if or-part_256"
-" or-part_256"
+"(if(let-values(((or-part_257)(parsed? i_26)))"
+"(if or-part_257"
+" or-part_257"
 "(let-values(((or-part_34)(expanded+parsed? i_26)))"
 "(if or-part_34"
 " or-part_34"
@@ -39190,7 +39200,7 @@ static const char *startup_source =
 "(expand-identifier)"
 "(lambda(s_425 ctx_15 alternate-id_1)"
 "(begin"
-"(let-values(((id_60)(let-values(((or-part_257) alternate-id_1))(if or-part_257 or-part_257 s_425))))"
+"(let-values(((id_60)(let-values(((or-part_258) alternate-id_1))(if or-part_258 or-part_258 s_425))))"
 "(if(if(not(free-id-set-empty?(expand-context-stops ctx_15)))"
 "(free-id-set-member?(expand-context-stops ctx_15)(expand-context-phase ctx_15) id_60)"
 " #f)"
@@ -39488,9 +39498,9 @@ static const char *startup_source =
 "(let-values(((ae_0)(syntax-e$1 s_427)))"
 "(let-values(((exp-s_0)(already-expanded-s ae_0)))"
 "(begin"
-"(if(let-values(((or-part_258)(syntax-any-macro-scopes? s_427)))"
-"(if or-part_258"
-" or-part_258"
+"(if(let-values(((or-part_259)(syntax-any-macro-scopes? s_427)))"
+"(if or-part_259"
+" or-part_259"
 "(let-values(((or-part_102)"
 "(not"
 "(eq?(expand-context-binding-layer ctx_18)(already-expanded-binding-layer ae_0)))))"
@@ -39735,9 +39745,9 @@ static const char *startup_source =
 " id_64)"
 " #f))"
 "((temp198_0)"
-"(let-values(((or-part_259)"
+"(let-values(((or-part_260)"
 "(expand-context-only-immediate? ctx_23)))"
-"(if or-part_259 or-part_259(1/rename-transformer? t_52))))"
+"(if or-part_260 or-part_260(1/rename-transformer? t_52))))"
 "((fail-non-transformer199_0) fail-non-transformer_4))"
 "(expand9.1"
 " temp197_0"
@@ -39750,18 +39760,18 @@ static const char *startup_source =
 " re-ctx196_0)))))))))))))))))))))"
 "(define-values"
 "(dispatch-variable)"
-"(lambda(t_53 s_429 id_65 ctx_6 binding_22 primitive?_6 protected?_7)"
+"(lambda(t_53 s_429 id_65 ctx_24 binding_22 primitive?_6 protected?_7)"
 "(begin"
-"(if(expand-context-only-immediate? ctx_6)"
+"(if(expand-context-only-immediate? ctx_24)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_20)(expand-context-observer ctx_6)))"
+"(let-values(((obs_20)(expand-context-observer ctx_24)))"
 "(if obs_20(let-values()(let-values()(call-expand-observe obs_20 'exit-check s_429)))(void)))"
 " id_65))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_21)(expand-context-observer ctx_6)))"
+"(let-values(((obs_21)(expand-context-observer ctx_24)))"
 "(if obs_21"
 "(let-values()(let-values()(call-expand-observe obs_21 'variable s_429 id_65)))"
 "(void)))"
@@ -39771,9 +39781,9 @@ static const char *startup_source =
 "(let-values(((id200_0) id_65)"
 "((t201_0) t_53)"
 "((temp202_0)"
-"(free-id-set-empty-or-just-module*?(expand-context-stops ctx_6))))"
+"(free-id-set-empty-or-just-module*?(expand-context-stops ctx_24))))"
 "(substitute-variable6.1 temp202_0 id200_0 t201_0))))"
-"(if(if(expand-context-to-parsed? ctx_6)(free-id-set-empty?(expand-context-stops ctx_6)) #f)"
+"(if(if(expand-context-to-parsed? ctx_24)(free-id-set-empty?(expand-context-stops ctx_24)) #f)"
 "(let-values()"
 "(let-values(((prop-s_0)(keep-properties-only~ result-s_4)))"
 "(let-values(((insp_16)(syntax-inspector result-s_4)))"
@@ -39784,7 +39794,7 @@ static const char *startup_source =
 "(let-values(((protected-result-s_0)"
 "(if protected?_7(syntax-property$1 result-s_4 'protected #t) result-s_4)))"
 "(begin"
-"(let-values(((obs_22)(expand-context-observer ctx_6)))"
+"(let-values(((obs_22)(expand-context-observer ctx_24)))"
 "(if obs_22"
 "(let-values()(let-values()(call-expand-observe obs_22 'return protected-result-s_0)))"
 "(void)))"
@@ -39798,14 +39808,14 @@ static const char *startup_source =
 "(let-values(((insp-of-t_5) insp-of-t47_0))"
 "(let-values(((s_430) s48_0))"
 "(let-values(((id_30) id49_1))"
-"(let-values(((ctx_24) ctx50_0))"
+"(let-values(((ctx_25) ctx50_0))"
 "(let-values(((binding_23) binding51_0))"
 "(let-values(((origin-id_0)(if origin-id45_0 origin-id44_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_23)(expand-context-observer ctx_24)))"
+"(let-values(((obs_23)(expand-context-observer ctx_25)))"
 "(if obs_23"
 "(let-values()"
 "(let-values()(call-expand-observe obs_23 'enter-macro s_430)))"
@@ -39815,28 +39825,28 @@ static const char *startup_source =
 "(let-values(((intro-scope_0)(new-scope 'macro)))"
 "(let-values(((intro-s_0)(flip-scope disarmed-s_3 intro-scope_0)))"
 "(let-values(((use-s_0 use-scopes_0)"
-"(maybe-add-use-site-scope intro-s_0 ctx_24 binding_23)))"
+"(maybe-add-use-site-scope intro-s_0 ctx_25 binding_23)))"
 "(let-values(((cleaned-s_0)(syntax-remove-taint-dispatch-properties use-s_0)))"
 "(let-values(((def-ctx-scopes_1)(box null)))"
 "(let-values(((transformed-s_0)"
 "(apply-transformer-in-context"
 " t_54"
 " cleaned-s_0"
-" ctx_24"
+" ctx_25"
 " insp-of-t_5"
 " intro-scope_0"
 " use-scopes_0"
 " def-ctx-scopes_1"
 " id_30)))"
 "(let-values(((result-s_5)(flip-scope transformed-s_0 intro-scope_0)))"
-"(let-values(((post-s_0)(maybe-add-post-expansion-scope result-s_5 ctx_24)))"
+"(let-values(((post-s_0)(maybe-add-post-expansion-scope result-s_5 ctx_25)))"
 "(let-values(((tracked-s_0)"
 "(syntax-track-origin$1"
 " post-s_0"
 " cleaned-s_0"
-"(let-values(((or-part_260) origin-id_0))"
-"(if or-part_260"
-" or-part_260"
+"(let-values(((or-part_261) origin-id_0))"
+"(if or-part_261"
+" or-part_261"
 "(if(syntax-identifier? s_430)"
 " s_430"
 "(car(syntax-e$1 s_430))))))))"
@@ -39844,9 +39854,9 @@ static const char *startup_source =
 "(taint-dispatch"
 " tracked-s_0"
 "(lambda(t-s_0)(syntax-rearm$1 t-s_0 s_430))"
-"(expand-context-phase ctx_24))))"
+"(expand-context-phase ctx_25))))"
 "(begin"
-"(let-values(((obs_24)(expand-context-observer ctx_24)))"
+"(let-values(((obs_24)(expand-context-observer ctx_25)))"
 "(if obs_24"
 "(let-values()"
 "(let-values()"
@@ -39855,43 +39865,43 @@ static const char *startup_source =
 "(values"
 " rearmed-s_0"
 "(accumulate-def-ctx-scopes"
-" ctx_24"
+" ctx_25"
 " def-ctx-scopes_1)))))))))))))))))))))))))))"
 "(define-values"
 "(apply-transformer-in-context)"
-"(lambda(t_55 cleaned-s_1 ctx_25 insp-of-t_6 intro-scope_1 use-scopes_1 def-ctx-scopes_2 id_66)"
+"(lambda(t_55 cleaned-s_1 ctx_26 insp-of-t_6 intro-scope_1 use-scopes_1 def-ctx-scopes_2 id_66)"
 "(begin"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_25)(expand-context-observer ctx_25)))"
+"(let-values(((obs_25)(expand-context-observer ctx_26)))"
 "(if obs_25"
 "(let-values()(let-values()(call-expand-observe obs_25 'macro-pre-x cleaned-s_1)))"
 "(void)))"
 "(values))))"
 "(let-values(((confine-def-ctx-scopes?_0)"
 "(not"
-"(let-values(((or-part_261)(expand-context-only-immediate? ctx_25)))"
-"(if or-part_261"
-" or-part_261"
-"(not(free-id-set-empty-or-just-module*?(expand-context-stops ctx_25))))))))"
+"(let-values(((or-part_262)(expand-context-only-immediate? ctx_26)))"
+"(if or-part_262"
+" or-part_262"
+"(not(free-id-set-empty-or-just-module*?(expand-context-stops ctx_26))))))))"
 "(let-values(((accum-ctx_0)"
 "(if(if confine-def-ctx-scopes?_0"
-"(if(expand-context-def-ctx-scopes ctx_25)"
-"(not(null?(unbox(expand-context-def-ctx-scopes ctx_25))))"
+"(if(expand-context-def-ctx-scopes ctx_26)"
+"(not(null?(unbox(expand-context-def-ctx-scopes ctx_26))))"
 " #f)"
 " #f)"
-"(accumulate-def-ctx-scopes ctx_25(expand-context-def-ctx-scopes ctx_25))"
-" ctx_25)))"
+"(accumulate-def-ctx-scopes ctx_26(expand-context-def-ctx-scopes ctx_26))"
+" ctx_26)))"
 "(let-values(((m-ctx_0)"
-"(let-values(((v_187) accum-ctx_0))"
-"(let-values(((the-struct_56) v_187))"
+"(let-values(((v_189) accum-ctx_0))"
+"(let-values(((the-struct_56) v_189))"
 "(if(expand-context/outer? the-struct_56)"
 "(let-values(((current-introduction-scopes203_0)(cons intro-scope_1 use-scopes_1))"
 "((def-ctx-scopes204_0)"
 "(if confine-def-ctx-scopes?_0"
 " def-ctx-scopes_2"
-"(expand-context-def-ctx-scopes ctx_25)))"
-"((inner205_0)(root-expand-context/outer-inner v_187)))"
+"(expand-context-def-ctx-scopes ctx_26)))"
+"((inner205_0)(root-expand-context/outer-inner v_189)))"
 "(expand-context/outer1.1"
 " inner205_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_56)"
@@ -39918,16 +39928,16 @@ static const char *startup_source =
 " m-ctx_0"
 " 1/current-namespace"
 "(namespace->namespace-at-phase"
-"(expand-context-namespace ctx_25)"
-"(add1(expand-context-phase ctx_25)))"
+"(expand-context-namespace ctx_26)"
+"(add1(expand-context-phase ctx_26)))"
 " current-module-code-inspector"
-"(let-values(((or-part_262) insp-of-t_6))"
-"(if or-part_262 or-part_262(current-module-code-inspector))))"
+"(let-values(((or-part_263) insp-of-t_6))"
+"(if or-part_263 or-part_263(current-module-code-inspector))))"
 "(let-values()"
 "(call-with-continuation-barrier"
 "(lambda()((transformer->procedure t_55) cleaned-s_1)))))))"
 "(begin"
-"(let-values(((obs_26)(expand-context-observer ctx_25)))"
+"(let-values(((obs_26)(expand-context-observer ctx_26)))"
 "(if obs_26"
 "(let-values()"
 "(let-values()(call-expand-observe obs_26 'macro-post-x transformed-s_1 cleaned-s_1)))"
@@ -39943,14 +39953,14 @@ static const char *startup_source =
 " transformed-s_1)))))))))"
 "(define-values"
 "(maybe-add-use-site-scope)"
-"(lambda(s_431 ctx_26 binding_24)"
+"(lambda(s_431 ctx_27 binding_24)"
 "(begin"
-"(if(if(root-expand-context-use-site-scopes ctx_26)"
-"(matching-frame?(root-expand-context-frame-id ctx_26)(binding-frame-id binding_24))"
+"(if(if(root-expand-context-use-site-scopes ctx_27)"
+"(matching-frame?(root-expand-context-frame-id ctx_27)(binding-frame-id binding_24))"
 " #f)"
 "(let-values()"
 "(let-values(((sc_30)(new-scope 'use-site)))"
-"(let-values(((b_80)(root-expand-context-use-site-scopes ctx_26)))"
+"(let-values(((b_80)(root-expand-context-use-site-scopes ctx_27)))"
 "(begin(set-box! b_80(cons sc_30(unbox b_80)))(values(add-scope s_431 sc_30)(list sc_30))))))"
 "(let-values()(values s_431 null))))))"
 "(define-values"
@@ -39958,28 +39968,28 @@ static const char *startup_source =
 "(lambda(current-frame-id_0 bind-frame-id_0)"
 "(begin"
 "(if current-frame-id_0"
-"(let-values(((or-part_263)(eq? current-frame-id_0 bind-frame-id_0)))"
-"(if or-part_263 or-part_263(eq? current-frame-id_0 'all)))"
+"(let-values(((or-part_264)(eq? current-frame-id_0 bind-frame-id_0)))"
+"(if or-part_264 or-part_264(eq? current-frame-id_0 'all)))"
 " #f))))"
 "(define-values"
 "(maybe-add-post-expansion-scope)"
-"(lambda(s_240 ctx_27)"
+"(lambda(s_240 ctx_28)"
 "(begin"
-"(if(root-expand-context-post-expansion-scope ctx_27)"
+"(if(root-expand-context-post-expansion-scope ctx_28)"
 "(let-values()"
-"((expand-context-post-expansion-scope-action ctx_27) s_240(root-expand-context-post-expansion-scope ctx_27)))"
+"((expand-context-post-expansion-scope-action ctx_28) s_240(root-expand-context-post-expansion-scope ctx_28)))"
 "(let-values() s_240)))))"
 "(define-values"
 "(accumulate-def-ctx-scopes)"
-"(lambda(ctx_28 def-ctx-scopes_3)"
+"(lambda(ctx_29 def-ctx-scopes_3)"
 "(begin"
 "(if(null?(unbox def-ctx-scopes_3))"
-" ctx_28"
-"(let-values(((v_188) ctx_28))"
-"(let-values(((the-struct_57) v_188))"
+" ctx_29"
+"(let-values(((v_190) ctx_29))"
+"(let-values(((the-struct_57) v_190))"
 "(if(expand-context/outer? the-struct_57)"
-"(let-values(((scopes206_0)(append(unbox def-ctx-scopes_3)(expand-context-scopes ctx_28)))"
-"((inner207_0)(root-expand-context/outer-inner v_188)))"
+"(let-values(((scopes206_0)(append(unbox def-ctx-scopes_3)(expand-context-scopes ctx_29)))"
+"((inner207_0)(root-expand-context/outer-inner v_190)))"
 "(expand-context/outer1.1"
 " inner207_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_57)"
@@ -40003,17 +40013,17 @@ static const char *startup_source =
 "(begin"
 " 'lookup62"
 "(let-values(((b_81) b59_0))"
-"(let-values(((ctx_29) ctx60_0))"
+"(let-values(((ctx_30) ctx60_0))"
 "(let-values(((id_67) id61_1))"
 "(let-values(((in-s_7)(if in57_0 in55_0 #f)))"
 "(let-values(((out-of-context-as-variable?_1)"
 "(if out-of-context-as-variable?58_0 out-of-context-as-variable?56_0 #f)))"
 "(let-values()"
 "(let-values(((b208_0) b_81)"
-"((temp209_0)(expand-context-env ctx_29))"
-"((temp210_0)(expand-context-lift-envs ctx_29))"
-"((temp211_1)(expand-context-namespace ctx_29))"
-"((temp212_0)(expand-context-phase ctx_29))"
+"((temp209_0)(expand-context-env ctx_30))"
+"((temp210_0)(expand-context-lift-envs ctx_30))"
+"((temp211_1)(expand-context-namespace ctx_30))"
+"((temp212_0)(expand-context-phase ctx_30))"
 "((id213_0) id_67)"
 "((in-s214_0) in-s_7)"
 "((out-of-context-as-variable?215_0) out-of-context-as-variable?_1))"
@@ -40065,17 +40075,17 @@ static const char *startup_source =
 "(begin"
 " 'expand/capture-lifts75"
 "(let-values(((s_254) s73_1))"
-"(let-values(((ctx_30) ctx74_0))"
+"(let-values(((ctx_31) ctx74_0))"
 "(let-values(((expand-lifts?_0)(if expand-lifts?69_0 expand-lifts?65_0 #f)))"
 "(let-values(((begin-form?_0)(if begin-form?70_0 begin-form?66_0 #f)))"
 "(let-values(((lift-key_2)(if lift-key71_0 lift-key67_0(generate-lift-key))))"
 "(let-values(((always-wrap?_0)(if always-wrap?72_0 always-wrap?68_0 #f)))"
 "(let-values()"
-"(let-values(((context_6)(expand-context-context ctx_30)))"
-"(let-values(((phase_108)(expand-context-phase ctx_30)))"
+"(let-values(((context_6)(expand-context-context ctx_31)))"
+"(let-values(((phase_108)(expand-context-phase ctx_31)))"
 "(let-values(((local?_0)(not begin-form?_0)))"
 "((letrec-values(((loop_94)"
-"(lambda(s_369 always-wrap?_1 ctx_31)"
+"(lambda(s_369 always-wrap?_1 ctx_32)"
 "(begin"
 " 'loop"
 "(let-values(((lift-env_2)(if local?_0(box empty-env) #f)))"
@@ -40084,21 +40094,21 @@ static const char *startup_source =
 "(if local?_0"
 "(make-local-lift"
 " lift-env_2"
-"(root-expand-context-counter ctx_31))"
-"(make-top-level-lift ctx_31)))"
+"(root-expand-context-counter ctx_32))"
+"(make-top-level-lift ctx_32)))"
 "((temp217_0)"
 "(if(not local?_0)"
 "(eq? context_6 'module)"
 " #f)))"
 "(make-lift-context6.1 temp217_0 #t temp216_1))))"
 "(let-values(((capture-ctx_0)"
-"(let-values(((v_189) ctx_31))"
-"(let-values(((the-struct_58) v_189))"
+"(let-values(((v_191) ctx_32))"
+"(let-values(((the-struct_58) v_191))"
 "(if(expand-context/outer? the-struct_58)"
 "(let-values(((inner218_0)"
 "(let-values(((the-struct_59)"
 "(root-expand-context/outer-inner"
-" v_189)))"
+" v_191)))"
 "(if(expand-context/inner?"
 " the-struct_59)"
 "(let-values(((lift-key219_0)"
@@ -40110,9 +40120,9 @@ static const char *startup_source =
 "(cons"
 " lift-env_2"
 "(expand-context-lift-envs"
-" ctx_31))"
+" ctx_32))"
 "(expand-context-lift-envs"
-" ctx_31)))"
+" ctx_32)))"
 "((module-lifts222_0)"
 "(if(let-values(((or-part_116)"
 " local?_0))"
@@ -40124,7 +40134,7 @@ static const char *startup_source =
 " '(top-level"
 " module)))))"
 "(expand-context-module-lifts"
-" ctx_31)"
+" ctx_32)"
 " lift-ctx_0)))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
@@ -40154,6 +40164,8 @@ static const char *startup_source =
 " the-struct_59)"
 "(expand-context/inner-in-local-expand?"
 " the-struct_59)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_59)"
 "(expand-context/inner-stops"
 " the-struct_59)"
 "(expand-context/inner-declared-submodule-names"
@@ -40224,13 +40236,13 @@ static const char *startup_source =
 "(get-and-clear-lifts!"
 "(expand-context-lifts capture-ctx_0))))"
 "(let-values(((with-lifts-s_0)"
-"(if(let-values(((or-part_264)"
+"(if(let-values(((or-part_265)"
 "(pair? lifts_6)))"
-"(if or-part_264"
-" or-part_264"
+"(if or-part_265"
+" or-part_265"
 " always-wrap?_1))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_31)"
+"(if(expand-context-to-parsed? ctx_32)"
 "(let-values()"
 "(begin"
 "(if expand-lifts?_0"
@@ -40242,7 +40254,7 @@ static const char *startup_source =
 " lifts_6"
 " exp-s_2"
 " rebuild-s_0"
-" ctx_31"
+" ctx_32"
 "(lambda(rhs_15 rhs-ctx_0)"
 "(loop_94 rhs_15 #f rhs-ctx_0)))))"
 "(let-values()"
@@ -40264,18 +40276,18 @@ static const char *startup_source =
 " exp-s_2"
 " phase_108)))))"
 "(let-values() exp-s_2))))"
-"(if(let-values(((or-part_265)(not expand-lifts?_0)))"
-"(if or-part_265"
-" or-part_265"
-"(let-values(((or-part_266)(null? lifts_6)))"
+"(if(let-values(((or-part_266)(not expand-lifts?_0)))"
 "(if or-part_266"
 " or-part_266"
-"(expand-context-to-parsed? ctx_31)))))"
+"(let-values(((or-part_267)(null? lifts_6)))"
+"(if or-part_267"
+" or-part_267"
+"(expand-context-to-parsed? ctx_32)))))"
 "(let-values() with-lifts-s_0)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_27)"
-"(expand-context-observer ctx_31)))"
+"(expand-context-observer ctx_32)))"
 "(if obs_27"
 "(let-values()"
 "(let-values()"
@@ -40284,11 +40296,11 @@ static const char *startup_source =
 " 'letlift-loop"
 " with-lifts-s_0)))"
 "(void)))"
-"(loop_94 with-lifts-s_0 #f ctx_31)))))))))))))))"
+"(loop_94 with-lifts-s_0 #f ctx_32)))))))))))))))"
 " loop_94)"
 " s_254"
 " always-wrap?_0"
-" ctx_30))))))))))))))"
+" ctx_31))))))))))))))"
 "(define-values"
 "(expand-transformer92.1)"
 "(lambda(always-wrap?82_0"
@@ -40308,7 +40320,7 @@ static const char *startup_source =
 "(begin"
 " 'expand-transformer92"
 "(let-values(((s_392) s90_1))"
-"(let-values(((ctx_32) ctx91_0))"
+"(let-values(((ctx_33) ctx91_0))"
 "(let-values(((context_7)(if context84_0 context78_0 'expression)))"
 "(let-values(((begin-form?_1)(if begin-form?85_0 begin-form?79_0 #f)))"
 "(let-values(((expand-lifts?_1)(if expand-lifts?86_0 expand-lifts?80_0 #t)))"
@@ -40318,7 +40330,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(let-values(((trans-ctx_0)"
-"(let-values(((ctx234_0) ctx_32)"
+"(let-values(((ctx234_0) ctx_33)"
 "((context235_0) context_7)"
 "((keep-stops?236_0) keep-stops?_0))"
 "(context->transformer-context100.1"
@@ -40349,32 +40361,32 @@ static const char *startup_source =
 "(lambda(keep-stops?95_0 keep-stops?96_0 ctx99_0 context97_0 context98_0)"
 "(begin"
 " 'context->transformer-context100"
-"(let-values(((ctx_33) ctx99_0))"
+"(let-values(((ctx_34) ctx99_0))"
 "(let-values(((context_8)(if context98_0 context97_0 'expression)))"
 "(let-values(((keep-stops?_1)(if keep-stops?96_0 keep-stops?95_0 #f)))"
 "(let-values()"
-"(let-values(((phase_109)(add1(expand-context-phase ctx_33))))"
-"(let-values(((ns_73)(namespace->namespace-at-phase(expand-context-namespace ctx_33) phase_109)))"
+"(let-values(((phase_109)(add1(expand-context-phase ctx_34))))"
+"(let-values(((ns_73)(namespace->namespace-at-phase(expand-context-namespace ctx_34) phase_109)))"
 "(begin"
 "(namespace-visit-available-modules! ns_73 phase_109)"
-"(let-values(((v_190) ctx_33))"
-"(let-values(((the-struct_60) v_190))"
+"(let-values(((v_192) ctx_34))"
+"(let-values(((the-struct_60) v_192))"
 "(if(expand-context/outer? the-struct_60)"
 "(let-values(((context237_0) context_8)"
 "((scopes238_0) null)"
 "((env239_0) empty-env)"
 "((only-immediate?240_0)"
-"(if keep-stops?_1(expand-context-only-immediate? ctx_33) #f))"
+"(if keep-stops?_1(expand-context-only-immediate? ctx_34) #f))"
 "((def-ctx-scopes241_0) #f)"
 "((post-expansion-scope242_0) #f)"
 "((inner243_0)"
-"(let-values(((the-struct_61)(root-expand-context/outer-inner v_190)))"
+"(let-values(((the-struct_61)(root-expand-context/outer-inner v_192)))"
 "(if(expand-context/inner? the-struct_61)"
 "(let-values(((phase244_0) phase_109)"
 "((namespace245_0) ns_73)"
 "((stops246_0)"
 "(if keep-stops?_1"
-"(expand-context-stops ctx_33)"
+"(expand-context-stops ctx_34)"
 " empty-free-id-set)))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi the-struct_61)"
@@ -40391,6 +40403,7 @@ static const char *startup_source =
 "(expand-context/inner-module-begin-k the-struct_61)"
 "(expand-context/inner-allow-unbound? the-struct_61)"
 "(expand-context/inner-in-local-expand? the-struct_61)"
+"(expand-context/inner-keep-#%expression? the-struct_61)"
 " stops246_0"
 "(expand-context/inner-declared-submodule-names the-struct_61)"
 "(expand-context/inner-lifts the-struct_61)"
@@ -40431,25 +40444,25 @@ static const char *startup_source =
 "(let-values(((who_17) who105_0))"
 "(let-values(((rhs_16) rhs106_0))"
 "(let-values(((ids_19) ids107_0))"
-"(let-values(((ctx_34) ctx108_0))"
+"(let-values(((ctx_35) ctx108_0))"
 "(let-values(((log-next?_0)(if log-next?104_0 log-next?103_0 #t)))"
 "(let-values()"
 "(let-values(((exp-rhs_0)"
-"(let-values(((rhs247_0) rhs_16)((temp248_0)(as-named-context ctx_34 ids_19)))"
+"(let-values(((rhs247_0) rhs_16)((temp248_0)(as-named-context ctx_35 ids_19)))"
 "(expand-transformer92.1 #f #f #f #f #f #f #f #f #f #f #f #f rhs247_0 temp248_0))))"
-"(let-values(((phase_52)(add1(expand-context-phase ctx_34))))"
+"(let-values(((phase_52)(add1(expand-context-phase ctx_35))))"
 "(let-values(((parsed-rhs_0)"
-"(if(expand-context-to-parsed? ctx_34)"
+"(if(expand-context-to-parsed? ctx_35)"
 " exp-rhs_0"
 "(let-values(((exp-rhs249_0) exp-rhs_0)"
 "((temp250_1)"
-"(let-values(((temp251_1)(as-to-parsed-context ctx_34)))"
+"(let-values(((temp251_1)(as-to-parsed-context ctx_35)))"
 "(context->transformer-context100.1 #f #f temp251_1 #f #f))))"
 "(expand9.1 #f #f #f #f #f #f exp-rhs249_0 temp250_1)))))"
 "(begin"
 "(if log-next?_0"
 "(let-values()"
-"(let-values(((obs_28)(expand-context-observer ctx_34)))"
+"(let-values(((obs_28)(expand-context-observer ctx_35)))"
 "(if obs_28(let-values()(let-values()(call-expand-observe obs_28 'next)))(void))))"
 "(void))"
 "(values"
@@ -40460,22 +40473,22 @@ static const char *startup_source =
 " ids_19"
 " parsed-rhs_0"
 " phase_52"
-"(namespace->namespace-at-phase(expand-context-namespace ctx_34) phase_52)"
-" ctx_34)))))))))))))))"
+"(namespace->namespace-at-phase(expand-context-namespace ctx_35) phase_52)"
+" ctx_35)))))))))))))))"
 "(define-values"
 "(eval-for-syntaxes-binding)"
-"(lambda(who_18 rhs_17 ids_20 ctx_35)"
+"(lambda(who_18 rhs_17 ids_20 ctx_36)"
 "(begin"
 "(let-values(((exp-rhs_1 parsed-rhs_1 vals_3)"
-"(let-values(((who252_0) who_18)((rhs253_0) rhs_17)((ids254_0) ids_20)((ctx255_0) ctx_35))"
+"(let-values(((who252_0) who_18)((rhs253_0) rhs_17)((ids254_0) ids_20)((ctx255_0) ctx_36))"
 "(expand+eval-for-syntaxes-binding109.1 #f #f who252_0 rhs253_0 ids254_0 ctx255_0))))"
 " vals_3))))"
 "(define-values"
 "(eval-for-bindings)"
-"(lambda(who_19 ids_21 p_49 phase_110 ns_74 ctx_36)"
+"(lambda(who_19 ids_21 p_49 phase_110 ns_74 ctx_37)"
 "(begin"
 "(let-values(((compiled_0)"
-"(if(can-direct-eval? p_49 ns_74(root-expand-context-self-mpi ctx_36))"
+"(if(can-direct-eval? p_49 ns_74(root-expand-context-self-mpi ctx_37))"
 " #f"
 "(compile-single"
 " p_49"
@@ -40489,7 +40502,7 @@ static const char *startup_source =
 "(extend-parameterization"
 "(continuation-mark-set-first #f parameterization-key)"
 " current-expand-context"
-" ctx_36"
+" ctx_37"
 " 1/current-namespace"
 " ns_74"
 " eval-jit-enabled"
@@ -40497,7 +40510,7 @@ static const char *startup_source =
 "(let-values()"
 "(if compiled_0"
 "(eval-single-top compiled_0 ns_74)"
-"(direct-eval p_49 ns_74(root-expand-context-self-mpi ctx_36))))))"
+"(direct-eval p_49 ns_74(root-expand-context-self-mpi ctx_37))))))"
 " list)))"
 "(begin"
 "(if(=(length vals_4)(length ids_21))"
@@ -40530,7 +40543,7 @@ static const char *startup_source =
 " s119_0)"
 "(begin"
 " 'keep-as-needed120"
-"(let-values(((ctx_37) ctx118_0))"
+"(let-values(((ctx_38) ctx118_0))"
 "(let-values(((s_433) s119_0))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_0)(if keep-for-parsed?116_0 keep-for-parsed?113_0 #f)))"
@@ -40543,10 +40556,10 @@ static const char *startup_source =
 "(if(if(pair? d_32)(syntax-identifier?(car d_32)) #f)"
 "(let-values()(syntax-e$1(car d_32)))"
 "(let-values() #f)))))"
-"(if(expand-context-to-parsed? ctx_37)"
+"(if(expand-context-to-parsed? ctx_38)"
 "(let-values()"
-"(if(let-values(((or-part_267) keep-for-parsed?_0))"
-"(if or-part_267 or-part_267 keep-for-error?_0))"
+"(if(let-values(((or-part_268) keep-for-parsed?_0))"
+"(if or-part_268 or-part_268 keep-for-error?_0))"
 "(datum->syntax$1 #f keep-e_0 s_433 s_433)"
 " #f))"
 "(let-values()"
@@ -40565,11 +40578,11 @@ static const char *startup_source =
 " 'disappeared-binding"
 "(append"
 "(apply append trans-idss_0)"
-"(let-values(((or-part_268)(syntax-property$1 s_434 'disappeared-binding)))"
-"(if or-part_268 or-part_268 null)))))))))"
+"(let-values(((or-part_269)(syntax-property$1 s_434 'disappeared-binding)))"
+"(if or-part_269 or-part_269 null)))))))))"
 "(define-values"
 "(increment-binding-layer)"
-"(lambda(ids_22 ctx_38 layer-val_0)"
+"(lambda(ids_22 ctx_39 layer-val_0)"
 "(begin"
 "(if((letrec-values(((loop_95)"
 "(lambda(ids_23)"
@@ -40579,16 +40592,16 @@ static const char *startup_source =
 "(if or-part_127"
 " or-part_127"
 "(if(pair? ids_23)"
-"(let-values(((or-part_232)(loop_95(car ids_23))))"
-"(if or-part_232 or-part_232(loop_95(cdr ids_23))))"
+"(let-values(((or-part_233)(loop_95(car ids_23))))"
+"(if or-part_233 or-part_233(loop_95(cdr ids_23))))"
 " #f)))))))"
 " loop_95)"
 " ids_22)"
 " layer-val_0"
-"(expand-context-binding-layer ctx_38)))))"
+"(expand-context-binding-layer ctx_39)))))"
 "(define-values"
 "(wrap-lifts-as-parsed-let)"
-"(lambda(lifts_7 exp-s_3 rebuild-s_1 ctx_39 parse-rhs_0)"
+"(lambda(lifts_7 exp-s_3 rebuild-s_1 ctx_40 parse-rhs_0)"
 "(begin"
 "(let-values(((idss+keyss+rhss_0)(get-lifts-as-lists lifts_7)))"
 "((letrec-values(((lets-loop_0)"
@@ -40609,8 +40622,8 @@ static const char *startup_source =
 "(list"
 "(lets-loop_0"
 "(cdr idss+keyss+rhss_1)"
-"(let-values(((v_191) rhs-ctx_1))"
-"(let-values(((the-struct_62) v_191))"
+"(let-values(((v_193) rhs-ctx_1))"
+"(let-values(((the-struct_62) v_193))"
 "(if(expand-context/outer? the-struct_62)"
 "(let-values(((env258_0)"
 "(let-values(((lst_67) ids_24)((lst_256) keys_4))"
@@ -40665,7 +40678,7 @@ static const char *startup_source =
 "(expand-context-env rhs-ctx_1)"
 " lst_67"
 " lst_256))))"
-"((inner259_0)(root-expand-context/outer-inner v_191)))"
+"((inner259_0)(root-expand-context/outer-inner v_193)))"
 "(expand-context/outer1.1"
 " inner259_0"
 "(root-expand-context/outer-post-expansion-scope the-struct_62)"
@@ -40688,24 +40701,24 @@ static const char *startup_source =
 " the-struct_62)))))))))))))))))"
 " lets-loop_0)"
 " idss+keyss+rhss_0"
-" ctx_39)))))"
+" ctx_40)))))"
 "(define-values"
 "(rename-transformer-target-in-context)"
-"(lambda(t_56 ctx_40)"
+"(lambda(t_56 ctx_41)"
 "(begin"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_40)"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_41)"
 "(let-values()(1/rename-transformer-target t_56))))))"
 "(define-values"
 "(maybe-install-free=id-in-context!)"
-"(lambda(val_71 id_69 phase_111 ctx_41)"
+"(lambda(val_71 id_69 phase_111 ctx_42)"
 "(begin"
 "(if(1/rename-transformer? val_71)"
 "(let-values()"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_41)"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_42)"
 "(let-values()(maybe-install-free=id! val_71 id_69 phase_111))))"
 "(void)))))"
 "(define-values"
@@ -40878,9 +40891,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_256)(not parent-ctx_0)))"
-"(if or-part_256"
-" or-part_256"
+"(if(let-values(((or-part_257)(not parent-ctx_0)))"
+"(if or-part_257"
+" or-part_257"
 "(1/internal-definition-context? parent-ctx_0)))"
 "(void)"
 "(let-values()"
@@ -40889,11 +40902,11 @@ static const char *startup_source =
 "                                               \"(or/c #f internal-definition-context?)\""
 " parent-ctx_0)))"
 "(values))))"
-"(let-values(((ctx_42)"
-"(let-values(((temp49_1) 'syntax-local-make-definition-context))"
-"(get-current-expand-context17.1 #f #f temp49_1 #t))))"
+"(let-values(((ctx_43)"
+"(let-values(((temp51_2) 'syntax-local-make-definition-context))"
+"(get-current-expand-context17.1 #f #f temp51_2 #t))))"
 "(let-values(((frame-id_8)"
-"(let-values(((or-part_35)(root-expand-context-frame-id ctx_42)))"
+"(let-values(((or-part_35)(root-expand-context-frame-id ctx_43)))"
 "(if or-part_35"
 " or-part_35"
 "(let-values(((or-part_67)"
@@ -40902,7 +40915,7 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_67 or-part_67(gensym)))))))"
 "(let-values(((sc_31)(new-scope 'intdef)))"
-"(let-values(((def-ctx-scopes_4)(expand-context-def-ctx-scopes ctx_42)))"
+"(let-values(((def-ctx-scopes_4)(expand-context-def-ctx-scopes ctx_43)))"
 "(begin"
 "(if def-ctx-scopes_4"
 "(void)"
@@ -40970,19 +40983,19 @@ static const char *startup_source =
 " intdefs?-string"
 " extra-intdefs_0)))"
 "(values))))"
-"(let-values(((ctx_43)"
-"(let-values(((temp50_1) 'local-expand))"
-"(get-current-expand-context17.1 #f #f temp50_1 #t))))"
+"(let-values(((ctx_44)"
+"(let-values(((temp52_3) 'local-expand))"
+"(get-current-expand-context17.1 #f #f temp52_3 #t))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_29)(expand-context-observer ctx_43)))"
+"(let-values(((obs_29)(expand-context-observer ctx_44)))"
 "(if obs_29"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe obs_29 'local-bind ids_25)))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_73)(expand-context-phase ctx_43)))"
+"(let-values(((phase_73)(expand-context-phase ctx_44)))"
 "(let-values(((all-intdefs_0)"
 "(if(list? extra-intdefs_0)"
 "(cons intdef_0 extra-intdefs_0)"
@@ -41017,31 +41030,31 @@ static const char *startup_source =
 "(remove-use-site-scopes"
 "(flip-introduction-scopes"
 " id_70"
-" ctx_43)"
-" ctx_43)))"
-"(let-values(((temp51_2)"
-"(let-values(((pre-id53_0)"
+" ctx_44)"
+" ctx_44)))"
+"(let-values(((temp53_1)"
+"(let-values(((pre-id55_0)"
 " pre-id_0)"
-"((intdef54_0)"
+"((intdef56_0)"
 " intdef_0)"
-"((temp55_2)"
+"((temp57_0)"
 " #t))"
 "(add-intdef-scopes28.1"
 " #f"
 " #f"
-" temp55_2"
+" temp57_0"
 " #t"
-" pre-id53_0"
-" intdef54_0)))"
-"((extra-intdefs52_0)"
+" pre-id55_0"
+" intdef56_0)))"
+"((extra-intdefs54_0)"
 " extra-intdefs_0))"
 "(add-intdef-scopes28.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp51_2"
-" extra-intdefs52_0))))"
+" temp53_1"
+" extra-intdefs54_0))))"
 " fold-var_245))))"
 "(values"
 " fold-var_246)))))"
@@ -41057,7 +41070,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((obs_30)"
-"(expand-context-observer ctx_43)))"
+"(expand-context-observer ctx_44)))"
 "(if obs_30"
 "(let-values()"
 "(let-values()"
@@ -41093,24 +41106,24 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((intdef-id56_0)"
+"(let-values(((intdef-id58_0)"
 " intdef-id_0)"
-"((phase57_1)"
+"((phase59_0)"
 " phase_73)"
-"((temp58_2)"
+"((temp60_3)"
 "(root-expand-context-counter"
-" ctx_43))"
-"((temp59_3)"
+" ctx_44))"
+"((temp61_1)"
 "(internal-definition-context-frame-id"
 " intdef_0)))"
 "(add-local-binding!37.1"
-" temp59_3"
+" temp61_1"
 " #t"
 " #f"
 " #f"
-" intdef-id56_0"
-" phase57_1"
-" temp58_2)))"
+" intdef-id58_0"
+" phase59_0"
+" temp60_3)))"
 " fold-var_248))))"
 "(values"
 " fold-var_249)))))"
@@ -41128,17 +41141,17 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((input-s_0)"
 "(flip-introduction-scopes"
-"(let-values(((s60_0) s_90)"
-"((all-intdefs61_0)"
+"(let-values(((s62_0) s_90)"
+"((all-intdefs63_0)"
 " all-intdefs_0))"
 "(add-intdef-scopes28.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" s60_0"
-" all-intdefs61_0))"
-" ctx_43)))"
+" s62_0"
+" all-intdefs63_0))"
+" ctx_44)))"
 "(let-values(((tmp-env_0)"
 "(let-values(((lst_225) syms_20))"
 "(begin"
@@ -41179,13 +41192,13 @@ static const char *startup_source =
 " env_8)))"
 " env_7)))))"
 " for-loop_78)"
-"(expand-context-env ctx_43)"
+"(expand-context-env ctx_44)"
 " lst_225)))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_31)"
 "(expand-context-observer"
-" ctx_43)))"
+" ctx_44)))"
 "(if obs_31"
 "(let-values()"
 "(let-values()"
@@ -41199,20 +41212,20 @@ static const char *startup_source =
 " 'syntax-local-bind-syntaxes"
 " input-s_0"
 " ids_25"
-"(let-values(((temp62_1)"
+"(let-values(((temp64_2)"
 "(let-values(((v_93)"
-" ctx_43))"
+" ctx_44))"
 "(let-values(((the-struct_64)"
 " v_93))"
 "(if(expand-context/outer?"
 " the-struct_64)"
-"(let-values(((env65_0)"
+"(let-values(((env67_0)"
 " tmp-env_0)"
-"((inner66_0)"
+"((inner68_0)"
 "(root-expand-context/outer-inner"
 " v_93)))"
 "(expand-context/outer1.1"
-" inner66_0"
+" inner68_0"
 "(root-expand-context/outer-post-expansion-scope"
 " the-struct_64)"
 "(root-expand-context/outer-use-site-scopes"
@@ -41221,7 +41234,7 @@ static const char *startup_source =
 " the-struct_64)"
 "(expand-context/outer-context"
 " the-struct_64)"
-" env65_0"
+" env67_0"
 "(expand-context/outer-post-expansion-scope-action"
 " the-struct_64)"
 "(expand-context/outer-scopes"
@@ -41244,13 +41257,13 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                                                                \"expand-context/outer?\""
 " the-struct_64)))))"
-"((temp63_2)"
+"((temp65_1)"
 " 'expression)"
-"((all-intdefs64_0)"
+"((all-intdefs66_0)"
 " all-intdefs_0))"
-"(make-local-expand-context44.1"
-" temp63_2"
-" all-intdefs64_0"
+"(make-local-expand-context46.1"
+" temp65_1"
+" all-intdefs66_0"
 " #f"
 " #f"
 " #f"
@@ -41259,11 +41272,13 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp62_1)))))"
+" #f"
+" #f"
+" temp64_2)))))"
 "(begin"
 "(let-values(((obs_32)"
 "(expand-context-observer"
-" ctx_43)))"
+" ctx_44)))"
 "(if obs_32"
 "(let-values()"
 "(let-values()"
@@ -41377,7 +41392,7 @@ static const char *startup_source =
 " val_28"
 " intdef-id_1"
 " phase_73"
-" ctx_43)"
+" ctx_44)"
 "(env-mixin2.1"
 " intdef-id_1"
 " sym_67"
@@ -41400,7 +41415,7 @@ static const char *startup_source =
 " lst_293"
 " lst_294))))"
 "(unbox env-mixins_0)))"
-"(let-values(((obs_33)(expand-context-observer ctx_43)))"
+"(let-values(((obs_33)(expand-context-observer ctx_44)))"
 "(if obs_33"
 "(let-values()"
 "(let-values()"
@@ -41470,10 +41485,10 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_201)))"
-"(let-values(((s67_0) s_201)"
-"((intdef68_0) intdef_4)"
-"((temp69_0) #t)"
-"((temp70_0)"
+"(let-values(((s69_0) s_201)"
+"((intdef70_0) intdef_4)"
+"((temp71_0) #t)"
+"((temp72_0)"
 "(let-values(((tmp_31) mode_12))"
 "(if(equal? tmp_31 'add)"
 "(let-values() add-scope)"
@@ -41486,7 +41501,7 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                                       \"(or/c 'add 'remove 'flip)\""
 " mode_12))))))))"
-"(add-intdef-scopes28.1 temp70_0 #t temp69_0 #t s67_0 intdef68_0)))))))))))"
+"(add-intdef-scopes28.1 temp72_0 #t temp71_0 #t s69_0 intdef70_0)))))))))))"
 "(case-lambda"
 "((intdef_5 s_435)"
 "(begin 'internal-definition-context-introduce(internal-definition-context-introduce20_0 intdef_5 s_435 #f #f)))"
@@ -41511,8 +41526,8 @@ static const char *startup_source =
 "(if(identifier? id_72)"
 "(void)"
 "          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_72)))"
-"(if(let-values(((or-part_269)(1/internal-definition-context? intdef_8)))"
-"(if or-part_269 or-part_269(if(list? intdef_8)(andmap2 1/internal-definition-context? intdef_8) #f)))"
+"(if(let-values(((or-part_270)(1/internal-definition-context? intdef_8)))"
+"(if or-part_270 or-part_270(if(list? intdef_8)(andmap2 1/internal-definition-context? intdef_8) #f)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -41550,8 +41565,8 @@ static const char *startup_source =
 "(intdefs?)"
 "(lambda(x_75)"
 "(begin"
-"(let-values(((or-part_270)(1/internal-definition-context? x_75)))"
-"(if or-part_270 or-part_270(if(list? x_75)(andmap2 1/internal-definition-context? x_75) #f))))))"
+"(let-values(((or-part_271)(1/internal-definition-context? x_75)))"
+"(if or-part_271 or-part_271(if(list? x_75)(andmap2 1/internal-definition-context? x_75) #f))))))"
 " (define-values (intdefs?-string) \"(or/c internal-definition-context? (listof internal-definition-context?))\")"
 "(define-values"
 "(intdefs-or-false?)"
@@ -41594,14 +41609,14 @@ static const char *startup_source =
 "(let-values(((env-mixin_1)"
 "(car"
 " env-mixins_2)))"
-"(let-values(((or-part_271)"
+"(let-values(((or-part_272)"
 "(hash-ref"
 "(env-mixin-cache"
 " env-mixin_1)"
 " env_16"
 " #f)))"
-"(if or-part_271"
-" or-part_271"
+"(if or-part_272"
+" or-part_272"
 "(let-values(((new-env_0)"
 "(env-extend"
 "(loop_96"
@@ -41653,9 +41668,9 @@ static const char *startup_source =
 "(let-values(((intdef_11)(car a_50)))"
 "(let-values(((s_328)"
 "(let-values(((s_158) s_100))"
-"(if(let-values(((or-part_272) always?_0))"
-"(if or-part_272"
-" or-part_272"
+"(if(let-values(((or-part_273) always?_0))"
+"(if or-part_273"
+" or-part_273"
 "(internal-definition-context-add-scope?"
 " intdef_11)))"
 "(let-values(((s_102) s_158))"
@@ -41673,55 +41688,58 @@ static const char *startup_source =
 " s_437"
 " x_77)))))))))))"
 "(define-values"
-"(make-local-expand-context44.1)"
+"(make-local-expand-context46.1)"
 "(lambda(context31_0"
 " intdefs33_0"
+" keep-#%expression?37_0"
+" keep-#%expression?44_0"
 " phase32_1"
-" phase38_0"
+" phase39_1"
 " stop-ids34_0"
-" stop-ids40_0"
+" stop-ids41_0"
 " to-parsed-ok?35_0"
-" to-parsed-ok?41_0"
+" to-parsed-ok?42_0"
 " track-to-be-defined?36_0"
-" track-to-be-defined?42_0"
-" ctx43_0)"
+" track-to-be-defined?43_0"
+" ctx45_0)"
 "(begin"
-" 'make-local-expand-context44"
-"(let-values(((ctx_44) ctx43_0))"
+" 'make-local-expand-context46"
+"(let-values(((ctx_45) ctx45_0))"
 "(let-values(((context_9) context31_0))"
-"(let-values(((phase_113)(if phase38_0 phase32_1(expand-context-phase ctx_44))))"
+"(let-values(((phase_107)(if phase39_1 phase32_1(expand-context-phase ctx_45))))"
 "(let-values(((intdefs_2) intdefs33_0))"
-"(let-values(((stop-ids_1)(if stop-ids40_0 stop-ids34_0 #f)))"
-"(let-values(((to-parsed-ok?_0)(if to-parsed-ok?41_0 to-parsed-ok?35_0 #f)))"
-"(let-values(((track-to-be-defined?_0)(if track-to-be-defined?42_0 track-to-be-defined?36_0 #f)))"
+"(let-values(((stop-ids_1)(if stop-ids41_0 stop-ids34_0 #f)))"
+"(let-values(((to-parsed-ok?_0)(if to-parsed-ok?42_0 to-parsed-ok?35_0 #f)))"
+"(let-values(((track-to-be-defined?_0)(if track-to-be-defined?43_0 track-to-be-defined?36_0 #f)))"
+"(let-values(((keep-#%expression?_1)(if keep-#%expression?44_0 keep-#%expression?37_0 #t)))"
 "(let-values()"
 "(let-values(((same-kind?_0)"
-"(let-values(((or-part_273)(eq? context_9(expand-context-context ctx_44))))"
-"(if or-part_273"
-" or-part_273"
-"(if(list? context_9)(list?(expand-context-context ctx_44)) #f)))))"
-"(let-values(((all-stop-ids_0)"
-"(if stop-ids_1(stop-ids->all-stop-ids stop-ids_1 phase_113) #f)))"
-"(let-values(((def-ctx-scopes_5)"
-"(if(expand-context-def-ctx-scopes ctx_44)"
-"(unbox(expand-context-def-ctx-scopes ctx_44))"
-" null)))"
-"(let-values(((v_192) ctx_44))"
-"(let-values(((the-struct_65) v_192))"
-"(if(expand-context/outer? the-struct_65)"
-"(let-values(((context71_0) context_9)"
-"((env72_0)(add-intdef-bindings(expand-context-env ctx_44) intdefs_2))"
-"((use-site-scopes73_0)"
-"(if(let-values(((or-part_274)(eq? context_9 'module)))"
+"(let-values(((or-part_274)(eq? context_9(expand-context-context ctx_45))))"
 "(if or-part_274"
 " or-part_274"
-"(let-values(((or-part_275)(eq? context_9 'module-begin)))"
-"(if or-part_275 or-part_275(list? context_9)))))"
-"(let-values(((or-part_276)"
-"(root-expand-context-use-site-scopes ctx_44)))"
-"(if or-part_276 or-part_276(box null)))"
+"(if(list? context_9)(list?(expand-context-context ctx_45)) #f)))))"
+"(let-values(((all-stop-ids_0)"
+"(if stop-ids_1(stop-ids->all-stop-ids stop-ids_1 phase_107) #f)))"
+"(let-values(((def-ctx-scopes_5)"
+"(if(expand-context-def-ctx-scopes ctx_45)"
+"(unbox(expand-context-def-ctx-scopes ctx_45))"
+" null)))"
+"(let-values(((v_161) ctx_45))"
+"(let-values(((the-struct_65) v_161))"
+"(if(expand-context/outer? the-struct_65)"
+"(let-values(((context73_0) context_9)"
+"((env74_0)(add-intdef-bindings(expand-context-env ctx_45) intdefs_2))"
+"((use-site-scopes75_0)"
+"(if(let-values(((or-part_275)(eq? context_9 'module)))"
+"(if or-part_275"
+" or-part_275"
+"(let-values(((or-part_276)(eq? context_9 'module-begin)))"
+"(if or-part_276 or-part_276(list? context_9)))))"
+"(let-values(((or-part_277)"
+"(root-expand-context-use-site-scopes ctx_45)))"
+"(if or-part_277 or-part_277(box null)))"
 " #f))"
-"((frame-id74_0)"
+"((frame-id76_0)"
 "(let-values(((x_78)"
 "(let-values(((a_51) intdefs_2))"
 "(if(list? a_51)"
@@ -41756,164 +41774,171 @@ static const char *startup_source =
 "(let-values()"
 " 'all)"
 "(let-values()"
-"(let-values(((or-part_277)"
+"(let-values(((or-part_278)"
 " frame-id_11))"
-"(if or-part_277"
-" or-part_277"
+"(if or-part_278"
+" or-part_278"
 " i-frame-id_0))))))))"
-"(values frame-id_12)))))"
+"(values"
+" frame-id_12)))))"
 "(if(not #f)"
-"(for-loop_263 frame-id_10(cdr a_52))"
+"(for-loop_263"
+" frame-id_10"
+"(cdr a_52))"
 " frame-id_10)))"
 " frame-id_9)))))"
 " for-loop_263)"
-"(root-expand-context-frame-id ctx_44)"
+"(root-expand-context-frame-id ctx_45)"
 " x_78))))"
-"((post-expansion-scope75_0)"
+"((post-expansion-scope77_0)"
 "(if(if intdefs_2(not(null? intdefs_2)) #f)"
 "(new-scope 'macro)"
 "(if same-kind?_0"
 "(if(memq context_9 '(module module-begin top-level))"
-"(root-expand-context-post-expansion-scope ctx_44)"
+"(root-expand-context-post-expansion-scope ctx_45)"
 " #f)"
 " #f)))"
-"((post-expansion-scope-action76_0)"
+"((post-expansion-scope-action78_0)"
 "(if(if intdefs_2(not(null? intdefs_2)) #f)"
-"(lambda(s_125 placeholder-sc_0)"
+"(lambda(s_220 placeholder-sc_0)"
 "(begin"
-" 'post-expansion-scope-action76"
-"(let-values(((s82_0) s_125)((intdefs83_0) intdefs_2))"
-"(add-intdef-scopes28.1 #f #f #f #f s82_0 intdefs83_0))))"
-"(expand-context-post-expansion-scope-action ctx_44)))"
-"((scopes77_0)(append def-ctx-scopes_5(expand-context-scopes ctx_44)))"
-"((only-immediate?78_0)(not stop-ids_1))"
-"((current-introduction-scopes79_0) null)"
-"((need-eventually-defined80_0)"
-"(let-values(((ht_138)(expand-context-need-eventually-defined ctx_44)))"
+" 'post-expansion-scope-action78"
+"(let-values(((s84_0) s_220)((intdefs85_0) intdefs_2))"
+"(add-intdef-scopes28.1 #f #f #f #f s84_0 intdefs85_0))))"
+"(expand-context-post-expansion-scope-action ctx_45)))"
+"((scopes79_0)(append def-ctx-scopes_5(expand-context-scopes ctx_45)))"
+"((only-immediate?80_0)(not stop-ids_1))"
+"((current-introduction-scopes81_0) null)"
+"((need-eventually-defined82_0)"
+"(let-values(((ht_138)"
+"(expand-context-need-eventually-defined ctx_45)))"
 "(if track-to-be-defined?_0"
 "(let-values() ht_138)"
 "(if ht_138(let-values()(make-hasheqv))(let-values() #f)))))"
-"((inner81_0)"
-"(let-values(((the-struct_36)(root-expand-context/outer-inner v_192)))"
-"(if(expand-context/inner? the-struct_36)"
-"(let-values(((to-parsed?84_0)"
+"((inner83_0)"
+"(let-values(((the-struct_66)"
+"(root-expand-context/outer-inner v_161)))"
+"(if(expand-context/inner? the-struct_66)"
+"(let-values(((to-parsed?86_0)"
 "(if to-parsed-ok?_0"
-"(expand-context-to-parsed? ctx_44)"
+"(expand-context-to-parsed? ctx_45)"
 " #f))"
-"((just-once?85_0) #f)"
-"((in-local-expand?86_0) #t)"
-"((stops87_0)"
+"((just-once?87_0) #f)"
+"((in-local-expand?88_0) #t)"
+"((keep-#%expression?89_0) keep-#%expression?_1)"
+"((stops90_0)"
 "(free-id-set"
-" phase_113"
-"(let-values(((or-part_278) all-stop-ids_0))"
-"(if or-part_278 or-part_278 null)))))"
+" phase_107"
+"(let-values(((or-part_279) all-stop-ids_0))"
+"(if or-part_279 or-part_279 null)))))"
 "(expand-context/inner2.1"
-"(root-expand-context/inner-self-mpi the-struct_36)"
-"(root-expand-context/inner-module-scopes the-struct_36)"
-"(root-expand-context/inner-top-level-bind-scope the-struct_36)"
-"(root-expand-context/inner-all-scopes-stx the-struct_36)"
-"(root-expand-context/inner-defined-syms the-struct_36)"
-"(root-expand-context/inner-counter the-struct_36)"
-"(root-expand-context/inner-lift-key the-struct_36)"
-" to-parsed?84_0"
-"(expand-context/inner-phase the-struct_36)"
-"(expand-context/inner-namespace the-struct_36)"
-" just-once?85_0"
-"(expand-context/inner-module-begin-k the-struct_36)"
-"(expand-context/inner-allow-unbound? the-struct_36)"
-" in-local-expand?86_0"
-" stops87_0"
-"(expand-context/inner-declared-submodule-names the-struct_36)"
-"(expand-context/inner-lifts the-struct_36)"
-"(expand-context/inner-lift-envs the-struct_36)"
-"(expand-context/inner-module-lifts the-struct_36)"
-"(expand-context/inner-require-lifts the-struct_36)"
-"(expand-context/inner-to-module-lifts the-struct_36)"
-"(expand-context/inner-requires+provides the-struct_36)"
-"(expand-context/inner-observer the-struct_36)"
-"(expand-context/inner-for-serializable? the-struct_36)"
+"(root-expand-context/inner-self-mpi the-struct_66)"
+"(root-expand-context/inner-module-scopes the-struct_66)"
+"(root-expand-context/inner-top-level-bind-scope the-struct_66)"
+"(root-expand-context/inner-all-scopes-stx the-struct_66)"
+"(root-expand-context/inner-defined-syms the-struct_66)"
+"(root-expand-context/inner-counter the-struct_66)"
+"(root-expand-context/inner-lift-key the-struct_66)"
+" to-parsed?86_0"
+"(expand-context/inner-phase the-struct_66)"
+"(expand-context/inner-namespace the-struct_66)"
+" just-once?87_0"
+"(expand-context/inner-module-begin-k the-struct_66)"
+"(expand-context/inner-allow-unbound? the-struct_66)"
+" in-local-expand?88_0"
+" keep-#%expression?89_0"
+" stops90_0"
+"(expand-context/inner-declared-submodule-names the-struct_66)"
+"(expand-context/inner-lifts the-struct_66)"
+"(expand-context/inner-lift-envs the-struct_66)"
+"(expand-context/inner-module-lifts the-struct_66)"
+"(expand-context/inner-require-lifts the-struct_66)"
+"(expand-context/inner-to-module-lifts the-struct_66)"
+"(expand-context/inner-requires+provides the-struct_66)"
+"(expand-context/inner-observer the-struct_66)"
+"(expand-context/inner-for-serializable? the-struct_66)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_36)))"
+" the-struct_66)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                     \"expand-context/inner?\""
-" the-struct_36)))))"
+"                                                       \"expand-context/inner?\""
+" the-struct_66)))))"
 "(expand-context/outer1.1"
-" inner81_0"
-" post-expansion-scope75_0"
-" use-site-scopes73_0"
-" frame-id74_0"
-" context71_0"
-" env72_0"
-" post-expansion-scope-action76_0"
-" scopes77_0"
+" inner83_0"
+" post-expansion-scope77_0"
+" use-site-scopes75_0"
+" frame-id76_0"
+" context73_0"
+" env74_0"
+" post-expansion-scope-action78_0"
+" scopes79_0"
 "(expand-context/outer-def-ctx-scopes the-struct_65)"
 "(expand-context/outer-binding-layer the-struct_65)"
 "(expand-context/outer-reference-records the-struct_65)"
-" only-immediate?78_0"
-" need-eventually-defined80_0"
-" current-introduction-scopes79_0"
+" only-immediate?80_0"
+" need-eventually-defined82_0"
+" current-introduction-scopes81_0"
 "(expand-context/outer-name the-struct_65)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                   \"expand-context/outer?\""
-" the-struct_65))))))))))))))))))"
+"                                     \"expand-context/outer?\""
+" the-struct_65)))))))))))))))))))"
 "(define-values"
 "(flip-introduction-scopes)"
-"(lambda(s_132 ctx_45)(begin(flip-scopes s_132(expand-context-current-introduction-scopes ctx_45)))))"
+"(lambda(s_438 ctx_46)(begin(flip-scopes s_438(expand-context-current-introduction-scopes ctx_46)))))"
 "(define-values"
 "(1/syntax-transforming?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming?"
-"(if(let-values(((temp62_2) #t))(get-current-expand-context17.1 temp62_2 #t #f #f)) #t #f))))"
+"(if(let-values(((temp62_1) #t))(get-current-expand-context17.1 temp62_1 #t #f #f)) #t #f))))"
 "(define-values"
 "(1/syntax-transforming-with-lifts?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming-with-lifts?"
-"(let-values(((ctx_46)(let-values(((temp63_3) #t))(get-current-expand-context17.1 temp63_3 #t #f #f))))"
-"(if ctx_46(if(expand-context-lifts ctx_46) #t #f) #f)))))"
+"(let-values(((ctx_47)(let-values(((temp63_2) #t))(get-current-expand-context17.1 temp63_2 #t #f #f))))"
+"(if ctx_47(if(expand-context-lifts ctx_47) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-transforming-module-expression?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming-module-expression?"
-"(let-values(((ctx_47)(let-values(((temp64_2) #t))(get-current-expand-context17.1 temp64_2 #t #f #f))))"
-"(if ctx_47(if(expand-context-to-module-lifts ctx_47) #t #f) #f)))))"
+"(let-values(((ctx_48)(let-values(((temp64_3) #t))(get-current-expand-context17.1 temp64_3 #t #f #f))))"
+"(if ctx_48(if(expand-context-to-module-lifts ctx_48) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-local-transforming-module-provides?)"
 "(lambda()"
 "(begin"
 " 'syntax-local-transforming-module-provides?"
-"(let-values(((ctx_48)(let-values(((temp65_1) #t))(get-current-expand-context17.1 temp65_1 #t #f #f))))"
-"(if ctx_48(if(expand-context-requires+provides ctx_48) #t #f) #f)))))"
+"(let-values(((ctx_49)(let-values(((temp65_2) #t))(get-current-expand-context17.1 temp65_2 #t #f #f))))"
+"(if ctx_49(if(expand-context-requires+provides ctx_49) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-local-context)"
 "(lambda()"
 "(begin"
 " 'syntax-local-context"
-"(let-values(((ctx_49)"
+"(let-values(((ctx_50)"
 "(let-values(((temp66_2) 'syntax-local-context))"
 "(get-current-expand-context17.1 #f #f temp66_2 #t))))"
-"(expand-context-context ctx_49)))))"
+"(expand-context-context ctx_50)))))"
 "(define-values"
 "(1/syntax-local-introduce)"
-"(lambda(s_438)"
+"(lambda(s_439)"
 "(begin"
 " 'syntax-local-introduce"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_438)"
+"(if(syntax?$1 s_439)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_438)))"
+"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_439)))"
 "(values))))"
-"(let-values(((ctx_50)"
+"(let-values(((ctx_51)"
 "(let-values(((temp68_0) 'syntax-local-introduce))"
 "(get-current-expand-context17.1 #f #f temp68_0 #t))))"
-"(flip-introduction-scopes s_438 ctx_50))))))))"
+"(flip-introduction-scopes s_439 ctx_51))))))))"
 "(define-values"
 "(1/syntax-local-identifier-as-binding)"
 "(lambda(id_76)"
@@ -41928,17 +41953,17 @@ static const char *startup_source =
 "(let-values()"
 "                              (raise-argument-error 'syntax-local-identifier-as-binding \"identifier?\" id_76)))"
 "(values))))"
-"(let-values(((ctx_51)"
-"(let-values(((temp70_1) 'syntax-local-identifier-as-binding))"
-"(get-current-expand-context17.1 #f #f temp70_1 #t))))"
-"(remove-use-site-scopes id_76 ctx_51))))))))"
+"(let-values(((ctx_52)"
+"(let-values(((temp70_0) 'syntax-local-identifier-as-binding))"
+"(get-current-expand-context17.1 #f #f temp70_0 #t))))"
+"(remove-use-site-scopes id_76 ctx_52))))))))"
 "(define-values"
 "(1/syntax-local-phase-level)"
 "(lambda()"
 "(begin"
 " 'syntax-local-phase-level"
-"(let-values(((ctx_52)(let-values(((temp71_0) #t))(get-current-expand-context17.1 temp71_0 #t #f #f))))"
-"(if ctx_52(expand-context-phase ctx_52) 0)))))"
+"(let-values(((ctx_53)(let-values(((temp71_1) #t))(get-current-expand-context17.1 temp71_1 #t #f #f))))"
+"(if ctx_53(expand-context-phase ctx_53) 0)))))"
 "(define-values"
 "(1/syntax-local-name)"
 "(lambda()"
@@ -41946,10 +41971,10 @@ static const char *startup_source =
 " 'syntax-local-name"
 "(let-values()"
 "(let-values()"
-"(let-values(((ctx_53)"
+"(let-values(((ctx_54)"
 "(let-values(((who73_0) 'syntax-local-name))"
 "(get-current-expand-context17.1 #f #f who73_0 #t))))"
-"(let-values(((id_77)(expand-context-name ctx_53)))"
+"(let-values(((id_77)(expand-context-name ctx_54)))"
 "(if id_77(datum->syntax$1 #f(syntax-e$1 id_77) id_77) #f))))))))"
 "(define-values"
 "(1/make-syntax-introducer)"
@@ -41998,7 +42023,7 @@ static const char *startup_source =
 " 'make-syntax-delta-introducer9"
 "(let-values(((ext-s_0) ext-s7_0))"
 "(let-values(((base-s_0) base-s8_0))"
-"(let-values(((phase_114)(if phase6_1 phase5_1(1/syntax-local-phase-level))))"
+"(let-values(((phase_113)(if phase6_1 phase5_1(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -42027,27 +42052,27 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(phase? phase_114)"
+"(if(phase? phase_113)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'make-syntax-delta-introducer"
 " phase?-string"
-" phase_114)))"
+" phase_113)))"
 "(values))))"
-"(let-values(((ext-scs_0)(syntax-scope-set ext-s_0 phase_114)))"
+"(let-values(((ext-scs_0)(syntax-scope-set ext-s_0 phase_113)))"
 "(let-values(((base-scs_0)"
 "(syntax-scope-set"
-"(let-values(((or-part_279) base-s_0))"
-"(if or-part_279 or-part_279 empty-syntax))"
-" phase_114)))"
+"(let-values(((or-part_280) base-s_0))"
+"(if or-part_280 or-part_280 empty-syntax))"
+" phase_113)))"
 "(let-values(((use-base-scs_0)"
 "(if(subset? base-scs_0 ext-scs_0)"
 " base-scs_0"
 "(let-values(((or-part_33)"
 "(if(identifier? base-s_0)"
 "(let-values(((base-s80_0) base-s_0)"
-"((phase81_0) phase_114)"
+"((phase81_0) phase_113)"
 "((temp82_1) #t))"
 "(resolve40.1"
 " #f"
@@ -42131,9 +42156,9 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if((lambda(x_79)"
-"(let-values(((or-part_204)(not x_79)))"
-"(if or-part_204"
-" or-part_204"
+"(let-values(((or-part_205)(not x_79)))"
+"(if or-part_205"
+" or-part_205"
 "((lambda(p_26)"
 "(if(procedure? p_26)(procedure-arity-includes? p_26 0) #f))"
 " x_79))))"
@@ -42155,46 +42180,46 @@ static const char *startup_source =
 "(let-values(((current-ctx_0)"
 "(let-values(((who89_0) who_20))"
 "(get-current-expand-context17.1 #f #f who89_0 #t))))"
-"(let-values(((ctx_54)"
+"(let-values(((ctx_55)"
 "(if intdefs_3"
-"(let-values(((v_193) current-ctx_0))"
-"(let-values(((the-struct_66) v_193))"
-"(if(expand-context/outer? the-struct_66)"
+"(let-values(((v_194) current-ctx_0))"
+"(let-values(((the-struct_67) v_194))"
+"(if(expand-context/outer? the-struct_67)"
 "(let-values(((env90_0)"
 "(add-intdef-bindings"
 "(expand-context-env current-ctx_0)"
 " intdefs_3))"
-"((inner91_0)(root-expand-context/outer-inner v_193)))"
+"((inner91_0)(root-expand-context/outer-inner v_194)))"
 "(expand-context/outer1.1"
 " inner91_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_66)"
-"(root-expand-context/outer-use-site-scopes the-struct_66)"
-"(root-expand-context/outer-frame-id the-struct_66)"
-"(expand-context/outer-context the-struct_66)"
+"(root-expand-context/outer-post-expansion-scope the-struct_67)"
+"(root-expand-context/outer-use-site-scopes the-struct_67)"
+"(root-expand-context/outer-frame-id the-struct_67)"
+"(expand-context/outer-context the-struct_67)"
 " env90_0"
-"(expand-context/outer-post-expansion-scope-action the-struct_66)"
-"(expand-context/outer-scopes the-struct_66)"
-"(expand-context/outer-def-ctx-scopes the-struct_66)"
-"(expand-context/outer-binding-layer the-struct_66)"
-"(expand-context/outer-reference-records the-struct_66)"
-"(expand-context/outer-only-immediate? the-struct_66)"
-"(expand-context/outer-need-eventually-defined the-struct_66)"
-"(expand-context/outer-current-introduction-scopes the-struct_66)"
-"(expand-context/outer-name the-struct_66)))"
+"(expand-context/outer-post-expansion-scope-action the-struct_67)"
+"(expand-context/outer-scopes the-struct_67)"
+"(expand-context/outer-def-ctx-scopes the-struct_67)"
+"(expand-context/outer-binding-layer the-struct_67)"
+"(expand-context/outer-reference-records the-struct_67)"
+"(expand-context/outer-only-immediate? the-struct_67)"
+"(expand-context/outer-need-eventually-defined the-struct_67)"
+"(expand-context/outer-current-introduction-scopes the-struct_67)"
+"(expand-context/outer-name the-struct_67)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                 \"expand-context/outer?\""
-" the-struct_66))))"
+" the-struct_67))))"
 " current-ctx_0)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_34)(expand-context-observer ctx_54)))"
+"(let-values(((obs_34)(expand-context-observer ctx_55)))"
 "(if obs_34"
 "(let-values()"
 "(let-values()(call-expand-observe obs_34 'local-value id_78)))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_7)(expand-context-phase ctx_54)))"
+"(let-values(((phase_7)(expand-context-phase ctx_55)))"
 "((letrec-values(((loop_97)"
 "(lambda(id_70)"
 "(begin"
@@ -42220,9 +42245,9 @@ static const char *startup_source =
 "(resolve+shift/extra-inspector"
 " id_70"
 " phase_7"
-"(expand-context-namespace ctx_54)))))"
+"(expand-context-namespace ctx_55)))))"
 "(begin"
-"(let-values(((obs_35)(expand-context-observer ctx_54)))"
+"(let-values(((obs_35)(expand-context-observer ctx_55)))"
 "(if obs_35"
 "(let-values()"
 "(let-values()"
@@ -42232,7 +42257,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values(((obs_36)"
-"(expand-context-observer ctx_54)))"
+"(expand-context-observer ctx_55)))"
 "(if obs_36"
 "(let-values()"
 "(let-values()"
@@ -42245,9 +42270,9 @@ static const char *startup_source =
 "(failure-thunk_0)"
 "                                                                  (error who_20 \"unbound identifier: ~v\" id_70))))"
 "(let-values()"
-"(let-values(((v_194 primitive?_7 insp_17 protected?_8)"
+"(let-values(((v_195 primitive?_7 insp_17 protected?_8)"
 "(let-values(((b95_0) b_23)"
-"((ctx96_0) ctx_54)"
+"((ctx96_0) ctx_55)"
 "((id97_0) id_70)"
 "((temp98_1) #t))"
 "(lookup62.1"
@@ -42258,12 +42283,12 @@ static const char *startup_source =
 " b95_0"
 " ctx96_0"
 " id97_0))))"
-"(if(let-values(((or-part_280)(variable? v_194)))"
-"(if or-part_280 or-part_280(core-form? v_194)))"
+"(if(let-values(((or-part_281)(variable? v_195)))"
+"(if or-part_281 or-part_281(core-form? v_195)))"
 "(let-values()"
 "(begin"
 "(let-values(((obs_37)"
-"(expand-context-observer ctx_54)))"
+"(expand-context-observer ctx_55)))"
 "(if obs_37"
 "(let-values()"
 "(let-values()"
@@ -42281,11 +42306,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values(((obs_38)"
-"(expand-context-observer ctx_54)))"
+"(expand-context-observer ctx_55)))"
 "(if obs_38"
 "(let-values()"
 "(if(not"
-"(if(1/rename-transformer? v_194)"
+"(if(1/rename-transformer? v_195)"
 "(not immediate?_1)"
 " #f))"
 "(let-values()"
@@ -42295,19 +42320,19 @@ static const char *startup_source =
 " #t))"
 "(void)))"
 "(void)))"
-"(if(1/rename-transformer? v_194)"
+"(if(1/rename-transformer? v_195)"
 "(let-values()"
 "(if immediate?_1"
 "(values"
-" v_194"
-"(1/rename-transformer-target v_194))"
+" v_195"
+"(1/rename-transformer-target v_195))"
 "(loop_97"
-"(1/rename-transformer-target v_194))))"
+"(1/rename-transformer-target v_195))))"
 "(if immediate?_1"
-"(let-values()(values v_194 #f))"
-"(let-values() v_194)))))))))))))))"
+"(let-values()(values v_195 #f))"
+"(let-values() v_195)))))))))))))))"
 " loop_97)"
-"(flip-introduction-scopes id_78 ctx_54))))))))))))))))))"
+"(flip-introduction-scopes id_78 ctx_55))))))))))))))))))"
 "(define-values"
 "(1/syntax-local-value)"
 "(let-values(((syntax-local-value25_0)"
@@ -42406,7 +42431,7 @@ static const char *startup_source =
 "(unbox"
 " counter_4)))"
 "(values))))"
-"(let-values(((name_61)"
+"(let-values(((name_36)"
 "(string->unreadable-symbol"
 "(format"
 "                                                                                                                    \"lifted/~a\""
@@ -42415,7 +42440,7 @@ static const char *startup_source =
 "(add-scope"
 "(datum->syntax$1"
 " #f"
-" name_61)"
+" name_36)"
 "(new-scope"
 " 'macro)))))"
 " fold-var_191))))"
@@ -42441,10 +42466,10 @@ static const char *startup_source =
 "(expand-context-phase ctx_18))))))))))))))"
 "(define-values"
 "(1/syntax-local-lift-expression)"
-"(lambda(s_439)"
+"(lambda(s_440)"
 "(begin"
 " 'syntax-local-lift-expression"
-"(let-values()(let-values()(car(do-lift-values-expression 'syntax-local-lift-expression 1 s_439)))))))"
+"(let-values()(let-values()(car(do-lift-values-expression 'syntax-local-lift-expression 1 s_440)))))))"
 "(define-values"
 "(1/syntax-local-lift-values-expression)"
 "(lambda(n_29 s_202)"
@@ -42458,10 +42483,10 @@ static const char *startup_source =
 " 'syntax-local-lift-context"
 "(let-values()"
 "(let-values()"
-"(let-values(((ctx_55)"
+"(let-values(((ctx_56)"
 "(let-values(((who113_0) 'syntax-local-lift-context))"
 "(get-current-expand-context17.1 #f #f who113_0 #t))))"
-"(root-expand-context-lift-key ctx_55)))))))"
+"(root-expand-context-lift-key ctx_56)))))))"
 "(define-values"
 "(1/syntax-local-lift-module)"
 "(lambda(s_64)"
@@ -42475,15 +42500,15 @@ static const char *startup_source =
 "(void)"
 "                            (let-values () (raise-argument-error 'syntax-local-lift-module \"syntax?\" s_64)))"
 "(values))))"
-"(let-values(((ctx_56)"
+"(let-values(((ctx_57)"
 "(let-values(((who115_0) 'syntax-local-lift-module))"
 "(get-current-expand-context17.1 #f #f who115_0 #t))))"
-"(let-values(((phase_115)(expand-context-phase ctx_56)))"
+"(let-values(((phase_114)(expand-context-phase ctx_57)))"
 "(begin"
-"(let-values(((tmp_34)(core-form-sym s_64 phase_115)))"
+"(let-values(((tmp_34)(core-form-sym s_64 phase_114)))"
 "(if(if(equal? tmp_34 'module) #t(equal? tmp_34 'module*))"
 "(let-values()"
-"(let-values(((lifts_9)(expand-context-module-lifts ctx_56)))"
+"(let-values(((lifts_9)(expand-context-module-lifts ctx_57)))"
 "(begin"
 "(if lifts_9"
 "(void)"
@@ -42493,10 +42518,10 @@ static const char *startup_source =
 "                                 \"not currently transforming within a module declaration or top level\""
 "                                 \"form to lift\""
 " s_64)))"
-"(add-lifted-module! lifts_9(flip-introduction-scopes s_64 ctx_56) phase_115))))"
+"(add-lifted-module! lifts_9(flip-introduction-scopes s_64 ctx_57) phase_114))))"
 "(let-values()"
 "                        (raise-arguments-error 'syntax-local-lift-module \"not a module form\" \"given form\" s_64))))"
-"(let-values(((obs_40)(expand-context-observer ctx_56)))"
+"(let-values(((obs_40)(expand-context-observer ctx_57)))"
 "(if obs_40"
 "(let-values()(let-values()(call-expand-observe obs_40 'lift-statement s_64)))"
 "(void))))))))))))"
@@ -42521,7 +42546,7 @@ static const char *startup_source =
 "(begin"
 " 'do-local-lift-to-module54"
 "(let-values(((who_22) who52_0))"
-"(let-values(((s_440) s53_1))"
+"(let-values(((s_441) s53_1))"
 "(let-values(((no-target-msg_0) no-target-msg34_0))"
 "(let-values(((intro?_0)(if intro?44_0 intro?35_0 #t)))"
 "(let-values(((more-checks_0)(if more-checks45_0 more-checks36_0 void)))"
@@ -42531,27 +42556,27 @@ static const char *startup_source =
 "(let-values(((pre-wrap_0)"
 "(if pre-wrap49_0"
 " pre-wrap40_0"
-"(lambda(s_441 phase_116 lift-ctx_1)(begin 'pre-wrap s_441)))))"
+"(lambda(s_442 phase_115 lift-ctx_1)(begin 'pre-wrap s_442)))))"
 "(let-values(((shift-wrap_0)"
 "(if shift-wrap50_0"
 " shift-wrap41_0"
-"(lambda(s_98 phase_117 lift-ctx_2)(begin 'shift-wrap s_98)))))"
+"(lambda(s_98 phase_116 lift-ctx_2)(begin 'shift-wrap s_98)))))"
 "(let-values(((post-wrap_0)"
 "(if post-wrap51_0"
 " post-wrap42_0"
-"(lambda(s_442 phase_118 lift-ctx_3)(begin 'post-wrap s_442)))))"
+"(lambda(s_443 phase_117 lift-ctx_3)(begin 'post-wrap s_443)))))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_440)"
+"(if(syntax?$1 s_441)"
 "(void)"
-"                                                (let-values () (raise-argument-error who_22 \"syntax?\" s_440)))"
+"                                                (let-values () (raise-argument-error who_22 \"syntax?\" s_441)))"
 "(values))))"
 "(let-values((()(begin(more-checks_0)(values))))"
-"(let-values(((ctx_57)"
+"(let-values(((ctx_58)"
 "(let-values(((who116_0) who_22))"
 "(get-current-expand-context17.1 #f #f who116_0 #t))))"
-"(let-values(((lift-ctx_4)(get-lift-ctx_0 ctx_57)))"
+"(let-values(((lift-ctx_4)(get-lift-ctx_0 ctx_58)))"
 "(let-values((()"
 "(begin"
 "(if lift-ctx_4"
@@ -42561,15 +42586,15 @@ static const char *startup_source =
 " who_22"
 " no-target-msg_0"
 "                                                           \"form to lift\""
-" s_440)))"
+" s_441)))"
 "(values))))"
-"(let-values(((phase_119)(expand-context-phase ctx_57)))"
+"(let-values(((phase_118)(expand-context-phase ctx_58)))"
 "(let-values(((wrt-phase_1)(get-wrt-phase_0 lift-ctx_4)))"
 "(let-values(((added-s_0)"
-"(if intro?_0(flip-introduction-scopes s_440 ctx_57) s_440)))"
-"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_119 lift-ctx_4)))"
+"(if intro?_0(flip-introduction-scopes s_441 ctx_58) s_441)))"
+"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_118 lift-ctx_4)))"
 "(let-values(((shift-s_0)"
-"(let-values(((start_41) phase_119)"
+"(let-values(((start_41) phase_118)"
 "((end_31) wrt-phase_1)"
 "((inc_25) -1))"
 "(begin"
@@ -42583,9 +42608,9 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(> pos_107 end_31)"
-"(let-values(((phase_120)"
+"(let-values(((phase_119)"
 " pos_107))"
-"(let-values(((s_443)"
+"(let-values(((s_444)"
 "(let-values(((s_104)"
 " s_68))"
 "(let-values(((s_169)"
@@ -42593,15 +42618,15 @@ static const char *startup_source =
 "(shift-wrap_0"
 " s_104"
 "(sub1"
-" phase_120)"
+" phase_119)"
 " lift-ctx_4))))"
 "(values"
 " s_169)))))"
 "(if(not #f)"
 "(for-loop_265"
-" s_443"
+" s_444"
 "(+ pos_107 inc_25))"
-" s_443)))"
+" s_444)))"
 " s_68)))))"
 " for-loop_265)"
 " pre-s_0"
@@ -42610,7 +42635,7 @@ static const char *startup_source =
 "(post-wrap_0 shift-s_0 wrt-phase_1 lift-ctx_4)))"
 "(begin"
 "(add-lifted!_0 lift-ctx_4 post-s_1 wrt-phase_1)"
-"(values ctx_57 post-s_1))))))))))))))))))))))))))))"
+"(values ctx_58 post-s_1))))))))))))))))))))))))))))"
 "(define-values"
 "(1/syntax-local-lift-require)"
 "(lambda(s_333 use-s_1)"
@@ -42619,7 +42644,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(let-values(((sc_33)(new-scope 'macro)))"
-"(let-values(((ctx_58 added-s_1)"
+"(let-values(((ctx_59 added-s_1)"
 "(let-values(((who118_0) 'syntax-local-lift-require)"
 "((temp119_0)(datum->syntax$1 #f s_333))"
 "                                       ((temp120_0) \"could not find target context\")"
@@ -42634,11 +42659,11 @@ static const char *startup_source =
 "((require-lift-context-wrt-phase124_0) require-lift-context-wrt-phase)"
 "((add-lifted-require!125_0) add-lifted-require!)"
 "((temp126_0)"
-"(lambda(s_444 phase_121 require-lift-ctx_0)"
-"(require-spec-shift-for-syntax s_444)))"
+"(lambda(s_445 phase_120 require-lift-ctx_0)"
+"(require-spec-shift-for-syntax s_445)))"
 "((temp127_1)"
-"(lambda(s_445 phase_122 require-lift-ctx_1)"
-"(wrap-form '#%require(add-scope s_445 sc_33) phase_122))))"
+"(lambda(s_446 phase_121 require-lift-ctx_1)"
+"(wrap-form '#%require(add-scope s_446 sc_33) phase_121))))"
 "(do-local-lift-to-module54.1"
 " add-lifted-require!125_0"
 " expand-context-require-lifts123_0"
@@ -42659,12 +42684,12 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(namespace-visit-available-modules!"
-"(expand-context-namespace ctx_58)"
-"(expand-context-phase ctx_58))"
+"(expand-context-namespace ctx_59)"
+"(expand-context-phase ctx_59))"
 "(values))))"
 "(let-values(((result-s_6)(add-scope use-s_1 sc_33)))"
 "(begin"
-"(let-values(((obs_41)(expand-context-observer ctx_58)))"
+"(let-values(((obs_41)(expand-context-observer ctx_59)))"
 "(if obs_41"
 "(let-values()"
 "(let-values()(call-expand-observe obs_41 'lift-require added-s_1 use-s_1 result-s_6)))"
@@ -42672,23 +42697,23 @@ static const char *startup_source =
 " result-s_6))))))))))"
 "(define-values"
 "(1/syntax-local-lift-provide)"
-"(lambda(s_446)"
+"(lambda(s_447)"
 "(begin"
 " 'syntax-local-lift-provide"
 "(let-values()"
 "(let-values()"
-"(let-values(((ctx_59 result-s_7)"
+"(let-values(((ctx_60 result-s_7)"
 "(let-values(((who129_0) 'syntax-local-lift-provide)"
-"((s130_0) s_446)"
+"((s130_0) s_447)"
 "                                     ((temp131_1) \"not expanding in a module run-time body\")"
 "((expand-context-to-module-lifts132_0) expand-context-to-module-lifts)"
 "((to-module-lift-context-wrt-phase133_0) to-module-lift-context-wrt-phase)"
 "((add-lifted-to-module-provide!134_0) add-lifted-to-module-provide!)"
 "((temp135_0)"
-"(lambda(s_126 phase_123 to-module-lift-ctx_0)(wrap-form 'for-syntax s_126 #f)))"
+"(lambda(s_126 phase_122 to-module-lift-ctx_0)(wrap-form 'for-syntax s_126 #f)))"
 "((temp136_0)"
-"(lambda(s_447 phase_124 to-module-lift-ctx_1)"
-"(wrap-form '#%provide s_447 phase_124))))"
+"(lambda(s_448 phase_123 to-module-lift-ctx_1)"
+"(wrap-form '#%provide s_448 phase_123))))"
 "(do-local-lift-to-module54.1"
 " add-lifted-to-module-provide!134_0"
 " expand-context-to-module-lifts132_0"
@@ -42706,7 +42731,7 @@ static const char *startup_source =
 " #t"
 " who129_0"
 " s130_0))))"
-"(let-values(((obs_42)(expand-context-observer ctx_59)))"
+"(let-values(((obs_42)(expand-context-observer ctx_60)))"
 "(if obs_42"
 "(let-values()(let-values()(call-expand-observe obs_42 'lift-provide result-s_7)))"
 "(void)))))))))"
@@ -42717,7 +42742,7 @@ static const char *startup_source =
 " 'syntax-local-lift-module-end-declaration"
 "(let-values()"
 "(let-values()"
-"(let-values(((ctx_60 also-s_0)"
+"(let-values(((ctx_61 also-s_0)"
 "(let-values(((who138_0) 'syntax-local-lift-module-end-declaration)"
 "((s139_0) s_127)"
 "((temp140_0)"
@@ -42726,13 +42751,13 @@ static const char *startup_source =
 "((temp142_1)(lambda(lift-ctx_5) 0))"
 "((add-lifted-to-module-end!143_0) add-lifted-to-module-end!)"
 "((temp144_0)"
-"(lambda(orig-s_32 phase_125 to-module-lift-ctx_2)"
+"(lambda(orig-s_32 phase_124 to-module-lift-ctx_2)"
 "(if(to-module-lift-context-end-as-expressions? to-module-lift-ctx_2)"
-"(wrap-form '#%expression orig-s_32 phase_125)"
+"(wrap-form '#%expression orig-s_32 phase_124)"
 " orig-s_32)))"
 "((temp145_1)"
-"(lambda(s_448 phase_126 to-module-lift-ctx_3)"
-"(wrap-form 'begin-for-syntax s_448 phase_126))))"
+"(lambda(s_449 phase_125 to-module-lift-ctx_3)"
+"(wrap-form 'begin-for-syntax s_449 phase_125))))"
 "(do-local-lift-to-module54.1"
 " add-lifted-to-module-end!143_0"
 " expand-context-to-module-lifts141_0"
@@ -42750,17 +42775,17 @@ static const char *startup_source =
 " #t"
 " who138_0"
 " s139_0))))"
-"(let-values(((obs_43)(expand-context-observer ctx_60)))"
+"(let-values(((obs_43)(expand-context-observer ctx_61)))"
 "(if obs_43"
 "(let-values()(let-values()(call-expand-observe obs_43 'lift-statement s_127)))"
 "(void)))))))))"
 "(define-values"
 "(wrap-form)"
-"(lambda(sym_68 s_449 phase_127)"
+"(lambda(sym_68 s_450 phase_126)"
 "(begin"
 "(datum->syntax$1"
 " #f"
-"(list(datum->syntax$1(if phase_127(syntax-shift-phase-level$1 core-stx phase_127) #f) sym_68) s_449)))))"
+"(list(datum->syntax$1(if phase_126(syntax-shift-phase-level$1 core-stx phase_126) #f) sym_68) s_450)))))"
 "(define-values"
 "(1/syntax-local-module-defined-identifiers)"
 "(lambda()"
@@ -42777,10 +42802,10 @@ static const char *startup_source =
 " 'syntax-local-module-defined-identifiers"
 "                               \"not currently transforming module provides\")))"
 "(values))))"
-"(let-values(((ctx_45)"
+"(let-values(((ctx_62)"
 "(let-values(((temp147_1) 'syntax-local-module-defined-identifiers))"
 "(get-current-expand-context17.1 #f #f temp147_1 #t))))"
-"(requireds->phase-ht(extract-module-definitions(expand-context-requires+provides ctx_45))))))))))"
+"(requireds->phase-ht(extract-module-definitions(expand-context-requires+provides ctx_62))))))))))"
 "(define-values"
 "(1/syntax-local-module-required-identifiers)"
 "(lambda(mod-path_8 phase-level_21)"
@@ -42790,8 +42815,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_281)(not mod-path_8)))"
-"(if or-part_281 or-part_281(1/module-path? mod-path_8)))"
+"(if(let-values(((or-part_282)(not mod-path_8)))"
+"(if or-part_282 or-part_282(1/module-path? mod-path_8)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -42801,8 +42826,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_282)(eq? phase-level_21 #t)))"
-"(if or-part_282 or-part_282(phase? phase-level_21)))"
+"(if(let-values(((or-part_283)(eq? phase-level_21 #t)))"
+"(if or-part_283 or-part_283(phase? phase-level_21)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -42819,11 +42844,11 @@ static const char *startup_source =
 " 'syntax-local-module-required-identifiers"
 "                                   \"not currently transforming module provides\")))"
 "(values))))"
-"(let-values(((ctx_61)"
+"(let-values(((ctx_63)"
 "(let-values(((temp149_1) 'syntax-local-module-required-identifiers))"
 "(get-current-expand-context17.1 #f #f temp149_1 #t))))"
-"(let-values(((requires+provides_5)(expand-context-requires+provides ctx_61)))"
-"(let-values(((mpi_47)(if mod-path_8(module-path->mpi/context mod-path_8 ctx_61) #f)))"
+"(let-values(((requires+provides_5)(expand-context-requires+provides ctx_63)))"
+"(let-values(((mpi_47)(if mod-path_8(module-path->mpi/context mod-path_8 ctx_63) #f)))"
 "(let-values(((requireds_0)"
 "(extract-all-module-requires"
 " requires+provides_5"
@@ -42841,7 +42866,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_112"
-"(let-values(((phase_128 ids_29)"
+"(let-values(((phase_127 ids_29)"
 "(hash-iterate-key+value ht_139 i_112)))"
 "(let-values(((fold-var_206)"
 "(let-values(((fold-var_260) fold-var_259))"
@@ -42849,7 +42874,7 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(cons phase_128 ids_29))"
+"(cons phase_127 ids_29))"
 " fold-var_260))))"
 "(values fold-var_261)))))"
 "(if(not #f)"
@@ -42899,9 +42924,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_283)(1/module-path? mod-path_9)))"
-"(if or-part_283"
-" or-part_283"
+"(if(let-values(((or-part_284)(1/module-path? mod-path_9)))"
+"(if or-part_284"
+" or-part_284"
 "(if(syntax?$1 mod-path_9)(1/module-path?(syntax->datum$1 mod-path_9)) #f)))"
 "(void)"
 "(let-values()"
@@ -42914,15 +42939,15 @@ static const char *startup_source =
 "                                \"               (module-path? (syntax->datum stx)))))\")"
 " mod-path_9)))"
 "(values))))"
-"(let-values(((ctx_62)"
+"(let-values(((ctx_64)"
 "(let-values(((temp151_1) 'syntax-local-module-exports))"
 "(get-current-expand-context17.1 #f #f temp151_1 #t))))"
-"(let-values(((ns_75)(expand-context-namespace ctx_62)))"
+"(let-values(((ns_75)(expand-context-namespace ctx_64)))"
 "(let-values(((mod-name_18)"
 "(1/module-path-index-resolve"
 "(module-path->mpi/context"
 "(if(syntax?$1 mod-path_9)(syntax->datum$1 mod-path_9) mod-path_9)"
-" ctx_62)"
+" ctx_64)"
 " #t)))"
 "(let-values(((m_19)(namespace->module ns_75 mod-name_18)))"
 "(begin"
@@ -42940,7 +42965,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_166"
-"(let-values(((phase_129 syms_21)"
+"(let-values(((phase_128 syms_21)"
 "(hash-iterate-key+value ht_144 i_166)))"
 "(let-values(((fold-var_263)"
 "(let-values(((fold-var_264) fold-var_262))"
@@ -42949,7 +42974,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_129"
+" phase_128"
 "(reverse$1"
 "(let-values(((ht_145)"
 " syms_21))"
@@ -43010,10 +43035,10 @@ static const char *startup_source =
 " 'syntax-local-submodules"
 "(let-values()"
 "(let-values()"
-"(let-values(((ctx_63)"
+"(let-values(((ctx_65)"
 "(let-values(((who153_0) 'syntax-local-submodules))"
 "(get-current-expand-context17.1 #f #f who153_0 #t))))"
-"(let-values(((submods_3)(expand-context-declared-submodule-names ctx_63)))"
+"(let-values(((submods_3)(expand-context-declared-submodule-names ctx_65)))"
 "(reverse$1"
 "(let-values(((ht_146) submods_3))"
 "(begin"
@@ -43025,7 +43050,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_168"
-"(let-values(((name_62 kind_7)(hash-iterate-key+value ht_146 i_168)))"
+"(let-values(((name_61 kind_7)(hash-iterate-key+value ht_146 i_168)))"
 "(let-values(((fold-var_271)"
 "(let-values(((fold-var_272) fold-var_270))"
 "(if(eq? kind_7 'module)"
@@ -43033,7 +43058,7 @@ static const char *startup_source =
 "(let-values(((fold-var_274)"
 "(let-values()"
 "(cons"
-"(let-values() name_62)"
+"(let-values() name_61)"
 " fold-var_273))))"
 "(values fold-var_274)))"
 " fold-var_272))))"
@@ -43065,10 +43090,10 @@ static const char *startup_source =
 "                                                   \"identifier?\""
 " id_34)))"
 "(values))))"
-"(let-values(((ctx_29)"
+"(let-values(((ctx_30)"
 "(let-values(((who155_0) 'syntax-local-get-shadower))"
 "(get-current-expand-context17.1 #f #f who155_0 #t))))"
-"(let-values(((new-id_0)(add-scopes id_34(expand-context-scopes ctx_29))))"
+"(let-values(((new-id_0)(add-scopes id_34(expand-context-scopes ctx_30))))"
 "(if(syntax-clean? id_34) new-id_0(syntax-taint$1 new-id_0))))))))))))))"
 "(case-lambda"
 "((id_85)(begin 'syntax-local-get-shadower(syntax-local-get-shadower60_0 id_85 #f #f)))"
@@ -43098,8 +43123,8 @@ static const char *startup_source =
 "(srcloc-vector?)"
 "(lambda(v_70)"
 "(begin"
-"(if(let-values(((or-part_284)(not(vector-ref v_70 1))))"
-"(if or-part_284 or-part_284(exact-positive-integer?(vector-ref v_70 1))))"
+"(if(let-values(((or-part_285)(not(vector-ref v_70 1))))"
+"(if or-part_285 or-part_285(exact-positive-integer?(vector-ref v_70 1))))"
 "(if(let-values(((or-part_27)(not(vector-ref v_70 2))))"
 "(if or-part_27 or-part_27(exact-nonnegative-integer?(vector-ref v_70 2))))"
 "(if(let-values(((or-part_10)(not(vector-ref v_70 3))))"
@@ -43111,47 +43136,47 @@ static const char *startup_source =
 " #f))))"
 "(define-values"
 "(to-srcloc-stx)"
-"(lambda(v_195)"
+"(lambda(v_196)"
 "(begin"
-"(if(srcloc? v_195)"
-"(let-values()"
-"(let-values(((the-struct_67) empty-syntax))"
-"(if(syntax?$1 the-struct_67)"
-"(let-values(((srcloc1_2) v_195))"
-"(syntax1.1"
-"(syntax-content the-struct_67)"
-"(syntax-scopes the-struct_67)"
-"(syntax-shifted-multi-scopes the-struct_67)"
-"(syntax-scope-propagations+tamper the-struct_67)"
-"(syntax-mpi-shifts the-struct_67)"
-" srcloc1_2"
-"(syntax-props the-struct_67)"
-"(syntax-inspector the-struct_67)))"
-"              (raise-argument-error 'struct-copy \"syntax?\" the-struct_67))))"
-"(if(pair? v_195)"
-"(let-values()(to-srcloc-stx(list->vector v_195)))"
-"(if(vector? v_195)"
+"(if(srcloc? v_196)"
 "(let-values()"
 "(let-values(((the-struct_68) empty-syntax))"
 "(if(syntax?$1 the-struct_68)"
-"(let-values(((srcloc2_1)"
-"(srcloc"
-"(vector-ref v_195 0)"
-"(vector-ref v_195 1)"
-"(vector-ref v_195 2)"
-"(vector-ref v_195 3)"
-"(vector-ref v_195 4))))"
+"(let-values(((srcloc1_2) v_196))"
 "(syntax1.1"
 "(syntax-content the-struct_68)"
 "(syntax-scopes the-struct_68)"
 "(syntax-shifted-multi-scopes the-struct_68)"
 "(syntax-scope-propagations+tamper the-struct_68)"
 "(syntax-mpi-shifts the-struct_68)"
-" srcloc2_1"
+" srcloc1_2"
 "(syntax-props the-struct_68)"
 "(syntax-inspector the-struct_68)))"
-"                  (raise-argument-error 'struct-copy \"syntax?\" the-struct_68))))"
-"(let-values() v_195)))))))"
+"              (raise-argument-error 'struct-copy \"syntax?\" the-struct_68))))"
+"(if(pair? v_196)"
+"(let-values()(to-srcloc-stx(list->vector v_196)))"
+"(if(vector? v_196)"
+"(let-values()"
+"(let-values(((the-struct_69) empty-syntax))"
+"(if(syntax?$1 the-struct_69)"
+"(let-values(((srcloc2_1)"
+"(srcloc"
+"(vector-ref v_196 0)"
+"(vector-ref v_196 1)"
+"(vector-ref v_196 2)"
+"(vector-ref v_196 3)"
+"(vector-ref v_196 4))))"
+"(syntax1.1"
+"(syntax-content the-struct_69)"
+"(syntax-scopes the-struct_69)"
+"(syntax-shifted-multi-scopes the-struct_69)"
+"(syntax-scope-propagations+tamper the-struct_69)"
+"(syntax-mpi-shifts the-struct_69)"
+" srcloc2_1"
+"(syntax-props the-struct_69)"
+"(syntax-inspector the-struct_69)))"
+"                  (raise-argument-error 'struct-copy \"syntax?\" the-struct_69))))"
+"(let-values() v_196)))))))"
 "(define-values"
 "(1/syntax-e)"
 "(lambda(s_0)"
@@ -43188,15 +43213,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_285)(not stx-c_4)))"
-"(if or-part_285 or-part_285(syntax?$1 stx-c_4)))"
+"(if(let-values(((or-part_286)(not stx-c_4)))"
+"(if or-part_286 or-part_286(syntax?$1 stx-c_4)))"
 "(void)"
 "                                        (let-values () (raise-argument-error 'datum->syntax \"(or #f syntax?)\" stx-c_4)))"
-"(if(let-values(((or-part_286)(not stx-l_2)))"
-"(if or-part_286"
-" or-part_286"
-"(let-values(((or-part_287)(syntax?$1 stx-l_2)))"
-"(if or-part_287 or-part_287(encoded-srcloc? stx-l_2)))))"
+"(if(let-values(((or-part_287)(not stx-l_2)))"
+"(if or-part_287"
+" or-part_287"
+"(let-values(((or-part_288)(syntax?$1 stx-l_2)))"
+"(if or-part_288 or-part_288(encoded-srcloc? stx-l_2)))))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -43214,16 +43239,16 @@ static const char *startup_source =
 "                                            \"                 (or/c exact-positive-integer? #f)\\n\""
 "                                            \"                 (or/c exact-nonnegative-integer? #f)))\")"
 " stx-l_2)))"
-"(if(let-values(((or-part_288)(not stx-p_1)))"
-"(if or-part_288 or-part_288(syntax?$1 stx-p_1)))"
+"(if(let-values(((or-part_289)(not stx-p_1)))"
+"(if or-part_289 or-part_289(syntax?$1 stx-p_1)))"
 "(void)"
 "                                        (let-values () (raise-argument-error 'datum->syntax \"(or #f syntax?)\" stx-p_1)))"
 "(datum->syntax$1 stx-c_4 s_177(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
 "(case-lambda"
 "((stx-c_5 s_304)(begin 'datum->syntax(datum->syntax9_0 stx-c_5 s_304 #f #f #f #f #f #f)))"
-"((stx-c_6 s_450 stx-l_3 stx-p_2 ignored3_1)(datum->syntax9_0 stx-c_6 s_450 stx-l_3 stx-p_2 ignored3_1 #t #t #t))"
+"((stx-c_6 s_451 stx-l_3 stx-p_2 ignored3_1)(datum->syntax9_0 stx-c_6 s_451 stx-l_3 stx-p_2 ignored3_1 #t #t #t))"
 "((stx-c_7 s_75 stx-l_4 stx-p2_1)(datum->syntax9_0 stx-c_7 s_75 stx-l_4 stx-p2_1 #f #t #t #f))"
-"((stx-c_8 s_451 stx-l1_1)(datum->syntax9_0 stx-c_8 s_451 stx-l1_1 #f #f #t #f #f)))))"
+"((stx-c_8 s_452 stx-l1_1)(datum->syntax9_0 stx-c_8 s_452 stx-l1_1 #f #f #t #f #f)))))"
 "(define-values"
 "(1/syntax->list)"
 "(lambda(s_5)"
@@ -43252,7 +43277,7 @@ static const char *startup_source =
 " 'bound-identifier=?15"
 "(let-values(((a_53) a13_0))"
 "(let-values(((b_82) b14_0))"
-"(let-values(((phase_130)(if phase12_1 phase11_0(1/syntax-local-phase-level))))"
+"(let-values(((phase_129)(if phase12_1 phase11_0(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -43263,10 +43288,10 @@ static const char *startup_source =
 "(if(identifier? b_82)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'bound-identifier=? \"identifier?\" b_82)))"
-"(if(phase? phase_130)"
+"(if(phase? phase_129)"
 "(void)"
-"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_130)))"
-"(bound-identifier=?$1 a_53 b_82 phase_130))))))))))))"
+"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_129)))"
+"(bound-identifier=?$1 a_53 b_82 phase_129))))))))))))"
 "(case-lambda"
 "((a_54 b_8)(begin 'bound-identifier=?(bound-identifier=?15_0 a_54 b_8 #f #f)))"
 "((a_55 b_83 phase11_1)(bound-identifier=?15_0 a_55 b_83 phase11_1 #t)))))"
@@ -43320,8 +43345,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-transformer-identifier=? \"identifier?\" b_88)))"
 "(values))))"
-"(let-values(((phase_131)(add1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_60 b_88 phase_131 phase_131)))))))))"
+"(let-values(((phase_130)(add1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_60 b_88 phase_130 phase_130)))))))))"
 "(define-values"
 "(1/free-template-identifier=?)"
 "(lambda(a_61 b_89)"
@@ -43341,8 +43366,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-template-identifier=? \"identifier?\" b_89)))"
 "(values))))"
-"(let-values(((phase_132)(sub1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_61 b_89 phase_132 phase_132)))))))))"
+"(let-values(((phase_131)(sub1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_61 b_89 phase_131 phase_131)))))))))"
 "(define-values"
 "(1/free-label-identifier=?)"
 "(lambda(a_62 b_90)"
@@ -43380,7 +43405,7 @@ static const char *startup_source =
 "(identifier-binding$1 id_86 phase_36 top-level-symbol?_1))))))))))))"
 "(case-lambda"
 "((id_87)(begin 'identifier-binding(identifier-binding30_0 id_87 #f #f #f #f)))"
-"((id_88 phase_133 top-level-symbol?26_1)(identifier-binding30_0 id_88 phase_133 top-level-symbol?26_1 #t #t))"
+"((id_88 phase_132 top-level-symbol?26_1)(identifier-binding30_0 id_88 phase_132 top-level-symbol?26_1 #t #t))"
 "((id_89 phase25_1)(identifier-binding30_0 id_89 phase25_1 #f #t #f)))))"
 "(define-values"
 "(1/identifier-transformer-binding)"
@@ -43389,7 +43414,7 @@ static const char *startup_source =
 "(begin"
 " 'identifier-transformer-binding35"
 "(let-values(((id_90) id34_1))"
-"(let-values(((phase_134)(if phase33_1 phase32_2(1/syntax-local-phase-level))))"
+"(let-values(((phase_133)(if phase33_1 phase32_2(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -43398,7 +43423,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_90)))"
-"(identifier-binding$1 id_90(if phase_134(add1 phase_134) #f))))))))))))"
+"(identifier-binding$1 id_90(if phase_133(add1 phase_133) #f))))))))))))"
 "(case-lambda"
 "((id_91)(begin 'identifier-transformer-binding(identifier-transformer-binding35_0 id_91 #f #f)))"
 "((id_92 phase32_3)(identifier-transformer-binding35_0 id_92 phase32_3 #t)))))"
@@ -43429,11 +43454,11 @@ static const char *startup_source =
 "(define-values"
 "(1/identifier-binding-symbol)"
 "(let-values(((identifier-binding-symbol40_0)"
-"(lambda(id39_0 phase37_2 phase38_1)"
+"(lambda(id39_0 phase37_2 phase38_0)"
 "(begin"
 " 'identifier-binding-symbol40"
 "(let-values(((id_94) id39_0))"
-"(let-values(((phase_135)(if phase38_1 phase37_2(1/syntax-local-phase-level))))"
+"(let-values(((phase_134)(if phase38_0 phase37_2(1/syntax-local-phase-level))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -43441,11 +43466,11 @@ static const char *startup_source =
 "(if(identifier? id_94)"
 "(void)"
 "                                  (let-values () (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_94)))"
-"(if(phase? phase_135)"
+"(if(phase? phase_134)"
 "(void)"
 "(let-values()"
-"(raise-argument-error 'identifier-binding-symbol phase?-string phase_135)))"
-"(identifier-binding-symbol$1 id_94 phase_135)))))))))))"
+"(raise-argument-error 'identifier-binding-symbol phase?-string phase_134)))"
+"(identifier-binding-symbol$1 id_94 phase_134)))))))))))"
 "(case-lambda"
 "((id_95)(begin 'identifier-binding-symbol(identifier-binding-symbol40_0 id_95 #f #f)))"
 "((id_70 phase37_3)(identifier-binding-symbol40_0 id_70 phase37_3 #t)))))"
@@ -43482,20 +43507,20 @@ static const char *startup_source =
 "(lambda(s51_0 phase47_2 all-bindings?48_0 phase49_1 all-bindings?50_0)"
 "(begin"
 " 'syntax-debug-info52"
-"(let-values(((s_452) s51_0))"
-"(let-values(((phase_136)(if phase49_1 phase47_2(1/syntax-local-phase-level))))"
+"(let-values(((s_453) s51_0))"
+"(let-values(((phase_135)(if phase49_1 phase47_2(1/syntax-local-phase-level))))"
 "(let-values(((all-bindings?_1)(if all-bindings?50_0 all-bindings?48_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_452)"
+"(if(syntax?$1 s_453)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'syntax-debug-info \"syntax?\" s_452)))"
-"(if(phase? phase_136)"
+"                                    (let-values () (raise-argument-error 'syntax-debug-info \"syntax?\" s_453)))"
+"(if(phase? phase_135)"
 "(void)"
-"(let-values()(raise-argument-error 'syntax-debug-info phase?-string phase_136)))"
-"(syntax-debug-info$1 s_452 phase_136 all-bindings?_1))))))))))))"
+"(let-values()(raise-argument-error 'syntax-debug-info phase?-string phase_135)))"
+"(syntax-debug-info$1 s_453 phase_135 all-bindings?_1))))))))))))"
 "(case-lambda"
 "((s_314)(begin 'syntax-debug-info(syntax-debug-info52_0 s_314 #f #f #f #f)))"
 "((s_91 phase_101 all-bindings?48_1)(syntax-debug-info52_0 s_91 phase_101 all-bindings?48_1 #t #t))"
@@ -43539,12 +43564,12 @@ static const char *startup_source =
 "                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_99)))"
 "(values))))"
 "(let-values(((s_32)(syntax-track-origin$1 new-stx_8 old-stx_4 id_99)))"
-"(let-values(((ctx_64)"
+"(let-values(((ctx_66)"
 "(let-values(((temp73_0) #t))(get-current-expand-context17.1 temp73_0 #t #f #f))))"
 "(begin"
-"(if ctx_64"
+"(if ctx_66"
 "(let-values()"
-"(let-values(((obs_44)(expand-context-observer ctx_64)))"
+"(let-values(((obs_44)(expand-context-observer ctx_66)))"
 "(if obs_44"
 "(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_32)))"
 "(void))))"
@@ -43642,17 +43667,17 @@ static const char *startup_source =
 "(void)"
 "                                        (let-values () (raise-argument-error who_23 \"namespace?\" dest-namespace_2)))"
 "(values))))"
-"(let-values(((phase_130)(namespace-phase src-namespace_6)))"
+"(let-values(((phase_129)(namespace-phase src-namespace_6)))"
 "(let-values((()"
 "(begin"
-"(if(eqv? phase_130(namespace-phase dest-namespace_2))"
+"(if(eqv? phase_129(namespace-phase dest-namespace_2))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " who_23"
 "                                               \"source and destination namespace phases do not match\""
 "                                               \"source phase\""
-" phase_130"
+" phase_129"
 "                                               \"destination phase\""
 "(namespace-phase dest-namespace_2))))"
 "(values))))"
@@ -43662,7 +43687,7 @@ static const char *startup_source =
 "(begin"
 "((letrec-values(((loop_98)"
 "(lambda(mpi_48"
-" phase_137"
+" phase_136"
 " attach-instances?_1"
 " attach-phase_0)"
 "(begin"
@@ -43681,7 +43706,7 @@ static const char *startup_source =
 " mpi_48)))))"
 "(let-values(((attach-this-instance?_0)"
 "(if attach-instances?_1"
-"(eqv? phase_137 attach-phase_0)"
+"(eqv? phase_136 attach-phase_0)"
 " #f)))"
 "(let-values(((m-ns_12)"
 "(hash-ref"
@@ -43689,12 +43714,12 @@ static const char *startup_source =
 " todo_0"
 " mod-name_19"
 " '#hasheqv())"
-" phase_137"
+" phase_136"
 " missing_0)))"
-"(if(let-values(((or-part_250)"
+"(if(let-values(((or-part_251)"
 "(eq? missing_0 m-ns_12)))"
-"(if or-part_250"
-" or-part_250"
+"(if or-part_251"
+" or-part_251"
 "(if attach-this-instance?_0"
 "(not m-ns_12)"
 " #f)))"
@@ -43715,9 +43740,9 @@ static const char *startup_source =
 "(if(if(module-cross-phase-persistent?"
 " m_20)"
 "(if(not"
-"(label-phase? phase_137))"
+"(label-phase? phase_136))"
 "(not"
-"(zero-phase? phase_137))"
+"(zero-phase? phase_136))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -43762,7 +43787,7 @@ static const char *startup_source =
 "((mod-name33_0)"
 " mod-name_19)"
 "((phase34_1)"
-" phase_137))"
+" phase_136))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43791,7 +43816,7 @@ static const char *startup_source =
 "((mod-name36_0)"
 " mod-name_19)"
 "((phase37_4)"
-" phase_137))"
+" phase_136))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43830,14 +43855,14 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(if(if(label-phase?"
-" phase_137)"
+" phase_136)"
 "(not"
 "(let-values(((src-namespace38_0)"
 " src-namespace_6)"
 "((mod-name39_0)"
 " mod-name_19)"
 "((phase40_0)"
-" phase_137))"
+" phase_136))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43864,7 +43889,7 @@ static const char *startup_source =
 "((mpi42_0)"
 " mpi_48)"
 "((phase43_1)"
-" phase_137))"
+" phase_136))"
 "(namespace-module-instantiate!96.1"
 " #f"
 " #f"
@@ -43890,7 +43915,7 @@ static const char *startup_source =
 "(lambda(ht_147)"
 "(hash-set"
 " ht_147"
-" phase_137"
+" phase_136"
 " m-ns_13))"
 " '#hasheqv())"
 "(if already?_0"
@@ -43955,7 +43980,7 @@ static const char *startup_source =
 " m_20)"
 " mpi_48)"
 "(phase+"
-" phase_137"
+" phase_136"
 "(car"
 " phase+reqs_1))"
 " attach-instances?_1"
@@ -44047,9 +44072,9 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_15)"
 " mod-path_15)"
 " #f)"
-" phase_130"
+" phase_129"
 " attach-instances?_0"
-" phase_130)"
+" phase_129)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -44082,7 +44107,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_170"
-"(let-values(((phase_138"
+"(let-values(((phase_137"
 " m-ns_15)"
 "(hash-iterate-key+value"
 " ht_149"
@@ -44128,14 +44153,14 @@ static const char *startup_source =
 "(namespace-record-module-instance-attached!"
 " src-namespace_6"
 " mod-name_20"
-" phase_138)"
+" phase_137)"
 "(let-values(((or-part_72)"
 "(let-values(((dest-namespace47_0)"
 " dest-namespace_2)"
 "((mod-name48_0)"
 " mod-name_20)"
 "((phase49_2)"
-" phase_138))"
+" phase_137))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -44151,7 +44176,7 @@ static const char *startup_source =
 "(namespace-install-module-namespace!"
 " dest-namespace_2"
 " mod-name_20"
-" phase_138"
+" phase_137"
 " m_21"
 " m-ns_15)))))"
 "(void)))))"
@@ -44351,7 +44376,7 @@ static const char *startup_source =
 " s_3))"
 "(let-values()(add-ns-scopes_0 s_3)))))))))))))))))))"
 "(case-lambda"
-"((s_453)(begin 'namespace-syntax-introduce(namespace-syntax-introduce4_0 s_453 #f #f)))"
+"((s_454)(begin 'namespace-syntax-introduce(namespace-syntax-introduce4_0 s_454 #f #f)))"
 "((s_75 ns1_4)(namespace-syntax-introduce4_0 s_75 ns1_4 #t)))))"
 "(define-values"
 "(namespace-datum-introduce)"
@@ -44367,8 +44392,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_289)(1/namespace? where_0)))"
-"(if or-part_289 or-part_289(phase? where_0)))"
+"(if(let-values(((or-part_290)(1/namespace? where_0)))"
+"(if or-part_290 or-part_290(phase? where_0)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -44434,8 +44459,8 @@ static const char *startup_source =
 "(add-scopes"
 " empty-syntax"
 "(root-expand-context-module-scopes(namespace-get-root-expand-ctx ns_76)))))"
-"(if(let-values(((or-part_290)(1/module-path-index? req_6)))"
-"(if or-part_290 or-part_290(1/module-path? req_6)))"
+"(if(let-values(((or-part_291)(1/module-path-index? req_6)))"
+"(if or-part_291 or-part_291(1/module-path? req_6)))"
 "(let-values()"
 "(let-values(((temp85_0)"
 "(if(1/module-path-index? req_6)"
@@ -44666,9 +44691,9 @@ static const char *startup_source =
 "(if(symbol? sym_71)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'namespace-variable-value \"symbol?\" sym_71)))"
-"(if(let-values(((or-part_258)(not failure-thunk_5)))"
-"(if or-part_258"
-" or-part_258"
+"(if(let-values(((or-part_259)(not failure-thunk_5)))"
+"(if or-part_259"
+" or-part_259"
 "(if(procedure? failure-thunk_5)"
 "(procedure-arity-includes? failure-thunk_5 0)"
 " #f)))"
@@ -44701,7 +44726,7 @@ static const char *startup_source =
 " ns_81))"
 "(void))"
 "(values))))"
-"(let-values(((v_196"
+"(let-values(((v_197"
 " primitive?_8"
 " extra-inspector_8"
 " protected?_9)"
@@ -44727,13 +44752,13 @@ static const char *startup_source =
 " id136_0))"
 "(values variable #f #f #f))))"
 "(begin"
-"(if(variable? v_196)"
+"(if(variable? v_197)"
 "(void)"
 "(let-values()"
 "(escape_0"
-"(let-values(((or-part_291) failure-thunk_5))"
-"(if or-part_291"
-" or-part_291"
+"(let-values(((or-part_292) failure-thunk_5))"
+"(if or-part_292"
+" or-part_292"
 "(lambda()"
 "(raise"
 "(make-exn:fail:syntax$1"
@@ -44769,9 +44794,9 @@ static const char *startup_source =
 " var-sym_6"
 "(lambda()"
 "(escape_0"
-"(let-values(((or-part_292) failure-thunk_5))"
-"(if or-part_292"
-" or-part_292"
+"(let-values(((or-part_293) failure-thunk_5))"
+"(if or-part_293"
+" or-part_293"
 "(raise"
 "(exn:fail:contract:variable"
 "(format"
@@ -44940,20 +44965,20 @@ static const char *startup_source =
 "(let-values(((compile_1)"
 "(if compile4_0"
 " compile2_0"
-"(lambda(s_454 ns_87)(begin 'compile(1/compile s_454 ns_87 #f))))))"
+"(lambda(s_455 ns_87)(begin 'compile(1/compile s_455 ns_87 #f))))))"
 "(let-values()"
-"(if(let-values(((or-part_286)(compiled-in-memory? s_178)))"
-"(if or-part_286"
-" or-part_286"
-"(let-values(((or-part_287)(1/linklet-directory? s_178)))"
-"(if or-part_287 or-part_287(1/linklet-bundle? s_178)))))"
+"(if(let-values(((or-part_287)(compiled-in-memory? s_178)))"
+"(if or-part_287"
+" or-part_287"
+"(let-values(((or-part_288)(1/linklet-directory? s_178)))"
+"(if or-part_288 or-part_288(1/linklet-bundle? s_178)))))"
 "(let-values()(eval-compiled s_178 ns_43))"
 "(if(if(syntax?$1 s_178)"
-"(let-values(((or-part_288)(compiled-in-memory?(1/syntax-e s_178))))"
-"(if or-part_288"
-" or-part_288"
-"(let-values(((or-part_293)(1/linklet-directory?(1/syntax-e s_178))))"
-"(if or-part_293 or-part_293(1/linklet-bundle?(1/syntax-e s_178))))))"
+"(let-values(((or-part_289)(compiled-in-memory?(1/syntax-e s_178))))"
+"(if or-part_289"
+" or-part_289"
+"(let-values(((or-part_294)(1/linklet-directory?(1/syntax-e s_178))))"
+"(if or-part_294 or-part_294(1/linklet-bundle?(1/syntax-e s_178))))))"
 " #f)"
 "(let-values()(eval-compiled(1/syntax->datum s_178) ns_43))"
 "(let-values()"
@@ -45014,21 +45039,21 @@ static const char *startup_source =
 " to-source?21_1)"
 "(begin"
 " 'compile23"
-"(let-values(((s_455) s22_0))"
+"(let-values(((s_456) s22_0))"
 "(let-values(((ns_92)(if ns18_1 ns14_2(1/current-namespace))))"
 "(let-values(((serializable?_4)(if serializable?19_0 serializable?15_0 #t)))"
 "(let-values(((expand_0)(if expand20_0 expand16_0 expand$1)))"
 "(let-values(((to-source?_5)(if to-source?21_1 to-source?17_0 #f)))"
 "(let-values()"
 "(let-values(((cs_0)"
-"(if(1/compiled-expression? s_455)"
-"(let-values()(list s_455))"
-"(if(if(syntax?$1 s_455)"
-"(1/compiled-expression?(1/syntax-e s_455))"
+"(if(1/compiled-expression? s_456)"
+"(let-values()(list s_456))"
+"(if(if(syntax?$1 s_456)"
+"(1/compiled-expression?(1/syntax-e s_456))"
 " #f)"
-"(let-values()(list(1/syntax-e s_455)))"
+"(let-values()(list(1/syntax-e s_456)))"
 "(let-values()"
-"(let-values(((s86_0) s_455)"
+"(let-values(((s86_0) s_456)"
 "((ns87_0) ns_92)"
 "((temp88_2)"
 "(lambda(s_80 ns_49 as-tail?_4)"
@@ -45072,8 +45097,8 @@ static const char *startup_source =
 " cs91_0))))))))))))))"
 "(case-lambda"
 "((s_189)(begin 'compile(compile23_0 s_189 #f #f #f #f #f #f #f #f)))"
-"((s_456 ns_93 serializable?_5 expand_1 to-source?17_1)"
-"(compile23_0 s_456 ns_93 serializable?_5 expand_1 to-source?17_1 #t #t #t #t))"
+"((s_457 ns_93 serializable?_5 expand_1 to-source?17_1)"
+"(compile23_0 s_457 ns_93 serializable?_5 expand_1 to-source?17_1 #t #t #t #t))"
 "((s_81 ns_94 serializable?_6 expand16_1)(compile23_0 s_81 ns_94 serializable?_6 expand16_1 #f #t #t #t #f))"
 "((s_19 ns_95 serializable?15_1)(compile23_0 s_19 ns_95 serializable?15_1 #f #f #t #t #f #f))"
 "((s_156 ns14_3)(compile23_0 s_156 ns14_3 #f #f #f #t #f #f #f)))))"
@@ -45087,7 +45112,7 @@ static const char *startup_source =
 "(let-values(((ns_96)(if ns26_2 ns25_0(1/current-namespace))))"
 "(let-values()(1/compile s_25 ns_96 #t expand$1 #t))))))))"
 "(case-lambda"
-"((s_457)(begin(compile-to-linklets28_0 s_457 #f #f)))"
+"((s_458)(begin(compile-to-linklets28_0 s_458 #f #f)))"
 "((s_307 ns25_1)(compile-to-linklets28_0 s_307 ns25_1 #t)))))"
 "(define-values"
 "(struct:lifted-parsed-begin"
@@ -45254,9 +45279,9 @@ static const char *startup_source =
 "(let-values(((s108_0) s_317)"
 "((ns109_1) ns_98)"
 "((temp110_1)"
-"(lambda(s_458 ns_99 as-tail?_5)"
+"(lambda(s_459 ns_99 as-tail?_5)"
 "(expand-single"
-" s_458"
+" s_459"
 " ns_99"
 " observer_2"
 " to-parsed?_2"
@@ -45283,21 +45308,21 @@ static const char *startup_source =
 "((s_305)(begin 'expand(expand40_0 s_305 #f #f #f #f #f #f #f #f)))"
 "((s_322 ns_100 observable?_1 to-parsed?_3 serializable?34_1)"
 "(expand40_0 s_322 ns_100 observable?_1 to-parsed?_3 serializable?34_1 #t #t #t #t))"
-"((s_459 ns_101 observable?_2 to-parsed?33_1)(expand40_0 s_459 ns_101 observable?_2 to-parsed?33_1 #f #t #t #t #f))"
+"((s_460 ns_101 observable?_2 to-parsed?33_1)(expand40_0 s_460 ns_101 observable?_2 to-parsed?33_1 #f #t #t #t #f))"
 "((s_34 ns_102 observable?32_1)(expand40_0 s_34 ns_102 observable?32_1 #f #f #t #t #f #f))"
-"((s_460 ns31_4)(expand40_0 s_460 ns31_4 #f #f #f #t #f #f #f)))))"
+"((s_461 ns31_4)(expand40_0 s_461 ns31_4 #f #f #f #t #f #f #f)))))"
 "(define-values"
 "(expand-single)"
 "(lambda(s_414 ns_103 observer_3 to-parsed?_4 serializable?_9)"
 "(begin"
 "(let-values(((rebuild-s_2)(keep-properties-only s_414)))"
-"(let-values(((ctx_65)"
+"(let-values(((ctx_67)"
 "(let-values(((ns114_0) ns_103)"
 "((to-parsed?115_0) to-parsed?_4)"
 "((serializable?116_0) serializable?_9)"
 "((observer117_0) observer_3))"
 "(make-expand-context10.1 serializable?116_0 #t observer117_0 #t to-parsed?115_0 #t ns114_0))))"
-"(let-values(((require-lifts_3 lifts_10 exp-s_6)(expand-capturing-lifts s_414 ctx_65)))"
+"(let-values(((require-lifts_3 lifts_10 exp-s_6)(expand-capturing-lifts s_414 ctx_67)))"
 "(if(if(null? require-lifts_3)(null? lifts_10) #f)"
 "(let-values() exp-s_6)"
 "(if to-parsed?_4"
@@ -45318,14 +45343,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(log-top-lift-begin-before ctx_65 require-lifts_3 lifts_10 exp-s_6 ns_103)"
+"(log-top-lift-begin-before ctx_67 require-lifts_3 lifts_10 exp-s_6 ns_103)"
 "(values))))"
 "(let-values(((new-s_2)"
 "(let-values(((temp123_1)(append require-lifts_3 lifts_10))"
 "((temp124_0)"
 "(lambda(form_1)"
 "(begin"
-"(let-values(((obs_45)(expand-context-observer ctx_65)))"
+"(let-values(((obs_45)(expand-context-observer ctx_67)))"
 "(if obs_45"
 "(let-values()"
 "(let-values()(call-expand-observe obs_45 'next)))"
@@ -45342,7 +45367,7 @@ static const char *startup_source =
 "(let-values() form_2)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_46)(expand-context-observer ctx_65)))"
+"(let-values(((obs_46)(expand-context-observer ctx_67)))"
 "(if obs_46"
 "(let-values()"
 "(let-values()(call-expand-observe obs_46 'next)))"
@@ -45363,17 +45388,17 @@ static const char *startup_source =
 " temp123_1"
 " exp-s126_0"
 " temp127_2))))"
-"(begin(log-top-begin-after ctx_65 new-s_2) new-s_2))))))))))))"
+"(begin(log-top-begin-after ctx_67 new-s_2) new-s_2))))))))))))"
 "(define-values"
 "(expand-once$1)"
 "(let-values(((expand-once45_0)"
 "(lambda(s44_1 ns42_1 ns43_0)"
 "(begin"
 " 'expand-once45"
-"(let-values(((s_461) s44_1))"
+"(let-values(((s_462) s44_1))"
 "(let-values(((ns_104)(if ns43_0 ns42_1(1/current-namespace))))"
 "(let-values()"
-"(let-values(((s128_0) s_461)"
+"(let-values(((s128_0) s_462)"
 "((ns129_0) ns_104)"
 "((temp130_1)"
 "(lambda(s_206 ns_105 as-tail?_6)(expand-single-once s_206 ns_105)))"
@@ -45397,77 +45422,78 @@ static const char *startup_source =
 " s128_0"
 " ns129_0)))))))))"
 "(case-lambda"
-"((s_462)(begin 'expand-once(expand-once45_0 s_462 #f #f)))"
-"((s_463 ns42_2)(expand-once45_0 s_463 ns42_2 #t)))))"
+"((s_463)(begin 'expand-once(expand-once45_0 s_463 #f #f)))"
+"((s_464 ns42_2)(expand-once45_0 s_464 ns42_2 #t)))))"
 "(define-values"
 "(expand-single-once)"
-"(lambda(s_464 ns_106)"
+"(lambda(s_465 ns_45)"
 "(begin"
 "(let-values(((require-lifts_4 lifts_11 exp-s_7)"
 "(expand-capturing-lifts"
-" s_464"
-"(let-values(((v_197)"
-"(let-values(((ns135_1) ns_106))"
+" s_465"
+"(let-values(((v_198)"
+"(let-values(((ns135_1) ns_45))"
 "(make-expand-context10.1 #f #f #f #f #f #f ns135_1))))"
-"(let-values(((the-struct_69) v_197))"
-"(if(expand-context/outer? the-struct_69)"
+"(let-values(((the-struct_70) v_198))"
+"(if(expand-context/outer? the-struct_70)"
 "(let-values(((inner136_0)"
-"(let-values(((the-struct_70)(root-expand-context/outer-inner v_197)))"
-"(if(expand-context/inner? the-struct_70)"
+"(let-values(((the-struct_71)(root-expand-context/outer-inner v_198)))"
+"(if(expand-context/inner? the-struct_71)"
 "(let-values(((just-once?137_0) #t))"
 "(expand-context/inner2.1"
-"(root-expand-context/inner-self-mpi the-struct_70)"
-"(root-expand-context/inner-module-scopes the-struct_70)"
-"(root-expand-context/inner-top-level-bind-scope the-struct_70)"
-"(root-expand-context/inner-all-scopes-stx the-struct_70)"
-"(root-expand-context/inner-defined-syms the-struct_70)"
-"(root-expand-context/inner-counter the-struct_70)"
-"(root-expand-context/inner-lift-key the-struct_70)"
-"(expand-context/inner-to-parsed? the-struct_70)"
-"(expand-context/inner-phase the-struct_70)"
-"(expand-context/inner-namespace the-struct_70)"
+"(root-expand-context/inner-self-mpi the-struct_71)"
+"(root-expand-context/inner-module-scopes the-struct_71)"
+"(root-expand-context/inner-top-level-bind-scope the-struct_71)"
+"(root-expand-context/inner-all-scopes-stx the-struct_71)"
+"(root-expand-context/inner-defined-syms the-struct_71)"
+"(root-expand-context/inner-counter the-struct_71)"
+"(root-expand-context/inner-lift-key the-struct_71)"
+"(expand-context/inner-to-parsed? the-struct_71)"
+"(expand-context/inner-phase the-struct_71)"
+"(expand-context/inner-namespace the-struct_71)"
 " just-once?137_0"
-"(expand-context/inner-module-begin-k the-struct_70)"
-"(expand-context/inner-allow-unbound? the-struct_70)"
-"(expand-context/inner-in-local-expand? the-struct_70)"
-"(expand-context/inner-stops the-struct_70)"
-"(expand-context/inner-declared-submodule-names the-struct_70)"
-"(expand-context/inner-lifts the-struct_70)"
-"(expand-context/inner-lift-envs the-struct_70)"
-"(expand-context/inner-module-lifts the-struct_70)"
-"(expand-context/inner-require-lifts the-struct_70)"
-"(expand-context/inner-to-module-lifts the-struct_70)"
-"(expand-context/inner-requires+provides the-struct_70)"
-"(expand-context/inner-observer the-struct_70)"
-"(expand-context/inner-for-serializable? the-struct_70)"
-"(expand-context/inner-should-not-encounter-macros? the-struct_70)))"
+"(expand-context/inner-module-begin-k the-struct_71)"
+"(expand-context/inner-allow-unbound? the-struct_71)"
+"(expand-context/inner-in-local-expand? the-struct_71)"
+"(expand-context/inner-keep-#%expression? the-struct_71)"
+"(expand-context/inner-stops the-struct_71)"
+"(expand-context/inner-declared-submodule-names the-struct_71)"
+"(expand-context/inner-lifts the-struct_71)"
+"(expand-context/inner-lift-envs the-struct_71)"
+"(expand-context/inner-module-lifts the-struct_71)"
+"(expand-context/inner-require-lifts the-struct_71)"
+"(expand-context/inner-to-module-lifts the-struct_71)"
+"(expand-context/inner-requires+provides the-struct_71)"
+"(expand-context/inner-observer the-struct_71)"
+"(expand-context/inner-for-serializable? the-struct_71)"
+"(expand-context/inner-should-not-encounter-macros? the-struct_71)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                              \"expand-context/inner?\""
-" the-struct_70)))))"
+" the-struct_71)))))"
 "(expand-context/outer1.1"
 " inner136_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_69)"
-"(root-expand-context/outer-use-site-scopes the-struct_69)"
-"(root-expand-context/outer-frame-id the-struct_69)"
-"(expand-context/outer-context the-struct_69)"
-"(expand-context/outer-env the-struct_69)"
-"(expand-context/outer-post-expansion-scope-action the-struct_69)"
-"(expand-context/outer-scopes the-struct_69)"
-"(expand-context/outer-def-ctx-scopes the-struct_69)"
-"(expand-context/outer-binding-layer the-struct_69)"
-"(expand-context/outer-reference-records the-struct_69)"
-"(expand-context/outer-only-immediate? the-struct_69)"
-"(expand-context/outer-need-eventually-defined the-struct_69)"
-"(expand-context/outer-current-introduction-scopes the-struct_69)"
-"(expand-context/outer-name the-struct_69)))"
-"                           (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_69)))))))"
+"(root-expand-context/outer-post-expansion-scope the-struct_70)"
+"(root-expand-context/outer-use-site-scopes the-struct_70)"
+"(root-expand-context/outer-frame-id the-struct_70)"
+"(expand-context/outer-context the-struct_70)"
+"(expand-context/outer-env the-struct_70)"
+"(expand-context/outer-post-expansion-scope-action the-struct_70)"
+"(expand-context/outer-scopes the-struct_70)"
+"(expand-context/outer-def-ctx-scopes the-struct_70)"
+"(expand-context/outer-binding-layer the-struct_70)"
+"(expand-context/outer-reference-records the-struct_70)"
+"(expand-context/outer-only-immediate? the-struct_70)"
+"(expand-context/outer-need-eventually-defined the-struct_70)"
+"(expand-context/outer-current-introduction-scopes the-struct_70)"
+"(expand-context/outer-name the-struct_70)))"
+"                           (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_70)))))))"
 "(if(if(null? require-lifts_4)(null? lifts_11) #f)"
 "(let-values() exp-s_7)"
 "(let-values()"
 "(let-values(((temp138_2)(append require-lifts_4 lifts_11))"
 "((exp-s139_0) exp-s_7)"
-"((temp140_2)(namespace-phase ns_106)))"
+"((temp140_2)(namespace-phase ns_45)))"
 "(wrap-lifts-as-begin16.1 #f #f #f #f temp138_2 exp-s139_0 temp140_2))))))))"
 "(define-values"
 "(expand-to-top-form$1)"
@@ -45475,7 +45501,7 @@ static const char *startup_source =
 "(lambda(s49_0 ns47_2 ns48_2)"
 "(begin"
 " 'expand-to-top-form50"
-"(let-values(((s_442) s49_0))"
+"(let-values(((s_443) s49_0))"
 "(let-values(((ns_84)(if ns48_2 ns47_2(1/current-namespace))))"
 "(let-values()"
 "(let-values(((observer_4)(current-expand-observe)))"
@@ -45488,7 +45514,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s141_0) s_442)"
+"(let-values(((s141_0) s_443)"
 "((ns142_0) ns_84)"
 "((temp143_1) #f)"
 "((temp144_1) #f)"
@@ -45509,8 +45535,8 @@ static const char *startup_source =
 " s141_0"
 " ns142_0)))))))))))))"
 "(case-lambda"
-"((s_465)(begin 'expand-to-top-form(expand-to-top-form50_0 s_465 #f #f)))"
-"((s_466 ns47_3)(expand-to-top-form50_0 s_466 ns47_3 #t)))))"
+"((s_466)(begin 'expand-to-top-form(expand-to-top-form50_0 s_466 #f #f)))"
+"((s_467 ns47_3)(expand-to-top-form50_0 s_467 ns47_3 #t)))))"
 "(define-values"
 "(per-top-level68.1)"
 "(lambda(combine53_0"
@@ -45530,7 +45556,7 @@ static const char *startup_source =
 "(begin"
 " 'per-top-level68"
 "(let-values(((given-s_0) given-s66_0))"
-"(let-values(((ns_107) ns67_1))"
+"(let-values(((ns_106) ns67_1))"
 "(let-values(((single_0) single52_0))"
 "(let-values(((combine_0)(if combine60_0 combine53_0 #f)))"
 "(let-values(((wrap_2)(if wrap61_0 wrap54_0 #f)))"
@@ -45539,13 +45565,13 @@ static const char *startup_source =
 "(let-values(((serializable?_10)(if serializable?64_0 serializable?57_0 #f)))"
 "(let-values(((observer_5) observer58_0))"
 "(let-values()"
-"(let-values(((s_109)(maybe-intro given-s_0 ns_107)))"
+"(let-values(((s_109)(maybe-intro given-s_0 ns_106)))"
 "(let-values(((ctx_23)"
-"(let-values(((ns146_0) ns_107)((observer147_0) observer_5))"
+"(let-values(((ns146_0) ns_106)((observer147_0) observer_5))"
 "(make-expand-context10.1 #f #f observer147_0 #t #f #f ns146_0))))"
-"(let-values(((phase_139)(namespace-phase ns_107)))"
+"(let-values(((phase_138)(namespace-phase ns_106)))"
 "((letrec-values(((loop_100)"
-"(lambda(s_159 phase_140 ns_108 as-tail?_7)"
+"(lambda(s_159 phase_139 ns_107 as-tail?_7)"
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
@@ -45553,70 +45579,72 @@ static const char *startup_source =
 "(let-values(((the-struct_41) v_130))"
 "(if(expand-context/outer? the-struct_41)"
 "(let-values(((inner148_0)"
-"(let-values(((the-struct_71)"
+"(let-values(((the-struct_72)"
 "(root-expand-context/outer-inner"
 " v_130)))"
 "(if(expand-context/inner?"
-" the-struct_71)"
+" the-struct_72)"
 "(let-values(((phase149_0)"
-" phase_140)"
+" phase_139)"
 "((namespace150_0)"
-" ns_108)"
+" ns_107)"
 "((just-once?151_0)"
 " just-once?_1)"
 "((for-serializable?152_0)"
 " serializable?_10))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-counter"
-" the-struct_71)"
+" the-struct_72)"
 "(root-expand-context/inner-lift-key"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-to-parsed?"
-" the-struct_71)"
+" the-struct_72)"
 " phase149_0"
 " namespace150_0"
 " just-once?151_0"
 "(expand-context/inner-module-begin-k"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_71)"
+" the-struct_72)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_72)"
 "(expand-context/inner-stops"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-lifts"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-lift-envs"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-module-lifts"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-require-lifts"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-requires+provides"
-" the-struct_71)"
+" the-struct_72)"
 "(expand-context/inner-observer"
-" the-struct_71)"
+" the-struct_72)"
 " for-serializable?152_0"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_71)))"
+" the-struct_72)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                             \"expand-context/inner?\""
-" the-struct_71)))))"
+" the-struct_72)))))"
 "(expand-context/outer1.1"
 " inner148_0"
 "(root-expand-context/outer-post-expansion-scope"
@@ -45666,113 +45694,115 @@ static const char *startup_source =
 "(let-values(((require-lifts_5 lifts_12 exp-s_8)"
 "(expand-capturing-lifts"
 " s_159"
-"(let-values(((v_198) tl-ctx_0))"
-"(let-values(((the-struct_72) v_198))"
-"(if(expand-context/outer? the-struct_72)"
+"(let-values(((v_199) tl-ctx_0))"
+"(let-values(((the-struct_73) v_199))"
+"(if(expand-context/outer? the-struct_73)"
 "(let-values(((only-immediate?153_0)"
 " #t)"
 "((def-ctx-scopes154_0)"
 "(box null))"
 "((inner155_0)"
-"(let-values(((the-struct_73)"
+"(let-values(((the-struct_74)"
 "(root-expand-context/outer-inner"
-" v_198)))"
+" v_199)))"
 "(if(expand-context/inner?"
-" the-struct_73)"
+" the-struct_74)"
 "(let-values(((phase156_0)"
-" phase_140)"
+" phase_139)"
 "((namespace157_0)"
-" ns_108))"
+" ns_107))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-counter"
-" the-struct_73)"
+" the-struct_74)"
 "(root-expand-context/inner-lift-key"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-to-parsed?"
-" the-struct_73)"
+" the-struct_74)"
 " phase156_0"
 " namespace157_0"
 "(expand-context/inner-just-once?"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-module-begin-k"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_73)"
+" the-struct_74)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_74)"
 "(expand-context/inner-stops"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-lifts"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-lift-envs"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-module-lifts"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-require-lifts"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-requires+provides"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-observer"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-for-serializable?"
-" the-struct_73)"
+" the-struct_74)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_73)))"
+" the-struct_74)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                    \"expand-context/inner?\""
-" the-struct_73)))))"
+" the-struct_74)))))"
 "(expand-context/outer1.1"
 " inner155_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_72)"
+" the-struct_73)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_72)"
+" the-struct_73)"
 "(root-expand-context/outer-frame-id"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-context"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-env"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-scopes"
-" the-struct_72)"
+" the-struct_73)"
 " def-ctx-scopes154_0"
 "(expand-context/outer-binding-layer"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-reference-records"
-" the-struct_72)"
+" the-struct_73)"
 " only-immediate?153_0"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_72)"
+" the-struct_73)"
 "(expand-context/outer-name"
-" the-struct_72)))"
+" the-struct_73)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                  \"expand-context/outer?\""
-" the-struct_72)))))))"
+" the-struct_73)))))))"
 "(let-values(((disarmed-exp-s_0)"
 "(syntax-disarm$1 exp-s_8)))"
-"(if(let-values(((or-part_294)"
+"(if(let-values(((or-part_295)"
 "(pair? require-lifts_5)))"
-"(if or-part_294 or-part_294(pair? lifts_12)))"
+"(if or-part_295 or-part_295(pair? lifts_12)))"
 "(let-values()"
 "(let-values(((new-s_3)"
 "(let-values(((temp158_0)"
@@ -45780,7 +45810,7 @@ static const char *startup_source =
 " require-lifts_5"
 " lifts_12))"
 "((exp-s159_0) exp-s_8)"
-"((phase160_0) phase_140))"
+"((phase160_0) phase_139))"
 "(wrap-lifts-as-begin16.1"
 " #f"
 " #f"
@@ -45805,8 +45835,8 @@ static const char *startup_source =
 " new-s_3"
 "(loop_100"
 " new-s_3"
-" phase_140"
-" ns_108"
+" phase_139"
+" ns_107"
 " as-tail?_7)))))"
 "(if(not single_0)"
 "(let-values()"
@@ -45829,7 +45859,7 @@ static const char *startup_source =
 "(let-values(((tmp_35)"
 "(core-form-sym"
 " disarmed-exp-s_0"
-" phase_140)))"
+" phase_139)))"
 "(if(equal? tmp_35 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -45846,25 +45876,25 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_28 begin161_0 e162_0)"
-"(let-values(((s_467)"
+"(let-values(((s_468)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_33)"
-" s_467))"
+" s_468))"
 "(let-values(((begin161_1"
 " e162_1)"
 "(let-values(((s_222)"
 "(if(syntax?$1"
-" s_467)"
+" s_468)"
 "(syntax-e$1"
-" s_467)"
-" s_467)))"
+" s_468)"
+" s_468)))"
 "(if(pair?"
 " s_222)"
 "(let-values(((begin163_0)"
-"(let-values(((s_468)"
+"(let-values(((s_469)"
 "(car"
 " s_222)))"
-" s_468))"
+" s_469))"
 "((e164_0)"
 "(let-values(((s_224)"
 "(cdr"
@@ -45916,8 +45946,8 @@ static const char *startup_source =
 "(let-values()"
 "(loop_100"
 "(car es_2)"
-" phase_140"
-" ns_108"
+" phase_139"
+" ns_107"
 " as-tail?_7))"
 "(let-values()"
 "(let-values((()"
@@ -45938,15 +45968,15 @@ static const char *startup_source =
 "(loop_100"
 "(car"
 " es_2)"
-" phase_140"
-" ns_108"
+" phase_139"
+" ns_107"
 " #f)"
 "(begin"
 "(loop_100"
 "(car"
 " es_2)"
-" phase_140"
-" ns_108"
+" phase_139"
+" ns_107"
 " #f)"
 "(void)))))"
 "(if combine_0"
@@ -45999,35 +46029,35 @@ static const char *startup_source =
 "(let-values(((ok?_29"
 " begin-for-syntax165_0"
 " e166_0)"
-"(let-values(((s_469)"
+"(let-values(((s_470)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_34)"
-" s_469))"
+" s_470))"
 "(let-values(((begin-for-syntax165_1"
 " e166_1)"
-"(let-values(((s_470)"
-"(if(syntax?$1"
-" s_469)"
-"(syntax-e$1"
-" s_469)"
-" s_469)))"
-"(if(pair?"
-" s_470)"
-"(let-values(((begin-for-syntax167_0)"
 "(let-values(((s_471)"
-"(car"
+"(if(syntax?$1"
+" s_470)"
+"(syntax-e$1"
+" s_470)"
 " s_470)))"
-" s_471))"
-"((e168_0)"
+"(if(pair?"
+" s_471)"
+"(let-values(((begin-for-syntax167_0)"
 "(let-values(((s_472)"
+"(car"
+" s_471)))"
+" s_472))"
+"((e168_0)"
+"(let-values(((s_473)"
 "(cdr"
-" s_470)))"
+" s_471)))"
 "(let-values(((s_228)"
 "(if(syntax?$1"
-" s_472)"
+" s_473)"
 "(syntax-e$1"
-" s_472)"
-" s_472)))"
+" s_473)"
+" s_473)))"
 "(let-values(((flat-s_21)"
 "(to-syntax-list.1"
 " s_228)))"
@@ -46052,10 +46082,10 @@ static const char *startup_source =
 " begin-for-syntax165_1"
 " e166_1))))))"
 "(let-values(((next-phase_0)"
-"(add1 phase_140)))"
+"(add1 phase_139)))"
 "(let-values(((next-ns_0)"
 "(namespace->namespace-at-phase"
-" ns_108"
+" ns_107"
 " next-phase_0)))"
 "(let-values((()"
 "(begin"
@@ -46075,7 +46105,7 @@ static const char *startup_source =
 "(if quick-immediate?_0"
 "(let-values()"
 "(namespace-visit-available-modules!"
-" ns_108))"
+" ns_107))"
 "(void))"
 "(values))))"
 "(let-values((()"
@@ -46101,7 +46131,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_302)"
-"(let-values(((s_473)"
+"(let-values(((s_474)"
 "(unsafe-car"
 " lst_302))"
 "((rest_171)"
@@ -46126,7 +46156,7 @@ static const char *startup_source =
 " 'next)))"
 "(void)))"
 "(loop_100"
-" s_473"
+" s_474"
 " next-phase_0"
 " next-ns_0"
 " #f)))"
@@ -46173,113 +46203,115 @@ static const char *startup_source =
 "(let-values()"
 "(single_0"
 " exp-s_8"
-" ns_108"
+" ns_107"
 " as-tail?_7))))))))))))))))))"
 " loop_100)"
 " s_109"
-" phase_139"
-" ns_107"
+" phase_138"
+" ns_106"
 " #t)))))))))))))))))"
 "(define-values"
 "(maybe-intro)"
-"(lambda(s_474 ns_109)"
-"(begin(if(syntax?$1 s_474) s_474(1/namespace-syntax-introduce(1/datum->syntax #f s_474) ns_109)))))"
+"(lambda(s_475 ns_108)"
+"(begin(if(syntax?$1 s_475) s_475(1/namespace-syntax-introduce(1/datum->syntax #f s_475) ns_108)))))"
 "(define-values"
 "(re-pair)"
 "(lambda(form-id_0 s_241 r_43)"
 "(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_241)(cons form-id_0 r_43) s_241 s_241) s_241))))"
 "(define-values"
 "(expand-capturing-lifts)"
-"(lambda(s_243 ctx_66)"
+"(lambda(s_243 ctx_68)"
 "(begin"
 "(let-values()"
-"(let-values(((ns_110)(expand-context-namespace ctx_66)))"
-"(let-values((()(begin(namespace-visit-available-modules! ns_110)(values))))"
+"(let-values(((ns_109)(expand-context-namespace ctx_68)))"
+"(let-values((()(begin(namespace-visit-available-modules! ns_109)(values))))"
 "(let-values(((lift-ctx_6)"
-"(let-values(((temp169_0)(make-top-level-lift ctx_66)))"
+"(let-values(((temp169_0)(make-top-level-lift ctx_68)))"
 "(make-lift-context6.1 #f #f temp169_0))))"
 "(let-values(((require-lift-ctx_2)"
 "(make-require-lift-context"
-"(namespace-phase ns_110)"
-"(make-parse-top-lifted-require ns_110))))"
+"(namespace-phase ns_109)"
+"(make-parse-top-lifted-require ns_109))))"
 "(let-values(((exp-s_9)"
 "(let-values(((s170_0) s_243)"
 "((temp171_2)"
-"(let-values(((v_199) ctx_66))"
-"(let-values(((the-struct_74) v_199))"
-"(if(expand-context/outer? the-struct_74)"
+"(let-values(((v_200) ctx_68))"
+"(let-values(((the-struct_75) v_200))"
+"(if(expand-context/outer? the-struct_75)"
 "(let-values(((inner172_0)"
-"(let-values(((the-struct_75)"
-"(root-expand-context/outer-inner v_199)))"
-"(if(expand-context/inner? the-struct_75)"
+"(let-values(((the-struct_76)"
+"(root-expand-context/outer-inner v_200)))"
+"(if(expand-context/inner? the-struct_76)"
 "(let-values(((lifts173_0) lift-ctx_6)"
 "((module-lifts174_0) lift-ctx_6)"
 "((require-lifts175_0)"
 " require-lift-ctx_2))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_75)"
+" the-struct_76)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_75)"
+" the-struct_76)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_75)"
+" the-struct_76)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_75)"
+" the-struct_76)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_75)"
-"(root-expand-context/inner-counter the-struct_75)"
+" the-struct_76)"
+"(root-expand-context/inner-counter the-struct_76)"
 "(root-expand-context/inner-lift-key"
-" the-struct_75)"
-"(expand-context/inner-to-parsed? the-struct_75)"
-"(expand-context/inner-phase the-struct_75)"
-"(expand-context/inner-namespace the-struct_75)"
-"(expand-context/inner-just-once? the-struct_75)"
+" the-struct_76)"
+"(expand-context/inner-to-parsed? the-struct_76)"
+"(expand-context/inner-phase the-struct_76)"
+"(expand-context/inner-namespace the-struct_76)"
+"(expand-context/inner-just-once? the-struct_76)"
 "(expand-context/inner-module-begin-k"
-" the-struct_75)"
+" the-struct_76)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_75)"
+" the-struct_76)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_75)"
-"(expand-context/inner-stops the-struct_75)"
+" the-struct_76)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_76)"
+"(expand-context/inner-stops the-struct_76)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_75)"
+" the-struct_76)"
 " lifts173_0"
-"(expand-context/inner-lift-envs the-struct_75)"
+"(expand-context/inner-lift-envs the-struct_76)"
 " module-lifts174_0"
 " require-lifts175_0"
 "(expand-context/inner-to-module-lifts"
-" the-struct_75)"
+" the-struct_76)"
 "(expand-context/inner-requires+provides"
-" the-struct_75)"
-"(expand-context/inner-observer the-struct_75)"
+" the-struct_76)"
+"(expand-context/inner-observer the-struct_76)"
 "(expand-context/inner-for-serializable?"
-" the-struct_75)"
+" the-struct_76)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_75)))"
+" the-struct_76)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                     \"expand-context/inner?\""
-" the-struct_75)))))"
+" the-struct_76)))))"
 "(expand-context/outer1.1"
 " inner172_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_74)"
-"(root-expand-context/outer-use-site-scopes the-struct_74)"
-"(root-expand-context/outer-frame-id the-struct_74)"
-"(expand-context/outer-context the-struct_74)"
-"(expand-context/outer-env the-struct_74)"
-"(expand-context/outer-post-expansion-scope-action the-struct_74)"
-"(expand-context/outer-scopes the-struct_74)"
-"(expand-context/outer-def-ctx-scopes the-struct_74)"
-"(expand-context/outer-binding-layer the-struct_74)"
-"(expand-context/outer-reference-records the-struct_74)"
-"(expand-context/outer-only-immediate? the-struct_74)"
-"(expand-context/outer-need-eventually-defined the-struct_74)"
-"(expand-context/outer-current-introduction-scopes the-struct_74)"
-"(expand-context/outer-name the-struct_74)))"
+"(root-expand-context/outer-post-expansion-scope the-struct_75)"
+"(root-expand-context/outer-use-site-scopes the-struct_75)"
+"(root-expand-context/outer-frame-id the-struct_75)"
+"(expand-context/outer-context the-struct_75)"
+"(expand-context/outer-env the-struct_75)"
+"(expand-context/outer-post-expansion-scope-action the-struct_75)"
+"(expand-context/outer-scopes the-struct_75)"
+"(expand-context/outer-def-ctx-scopes the-struct_75)"
+"(expand-context/outer-binding-layer the-struct_75)"
+"(expand-context/outer-reference-records the-struct_75)"
+"(expand-context/outer-only-immediate? the-struct_75)"
+"(expand-context/outer-need-eventually-defined the-struct_75)"
+"(expand-context/outer-current-introduction-scopes the-struct_75)"
+"(expand-context/outer-name the-struct_75)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                   \"expand-context/outer?\""
-" the-struct_74))))))"
+" the-struct_75))))))"
 "(expand9.1 #f #f #f #f #f #f s170_0 temp171_2))))"
 "(values"
 "(get-and-clear-require-lifts! require-lift-ctx_2)"
@@ -46287,14 +46319,14 @@ static const char *startup_source =
 " exp-s_9))))))))))"
 "(define-values"
 "(make-parse-top-lifted-require)"
-"(lambda(ns_111)"
+"(lambda(ns_110)"
 "(begin"
-"(lambda(s_475 phase_141)"
+"(lambda(s_476 phase_140)"
 "(let-values(((ok?_30 #%require176_0 req177_0)"
-"(let-values(((s_476)(syntax-disarm$1 s_475)))"
-"(let-values(((orig-s_35) s_476))"
+"(let-values(((s_477)(syntax-disarm$1 s_476)))"
+"(let-values(((orig-s_35) s_477))"
 "(let-values(((#%require176_1 req177_1)"
-"(let-values(((s_353)(if(syntax?$1 s_476)(syntax-e$1 s_476) s_476)))"
+"(let-values(((s_353)(if(syntax?$1 s_477)(syntax-e$1 s_477) s_477)))"
 "(if(pair? s_353)"
 "(let-values(((#%require178_0)(let-values(((s_356)(car s_353))) s_356))"
 "((req179_0)"
@@ -46305,8 +46337,8 @@ static const char *startup_source =
 " s_357)))"
 "(if(pair? s_248)"
 "(let-values(((req180_0)"
-"(let-values(((s_477)(car s_248)))"
-" s_477))"
+"(let-values(((s_478)(car s_248)))"
+" s_478))"
 "(()"
 "(let-values(((s_359)(cdr s_248)))"
 "(let-values(((s_360)"
@@ -46325,10 +46357,10 @@ static const char *startup_source =
 "                                            (raise-syntax-error$1 #f \"bad syntax\" orig-s_35)))))"
 "(values #t #%require176_1 req177_1))))))"
 "(let-values(((temp181_0)(list req177_0))"
-"((s182_1) s_475)"
-"((ns183_0) ns_111)"
-"((phase184_1) phase_141)"
-"((phase185_0) phase_141)"
+"((s182_1) s_476)"
+"((ns183_0) ns_110)"
+"((phase184_1) phase_140)"
+"((phase185_0) phase_140)"
 "((temp186_0)(let-values(((temp188_0) #f))(make-requires+provides8.1 #f #f temp188_0)))"
 "((temp187_0) 'require))"
 "(parse-and-perform-requires!30.1"
@@ -46435,20 +46467,20 @@ static const char *startup_source =
 " just-rhs_0)))"
 "(if(lifted-parsed-begin?"
 " exp-rhs_3)"
-"(let-values(((the-struct_76)"
+"(let-values(((the-struct_77)"
 " exp-rhs_3))"
 "(if(lifted-parsed-begin?"
-" the-struct_76)"
+" the-struct_77)"
 "(let-values(((last189_0)"
 " dv_0))"
 "(lifted-parsed-begin30.1"
 "(lifted-parsed-begin-seq"
-" the-struct_76)"
+" the-struct_77)"
 " last189_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                   \"lifted-parsed-begin?\""
-" the-struct_76)))"
+" the-struct_77)))"
 " dv_0)))))"
 " fold-var_285))))"
 "(values fold-var_286)))))"
@@ -46460,30 +46492,30 @@ static const char *startup_source =
 " exp-s_10))))))))))"
 "(define-values"
 "(log-top-lift-begin-before)"
-"(lambda(ctx_67 require-lifts_7 lifts_14 exp-s_11 ns_112)"
+"(lambda(ctx_69 require-lifts_7 lifts_14 exp-s_11 ns_111)"
 "(begin"
-"(let-values(((obs_57)(expand-context-observer ctx_67)))"
+"(let-values(((obs_57)(expand-context-observer ctx_69)))"
 "(if obs_57"
 "(let-values()"
 "(let-values(((new-s_6)"
 "(let-values(((temp190_0)(append require-lifts_7 lifts_14))"
 "((exp-s191_0) exp-s_11)"
-"((temp192_0)(namespace-phase ns_112)))"
+"((temp192_0)(namespace-phase ns_111)))"
 "(wrap-lifts-as-begin16.1 #f #f #f #f temp190_0 exp-s191_0 temp192_0))))"
-"(begin(call-expand-observe obs_57 'lift-loop new-s_6)(log-top-begin-before ctx_67 new-s_6))))"
+"(begin(call-expand-observe obs_57 'lift-loop new-s_6)(log-top-begin-before ctx_69 new-s_6))))"
 "(void))))))"
 "(define-values"
 "(log-top-begin-before)"
-"(lambda(ctx_68 new-s_7)"
+"(lambda(ctx_70 new-s_7)"
 "(begin"
-"(let-values(((obs_58)(expand-context-observer ctx_68)))"
+"(let-values(((obs_58)(expand-context-observer ctx_70)))"
 "(if obs_58"
 "(let-values()"
 "(let-values(((ok?_31 begin193_0 e194_0)"
-"(let-values(((s_478) new-s_7))"
-"(let-values(((orig-s_36) s_478))"
+"(let-values(((s_479) new-s_7))"
+"(let-values(((orig-s_36) s_479))"
 "(let-values(((begin193_1 e194_1)"
-"(let-values(((s_389)(if(syntax?$1 s_478)(syntax-e$1 s_478) s_478)))"
+"(let-values(((s_389)(if(syntax?$1 s_479)(syntax-e$1 s_479) s_479)))"
 "(if(pair? s_389)"
 "(let-values(((begin195_0)(let-values(((s_141)(car s_389))) s_141))"
 "((e196_0)"
@@ -46512,25 +46544,25 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(log-top-begin-after)"
-"(lambda(ctx_69 new-s_8)"
+"(lambda(ctx_71 new-s_8)"
 "(begin"
-"(let-values(((obs_59)(expand-context-observer ctx_69)))"
+"(let-values(((obs_59)(expand-context-observer ctx_71)))"
 "(if obs_59"
 "(let-values()"
 "(let-values(((ok?_32 begin197_0 e198_0)"
-"(let-values(((s_479) new-s_8))"
-"(let-values(((orig-s_37) s_479))"
+"(let-values(((s_480) new-s_8))"
+"(let-values(((orig-s_37) s_480))"
 "(let-values(((begin197_1 e198_1)"
-"(let-values(((s_480)(if(syntax?$1 s_479)(syntax-e$1 s_479) s_479)))"
-"(if(pair? s_480)"
-"(let-values(((begin199_0)(let-values(((s_406)(car s_480))) s_406))"
+"(let-values(((s_481)(if(syntax?$1 s_480)(syntax-e$1 s_480) s_480)))"
+"(if(pair? s_481)"
+"(let-values(((begin199_0)(let-values(((s_406)(car s_481))) s_406))"
 "((e200_0)"
-"(let-values(((s_407)(cdr s_480)))"
-"(let-values(((s_481)"
+"(let-values(((s_407)(cdr s_481)))"
+"(let-values(((s_482)"
 "(if(syntax?$1 s_407)"
 "(syntax-e$1 s_407)"
 " s_407)))"
-"(let-values(((flat-s_23)(to-syntax-list.1 s_481)))"
+"(let-values(((flat-s_23)(to-syntax-list.1 s_482)))"
 "(if(not flat-s_23)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -46541,7 +46573,7 @@ static const char *startup_source =
 "(values begin199_0 e200_0))"
 "                                                (raise-syntax-error$1 #f \"bad syntax\" orig-s_37)))))"
 "(values #t begin197_1 e198_1))))))"
-"(let-values(((obs_60)(expand-context-observer ctx_69)))"
+"(let-values(((obs_60)(expand-context-observer ctx_71)))"
 "(if obs_60"
 "(let-values()"
 "(let-values()"
@@ -46584,8 +46616,8 @@ static const char *startup_source =
 "(let-values(((or-part_6)(not sym_84)))"
 "(if or-part_6"
 " or-part_6"
-"(let-values(((or-part_295)(equal? sym_84 0)))"
-"(if or-part_295 or-part_295(void? sym_84)))))))"
+"(let-values(((or-part_296)(equal? sym_84 0)))"
+"(if or-part_296 or-part_296(void? sym_84)))))))"
 "(void)"
 "(let-values()"
 "                                                    (raise-argument-error who_25 \"(or/c symbol? #f 0 void?)\" sym_84)))"
@@ -46609,13 +46641,13 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_5)"
 " #f))))))"
 "(let-values(((mod-name_22)(1/module-path-index-resolve mpi_49 #t)))"
-"(let-values(((phase_142)(namespace-phase ns_58)))"
+"(let-values(((phase_141)(namespace-phase ns_58)))"
 "(if(not sym_84)"
 "(let-values()"
 "(let-values(((ns20_1) ns_58)"
 "((mpi21_0) mpi_49)"
-"((phase22_0) phase_142)"
-"((phase23_1) phase_142)"
+"((phase22_0) phase_141)"
+"((phase23_1) phase_141)"
 "((temp24_4) #f))"
 "(namespace-module-instantiate!96.1"
 " temp24_4"
@@ -46633,8 +46665,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns25_2) ns_58)"
 "((mpi26_0) mpi_49)"
-"((phase27_1) phase_142)"
-"((phase28_1) phase_142))"
+"((phase27_1) phase_141)"
+"((phase28_1) phase_141))"
 "(namespace-module-instantiate!96.1"
 " #f"
 " #f"
@@ -46651,8 +46683,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns29_0) ns_58)"
 "((mpi30_0) mpi_49)"
-"((phase31_0) phase_142)"
-"((phase32_4) phase_142))"
+"((phase31_0) phase_141)"
+"((phase32_4) phase_141))"
 "(namespace-module-visit!104.1"
 " phase32_4"
 " #t"
@@ -46697,8 +46729,8 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns33_0) ns_58)"
 "((mpi34_0) mpi_49)"
-"((phase35_1) phase_142)"
-"((phase36_0) phase_142)"
+"((phase35_1) phase_141)"
+"((phase36_0) phase_141)"
 "((temp37_2) #f))"
 "(namespace-module-instantiate!96.1"
 " temp37_2"
@@ -46725,7 +46757,7 @@ static const char *startup_source =
 " ex-mod-name_0)"
 "((temp40_2)"
 "(phase-"
-" phase_142"
+" phase_141"
 " ex-phase_0))"
 "((temp41_3) #t))"
 "(namespace->module-namespace82.1"
@@ -46822,9 +46854,9 @@ static const char *startup_source =
 "((mpi43_1)"
 " mpi_49)"
 "((phase44_0)"
-" phase_142)"
+" phase_141)"
 "((phase45_1)"
-" phase_142))"
+" phase_141))"
 "(namespace-module-visit!104.1"
 " phase45_1"
 " #t"
@@ -46906,8 +46938,8 @@ static const char *startup_source =
 "(extend-parameterization"
 "(continuation-mark-set-first #f parameterization-key)"
 " 1/current-namespace"
-"(let-values(((ns_113)(1/current-namespace)))"
-"(namespace->namespace-at-phase ns_113(add1(namespace-phase ns_113)))))"
+"(let-values(((ns_112)(1/current-namespace)))"
+"(namespace->namespace-at-phase ns_112(add1(namespace-phase ns_112)))))"
 "(let-values()"
 "(do-dynamic-require"
 " 'dynamic-require-for-syntax"
@@ -46995,12 +47027,12 @@ static const char *startup_source =
 "(if(list? l_76)"
 "(andmap2"
 "(lambda(p_55)"
-"(let-values(((or-part_286)(not p_55)))"
-"(if or-part_286"
-" or-part_286"
-"(let-values(((or-part_287)(complete-path-string? p_55)))"
+"(let-values(((or-part_287)(not p_55)))"
 "(if or-part_287"
 " or-part_287"
+"(let-values(((or-part_288)(complete-path-string? p_55)))"
+"(if or-part_288"
+" or-part_288"
 "(if(hash? p_55)"
 "(let-values(((ht_151) p_55))"
 "(begin"
@@ -47080,7 +47112,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_90"
-"(let-values(((k_36 v_200)(hash-iterate-key+value ht_152 i_90)))"
+"(let-values(((k_36 v_201)(hash-iterate-key+value ht_152 i_90)))"
 "(let-values(((table_217)"
 "(let-values(((table_185) table_216))"
 "(let-values(((table_218)"
@@ -47089,7 +47121,7 @@ static const char *startup_source =
 "(let-values()"
 "(values"
 " k_36"
-"(to-path v_200)))))"
+"(to-path v_201)))))"
 "(hash-set"
 " table_185"
 " key_83"
@@ -47142,17 +47174,17 @@ static const char *startup_source =
 "(let-values()"
 "(make-parameter"
 " 'modify-seconds"
-"(lambda(v_201)"
+"(lambda(v_202)"
 "(begin"
 "(if((lambda(v_66)"
 "(let-values(((or-part_32)(eq? v_66 'modify-seconds)))"
 "(if or-part_32 or-part_32(eq? v_66 'exists))))"
-" v_201)"
+" v_202)"
 "(void)"
-"             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_201)))"
-" v_201))))))"
+"             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_202)))"
+" v_202))))))"
 "(define-values(1/use-collection-link-paths)(make-parameter #t(lambda(v_79)(if v_79 #t #f))))"
-"(define-values(1/use-user-specific-search-paths)(make-parameter #t(lambda(v_202)(if v_202 #t #f))))"
+"(define-values(1/use-user-specific-search-paths)(make-parameter #t(lambda(v_203)(if v_203 #t #f))))"
 "(define-values(complete-path-string?)(lambda(p_57)(begin(if(path-string? p_57)(complete-path? p_57) #f))))"
 "(define-values"
 "(relative-path-string?$1)"
@@ -47190,7 +47222,7 @@ static const char *startup_source =
 "(call-with-current-load-relative-directory)"
 "(lambda(p_31 thunk_4)"
 "(begin"
-"(let-values(((base_18 name_63 dir?_2)(split-path p_31)))"
+"(let-values(((base_18 name_62 dir?_2)(split-path p_31)))"
 "(with-continuation-mark"
 " parameterization-key"
 "(extend-parameterization"
@@ -47222,11 +47254,11 @@ static const char *startup_source =
 "(let-values(((sp_0)(find-system-path 'exec-file)))"
 "(let-values(((exe_0)(find-executable-path sp_0 #f)))"
 "(let-values(((start_43)"
-"(let-values(((or-part_287)(1/string->number start_42)))"
-"(if or-part_287 or-part_287 0))))"
+"(let-values(((or-part_288)(1/string->number start_42)))"
+"(if or-part_288 or-part_288 0))))"
 "(let-values(((end_33)"
-"(let-values(((or-part_293)(1/string->number end_32)))"
-"(if or-part_293 or-part_293 0))))"
+"(let-values(((or-part_294)(1/string->number end_32)))"
+"(if or-part_294 or-part_294 0))))"
 "(let-values(((exe4_0) exe_0)"
 "((temp5_5)"
 "(lambda()"
@@ -47289,7 +47321,7 @@ static const char *startup_source =
 "(path->complete-path"
 "(find-executable-path(find-system-path 'exec-file))"
 "(find-system-path 'orig-dir))))"
-"(let-values(((base_19 name_64 dir?_3)(split-path exec_0)))"
+"(let-values(((base_19 name_63 dir?_3)(split-path exec_0)))"
 "(simplify-path(path->complete-path collects-path_0 base_19)))))"
 "(let-values()"
 "(let-values(((p_61)(find-executable-path(find-system-path 'exec-file) collects-path_0 #t)))"
@@ -47344,7 +47376,7 @@ static const char *startup_source =
 "(lambda(d_33)"
 "(begin"
 "      (let-values (((p_63) (if d_33 (build-path d_33 \"config.rktd\") #f)))"
-"(let-values(((or-part_285)"
+"(let-values(((or-part_286)"
 "(if p_63"
 "(if(file-exists? p_63)"
 "(let-values(((p9_0) p_63)"
@@ -47357,7 +47389,7 @@ static const char *startup_source =
 "(with-input-from-file45.1 #f #f p9_0 temp10_4))"
 " #f)"
 " #f)))"
-"(if or-part_285 or-part_285 '#hash()))))))"
+"(if or-part_286 or-part_286 '#hash()))))))"
 "(define-values"
 "(get-installation-name)"
 "(lambda(config-table_0)(begin(hash-ref config-table_0 'installation-name(version)))))"
@@ -47442,7 +47474,7 @@ static const char *startup_source =
 "(lambda(path_8)"
 "(begin"
 " 'loop"
-"(let-values(((base_20 name_65 dir?_4)(split-path path_8)))"
+"(let-values(((base_20 name_64 dir?_4)(split-path path_8)))"
 "(if(path? base_20)"
 "(if(directory-exists? base_20)"
 "(filesystem-change-evt base_20(lambda() #f))"
@@ -47533,7 +47565,7 @@ static const char *startup_source =
 "(lambda()"
 "(call-with-default-reading-parameterization"
 "(lambda()"
-"(let-values(((v_203)"
+"(let-values(((v_204)"
 "(if(no-file-stamp? ts_1)"
 " null"
 "(let-values(((links-path13_0) links-path_0)"
@@ -47550,41 +47582,41 @@ static const char *startup_source =
 "(call-with-input-file*61.1 #f #f links-path13_0 temp14_5)))))"
 "(let-values((()"
 "(begin"
-"(if(if(list? v_203)"
+"(if(if(list? v_204)"
 "(andmap2"
 "(lambda(p_67)"
 "(if(list? p_67)"
-"(if(let-values(((or-part_296)(= 2(length p_67))))"
-"(if or-part_296 or-part_296(= 3(length p_67))))"
-"(if(let-values(((or-part_297)(string?(car p_67))))"
-"(if or-part_297"
-" or-part_297"
-"(let-values(((or-part_215)"
+"(if(let-values(((or-part_297)(= 2(length p_67))))"
+"(if or-part_297 or-part_297(= 3(length p_67))))"
+"(if(let-values(((or-part_298)(string?(car p_67))))"
+"(if or-part_298"
+" or-part_298"
+"(let-values(((or-part_216)"
 "(eq? 'root(car p_67))))"
-"(if or-part_215"
-" or-part_215"
+"(if or-part_216"
+" or-part_216"
 "(eq? 'static-root(car p_67))))))"
 "(if(path-string?(cadr p_67))"
-"(let-values(((or-part_216)(null?(cddr p_67))))"
-"(if or-part_216 or-part_216(regexp?(caddr p_67))))"
+"(let-values(((or-part_217)(null?(cddr p_67))))"
+"(if or-part_217 or-part_217(regexp?(caddr p_67))))"
 " #f)"
 " #f)"
 " #f)"
 " #f))"
-" v_203)"
+" v_204)"
 " #f)"
 "(void)"
 "                                                  (let-values () (error \"ill-formed content\")))"
 "(values))))"
 "(let-values(((ht_155)(make-hasheq)))"
 "(let-values(((dir_0)"
-"(let-values(((base_21 name_66 dir?_5)(split-path links-path_0)))"
+"(let-values(((base_21 name_65 dir?_5)(split-path links-path_0)))"
 " base_21)))"
 "(begin"
 "(for-each2"
 "(lambda(p_68)"
-"(if(let-values(((or-part_298)(null?(cddr p_68))))"
-"(if or-part_298 or-part_298(regexp-match?(caddr p_68)(version))))"
+"(if(let-values(((or-part_299)(null?(cddr p_68))))"
+"(if or-part_299 or-part_299(regexp-match?(caddr p_68)(version))))"
 "(let-values()"
 "(let-values(((dir_1)"
 "(simplify-path(path->complete-path(cadr p_68) dir_0))))"
@@ -47609,19 +47641,19 @@ static const char *startup_source =
 "(let-values()(hash-set! ht_155 #f null)))"
 "(hash-for-each"
 " ht_155"
-"(lambda(k_38 v_204)"
-"(hash-set! ht_155 k_38(cons dir_1 v_204))))))"
+"(lambda(k_38 v_205)"
+"(hash-set! ht_155 k_38(cons dir_1 v_205))))))"
 "(let-values()"
-"(let-values(((s_482)(string->symbol(car p_68))))"
+"(let-values(((s_483)(string->symbol(car p_68))))"
 "(hash-set!"
 " ht_155"
-" s_482"
-"(cons(box dir_1)(hash-ref ht_155 s_482 null)))))))))"
+" s_483"
+"(cons(box dir_1)(hash-ref ht_155 s_483 null)))))))))"
 "(void)))"
-" v_203)"
+" v_204)"
 "(hash-for-each"
 " ht_155"
-"(lambda(k_39 v_205)(hash-set! ht_155 k_39(reverse$1 v_205))))"
+"(lambda(k_39 v_206)(hash-set! ht_155 k_39(reverse$1 v_206))))"
 "(hash-set! links-cache links-path_0(cons ts_1 ht_155))"
 " ht_155))))))))))))))))))))))"
 "(define-values"
@@ -47640,10 +47672,10 @@ static const char *startup_source =
 "(cons(substring collection_2(cdar m_23)) collection-path_2))))"
 "(values collection_2 collection-path_2))))"
 "(let-values()"
-"(let-values(((base_22 name_67 dir?_6)(split-path collection_2)))"
+"(let-values(((base_22 name_66 dir?_6)(split-path collection_2)))"
 "(if(eq? base_22 'relative)"
-"(values name_67 collection-path_2)"
-"(normalize-collection-reference base_22(cons name_67 collection-path_2)))))))))"
+"(values name_66 collection-path_2)"
+"(normalize-collection-reference base_22(cons name_66 collection-path_2)))))))))"
 "(define-values"
 "(find-col-file)"
 "(lambda(fail_5 collection-in_0 collection-path-in_0 file-name_1 check-compiled?_1)"
@@ -47804,9 +47836,9 @@ static const char *startup_source =
 "(file-exists?/maybe-compiled)"
 "(lambda(dir_3 path_10 check-compiled?_2)"
 "(begin"
-"(let-values(((or-part_299)(file-exists?(build-path dir_3 path_10))))"
-"(if or-part_299"
-" or-part_299"
+"(let-values(((or-part_300)(file-exists?(build-path dir_3 path_10))))"
+"(if or-part_300"
+" or-part_300"
 "(if check-compiled?_2"
 "            (let-values (((try-path_0) (path-add-extension path_10 #\".zo\"))"
 "((modes_0)(1/use-compiled-file-paths))"
@@ -47863,13 +47895,13 @@ static const char *startup_source =
 "(if(null? l_84)"
 " null"
 "(let-values(((collects-path_1)(car l_84)))"
-"(let-values(((v_206)"
+"(let-values(((v_207)"
 "(exe-relative-path->complete-path"
 " collects-path_1)))"
-"(if v_206"
+"(if v_207"
 "(cons"
 "(simplify-path"
-"(path->complete-path v_206(current-directory)))"
+"(path->complete-path v_207(current-directory)))"
 "(loop_84(cdr l_84)))"
 "(loop_84(cdr l_84))))))))))"
 " loop_84)"
@@ -47889,14 +47921,14 @@ static const char *startup_source =
 "(let-values()"
 "(make-parameter"
 " #f"
-"(lambda(v_207)"
+"(lambda(v_208)"
 "(begin"
 "(if((lambda(x_81)"
 "(let-values(((or-part_11)(not x_81)))(if or-part_11 or-part_11(prop:readtable? x_81))))"
-" v_207)"
+" v_208)"
 "(void)"
-"             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_207)))"
-" v_207))))))"
+"             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_208)))"
+" v_208))))))"
 "(define-values"
 "(struct:read-config/outer"
 " read-config/outer1.1"
@@ -48023,41 +48055,41 @@ static const char *startup_source =
 " indentations_0"
 " keep-comment?_0))))"
 "(define-values(read-config-wrap)(lambda(v_25)(begin(read-config/outer-wrap v_25))))"
-"(define-values(read-config-line)(lambda(v_208)(begin(read-config/outer-line v_208))))"
-"(define-values(read-config-col)(lambda(v_209)(begin(read-config/outer-col v_209))))"
-"(define-values(read-config-pos)(lambda(v_210)(begin(read-config/outer-pos v_210))))"
-"(define-values(read-config-indentations)(lambda(v_211)(begin(read-config/outer-indentations v_211))))"
-"(define-values(read-config-keep-comment?)(lambda(v_212)(begin(read-config/outer-keep-comment? v_212))))"
+"(define-values(read-config-line)(lambda(v_209)(begin(read-config/outer-line v_209))))"
+"(define-values(read-config-col)(lambda(v_210)(begin(read-config/outer-col v_210))))"
+"(define-values(read-config-pos)(lambda(v_211)(begin(read-config/outer-pos v_211))))"
+"(define-values(read-config-indentations)(lambda(v_212)(begin(read-config/outer-indentations v_212))))"
+"(define-values(read-config-keep-comment?)(lambda(v_213)(begin(read-config/outer-keep-comment? v_213))))"
 "(define-values"
 "(read-config-readtable)"
-"(lambda(v_213)(begin(read-config/inner-readtable(read-config/outer-inner v_213)))))"
+"(lambda(v_214)(begin(read-config/inner-readtable(read-config/outer-inner v_214)))))"
 "(define-values"
 "(read-config-next-readtable)"
-"(lambda(v_214)(begin(read-config/inner-next-readtable(read-config/outer-inner v_214)))))"
+"(lambda(v_215)(begin(read-config/inner-next-readtable(read-config/outer-inner v_215)))))"
 "(define-values"
 "(read-config-for-syntax?)"
-"(lambda(v_215)(begin(read-config/inner-for-syntax?(read-config/outer-inner v_215)))))"
+"(lambda(v_216)(begin(read-config/inner-for-syntax?(read-config/outer-inner v_216)))))"
 "(define-values(read-config-source)(lambda(v_73)(begin(read-config/inner-source(read-config/outer-inner v_73)))))"
 "(define-values"
 "(read-config-read-compiled)"
-"(lambda(v_186)(begin(read-config/inner-read-compiled(read-config/outer-inner v_186)))))"
+"(lambda(v_188)(begin(read-config/inner-read-compiled(read-config/outer-inner v_188)))))"
 "(define-values"
 "(read-config-dynamic-require)"
-"(lambda(v_216)(begin(read-config/inner-dynamic-require(read-config/outer-inner v_216)))))"
+"(lambda(v_217)(begin(read-config/inner-dynamic-require(read-config/outer-inner v_217)))))"
 "(define-values"
 "(read-config-module-declared?)"
-"(lambda(v_217)(begin(read-config/inner-module-declared?(read-config/outer-inner v_217)))))"
+"(lambda(v_218)(begin(read-config/inner-module-declared?(read-config/outer-inner v_218)))))"
 "(define-values(read-config-coerce)(lambda(v_80)(begin(read-config/inner-coerce(read-config/outer-inner v_80)))))"
 "(define-values"
 "(read-config-coerce-key)"
-"(lambda(v_218)(begin(read-config/inner-coerce-key(read-config/outer-inner v_218)))))"
+"(lambda(v_219)(begin(read-config/inner-coerce-key(read-config/outer-inner v_219)))))"
 "(define-values"
 "(read-config-parameter-override)"
-"(lambda(v_206)(begin(read-config/inner-parameter-override(read-config/outer-inner v_206)))))"
+"(lambda(v_207)(begin(read-config/inner-parameter-override(read-config/outer-inner v_207)))))"
 "(define-values"
 "(read-config-parameter-cache)"
-"(lambda(v_219)(begin(read-config/inner-parameter-cache(read-config/outer-inner v_219)))))"
-"(define-values(read-config-st)(lambda(v_220)(begin(read-config/inner-st(read-config/outer-inner v_220)))))"
+"(lambda(v_220)(begin(read-config/inner-parameter-cache(read-config/outer-inner v_220)))))"
+"(define-values(read-config-st)(lambda(v_221)(begin(read-config/inner-st(read-config/outer-inner v_221)))))"
 "(define-values"
 "(struct:read-config-state"
 " read-config-state3.1"
@@ -48141,14 +48173,14 @@ static const char *startup_source =
 " or-part_91"
 "(lambda(mod-path_25 sym_93 failure-k_0)"
 "                                     (error 'read \"no `dynamic-require` provided\"))))"
-"(let-values(((or-part_300) module-declared?_1))"
-"(if or-part_300"
-" or-part_300"
+"(let-values(((or-part_301) module-declared?_1))"
+"(if or-part_301"
+" or-part_301"
 "                                   (lambda (mod-path_26) (error 'read \"no `module-declare?` provided\"))))"
-"(let-values(((or-part_211) coerce_1))"
-"(if or-part_211 or-part_211(lambda(for-syntax?_2 v_113 srcloc_9) v_113)))"
-"(let-values(((or-part_301) coerce-key_1))"
-"(if or-part_301 or-part_301(lambda(for-syntax?_3 v_117) v_117)))"
+"(let-values(((or-part_212) coerce_1))"
+"(if or-part_212 or-part_212(lambda(for-syntax?_2 v_107 srcloc_9) v_107)))"
+"(let-values(((or-part_302) coerce-key_1))"
+"(if or-part_302 or-part_302(lambda(for-syntax?_3 v_111) v_111)))"
 " #f"
 " #f"
 " #f"
@@ -48178,14 +48210,14 @@ static const char *startup_source =
 "(let-values(((local-graph?_0) reset-graph?33_0))"
 "(let-values(((keep-comment?_2) keep-comment?34_0))"
 "(let-values()"
-"(let-values(((v_221) config_0))"
-"(let-values(((the-struct_77) v_221))"
-"(if(read-config/outer? the-struct_77)"
+"(let-values(((v_222) config_0))"
+"(let-values(((the-struct_78) v_222))"
+"(if(read-config/outer? the-struct_78)"
 "(let-values(((wrap55_0) wrap_5)"
 "((keep-comment?56_0) keep-comment?_2)"
 "((inner57_0)"
-"(let-values(((the-struct_78)(read-config/outer-inner v_221)))"
-"(if(read-config/inner? the-struct_78)"
+"(let-values(((the-struct_79)(read-config/outer-inner v_222)))"
+"(if(read-config/inner? the-struct_79)"
 "(let-values(((for-syntax?58_0) for-syntax?_4)"
 "((readtable59_0) readtable_2)"
 "((next-readtable60_0) next-readtable_2)"
@@ -48197,25 +48229,25 @@ static const char *startup_source =
 " readtable59_0"
 " next-readtable60_0"
 " for-syntax?58_0"
-"(read-config/inner-source the-struct_78)"
-"(read-config/inner-read-compiled the-struct_78)"
-"(read-config/inner-dynamic-require the-struct_78)"
-"(read-config/inner-module-declared? the-struct_78)"
-"(read-config/inner-coerce the-struct_78)"
-"(read-config/inner-coerce-key the-struct_78)"
-"(read-config/inner-parameter-override the-struct_78)"
-"(read-config/inner-parameter-cache the-struct_78)"
+"(read-config/inner-source the-struct_79)"
+"(read-config/inner-read-compiled the-struct_79)"
+"(read-config/inner-dynamic-require the-struct_79)"
+"(read-config/inner-module-declared? the-struct_79)"
+"(read-config/inner-coerce the-struct_79)"
+"(read-config/inner-coerce-key the-struct_79)"
+"(read-config/inner-parameter-override the-struct_79)"
+"(read-config/inner-parameter-cache the-struct_79)"
 " st61_0))"
-"                                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_78)))))"
+"                                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_79)))))"
 "(read-config/outer1.1"
 " inner57_0"
 " wrap55_0"
-"(read-config/outer-line the-struct_77)"
-"(read-config/outer-col the-struct_77)"
-"(read-config/outer-pos the-struct_77)"
-"(read-config/outer-indentations the-struct_77)"
+"(read-config/outer-line the-struct_78)"
+"(read-config/outer-col the-struct_78)"
+"(read-config/outer-pos the-struct_78)"
+"(read-config/outer-indentations the-struct_78)"
 " keep-comment?56_0))"
-"                            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_77)))))))))))))))"
+"                            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_78)))))))))))))))"
 "(define-values"
 "(port+config->srcloc49.1)"
 "(lambda(end-pos45_0 end-pos46_0 in47_0 config48_0)"
@@ -48226,16 +48258,16 @@ static const char *startup_source =
 "(let-values(((given-end-pos_0)(if end-pos46_0 end-pos45_0 #f)))"
 "(let-values()"
 "(let-values(((end-pos_0)"
-"(let-values(((or-part_302) given-end-pos_0))"
-"(if or-part_302"
-" or-part_302"
+"(let-values(((or-part_303) given-end-pos_0))"
+"(if or-part_303"
+" or-part_303"
 "(let-values(((end-line_0 end-col_0 end-pos_1)(port-next-location in_1)))"
 " end-pos_1)))))"
 "(srcloc"
-"(let-values(((or-part_173)(read-config-source config_1)))"
-"(if or-part_173"
-" or-part_173"
-"                     (let-values (((or-part_303) (object-name in_1))) (if or-part_303 or-part_303 \"UNKNOWN\"))))"
+"(let-values(((or-part_174)(read-config-source config_1)))"
+"(if or-part_174"
+" or-part_174"
+"                     (let-values (((or-part_304) (object-name in_1))) (if or-part_304 or-part_304 \"UNKNOWN\"))))"
 "(read-config-line config_1)"
 "(read-config-col config_1)"
 "(read-config-pos config_1)"
@@ -48246,76 +48278,76 @@ static const char *startup_source =
 "(reading-at)"
 "(lambda(config_2 line_2 col_1 pos_109)"
 "(begin"
-"(let-values(((v_222) config_2))"
-"(let-values(((the-struct_79) v_222))"
-"(if(read-config/outer? the-struct_79)"
+"(let-values(((v_223) config_2))"
+"(let-values(((the-struct_80) v_223))"
+"(if(read-config/outer? the-struct_80)"
 "(let-values(((line62_0) line_2)"
 "((col63_0) col_1)"
 "((pos64_0) pos_109)"
-"((inner65_0)(read-config/outer-inner v_222)))"
+"((inner65_0)(read-config/outer-inner v_223)))"
 "(read-config/outer1.1"
 " inner65_0"
-"(read-config/outer-wrap the-struct_79)"
+"(read-config/outer-wrap the-struct_80)"
 " line62_0"
 " col63_0"
 " pos64_0"
-"(read-config/outer-indentations the-struct_79)"
-"(read-config/outer-keep-comment? the-struct_79)))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_79)))))))"
-"(define-values"
-"(disable-wrapping)"
-"(lambda(config_3)"
-"(begin"
-"(let-values(((v_223) config_3))"
-"(let-values(((the-struct_80) v_223))"
-"(if(read-config/outer? the-struct_80)"
-"(let-values(((wrap66_0) #f)((inner67_0)(read-config/outer-inner v_223)))"
-"(read-config/outer1.1"
-" inner67_0"
-" wrap66_0"
-"(read-config/outer-line the-struct_80)"
-"(read-config/outer-col the-struct_80)"
-"(read-config/outer-pos the-struct_80)"
 "(read-config/outer-indentations the-struct_80)"
 "(read-config/outer-keep-comment? the-struct_80)))"
 "            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_80)))))))"
 "(define-values"
-"(keep-comment)"
-"(lambda(config_4)"
+"(disable-wrapping)"
+"(lambda(config_3)"
 "(begin"
-"(let-values(((v_224) config_4))"
+"(let-values(((v_224) config_3))"
 "(let-values(((the-struct_81) v_224))"
 "(if(read-config/outer? the-struct_81)"
-"(let-values(((keep-comment?68_0) #t)((inner69_0)(read-config/outer-inner v_224)))"
+"(let-values(((wrap66_0) #f)((inner67_0)(read-config/outer-inner v_224)))"
 "(read-config/outer1.1"
-" inner69_0"
-"(read-config/outer-wrap the-struct_81)"
+" inner67_0"
+" wrap66_0"
 "(read-config/outer-line the-struct_81)"
 "(read-config/outer-col the-struct_81)"
 "(read-config/outer-pos the-struct_81)"
 "(read-config/outer-indentations the-struct_81)"
-" keep-comment?68_0))"
+"(read-config/outer-keep-comment? the-struct_81)))"
 "            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_81)))))))"
 "(define-values"
+"(keep-comment)"
+"(lambda(config_4)"
+"(begin"
+"(let-values(((v_225) config_4))"
+"(let-values(((the-struct_82) v_225))"
+"(if(read-config/outer? the-struct_82)"
+"(let-values(((keep-comment?68_0) #t)((inner69_0)(read-config/outer-inner v_225)))"
+"(read-config/outer1.1"
+" inner69_0"
+"(read-config/outer-wrap the-struct_82)"
+"(read-config/outer-line the-struct_82)"
+"(read-config/outer-col the-struct_82)"
+"(read-config/outer-pos the-struct_82)"
+"(read-config/outer-indentations the-struct_82)"
+" keep-comment?68_0))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_82)))))))"
+"(define-values"
 "(discard-comment)"
 "(lambda(config_5)"
 "(begin"
 "(if(not(read-config-keep-comment? config_5))"
 "(let-values() config_5)"
 "(let-values()"
-"(let-values(((v_225) config_5))"
-"(let-values(((the-struct_82) v_225))"
-"(if(read-config/outer? the-struct_82)"
-"(let-values(((keep-comment?70_0) #f)((inner71_0)(read-config/outer-inner v_225)))"
+"(let-values(((v_226) config_5))"
+"(let-values(((the-struct_83) v_226))"
+"(if(read-config/outer? the-struct_83)"
+"(let-values(((keep-comment?70_0) #f)((inner71_0)(read-config/outer-inner v_226)))"
 "(read-config/outer1.1"
 " inner71_0"
-"(read-config/outer-wrap the-struct_82)"
-"(read-config/outer-line the-struct_82)"
-"(read-config/outer-col the-struct_82)"
-"(read-config/outer-pos the-struct_82)"
-"(read-config/outer-indentations the-struct_82)"
+"(read-config/outer-wrap the-struct_83)"
+"(read-config/outer-line the-struct_83)"
+"(read-config/outer-col the-struct_83)"
+"(read-config/outer-pos the-struct_83)"
+"(read-config/outer-indentations the-struct_83)"
 " keep-comment?70_0))"
-"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_82)))))))))"
+"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_83)))))))))"
 "(define-values"
 "(next-readtable)"
 "(lambda(config_6)"
@@ -48323,36 +48355,36 @@ static const char *startup_source =
 "(if(eq?(read-config-readtable config_6)(read-config-next-readtable config_6))"
 "(let-values() config_6)"
 "(let-values()"
-"(let-values(((v_226) config_6))"
-"(let-values(((the-struct_83) v_226))"
-"(if(read-config/outer? the-struct_83)"
+"(let-values(((v_227) config_6))"
+"(let-values(((the-struct_84) v_227))"
+"(if(read-config/outer? the-struct_84)"
 "(let-values(((inner72_0)"
-"(let-values(((the-struct_84)(read-config/outer-inner v_226)))"
-"(if(read-config/inner? the-struct_84)"
+"(let-values(((the-struct_85)(read-config/outer-inner v_227)))"
+"(if(read-config/inner? the-struct_85)"
 "(let-values(((readtable73_0)(read-config-next-readtable config_6)))"
 "(read-config/inner2.1"
 " readtable73_0"
-"(read-config/inner-next-readtable the-struct_84)"
-"(read-config/inner-for-syntax? the-struct_84)"
-"(read-config/inner-source the-struct_84)"
-"(read-config/inner-read-compiled the-struct_84)"
-"(read-config/inner-dynamic-require the-struct_84)"
-"(read-config/inner-module-declared? the-struct_84)"
-"(read-config/inner-coerce the-struct_84)"
-"(read-config/inner-coerce-key the-struct_84)"
-"(read-config/inner-parameter-override the-struct_84)"
-"(read-config/inner-parameter-cache the-struct_84)"
-"(read-config/inner-st the-struct_84)))"
-"                                  (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_84)))))"
+"(read-config/inner-next-readtable the-struct_85)"
+"(read-config/inner-for-syntax? the-struct_85)"
+"(read-config/inner-source the-struct_85)"
+"(read-config/inner-read-compiled the-struct_85)"
+"(read-config/inner-dynamic-require the-struct_85)"
+"(read-config/inner-module-declared? the-struct_85)"
+"(read-config/inner-coerce the-struct_85)"
+"(read-config/inner-coerce-key the-struct_85)"
+"(read-config/inner-parameter-override the-struct_85)"
+"(read-config/inner-parameter-cache the-struct_85)"
+"(read-config/inner-st the-struct_85)))"
+"                                  (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_85)))))"
 "(read-config/outer1.1"
 " inner72_0"
-"(read-config/outer-wrap the-struct_83)"
-"(read-config/outer-line the-struct_83)"
-"(read-config/outer-col the-struct_83)"
-"(read-config/outer-pos the-struct_83)"
-"(read-config/outer-indentations the-struct_83)"
-"(read-config/outer-keep-comment? the-struct_83)))"
-"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_83)))))))))"
+"(read-config/outer-wrap the-struct_84)"
+"(read-config/outer-line the-struct_84)"
+"(read-config/outer-col the-struct_84)"
+"(read-config/outer-pos the-struct_84)"
+"(read-config/outer-indentations the-struct_84)"
+"(read-config/outer-keep-comment? the-struct_84)))"
+"                (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_84)))))))))"
 "(define-values"
 "(coerce)"
 "(lambda(val_79 in_2 config_7)"
@@ -48364,26 +48396,26 @@ static const char *startup_source =
 "(if for-syntax?_5"
 "(let-values(((in1_0) in_2)((config2_0) config_7))(port+config->srcloc49.1 #f #f in1_0 config2_0))"
 " #f))))))"
-"(define-values(default-reader-guard$1)(lambda(v_227)(begin 'default-reader-guard v_227)))"
+"(define-values(default-reader-guard$1)(lambda(v_228)(begin 'default-reader-guard v_228)))"
 "(define-values"
 "(1/current-reader-guard)"
 "(make-parameter"
 " default-reader-guard$1"
-"(lambda(v_228)"
+"(lambda(v_229)"
 "(begin"
-"(if(if(procedure? v_228)(procedure-arity-includes? v_228 1) #f)"
+"(if(if(procedure? v_229)(procedure-arity-includes? v_229 1) #f)"
 "(void)"
-"         (let-values () (raise-argument-error 'current-reader-guard \"(procedure-arity-includes/c 1)\" v_228)))"
-" v_228))))"
+"         (let-values () (raise-argument-error 'current-reader-guard \"(procedure-arity-includes/c 1)\" v_229)))"
+" v_229))))"
 "(define-values(1/read-square-bracket-as-paren)(make-parameter #t(lambda(v_1)(if v_1 #t #f))))"
-"(define-values(1/read-curly-brace-as-paren)(make-parameter #t(lambda(v_229)(if v_229 #t #f))))"
-"(define-values(1/read-square-bracket-with-tag)(make-parameter #f(lambda(v_230)(if v_230 #t #f))))"
+"(define-values(1/read-curly-brace-as-paren)(make-parameter #t(lambda(v_230)(if v_230 #t #f))))"
+"(define-values(1/read-square-bracket-with-tag)(make-parameter #f(lambda(v_231)(if v_231 #t #f))))"
 "(define-values(1/read-curly-brace-with-tag)(make-parameter #f(lambda(v_63)(if v_63 #t #f))))"
 "(define-values(1/read-cdot)(make-parameter #f(lambda(v_29)(if v_29 #t #f))))"
 "(define-values(1/read-accept-graph)(make-parameter #t(lambda(v_64)(if v_64 #t #f))))"
 "(define-values(1/read-accept-compiled)(make-parameter #f(lambda(v_2)(if v_2 #t #f))))"
 "(define-values(1/read-accept-box)(make-parameter #t(lambda(v_96)(if v_96 #t #f))))"
-"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_231)(if v_231 #t #f))))"
+"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_232)(if v_232 #t #f))))"
 "(define-values(1/read-accept-dot)(make-parameter #t(lambda(v_65)(if v_65 #t #f))))"
 "(define-values(1/read-accept-infix-dot)(make-parameter #t(lambda(v_30)(if v_30 #t #f))))"
 "(define-values(1/read-accept-quasiquote)(make-parameter #t(lambda(v_3)(if v_3 #t #f))))"
@@ -48405,36 +48437,36 @@ static const char *startup_source =
 "(lambda(param_1 config_9 v_28)"
 "(begin"
 "(let-values(((v_95) config_9))"
-"(let-values(((the-struct_85) v_95))"
-"(if(read-config/outer? the-struct_85)"
+"(let-values(((the-struct_86) v_95))"
+"(if(read-config/outer? the-struct_86)"
 "(let-values(((inner1_0)"
-"(let-values(((the-struct_86)(read-config/outer-inner v_95)))"
-"(if(read-config/inner? the-struct_86)"
+"(let-values(((the-struct_87)(read-config/outer-inner v_95)))"
+"(if(read-config/inner? the-struct_87)"
 "(let-values(((parameter-override2_0)"
 "(hash-set(read-config-parameter-override config_9) param_1 v_28)))"
 "(read-config/inner2.1"
-"(read-config/inner-readtable the-struct_86)"
-"(read-config/inner-next-readtable the-struct_86)"
-"(read-config/inner-for-syntax? the-struct_86)"
-"(read-config/inner-source the-struct_86)"
-"(read-config/inner-read-compiled the-struct_86)"
-"(read-config/inner-dynamic-require the-struct_86)"
-"(read-config/inner-module-declared? the-struct_86)"
-"(read-config/inner-coerce the-struct_86)"
-"(read-config/inner-coerce-key the-struct_86)"
+"(read-config/inner-readtable the-struct_87)"
+"(read-config/inner-next-readtable the-struct_87)"
+"(read-config/inner-for-syntax? the-struct_87)"
+"(read-config/inner-source the-struct_87)"
+"(read-config/inner-read-compiled the-struct_87)"
+"(read-config/inner-dynamic-require the-struct_87)"
+"(read-config/inner-module-declared? the-struct_87)"
+"(read-config/inner-coerce the-struct_87)"
+"(read-config/inner-coerce-key the-struct_87)"
 " parameter-override2_0"
-"(read-config/inner-parameter-cache the-struct_86)"
-"(read-config/inner-st the-struct_86)))"
-"                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_86)))))"
+"(read-config/inner-parameter-cache the-struct_87)"
+"(read-config/inner-st the-struct_87)))"
+"                              (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_87)))))"
 "(read-config/outer1.1"
 " inner1_0"
-"(read-config/outer-wrap the-struct_85)"
-"(read-config/outer-line the-struct_85)"
-"(read-config/outer-col the-struct_85)"
-"(read-config/outer-pos the-struct_85)"
-"(read-config/outer-indentations the-struct_85)"
-"(read-config/outer-keep-comment? the-struct_85)))"
-"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_85)))))))"
+"(read-config/outer-wrap the-struct_86)"
+"(read-config/outer-line the-struct_86)"
+"(read-config/outer-col the-struct_86)"
+"(read-config/outer-pos the-struct_86)"
+"(read-config/outer-indentations the-struct_86)"
+"(read-config/outer-keep-comment? the-struct_86)))"
+"            (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_86)))))))"
 "(define-values"
 "(force-parameters!)"
 "(lambda(config_10)"
@@ -48562,20 +48594,20 @@ static const char *startup_source =
 "(begin"
 "(if key_85"
 "(let-values()"
-"(if(let-values(((or-part_250)"
+"(if(let-values(((or-part_251)"
 "(eq? mode_16 'terminating-macro)))"
-"(if or-part_250"
-" or-part_250"
-"(let-values(((or-part_251)"
+"(if or-part_251"
+" or-part_251"
+"(let-values(((or-part_252)"
 "(eq?"
 " mode_16"
 " 'non-terminating-macro)))"
-"(if or-part_251"
-" or-part_251"
-"(let-values(((or-part_304)"
+"(if or-part_252"
+" or-part_252"
+"(let-values(((or-part_305)"
 "(eq? mode_16 'dispatch-macro)))"
-"(if or-part_304"
-" or-part_304"
+"(if or-part_305"
+" or-part_305"
 "(char? mode_16)))))))"
 "(void)"
 "(let-values()"
@@ -48646,10 +48678,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_305)"
+"(if(let-values(((or-part_306)"
 "(not target_0)))"
-"(if or-part_305"
-" or-part_305"
+"(if or-part_306"
+" or-part_306"
 "(1/readtable? target_0)))"
 "(void)"
 "(let-values()"
@@ -48735,7 +48767,7 @@ static const char *startup_source =
 "(lambda(c_58 config_11)"
 "(begin"
 "(let-values(((rt_2)(read-config-readtable config_11))((c_59) c_58))"
-"(if(let-values(((or-part_306)(not rt_2)))(if or-part_306 or-part_306(not(char? c_59))))"
+"(if(let-values(((or-part_307)(not rt_2)))(if or-part_307 or-part_307(not(char? c_59))))"
 "(let-values() c_59)"
 "(let-values()(*readtable-effective-char rt_2 c_59)))))))"
 "(define-values"
@@ -48759,7 +48791,7 @@ static const char *startup_source =
 "(lambda(handler_0 c_62 in_3 config_14 line_3 col_2 pos_110)"
 "(begin"
 "(let-values(((for-syntax?_6)(read-config-for-syntax? config_14)))"
-"(let-values(((v_232)"
+"(let-values(((v_233)"
 "(if(not for-syntax?_6)"
 "(let-values()"
 "(with-continuation-mark"
@@ -48781,7 +48813,7 @@ static const char *startup_source =
 " config_14)"
 "(let-values()"
 "(handler_0 c_62 in_3(read-config-source config_14) line_3 col_2 pos_110)))))))"
-"(if(1/special-comment? v_232) v_232(coerce v_232 in_3 config_14)))))))"
+"(if(1/special-comment? v_233) v_233(coerce v_233 in_3 config_14)))))))"
 "(define-values"
 "(1/readtable-mapping)"
 "(lambda(rt_5 c_63)"
@@ -48940,8 +48972,8 @@ static const char *startup_source =
 "((config34_0) config_18)"
 "                                     ((temp35_1) \"~a\")"
 "((temp36_4)"
-"(let-values(((s_483)(exn-message exn_2)))"
-"                                        (regexp-replace \"^[a-z-]*: \" s_483 \"\")))"
+"(let-values(((s_484)(exn-message exn_2)))"
+"                                        (regexp-replace \"^[a-z-]*: \" s_484 \"\")))"
 "((temp37_3)(exn-continuation-marks exn_2)))"
 "(reader-error12.1"
 " temp37_3"
@@ -49019,10 +49051,10 @@ static const char *startup_source =
 " in_10"
 " special1.1"
 " source_5))))"
-"(if(let-values(((or-part_288)"
+"(if(let-values(((or-part_289)"
 "(eof-object? c_65)))"
-"(if or-part_288"
-" or-part_288"
+"(if or-part_289"
+" or-part_289"
 "(eqv?"
 " '#\\newline"
 "(effective-char c_65 config_15))))"
@@ -49076,8 +49108,8 @@ static const char *startup_source =
 "(if(eq? c_67 'special)"
 "(special1.1 'special)"
 " c_67)))))"
-"(let-values(((or-part_289)(eqv? '#\\space c3_1)))"
-"(if or-part_289 or-part_289(eqv? '#\\/ c3_1))))"
+"(let-values(((or-part_290)(eqv? '#\\space c3_1)))"
+"(if or-part_290 or-part_290(eqv? '#\\/ c3_1))))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -49102,13 +49134,13 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(let-values((()(begin(consume-char in_5 '#\\;)(values))))"
-"(let-values(((v_185)(read-one_0 #f in_5 config_15)))"
+"(let-values(((v_187)(read-one_0 #f in_5 config_15)))"
 "(begin"
-"(if(eof-object? v_185)"
+"(if(eof-object? v_187)"
 "(let-values()"
 "(let-values(((in1_2) in_5)"
 "((config2_2) config_15)"
-"((v3_0) v_185)"
+"((v3_0) v_187)"
 "((temp4_2)"
 "                                                                            \"expected a commented-out element for `~a;`, but found end-of-file\")"
 "((ec5_0) ec_0))"
@@ -49205,12 +49237,12 @@ static const char *startup_source =
 "(let-values(((or-part_26)(char-whitespace? dc_0)))"
 "(if or-part_26"
 " or-part_26"
-"(let-values(((or-part_307)(char=? dc_0 '#\\()))"
-"(if or-part_307"
-" or-part_307"
-"(let-values(((or-part_284)(char=? dc_0 '#\\))))"
-"(if or-part_284"
-" or-part_284"
+"(let-values(((or-part_308)(char=? dc_0 '#\\()))"
+"(if or-part_308"
+" or-part_308"
+"(let-values(((or-part_285)(char=? dc_0 '#\\))))"
+"(if or-part_285"
+" or-part_285"
 "(let-values(((or-part_27)(char=? dc_0 '#\\[)))"
 "(if or-part_27"
 " or-part_27"
@@ -49226,9 +49258,9 @@ static const char *startup_source =
 "(let-values(((or-part_13)(char=? dc_0 '#\\')))"
 "(if or-part_13"
 " or-part_13"
-"(let-values(((or-part_208)(char=? dc_0 '#\\`)))"
-"(if or-part_208"
-" or-part_208"
+"(let-values(((or-part_209)(char=? dc_0 '#\\`)))"
+"(if or-part_209"
+" or-part_209"
 "(let-values(((or-part_3)(char=? dc_0 '#\\,)))"
 "(if or-part_3"
 " or-part_3"
@@ -49306,9 +49338,9 @@ static const char *startup_source =
 "(if(check-parameter 1/read-curly-brace-as-paren config_21)(opener-name '#\\{ config_21) #f)))"
 "(if(if s_10 c_69 #f)"
 "              (let-values () (format \"~a, ~a, or ~a\" p_63 s_10 c_69))"
-"(if(let-values(((or-part_287) s_10))(if or-part_287 or-part_287 c_69))"
+"(if(let-values(((or-part_288) s_10))(if or-part_288 or-part_288 c_69))"
 "(let-values()"
-"                  (format \"~a or ~a\" p_63 (let-values (((or-part_288) s_10)) (if or-part_288 or-part_288 c_69))))"
+"                  (format \"~a or ~a\" p_63 (let-values (((or-part_289) s_10)) (if or-part_289 or-part_289 c_69))))"
 "(let-values() p_63)))))))))"
 "(define-values"
 "(struct:accum-string"
@@ -49490,7 +49522,7 @@ static const char *startup_source =
 "                 (let-values () (format \"unexpected `~a`\" c_71))"
 "(let-values()"
 "(let-values(((missing_2)"
-"(let-values(((or-part_215)"
+"(let-values(((or-part_216)"
 "(let-values(((lst_7)(cdr indts_1)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
@@ -49526,7 +49558,7 @@ static const char *startup_source =
 " for-loop_0)"
 " #f"
 " lst_7)))))"
-"                                   (if or-part_215 or-part_215 \"expected\"))))"
+"                                   (if or-part_216 or-part_216 \"expected\"))))"
 "(let-values(((opener-str_0)(opener-name(closer->opener(indentation-closer indt_2)) config_33)))"
 "(format"
 "                        \"~a ~a to close ~a, found instead `~a`\""
@@ -49573,26 +49605,26 @@ static const char *startup_source =
 "(let-values(((head_0) #f))"
 "(let-values(((indentation_0)(make-indentation closer_1 in_10 seq-config_0)))"
 "(let-values(((config_34)"
-"(let-values(((v_233) elem-config_0))"
-"(let-values(((the-struct_87) v_233))"
-"(if(read-config/outer? the-struct_87)"
+"(let-values(((v_234) elem-config_0))"
+"(let-values(((the-struct_88) v_234))"
+"(if(read-config/outer? the-struct_88)"
 "(let-values(((indentations20_0)"
 "(cons"
 " indentation_0"
 "(read-config-indentations seq-config_0)))"
-"((inner21_0)(read-config/outer-inner v_233)))"
+"((inner21_0)(read-config/outer-inner v_234)))"
 "(read-config/outer1.1"
 " inner21_0"
-"(read-config/outer-wrap the-struct_87)"
-"(read-config/outer-line the-struct_87)"
-"(read-config/outer-col the-struct_87)"
-"(read-config/outer-pos the-struct_87)"
+"(read-config/outer-wrap the-struct_88)"
+"(read-config/outer-line the-struct_88)"
+"(read-config/outer-col the-struct_88)"
+"(read-config/outer-pos the-struct_88)"
 " indentations20_0"
-"(read-config/outer-keep-comment? the-struct_87)))"
+"(read-config/outer-keep-comment? the-struct_88)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                       \"read-config/outer?\""
-" the-struct_87))))))"
+" the-struct_88))))))"
 "(let-values(((open-end-line_0 open-end-col_0 open-end-pos_0)"
 "(port-next-location in_10)))"
 "(let-values(((config/keep-comment_0)(keep-comment config_34)))"
@@ -49818,11 +49850,11 @@ static const char *startup_source =
 " post-c_0"
 " seq-config_0)))"
 "(begin"
-"(if(let-values(((or-part_308)"
+"(if(let-values(((or-part_309)"
 "(eof-object?"
 " post-ec_0)))"
-"(if or-part_308"
-" or-part_308"
+"(if or-part_309"
+" or-part_309"
 "(eqv?"
 " post-ec_0"
 " closer_1)))"
@@ -49886,12 +49918,12 @@ static const char *startup_source =
 " temp40_3"
 "(list)))))))))))))"
 "(let-values()"
-"(let-values(((v_234)"
+"(let-values(((v_235)"
 "(read-one/not-eof_0"
 " c_72"
 " first-read-one_1"
 " config/keep-comment_0)))"
-"(if(1/special-comment? v_234)"
+"(if(1/special-comment? v_235)"
 "(let-values()"
 "(loop_98"
 " depth_11"
@@ -49903,13 +49935,13 @@ static const char *startup_source =
 "(let-values()"
 "(loop_98"
 " depth_11"
-"(cons v_234 accum_0)"
+"(cons v_235 accum_0)"
 " #f"
 " #f"
 " read-one_1))"
 "(let-values()"
 "(cons"
-" v_234"
+" v_235"
 "(loop_98"
 "(add1 depth_11)"
 " null"
@@ -49974,11 +50006,11 @@ static const char *startup_source =
 "(consume-char in_12 c_75)"
 "(if accum-str_0(let-values()(accum-string-add! accum-str_0 c_75))(void))"
 "((letrec-values(((loop_60)"
-"(lambda(v_235 max-count_1)"
+"(lambda(v_236 max-count_1)"
 "(begin"
 " 'loop"
 "(if(zero? max-count_1)"
-"(let-values() v_235)"
+"(let-values() v_236)"
 "(let-values()"
 "(let-values(((c_68)"
 "(let-values(((in_24) in_12)"
@@ -50002,9 +50034,9 @@ static const char *startup_source =
 "(let-values()(accum-string-add! accum-str_0 c_68))"
 "(void))"
 "(loop_60"
-"(+(digit->number c_68)(* v_235 base_23))"
+"(+(digit->number c_68)(* v_236 base_23))"
 "(sub1 max-count_1))))"
-"(let-values() v_235)))))))))"
+"(let-values() v_236)))))))))"
 " loop_60)"
 "(+(digit->number c_75)(* init-v_0 base_23))"
 "(sub1 max-count_0))))"
@@ -50027,11 +50059,11 @@ static const char *startup_source =
 "(hex-digit?)"
 "(lambda(c_78)"
 "(begin"
-"(let-values(((or-part_309)(if(char>=? c_78 '#\\0)(char<=? c_78 '#\\9) #f)))"
-"(if or-part_309"
-" or-part_309"
-"(let-values(((or-part_308)(if(char>=? c_78 '#\\A)(char<=? c_78 '#\\F) #f)))"
-"(if or-part_308 or-part_308(if(char>=? c_78 '#\\a)(char<=? c_78 '#\\f) #f))))))))"
+"(let-values(((or-part_310)(if(char>=? c_78 '#\\0)(char<=? c_78 '#\\9) #f)))"
+"(if or-part_310"
+" or-part_310"
+"(let-values(((or-part_309)(if(char>=? c_78 '#\\A)(char<=? c_78 '#\\F) #f)))"
+"(if or-part_309 or-part_309(if(char>=? c_78 '#\\a)(char<=? c_78 '#\\f) #f))))))))"
 "(define-values"
 "(digit->number)"
 "(lambda(c_79)"
@@ -50086,9 +50118,9 @@ static const char *startup_source =
 " 'string->number"
 "                                         \"(or/c 'decimal-as-inexact decimal-as-exact)\""
 " decimal-mode_0)))"
-"(let-values(((s69_0) s_42)"
-"((temp70_2) 0)"
-"((temp71_1)(string-length s_42))"
+"(let-values(((s69_1) s_42)"
+"((temp70_1) 0)"
+"((temp71_2)(string-length s_42))"
 "((radix72_0) radix_0)"
 "((temp73_1) #f)"
 "((decimal-mode74_0) decimal-mode_0)"
@@ -50097,18 +50129,18 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp73_1"
-" s69_0"
-" temp70_2"
-" temp71_1"
+" s69_1"
+" temp70_1"
+" temp71_2"
 " radix72_0"
 " decimal-mode74_0"
 " convert-mode75_0))))))))))))))"
 "(case-lambda"
 "((s_309)(begin 'string->number(string->number8_0 s_309 #f #f #f #f #f #f)))"
-"((s_455 radix_1 convert-mode_1 decimal-mode3_1)"
-"(string->number8_0 s_455 radix_1 convert-mode_1 decimal-mode3_1 #t #t #t))"
-"((s_484 radix_2 convert-mode2_1)(string->number8_0 s_484 radix_2 convert-mode2_1 #f #t #t #f))"
-"((s_485 radix1_1)(string->number8_0 s_485 radix1_1 #f #f #t #f #f)))))"
+"((s_456 radix_1 convert-mode_1 decimal-mode3_1)"
+"(string->number8_0 s_456 radix_1 convert-mode_1 decimal-mode3_1 #t #t #t))"
+"((s_485 radix_2 convert-mode2_1)(string->number8_0 s_485 radix_2 convert-mode2_1 #f #t #t #f))"
+"((s_486 radix1_1)(string->number8_0 s_486 radix1_1 #f #f #t #f #f)))))"
 "(define-values"
 "(do-string->number20.1)"
 "(lambda(in-complex11_0"
@@ -50265,8 +50297,8 @@ static const char *startup_source =
 " temp81_1"
 " temp82_4)))))"
 "(let-values()"
-"(if(let-values(((or-part_209) radix-set?_0))"
-"(if or-part_209 or-part_209 in-complex_0))"
+"(if(let-values(((or-part_210) radix-set?_0))"
+"(if or-part_210 or-part_210 in-complex_0))"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
 "(let-values()"
@@ -50315,13 +50347,13 @@ static const char *startup_source =
 "(read-special-number s_21 start_44 end_34 convert-mode_2)"
 " #f)))"
 "(if c1_30"
-"((lambda(v_194)"
+"((lambda(v_195)"
 "(if(eq? exactness_0 'exact)"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
-"                                             (let-values () (format \"no exact representation for `~a`\" v_194))"
+"                                             (let-values () (format \"no exact representation for `~a`\" v_195))"
 "(let-values() #f)))"
-"(let-values() v_194)))"
+"(let-values() v_195)))"
 " c1_30)"
 "(let-values(((c2_3)"
 "(if(char-sign? c_80)"
@@ -50350,8 +50382,8 @@ static const char *startup_source =
 "((temp96_1) 'i)"
 "((v97_0) v_37)"
 "((temp98_2)"
-"(lambda(v_236 v2_0)"
-"(begin 'temp98(make-rectangular v_236 v2_0)))))"
+"(lambda(v_237 v2_0)"
+"(begin 'temp98(make-rectangular v_237 v2_0)))))"
 "(read-for-special-compound65.1"
 " temp96_1"
 " #f"
@@ -50394,8 +50426,8 @@ static const char *startup_source =
 "((temp106_1) #t)"
 "((v2107_0) v2_1)"
 "((temp108_0)"
-"(lambda(v2_2 v_218)"
-"(begin 'temp108(make-rectangular v_218 v2_2)))))"
+"(lambda(v2_2 v_219)"
+"(begin 'temp108(make-rectangular v_219 v2_2)))))"
 "(read-for-special-compound65.1"
 " temp105_1"
 " temp106_1"
@@ -50424,7 +50456,7 @@ static const char *startup_source =
 " #f)"
 " #f)))"
 "(if c4_0"
-"((lambda(v_219)"
+"((lambda(v_220)"
 "(let-values(((s109_0) s_21)"
 "((temp110_2)(+ start_44 7))"
 "((end111_0) end_34)"
@@ -50432,10 +50464,10 @@ static const char *startup_source =
 "((exactness113_0) exactness_0)"
 "((convert-mode114_0) convert-mode_2)"
 "((temp115_0) '@)"
-"((v116_0) v_219)"
+"((v116_0) v_220)"
 "((temp117_1)"
-"(lambda(v_237 v2_3)"
-"(begin 'temp117(make-polar v_237 v2_3)))))"
+"(lambda(v_238 v2_3)"
+"(begin 'temp117(make-polar v_238 v2_3)))))"
 "(read-for-special-compound65.1"
 " temp115_0"
 " #f"
@@ -50473,8 +50505,8 @@ static const char *startup_source =
 "((temp125_1) #t)"
 "((v2126_0) v2_4)"
 "((temp127_3)"
-"(lambda(v2_5 v_238)"
-"(begin 'temp127(make-polar v_238 v2_5)))))"
+"(lambda(v2_5 v_239)"
+"(begin 'temp127(make-polar v_239 v2_5)))))"
 "(read-for-special-compound65.1"
 " temp124_1"
 " temp125_1"
@@ -50561,10 +50593,10 @@ static const char *startup_source =
 "(substring s_38 start_45 end_35)))"
 "(let-values() #f)))"
 "(if(if sign-pos_0"
-"(let-values(((or-part_310)"
+"(let-values(((or-part_311)"
 "(if dot-pos_1(< dot-pos_1 sign-pos_0) #f)))"
-"(if or-part_310"
-" or-part_310"
+"(if or-part_311"
+" or-part_311"
 "(if slash-pos_0(< slash-pos_0 sign-pos_0) #f)))"
 " #f)"
 "(let-values()"
@@ -50690,27 +50722,27 @@ static const char *startup_source =
 " slash-pos_0"
 " #f"
 "(if(> i_174 start_45)"
-"(let-values(((or-part_202)(not @-pos_0)))"
-"(if or-part_202"
-" or-part_202"
+"(let-values(((or-part_203)(not @-pos_0)))"
+"(if or-part_203"
+" or-part_203"
 "(> i_174(add1 @-pos_0))))"
 " #f)))))"
 "(if(char=? c_81 '#\\.)"
 "(let-values()"
-"(if(let-values(((or-part_311)"
+"(if(let-values(((or-part_312)"
 "(if exp-pos_0"
-"(let-values(((or-part_312)"
+"(let-values(((or-part_313)"
 "(not sign-pos_0)))"
-"(if or-part_312"
-" or-part_312"
-"(> exp-pos_0 sign-pos_0)))"
-" #f)))"
-"(if or-part_311"
-" or-part_311"
-"(if dot-pos_1"
-"(let-values(((or-part_313)(not sign-pos_0)))"
 "(if or-part_313"
 " or-part_313"
+"(> exp-pos_0 sign-pos_0)))"
+" #f)))"
+"(if or-part_312"
+" or-part_312"
+"(if dot-pos_1"
+"(let-values(((or-part_314)(not sign-pos_0)))"
+"(if or-part_314"
+" or-part_314"
 "(> dot-pos_1 sign-pos_0)))"
 " #f)))"
 "(let-values()"
@@ -50721,9 +50753,9 @@ static const char *startup_source =
 "(substring s_38 start_45 end_35)))"
 "(let-values() #f)))"
 "(if(if slash-pos_0"
-"(let-values(((or-part_314)(not sign-pos_0)))"
-"(if or-part_314"
-" or-part_314"
+"(let-values(((or-part_315)(not sign-pos_0)))"
+"(if or-part_315"
+" or-part_315"
 "(> slash-pos_0 sign-pos_0)))"
 " #f)"
 "(let-values()"
@@ -50748,9 +50780,9 @@ static const char *startup_source =
 "(if(char=? c_81 '#\\/)"
 "(let-values()"
 "(if(if dot-pos_1"
-"(let-values(((or-part_315)(not sign-pos_0)))"
-"(if or-part_315"
-" or-part_315"
+"(let-values(((or-part_316)(not sign-pos_0)))"
+"(if or-part_316"
+" or-part_316"
 "(> dot-pos_1 sign-pos_0)))"
 " #f)"
 "(let-values()"
@@ -50760,21 +50792,21 @@ static const char *startup_source =
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
 "(substring s_38 start_45 end_35)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_316)"
+"(if(let-values(((or-part_317)"
 "(if exp-pos_0"
-"(let-values(((or-part_317)"
-"(not sign-pos_0)))"
-"(if or-part_317"
-" or-part_317"
-"(> exp-pos_0 sign-pos_0)))"
-" #f)))"
-"(if or-part_316"
-" or-part_316"
-"(if slash-pos_0"
 "(let-values(((or-part_318)"
 "(not sign-pos_0)))"
 "(if or-part_318"
 " or-part_318"
+"(> exp-pos_0 sign-pos_0)))"
+" #f)))"
+"(if or-part_317"
+" or-part_317"
+"(if slash-pos_0"
+"(let-values(((or-part_319)"
+"(not sign-pos_0)))"
+"(if or-part_319"
+" or-part_319"
 "(> slash-pos_0 sign-pos_0)))"
 " #f)))"
 "(let-values()"
@@ -50796,58 +50828,58 @@ static const char *startup_source =
 " i_174"
 " #f"
 " must-i?_0)))))"
-"(if(let-values(((or-part_319)(char=? c_81 '#\\e)))"
-"(if or-part_319"
-" or-part_319"
-"(let-values(((or-part_320)(char=? c_81 '#\\E)))"
+"(if(let-values(((or-part_320)(char=? c_81 '#\\e)))"
 "(if or-part_320"
 " or-part_320"
-"(let-values(((or-part_321)"
-"(char=? c_81 '#\\f)))"
+"(let-values(((or-part_321)(char=? c_81 '#\\E)))"
 "(if or-part_321"
 " or-part_321"
 "(let-values(((or-part_322)"
-"(char=? c_81 '#\\F)))"
+"(char=? c_81 '#\\f)))"
 "(if or-part_322"
 " or-part_322"
 "(let-values(((or-part_323)"
-"(char=? c_81 '#\\d)))"
+"(char=? c_81 '#\\F)))"
 "(if or-part_323"
 " or-part_323"
-"(let-values(((or-part_203)"
+"(let-values(((or-part_324)"
+"(char=? c_81 '#\\d)))"
+"(if or-part_324"
+" or-part_324"
+"(let-values(((or-part_204)"
 "(char=? c_81 '#\\D)))"
-"(if or-part_203"
-" or-part_203"
-"(let-values(((or-part_158)"
+"(if or-part_204"
+" or-part_204"
+"(let-values(((or-part_173)"
 "(char=?"
 " c_81"
 " '#\\s)))"
-"(if or-part_158"
-" or-part_158"
-"(let-values(((or-part_324)"
-"(char=?"
-" c_81"
-" '#\\S)))"
-"(if or-part_324"
-" or-part_324"
+"(if or-part_173"
+" or-part_173"
 "(let-values(((or-part_325)"
 "(char=?"
 " c_81"
-" '#\\l)))"
+" '#\\S)))"
 "(if or-part_325"
 " or-part_325"
 "(let-values(((or-part_326)"
 "(char=?"
 " c_81"
-" '#\\L)))"
+" '#\\l)))"
 "(if or-part_326"
 " or-part_326"
-"(let-values(((or-part_179)"
+"(let-values(((or-part_327)"
+"(char=?"
+" c_81"
+" '#\\L)))"
+"(if or-part_327"
+" or-part_327"
+"(let-values(((or-part_180)"
 "(char=?"
 " c_81"
 " '#\\t)))"
-"(if or-part_179"
-" or-part_179"
+"(if or-part_180"
+" or-part_180"
 "(char=?"
 " c_81"
 " '#\\T)))))))))))))))))))))))"
@@ -50874,8 +50906,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_327) exp-pos_0))"
-"(if or-part_327 or-part_327 i_174))"
+"(let-values(((or-part_328) exp-pos_0))"
+"(if or-part_328 or-part_328 i_174))"
 " must-i?_0))"
 "(let-values()"
 "(loop_108"
@@ -50887,8 +50919,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_328) exp-pos_0))"
-"(if or-part_328 or-part_328 i_174))"
+"(let-values(((or-part_329) exp-pos_0))"
+"(if or-part_329 or-part_329 i_174))"
 " must-i?_0)))))"
 "(if(char=? c_81 '#\\@)"
 "(let-values()"
@@ -50900,9 +50932,9 @@ static const char *startup_source =
 "                                                                             \"cannot mix `@` and `i` in `~.a`\""
 "(substring s_38 start_45 end_35)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_329) @-pos_0))"
-"(if or-part_329"
-" or-part_329"
+"(if(let-values(((or-part_158) @-pos_0))"
+"(if or-part_158"
+" or-part_158"
 "(eq? in-complex_1 '@)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -51021,7 +51053,7 @@ static const char *startup_source =
 " convert-mode49_0)"
 "(begin"
 " 'string->complex-number50"
-"(let-values(((s_486) s40_0))"
+"(let-values(((s_487) s40_0))"
 "(let-values(((start1_0) start141_0))"
 "(let-values(((end1_0) end142_0))"
 "(let-values(((start2_0) start243_0))"
@@ -51038,7 +51070,7 @@ static const char *startup_source =
 "(if(= start1_0 end1_0)"
 "(let-values()(if(eq? exactness_2 'inexact) 0.0 0))"
 "(let-values()"
-"(let-values(((s160_0) s_486)"
+"(let-values(((s160_0) s_487)"
 "((start1161_0) start1_0)"
 "((end1162_0) end1_0)"
 "((radix163_0) radix_6)"
@@ -51059,12 +51091,12 @@ static const char *startup_source =
 "(let-values(((v2_6)"
 "(if(if(eq? in-complex_2 'i)(=(- end2_0 start2_0) 1) #f)"
 "(let-values()"
-"(let-values(((neg?_0)(char=?(string-ref s_486 start2_0) '#\\-)))"
+"(let-values(((neg?_0)(char=?(string-ref s_487 start2_0) '#\\-)))"
 "(if(eq? exactness_2 'inexact)"
 "(let-values()(if neg?_0 -1.0 1.0))"
 "(let-values()(if neg?_0 -1 1)))))"
 "(let-values()"
-"(let-values(((s168_0) s_486)"
+"(let-values(((s168_0) s_487)"
 "((start2169_0) start2_0)"
 "((end2170_0) end2_0)"
 "((radix171_0) radix_6)"
@@ -51227,7 +51259,7 @@ static const char *startup_source =
 " 'read)))"
 "(let-values()(real->double-flonum r_45)))))))))"
 "(let-values(((get-extfl?_0)(extfl-mark?_0)))"
-"(if(let-values(((or-part_214)(not m-v_0)))(if or-part_214 or-part_214(not e-v_0)))"
+"(if(let-values(((or-part_215)(not m-v_0)))(if or-part_215 or-part_215(not e-v_0)))"
 "(let-values() #f)"
 "(if(string? m-v_0)"
 "(let-values() m-v_0)"
@@ -51410,48 +51442,48 @@ static const char *startup_source =
 " end_37))))))"
 "(define-values"
 "(string->exact-integer-number)"
-"(lambda(s_487 start_48 end_38 radix_9 convert-mode_7)"
+"(lambda(s_488 start_48 end_38 radix_9 convert-mode_7)"
 "(begin"
-"(if(hashes? s_487 start_48 end_38)"
+"(if(hashes? s_488 start_48 end_38)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_487 start_48 end_38)))"
+"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_488 start_48 end_38)))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((n_34)(string->number$1(maybe-substring s_487 start_48 end_38) radix_9)))"
+"(let-values(((n_34)(string->number$1(maybe-substring s_488 start_48 end_38) radix_9)))"
 "(if(not n_34)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"                  (let-values () (format \"bad exponent `~.a`\" (substring s_487 start_48 end_38)))"
+"                  (let-values () (format \"bad exponent `~.a`\" (substring s_488 start_48 end_38)))"
 "(let-values() #f)))"
 "(let-values() n_34))))))))"
 "(define-values"
 "(read-special-number)"
-"(lambda(s_488 start_49 end_39 convert-mode_8)"
+"(lambda(s_489 start_49 end_39 convert-mode_8)"
 "(begin"
 "(if(=(- end_39 start_49) 6)"
-"(if(let-values(((or-part_347)(char=?(string-ref s_488 start_49) '#\\+)))"
-"(if or-part_347 or-part_347(char=?(string-ref s_488 start_49) '#\\-)))"
+"(if(let-values(((or-part_347)(char=?(string-ref s_489 start_49) '#\\+)))"
+"(if or-part_347 or-part_347(char=?(string-ref s_489 start_49) '#\\-)))"
 "(let-values(((or-part_348)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 1))) '#\\i)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 2))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 3))) '#\\f)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 4))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 1))) '#\\i)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 2))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 3))) '#\\f)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 4))) '#\\.)"
 "(let-values(((or-part_349)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\0)"
-"(if(char=?(string-ref s_488 start_49) '#\\+) +inf.0 -inf.0)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\0)"
+"(if(char=?(string-ref s_489 start_49) '#\\+) +inf.0 -inf.0)"
 " #f)))"
 "(if or-part_349"
 " or-part_349"
 "(let-values(((or-part_350)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\f)"
-"(if(char=?(string-ref s_488 start_49) '#\\+) +inf.f -inf.f)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\f)"
+"(if(char=?(string-ref s_489 start_49) '#\\+) +inf.f -inf.f)"
 " #f)))"
 "(if or-part_350"
 " or-part_350"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false))"
-"(if(char=?(string-ref s_488 start_49) '#\\+) '+inf.t '-inf.t)"
+"(if(char=?(string-ref s_489 start_49) '#\\+) '+inf.t '-inf.t)"
 " #f)"
 " #f)))))"
 " #f)"
@@ -51460,19 +51492,19 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_348"
 " or-part_348"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 1))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 2))) '#\\a)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 3))) '#\\n)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 4))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 1))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 2))) '#\\a)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 3))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 4))) '#\\.)"
 "(let-values(((or-part_351)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\0) +nan.0 #f)))"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\0) +nan.0 #f)))"
 "(if or-part_351"
 " or-part_351"
 "(let-values(((or-part_352)"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\f) +nan.f #f)))"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\f) +nan.f #f)))"
 "(if or-part_352"
 " or-part_352"
-"(if(char=?(char-downcase(string-ref s_488(+ start_49 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_489(+ start_49 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false)) '+nan.t #f)"
 " #f)))))"
 " #f)"
@@ -51483,10 +51515,10 @@ static const char *startup_source =
 " #f))))"
 "(define-values"
 "(fail-extflonum)"
-"(lambda(convert-mode_9 v_239)"
+"(lambda(convert-mode_9 v_240)"
 "(begin"
 "(if(eq? convert-mode_9 'must-read)"
-"        (let-values () (format \"cannot combine extflonum `~a` into complex number\" v_239))"
+"        (let-values () (format \"cannot combine extflonum `~a` into complex number\" v_240))"
 "(let-values() #f)))))"
 "(define-values"
 "(read-for-special-compound65.1)"
@@ -51511,19 +51543,19 @@ static const char *startup_source =
 "(let-values(((convert-mode_10) convert-mode62_0))"
 "(let-values(((in-complex_3) in-complex53_0))"
 "(let-values(((reading-first?_0)(if reading-first?56_0 reading-first?54_0 #f)))"
-"(let-values(((v_240) v63_0))"
+"(let-values(((v_241) v63_0))"
 "(let-values(((combine_1) combine64_0))"
 "(let-values()"
 "(if(eq? exactness_5 'exact)"
 "(let-values()"
 "(if(eq? convert-mode_10 'must-read)"
-"                                  (let-values () (format \"no exact representation for `~a`\" v_240))"
+"                                  (let-values () (format \"no exact representation for `~a`\" v_241))"
 "(let-values() #f)))"
-"(if(if(extflonum? v_240)"
+"(if(if(extflonum? v_241)"
 "(let-values(((or-part_353)(not reading-first?_0)))"
 "(if or-part_353 or-part_353(not(eq? convert-mode_10 'must-read))))"
 " #f)"
-"(let-values()(fail-extflonum convert-mode_10 v_240))"
+"(let-values()(fail-extflonum convert-mode_10 v_241))"
 "(let-values()"
 "(let-values(((v2_7)"
 "(let-values(((s176_0) s_258)"
@@ -51548,12 +51580,12 @@ static const char *startup_source =
 "(let-values() v2_7)"
 "(if(not v2_7)"
 "(let-values() v2_7)"
-"(if(extflonum? v_240)"
-"(let-values()(fail-extflonum convert-mode_10 v_240))"
-"(let-values()(combine_1 v_240 v2_7)))))))))))))))))))))))"
+"(if(extflonum? v_241)"
+"(let-values()(fail-extflonum convert-mode_10 v_241))"
+"(let-values()(combine_1 v_241 v2_7)))))))))))))))))))))))"
 "(define-values"
 "(hashes?)"
-"(lambda(s_489 start_51 end_41)"
+"(lambda(s_490 start_51 end_41)"
 "(begin"
 "(let-values(((v*_6 start*_5 stop*_6 step*_5)"
 "(normalise-inputs"
@@ -51561,7 +51593,7 @@ static const char *startup_source =
 "                     \"string\""
 "(lambda(x_83)(string? x_83))"
 "(lambda(x_84)(unsafe-string-length x_84))"
-" s_489"
+" s_490"
 " start_51"
 " end_41"
 " 1)))"
@@ -51648,24 +51680,24 @@ static const char *startup_source =
 "(digit?)"
 "(lambda(c_86 radix_11)"
 "(begin"
-"(let-values(((v_241)(char->integer c_86)))"
+"(let-values(((v_242)(char->integer c_86)))"
 "(let-values(((or-part_356)"
-"(if(>= v_241(char->integer '#\\0))(<(- v_241(char->integer '#\\0)) radix_11) #f)))"
+"(if(>= v_242(char->integer '#\\0))(<(- v_242(char->integer '#\\0)) radix_11) #f)))"
 "(if or-part_356"
 " or-part_356"
 "(if(> radix_11 10)"
 "(let-values(((or-part_357)"
-"(if(>= v_241(char->integer '#\\a))(<(- v_241(-(char->integer '#\\a) 10)) radix_11) #f)))"
+"(if(>= v_242(char->integer '#\\a))(<(- v_242(-(char->integer '#\\a) 10)) radix_11) #f)))"
 "(if or-part_357"
 " or-part_357"
-"(if(>= v_241(char->integer '#\\A))(<(- v_241(-(char->integer '#\\A) 10)) radix_11) #f)))"
+"(if(>= v_242(char->integer '#\\A))(<(- v_242(-(char->integer '#\\A) 10)) radix_11) #f)))"
 " #f)))))))"
 "(define-values"
 "(fail-bad-number)"
-"(lambda(convert-mode_11 s_490 start_55 end_44)"
+"(lambda(convert-mode_11 s_491 start_55 end_44)"
 "(begin"
 "(if(eq? convert-mode_11 'must-read)"
-"        (let-values () (format \"bad number `~.a`\" (substring s_490 start_55 end_44)))"
+"        (let-values () (format \"bad number `~.a`\" (substring s_491 start_55 end_44)))"
 "(let-values() #f)))))"
 "(define-values"
 "(read-complains)"
@@ -52023,11 +52055,11 @@ static const char *startup_source =
 "(let-values(((or-part_164) num_0))"
 "(if or-part_164"
 " or-part_164"
-"(let-values(((or-part_305)"
+"(let-values(((or-part_306)"
 "(if(eq? mode_17 'keyword)"
 "(string->keyword str_29)"
 " #f)))"
-"(if or-part_305 or-part_305(string->symbol str_29)))))"
+"(if or-part_306 or-part_306(string->symbol str_29)))))"
 " in_25"
 " config_24"
 " str_29)))))))))))))))))))))))))"
@@ -52149,7 +52181,7 @@ static const char *startup_source =
 "                                                               \"exact-nonnegative-integer?\""
 " len_38)))"
 "(let-values(((fill_0) 0))"
-"(let-values(((v_200)(make-fxvector len_38 fill_0)))"
+"(let-values(((v_201)(make-fxvector len_38 fill_0)))"
 "(begin"
 "(if(zero? len_38)"
 "(void)"
@@ -52183,7 +52215,7 @@ static const char *startup_source =
 "(if(fixnum?"
 " elem_0)"
 "(unsafe-fxvector-set!"
-" v_200"
+" v_201"
 " i_178"
 " elem_0)"
 "(not-an-fX.1"
@@ -52210,7 +52242,7 @@ static const char *startup_source =
 " for-loop_256)"
 " 0"
 " lst_23)))))"
-" v_200))))))"
+" v_201))))))"
 "(if(equal? tmp_41 'flonum)"
 "(let-values()"
 "(let-values(((len_8)(length seq_2)))"
@@ -52223,7 +52255,7 @@ static const char *startup_source =
 "                                                                 \"exact-nonnegative-integer?\""
 " len_8)))"
 "(let-values(((fill_1) 0.0))"
-"(let-values(((v_242)(make-flvector len_8 fill_1)))"
+"(let-values(((v_243)(make-flvector len_8 fill_1)))"
 "(begin"
 "(if(zero? len_8)"
 "(void)"
@@ -52257,7 +52289,7 @@ static const char *startup_source =
 "(if(flonum?"
 " elem_1)"
 "(unsafe-flvector-set!"
-" v_242"
+" v_243"
 " i_91"
 " elem_1)"
 "(not-an-fX.1$1"
@@ -52284,7 +52316,7 @@ static const char *startup_source =
 " for-loop_195)"
 " 0"
 " lst_91)))))"
-" v_242))))))"
+" v_243))))))"
 "(let-values()(void)))))))"
 "(let-values()"
 "(let-values(((len_39)(length seq_2)))"
@@ -52322,11 +52354,11 @@ static const char *startup_source =
 "(list temp25_6 expected-len26_0 len27_0))))"
 "(let-values()"
 "(let-values(((last-or_0)"
-"(lambda(v_243)"
+"(lambda(v_244)"
 "(begin"
 " 'last-or"
 "(if(null? seq_2)"
-"(wrap v_243 in_30 config_40 #f)"
+"(wrap v_244 in_30 config_40 #f)"
 "((letrec-values(((loop_111)"
 "(lambda(seq_3)"
 "(begin"
@@ -52600,15 +52632,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in48_0) in_33)"
 "((config49_0) config_43)"
-"                                         ((temp50_2) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_91 c2_4))))"
-"(bad-syntax-error20.1 #f #f in48_0 config49_0 temp50_2)))))"
+"                                         ((temp50_1) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_91 c2_4))))"
+"(bad-syntax-error20.1 #f #f in48_0 config49_0 temp50_1)))))"
 "(if(equal? tmp_45 '#\\{)"
 "(let-values()"
 "(if(check-parameter 1/read-curly-brace-as-paren config_43)"
 "(let-values()"
 "(let-values(((read-one51_0) read-one_6)"
-"((temp52_3) '#\\{)"
-"((temp53_1) '#\\{)"
+"((temp52_4) '#\\{)"
+"((temp53_2) '#\\{)"
 "((temp54_0) '#\\})"
 "((in55_1) in_33)"
 "((config56_0) config_43)"
@@ -52620,21 +52652,21 @@ static const char *startup_source =
 " vector-mode57_0"
 " #t"
 " read-one51_0"
-" temp52_3"
-" temp53_1"
+" temp52_4"
+" temp53_2"
 " temp54_0"
 " in55_1"
 " config56_0)))"
 "(let-values()"
 "(let-values(((in59_0) in_33)"
 "((config60_0) config_43)"
-"                                           ((temp61_1) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_91 c2_4))))"
-"(bad-syntax-error20.1 #f #f in59_0 config60_0 temp61_1)))))"
+"                                           ((temp61_2) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_91 c2_4))))"
+"(bad-syntax-error20.1 #f #f in59_0 config60_0 temp61_2)))))"
 "(let-values()"
 "(let-values(((in62_0) in_33)"
 "((config63_0) config_43)"
 "((c464_0) c4_1)"
-"                                       ((temp65_2) \"expected `(`, `[`, or `{` after `#~a~a~a`\")"
+"                                       ((temp65_3) \"expected `(`, `[`, or `{` after `#~a~a~a`\")"
 "((c66_0) c_91)"
 "((c267_0) c2_4)"
 "((len-str68_0) len-str_0))"
@@ -52649,7 +52681,7 @@ static const char *startup_source =
 " #f"
 " in62_0"
 " config63_0"
-" temp65_2"
+" temp65_3"
 "(list c66_0 c267_0 len-str68_0))))))))))))))))"
 "(define-values"
 "(read-simple-number)"
@@ -52658,16 +52690,16 @@ static const char *startup_source =
 "(let-values(((accum-str_2)(accum-string-init! config_44)))"
 "(let-values((()(begin(accum-string-add! accum-str_2 init-c_10)(values))))"
 "(let-values(((init-v_1)(digit->number init-c_10)))"
-"(let-values(((v_102)"
+"(let-values(((v_245)"
 "(let-values(((in69_0) in_35)"
 "((config70_0) config_44)"
 "((accum-str71_0) accum-str_2)"
-"((temp72_0) 10)"
+"((temp72_1) 10)"
 "((temp73_2) +inf.0)"
 "((init-v74_0) init-v_1)"
 "((init-v75_0) init-v_1))"
 "(read-digits13.1"
-" temp72_0"
+" temp72_1"
 " init-v74_0"
 " #t"
 " temp73_2"
@@ -52678,7 +52710,7 @@ static const char *startup_source =
 " accum-str71_0"
 " #t))))"
 "(values"
-" v_102"
+" v_245"
 "(let-values(((accum-str76_0) accum-str_2)((config77_0) config_44))"
 "(accum-string-get!6.1 #f #f accum-str76_0 config77_0))"
 "(let-values(((in_36) in_35)((source_20)(read-config-source config_44)))"
@@ -52983,9 +53015,9 @@ static const char *startup_source =
 "(if(if(equal? tmp_48 '#\\=) #t(equal? tmp_48 '#\\#))"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_306)(read-config-for-syntax? config_46)))"
-"(if or-part_306"
-" or-part_306"
+"(if(let-values(((or-part_307)(read-config-for-syntax? config_46)))"
+"(if or-part_307"
+" or-part_307"
 "(not(check-parameter 1/read-accept-graph config_46))))"
 "(let-values()"
 "(let-values(((in37_1) in_38)"
@@ -53046,7 +53078,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in50_0) in_38)"
 "((config51_0) config_46)"
-"                                                                                   ((temp52_4) \"multiple `~a~a~a` tags\")"
+"                                                                                   ((temp52_5) \"multiple `~a~a~a` tags\")"
 "((dispatch-c53_0) dispatch-c_1)"
 "((temp54_1)"
 "(let-values(((accum-str56_0)"
@@ -53070,7 +53102,7 @@ static const char *startup_source =
 " #f"
 " in50_0"
 " config51_0"
-" temp52_4"
+" temp52_5"
 "(list dispatch-c53_0 temp54_1 c55_0))))"
 "(void))"
 "(values))))"
@@ -53083,10 +53115,10 @@ static const char *startup_source =
 "(let-values(((in58_0) in_38)"
 "((config59_0) config_46)"
 "((result-v60_0) result-v_0)"
-"((temp61_2)"
+"((temp61_3)"
 "                                                                            \"expected an element for graph after `~a~a~a`, found end-of-file\")"
 "((dispatch-c62_0) dispatch-c_1)"
-"((temp63_4)"
+"((temp63_3)"
 "(let-values(((accum-str65_0) accum-str_3)"
 "((config66_0) config_46))"
 "(accum-string-get!6.1"
@@ -53106,8 +53138,8 @@ static const char *startup_source =
 " #f"
 " in58_0"
 " config59_0"
-" temp61_2"
-"(list dispatch-c62_0 temp63_4 c64_0))))"
+" temp61_3"
+"(list dispatch-c62_0 temp63_3 c64_0))))"
 "(void))"
 "(accum-string-abandon! accum-str_3 config_46)"
 "(placeholder-set! ph_1 result-v_0)"
@@ -53123,7 +53155,7 @@ static const char *startup_source =
 "(lambda()"
 "(let-values(((in67_0) in_38)"
 "((config68_0) config_46)"
-"                                                                  ((temp69_1) \"no preceding `~a~a=` for `~a~a~a`\")"
+"                                                                  ((temp69_0) \"no preceding `~a~a=` for `~a~a~a`\")"
 "((dispatch-c70_0) dispatch-c_1)"
 "((v71_0) v_28)"
 "((dispatch-c72_0) dispatch-c_1)"
@@ -53147,7 +53179,7 @@ static const char *startup_source =
 " #f"
 " in67_0"
 " config68_0"
-" temp69_1"
+" temp69_0"
 "(list dispatch-c70_0 v71_0 dispatch-c72_0 temp73_3 c74_0)))))"
 "(accum-string-abandon! accum-str_3 config_46)))"
 "(let-values()(void)))))))"
@@ -53464,7 +53496,7 @@ static const char *startup_source =
 "(let-values(((in47_1) in_38)"
 "((config48_1) config_46)"
 "((c49_0) c_70)"
-"                                                                                         ((temp50_3) \"bad syntax `~a`\")"
+"                                                                                         ((temp50_2) \"bad syntax `~a`\")"
 "((temp51_3)"
 "(let-values(((accum-str52_0)"
 " accum-str_3)"
@@ -53486,7 +53518,7 @@ static const char *startup_source =
 " #f"
 " in47_1"
 " config48_1"
-" temp50_3"
+" temp50_2"
 "(list temp51_3)))))))))))))))))"
 " loop_112)"
 " 'equal)))"
@@ -53536,8 +53568,8 @@ static const char *startup_source =
 "((config55_0) config_48)"
 "((c56_0) c_93)"
 "((prefix-end-pos57_0) prefix-end-pos_0)"
-"                                       ((temp58_3) \"expected ~a to close `~a`\")"
-"((temp59_4)(closer-name overall-closer-ec_0 config_48))"
+"                                       ((temp58_2) \"expected ~a to close `~a`\")"
+"((temp59_3)(closer-name overall-closer-ec_0 config_48))"
 "((overall-opener-c60_0) overall-opener-c_0))"
 "(reader-error12.1"
 " #f"
@@ -53550,18 +53582,18 @@ static const char *startup_source =
 " #f"
 " in54_0"
 " config55_0"
-" temp58_3"
-"(list temp59_4 overall-opener-c60_0))))"
+" temp58_2"
+"(list temp59_3 overall-opener-c60_0))))"
 "(if(char-closer? ec_8 config_48)"
 "(let-values()"
 "(let-values(((in61_0) in_41)"
-"((temp62_3)(reading-at config_48 open-line_0 open-col_0 open-pos_0))"
-"                                         ((temp63_5) \"~a\")"
-"((temp64_3)(indentation-unexpected-closer-message ec_8 c_93 config_48)))"
-"(reader-error12.1 #f #f #f #f #f #f #f #f in61_0 temp62_3 temp63_5(list temp64_3))))"
+"((temp62_2)(reading-at config_48 open-line_0 open-col_0 open-pos_0))"
+"                                         ((temp63_4) \"~a\")"
+"((temp64_4)(indentation-unexpected-closer-message ec_8 c_93 config_48)))"
+"(reader-error12.1 #f #f #f #f #f #f #f #f in61_0 temp62_2 temp63_4(list temp64_4))))"
 "(let-values()"
-"(let-values(((v_244)(read-one_8 c_93 in_41(keep-comment elem-config_1))))"
-"(if(1/special-comment? v_244)"
+"(let-values(((v_246)(read-one_8 c_93 in_41(keep-comment elem-config_1))))"
+"(if(1/special-comment? v_246)"
 "(let-values()"
 "((make-read-one-key+value"
 " read-one_8"
@@ -53613,10 +53645,10 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(let-values(((in69_1) in_41)"
-"((temp70_3)"
+"((temp70_2)"
 "(reading-at config_48 dot-line_1 dot-col_1 dot-pos_4))"
 "((dot-c71_0) dot-c_0)"
-"                                                               ((temp72_1) \"expected ~a and value for hash\")"
+"                                                               ((temp72_2) \"expected ~a and value for hash\")"
 "((temp73_4)(dot-name config_48)))"
 "(reader-error12.1"
 " #f"
@@ -53628,11 +53660,11 @@ static const char *startup_source =
 " #f"
 " #f"
 " in69_1"
-" temp70_3"
-" temp72_1"
+" temp70_2"
+" temp72_2"
 "(list temp73_4)))))"
 "(values))))"
-"(let-values(((v_245)(read-one_8 #f in_41 elem-config_1)))"
+"(let-values(((v_247)(read-one_8 #f in_41 elem-config_1)))"
 "(let-values(((closer-c_0)"
 "(read-char/skip-whitespace-and-comments #f read-one_8 in_41 config_48)))"
 "(let-values(((closer-line_0 closer-col_0 closer-pos_0)"
@@ -53665,7 +53697,7 @@ static const char *startup_source =
 " temp75_1"
 " temp77_1"
 "(list temp78_2)))))"
-"(cons(coerce-key k_41 elem-config_1) v_245))))))))))))))))))))))"
+"(cons(coerce-key k_41 elem-config_1) v_247))))))))))))))))))))))"
 "(define-values"
 "(read-string5.1)"
 "(lambda(mode1_1 mode2_0 in3_0 config4_0)"
@@ -54094,7 +54126,7 @@ static const char *startup_source =
 "(let-values(((pos_103)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_243)"
+"(let-values(((v_244)"
 "(let-values(((in40_1)"
 " in_43)"
 "((config41_1)"
@@ -54117,13 +54149,13 @@ static const char *startup_source =
 " accum-str42_0"
 " #t))))"
 "(begin"
-"(if(integer? v_243)"
+"(if(integer? v_244)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_43"
 " config_22"
-" v_243"
+" v_244"
 " escaping-c_0"
 " escaped-c_0)))"
 "(set-accum-string-count!"
@@ -54132,7 +54164,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_243))))))"
+" v_244))))))"
 "(if(unsafe-fx< index_3 15)"
 "(let-values()"
 "(let-values((()"
@@ -54147,7 +54179,7 @@ static const char *startup_source =
 "(let-values(((pos_120)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_246)"
+"(let-values(((v_248)"
 "(let-values(((in45_0)"
 " in_43)"
 "((config46_0)"
@@ -54156,13 +54188,13 @@ static const char *startup_source =
 " accum-str_4)"
 "((temp48_1)"
 " 16)"
-"((temp49_2)"
+"((temp49_1)"
 " 4))"
 "(read-digits13.1"
 " temp48_1"
 " #f"
 " #f"
-" temp49_2"
+" temp49_1"
 " #f"
 " #f"
 " in45_0"
@@ -54171,23 +54203,23 @@ static const char *startup_source =
 " #t))))"
 "(begin"
 "(if(integer?"
-" v_246)"
+" v_248)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_43"
 " config_22"
-" v_246"
+" v_248"
 " escaping-c_0"
 " escaped-c_0)))"
-"(if(let-values(((or-part_252)"
+"(if(let-values(((or-part_253)"
 "(<"
-" v_246"
+" v_248"
 " 55296)))"
-"(if or-part_252"
-" or-part_252"
+"(if or-part_253"
+" or-part_253"
 "(>"
-" v_246"
+" v_248"
 " 57343)))"
 "(let-values()"
 "(begin"
@@ -54197,7 +54229,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_246))))"
+" v_248))))"
 "(let-values()"
 "(let-values(((next!_0)"
 "(lambda()"
@@ -54241,12 +54273,12 @@ static const char *startup_source =
 " config_22)"
 "((accum-str52_1)"
 " accum-str_4)"
-"((temp53_2)"
+"((temp53_3)"
 " 16)"
 "((temp54_2)"
 " 4))"
 "(read-digits13.1"
-" temp53_2"
+" temp53_3"
 " #f"
 " #f"
 " temp54_2"
@@ -54281,7 +54313,7 @@ static const char *startup_source =
 "(+"
 "(arithmetic-shift"
 "(-"
-" v_246"
+" v_248"
 " 55296)"
 " 10)"
 "(-"
@@ -54296,11 +54328,11 @@ static const char *startup_source =
 " in_43)"
 "((config56_1)"
 " config_22)"
-"((temp57_0)"
+"((temp57_1)"
 "                                                                                                                                      \"escape sequence `~au~a` is out of range in string\")"
 "((escaping-c58_0)"
 " escaping-c_0)"
-"((temp59_5)"
+"((temp59_4)"
 "(let-values(((accum-str60_0)"
 " accum-str_4)"
 "((config61_0)"
@@ -54323,10 +54355,10 @@ static const char *startup_source =
 " #f"
 " in55_2"
 " config56_1"
-" temp57_0"
+" temp57_1"
 "(list"
 " escaping-c58_0"
-" temp59_5))))"
+" temp59_4))))"
 "(let-values()"
 "(begin"
 "(set-accum-string-count!"
@@ -54387,7 +54419,7 @@ static const char *startup_source =
 "(let-values(((pos_121)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_247)"
+"(let-values(((v_249)"
 "(let-values(((in72_0)"
 " in_43)"
 "((config73_0)"
@@ -54411,26 +54443,26 @@ static const char *startup_source =
 " #t))))"
 "(begin"
 "(if(integer?"
-" v_247)"
+" v_249)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_43"
 " config_22"
-" v_247"
+" v_249"
 " escaping-c_0"
 " escaped-c_0)))"
 "(if(if(let-values(((or-part_55)"
 "(<"
-" v_247"
+" v_249"
 " 55296)))"
 "(if or-part_55"
 " or-part_55"
 "(>"
-" v_247"
+" v_249"
 " 57343)))"
 "(<="
-" v_247"
+" v_249"
 " 1114111)"
 " #f)"
 "(let-values()"
@@ -54441,7 +54473,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_247))))"
+" v_249))))"
 "(let-values()"
 "(let-values(((in77_1)"
 " in_43)"
@@ -54914,7 +54946,7 @@ static const char *startup_source =
 "(void)))))))"
 " loop_105))"
 "(values))))"
-"(let-values(((name_68)"
+"(let-values(((name_67)"
 "(string-foldcase"
 "(let-values(((accum-str27_0) accum-str_7)"
 "((config28_1) config_8))"
@@ -54923,7 +54955,7 @@ static const char *startup_source =
 " #f"
 " accum-str27_0"
 " config28_1)))))"
-"(let-values(((tmp_54) name_68))"
+"(let-values(((tmp_54) name_67))"
 "                                                      (if (if (equal? tmp_54 \"nul\") #t (equal? tmp_54 \"null\"))"
 "(let-values() '#\\nul)"
 "                                                        (if (equal? tmp_54 \"backspace\")"
@@ -54949,7 +54981,7 @@ static const char *startup_source =
 "((config30_0) config_8)"
 "((temp31_5)"
 "                                                                                        \"bad character constant `#\\\\~a`\")"
-"((name32_0) name_68))"
+"((name32_0) name_67))"
 "(reader-error12.1"
 " #f"
 " #f"
@@ -55258,7 +55290,7 @@ static const char *startup_source =
 "(let-values(((in56_0) in_25)"
 "((config57_1) config_24)"
 "((mod-path-wrapped58_0) mod-path-wrapped_0)"
-"                               ((temp59_6) \"expected a datum after `~a`, found end-of-file\")"
+"                               ((temp59_5) \"expected a datum after `~a`, found end-of-file\")"
 "((extend-str60_0) extend-str_0))"
 "(reader-error12.1"
 " #f"
@@ -55271,7 +55303,7 @@ static const char *startup_source =
 " #f"
 " in56_0"
 " config57_1"
-" temp59_6"
+" temp59_5"
 "(list extend-str60_0))))"
 "(void))"
 "(let-values(((temp47_1)((read-config-coerce config_24) #f mod-path-wrapped_0 #f))"
@@ -55314,7 +55346,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in67_1) in_54)"
 "((config68_1) config_51)"
-"                                         ((temp69_2) \"expected a single space after `~a`\")"
+"                                         ((temp69_1) \"expected a single space after `~a`\")"
 "((extend-str70_0) extend-str_1))"
 "(reader-error12.1"
 " #f"
@@ -55327,20 +55359,20 @@ static const char *startup_source =
 " #f"
 " in67_1"
 " config68_1"
-" temp69_2"
+" temp69_1"
 "(list extend-str70_0)))))"
 "(let-values(((extend-str61_0) extend-str_1)"
 "((read-recur62_0) read-recur_1)"
 "((in63_1) in_54)"
 "((config64_1) config_51)"
-"((temp65_3) '|#lang|)"
+"((temp65_4) '|#lang|)"
 "((get-info?66_0) get-info?_0))"
 "(read-lang29.1"
 " get-info?66_0"
 " #t"
 " #f"
 " #f"
-" temp65_3"
+" temp65_4"
 " extend-str61_0"
 " read-recur62_0"
 " in63_1"
@@ -55368,7 +55400,7 @@ static const char *startup_source =
 "((temp80_3)"
 "(if(char? c_102)(string dispatch-c_4 '#\\! c_102)(string dispatch-c_4 '#\\!))))"
 "(bad-syntax-error20.1 #f #f in78_0 config79_0 temp80_3))))"
-"(let-values(((temp71_2)(string dispatch-c_4 '#\\!))"
+"(let-values(((temp71_3)(string dispatch-c_4 '#\\!))"
 "((read-recur72_0) read-recur_2)"
 "((in73_0) in_55)"
 "((config74_0) config_52)"
@@ -55381,7 +55413,7 @@ static const char *startup_source =
 " c75_0"
 " #t"
 " temp76_1"
-" temp71_2"
+" temp71_3"
 " read-recur72_0"
 " in73_0"
 " config74_0)))))))))))))"
@@ -55625,15 +55657,15 @@ static const char *startup_source =
 "(lambda(c_104)"
 "(begin"
 "(if(<(char->integer c_104) 128)"
-"(let-values(((or-part_292)(char-alphabetic? c_104)))"
-"(if or-part_292"
-" or-part_292"
-"(let-values(((or-part_177)(char-numeric? c_104)))"
-"(if or-part_177"
-" or-part_177"
-"(let-values(((or-part_300)(char=? '#\\- c_104)))"
-"(if or-part_300"
-" or-part_300"
+"(let-values(((or-part_293)(char-alphabetic? c_104)))"
+"(if or-part_293"
+" or-part_293"
+"(let-values(((or-part_178)(char-numeric? c_104)))"
+"(if or-part_178"
+" or-part_178"
+"(let-values(((or-part_301)(char=? '#\\- c_104)))"
+"(if or-part_301"
+" or-part_301"
 "(let-values(((or-part_171)(char=? '#\\+ c_104)))"
 "(if or-part_171 or-part_171(char=? '#\\_ c_104)))))))))"
 " #f))))"
@@ -56008,26 +56040,26 @@ static const char *startup_source =
 " #t"
 " wrap63_0"
 " #t)))))))"
-"(let-values(((v_248)(read-one init-c_15 in_12 config_57)))"
-"(if(if(let-values(((or-part_305)(not recursive?_0)))"
-"(if or-part_305 or-part_305 local-graph?_1))"
+"(let-values(((v_250)(read-one init-c_15 in_12 config_57)))"
+"(if(if(let-values(((or-part_306)(not recursive?_0)))"
+"(if or-part_306 or-part_306 local-graph?_1))"
 "(read-config-state-graph(read-config-st config_57))"
 " #f)"
 "(let-values()"
 "(catch-and-reraise-as-reader/proc"
 " #f"
 " config_57"
-"(lambda()(make-reader-graph v_248))))"
+"(lambda()(make-reader-graph v_250))))"
 "(if(if recursive?_0"
 "(if(not local-graph?_1)"
 "(if(not for-syntax?_9)"
-"(if(not(eof-object? v_248))(not(1/special-comment? v_248)) #f)"
+"(if(not(eof-object? v_250))(not(1/special-comment? v_250)) #f)"
 " #f)"
 " #f)"
 " #f)"
 "(let-values()"
-"(begin(get-graph-hash config_57)(make-placeholder v_248)))"
-"(let-values() v_248))))))))))))))))))))))))"
+"(begin(get-graph-hash config_57)(make-placeholder v_250)))"
+"(let-values() v_250))))))))))))))))))))))))"
 "(define-values"
 "(read-language49.1)"
 "(lambda(coerce38_0"
@@ -56059,8 +56091,8 @@ static const char *startup_source =
 "(let-values(((coerce-key_3)(if coerce-key46_0 coerce-key39_0 #f)))"
 "(let-values()"
 "(let-values(((config_59)"
-"(let-values(((temp70_4) #f)"
-"((temp71_3) #f)"
+"(let-values(((temp70_3) #f)"
+"((temp71_4) #f)"
 "((for-syntax?72_0) for-syntax?_10)"
 "((wrap73_0) wrap_8)"
 "((read-compiled74_0) read-compiled_3)"
@@ -56081,11 +56113,11 @@ static const char *startup_source =
 " #f"
 " module-declared?76_0"
 " #t"
-" temp71_3"
+" temp71_4"
 " #t"
 " read-compiled74_0"
 " #t"
-" temp70_4"
+" temp70_3"
 " #t"
 " #f"
 " #f"
@@ -56102,12 +56134,12 @@ static const char *startup_source =
 "(if(check-parameter 1/read-cdot config_60)"
 "(let-values()"
 "(let-values(((line_11 col_10 pos_123)(port-next-location in_62)))"
-"(let-values(((v_249)(read-undotted init-c_16 in_62 config_60)))"
-"(if(1/special-comment? v_249)"
-"(let-values() v_249)"
+"(let-values(((v_251)(read-undotted init-c_16 in_62 config_60)))"
+"(if(1/special-comment? v_251)"
+"(let-values() v_251)"
 "(let-values()"
 "((letrec-values(((loop_118)"
-"(lambda(v_250)"
+"(lambda(v_252)"
 "(begin"
 " 'loop"
 "(let-values(((c_106)"
@@ -56123,9 +56155,9 @@ static const char *startup_source =
 "(if(eq? c_107 'special)(special1.1 'special) c_107)))))"
 "(let-values(((ec_9)(effective-char c_106 config_60)))"
 "(if(not(char? ec_9))"
-"(let-values() v_250)"
+"(let-values() v_252)"
 "(if(char-whitespace? ec_9)"
-"(let-values()(begin(consume-char in_62 c_106)(loop_118 v_250)))"
+"(let-values()(begin(consume-char in_62 c_106)(loop_118 v_252)))"
 "(if(char=? ec_9 '#\\.)"
 "(let-values()"
 "(let-values(((dot-line_2 dot-col_2 dot-pos_5)"
@@ -56145,13 +56177,13 @@ static const char *startup_source =
 "(read-undotted #f in_62 config_60)))"
 "(loop_118"
 "(wrap"
-"(list cdot_0 v_250 post-v_0)"
+"(list cdot_0 v_252 post-v_0)"
 " in_62"
 "(reading-at config_60 line_11 col_10 pos_123)"
 " '#\\.)))))))"
-"(let-values() v_250))))))))))"
+"(let-values() v_252))))))))))"
 " loop_118)"
-" v_249))))))"
+" v_251))))))"
 "(void))))))"
 "(define-values"
 "(read-undotted)"
@@ -56163,10 +56195,10 @@ static const char *startup_source =
 "(let-values() eof)"
 "(if(not(char? c_108))"
 "(let-values()"
-"(let-values(((v_251)(special-value c_108)))"
-"(if(1/special-comment? v_251)"
-"(let-values()(if(read-config-keep-comment? config_55) v_251(read-undotted #f in_60 config_55)))"
-"(let-values()(coerce v_251 in_60(reading-at config_55 line_12 col_11 pos_124))))))"
+"(let-values(((v_253)(special-value c_108)))"
+"(if(1/special-comment? v_253)"
+"(let-values()(if(read-config-keep-comment? config_55) v_253(read-undotted #f in_60 config_55)))"
+"(let-values()(coerce v_253 in_60(reading-at config_55 line_12 col_11 pos_124))))))"
 "(let-values(((c2_8)(readtable-handler config_55 c_108)))"
 "(if c2_8"
 "((lambda(handler_3)"
@@ -56240,14 +56272,14 @@ static const char *startup_source =
 "(if(unsafe-fx< index_4 2)"
 "(if(unsafe-fx< index_4 1)"
 "(let-values()"
-"(let-values(((v_252)"
+"(let-values(((v_254)"
 "(let-values(((c79_1) c_108)"
 "((in80_1) in_60)"
 "((r-config81_0) r-config_0)"
 "((temp82_5)"
-"(if(let-values(((or-part_326)(eq? c_108 ec_10)))"
-"(if or-part_326"
-" or-part_326"
+"(if(let-values(((or-part_327)(eq? c_108 ec_10)))"
+"(if or-part_327"
+" or-part_327"
 "(if(<(char->integer ec_10) 128)"
 "(char-numeric? ec_10)"
 " #f)))"
@@ -56261,7 +56293,7 @@ static const char *startup_source =
 " c79_1"
 " in80_1"
 " r-config81_0))))"
-"(retry-special-comment v_252 in_60 config_55)))"
+"(retry-special-comment v_254 in_60 config_55)))"
 "(let-values()(read-dispatch c_108 in_60 r-config_0 config_55)))"
 "(if(unsafe-fx< index_4 3)"
 "                                    (let-values () (read-quote read-one 'quote \"quoting \\\"'\\\"\" c_108 in_60 r-config_0))"
@@ -56498,10 +56530,10 @@ static const char *startup_source =
 "(list c120_0))))))))"
 "(if(unsafe-fx< index_4 10)"
 "(let-values()"
-"(if(let-values(((or-part_360)"
+"(if(let-values(((or-part_276)"
 "(check-parameter 1/read-curly-brace-as-paren config_55)))"
-"(if or-part_360"
-" or-part_360"
+"(if or-part_276"
+" or-part_276"
 "(check-parameter 1/read-curly-brace-with-tag config_55)))"
 "(let-values()"
 "(wrap"
@@ -56552,10 +56584,10 @@ static const char *startup_source =
 "(list c131_0))))))"
 "(if(unsafe-fx< index_4 11)"
 "(let-values()"
-"(if(let-values(((or-part_361)"
+"(if(let-values(((or-part_360)"
 "(check-parameter 1/read-curly-brace-as-paren config_55)))"
-"(if or-part_361"
-" or-part_361"
+"(if or-part_360"
+" or-part_360"
 "(check-parameter 1/read-curly-brace-with-tag config_55)))"
 "(let-values()"
 "(let-values(((in132_0) in_60)"
@@ -56643,9 +56675,9 @@ static const char *startup_source =
 "(let-values(((line_13)(read-config-line config_61)))"
 "(let-values(((col_12)(read-config-col config_61)))"
 "(let-values(((pos_125)(read-config-pos config_61)))"
-"(let-values(((v_148)"
+"(let-values(((v_150)"
 "(readtable-apply handler_4 c_110 in_65 config_61 line_13 col_12 pos_125)))"
-"(retry-special-comment v_148 in_65 orig-config_0))))))"
+"(retry-special-comment v_150 in_65 orig-config_0))))))"
 " c3_9)"
 "(let-values()"
 "(let-values()"
@@ -57254,11 +57286,11 @@ static const char *startup_source =
 "(list dispatch-c279_0)))))))))))))))))))))))))"
 "(define-values"
 "(retry-special-comment)"
-"(lambda(v_253 in_74 config_62)"
+"(lambda(v_255 in_74 config_62)"
 "(begin"
-"(if(1/special-comment? v_253)"
-"(let-values()(if(read-config-keep-comment? config_62) v_253(read-undotted #f in_74 config_62)))"
-"(let-values() v_253)))))"
+"(if(1/special-comment? v_255)"
+"(let-values()(if(read-config-keep-comment? config_62) v_255(read-undotted #f in_74 config_62)))"
+"(let-values() v_255)))))"
 "(define-values"
 "(1/module-declared?)"
 "(let-values(((module-declared?4_0)"
@@ -57298,11 +57330,11 @@ static const char *startup_source =
 "(void)"
 "(let-values()(raise-argument-error 'module-predefined? module-reference-str mod_7)))"
 "(values))))"
-"(let-values(((ns_114)(1/current-namespace)))"
-"(let-values(((name_69)"
+"(let-values(((ns_113)(1/current-namespace)))"
+"(let-values(((name_68)"
 "(let-values(((mod39_0) mod_7)((temp40_4) #f))"
 "(reference->resolved-module-path32.1 temp40_4 mod39_0))))"
-"(let-values(((m_24)(namespace->module ns_114 name_69)))"
+"(let-values(((m_24)(namespace->module ns_113 name_68)))"
 "(if m_24(module-is-predefined? m_24) #f))))))))))"
 "(define-values"
 "(module->)"
@@ -57389,7 +57421,7 @@ static const char *startup_source =
 "(begin"
 " 'module->namespace21"
 "(let-values(((mod_18) mod20_0))"
-"(let-values(((ns_115)(if ns19_1 ns18_2(1/current-namespace))))"
+"(let-values(((ns_114)(if ns19_1 ns18_2(1/current-namespace))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -57405,19 +57437,19 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(1/namespace? ns_115)"
+"(if(1/namespace? ns_114)"
 "(void)"
 "(let-values()"
-"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_115)))"
+"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_114)))"
 "(values))))"
-"(let-values(((name_70)"
-"(let-values(((mod49_0) mod_18)((temp50_4) #t))"
-"(reference->resolved-module-path32.1 temp50_4 mod49_0))))"
-"(let-values(((phase_131)(namespace-phase ns_115)))"
+"(let-values(((name_69)"
+"(let-values(((mod49_0) mod_18)((temp50_3) #t))"
+"(reference->resolved-module-path32.1 temp50_3 mod49_0))))"
+"(let-values(((phase_130)(namespace-phase ns_114)))"
 "(let-values(((m-ns_17)"
-"(let-values(((ns51_1) ns_115)"
-"((name52_0) name_70)"
-"((phase53_0) phase_131))"
+"(let-values(((ns51_1) ns_114)"
+"((name52_0) name_69)"
+"((phase53_0) phase_130))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -57433,12 +57465,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(namespace->module/complain 'module->namespace ns_115 name_70)"
+"(namespace->module/complain 'module->namespace ns_114 name_69)"
 "(raise-arguments-error"
 " 'module->namespace"
 "                                                 \"module not instantiated in the current namespace\""
 "                                                 \"name\""
-" name_70))))"
+" name_69))))"
 "(if(inspector-superior?"
 "(current-code-inspector)"
 "(namespace-inspector m-ns_17))"
@@ -57448,7 +57480,7 @@ static const char *startup_source =
 " 'module->namespace"
 "                                               \"current code inspector cannot access namespace of module\""
 "                                               \"module name\""
-" name_70)))"
+" name_69)))"
 "(if(namespace-get-root-expand-ctx m-ns_17)"
 "(void)"
 "(let-values()"
@@ -57456,9 +57488,9 @@ static const char *startup_source =
 " m-ns_17"
 "(let-values(((temp54_4)(namespace-mpi m-ns_17)))"
 "(make-root-expand-context13.1 #f #f #f #f #f #f #f #f temp54_4)))))"
-"(let-values(((ns46_1) ns_115)"
+"(let-values(((ns46_1) ns_114)"
 "((temp47_2)(namespace-mpi m-ns_17))"
-"((phase48_1) phase_131))"
+"((phase48_1) phase_130))"
 "(namespace-module-make-available!112.1 #f #f ns46_1 temp47_2 phase48_1))"
 " m-ns_17)))))))))))))))"
 "(case-lambda"
@@ -57472,7 +57504,7 @@ static const char *startup_source =
 " 'namespace-unprotect-module27"
 "(let-values(((insp_12) insp25_0))"
 "(let-values(((mod_21) mod26_0))"
-"(let-values(((ns_116)(if ns24_1 ns23_0(1/current-namespace))))"
+"(let-values(((ns_115)(if ns24_1 ns23_0(1/current-namespace))))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -57498,22 +57530,22 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(1/namespace? ns_116)"
+"(if(1/namespace? ns_115)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'namespace-unprotect-module"
 "                                                         \"namespace?\""
-" ns_116)))"
+" ns_115)))"
 "(values))))"
-"(let-values(((name_71)"
-"(let-values(((mod56_0) mod_21)((temp57_0) #f))"
-"(reference->resolved-module-path32.1 temp57_0 mod56_0))))"
-"(let-values(((phase_138)(namespace-phase ns_116)))"
+"(let-values(((name_70)"
+"(let-values(((mod56_0) mod_21)((temp57_1) #f))"
+"(reference->resolved-module-path32.1 temp57_1 mod56_0))))"
+"(let-values(((phase_137)(namespace-phase ns_115)))"
 "(let-values(((m-ns_15)"
-"(let-values(((ns58_0) ns_116)"
-"((name59_0) name_71)"
-"((phase60_0) phase_138))"
+"(let-values(((ns58_0) ns_115)"
+"((name59_0) name_70)"
+"((phase60_0) phase_137))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -57532,7 +57564,7 @@ static const char *startup_source =
 " 'namespace-unprotect-module"
 "                                                   \"module not instantiated\""
 "                                                   \"module name\""
-" name_71)))"
+" name_70)))"
 "(if(inspector-superior? insp_12(namespace-inspector m-ns_15))"
 "(let-values()"
 "(set-namespace-inspector!"
@@ -57544,21 +57576,21 @@ static const char *startup_source =
 "((insp_19 mod_23 ns23_1)(namespace-unprotect-module27_0 insp_19 mod_23 ns23_1 #t)))))"
 "(define-values"
 "(namespace->module/complain)"
-"(lambda(who_36 ns_117 name_72)"
+"(lambda(who_36 ns_116 name_71)"
 "(begin"
-"(let-values(((or-part_209)(namespace->module ns_117 name_72)))"
-"(if or-part_209"
-" or-part_209"
-"          (raise-arguments-error who_36 \"unknown module in the current namespace\" \"name\" name_72))))))"
+"(let-values(((or-part_210)(namespace->module ns_116 name_71)))"
+"(if or-part_210"
+" or-part_210"
+"          (raise-arguments-error who_36 \"unknown module in the current namespace\" \"name\" name_71))))))"
 "(define-values"
 "(module-reference?)"
 "(lambda(mod_24)"
 "(begin"
-"(let-values(((or-part_249)(1/module-path? mod_24)))"
-"(if or-part_249"
-" or-part_249"
-"(let-values(((or-part_362)(1/module-path-index? mod_24)))"
-"(if or-part_362 or-part_362(1/resolved-module-path? mod_24))))))))"
+"(let-values(((or-part_250)(1/module-path? mod_24)))"
+"(if or-part_250"
+" or-part_250"
+"(let-values(((or-part_361)(1/module-path-index? mod_24)))"
+"(if or-part_361 or-part_361(1/resolved-module-path? mod_24))))))))"
 " (define-values (module-reference-str) \"(or/c module-path? module-path-index? resolved-module-path?)\")"
 "(define-values"
 "(reference->resolved-module-path32.1)"
@@ -57724,8 +57756,8 @@ static const char *startup_source =
 "(read-to-syntax)"
 "(lambda(s-exp_4 srcloc_11 rep_1)"
 "(begin"
-"(let-values(((the-struct_88) empty-syntax))"
-"(if(syntax?$1 the-struct_88)"
+"(let-values(((the-struct_89) empty-syntax))"
+"(if(syntax?$1 the-struct_89)"
 "(let-values(((content63_0)(datum-intern-literal s-exp_4))"
 "((srcloc64_0) srcloc_11)"
 "((props65_0)"
@@ -57737,14 +57769,14 @@ static const char *startup_source =
 "(let-values() original-props))))))"
 "(syntax1.1"
 " content63_0"
-"(syntax-scopes the-struct_88)"
-"(syntax-shifted-multi-scopes the-struct_88)"
-"(syntax-scope-propagations+tamper the-struct_88)"
-"(syntax-mpi-shifts the-struct_88)"
+"(syntax-scopes the-struct_89)"
+"(syntax-shifted-multi-scopes the-struct_89)"
+"(syntax-scope-propagations+tamper the-struct_89)"
+"(syntax-mpi-shifts the-struct_89)"
 " srcloc64_0"
 " props65_0"
-"(syntax-inspector the-struct_88)))"
-"          (raise-argument-error 'struct-copy \"syntax?\" the-struct_88))))))"
+"(syntax-inspector the-struct_89)))"
+"          (raise-argument-error 'struct-copy \"syntax?\" the-struct_89))))))"
 "(define-values(original-props)(syntax-props(syntax-property$1 empty-syntax original-property-sym #t)))"
 "(define-values"
 "(original-square-props)"
@@ -57755,17 +57787,17 @@ static const char *startup_source =
 "(define-values(read-module-declared?)(lambda(mod-path_29)(begin(1/module-declared? mod-path_29 #t))))"
 "(define-values"
 "(read-coerce)"
-"(lambda(for-syntax?_12 v_254 srcloc_12)"
+"(lambda(for-syntax?_12 v_256 srcloc_12)"
 "(begin"
 "(if(not for-syntax?_12)"
-"(let-values()(if(syntax?$1 v_254)(let-values()(syntax->datum$1 v_254))(let-values() v_254)))"
-"(if(syntax?$1 v_254)"
-"(let-values() v_254)"
-"(if(list? v_254)"
+"(let-values()(if(syntax?$1 v_256)(let-values()(syntax->datum$1 v_256))(let-values() v_256)))"
+"(if(syntax?$1 v_256)"
+"(let-values() v_256)"
+"(if(list? v_256)"
 "(let-values()"
 "(read-to-syntax"
 "(reverse$1"
-"(let-values(((lst_270) v_254))"
+"(let-values(((lst_270) v_256))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -57793,13 +57825,13 @@ static const char *startup_source =
 " lst_270))))"
 " srcloc_12"
 " #f))"
-"(if(pair? v_254)"
+"(if(pair? v_256)"
 "(let-values()"
 "(read-to-syntax"
-"(cons(read-coerce #t(car v_254) srcloc_12)(read-coerce #t(cdr v_254) srcloc_12))"
+"(cons(read-coerce #t(car v_256) srcloc_12)(read-coerce #t(cdr v_256) srcloc_12))"
 " srcloc_12"
 " #f))"
-"(let-values()(read-to-syntax v_254 srcloc_12 #f)))))))))"
+"(let-values()(read-to-syntax v_256 srcloc_12 #f)))))))))"
 "(define-values"
 "(read-coerce-key)"
 "(lambda(for-syntax?_13 k_42)"
@@ -57955,14 +57987,14 @@ static const char *startup_source =
 "(void)"
 "                                      (let-values () (raise-argument-error 'read/recursive \"input-port?\" in_20)))"
 "(if((lambda(x_19)"
-"(let-values(((or-part_305)(not x_19)))"
-"(if or-part_305 or-part_305(char? x_19))))"
+"(let-values(((or-part_306)(not x_19)))"
+"(if or-part_306 or-part_306(char? x_19))))"
 " start_38)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'read/recursive \"(or/c char? #f)\" start_38)))"
 "(if((lambda(x_23)"
-"(let-values(((or-part_279)(not x_23)))"
-"(if or-part_279 or-part_279(1/readtable? x_23))))"
+"(let-values(((or-part_280)(not x_23)))"
+"(if or-part_280 or-part_280(1/readtable? x_23))))"
 " readtable_9)"
 "(void)"
 "(let-values()"
@@ -58007,9 +58039,9 @@ static const char *startup_source =
 " (define-values (read-language-fail-thunk) (lambda () (begin (error \"fail\"))))"
 "(define-values"
 "(declare-primitive-module!)"
-"(lambda(name_73 inst_7 in-ns_0 protected_0 cross-phase-persistent?_3)"
+"(lambda(name_72 inst_7 in-ns_0 protected_0 cross-phase-persistent?_3)"
 "(begin"
-"(let-values(((mpi_51)(1/module-path-index-join(list 'quote name_73) #f)))"
+"(let-values(((mpi_51)(1/module-path-index-join(list 'quote name_72) #f)))"
 "(let-values(((in-ns1_0) in-ns_0)"
 "((temp2_6)"
 "(let-values(((temp4_0)(1/current-module-declare-source))"
@@ -58172,7 +58204,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f)))"
-"((temp3_9)(substitute-module-declare-name name_73)))"
+"((temp3_9)(substitute-module-declare-name name_72)))"
 "(declare-module!58.1 #f #f in-ns1_0 temp2_6 temp3_9))))))"
 "(define-values"
 "(1/prop:exn:missing-module 1/exn:missing-module? 1/exn:missing-module-accessor)"
@@ -58233,13 +58265,13 @@ static const char *startup_source =
 "(1/current-module-path-for-load)"
 "(make-parameter"
 " #f"
-"(lambda(v_185)"
+"(lambda(v_187)"
 "(begin"
-"(if(let-values(((or-part_69)(not v_185)))"
+"(if(let-values(((or-part_69)(not v_187)))"
 "(if or-part_69"
 " or-part_69"
-"(let-values(((or-part_70)(1/module-path? v_185)))"
-"(if or-part_70 or-part_70(if(syntax?$1 v_185)(1/module-path?(syntax->datum$1 v_185)) #f)))))"
+"(let-values(((or-part_70)(1/module-path? v_187)))"
+"(if or-part_70 or-part_70(if(syntax?$1 v_187)(1/module-path?(syntax->datum$1 v_187)) #f)))))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -58248,11 +58280,11 @@ static const char *startup_source =
 "             \"(or/c module-path?\""
 "             \" (and/c syntax? (lambda (stx) (module-path? (syntax->datum stx))))\""
 "             \" #f)\")"
-" v_185)))"
-" v_185))))"
+" v_187)))"
+" v_187))))"
 "(define-values"
 "(maybe-raise-missing-module)"
-"(lambda(name_74 filename_0 pre_0 rel_0 post_0 errstr_0)"
+"(lambda(name_73 filename_0 pre_0 rel_0 post_0 errstr_0)"
 "(begin"
 "(let-values(((path_11)(1/current-module-path-for-load)))"
 "(if path_11"
@@ -58268,7 +58300,7 @@ static const char *startup_source =
 "                      \"  module path: ~a\\n\""
 "                      \"  path: ~a~a~a~a\\n\""
 "                      \"  system error: ~a\")"
-"(if(syntax-srcloc path_11)(srcloc->string(syntax-srcloc path_11)) name_74)"
+"(if(syntax-srcloc path_11)(srcloc->string(syntax-srcloc path_11)) name_73)"
 "(syntax->datum$1 path_11)"
 " filename_0"
 " pre_0"
@@ -58287,7 +58319,7 @@ static const char *startup_source =
 "                  \"  module path: ~a\\n\""
 "                  \"  path: ~a~a~a~a\\n\""
 "                  \"  system error: ~a\")"
-" name_74"
+" name_73"
 " path_11"
 " filename_0"
 " pre_0"
@@ -58308,12 +58340,12 @@ static const char *startup_source =
 "(let-values(((stop-ids_2) stop-ids5_0))"
 "(let-values(((intdefs_4)(if intdefs2_0 intdefs1_0 '())))"
 "(let-values()"
-"(let-values(((temp59_7) 'local-expand)"
-"((s60_1) s_2)"
-"((context61_0) context_10)"
-"((stop-ids62_0) stop-ids_2)"
-"((intdefs63_0) intdefs_4))"
-"(do-local-expand56.1"
+"(let-values(((temp61_4) 'local-expand)"
+"((s62_1) s_2)"
+"((context63_0) context_10)"
+"((stop-ids64_0) stop-ids_2)"
+"((intdefs65_0) intdefs_4))"
+"(do-local-expand58.1"
 " #f"
 " #f"
 " #f"
@@ -58326,11 +58358,13 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp59_7"
-" s60_1"
-" context61_0"
-" stop-ids62_0"
-" intdefs63_0"
+" #f"
+" #f"
+" temp61_4"
+" s62_1"
+" context63_0"
+" stop-ids64_0"
+" intdefs65_0"
 " #t)))))))))))"
 "(case-lambda"
 "((s_177 context_1 stop-ids_3)(begin 'local-expand(local-expand6_0 s_177 context_1 stop-ids_3 #f #f)))"
@@ -58347,19 +58381,21 @@ static const char *startup_source =
 "(let-values(((intdefs_5)(if intdefs10_0 intdefs8_0 '())))"
 "(let-values(((lift-key_4)(if lift-key11_0 lift-key9_0(generate-lift-key))))"
 "(let-values()"
-"(let-values(((temp64_4) 'local-expand)"
-"((s65_0) s_77)"
-"((context66_0) context_12)"
-"((stop-ids67_0) stop-ids_5)"
-"((intdefs68_0) intdefs_5)"
-"((temp69_3) #t)"
-"((lift-key70_0) lift-key_4))"
-"(do-local-expand56.1"
+"(let-values(((temp66_5) 'local-expand)"
+"((s67_0) s_77)"
+"((context68_0) context_12)"
+"((stop-ids69_0) stop-ids_5)"
+"((intdefs70_0) intdefs_5)"
+"((temp71_5) #t)"
+"((lift-key72_0) lift-key_4))"
+"(do-local-expand58.1"
 " #f"
 " #f"
-" temp69_3"
+" temp71_5"
 " #t"
-" lift-key70_0"
+" #f"
+" #f"
+" lift-key72_0"
 " #t"
 " #f"
 " #f"
@@ -58367,11 +58403,11 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp64_4"
-" s65_0"
-" context66_0"
-" stop-ids67_0"
-" intdefs68_0"
+" temp66_5"
+" s67_0"
+" context68_0"
+" stop-ids69_0"
+" intdefs70_0"
 " #t))))))))))))"
 "(case-lambda"
 "((s_85 context_13 stop-ids_6)"
@@ -58386,19 +58422,19 @@ static const char *startup_source =
 "(lambda(s19_1 context20_0 stop-ids21_0 intdefs17_0 intdefs18_0)"
 "(begin"
 " 'local-transformer-expand22"
-"(let-values(((s_491) s19_1))"
+"(let-values(((s_492) s19_1))"
 "(let-values(((context_16) context20_0))"
 "(let-values(((stop-ids_9) stop-ids21_0))"
 "(let-values(((intdefs_7)(if intdefs18_0 intdefs17_0 '())))"
 "(let-values()"
-"(let-values(((temp71_4) 'local-expand)"
-"((s72_0) s_491)"
-"((context73_0) context_16)"
-"((stop-ids74_0) stop-ids_9)"
-"((intdefs75_0) intdefs_7)"
-"((temp76_2) #t))"
-"(do-local-expand56.1"
-" temp76_2"
+"(let-values(((temp73_5) 'local-expand)"
+"((s74_0) s_492)"
+"((context75_0) context_16)"
+"((stop-ids76_0) stop-ids_9)"
+"((intdefs77_0) intdefs_7)"
+"((temp78_3) #t))"
+"(do-local-expand58.1"
+" temp78_3"
 " #t"
 " #f"
 " #f"
@@ -58410,43 +58446,47 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp71_4"
-" s72_0"
-" context73_0"
-" stop-ids74_0"
-" intdefs75_0"
+" #f"
+" #f"
+" temp73_5"
+" s74_0"
+" context75_0"
+" stop-ids76_0"
+" intdefs77_0"
 " #t)))))))))))"
 "(case-lambda"
-"((s_485 context_17 stop-ids_10)"
-"(begin 'local-transformer-expand(local-transformer-expand22_0 s_485 context_17 stop-ids_10 #f #f)))"
-"((s_492 context_18 stop-ids_11 intdefs17_1)"
-"(local-transformer-expand22_0 s_492 context_18 stop-ids_11 intdefs17_1 #t)))))"
+"((s_486 context_17 stop-ids_10)"
+"(begin 'local-transformer-expand(local-transformer-expand22_0 s_486 context_17 stop-ids_10 #f #f)))"
+"((s_493 context_18 stop-ids_11 intdefs17_1)"
+"(local-transformer-expand22_0 s_493 context_18 stop-ids_11 intdefs17_1 #t)))))"
 "(define-values"
 "(1/local-transformer-expand/capture-lifts)"
 "(let-values(((local-transformer-expand/capture-lifts31_0)"
 "(lambda(s28_1 context29_0 stop-ids30_0 intdefs24_0 lift-key25_0 intdefs26_0 lift-key27_0)"
 "(begin"
 " 'local-transformer-expand/capture-lifts31"
-"(let-values(((s_482) s28_1))"
+"(let-values(((s_483) s28_1))"
 "(let-values(((context_19) context29_0))"
 "(let-values(((stop-ids_12) stop-ids30_0))"
 "(let-values(((intdefs_8)(if intdefs26_0 intdefs24_0 '())))"
 "(let-values(((lift-key_5)(if lift-key27_0 lift-key25_0(generate-lift-key))))"
 "(let-values()"
-"(let-values(((temp77_2) 'local-expand)"
-"((s78_0) s_482)"
-"((context79_0) context_19)"
-"((stop-ids80_0) stop-ids_12)"
-"((intdefs81_0) intdefs_8)"
-"((temp82_6) #t)"
-"((temp83_2) #t)"
-"((lift-key84_0) lift-key_5))"
-"(do-local-expand56.1"
-" temp82_6"
+"(let-values(((temp79_2) 'local-expand)"
+"((s80_1) s_483)"
+"((context81_0) context_19)"
+"((stop-ids82_0) stop-ids_12)"
+"((intdefs83_0) intdefs_8)"
+"((temp84_1) #t)"
+"((temp85_3) #t)"
+"((lift-key86_0) lift-key_5))"
+"(do-local-expand58.1"
+" temp84_1"
 " #t"
-" temp83_2"
+" temp85_3"
 " #t"
-" lift-key84_0"
+" #f"
+" #f"
+" lift-key86_0"
 " #t"
 " #f"
 " #f"
@@ -58454,17 +58494,17 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp77_2"
-" s78_0"
-" context79_0"
-" stop-ids80_0"
-" intdefs81_0"
+" temp79_2"
+" s80_1"
+" context81_0"
+" stop-ids82_0"
+" intdefs83_0"
 " #t))))))))))))"
 "(case-lambda"
-"((s_493 context_20 stop-ids_13)"
+"((s_494 context_20 stop-ids_13)"
 "(begin"
 " 'local-transformer-expand/capture-lifts"
-"(local-transformer-expand/capture-lifts31_0 s_493 context_20 stop-ids_13 #f #f #f #f)))"
+"(local-transformer-expand/capture-lifts31_0 s_494 context_20 stop-ids_13 #f #f #f #f)))"
 "((s_25 context_21 stop-ids_14 intdefs_9 lift-key25_1)"
 "(local-transformer-expand/capture-lifts31_0 s_25 context_21 stop-ids_14 intdefs_9 lift-key25_1 #t #t))"
 "((s_90 context_22 stop-ids_15 intdefs24_1)"
@@ -58479,34 +58519,37 @@ static const char *startup_source =
 "(let-values(((opaque-only?_0)(if opaque-only?34_0 opaque-only?33_0 #f)))"
 "(let-values()"
 "(let-values(((exp-s_12)"
-"(let-values(((temp85_3) 'syntax-local-expand-expression)"
-"((s86_1) s_173)"
-"((temp87_4) 'expression)"
-"((null88_0) null)"
-"((temp89_3) #f)"
-"((opaque-only?90_0) opaque-only?_0)"
-"((temp91_1) #t)"
-"((temp92_3) #t))"
-"(do-local-expand56.1"
+"(let-values(((temp87_4) 'syntax-local-expand-expression)"
+"((s88_0) s_173)"
+"((temp89_3) 'expression)"
+"((null90_0) null)"
+"((temp91_1) #f)"
+"((opaque-only?92_0) opaque-only?_0)"
+"((temp93_3) #t)"
+"((temp94_3) #t)"
+"((temp95_1) #f))"
+"(do-local-expand58.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" #f"
-" #f"
-" temp91_1"
+" temp95_1"
 " #t"
-" opaque-only?90_0"
+" #f"
+" #f"
+" temp93_3"
 " #t"
-" temp92_3"
+" opaque-only?92_0"
+" #t"
+" temp94_3"
 " #t"
-" temp85_3"
-" s86_1"
 " temp87_4"
-" null88_0"
+" s88_0"
 " temp89_3"
+" null90_0"
+" temp91_1"
 " #t))))"
-"(let-values(((ctx_70)(let-values()(get-current-expand-context17.1 #f #f #f #f))))"
+"(let-values(((ctx_72)(let-values()(get-current-expand-context17.1 #f #f #f #f))))"
 "(let-values(((ae_1)"
 "(flip-introduction-scopes"
 "(datum->syntax$1"
@@ -58514,70 +58557,73 @@ static const char *startup_source =
 "(already-expanded1.1"
 "(if(parsed? exp-s_12)"
 " exp-s_12"
-"(flip-introduction-scopes exp-s_12 ctx_70))"
-"(expand-context-binding-layer ctx_70)))"
-" ctx_70)))"
+"(flip-introduction-scopes exp-s_12 ctx_72))"
+"(expand-context-binding-layer ctx_72)))"
+" ctx_72)))"
 "(begin"
-"(let-values(((obs_61)(expand-context-observer ctx_70)))"
-"(if obs_61"
-"(let-values()(let-values()(call-expand-observe obs_61 'opaque-expr ae_1)))"
-"(void)))"
-"(let-values(((obs_35)(expand-context-observer ctx_70)))"
+"(let-values(((obs_35)(expand-context-observer ctx_72)))"
 "(if obs_35"
-"(let-values()(let-values()(call-expand-observe obs_35 'exit-local exp-s_12)))"
+"(let-values()(let-values()(call-expand-observe obs_35 'opaque-expr ae_1)))"
+"(void)))"
+"(let-values(((obs_36)(expand-context-observer ctx_72)))"
+"(if obs_36"
+"(let-values()(let-values()(call-expand-observe obs_36 'exit-local exp-s_12)))"
 "(void)))"
 "(values(if(not opaque-only?_0) exp-s_12 #f) ae_1))))))))))))"
 "(case-lambda"
-"((s_483)(begin 'syntax-local-expand-expression(syntax-local-expand-expression36_0 s_483 #f #f)))"
-"((s_26 opaque-only?33_1)(syntax-local-expand-expression36_0 s_26 opaque-only?33_1 #t)))))"
+"((s_26)(begin 'syntax-local-expand-expression(syntax-local-expand-expression36_0 s_26 #f #f)))"
+"((s_84 opaque-only?33_1)(syntax-local-expand-expression36_0 s_84 opaque-only?33_1 #t)))))"
 "(define-values"
-"(do-local-expand56.1)"
+"(do-local-expand58.1)"
 "(lambda(as-transformer?39_0"
-" as-transformer?45_0"
+" as-transformer?46_0"
 " capture-lifts?38_0"
-" capture-lifts?44_0"
-" lift-key41_0"
-" lift-key47_0"
-" skip-log-exit?43_0"
-" skip-log-exit?49_0"
+" capture-lifts?45_0"
+" keep-#%expression?41_0"
+" keep-#%expression?48_0"
+" lift-key42_0"
+" lift-key49_0"
+" skip-log-exit?44_0"
+" skip-log-exit?51_0"
 " to-parsed-ok?40_0"
-" to-parsed-ok?46_0"
-" track-to-be-defined?42_1"
-" track-to-be-defined?48_0"
-" who52_1"
-" s-or-s-exp53_0"
-" context54_0"
-" stop-ids55_0"
-" intdefs50_0"
-" intdefs51_0)"
+" to-parsed-ok?47_0"
+" track-to-be-defined?43_1"
+" track-to-be-defined?50_0"
+" who54_0"
+" s-or-s-exp55_0"
+" context56_0"
+" stop-ids57_0"
+" intdefs52_0"
+" intdefs53_0)"
 "(begin"
-" 'do-local-expand56"
-"(let-values(((who_37) who52_1))"
-"(let-values(((s-or-s-exp_0) s-or-s-exp53_0))"
-"(let-values(((context_23) context54_0))"
-"(let-values(((stop-ids_16) stop-ids55_0))"
-"(let-values(((intdefs_10)(if intdefs51_0 intdefs50_0 '())))"
-"(let-values(((capture-lifts?_0)(if capture-lifts?44_0 capture-lifts?38_0 #f)))"
-"(let-values(((as-transformer?_6)(if as-transformer?45_0 as-transformer?39_0 #f)))"
-"(let-values(((to-parsed-ok?_1)(if to-parsed-ok?46_0 to-parsed-ok?40_0 #f)))"
+" 'do-local-expand58"
+"(let-values(((who_37) who54_0))"
+"(let-values(((s-or-s-exp_0) s-or-s-exp55_0))"
+"(let-values(((context_23) context56_0))"
+"(let-values(((stop-ids_16) stop-ids57_0))"
+"(let-values(((intdefs_10)(if intdefs53_0 intdefs52_0 '())))"
+"(let-values(((capture-lifts?_0)(if capture-lifts?45_0 capture-lifts?38_0 #f)))"
+"(let-values(((as-transformer?_6)(if as-transformer?46_0 as-transformer?39_0 #f)))"
+"(let-values(((to-parsed-ok?_1)(if to-parsed-ok?47_0 to-parsed-ok?40_0 #f)))"
+"(let-values(((keep-#%expression?_2)(if keep-#%expression?48_0 keep-#%expression?41_0 #t)))"
 "(let-values(((lift-key_6)"
-"(if lift-key47_0"
-" lift-key41_0"
-"(if(let-values(((or-part_363) capture-lifts?_0))"
-"(if or-part_363 or-part_363 as-transformer?_6))"
+"(if lift-key49_0"
+" lift-key42_0"
+"(if(let-values(((or-part_45) capture-lifts?_0))"
+"(if or-part_45 or-part_45 as-transformer?_6))"
 "(generate-lift-key)"
 " #f))))"
 "(let-values(((track-to-be-defined?_1)"
-"(if track-to-be-defined?48_0 track-to-be-defined?42_1 #f)))"
-"(let-values(((skip-log-exit?_0)(if skip-log-exit?49_0 skip-log-exit?43_0 #f)))"
+"(if track-to-be-defined?50_0 track-to-be-defined?43_1 #f)))"
+"(let-values(((skip-log-exit?_0)(if skip-log-exit?51_0 skip-log-exit?44_0 #f)))"
 "(let-values()"
 "(let-values()"
-"(let-values(((s_419)(datum->syntax$1 #f s-or-s-exp_0)))"
+"(let-values(((s_495)(datum->syntax$1 #f s-or-s-exp_0)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_166)(list? context_23)))"
-"(if or-part_166"
-" or-part_166"
+"(if(let-values(((or-part_170)(list? context_23)))"
+"(if or-part_170"
+" or-part_170"
 "(memq"
 " context_23"
 "(if as-transformer?_6"
@@ -58588,15 +58634,15 @@ static const char *startup_source =
 "(raise-argument-error"
 " who_37"
 "(if as-transformer?_6"
-"                                                         \"(or/c 'expression 'top-level list?)\""
-"                                                         \"(or/c 'expression 'top-level 'module 'module-begin list?)\")"
+"                                                           \"(or/c 'expression 'top-level list?)\""
+"                                                           \"(or/c 'expression 'top-level 'module 'module-begin list?)\")"
 " context_23)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_167)(not stop-ids_16)))"
-"(if or-part_167"
-" or-part_167"
+"(if(let-values(((or-part_362)(not stop-ids_16)))"
+"(if or-part_362"
+" or-part_362"
 "(if(list? stop-ids_16)"
 "(andmap2 identifier? stop-ids_16)"
 " #f)))"
@@ -58604,7 +58650,7 @@ static const char *startup_source =
 "(let-values()"
 "(raise-argument-error"
 " who_37"
-"                                                         \"(or/c (listof identifier?) #f)\""
+"                                                           \"(or/c (listof identifier?) #f)\""
 " stop-ids_16)))"
 "(values))))"
 "(let-values((()"
@@ -58617,88 +58663,102 @@ static const char *startup_source =
 " intdefs-or-false?-string"
 " intdefs_10)))"
 "(values))))"
-"(let-values(((ctx_71)"
-"(let-values(((who93_0) who_37))"
-"(get-current-expand-context17.1 #f #f who93_0 #t))))"
-"(let-values(((phase_143)"
+"(let-values(((ctx_73)"
+"(let-values(((who96_0) who_37))"
+"(get-current-expand-context17.1 #f #f who96_0 #t))))"
+"(let-values(((phase_142)"
 "(if as-transformer?_6"
-"(add1(expand-context-phase ctx_71))"
-"(expand-context-phase ctx_71))))"
+"(add1(expand-context-phase ctx_73))"
+"(expand-context-phase ctx_73))))"
 "(let-values(((local-ctx_0)"
-"(let-values(((ctx94_0) ctx_71)"
-"((context95_0) context_23)"
-"((phase96_0) phase_143)"
-"((intdefs97_0) intdefs_10)"
-"((stop-ids98_0) stop-ids_16)"
-"((to-parsed-ok?99_0) to-parsed-ok?_1)"
-"((track-to-be-defined?100_0)"
+"(let-values(((ctx97_0) ctx_73)"
+"((context98_1) context_23)"
+"((phase99_0) phase_142)"
+"((intdefs100_0) intdefs_10)"
+"((stop-ids101_0) stop-ids_16)"
+"((to-parsed-ok?102_0) to-parsed-ok?_1)"
+"((temp103_1)"
+"(let-values(((or-part_363)"
+" keep-#%expression?_2))"
+"(if or-part_363"
+" or-part_363"
+"(if(expand-context-in-local-expand?"
+" ctx_73)"
+"(expand-context-keep-#%expression?"
+" ctx_73)"
+" #f))))"
+"((track-to-be-defined?104_0)"
 " track-to-be-defined?_1))"
-"(make-local-expand-context44.1"
-" context95_0"
-" intdefs97_0"
-" phase96_0"
+"(make-local-expand-context46.1"
+" context98_1"
+" intdefs100_0"
+" temp103_1"
 " #t"
-" stop-ids98_0"
+" phase99_0"
 " #t"
-" to-parsed-ok?99_0"
+" stop-ids101_0"
 " #t"
-" track-to-be-defined?100_0"
+" to-parsed-ok?102_0"
 " #t"
-" ctx94_0))))"
+" track-to-be-defined?104_0"
+" #t"
+" ctx97_0))))"
 "(let-values((()"
 "(begin"
 "(namespace-visit-available-modules!"
-"(expand-context-namespace ctx_71)"
-" phase_143)"
+"(expand-context-namespace ctx_73)"
+" phase_142)"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_62)"
+"(let-values(((obs_61)"
 "(expand-context-observer local-ctx_0)))"
-"(if obs_62"
+"(if obs_61"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_62"
+" obs_61"
 " 'enter-local"
-" s_419)))"
+" s_495)))"
 "(void)))"
 "(values))))"
 "(let-values(((input-s_1)"
-"(let-values(((temp101_4)"
-"(flip-introduction-scopes s_419 ctx_71))"
-"((intdefs102_0) intdefs_10))"
+"(let-values(((temp105_4)"
+"(flip-introduction-scopes s_495 ctx_73))"
+"((intdefs106_0) intdefs_10))"
 "(add-intdef-scopes28.1"
 " #f"
 " #f"
 " #f"
 " #f"
-" temp101_4"
-" intdefs102_0))))"
+" temp105_4"
+" intdefs106_0))))"
 "(let-values((()"
 "(begin"
 "(if as-transformer?_6"
 "(let-values()"
+"(let-values(((obs_62)"
+"(expand-context-observer"
+" local-ctx_0)))"
+"(if obs_62"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_62"
+" 'phase-up)))"
+"(void))))"
+"(void))"
+"(values))))"
+"(let-values((()"
+"(begin"
 "(let-values(((obs_63)"
 "(expand-context-observer"
 " local-ctx_0)))"
 "(if obs_63"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_63 'phase-up)))"
-"(void))))"
-"(void))"
-"(values))))"
-"(let-values((()"
-"(begin"
-"(let-values(((obs_64)"
-"(expand-context-observer"
-" local-ctx_0)))"
-"(if obs_64"
-"(let-values()"
-"(let-values()"
 "(call-expand-observe"
-" obs_64"
+" obs_63"
 " 'local-pre"
 " input-s_1)))"
 "(void)))"
@@ -58707,14 +58767,14 @@ static const char *startup_source =
 "(begin"
 "(if stop-ids_16"
 "(let-values()"
-"(let-values(((obs_65)"
+"(let-values(((obs_64)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_65"
+"(if obs_64"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_65"
+" obs_64"
 " 'start)))"
 "(void))))"
 "(void))"
@@ -58722,78 +58782,84 @@ static const char *startup_source =
 "(let-values(((output-s_0)"
 "(if(if as-transformer?_6 capture-lifts?_0 #f)"
 "(let-values()"
-"(let-values(((input-s103_0) input-s_1)"
-"((local-ctx104_0) local-ctx_0)"
-"((context105_0) context_23)"
-"((temp106_4) #f)"
-"((temp107_2) #t)"
-"((lift-key108_0) lift-key_6)"
-"((temp109_0) #t)"
-"((temp110_5) #t))"
+"(let-values(((input-s107_0) input-s_1)"
+"((local-ctx108_0)"
+" local-ctx_0)"
+"((context109_0) context_23)"
+"((temp110_5) #f)"
+"((temp111_1) #t)"
+"((lift-key112_0) lift-key_6)"
+"((temp113_1) #t)"
+"((temp114_3) #t))"
 "(expand-transformer92.1"
-" temp109_0"
+" temp113_1"
 " #t"
-" temp107_2"
+" temp111_1"
 " #t"
-" context105_0"
-" #t"
-" temp106_4"
+" context109_0"
 " #t"
 " temp110_5"
 " #t"
-" lift-key108_0"
+" temp114_3"
 " #t"
-" input-s103_0"
-" local-ctx104_0)))"
+" lift-key112_0"
+" #t"
+" input-s107_0"
+" local-ctx108_0)))"
 "(if as-transformer?_6"
 "(let-values()"
-"(let-values(((input-s111_0) input-s_1)"
-"((local-ctx112_0)"
+"(let-values(((input-s115_0) input-s_1)"
+"((local-ctx116_0)"
 " local-ctx_0)"
-"((context113_0) context_23)"
-"((temp114_3) #f)"
-"((temp115_2)"
-"(eq? 'top-level context_23))"
-"((lift-key116_0) lift-key_6)"
-"((temp117_2) #t))"
+"((context117_0) context_23)"
+"((temp118_0) #f)"
+"((temp119_2)"
+"(eq?"
+" 'top-level"
+" context_23))"
+"((lift-key120_0)"
+" lift-key_6)"
+"((temp121_1) #t))"
 "(expand-transformer92.1"
 " #f"
 " #f"
-" temp115_2"
+" temp119_2"
 " #t"
-" context113_0"
+" context117_0"
 " #t"
-" temp114_3"
+" temp118_0"
 " #t"
-" temp117_2"
+" temp121_1"
 " #t"
-" lift-key116_0"
+" lift-key120_0"
 " #t"
-" input-s111_0"
-" local-ctx112_0)))"
+" input-s115_0"
+" local-ctx116_0)))"
 "(if capture-lifts?_0"
 "(let-values()"
-"(let-values(((input-s118_0) input-s_1)"
-"((local-ctx119_0)"
+"(let-values(((input-s122_0)"
+" input-s_1)"
+"((local-ctx123_0)"
 " local-ctx_0)"
-"((temp120_3) #t)"
-"((lift-key121_0)"
+"((temp124_3) #t)"
+"((lift-key125_0)"
 " lift-key_6)"
-"((temp122_3) #t))"
+"((temp126_1) #t))"
 "(expand/capture-lifts75.1"
-" temp122_3"
+" temp126_1"
 " #t"
-" temp120_3"
+" temp124_3"
 " #t"
 " #f"
 " #f"
-" lift-key121_0"
+" lift-key125_0"
 " #t"
-" input-s118_0"
-" local-ctx119_0)))"
+" input-s122_0"
+" local-ctx123_0)))"
 "(let-values()"
-"(let-values(((input-s123_0) input-s_1)"
-"((local-ctx124_0)"
+"(let-values(((input-s127_0)"
+" input-s_1)"
+"((local-ctx128_0)"
 " local-ctx_0))"
 "(expand9.1"
 " #f"
@@ -58802,18 +58868,18 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" input-s123_0"
-" local-ctx124_0))))))))"
+" input-s127_0"
+" local-ctx128_0))))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_66)"
+"(let-values(((obs_10)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_66"
+"(if obs_10"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_66"
+" obs_10"
 " 'local-post"
 " output-s_0)))"
 "(void)))"
@@ -58823,23 +58889,23 @@ static const char *startup_source =
 " output-s_0"
 "(flip-introduction-scopes"
 " output-s_0"
-" ctx_71))))"
+" ctx_73))))"
 "(begin"
 "(if skip-log-exit?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_67)"
+"(let-values(((obs_65)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_67"
+"(if obs_65"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_67"
+" obs_65"
 " 'exit-local"
 " result-s_8)))"
 "(void)))))"
-" result-s_8)))))))))))))))))))))))))))))))))"
+" result-s_8))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(1/syntax-tainted?)"
 "(lambda(s_0)"
@@ -58870,8 +58936,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_208)(not maybe-insp_0)))"
-"(if or-part_208 or-part_208(inspector? maybe-insp_0)))"
+"(if(let-values(((or-part_209)(not maybe-insp_0)))"
+"(if or-part_209 or-part_209(inspector? maybe-insp_0)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -58884,25 +58950,25 @@ static const char *startup_source =
 "(let-values()"
 "(taint-dispatch"
 " s_176"
-"(lambda(s_494)(syntax-arm$1 s_494 insp_21))"
+"(lambda(s_496)(syntax-arm$1 s_496 insp_21))"
 "(1/syntax-local-phase-level)))"
 "(let-values()(syntax-arm$1 s_176 insp_21))))))))))))))))"
 "(case-lambda"
 "((s_177)(begin 'syntax-arm(syntax-arm6_0 s_177 #f #f #f #f)))"
 "((s_178 maybe-insp_1 use-mode?2_1)(syntax-arm6_0 s_178 maybe-insp_1 use-mode?2_1 #t #t))"
-"((s_454 maybe-insp1_1)(syntax-arm6_0 s_454 maybe-insp1_1 #f #t #f)))))"
+"((s_455 maybe-insp1_1)(syntax-arm6_0 s_455 maybe-insp1_1 #f #t #f)))))"
 "(define-values"
 "(1/syntax-disarm)"
-"(lambda(s_495 maybe-insp_2)"
+"(lambda(s_497 maybe-insp_2)"
 "(begin"
 " 'syntax-disarm"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_495)"
+"(if(syntax?$1 s_497)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_495)))"
+"                            (let-values () (raise-argument-error 'syntax-disarm \"syntax?\" s_497)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -58911,35 +58977,35 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'syntax-disarm \"(or/c inspector? #f)\" maybe-insp_2)))"
 "(values))))"
-"(let-values(((insp_22)(inspector-for-taint maybe-insp_2)))(syntax-disarm$1 s_495 insp_22)))))))))"
+"(let-values(((insp_22)(inspector-for-taint maybe-insp_2)))(syntax-disarm$1 s_497 insp_22)))))))))"
 "(define-values"
 "(1/syntax-rearm)"
 "(let-values(((syntax-rearm12_0)"
 "(lambda(s10_0 from-s11_0 use-mode?8_0 use-mode?9_0)"
 "(begin"
 " 'syntax-rearm12"
-"(let-values(((s_453) s10_0))"
+"(let-values(((s_454) s10_0))"
 "(let-values(((from-s_2) from-s11_0))"
 "(let-values(((use-mode?_1)(if use-mode?9_0 use-mode?8_0 #f)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_453)"
+"(if(syntax?$1 s_454)"
 "(void)"
-"                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" s_453)))"
+"                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" s_454)))"
 "(if(syntax?$1 from-s_2)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'syntax-rearm \"syntax?\" from-s_2)))"
 "(if use-mode?_1"
 "(let-values()"
 "(taint-dispatch"
-" s_453"
-"(lambda(s_496)(syntax-rearm$1 s_496 from-s_2))"
+" s_454"
+"(lambda(s_498)(syntax-rearm$1 s_498 from-s_2))"
 "(1/syntax-local-phase-level)))"
-"(let-values()(syntax-rearm$1 s_453 from-s_2))))))))))))))"
+"(let-values()(syntax-rearm$1 s_454 from-s_2))))))))))))))"
 "(case-lambda"
-"((s_451 from-s_3)(begin 'syntax-rearm(syntax-rearm12_0 s_451 from-s_3 #f #f)))"
+"((s_452 from-s_3)(begin 'syntax-rearm(syntax-rearm12_0 s_452 from-s_3 #f #f)))"
 "((s_5 from-s_4 use-mode?8_1)(syntax-rearm12_0 s_5 from-s_4 use-mode?8_1 #t)))))"
 "(define-values"
 "(1/syntax-taint)"
@@ -58987,15 +59053,15 @@ static const char *startup_source =
 "(let-values()"
 "                              (raise-argument-error 'variable-reference->namespace \"variable-reference?\" vr_1)))"
 "(values))))"
-"(let-values(((ns_118)(variable-reference->namespace* vr_1)))"
-"(let-values(((mpi_52)(namespace-mpi ns_118)))"
+"(let-values(((ns_117)(variable-reference->namespace* vr_1)))"
+"(let-values(((mpi_52)(namespace-mpi ns_117)))"
 "(begin"
 "(if(non-self-module-path-index? mpi_52)"
 "(let-values()"
-"(let-values(((ns4_0) ns_118)((mpi5_1) mpi_52)((temp6_5)(namespace-0-phase ns_118)))"
+"(let-values(((ns4_0) ns_117)((mpi5_1) mpi_52)((temp6_5)(namespace-0-phase ns_117)))"
 "(namespace-module-make-available!112.1 #f #f ns4_0 mpi5_1 temp6_5)))"
 "(void))"
-" ns_118)))))))))"
+" ns_117)))))))))"
 "(define-values"
 "(variable-reference->namespace*)"
 "(lambda(vr_2)"
@@ -59389,15 +59455,15 @@ static const char *startup_source =
 "(lambda(eval1_0 main-ids2_0 read-ids3_0 ns7_1)"
 "(begin"
 " 'declare-kernel-module!8"
-"(let-values(((ns_119) ns7_1))"
+"(let-values(((ns_118) ns7_1))"
 "(let-values()"
 "(let-values(((main-ids_0) main-ids2_0))"
 "(let-values(((read-ids_0) read-ids3_0))"
 "(let-values()"
 "(begin"
-"(let-values(((temp53_3) '#%kernel)"
+"(let-values(((temp53_4) '#%kernel)"
 "((temp54_5) '#%runtime)"
-"((temp55_3)(set-union primitive-ids(set-union main-ids_0 read-ids_0)))"
+"((temp55_2)(set-union primitive-ids(set-union main-ids_0 read-ids_0)))"
 "((temp56_2)"
 "(hasheq"
 " 'variable-reference?"
@@ -59406,10 +59472,10 @@ static const char *startup_source =
 " 1/variable-reference-constant?"
 " 'variable-reference-from-unsafe?"
 " 1/variable-reference-from-unsafe?))"
-"((ns57_0) ns_119))"
-"(copy-runtime-module!26.1 #f #f temp56_2 #t ns57_0 #f #f #f #f temp55_3 #t temp54_5 #t temp53_3))"
-"(let-values(((temp58_4) '#%kernel)((temp59_8) '(#%core #%runtime #%main #%read))((ns60_0) ns_119))"
-"(declare-reexporting-module!50.1 ns60_0 #f #f temp58_4 temp59_8)))))))))))"
+"((ns57_0) ns_118))"
+"(copy-runtime-module!26.1 #f #f temp56_2 #t ns57_0 #f #f #f #f temp55_2 #t temp54_5 #t temp53_4))"
+"(let-values(((temp58_3) '#%kernel)((temp59_6) '(#%core #%runtime #%main #%read))((ns60_0) ns_118))"
+"(declare-reexporting-module!50.1 ns60_0 #f #f temp58_3 temp59_6)))))))))))"
 "(define-values"
 "(copy-runtime-module!26.1)"
 "(lambda(alts14_0"
@@ -59428,16 +59494,16 @@ static const char *startup_source =
 " name25_0)"
 "(begin"
 " 'copy-runtime-module!26"
-"(let-values(((name_66) name25_0))"
-"(let-values(((to-name_0)(if to18_0 to11_0 name_66)))"
-"(let-values(((ns_120) namespace12_0))"
+"(let-values(((name_65) name25_0))"
+"(let-values(((to-name_0)(if to18_0 to11_0 name_65)))"
+"(let-values(((ns_119) namespace12_0))"
 "(let-values(((skip-syms_0)(if skip20_0 skip13_0(seteq))))"
 "(let-values(((alts_0)(if alts21_0 alts14_0 '#hasheq())))"
 "(let-values(((extras_0)(if extras22_0 extras15_0 '#hasheq())))"
 "(let-values(((primitive?_9)(if primitive?23_0 primitive?16_0 #t)))"
 "(let-values(((protected?_10)(if protected?24_0 protected?17_0 #f)))"
 "(let-values()"
-"(let-values(((prims_0)(1/primitive-table name_66)))"
+"(let-values(((prims_0)(1/primitive-table name_65)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ht_24) prims_0))"
@@ -59502,13 +59568,13 @@ static const char *startup_source =
 "(let-values()"
 "(values"
 " sym_100"
-"(let-values(((or-part_219)"
+"(let-values(((or-part_220)"
 "(hash-ref"
 " alts_0"
 " sym_100"
 " #f)))"
-"(if or-part_219"
-" or-part_219"
+"(if or-part_220"
+" or-part_220"
 " val_5))))))"
 "(hash-set"
 " table_20"
@@ -59559,7 +59625,7 @@ static const char *startup_source =
 "(hash-iterate-first ht_162))))))"
 "(let-values(((to-name61_0) to-name_0)"
 "((ht+extras62_0) ht+extras_0)"
-"((ns63_0) ns_120)"
+"((ns63_0) ns_119)"
 "((primitive?64_0) primitive?_9)"
 "((protected?65_0) protected?_10))"
 "(declare-hash-based-module!41.1"
@@ -59589,21 +59655,21 @@ static const char *startup_source =
 " ht40_0)"
 "(begin"
 " 'declare-hash-based-module!41"
-"(let-values(((name_75) name39_0))"
+"(let-values(((name_74) name39_0))"
 "(let-values(((ht_165) ht40_0))"
-"(let-values(((ns_121) namespace29_0))"
+"(let-values(((ns_120) namespace29_0))"
 "(let-values(((primitive?_10)(if primitive?35_0 primitive?30_0 #f)))"
 "(let-values(((protected?_11)(if protected?36_0 protected?31_0 #f)))"
 "(let-values(((protected-syms_0)(if protected37_0 protected32_0 null)))"
 "(let-values(((register-builtin?_0)(if register-builtin?38_0 register-builtin?33_0 #f)))"
 "(let-values()"
-"(let-values(((mpi_55)(1/module-path-index-join(list 'quote name_75) #f)))"
-"(let-values(((ns66_1) ns_121)"
+"(let-values(((mpi_55)(1/module-path-index-join(list 'quote name_74) #f)))"
+"(let-values(((ns66_1) ns_120)"
 "((temp67_1)"
-"(let-values(((temp69_4) #t)"
+"(let-values(((temp69_2) #t)"
 "((primitive?70_0) primitive?_10)"
-"((temp71_5) #t)"
-"((temp72_2)(not protected?_11))"
+"((temp71_6) #t)"
+"((temp72_3)(not protected?_11))"
 "((mpi73_1) mpi_55)"
 "((temp74_0)"
 "(hasheqv"
@@ -59641,7 +59707,7 @@ static const char *startup_source =
 "(let-values(((binding_28)"
 "(let-values(((mpi76_0)"
 " mpi_55)"
-"((temp77_3)"
+"((temp77_2)"
 " 0)"
 "((sym78_0)"
 " sym_101))"
@@ -59665,7 +59731,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " mpi76_0"
-" temp77_3"
+" temp77_2"
 " sym78_0))))"
 "(values"
 " sym_101"
@@ -59700,7 +59766,7 @@ static const char *startup_source =
 "(hash-iterate-first ht_166))))))"
 "((temp75_3)"
 "(lambda(data-box_6"
-" ns_122"
+" ns_121"
 " phase-shift_21"
 " phase-level_23"
 " self_29"
@@ -59731,7 +59797,7 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(namespace-set-variable!"
-" ns_122"
+" ns_121"
 " 0"
 " sym_102"
 " val_31))"
@@ -59749,7 +59815,7 @@ static const char *startup_source =
 "(void)))"
 "(void)))))"
 "(make-module39.1"
-" temp69_4"
+" temp69_2"
 " #t"
 " #f"
 " #f"
@@ -59762,11 +59828,11 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp72_2"
+" temp72_3"
 " #t"
 " #f"
 " #f"
-" temp71_5"
+" temp71_6"
 " #t"
 " #f"
 " #f"
@@ -59789,12 +59855,12 @@ static const char *startup_source =
 "(lambda(namespace45_0 reexport?44_0 reexport?46_0 name48_1 require-names49_0)"
 "(begin"
 " 'declare-reexporting-module!50"
-"(let-values(((name_76) name48_1))"
+"(let-values(((name_75) name48_1))"
 "(let-values(((require-names_0) require-names49_0))"
 "(let-values(((reexport?_0)(if reexport?46_0 reexport?44_0 #t)))"
-"(let-values(((ns_123) namespace45_0))"
+"(let-values(((ns_122) namespace45_0))"
 "(let-values()"
-"(let-values(((mpi_56)(1/module-path-index-join(list 'quote name_76) #f)))"
+"(let-values(((mpi_56)(1/module-path-index-join(list 'quote name_75) #f)))"
 "(let-values(((require-mpis_0)"
 "(reverse$1"
 "(let-values(((lst_202) require-names_0))"
@@ -59829,10 +59895,10 @@ static const char *startup_source =
 " for-loop_207)"
 " null"
 " lst_202))))))"
-"(let-values(((ns79_1) ns_123)"
+"(let-values(((ns79_1) ns_122)"
 "((temp80_4)"
-"(let-values(((temp82_7) #t)"
-"((temp83_3) #t)"
+"(let-values(((temp82_6) #t)"
+"((temp83_2) #t)"
 "((mpi84_0) mpi_56)"
 "((temp85_4)(list(cons 0 require-mpis_0)))"
 "((temp86_1)"
@@ -59856,7 +59922,7 @@ static const char *startup_source =
 "(let-values(((table_228)"
 "(let-values(((m_29)"
 "(namespace->module"
-" ns_123"
+" ns_122"
 "(1/module-path-index-resolve"
 " require-mpi_0))))"
 "(begin"
@@ -59937,7 +60003,7 @@ static const char *startup_source =
 " '#hasheqv()))"
 "((void87_0) void))"
 "(make-module39.1"
-" temp82_7"
+" temp82_6"
 " #t"
 " #f"
 " #f"
@@ -59954,7 +60020,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp83_3"
+" temp83_2"
 " #t"
 " #f"
 " #f"
@@ -60033,13 +60099,13 @@ static const char *startup_source =
 "(let-values()"
 "(case-lambda"
 "((s_71)(begin 'eval((1/current-eval)(intro s_71))))"
-"((s_187 ns_124)"
+"((s_187 ns_123)"
 "(begin"
-"          (if (1/namespace? ns_124) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_124)))"
+"          (if (1/namespace? ns_123) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_123)))"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_124)"
-"(let-values()((1/current-eval)(intro s_187 ns_124))))))))))"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_123)"
+"(let-values()((1/current-eval)(intro s_187 ns_123))))))))))"
 "(define-values"
 "(1/eval-syntax)"
 "(let-values()"
@@ -60051,13 +60117,13 @@ static const char *startup_source =
 "(begin"
 "            (if (syntax?$1 s_8) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_8)))"
 "((1/current-eval) s_8))))"
-"((s_2 ns_125)"
+"((s_2 ns_124)"
 "(begin"
 "          (if (syntax?$1 s_2) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_2)))"
-"          (if (1/namespace? ns_125) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_125)))"
+"          (if (1/namespace? ns_124) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_124)))"
 "(with-continuation-mark"
 " parameterization-key"
-"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_125)"
+"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_124)"
 "(let-values()((1/current-eval) s_2)))))))))"
 "(define-values(compile$1)(lambda(s_176)(begin 'compile((1/current-compile)(intro s_176) #f))))"
 "(define-values"
@@ -60073,15 +60139,15 @@ static const char *startup_source =
 "(define-values(1/expand)(lambda(s_9)(begin 'expand(expand$1(intro s_9)(1/current-namespace) #t))))"
 "(define-values"
 "(1/expand-syntax)"
-"(lambda(s_497)"
+"(lambda(s_499)"
 "(begin"
 " 'expand-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_497) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_497)))"
-"(expand$1 s_497(1/current-namespace) #t)))))))"
-"(define-values(1/expand-once)(lambda(s_494)(begin 'expand-once(expand-once$1(intro s_494)))))"
+"            (if (syntax?$1 s_499) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_499)))"
+"(expand$1 s_499(1/current-namespace) #t)))))))"
+"(define-values(1/expand-once)(lambda(s_496)(begin 'expand-once(expand-once$1(intro s_496)))))"
 "(define-values"
 "(1/expand-syntax-once)"
 "(lambda(s_177)"
@@ -60114,8 +60180,8 @@ static const char *startup_source =
 "(let-values(((given-s_1) given-s3_0))"
 "(let-values(((ns_68)(if ns2_1 ns1_7(1/current-namespace))))"
 "(let-values()"
-"(let-values(((s_498)(if(syntax?$1 given-s_1) given-s_1(1/datum->syntax #f given-s_1))))"
-"(1/namespace-syntax-introduce s_498 ns_68)))))))))"
+"(let-values(((s_500)(if(syntax?$1 given-s_1) given-s_1(1/datum->syntax #f given-s_1))))"
+"(1/namespace-syntax-introduce s_500 ns_68)))))))))"
 "(case-lambda((given-s_2)(begin(intro4_0 given-s_2 #f #f)))((given-s_3 ns1_8)(intro4_0 given-s_3 ns1_8 #t)))))"
 "(define-values"
 "(main-primitives)"
@@ -60411,8 +60477,8 @@ static const char *startup_source =
 "(check-module-form)"
 "(lambda(exp_0 filename_1)"
 "(begin"
-"(if(let-values(((or-part_307)(eof-object? exp_0)))"
-"(if or-part_307 or-part_307(eof-object?(1/syntax-e exp_0))))"
+"(if(let-values(((or-part_308)(eof-object? exp_0)))"
+"(if or-part_308 or-part_308(eof-object?(1/syntax-e exp_0))))"
 "(let-values()"
 "(if filename_1"
 "(error"
@@ -60559,11 +60625,11 @@ static const char *startup_source =
 "(lambda()((1/current-eval) m-s_0))))))))))))))))))))"
 "(let-values()"
 "(let-values(((add-top-interaction_0)"
-"(lambda(s_454)"
+"(lambda(s_455)"
 "(begin"
 " 'add-top-interaction"
 "(1/namespace-syntax-introduce"
-"(1/datum->syntax #f(cons '#%top-interaction s_454) s_454))))))"
+"(1/datum->syntax #f(cons '#%top-interaction s_455) s_455))))))"
 "(let-values(((path1_0) path_12)"
 "((temp2_8)"
 "(lambda(i_83)"
@@ -60693,7 +60759,7 @@ static const char *startup_source =
 "(lambda(i_188)"
 "(begin"
 " 'read-byte/not-eof"
-"(let-values(((v_184)(read-byte i_188)))(if(eof-object? v_184) 0 v_184))))))"
+"(let-values(((v_186)(read-byte i_188)))(if(eof-object? v_186) 0 v_186))))))"
 "(bitwise-ior"
 "(read-byte/not-eof_0 i_58)"
 "(arithmetic-shift(read-byte/not-eof_0 i_58) 8)"
@@ -60708,9 +60774,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()(begin(file-position i_189 pos_119)(values))))"
 "(let-values(((name-len_0)(read-number i_189)))"
-"(let-values(((v_255)(read-bytes name-len_0 i_189)))"
+"(let-values(((v_257)(read-bytes name-len_0 i_189)))"
 "(begin"
-"(if(if(bytes? v_255)(=(bytes-length v_255) name-len_0) #f)"
+"(if(if(bytes? v_257)(=(bytes-length v_257) name-len_0) #f)"
 "(void)"
 "(let-values()"
 "(error"
@@ -60724,10 +60790,10 @@ static const char *startup_source =
 "(object-name i_189)"
 " pos_119"
 " name-len_0"
-" v_255)))"
-"(if(bytes=? bstr_5 v_255)"
+" v_257)))"
+"(if(bytes=? bstr_5 v_257)"
 "(let-values()(read-number i_189))"
-"(if(bytes<? bstr_5 v_255)"
+"(if(bytes<? bstr_5 v_257)"
 "(let-values()"
 "(begin"
 "(read-number i_189)"
@@ -61160,8 +61226,8 @@ static const char *startup_source =
 "(void))))))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(register-zo-path)"
-"(lambda(name_77 ns-hts_1 path_17 src-path_0 base_27)"
-"(begin(if ns-hts_1(let-values()(hash-set!(cdr ns-hts_1) name_77(list path_17 src-path_0 base_27)))(void)))))"
+"(lambda(name_76 ns-hts_1 path_17 src-path_0 base_27)"
+"(begin(if ns-hts_1(let-values()(hash-set!(cdr ns-hts_1) name_76(list path_17 src-path_0 base_27)))(void)))))"
 "(define-values(default-reader-guard)(lambda(path_18)(begin path_18)))"
 "(define-values(-module-hash-table-table)(make-weak-hasheq))"
 "(define-values"
@@ -61170,7 +61236,7 @@ static const char *startup_source =
 "(begin(let-values(((e_89)(hash-ref -module-hash-table-table reg_0 #f)))(if e_89(ephemeron-value e_89) #f)))))"
 "(define-values"
 "(registry-table-set!)"
-"(lambda(reg_1 v_205)(begin(hash-set! -module-hash-table-table reg_1(make-ephemeron reg_1 v_205)))))"
+"(lambda(reg_1 v_206)(begin(hash-set! -module-hash-table-table reg_1(make-ephemeron reg_1 v_206)))))"
 "(define-values(CACHE-N) 512)"
 "(define-values(-path-cache)(make-vector CACHE-N #f))"
 "(define-values"
@@ -61183,7 +61249,7 @@ static const char *startup_source =
 "(if l_85(let-values(((a_72)(1/assoc p_22 l_85)))(if a_72(cdr a_72) #f)) #f)))))))"
 "(define-values"
 "(path-cache-set!)"
-"(lambda(p_77 v_256)"
+"(lambda(p_77 v_258)"
 "(begin"
 "(let-values(((i_190)(modulo(abs(equal-hash-code p_77)) CACHE-N)))"
 "(let-values(((w_2)(vector-ref -path-cache i_190)))"
@@ -61192,37 +61258,37 @@ static const char *startup_source =
 " -path-cache"
 " i_190"
 "(make-weak-box"
-"(cons(cons p_77 v_256)(let-values(((or-part_36) l_72))(if or-part_36 or-part_36 null)))))))))))"
+"(cons(cons p_77 v_258)(let-values(((or-part_36) l_72))(if or-part_36 or-part_36 null)))))))))))"
 "(define-values(-loading-filename)(gensym))"
 "(define-values(-loading-prompt-tag)(make-continuation-prompt-tag 'module-loading))"
 "(define-values(-prev-relto) #f)"
 "(define-values(-prev-relto-dir) #f)"
 "(define-values"
 "(split-relative-string)"
-"(lambda(s_493 coll-mode?_0)"
+"(lambda(s_494 coll-mode?_0)"
 "(begin"
 "(let-values(((l_20)"
 "((letrec-values(((loop_119)"
-"(lambda(s_499)"
+"(lambda(s_501)"
 "(begin"
 " 'loop"
-"(let-values(((len_42)(string-length s_499)))"
+"(let-values(((len_42)(string-length s_501)))"
 "((letrec-values(((iloop_2)"
 "(lambda(i_100)"
 "(begin"
 " 'iloop"
 "(if(= i_100 len_42)"
-"(let-values()(list s_499))"
-"(if(char=? '#\\/(string-ref s_499 i_100))"
+"(let-values()(list s_501))"
+"(if(char=? '#\\/(string-ref s_501 i_100))"
 "(let-values()"
 "(cons"
-"(substring s_499 0 i_100)"
-"(loop_119(substring s_499(add1 i_100)))))"
+"(substring s_501 0 i_100)"
+"(loop_119(substring s_501(add1 i_100)))))"
 "(let-values()(iloop_2(add1 i_100)))))))))"
 " iloop_2)"
 " 0))))))"
 " loop_119)"
-" s_493)))"
+" s_494)))"
 "(if coll-mode?_0"
 " l_20"
 "((letrec-values(((loop_103)"
@@ -61314,18 +61380,18 @@ static const char *startup_source =
 "(void))))"
 "(void))))"
 "(void)))))))"
-"((s_500 relto_0 stx_18)"
+"((s_502 relto_0 stx_18)"
 "(begin"
 "(log-message"
 "(current-logger)"
 " 'error"
 "                              \"default module name resolver called with three arguments (deprecated)\""
 " #f)"
-"(standard-module-name-resolver_0 s_500 relto_0 stx_18 #t)))"
-"((s_501 relto_1 stx_19 load?_7)"
+"(standard-module-name-resolver_0 s_502 relto_0 stx_18 #t)))"
+"((s_503 relto_1 stx_19 load?_7)"
 "(let-values((()"
 "(begin"
-"(if(1/module-path? s_501)"
+"(if(1/module-path? s_503)"
 "(void)"
 "(let-values()"
 "(if(syntax?$1 stx_19)"
@@ -61333,7 +61399,7 @@ static const char *startup_source =
 "(raise-argument-error"
 " 'standard-module-name-resolver"
 "                                                  \"module-path?\""
-" s_501))))"
+" s_503))))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -61396,24 +61462,24 @@ static const char *startup_source =
 " loop_120)"
 " null"
 " orig-l_10)))))"
-"(if(if(pair? s_501)(eq?(car s_501) 'quote) #f)"
-"(let-values()(1/make-resolved-module-path(cadr s_501)))"
-"(if(if(pair? s_501)"
-"(if(eq?(car s_501) 'submod)"
-"(if(pair?(cadr s_501))(eq?(caadr s_501) 'quote) #f)"
+"(if(if(pair? s_503)(eq?(car s_503) 'quote) #f)"
+"(let-values()(1/make-resolved-module-path(cadr s_503)))"
+"(if(if(pair? s_503)"
+"(if(eq?(car s_503) 'submod)"
+"(if(pair?(cadr s_503))(eq?(caadr s_503) 'quote) #f)"
 " #f)"
 " #f)"
 "(let-values()"
-"(1/make-resolved-module-path(flatten-sub-path_0(cadadr s_501)(cddr s_501))))"
-"(if(if(pair? s_501)"
-"(if(eq?(car s_501) 'submod)"
-"                                               (if (let-values (((or-part_299) (equal? (cadr s_501) \".\")))"
-"                                                     (if or-part_299 or-part_299 (equal? (cadr s_501) \"..\")))"
+"(1/make-resolved-module-path(flatten-sub-path_0(cadadr s_503)(cddr s_503))))"
+"(if(if(pair? s_503)"
+"(if(eq?(car s_503) 'submod)"
+"                                               (if (let-values (((or-part_300) (equal? (cadr s_503) \".\")))"
+"                                                     (if or-part_300 or-part_300 (equal? (cadr s_503) \"..\")))"
 "(if relto_1"
 "(let-values(((p_78)(1/resolved-module-path-name relto_1)))"
-"(let-values(((or-part_280)(symbol? p_78)))"
-"(if or-part_280"
-" or-part_280"
+"(let-values(((or-part_281)(symbol? p_78)))"
+"(if or-part_281"
+" or-part_281"
 "(if(pair? p_78)(symbol?(car p_78)) #f))))"
 " #f)"
 " #f)"
@@ -61425,27 +61491,27 @@ static const char *startup_source =
 "(flatten-sub-path_0"
 "(if(pair? rp_0)(car rp_0) rp_0)"
 "(let-values(((r_46)"
-"                                                             (if (equal? (cadr s_501) \"..\") (cdr s_501) (cddr s_501))))"
+"                                                             (if (equal? (cadr s_503) \"..\") (cdr s_503) (cddr s_503))))"
 "(if(pair? rp_0)(append(cdr rp_0) r_46) r_46))))))"
-"(if(if(pair? s_501)(eq?(car s_501) 'planet) #f)"
+"(if(if(pair? s_503)(eq?(car s_503) 'planet) #f)"
 "(let-values()"
 "(begin"
 "(prep-planet-resolver!_0)"
-"(planet-resolver_0 s_501 relto_1 stx_19 load?_7 #f orig-paramz)))"
-"(if(if(pair? s_501)"
-"(if(eq?(car s_501) 'submod)"
-"(if(pair?(cadr s_501))(eq?(caadr s_501) 'planet) #f)"
+"(planet-resolver_0 s_503 relto_1 stx_19 load?_7 #f orig-paramz)))"
+"(if(if(pair? s_503)"
+"(if(eq?(car s_503) 'submod)"
+"(if(pair?(cadr s_503))(eq?(caadr s_503) 'planet) #f)"
 " #f)"
 " #f)"
 "(let-values()"
 "(begin"
 "(prep-planet-resolver!_0)"
 "(planet-resolver_0"
-"(cadr s_501)"
+"(cadr s_503)"
 " relto_1"
 " stx_19"
 " load?_7"
-"(cddr s_501)"
+"(cddr s_503)"
 " orig-paramz)))"
 "(let-values()"
 "(let-values(((get-dir_0)"
@@ -61510,18 +61576,18 @@ static const char *startup_source =
 " msg_1"
 "(format"
 "                                                                                  \"\\n  for module path: ~s\\n\""
-" s_501)))))"
+" s_503)))))"
 "(raise"
 "(if stx_19"
 "(1/make-exn:fail:syntax:missing-module"
 " msg_2"
 "(current-continuation-marks)"
 "(list stx_19)"
-" s_501)"
+" s_503)"
 "(1/make-exn:fail:filesystem:missing-module"
 " msg_2"
 "(current-continuation-marks)"
-" s_501)))))))"
+" s_503)))))))"
 "((ss->rkt_0)"
 "(lambda(s_94)"
 "(begin"
@@ -61548,14 +61614,14 @@ static const char *startup_source =
 "(lambda(p_81)"
 "(begin"
 " 'path-ss->rkt"
-"(let-values(((base_11 name_78 dir?_8)"
+"(let-values(((base_11 name_77 dir?_8)"
 "(split-path p_81)))"
-"                                                                   (if (regexp-match '#rx\"[.]ss$\" (path->bytes name_78))"
+"                                                                   (if (regexp-match '#rx\"[.]ss$\" (path->bytes name_77))"
 "                                                                     (path-replace-extension p_81 #\".rkt\")"
 " p_81)))))"
 "((s_92)"
-"(if(if(pair? s_501)(eq? 'submod(car s_501)) #f)"
-"(let-values(((v_38)(cadr s_501)))"
+"(if(if(pair? s_503)(eq? 'submod(car s_503)) #f)"
+"(let-values(((v_38)(cadr s_503)))"
 "                                                                 (if (let-values (((or-part_371) (equal? v_38 \".\")))"
 "                                                                       (if or-part_371 or-part_371 (equal? v_38 \"..\")))"
 "(if relto_1"
@@ -61566,19 +61632,19 @@ static const char *startup_source =
 "(error"
 " 'standard-module-name-resolver"
 "                                                                      \"no base path for relative submodule path: ~.s\""
-" s_501))"
+" s_503))"
 " v_38))"
-" s_501))"
+" s_503))"
 "((subm-path_0)"
-"(if(if(pair? s_501)(eq? 'submod(car s_501)) #f)"
+"(if(if(pair? s_503)(eq? 'submod(car s_503)) #f)"
 "(let-values(((p_83)"
 "(if(if(let-values(((or-part_166)"
 "(equal?"
-"(cadr s_501)"
+"(cadr s_503)"
 "                                                                                                    \".\")))"
 "(if or-part_166"
 " or-part_166"
-"                                                                                         (equal? (cadr s_501) \"..\")))"
+"                                                                                         (equal? (cadr s_503) \"..\")))"
 " relto_1"
 " #f)"
 "(let-values(((p_84)"
@@ -61586,10 +61652,10 @@ static const char *startup_source =
 " relto_1))"
 "((r_27)"
 "(if(equal?"
-"(cadr s_501)"
+"(cadr s_503)"
 "                                                                                                  \"..\")"
-"(cdr s_501)"
-"(cddr s_501))))"
+"(cdr s_503)"
+"(cddr s_503))))"
 "(if(pair? p_84)"
 "(flatten-sub-path_0"
 "(car p_84)"
@@ -61597,9 +61663,9 @@ static const char *startup_source =
 "(flatten-sub-path_0 p_84 r_27)))"
 "(flatten-sub-path_0"
 "                                                                                \".\""
-"                                                                                (if (equal? (cadr s_501) \"..\")"
-"(cdr s_501)"
-"(cddr s_501))))))"
+"                                                                                (if (equal? (cadr s_503) \"..\")"
+"(cdr s_503)"
+"(cddr s_503))))))"
 "(if(pair? p_83)(cdr p_83) #f))"
 " #f)))"
 "(let-values(((s-parsed_0)"
@@ -61938,10 +62004,10 @@ static const char *startup_source =
 " standard-module-name-resolver_0)))))"
 "(define-values"
 "(default-eval-handler)"
-"(lambda(s_502)"
+"(lambda(s_504)"
 "(begin"
 "(1/eval"
-" s_502"
+" s_504"
 "(1/current-namespace)"
 "(let-values(((c_116)(1/current-compile)))"
 "(lambda(e_90 ns_16)"
@@ -61993,10 +62059,10 @@ static const char *startup_source =
 "(hash 'boot boot 'seal seal 'get-original-parameterization get-original-parameterization))"
 "(define-values"
 "(prepare-next-phase-namespace)"
-"(lambda(ctx_72)"
+"(lambda(ctx_74)"
 "(begin"
-"(let-values(((phase_45)(add1(expand-context-phase ctx_72))))"
-"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_72) phase_45)))"
+"(let-values(((phase_45)(add1(expand-context-phase ctx_74))))"
+"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_74) phase_45)))"
 "(namespace-visit-available-modules! ns_59 phase_45))))))"
 "(define-values"
 "(expand-body7.1)"
@@ -62004,17 +62070,17 @@ static const char *startup_source =
 "(begin"
 " 'expand-body7"
 "(let-values(((bodys_7) bodys5_0))"
-"(let-values(((ctx_73) ctx6_0))"
+"(let-values(((ctx_75) ctx6_0))"
 "(let-values(((s_179) source1_0))"
 "(let-values(((stratified?_0)(if stratified?4_0 stratified?2_0 #f)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_68)(expand-context-observer ctx_73)))"
-"(if obs_68"
+"(let-values(((obs_66)(expand-context-observer ctx_75)))"
+"(if obs_66"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_68 'enter-block(datum->syntax$1 #f bodys_7))))"
+"(call-expand-observe obs_66 'enter-block(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
 "(let-values(((inside-sc_0)(new-scope 'intdef)))"
@@ -62052,24 +62118,24 @@ static const char *startup_source =
 " lst_265))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_69)(expand-context-observer ctx_73)))"
-"(if obs_69"
+"(let-values(((obs_67)(expand-context-observer ctx_75)))"
+"(if obs_67"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_69"
+" obs_67"
 " 'block-renames"
 "(datum->syntax$1 #f init-bodys_0)"
 "(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_144)(expand-context-phase ctx_73)))"
+"(let-values(((phase_143)(expand-context-phase ctx_75)))"
 "(let-values(((frame-id_2)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
-"(let-values(((v_257) ctx_73))"
-"(let-values(((the-struct_89) v_257))"
-"(if(expand-context/outer? the-struct_89)"
+"(let-values(((v_259) ctx_75))"
+"(let-values(((the-struct_90) v_259))"
+"(if(expand-context/outer? the-struct_90)"
 "(let-values(((context51_0)(list(make-liberal-define-context)))"
 "((name52_1) #f)"
 "((only-immediate?53_0) #t)"
@@ -62077,44 +62143,44 @@ static const char *startup_source =
 "((post-expansion-scope55_0) inside-sc_0)"
 "((post-expansion-scope-action56_0) add-scope)"
 "((scopes57_0)"
-"(cons inside-sc_0(expand-context-scopes ctx_73)))"
+"(cons inside-sc_0(expand-context-scopes ctx_75)))"
 "((use-site-scopes58_0)(box null))"
 "((frame-id59_0) frame-id_2)"
 "((reference-records60_0)"
 "(cons"
 " frame-id_2"
-"(expand-context-reference-records ctx_73)))"
-"((inner61_0)(root-expand-context/outer-inner v_257)))"
+"(expand-context-reference-records ctx_75)))"
+"((inner61_0)(root-expand-context/outer-inner v_259)))"
 "(expand-context/outer1.1"
 " inner61_0"
 " post-expansion-scope55_0"
 " use-site-scopes58_0"
 " frame-id59_0"
 " context51_0"
-"(expand-context/outer-env the-struct_89)"
+"(expand-context/outer-env the-struct_90)"
 " post-expansion-scope-action56_0"
 " scopes57_0"
 " def-ctx-scopes54_0"
-"(expand-context/outer-binding-layer the-struct_89)"
+"(expand-context/outer-binding-layer the-struct_90)"
 " reference-records60_0"
 " only-immediate?53_0"
-"(expand-context/outer-need-eventually-defined the-struct_89)"
-"(expand-context/outer-current-introduction-scopes the-struct_89)"
+"(expand-context/outer-need-eventually-defined the-struct_90)"
+"(expand-context/outer-current-introduction-scopes the-struct_90)"
 " name52_1))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                   \"expand-context/outer?\""
-" the-struct_89))))))"
+" the-struct_90))))))"
 "(let-values(((maybe-increment-binding-layer_0)"
 "(lambda(ids_30 body-ctx_1)"
 "(begin"
 " 'maybe-increment-binding-layer"
 "(if(eq?"
 "(expand-context-binding-layer body-ctx_1)"
-"(expand-context-binding-layer ctx_73))"
+"(expand-context-binding-layer ctx_75))"
 "(increment-binding-layer ids_30 body-ctx_1 inside-sc_0)"
 "(expand-context-binding-layer body-ctx_1))))))"
-"(let-values(((name_79)(expand-context-name ctx_73)))"
+"(let-values(((name_78)(expand-context-name ctx_75)))"
 "((letrec-values(((loop_40)"
 "(lambda(body-ctx_2"
 " bodys_8"
@@ -62133,15 +62199,15 @@ static const char *startup_source =
 "(let-values(((body-ctx62_0) body-ctx_2)"
 "((frame-id63_0) frame-id_2)"
 "((def-ctx-scopes64_0) def-ctx-scopes_6)"
-"((temp65_4)(reverse$1 val-idss_0))"
-"((temp66_5)(reverse$1 val-keyss_0))"
+"((temp65_5)(reverse$1 val-idss_0))"
+"((temp66_6)(reverse$1 val-keyss_0))"
 "((temp67_2)(reverse$1 val-rhss_0))"
 "((temp68_4)(reverse$1 track-stxs_0))"
-"((temp69_5)(reverse$1 stx-clauses_0))"
-"((temp70_5)(reverse$1 done-bodys_0))"
+"((temp69_3)(reverse$1 stx-clauses_0))"
+"((temp70_4)(reverse$1 done-bodys_0))"
 "((s71_0) s_179)"
 "((stratified?72_0) stratified?_0)"
-"((name73_0) name_79)"
+"((name73_0) name_78)"
 "((temp74_1)(reverse$1 trans-idss_1)))"
 "(finish-expanding-body27.1"
 " temp74_1"
@@ -62151,12 +62217,12 @@ static const char *startup_source =
 " body-ctx62_0"
 " frame-id63_0"
 " def-ctx-scopes64_0"
-" temp65_4"
-" temp66_5"
+" temp65_5"
+" temp66_6"
 " temp67_2"
 " temp68_4"
-" temp69_5"
-" temp70_5)))"
+" temp69_3"
+" temp70_4)))"
 "(let-values()"
 "(let-values(((rest-bodys_0)(cdr bodys_8)))"
 "(let-values((()"
@@ -62174,55 +62240,55 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((exp-body_0)"
 "(let-values(((temp75_4)(car bodys_8))"
-"((temp76_3)"
-"(if(if name_79"
+"((temp76_2)"
+"(if(if name_78"
 "(null?"
 "(cdr bodys_8))"
 " #f)"
-"(let-values(((v_232)"
+"(let-values(((v_233)"
 " body-ctx_2))"
-"(let-values(((the-struct_90)"
-" v_232))"
+"(let-values(((the-struct_91)"
+" v_233))"
 "(if(expand-context/outer?"
-" the-struct_90)"
+" the-struct_91)"
 "(let-values(((name77_0)"
-" name_79)"
+" name_78)"
 "((inner78_0)"
 "(root-expand-context/outer-inner"
-" v_232)))"
+" v_233)))"
 "(expand-context/outer1.1"
 " inner78_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_90)"
+" the-struct_91)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_90)"
+" the-struct_91)"
 "(root-expand-context/outer-frame-id"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-context"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-env"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-scopes"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-binding-layer"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-reference-records"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-only-immediate?"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_90)"
+" the-struct_91)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_90)"
+" the-struct_91)"
 " name77_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                       \"expand-context/outer?\""
-" the-struct_90))))"
+" the-struct_91))))"
 " body-ctx_2)))"
 "(expand9.1"
 " #f"
@@ -62232,25 +62298,25 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp75_4"
-" temp76_3))))"
+" temp76_2))))"
 "(let-values(((disarmed-exp-body_0)"
 "(syntax-disarm$1 exp-body_0)))"
 "(let-values(((tmp_62)"
 "(core-form-sym"
 " disarmed-exp-body_0"
-" phase_144)))"
+" phase_143)))"
 "(if(equal? tmp_62 'begin)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_70)"
+"(let-values(((obs_68)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_70"
+"(if obs_68"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_70"
+" obs_68"
 " 'prim-begin)))"
 "(void)))"
 "(values))))"
@@ -62270,15 +62336,15 @@ static const char *startup_source =
 "(if(pair?"
 " s_426)"
 "(let-values(((begin81_0)"
-"(let-values(((s_500)"
+"(let-values(((s_502)"
 "(car"
 " s_426)))"
-" s_500))"
+" s_502))"
 "((e82_0)"
 "(let-values(((s_46)"
 "(cdr"
 " s_426)))"
-"(let-values(((s_503)"
+"(let-values(((s_505)"
 "(if(syntax?$1"
 " s_46)"
 "(syntax-e$1"
@@ -62286,7 +62352,7 @@ static const char *startup_source =
 " s_46)))"
 "(let-values(((flat-s_24)"
 "(to-syntax-list.1"
-" s_503)))"
+" s_505)))"
 "(if(not"
 " flat-s_24)"
 "(let-values()"
@@ -62319,14 +62385,14 @@ static const char *startup_source =
 "(map2 track_0 e80_0)"
 " rest-bodys_0)))"
 "(begin"
-"(let-values(((obs_61)"
+"(let-values(((obs_69)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_61"
+"(if obs_69"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_61"
+" obs_69"
 " 'splice"
 " splice-bodys_0)))"
 "(void)))"
@@ -62345,14 +62411,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_71)"
+"(let-values(((obs_70)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_71"
+"(if obs_70"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_71"
+" obs_70"
 " 'prim-define-values)))"
 "(void)))"
 "(values))))"
@@ -62360,38 +62426,38 @@ static const char *startup_source =
 " define-values83_0"
 " id84_0"
 " rhs85_0)"
-"(let-values(((s_504)"
+"(let-values(((s_506)"
 " disarmed-exp-body_0))"
 "(let-values(((orig-s_39)"
-" s_504))"
+" s_506))"
 "(let-values(((define-values83_1"
 " id84_1"
 " rhs85_1)"
 "(let-values(((s_94)"
 "(if(syntax?$1"
-" s_504)"
-"(syntax-e$1"
-" s_504)"
-" s_504)))"
-"(if(pair?"
-" s_94)"
-"(let-values(((define-values86_0)"
-"(let-values(((s_505)"
-"(car"
-" s_94)))"
-" s_505))"
-"((id87_0"
-" rhs88_0)"
-"(let-values(((s_506)"
-"(cdr"
-" s_94)))"
-"(let-values(((s_52)"
-"(if(syntax?$1"
 " s_506)"
 "(syntax-e$1"
 " s_506)"
 " s_506)))"
 "(if(pair?"
+" s_94)"
+"(let-values(((define-values86_0)"
+"(let-values(((s_507)"
+"(car"
+" s_94)))"
+" s_507))"
+"((id87_0"
+" rhs88_0)"
+"(let-values(((s_508)"
+"(cdr"
+" s_94)))"
+"(let-values(((s_52)"
+"(if(syntax?$1"
+" s_508)"
+"(syntax-e$1"
+" s_508)"
+" s_508)))"
+"(if(pair?"
 " s_52)"
 "(let-values(((id89_0)"
 "(let-values(((s_53)"
@@ -62479,32 +62545,32 @@ static const char *startup_source =
 "(reverse$1"
 " id_101))))))))"
 "((rhs90_0)"
-"(let-values(((s_507)"
+"(let-values(((s_509)"
 "(cdr"
 " s_52)))"
-"(let-values(((s_508)"
+"(let-values(((s_510)"
 "(if(syntax?$1"
-" s_507)"
+" s_509)"
 "(syntax-e$1"
-" s_507)"
-" s_507)))"
+" s_509)"
+" s_509)))"
 "(if(pair?"
-" s_508)"
+" s_510)"
 "(let-values(((rhs91_0)"
 "(let-values(((s_33)"
 "(car"
-" s_508)))"
+" s_510)))"
 " s_33))"
 "(()"
-"(let-values(((s_458)"
+"(let-values(((s_459)"
 "(cdr"
-" s_508)))"
+" s_510)))"
 "(let-values(((s_320)"
 "(if(syntax?$1"
-" s_458)"
+" s_459)"
 "(syntax-e$1"
-" s_458)"
-" s_458)))"
+" s_459)"
+" s_459)))"
 "(if(null?"
 " s_320)"
 "(values)"
@@ -62544,14 +62610,14 @@ static const char *startup_source =
 " body-ctx_2)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_72)"
+"(let-values(((obs_62)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_72"
+"(if obs_62"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_72"
+" obs_62"
 " 'rename-one"
 "(datum->syntax$1"
 " #f"
@@ -62564,7 +62630,7 @@ static const char *startup_source =
 "(let-values(((ids93_0)"
 " ids_31)"
 "((phase94_1)"
-" phase_144)"
+" phase_143)"
 "((exp-body95_0)"
 " exp-body_0)"
 "((dups96_0)"
@@ -62579,7 +62645,7 @@ static const char *startup_source =
 " #t))))"
 "(let-values(((counter_5)"
 "(root-expand-context-counter"
-" ctx_73)))"
+" ctx_75)))"
 "(let-values(((keys_5)"
 "(reverse$1"
 "(let-values(((lst_314)"
@@ -62614,7 +62680,7 @@ static const char *startup_source =
 "(let-values(((id97_1)"
 " id_83)"
 "((phase98_0)"
-" phase_144)"
+" phase_143)"
 "((counter99_0)"
 " counter_5)"
 "((frame-id100_0)"
@@ -62709,12 +62775,12 @@ static const char *startup_source =
 " lst_316"
 " lst_229)))))"
 "(loop_40"
-"(let-values(((v_104)"
+"(let-values(((v_98)"
 " body-ctx_2))"
-"(let-values(((the-struct_91)"
-" v_104))"
+"(let-values(((the-struct_92)"
+" v_98))"
 "(if(expand-context/outer?"
-" the-struct_91)"
+" the-struct_92)"
 "(let-values(((env102_0)"
 " extended-env_0)"
 "((binding-layer103_0)"
@@ -62723,39 +62789,39 @@ static const char *startup_source =
 " body-ctx_2))"
 "((inner104_0)"
 "(root-expand-context/outer-inner"
-" v_104)))"
+" v_98)))"
 "(expand-context/outer1.1"
 " inner104_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_91)"
+" the-struct_92)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(root-expand-context/outer-frame-id"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-context"
-" the-struct_91)"
+" the-struct_92)"
 " env102_0"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_91)"
+" the-struct_92)"
 " binding-layer103_0"
 "(expand-context/outer-reference-records"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-only-immediate?"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_91)"
+" the-struct_92)"
 "(expand-context/outer-name"
-" the-struct_91)))"
+" the-struct_92)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                      \"expand-context/outer?\""
-" the-struct_91))))"
+" the-struct_92))))"
 " rest-bodys_0"
 " null"
 "(cons"
@@ -62890,7 +62956,7 @@ static const char *startup_source =
 "(no-binds"
 " done-body_2"
 " s_179"
-" phase_144))"
+" phase_143))"
 " fold-var_305))))"
 "(values"
 " fold-var_306)))))"
@@ -62960,14 +63026,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_73)"
+"(let-values(((obs_71)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_73"
+"(if obs_71"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_73"
+" obs_71"
 " 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
@@ -62982,45 +63048,45 @@ static const char *startup_source =
 "(let-values(((define-syntaxes105_1"
 " id106_2"
 " rhs107_1)"
-"(let-values(((s_443)"
+"(let-values(((s_444)"
 "(if(syntax?$1"
 " s_102)"
 "(syntax-e$1"
 " s_102)"
 " s_102)))"
 "(if(pair?"
-" s_443)"
+" s_444)"
 "(let-values(((define-syntaxes108_0)"
 "(let-values(((s_211)"
 "(car"
-" s_443)))"
+" s_444)))"
 " s_211))"
 "((id109_0"
 " rhs110_0)"
-"(let-values(((s_509)"
-"(cdr"
-" s_443)))"
-"(let-values(((s_510)"
-"(if(syntax?$1"
-" s_509)"
-"(syntax-e$1"
-" s_509)"
-" s_509)))"
-"(if(pair?"
-" s_510)"
-"(let-values(((id111_0)"
 "(let-values(((s_511)"
-"(car"
-" s_510)))"
+"(cdr"
+" s_444)))"
 "(let-values(((s_512)"
 "(if(syntax?$1"
 " s_511)"
 "(syntax-e$1"
 " s_511)"
 " s_511)))"
+"(if(pair?"
+" s_512)"
+"(let-values(((id111_0)"
+"(let-values(((s_513)"
+"(car"
+" s_512)))"
+"(let-values(((s_514)"
+"(if(syntax?$1"
+" s_513)"
+"(syntax-e$1"
+" s_513)"
+" s_513)))"
 "(let-values(((flat-s_26)"
 "(to-syntax-list.1"
-" s_512)))"
+" s_514)))"
 "(if(not"
 " flat-s_26)"
 "(let-values()"
@@ -63046,7 +63112,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_322)"
-"(let-values(((s_513)"
+"(let-values(((s_515)"
 "(unsafe-car"
 " lst_322))"
 "((rest_187)"
@@ -63061,21 +63127,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_375)"
 "(if(syntax?$1"
-" s_513)"
+" s_515)"
 "(symbol?"
 "(syntax-e$1"
-" s_513))"
+" s_515))"
 " #f)))"
 "(if or-part_375"
 " or-part_375"
 "(symbol?"
-" s_513)))"
-" s_513"
+" s_515)))"
+" s_515"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_40"
-" s_513)))))"
+" s_515)))))"
 "(cons"
 " id114_0"
 " id_109)))))"
@@ -63094,32 +63160,32 @@ static const char *startup_source =
 "(reverse$1"
 " id_106))))))))"
 "((rhs112_0)"
-"(let-values(((s_514)"
-"(cdr"
-" s_510)))"
-"(let-values(((s_111)"
-"(if(syntax?$1"
-" s_514)"
-"(syntax-e$1"
-" s_514)"
-" s_514)))"
-"(if(pair?"
-" s_111)"
-"(let-values(((rhs113_0)"
-"(let-values(((s_515)"
-"(car"
-" s_111)))"
-" s_515))"
-"(()"
 "(let-values(((s_516)"
 "(cdr"
-" s_111)))"
-"(let-values(((s_159)"
+" s_512)))"
+"(let-values(((s_111)"
 "(if(syntax?$1"
 " s_516)"
 "(syntax-e$1"
 " s_516)"
 " s_516)))"
+"(if(pair?"
+" s_111)"
+"(let-values(((rhs113_0)"
+"(let-values(((s_517)"
+"(car"
+" s_111)))"
+" s_517))"
+"(()"
+"(let-values(((s_518)"
+"(cdr"
+" s_111)))"
+"(let-values(((s_159)"
+"(if(syntax?$1"
+" s_518)"
+"(syntax-e$1"
+" s_518)"
+" s_518)))"
 "(if(null?"
 " s_159)"
 "(values)"
@@ -63159,14 +63225,14 @@ static const char *startup_source =
 " body-ctx_2)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_74)"
+"(let-values(((obs_72)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_74"
+"(if obs_72"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_74"
+" obs_72"
 " 'rename-one"
 "(datum->syntax$1"
 " #f"
@@ -63179,7 +63245,7 @@ static const char *startup_source =
 "(let-values(((ids115_0)"
 " ids_32)"
 "((phase116_0)"
-" phase_144)"
+" phase_143)"
 "((exp-body117_0)"
 " exp-body_0)"
 "((dups118_0)"
@@ -63194,7 +63260,7 @@ static const char *startup_source =
 " #t))))"
 "(let-values(((counter_6)"
 "(root-expand-context-counter"
-" ctx_73)))"
+" ctx_75)))"
 "(let-values(((keys_6)"
 "(reverse$1"
 "(let-values(((lst_323)"
@@ -63229,7 +63295,7 @@ static const char *startup_source =
 "(let-values(((id119_0)"
 " id_111)"
 "((phase120_0)"
-" phase_144)"
+" phase_143)"
 "((counter121_0)"
 " counter_6)"
 "((frame-id122_0)"
@@ -63259,32 +63325,32 @@ static const char *startup_source =
 " lst_323))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_75)"
+"(let-values(((obs_73)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_75"
+"(if obs_73"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_75"
+" obs_73"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
-" ctx_73)"
+" ctx_75)"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_76)"
+"(let-values(((obs_74)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_76"
+"(if obs_74"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_76"
+" obs_74"
 " 'enter-bind)))"
 "(void)))"
 "(values))))"
@@ -63362,7 +63428,7 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_40"
 " id_112"
-" phase_144"
+" phase_143"
 " body-ctx_2)"
 "(env-extend"
 " env_23"
@@ -63386,23 +63452,23 @@ static const char *startup_source =
 " lst_325"
 " lst_326)))))"
 "(begin"
-"(let-values(((obs_77)"
+"(let-values(((obs_75)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_77"
+"(if obs_75"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_77"
+" obs_75"
 " 'exit-bind)))"
 "(void)))"
 "(loop_40"
-"(let-values(((v_258)"
+"(let-values(((v_260)"
 " body-ctx_2))"
-"(let-values(((the-struct_92)"
-" v_258))"
+"(let-values(((the-struct_93)"
+" v_260))"
 "(if(expand-context/outer?"
-" the-struct_92)"
+" the-struct_93)"
 "(let-values(((env124_0)"
 " extended-env_1)"
 "((binding-layer125_0)"
@@ -63411,39 +63477,39 @@ static const char *startup_source =
 " body-ctx_2))"
 "((inner126_0)"
 "(root-expand-context/outer-inner"
-" v_258)))"
+" v_260)))"
 "(expand-context/outer1.1"
 " inner126_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_92)"
+" the-struct_93)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_92)"
+" the-struct_93)"
 "(root-expand-context/outer-frame-id"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-context"
-" the-struct_92)"
+" the-struct_93)"
 " env124_0"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-scopes"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_92)"
+" the-struct_93)"
 " binding-layer125_0"
 "(expand-context/outer-reference-records"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-only-immediate?"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_92)"
+" the-struct_93)"
 "(expand-context/outer-name"
-" the-struct_92)))"
+" the-struct_93)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                  \"expand-context/outer?\""
-" the-struct_92))))"
+" the-struct_93))))"
 " rest-bodys_0"
 " done-bodys_0"
 " val-idss_0"
@@ -63487,7 +63553,7 @@ static const char *startup_source =
 "(cons"
 "(core-id"
 " '#%stratified-body"
-" phase_144)"
+" phase_143)"
 "(cons"
 " exp-body_0"
 " rest-bodys_0)))))"
@@ -63549,7 +63615,7 @@ static const char *startup_source =
 "(let-values(((done-bodys_1) done-bodys26_0))"
 "(let-values(((s_229) source10_0))"
 "(let-values(((stratified?_1) stratified?11_0))"
-"(let-values(((name_80) name12_0))"
+"(let-values(((name_79) name12_0))"
 "(let-values(((disappeared-transformer-bindings_0) disappeared-transformer-bindings13_0))"
 "(let-values()"
 "(let-values((()"
@@ -63563,12 +63629,12 @@ static const char *startup_source =
 "(void))"
 "(values))))"
 "(let-values(((finish-ctx_0)"
-"(let-values(((v_259)"
+"(let-values(((v_261)"
 "(accumulate-def-ctx-scopes"
 " body-ctx_3"
 " def-ctx-scopes_7)))"
-"(let-values(((the-struct_93) v_259))"
-"(if(expand-context/outer? the-struct_93)"
+"(let-values(((the-struct_94) v_261))"
+"(if(expand-context/outer? the-struct_94)"
 "(let-values(((context127_0) 'expression)"
 "((use-site-scopes128_0)(box null))"
 "((scopes129_0)"
@@ -63581,29 +63647,29 @@ static const char *startup_source =
 "((def-ctx-scopes131_0) #f)"
 "((post-expansion-scope132_0) #f)"
 "((inner133_0)"
-"(root-expand-context/outer-inner v_259)))"
+"(root-expand-context/outer-inner v_261)))"
 "(expand-context/outer1.1"
 " inner133_0"
 " post-expansion-scope132_0"
 " use-site-scopes128_0"
-"(root-expand-context/outer-frame-id the-struct_93)"
+"(root-expand-context/outer-frame-id the-struct_94)"
 " context127_0"
-"(expand-context/outer-env the-struct_93)"
+"(expand-context/outer-env the-struct_94)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_93)"
+" the-struct_94)"
 " scopes129_0"
 " def-ctx-scopes131_0"
-"(expand-context/outer-binding-layer the-struct_93)"
-"(expand-context/outer-reference-records the-struct_93)"
+"(expand-context/outer-binding-layer the-struct_94)"
+"(expand-context/outer-reference-records the-struct_94)"
 " only-immediate?130_0"
-"(expand-context/outer-need-eventually-defined the-struct_93)"
+"(expand-context/outer-need-eventually-defined the-struct_94)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_93)"
-"(expand-context/outer-name the-struct_93)))"
+" the-struct_94)"
+"(expand-context/outer-name the-struct_94)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                         \"expand-context/outer?\""
-" the-struct_93))))))"
+" the-struct_94))))))"
 "(let-values(((finish-bodys_0)"
 "(lambda()"
 "(begin"
@@ -63614,28 +63680,28 @@ static const char *startup_source =
 "(if block->list?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_78)"
+"(let-values(((obs_76)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_78"
+"(if obs_76"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_78"
+" obs_76"
 " 'next-group)))"
 "(void)))))"
 "(values))))"
 "(let-values(((last-i_1)(sub1(length done-bodys_1))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_79)"
+"(let-values(((obs_77)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_79"
+"(if obs_77"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_79"
+" obs_77"
 " 'enter-list"
 "(datum->syntax$1"
 " #f"
@@ -63683,68 +63749,68 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_80)"
+"(let-values(((obs_78)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_80"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_80"
+" obs_78"
 " 'next)))"
 "(void)))"
 "(let-values(((done-body134_0)"
 " done-body_4)"
 "((temp135_3)"
-"(if(if name_80"
+"(if(if name_79"
 "(="
 " i_191"
 " last-i_1)"
 " #f)"
-"(let-values(((v_260)"
+"(let-values(((v_262)"
 " finish-ctx_0))"
-"(let-values(((the-struct_94)"
-" v_260))"
+"(let-values(((the-struct_95)"
+" v_262))"
 "(if(expand-context/outer?"
-" the-struct_94)"
+" the-struct_95)"
 "(let-values(((name136_0)"
-" name_80)"
+" name_79)"
 "((inner137_0)"
 "(root-expand-context/outer-inner"
-" v_260)))"
+" v_262)))"
 "(expand-context/outer1.1"
 " inner137_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_94)"
+" the-struct_95)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(root-expand-context/outer-frame-id"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-context"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-env"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-binding-layer"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-reference-records"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-only-immediate?"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_94)"
+" the-struct_95)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_94)"
+" the-struct_95)"
 " name136_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                         \"expand-context/outer?\""
-" the-struct_94))))"
+" the-struct_95))))"
 " finish-ctx_0)))"
 "(expand9.1"
 " #f"
@@ -63773,13 +63839,13 @@ static const char *startup_source =
 " lst_329"
 " start_65))))))"
 "(begin"
-"(let-values(((obs_81)"
+"(let-values(((obs_79)"
 "(expand-context-observer body-ctx_3)))"
-"(if obs_81"
+"(if obs_79"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_81"
+" obs_79"
 " 'exit-list"
 "(datum->syntax$1 #f exp-bodys_0))))"
 "(void)))"
@@ -63788,12 +63854,12 @@ static const char *startup_source =
 "(if(if(null? val-idss_1)(null? disappeared-transformer-bindings_0) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_82)(expand-context-observer finish-ctx_0)))"
-"(if obs_82"
+"(let-values(((obs_80)(expand-context-observer finish-ctx_0)))"
+"(if obs_80"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_82"
+" obs_80"
 " 'block->list"
 "(datum->syntax$1 s_229 done-bodys_1))))"
 "(void)))"
@@ -63801,12 +63867,12 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_83)"
+"(let-values(((obs_81)"
 "(expand-context-observer finish-ctx_0)))"
-"(if obs_83"
+"(if obs_81"
 "(let-values()"
 "(log-letrec-values$1"
-" obs_83"
+" obs_81"
 " finish-ctx_0"
 " s_229"
 " val-idss_1"
@@ -63841,13 +63907,13 @@ static const char *startup_source =
 " val-rhss140_0"
 " track-stxs141_0))))"
 "(begin"
-"(let-values(((obs_84)(expand-context-observer body-ctx_3)))"
-"(if obs_84"
+"(let-values(((obs_82)(expand-context-observer body-ctx_3)))"
+"(if obs_82"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_84 'exit-prim exp-s_13)"
-"(call-expand-observe obs_84 'return exp-s_13))))"
+"(call-expand-observe obs_82 'exit-prim exp-s_13)"
+"(call-expand-observe obs_82 'return exp-s_13))))"
 "(void)))"
 "(if(expand-context-to-parsed? body-ctx_3)"
 "(list exp-s_13)"
@@ -63876,13 +63942,13 @@ static const char *startup_source =
 "(let-values(((track-stxs_2) track-stxs47_0))"
 "(let-values(((split?_0) split?30_0))"
 "(let-values(((frame-id_14) frame-id31_0))"
-"(let-values(((ctx_74) ctx32_0))"
+"(let-values(((ctx_76) ctx32_0))"
 "(let-values(((s_369) source33_0))"
 "(let-values(((had-stxes?_0) had-stxes?34_0))"
 "(let-values(((get-body_0) get-body35_0))"
 "(let-values(((track?_1) track?36_0))"
 "(let-values()"
-"(let-values(((phase_145)(expand-context-phase ctx_74)))"
+"(let-values(((phase_144)(expand-context-phase ctx_76)))"
 "((letrec-values(((loop_121)"
 "(lambda(idss_2"
 " keyss_1"
@@ -63904,7 +63970,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((exp-body_1)(get-body_0)))"
 "(let-values(((result-s_9)"
-"(if(expand-context-to-parsed? ctx_74)"
+"(if(expand-context-to-parsed? ctx_76)"
 "(if(null? accum-idss_0)"
 "(parsed-let-values17.1"
 "(keep-properties-only s_369)"
@@ -63927,10 +63993,10 @@ static const char *startup_source =
 "(if(null? accum-idss_0)"
 "(core-id"
 " 'let-values"
-" phase_145)"
+" phase_144)"
 "(core-id"
 " 'letrec-values"
-" phase_145))"
+" phase_144))"
 "(build-clauses"
 " accum-idss_0"
 " accum-rhss_0"
@@ -63942,16 +64008,16 @@ static const char *startup_source =
 " s150_0"
 " temp151_3)))))"
 "(begin"
-"(let-values(((obs_85)"
-"(expand-context-observer ctx_74)))"
-"(if obs_85"
+"(let-values(((obs_83)"
+"(expand-context-observer ctx_76)))"
+"(if obs_83"
 "(let-values()"
 "(if(if can-log?_0"
-"(log-tag? had-stxes?_0 ctx_74)"
+"(log-tag? had-stxes?_0 ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_85"
+" obs_83"
 " 'tag"
 " result-s_9))"
 "(void)))"
@@ -63960,13 +64026,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_86)"
+"(let-values(((obs_84)"
 "(expand-context-observer"
-" ctx_74)))"
-"(if obs_86"
+" ctx_76)))"
+"(if obs_84"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_86 'next)))"
+"(call-expand-observe obs_84 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((ids_33)(car idss_2)))"
@@ -63974,7 +64040,7 @@ static const char *startup_source =
 "(let-values(((temp152_2)(car rhss_2))"
 "((temp153_1)"
 "(as-named-context"
-" ctx_74"
+" ctx_76"
 " ids_33)))"
 "(expand9.1"
 " #f"
@@ -64025,7 +64091,7 @@ static const char *startup_source =
 " #f)))"
 "(let-values(((result-s_10)"
 "(if(expand-context-to-parsed?"
-" ctx_74)"
+" ctx_76)"
 "(parsed-let-values17.1"
 "(keep-properties-only"
 " s_369)"
@@ -64043,7 +64109,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'let-values"
-" phase_145)"
+" phase_144)"
 "(list"
 "(build-clause"
 " ids_33"
@@ -64056,19 +64122,19 @@ static const char *startup_source =
 " s155_1"
 " temp156_0)))))"
 "(begin"
-"(let-values(((obs_87)"
+"(let-values(((obs_85)"
 "(expand-context-observer"
-" ctx_74)))"
-"(if obs_87"
+" ctx_76)))"
+"(if obs_85"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
 " had-stxes?_0"
-" ctx_74)"
+" ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_87"
+" obs_85"
 " 'tag"
 " result-s_10))"
 "(void)))"
@@ -64098,7 +64164,7 @@ static const char *startup_source =
 " #f)))"
 "(let-values(((result-s_11)"
 "(if(expand-context-to-parsed?"
-" ctx_74)"
+" ctx_76)"
 "(parsed-letrec-values18.1"
 "(keep-properties-only"
 " s_369)"
@@ -64124,7 +64190,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'letrec-values"
-" phase_145)"
+" phase_144)"
 "(build-clauses"
 "(cons"
 " ids_33"
@@ -64142,19 +64208,19 @@ static const char *startup_source =
 " s158_0"
 " temp159_1)))))"
 "(begin"
-"(let-values(((obs_88)"
+"(let-values(((obs_86)"
 "(expand-context-observer"
-" ctx_74)))"
-"(if obs_88"
+" ctx_76)))"
+"(if obs_86"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
 " had-stxes?_0"
-" ctx_74)"
+" ctx_76)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_88"
+" obs_86"
 " 'tag"
 " result-s_11))"
 "(void)))"
@@ -64199,22 +64265,22 @@ static const char *startup_source =
 "(if track-stx_1(syntax-track-origin$1 clause_2 track-stx_1) clause_2)))))"
 "(define-values"
 "(no-binds)"
-"(lambda(expr_10 s_517 phase_146)"
+"(lambda(expr_10 s_519 phase_145)"
 "(begin"
-"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_146)))"
+"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_145)))"
 "(datum->syntax$1"
-"(core-id '#%app phase_146)"
-"(list(core-id 'begin phase_146) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
-" s_517)))))"
+"(core-id '#%app phase_145)"
+"(list(core-id 'begin phase_145) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
+" s_519)))))"
 "(define-values"
 "(log-tag?)"
-"(lambda(had-stxes?_1 ctx_75)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_75)) #f))))"
+"(lambda(had-stxes?_1 ctx_77)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_77)) #f))))"
 "(define-values"
 "(log-letrec-values$1)"
-"(lambda(obs_89 ctx_76 s_518 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
+"(lambda(obs_87 ctx_78 s_520 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
 "(begin"
 " 'log-letrec-values"
-"(let-values(((phase_147)(expand-context-phase ctx_76)))"
+"(let-values(((phase_146)(expand-context-phase ctx_78)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
 "(let-values(((lst_124) val-idss_2)((lst_331) val-rhss_2)((lst_332) track-stxs_4))"
@@ -64261,65 +64327,65 @@ static const char *startup_source =
 " lst_331"
 " lst_332))))))"
 "(let-values(((had-stxes?_2)(not(null? stx-clauses_2))))"
-"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_147)))"
+"(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_146)))"
 "(let-values(((lv-s_0)"
 "(datum->syntax$1"
 " #f"
 "(if had-stxes?_2"
 "(list* lv-id_0 stx-clauses_2 clauses_0 done-bodys_2)"
 "(list* lv-id_0 clauses_0 done-bodys_2))"
-" s_518)))"
+" s_520)))"
 "(begin"
-"(call-expand-observe obs_89 'block->letrec(list lv-s_0))"
-"(call-expand-observe obs_89 'visit lv-s_0)"
-"(call-expand-observe obs_89 'resolve lv-id_0)"
-"(call-expand-observe obs_89 'enter-prim lv-s_0)"
+"(call-expand-observe obs_87 'block->letrec(list lv-s_0))"
+"(call-expand-observe obs_87 'visit lv-s_0)"
+"(call-expand-observe obs_87 'resolve lv-id_0)"
+"(call-expand-observe obs_87 'enter-prim lv-s_0)"
 "(if had-stxes?_2"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_89 'prim-letrec-syntaxes+values)"
+"(call-expand-observe obs_87 'prim-letrec-syntaxes+values)"
 "(call-expand-observe"
-" obs_89"
+" obs_87"
 " 'letrec-syntaxes-renames"
 " stx-clauses_2"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_518))"
-"(call-expand-observe obs_89 'prepare-env)"
-"(call-expand-observe obs_89 'next-group)"
+"(datum->syntax$1 #f done-bodys_2 s_520))"
+"(call-expand-observe obs_87 'prepare-env)"
+"(call-expand-observe obs_87 'next-group)"
 "(if(null? val-idss_2)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_89 'prim-letrec-values)"
+"(call-expand-observe obs_87 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_89"
+" obs_87"
 " 'let-renames"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_518)))))))"
+"(datum->syntax$1 #f done-bodys_2 s_520)))))))"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_89 'prim-letrec-values)"
+"(call-expand-observe obs_87 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_89"
+" obs_87"
 " 'let-renames"
 " clauses_0"
-"(datum->syntax$1 #f done-bodys_2 s_518))))))))))))))"
+"(datum->syntax$1 #f done-bodys_2 s_520))))))))))))))"
 "(define-values"
 "(lambda-clause-expander)"
-"(lambda(s_73 disarmed-s_5 formals_1 bodys_9 ctx_77 log-renames-tag_0)"
+"(lambda(s_73 disarmed-s_5 formals_1 bodys_9 ctx_79 log-renames-tag_0)"
 "(begin"
 "(let-values(((sc_35)(new-scope 'local)))"
-"(let-values(((phase_148)(expand-context-phase ctx_77)))"
+"(let-values(((phase_147)(expand-context-phase ctx_79)))"
 "(let-values(((ids_35)(parse-and-flatten-formals formals_1 sc_35 disarmed-s_5)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ids34_0) ids_35)"
-"((phase35_2) phase_148)"
+"((phase35_2) phase_147)"
 "((s36_0) s_73)"
 "                                         ((temp37_5) \"argument name\"))"
 "(check-no-duplicate-ids8.1 temp37_5 #t ids34_0 phase35_2 s36_0 #f #f))"
 "(values))))"
-"(let-values(((counter_7)(root-expand-context-counter ctx_77)))"
+"(let-values(((counter_7)(root-expand-context-counter ctx_79)))"
 "(let-values(((keys_7)"
 "(reverse$1"
 "(let-values(((lst_87) ids_35))"
@@ -64342,8 +64408,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id38_1)"
 " id_113)"
-"((phase39_1)"
-" phase_148)"
+"((phase39_2)"
+" phase_147)"
 "((counter40_0)"
 " counter_7)"
 "((s41_0)"
@@ -64354,7 +64420,7 @@ static const char *startup_source =
 " s41_0"
 " #t"
 " id38_1"
-" phase39_1"
+" phase39_2"
 " counter40_0)))"
 " fold-var_34))))"
 "(values fold-var_157)))))"
@@ -64398,7 +64464,7 @@ static const char *startup_source =
 " env_26)))"
 " env_25)))))"
 " for-loop_48)"
-"(expand-context-env ctx_77)"
+"(expand-context-env ctx_79)"
 " lst_80"
 " lst_90)))))"
 "(let-values(((sc-formals_0)(add-scope formals_1 sc_35)))"
@@ -64437,74 +64503,74 @@ static const char *startup_source =
 " lst_17))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_90)(expand-context-observer ctx_77)))"
-"(if obs_90"
+"(let-values(((obs_88)(expand-context-observer ctx_79)))"
+"(if obs_88"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_90"
+" obs_88"
 " log-renames-tag_0"
 " sc-formals_0"
 "(datum->syntax$1 #f sc-bodys_0))))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_4)"
-"(let-values(((v_261) ctx_77))"
-"(let-values(((the-struct_95) v_261))"
-"(if(expand-context/outer? the-struct_95)"
+"(let-values(((v_263) ctx_79))"
+"(let-values(((the-struct_96) v_263))"
+"(if(expand-context/outer? the-struct_96)"
 "(let-values(((env42_0) body-env_0)"
-"((scopes43_1)(cons sc_35(expand-context-scopes ctx_77)))"
+"((scopes43_1)(cons sc_35(expand-context-scopes ctx_79)))"
 "((binding-layer44_0)"
-"(increment-binding-layer ids_35 ctx_77 sc_35))"
+"(increment-binding-layer ids_35 ctx_79 sc_35))"
 "((frame-id45_0) #f)"
-"((inner46_0)(root-expand-context/outer-inner v_261)))"
+"((inner46_0)(root-expand-context/outer-inner v_263)))"
 "(expand-context/outer1.1"
 " inner46_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_95)"
-"(root-expand-context/outer-use-site-scopes the-struct_95)"
+"(root-expand-context/outer-post-expansion-scope the-struct_96)"
+"(root-expand-context/outer-use-site-scopes the-struct_96)"
 " frame-id45_0"
-"(expand-context/outer-context the-struct_95)"
+"(expand-context/outer-context the-struct_96)"
 " env42_0"
-"(expand-context/outer-post-expansion-scope-action the-struct_95)"
+"(expand-context/outer-post-expansion-scope-action the-struct_96)"
 " scopes43_1"
-"(expand-context/outer-def-ctx-scopes the-struct_95)"
+"(expand-context/outer-def-ctx-scopes the-struct_96)"
 " binding-layer44_0"
-"(expand-context/outer-reference-records the-struct_95)"
-"(expand-context/outer-only-immediate? the-struct_95)"
-"(expand-context/outer-need-eventually-defined the-struct_95)"
-"(expand-context/outer-current-introduction-scopes the-struct_95)"
-"(expand-context/outer-name the-struct_95)))"
+"(expand-context/outer-reference-records the-struct_96)"
+"(expand-context/outer-only-immediate? the-struct_96)"
+"(expand-context/outer-need-eventually-defined the-struct_96)"
+"(expand-context/outer-current-introduction-scopes the-struct_96)"
+"(expand-context/outer-name the-struct_96)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                               \"expand-context/outer?\""
-" the-struct_95))))))"
+" the-struct_96))))))"
 "(let-values(((exp-body_2)"
 "(let-values(((sc-bodys47_0) sc-bodys_0)"
 "((body-ctx48_0) body-ctx_4)"
-"((temp49_3)"
-"(let-values(((ctx50_1) ctx_77)((s51_1) s_73)((temp52_5) #t))"
-"(keep-as-needed120.1 #f #f temp52_5 #t #f #f ctx50_1 s51_1))))"
-"(expand-body7.1 temp49_3 #f #f sc-bodys47_0 body-ctx48_0))))"
+"((temp49_2)"
+"(let-values(((ctx50_1) ctx_79)((s51_1) s_73)((temp52_6) #t))"
+"(keep-as-needed120.1 #f #f temp52_6 #t #f #f ctx50_1 s51_1))))"
+"(expand-body7.1 temp49_2 #f #f sc-bodys47_0 body-ctx48_0))))"
 "(values"
-"(if(expand-context-to-parsed? ctx_77)"
+"(if(expand-context-to-parsed? ctx_79)"
 "(unflatten-like-formals keys_7 formals_1)"
 " sc-formals_0)"
 " exp-body_2))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'lambda"
-"(lambda(s_13 ctx_78)"
+"(lambda(s_13 ctx_80)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_91)(expand-context-observer ctx_78)))"
-"(if obs_91(let-values()(let-values()(call-expand-observe obs_91 'prim-lambda)))(void)))"
+"(let-values(((obs_89)(expand-context-observer ctx_80)))"
+"(if obs_89(let-values()(let-values()(call-expand-observe obs_89 'prim-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_6)(syntax-disarm$1 s_13)))"
 "(let-values(((ok?_36 lambda53_0 formals54_0 body55_0)"
-"(let-values(((s_519) disarmed-s_6))"
-"(let-values(((orig-s_41) s_519))"
+"(let-values(((s_521) disarmed-s_6))"
+"(let-values(((orig-s_41) s_521))"
 "(let-values(((lambda53_1 formals54_1 body55_1)"
-"(let-values(((s_172)(if(syntax?$1 s_519)(syntax-e$1 s_519) s_519)))"
+"(let-values(((s_172)(if(syntax?$1 s_521)(syntax-e$1 s_521) s_521)))"
 "(if(pair? s_172)"
 "(let-values(((lambda56_0)(let-values(((s_45)(car s_172))) s_45))"
 "((formals57_0 body58_0)"
@@ -64519,13 +64585,13 @@ static const char *startup_source =
 " s_174))"
 "((body60_0)"
 "(let-values(((s_175)(cdr s_82)))"
-"(let-values(((s_500)"
+"(let-values(((s_502)"
 "(if(syntax?$1 s_175)"
 "(syntax-e$1 s_175)"
 " s_175)))"
 "(let-values(((flat-s_27)"
 "(to-syntax-list.1"
-" s_500)))"
+" s_502)))"
 "(if(not flat-s_27)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -64546,29 +64612,29 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_41)))))"
 "(values #t lambda53_1 formals54_1 body55_1))))))"
 "(let-values(((rebuild-s_4)"
-"(let-values(((ctx61_0) ctx_78)((s62_0) s_13)((temp63_6) #t))"
-"(keep-as-needed120.1 #f #f #f #f temp63_6 #t ctx61_0 s62_0))))"
+"(let-values(((ctx61_0) ctx_80)((s62_2) s_13)((temp63_5) #t))"
+"(keep-as-needed120.1 #f #f #f #f temp63_5 #t ctx61_0 s62_2))))"
 "(let-values(((formals_2 body_13)"
-"(lambda-clause-expander s_13 disarmed-s_6 formals54_0 body55_0 ctx_78 'lambda-renames)))"
-"(if(expand-context-to-parsed? ctx_78)"
+"(lambda-clause-expander s_13 disarmed-s_6 formals54_0 body55_0 ctx_80 'lambda-renames)))"
+"(if(expand-context-to-parsed? ctx_80)"
 "(parsed-lambda5.1 rebuild-s_4 formals_2 body_13)"
-"(let-values(((rebuild-s64_0) rebuild-s_4)((temp65_5)(list* lambda53_0 formals_2 body_13)))"
-"(rebuild5.1 #f #f rebuild-s64_0 temp65_5)))))))))))"
+"(let-values(((rebuild-s64_0) rebuild-s_4)((temp65_6)(list* lambda53_0 formals_2 body_13)))"
+"(rebuild5.1 #f #f rebuild-s64_0 temp65_6)))))))))))"
 "(void"
 "(add-core-form!*"
 " 'λ"
 "(lambda(s_26)"
 "(let-values(((ok?_37 lam-id66_0 formals67_0 _68_0)"
-"(let-values(((s_504) s_26))"
-"(let-values(((orig-s_39) s_504))"
+"(let-values(((s_506) s_26))"
+"(let-values(((orig-s_39) s_506))"
 "(let-values(((lam-id66_1 formals67_1 _68_1)"
-"(let-values(((s_94)(if(syntax?$1 s_504)(syntax-e$1 s_504) s_504)))"
+"(let-values(((s_94)(if(syntax?$1 s_506)(syntax-e$1 s_506) s_506)))"
 "(if(pair? s_94)"
-"(let-values(((lam-id69_0)(let-values(((s_505)(car s_94))) s_505))"
+"(let-values(((lam-id69_0)(let-values(((s_507)(car s_94))) s_507))"
 "((formals70_0 _71_1)"
-"(let-values(((s_506)(cdr s_94)))"
+"(let-values(((s_508)(cdr s_94)))"
 "(let-values(((s_52)"
-"(if(syntax?$1 s_506)(syntax-e$1 s_506) s_506)))"
+"(if(syntax?$1 s_508)(syntax-e$1 s_508) s_508)))"
 "(if(pair? s_52)"
 "(let-values(((formals72_0)"
 "(let-values(((s_53)(car s_52))) s_53))"
@@ -64599,39 +64665,39 @@ static const char *startup_source =
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_39)))))"
 "(values #t lam-id66_1 formals67_1 _68_1))))))"
 "(let-values(((ids_36)(parse-and-flatten-formals formals67_0 #f s_26)))"
-"(let-values(((ctx_79)(let-values(((temp78_3) #t))(get-current-expand-context17.1 temp78_3 #t #f #f))))"
-"(let-values(((phase_149)(if ctx_79(expand-context-phase ctx_79) 0)))"
+"(let-values(((ctx_81)(let-values(((temp78_4) #t))(get-current-expand-context17.1 temp78_4 #t #f #f))))"
+"(let-values(((phase_148)(if ctx_81(expand-context-phase ctx_81) 0)))"
 "(begin"
-"               (let-values (((ids74_0) ids_36) ((phase75_0) phase_149) ((s76_2) s_26) ((temp77_4) \"argument name\"))"
-"(check-no-duplicate-ids8.1 temp77_4 #t ids74_0 phase75_0 s76_2 #f #f))"
+"               (let-values (((ids74_0) ids_36) ((phase75_0) phase_148) ((s76_2) s_26) ((temp77_3) \"argument name\"))"
+"(check-no-duplicate-ids8.1 temp77_3 #t ids74_0 phase75_0 s76_2 #f #f))"
 "(datum->syntax$1"
 " s_26"
 "(cons"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_149) 'lambda lam-id66_0 lam-id66_0)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_148) 'lambda lam-id66_0 lam-id66_0)"
 "(cdr(syntax-e$1 s_26)))"
 " s_26"
 " s_26)))))))))"
 "(void"
 "(add-core-form!*"
 " 'case-lambda"
-"(lambda(s_520 ctx_80)"
+"(lambda(s_522 ctx_82)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_92)(expand-context-observer ctx_80)))"
-"(if obs_92"
-"(let-values()(let-values()(call-expand-observe obs_92 'prim-case-lambda)))"
+"(let-values(((obs_90)(expand-context-observer ctx_82)))"
+"(if obs_90"
+"(let-values()(let-values()(call-expand-observe obs_90 'prim-case-lambda)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_7)(syntax-disarm$1 s_520)))"
+"(let-values(((disarmed-s_7)(syntax-disarm$1 s_522)))"
 "(let-values(((ok?_1 case-lambda79_0 formals80_0 body81_0)"
-"(let-values(((s_439) disarmed-s_7))"
-"(let-values(((orig-s_42) s_439))"
+"(let-values(((s_440) disarmed-s_7))"
+"(let-values(((orig-s_42) s_440))"
 "(let-values(((case-lambda79_1 formals80_1 body81_1)"
-"(let-values(((s_521)(if(syntax?$1 s_439)(syntax-e$1 s_439) s_439)))"
-"(if(pair? s_521)"
-"(let-values(((case-lambda82_0)(let-values(((s_37)(car s_521))) s_37))"
+"(let-values(((s_523)(if(syntax?$1 s_440)(syntax-e$1 s_440) s_440)))"
+"(if(pair? s_523)"
+"(let-values(((case-lambda82_0)(let-values(((s_37)(car s_523))) s_37))"
 "((formals83_0 body84_0)"
-"(let-values(((s_65)(cdr s_521)))"
+"(let-values(((s_65)(cdr s_523)))"
 "(let-values(((s_435)"
 "(if(syntax?$1 s_65)"
 "(syntax-e$1 s_65)"
@@ -64689,18 +64755,18 @@ static const char *startup_source =
 " s_205)))"
 " s_97))"
 "((body86_0)"
-"(let-values(((s_462)"
+"(let-values(((s_463)"
 "(cdr"
 " s_205)))"
-"(let-values(((s_463)"
+"(let-values(((s_464)"
 "(if(syntax?$1"
-" s_462)"
+" s_463)"
 "(syntax-e$1"
-" s_462)"
-" s_462)))"
+" s_463)"
+" s_463)))"
 "(let-values(((flat-s_30)"
 "(to-syntax-list.1"
-" s_463)))"
+" s_464)))"
 "(if(not"
 " flat-s_30)"
 "(let-values()"
@@ -64757,20 +64823,20 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_42)))))"
 "(values #t case-lambda79_1 formals80_1 body81_1))))))"
 "(let-values(((ok?_38 case-lambda87_0 clause88_0)"
-"(let-values(((s_464) disarmed-s_7))"
-"(let-values(((orig-s_43) s_464))"
+"(let-values(((s_465) disarmed-s_7))"
+"(let-values(((orig-s_43) s_465))"
 "(let-values(((case-lambda87_1 clause88_1)"
-"(let-values(((s_522)(if(syntax?$1 s_464)(syntax-e$1 s_464) s_464)))"
-"(if(pair? s_522)"
+"(let-values(((s_524)(if(syntax?$1 s_465)(syntax-e$1 s_465) s_465)))"
+"(if(pair? s_524)"
 "(let-values(((case-lambda89_0)"
-"(let-values(((s_523)(car s_522))) s_523))"
+"(let-values(((s_525)(car s_524))) s_525))"
 "((clause90_0)"
-"(let-values(((s_421)(cdr s_522)))"
-"(let-values(((s_524)"
+"(let-values(((s_421)(cdr s_524)))"
+"(let-values(((s_526)"
 "(if(syntax?$1 s_421)"
 "(syntax-e$1 s_421)"
 " s_421)))"
-"(let-values(((flat-s_31)(to-syntax-list.1 s_524)))"
+"(let-values(((flat-s_31)(to-syntax-list.1 s_526)))"
 "(if(not flat-s_31)"
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_43))"
@@ -64779,8 +64845,8 @@ static const char *startup_source =
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_43)))))"
 "(values #t case-lambda87_1 clause88_1))))))"
 "(let-values(((rebuild-s_5)"
-"(let-values(((ctx93_0) ctx_80)((s94_0) s_520)((temp95_1) #t))"
-"(keep-as-needed120.1 #f #f #f #f temp95_1 #t ctx93_0 s94_0))))"
+"(let-values(((ctx93_0) ctx_82)((s94_0) s_522)((temp95_2) #t))"
+"(keep-as-needed120.1 #f #f #f #f temp95_2 #t ctx93_0 s94_0))))"
 "(let-values(((clauses_1)"
 "(reverse$1"
 "(let-values(((lst_336) formals80_0)((lst_110) body81_0)((lst_337) clause88_0))"
@@ -64815,20 +64881,20 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_93)"
+"(let-values(((obs_91)"
 "(expand-context-observer"
-" ctx_80)))"
-"(if obs_93"
+" ctx_82)))"
+"(if obs_91"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_93"
+" obs_91"
 " 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((rebuild-clause_0)"
 "(let-values(((ctx96_1)"
-" ctx_80)"
+" ctx_82)"
 "((clause97_0)"
 " clause_3))"
 "(keep-as-needed120.1"
@@ -64843,14 +64909,14 @@ static const char *startup_source =
 "(let-values(((exp-formals_0"
 " exp-body_3)"
 "(lambda-clause-expander"
-" s_520"
+" s_522"
 " disarmed-s_7"
 " formals_8"
 " body_19"
-" ctx_80"
+" ctx_82"
 " 'lambda-renames)))"
 "(if(expand-context-to-parsed?"
-" ctx_80)"
+" ctx_82)"
 "(list"
 " exp-formals_0"
 " exp-body_3)"
@@ -64876,13 +64942,13 @@ static const char *startup_source =
 " lst_336"
 " lst_110"
 " lst_337))))))"
-"(if(expand-context-to-parsed? ctx_80)"
+"(if(expand-context-to-parsed? ctx_82)"
 "(parsed-case-lambda6.1 rebuild-s_5 clauses_1)"
-"(let-values(((rebuild-s100_0) rebuild-s_5)((temp101_5)(list* case-lambda79_0 clauses_1)))"
-"(rebuild5.1 #f #f rebuild-s100_0 temp101_5))))))))))))"
+"(let-values(((rebuild-s100_0) rebuild-s_5)((temp101_4)(list* case-lambda79_0 clauses_1)))"
+"(rebuild5.1 #f #f rebuild-s100_0 temp101_4))))))))))))"
 "(define-values"
 "(parse-and-flatten-formals)"
-"(lambda(all-formals_0 sc_36 s_525)"
+"(lambda(all-formals_0 sc_36 s_527)"
 "(begin"
 "((letrec-values(((loop_122)"
 "(lambda(formals_9)"
@@ -64897,21 +64963,21 @@ static const char *startup_source =
 "(let-values()(loop_122 p_87))"
 "(if(null? p_87)"
 "(let-values() null)"
-"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_525 p_87))))))"
+"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_527 p_87))))))"
 "(if(pair? formals_9)"
 "(let-values()"
 "(begin"
 "(if(identifier?(car formals_9))"
 "(void)"
 "(let-values()"
-"                                          (raise-syntax-error$1 #f \"not an identifier\" s_525 (car formals_9))))"
+"                                          (raise-syntax-error$1 #f \"not an identifier\" s_527 (car formals_9))))"
 "(cons"
 "(if sc_36(add-scope(car formals_9) sc_36)(car formals_9))"
 "(loop_122(cdr formals_9)))))"
 "(if(null? formals_9)"
 "(let-values() null)"
 "(let-values()"
-"                                      (raise-syntax-error$1 \"bad argument sequence\" s_525 all-formals_0))))))))))"
+"                                      (raise-syntax-error$1 \"bad argument sequence\" s_527 all-formals_0))))))))))"
 " loop_122)"
 " all-formals_0))))"
 "(define-values"
@@ -64951,15 +65017,15 @@ static const char *startup_source =
 "(let-values(((split-by-reference?_0)(if split-by-reference?9_0 split-by-reference?4_0 #f)))"
 "(let-values(((renames-log-tag_0)(if renames-log-tag10_0 renames-log-tag5_0 'let-renames)))"
 "(let-values()"
-"(lambda(s_526 ctx_81)"
+"(lambda(s_528 ctx_83)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_23)(expand-context-observer ctx_81)))"
+"(let-values(((obs_23)(expand-context-observer ctx_83)))"
 "(if obs_23"
 "(let-values()(let-values()(call-expand-observe obs_23 log-tag_0)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_8)(syntax-disarm$1 s_526)))"
+"(let-values(((disarmed-s_8)(syntax-disarm$1 s_528)))"
 "(let-values(((ok?_39"
 " letrec-syntaxes+values102_0"
 " id:trans103_0"
@@ -64967,38 +65033,38 @@ static const char *startup_source =
 " id:val105_0"
 " val-rhs106_0"
 " body107_0)"
-"(let-values(((s_527) disarmed-s_8))"
+"(let-values(((s_529) disarmed-s_8))"
 "(if(if syntaxes?_0 #t #f)"
-"(let-values(((orig-s_44) s_527))"
+"(let-values(((orig-s_44) s_529))"
 "(let-values(((letrec-syntaxes+values102_1"
 " id:trans103_1"
 " trans-rhs104_1"
 " id:val105_1"
 " val-rhs106_1"
 " body107_1)"
-"(let-values(((s_470)"
-"(if(syntax?$1 s_527)"
-"(syntax-e$1 s_527)"
-" s_527)))"
-"(if(pair? s_470)"
+"(let-values(((s_471)"
+"(if(syntax?$1 s_529)"
+"(syntax-e$1 s_529)"
+" s_529)))"
+"(if(pair? s_471)"
 "(let-values(((letrec-syntaxes+values108_0)"
-"(let-values(((s_528)(car s_470))) s_528))"
+"(let-values(((s_530)(car s_471))) s_530))"
 "((id:trans109_0"
 " trans-rhs110_0"
 " id:val111_0"
 " val-rhs112_0"
 " body113_0)"
-"(let-values(((s_529)(cdr s_470)))"
-"(let-values(((s_530)"
-"(if(syntax?$1 s_529)"
-"(syntax-e$1 s_529)"
-" s_529)))"
-"(if(pair? s_530)"
+"(let-values(((s_531)(cdr s_471)))"
+"(let-values(((s_532)"
+"(if(syntax?$1 s_531)"
+"(syntax-e$1 s_531)"
+" s_531)))"
+"(if(pair? s_532)"
 "(let-values(((id:trans114_0"
 " trans-rhs115_0)"
 "(let-values(((s_231)"
 "(car"
-" s_530)))"
+" s_532)))"
 "(let-values(((s_232)"
 "(if(syntax?$1"
 " s_231)"
@@ -65053,18 +65119,18 @@ static const char *startup_source =
 "(let-values(((id:trans145_0"
 " trans-rhs146_0)"
 "(let-values()"
-"(let-values(((s_531)"
+"(let-values(((s_533)"
 "(if(syntax?$1"
 " s_237)"
 "(syntax-e$1"
 " s_237)"
 " s_237)))"
 "(if(pair?"
-" s_531)"
+" s_533)"
 "(let-values(((id:trans119_0)"
 "(let-values(((s_342)"
 "(car"
-" s_531)))"
+" s_533)))"
 "(let-values(((s_343)"
 "(if(syntax?$1"
 " s_342)"
@@ -65112,15 +65178,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans147_0)"
 "(let-values()"
-"(if(let-values(((or-part_263)"
+"(if(let-values(((or-part_264)"
 "(if(syntax?$1"
 " s_346)"
 "(symbol?"
 "(syntax-e$1"
 " s_346))"
 " #f)))"
-"(if or-part_263"
-" or-part_263"
+"(if or-part_264"
+" or-part_264"
 "(symbol?"
 " s_346)))"
 " s_346"
@@ -65149,24 +65215,24 @@ static const char *startup_source =
 "((trans-rhs120_0)"
 "(let-values(((s_240)"
 "(cdr"
-" s_531)))"
-"(let-values(((s_474)"
+" s_533)))"
+"(let-values(((s_475)"
 "(if(syntax?$1"
 " s_240)"
 "(syntax-e$1"
 " s_240)"
 " s_240)))"
 "(if(pair?"
-" s_474)"
+" s_475)"
 "(let-values(((trans-rhs121_0)"
-"(let-values(((s_532)"
+"(let-values(((s_534)"
 "(car"
-" s_474)))"
-" s_532))"
+" s_475)))"
+" s_534))"
 "(()"
 "(let-values(((s_241)"
 "(cdr"
-" s_474)))"
+" s_475)))"
 "(let-values(((s_242)"
 "(if(syntax?$1"
 " s_241)"
@@ -65229,7 +65295,7 @@ static const char *startup_source =
 " body118_0)"
 "(let-values(((s_243)"
 "(cdr"
-" s_530)))"
+" s_532)))"
 "(let-values(((s_351)"
 "(if(syntax?$1"
 " s_243)"
@@ -65242,7 +65308,7 @@ static const char *startup_source =
 "(let-values(((s_246)"
 "(car"
 " s_351)))"
-"(let-values(((s_533)"
+"(let-values(((s_535)"
 "(if(syntax?$1"
 " s_246)"
 "(syntax-e$1"
@@ -65250,7 +65316,7 @@ static const char *startup_source =
 " s_246)))"
 "(let-values(((flat-s_34)"
 "(to-syntax-list.1"
-" s_533)))"
+" s_535)))"
 "(if(not"
 " flat-s_34)"
 "(let-values()"
@@ -65278,7 +65344,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_344)"
-"(let-values(((s_534)"
+"(let-values(((s_536)"
 "(unsafe-car"
 " lst_344))"
 "((rest_203)"
@@ -65296,27 +65362,27 @@ static const char *startup_source =
 "(let-values(((id:val148_0"
 " val-rhs149_0)"
 "(let-values()"
-"(let-values(((s_535)"
+"(let-values(((s_537)"
 "(if(syntax?$1"
-" s_534)"
+" s_536)"
 "(syntax-e$1"
-" s_534)"
-" s_534)))"
+" s_536)"
+" s_536)))"
 "(if(pair?"
-" s_535)"
+" s_537)"
 "(let-values(((id:val125_0)"
-"(let-values(((s_488)"
+"(let-values(((s_489)"
 "(car"
-" s_535)))"
-"(let-values(((s_536)"
+" s_537)))"
+"(let-values(((s_538)"
 "(if(syntax?$1"
-" s_488)"
+" s_489)"
 "(syntax-e$1"
-" s_488)"
-" s_488)))"
+" s_489)"
+" s_489)))"
 "(let-values(((flat-s_35)"
 "(to-syntax-list.1"
-" s_536)))"
+" s_538)))"
 "(if(not"
 " flat-s_35)"
 "(let-values()"
@@ -65342,7 +65408,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_346)"
-"(let-values(((s_537)"
+"(let-values(((s_539)"
 "(unsafe-car"
 " lst_346))"
 "((rest_204)"
@@ -65357,21 +65423,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_377)"
 "(if(syntax?$1"
-" s_537)"
+" s_539)"
 "(symbol?"
 "(syntax-e$1"
-" s_537))"
+" s_539))"
 " #f)))"
 "(if or-part_377"
 " or-part_377"
 "(symbol?"
-" s_537)))"
-" s_537"
+" s_539)))"
+" s_539"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                     \"not an identifier\""
 " orig-s_44"
-" s_537)))))"
+" s_539)))))"
 "(cons"
 " id:val150_0"
 " id:val_8)))))"
@@ -65392,7 +65458,7 @@ static const char *startup_source =
 "((val-rhs126_0)"
 "(let-values(((s_357)"
 "(cdr"
-" s_535)))"
+" s_537)))"
 "(let-values(((s_248)"
 "(if(syntax?$1"
 " s_357)"
@@ -65402,10 +65468,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_248)"
 "(let-values(((val-rhs127_0)"
-"(let-values(((s_477)"
+"(let-values(((s_478)"
 "(car"
 " s_248)))"
-" s_477))"
+" s_478))"
 "(()"
 "(let-values(((s_359)"
 "(cdr"
@@ -65546,17 +65612,17 @@ static const char *startup_source =
 " s_254))"
 "((id:val133_0 val-rhs134_0 body135_0)"
 "(let-values(((s_255)(cdr s_366)))"
-"(let-values(((s_538)"
+"(let-values(((s_540)"
 "(if(syntax?$1 s_255)"
 "(syntax-e$1 s_255)"
 " s_255)))"
-"(if(pair? s_538)"
+"(if(pair? s_540)"
 "(let-values(((id:val136_0"
 " val-rhs137_0)"
 "(let-values(((s_258)"
 "(car"
-" s_538)))"
-"(let-values(((s_539)"
+" s_540)))"
+"(let-values(((s_541)"
 "(if(syntax?$1"
 " s_258)"
 "(syntax-e$1"
@@ -65564,7 +65630,7 @@ static const char *startup_source =
 " s_258)))"
 "(let-values(((flat-s_37)"
 "(to-syntax-list.1"
-" s_539)))"
+" s_541)))"
 "(if(not"
 " flat-s_37)"
 "(let-values()"
@@ -65592,7 +65658,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_303)"
-"(let-values(((s_540)"
+"(let-values(((s_542)"
 "(unsafe-car"
 " lst_303))"
 "((rest_205)"
@@ -65612,25 +65678,25 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((s_378)"
 "(if(syntax?$1"
-" s_540)"
+" s_542)"
 "(syntax-e$1"
-" s_540)"
-" s_540)))"
+" s_542)"
+" s_542)))"
 "(if(pair?"
 " s_378)"
 "(let-values(((id:val139_0)"
-"(let-values(((s_541)"
+"(let-values(((s_543)"
 "(car"
 " s_378)))"
-"(let-values(((s_542)"
+"(let-values(((s_544)"
 "(if(syntax?$1"
-" s_541)"
+" s_543)"
 "(syntax-e$1"
-" s_541)"
-" s_541)))"
+" s_543)"
+" s_543)))"
 "(let-values(((flat-s_38)"
 "(to-syntax-list.1"
-" s_542)))"
+" s_544)))"
 "(if(not"
 " flat-s_38)"
 "(let-values()"
@@ -65656,7 +65722,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_349)"
-"(let-values(((s_543)"
+"(let-values(((s_545)"
 "(unsafe-car"
 " lst_349))"
 "((rest_206)"
@@ -65671,21 +65737,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_378)"
 "(if(syntax?$1"
-" s_543)"
+" s_545)"
 "(symbol?"
 "(syntax-e$1"
-" s_543))"
+" s_545))"
 " #f)))"
 "(if or-part_378"
 " or-part_378"
 "(symbol?"
-" s_543)))"
-" s_543"
+" s_545)))"
+" s_545"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                   \"not an identifier\""
 " orig-s_45"
-" s_543)))))"
+" s_545)))))"
 "(cons"
 " id:val153_0"
 " id:val_18)))))"
@@ -65716,22 +65782,22 @@ static const char *startup_source =
 "(if(pair?"
 " s_260)"
 "(let-values(((val-rhs141_0)"
-"(let-values(((s_544)"
+"(let-values(((s_546)"
 "(car"
 " s_260)))"
-" s_544))"
+" s_546))"
 "(()"
-"(let-values(((s_545)"
+"(let-values(((s_547)"
 "(cdr"
 " s_260)))"
-"(let-values(((s_546)"
+"(let-values(((s_548)"
 "(if(syntax?$1"
-" s_545)"
+" s_547)"
 "(syntax-e$1"
-" s_545)"
-" s_545)))"
+" s_547)"
+" s_547)))"
 "(if(null?"
-" s_546)"
+" s_548)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -65782,15 +65848,15 @@ static const char *startup_source =
 "(reverse$1"
 " val-rhs_6)))))))))"
 "((body138_0)"
-"(let-values(((s_547)"
+"(let-values(((s_549)"
 "(cdr"
-" s_538)))"
+" s_540)))"
 "(let-values(((s_261)"
 "(if(syntax?$1"
-" s_547)"
+" s_549)"
 "(syntax-e$1"
-" s_547)"
-" s_547)))"
+" s_549)"
+" s_549)))"
 "(let-values(((flat-s_39)"
 "(to-syntax-list.1"
 " s_261)))"
@@ -65827,7 +65893,7 @@ static const char *startup_source =
 "(values #t let-values128_1 id:val129_1 val-rhs130_1 body131_1)))"
 "(values #f #f #f #f #f)))))"
 "(let-values(((sc_37)(new-scope 'local)))"
-"(let-values(((phase_150)(expand-context-phase ctx_81)))"
+"(let-values(((phase_149)(expand-context-phase ctx_83)))"
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
@@ -66034,69 +66100,69 @@ static const char *startup_source =
 "(if syntaxes?_0"
 "(let-values()"
 "(let-values(((ok?_41 _154_0 _155_0 clause156_0 _157_0)"
-"(let-values(((s_481) disarmed-s_8))"
-"(let-values(((orig-s_46) s_481))"
+"(let-values(((s_482) disarmed-s_8))"
+"(let-values(((orig-s_46) s_482))"
 "(let-values(((_154_1"
 " _155_1"
 " clause156_1"
 " _157_1)"
 "(let-values(((s_142)"
 "(if(syntax?$1"
-" s_481)"
+" s_482)"
 "(syntax-e$1"
-" s_481)"
-" s_481)))"
+" s_482)"
+" s_482)))"
 "(if(pair? s_142)"
 "(let-values(((_158_0)"
-"(let-values(((s_548)"
+"(let-values(((s_550)"
 "(car"
 " s_142)))"
-" s_548))"
+" s_550))"
 "((_159_0"
 " clause160_0"
 " _161_0)"
-"(let-values(((s_549)"
+"(let-values(((s_551)"
 "(cdr"
 " s_142)))"
 "(let-values(((s_143)"
 "(if(syntax?$1"
-" s_549)"
-"(syntax-e$1"
-" s_549)"
-" s_549)))"
-"(if(pair?"
-" s_143)"
-"(let-values(((_162_0)"
-"(let-values(((s_550)"
-"(car"
-" s_143)))"
-" s_550))"
-"((clause163_0"
-" _164_0)"
-"(let-values(((s_551)"
-"(cdr"
-" s_143)))"
-"(let-values(((s_552)"
-"(if(syntax?$1"
 " s_551)"
 "(syntax-e$1"
 " s_551)"
 " s_551)))"
 "(if(pair?"
-" s_552)"
-"(let-values(((clause165_0)"
-"(let-values(((s_553)"
+" s_143)"
+"(let-values(((_162_0)"
+"(let-values(((s_552)"
 "(car"
-" s_552)))"
+" s_143)))"
+" s_552))"
+"((clause163_0"
+" _164_0)"
+"(let-values(((s_553)"
+"(cdr"
+" s_143)))"
 "(let-values(((s_554)"
 "(if(syntax?$1"
 " s_553)"
 "(syntax-e$1"
 " s_553)"
 " s_553)))"
+"(if(pair?"
+" s_554)"
+"(let-values(((clause165_0)"
+"(let-values(((s_555)"
+"(car"
+" s_554)))"
+"(let-values(((s_556)"
+"(if(syntax?$1"
+" s_555)"
+"(syntax-e$1"
+" s_555)"
+" s_555)))"
 "(let-values(((flat-s_40)"
 "(to-syntax-list.1"
-" s_554)))"
+" s_556)))"
 "(if(not"
 " flat-s_40)"
 "(let-values()"
@@ -66107,10 +66173,10 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_40))))))"
 "((_166_0)"
-"(let-values(((s_555)"
+"(let-values(((s_557)"
 "(cdr"
-" s_552)))"
-" s_555)))"
+" s_554)))"
+" s_557)))"
 "(values"
 " clause165_0"
 " _166_0))"
@@ -66144,47 +66210,47 @@ static const char *startup_source =
 " clause156_0))"
 "(let-values()"
 "(let-values(((ok?_42 _167_0 clause168_0 _169_0)"
-"(let-values(((s_556) disarmed-s_8))"
-"(let-values(((orig-s_47) s_556))"
+"(let-values(((s_558) disarmed-s_8))"
+"(let-values(((orig-s_47) s_558))"
 "(let-values(((_167_1 clause168_1 _169_1)"
-"(let-values(((s_557)"
+"(let-values(((s_559)"
 "(if(syntax?$1"
-" s_556)"
+" s_558)"
 "(syntax-e$1"
-" s_556)"
-" s_556)))"
-"(if(pair? s_557)"
+" s_558)"
+" s_558)))"
+"(if(pair? s_559)"
 "(let-values(((_170_0)"
-"(let-values(((s_558)"
+"(let-values(((s_560)"
 "(car"
-" s_557)))"
-" s_558))"
+" s_559)))"
+" s_560))"
 "((clause171_0"
 " _172_0)"
-"(let-values(((s_559)"
-"(cdr"
-" s_557)))"
-"(let-values(((s_560)"
-"(if(syntax?$1"
-" s_559)"
-"(syntax-e$1"
-" s_559)"
-" s_559)))"
-"(if(pair?"
-" s_560)"
-"(let-values(((clause173_0)"
 "(let-values(((s_561)"
-"(car"
-" s_560)))"
+"(cdr"
+" s_559)))"
 "(let-values(((s_562)"
 "(if(syntax?$1"
 " s_561)"
 "(syntax-e$1"
 " s_561)"
 " s_561)))"
+"(if(pair?"
+" s_562)"
+"(let-values(((clause173_0)"
+"(let-values(((s_563)"
+"(car"
+" s_562)))"
+"(let-values(((s_564)"
+"(if(syntax?$1"
+" s_563)"
+"(syntax-e$1"
+" s_563)"
+" s_563)))"
 "(let-values(((flat-s_41)"
 "(to-syntax-list.1"
-" s_562)))"
+" s_564)))"
 "(if(not"
 " flat-s_41)"
 "(let-values()"
@@ -66195,10 +66261,10 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_41))))))"
 "((_174_0)"
-"(let-values(((s_563)"
+"(let-values(((s_565)"
 "(cdr"
-" s_560)))"
-" s_563)))"
+" s_562)))"
+" s_565)))"
 "(values"
 " clause173_0"
 " _174_0))"
@@ -66219,8 +66285,8 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((temp142_4)(list trans-idss_2 val-idss_3))"
-"((phase143_0) phase_150)"
-"((s144_0) s_526))"
+"((phase143_0) phase_149)"
+"((s144_0) s_528))"
 "(check-no-duplicate-ids8.1"
 " #f"
 " #f"
@@ -66230,7 +66296,7 @@ static const char *startup_source =
 " #f"
 " #f))"
 "(values))))"
-"(let-values(((counter_8)(root-expand-context-counter ctx_81)))"
+"(let-values(((counter_8)(root-expand-context-counter ctx_83)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
 "(let-values(((lst_360) trans-idss_2))"
@@ -66290,13 +66356,13 @@ static const char *startup_source =
 "(let-values(((id175_0)"
 " id_117)"
 "((phase176_0)"
-" phase_150)"
+" phase_149)"
 "((counter177_0)"
 " counter_8)"
 "((frame-id178_0)"
 " frame-id_15)"
 "((s179_0)"
-" s_526))"
+" s_528))"
 "(add-local-binding!37.1"
 " frame-id178_0"
 " #t"
@@ -66389,13 +66455,13 @@ static const char *startup_source =
 "(let-values(((id180_0)"
 " id_118)"
 "((phase181_0)"
-" phase_150)"
+" phase_149)"
 "((counter182_0)"
 " counter_8)"
 "((frame-id183_0)"
 " frame-id_15)"
 "((s184_0)"
-" s_526))"
+" s_528))"
 "(add-local-binding!37.1"
 " frame-id183_0"
 " #t"
@@ -66473,12 +66539,12 @@ static const char *startup_source =
 " lst_367))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_94)"
-"(expand-context-observer ctx_81)))"
-"(if obs_94"
+"(let-values(((obs_92)"
+"(expand-context-observer ctx_83)))"
+"(if obs_92"
 "(let-values()"
 "(log-let-renames"
-" obs_94"
+" obs_92"
 " renames-log-tag_0"
 " val-idss_3"
 " val-rhss_3"
@@ -66493,17 +66559,17 @@ static const char *startup_source =
 "(if syntaxes?_0"
 "(let-values()"
 "(begin"
-"(let-values(((obs_95)"
+"(let-values(((obs_93)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_95"
+" ctx_83)))"
+"(if obs_93"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_95"
+" obs_93"
 " 'prepare-env)))"
 "(void)))"
-"(prepare-next-phase-namespace ctx_81)))"
+"(prepare-next-phase-namespace ctx_83)))"
 "(void))"
 "(values))))"
 "(let-values(((trans-valss_0)"
@@ -66552,18 +66618,18 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_96)"
+"(let-values(((obs_94)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_96"
+" ctx_83)))"
+"(if obs_94"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_96"
+" obs_94"
 " 'next)"
 "(call-expand-observe"
-" obs_96"
+" obs_94"
 " 'enter-bind))))"
 "(void)))"
 "(values))))"
@@ -66574,16 +66640,16 @@ static const char *startup_source =
 " rhs_21"
 " sc_37)"
 " ids_41"
-" ctx_81)))"
+" ctx_83)))"
 "(begin"
-"(let-values(((obs_97)"
+"(let-values(((obs_95)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_97"
+" ctx_83)))"
+"(if obs_95"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_97"
+" obs_95"
 " 'exit-bind)))"
 "(void)))"
 " trans-val_1))))"
@@ -66710,7 +66776,7 @@ static const char *startup_source =
 " env_30)))"
 " env_29)))))"
 " for-loop_312)"
-"(expand-context-env ctx_81)"
+"(expand-context-env ctx_83)"
 " lst_61"
 " lst_249)))))"
 "(let-values(((rec-env_0)"
@@ -66835,8 +66901,8 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_85"
 " id_120"
-" phase_150"
-" ctx_81)"
+" phase_149"
+" ctx_83)"
 "(env-extend"
 " env_42"
 " key_94"
@@ -66873,22 +66939,22 @@ static const char *startup_source =
 " lst_375"
 " lst_376)))))"
 "(let-values(((expr-ctx_0)"
-"(as-expression-context ctx_81)))"
+"(as-expression-context ctx_83)))"
 "(let-values(((orig-rrs_0)"
 "(expand-context-reference-records"
 " expr-ctx_0)))"
 "(let-values(((rec-ctx_0)"
-"(let-values(((v_180) expr-ctx_0))"
-"(let-values(((the-struct_96) v_180))"
+"(let-values(((v_182) expr-ctx_0))"
+"(let-values(((the-struct_97) v_182))"
 "(if(expand-context/outer?"
-" the-struct_96)"
+" the-struct_97)"
 "(let-values(((env185_0)"
 " rec-env_0)"
 "((scopes186_0)"
 "(cons"
 " sc_37"
 "(expand-context-scopes"
-" ctx_81)))"
+" ctx_83)))"
 "((reference-records187_0)"
 "(if split-by-reference?_0"
 "(cons"
@@ -66900,52 +66966,52 @@ static const char *startup_source =
 "(cons"
 " trans-idss_2"
 " val-idss_3)"
-" ctx_81"
+" ctx_83"
 " sc_37))"
 "((inner189_0)"
 "(root-expand-context/outer-inner"
-" v_180)))"
+" v_182)))"
 "(expand-context/outer1.1"
 " inner189_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_96)"
+" the-struct_97)"
 "(root-expand-context/outer-frame-id"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/outer-context"
-" the-struct_96)"
+" the-struct_97)"
 " env185_0"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_96)"
+" the-struct_97)"
 " scopes186_0"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_96)"
+" the-struct_97)"
 " binding-layer188_0"
 " reference-records187_0"
 "(expand-context/outer-only-immediate?"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_96)"
+" the-struct_97)"
 "(expand-context/outer-name"
-" the-struct_96)))"
+" the-struct_97)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                       \"expand-context/outer?\""
-" the-struct_96))))))"
+" the-struct_97))))))"
 "(let-values(((letrec-values-id_0)"
 "(if(not"
 "(expand-context-to-parsed?"
-" ctx_81))"
+" ctx_83))"
 "(if syntaxes?_0"
-"(core-id 'letrec-values phase_150)"
+"(core-id 'letrec-values phase_149)"
 " let-values128_0)"
 " #f)))"
 "(let-values(((rebuild-s_6)"
-"(let-values(((ctx190_0) ctx_81)"
-"((s191_1) s_526)"
+"(let-values(((ctx190_0) ctx_83)"
+"((s191_1) s_528)"
 "((temp192_1) #t))"
 "(keep-as-needed120.1"
 " #f"
@@ -66958,7 +67024,7 @@ static const char *startup_source =
 " s191_1))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
-" ctx_81)"
+" ctx_83)"
 "(reverse$1"
 "(let-values(((lst_384)"
 " val-idss_3))"
@@ -67055,13 +67121,13 @@ static const char *startup_source =
 "(begin"
 "(if syntaxes?_0"
 "(let-values()"
-"(let-values(((obs_98)"
+"(let-values(((obs_96)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_98"
+" ctx_83)))"
+"(if obs_96"
 "(let-values()"
 "(log-letrec-values"
-" obs_98"
+" obs_96"
 " val-idss_3"
 " val-rhss_3"
 " bodys_10))"
@@ -67074,10 +67140,10 @@ static const char *startup_source =
 " 'get-body"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_99)"
+"(let-values(((obs_97)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_99"
+" ctx_83)))"
+"(if obs_97"
 "(let-values()"
 "(if(not"
 "(if syntaxes?_0"
@@ -67086,63 +67152,63 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(call-expand-observe"
-" obs_99"
+" obs_97"
 " 'next-group))"
 "(void)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_5)"
-"(let-values(((v_262)"
+"(let-values(((v_264)"
 " rec-ctx_0))"
-"(let-values(((the-struct_97)"
-" v_262))"
+"(let-values(((the-struct_98)"
+" v_264))"
 "(if(expand-context/outer?"
-" the-struct_97)"
+" the-struct_98)"
 "(let-values(((reference-records196_0)"
 " orig-rrs_0)"
 "((inner197_0)"
 "(root-expand-context/outer-inner"
-" v_262)))"
+" v_264)))"
 "(expand-context/outer1.1"
 " inner197_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_97)"
+" the-struct_98)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_97)"
+" the-struct_98)"
 "(root-expand-context/outer-frame-id"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-context"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-env"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-scopes"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-binding-layer"
-" the-struct_97)"
+" the-struct_98)"
 " reference-records196_0"
 "(expand-context/outer-only-immediate?"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_97)"
+" the-struct_98)"
 "(expand-context/outer-name"
-" the-struct_97)))"
+" the-struct_98)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                     \"expand-context/outer?\""
-" the-struct_97))))))"
+" the-struct_98))))))"
 "(let-values(((bodys193_0)"
 " bodys_10)"
 "((temp194_0)"
 "(let-values(((body-ctx198_0)"
 " body-ctx_5)"
 "((ctx199_0)"
-" ctx_81))"
+" ctx_83))"
 "(as-tail-context23.1"
 " ctx199_0"
 " body-ctx198_0)))"
@@ -67245,14 +67311,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_100)"
+"(let-values(((obs_98)"
 "(expand-context-observer"
-" ctx_81)))"
-"(if obs_100"
+" ctx_83)))"
+"(if obs_98"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_100"
+" obs_98"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -67277,7 +67343,7 @@ static const char *startup_source =
 " rhs200_0"
 " temp201_1))))"
 "(if(expand-context-to-parsed?"
-" ctx_81)"
+" ctx_83)"
 "(list"
 " keys_12"
 " exp-rhs_4)"
@@ -67316,7 +67382,7 @@ static const char *startup_source =
 " frame-id_15))"
 "(void))"
 "(if(expand-context-to-parsed?"
-" ctx_81)"
+" ctx_83)"
 "(if rec?_1"
 "(parsed-letrec-values18.1"
 " rebuild-s_6"
@@ -67375,14 +67441,14 @@ static const char *startup_source =
 " val-keyss205_0"
 " val-rhss206_0"
 " val-clauses207_0))))))"
-"(if(expand-context-to-parsed? ctx_81)"
+"(if(expand-context-to-parsed? ctx_83)"
 " result-s_12"
 "(attach-disappeared-transformer-bindings"
 " result-s_12"
 " trans-idss_2))))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(log-let-renames)"
-"(lambda(obs_101 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_38)"
+"(lambda(obs_99 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_38)"
 "(begin"
 "(let-values(((vals+body_0)"
 "(cons"
@@ -67425,7 +67491,7 @@ static const char *startup_source =
 " lst_396))))"
 "(datum->syntax$1 #f bodys_11))))"
 "(call-expand-observe"
-" obs_101"
+" obs_99"
 " renames-log-tag_1"
 "(if(not trans-rhss_0)"
 " vals+body_0"
@@ -67470,16 +67536,16 @@ static const char *startup_source =
 " vals+body_0)))))))"
 "(define-values"
 "(log-letrec-values)"
-"(lambda(obs_102 val-idss_5 val-rhss_5 bodys_12)"
+"(lambda(obs_100 val-idss_5 val-rhss_5 bodys_12)"
 "(begin"
 "(begin"
-"(call-expand-observe obs_102 'next-group)"
+"(call-expand-observe obs_100 'next-group)"
 "(if(null? val-idss_5)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_102 'prim-letrec-values)"
-"(log-let-renames obs_102 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
+"(call-expand-observe obs_100 'prim-letrec-values)"
+"(log-let-renames obs_100 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
 "(void"
 "(add-core-form!*"
 " 'let-values"
@@ -67501,30 +67567,30 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_564 ctx_82)"
+"(lambda(s_566 ctx_84)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_103)(expand-context-observer ctx_82)))"
-"(if obs_103"
-"(let-values()(let-values()(call-expand-observe obs_103 'prim-#%stratified)))"
+"(let-values(((obs_101)(expand-context-observer ctx_84)))"
+"(if obs_101"
+"(let-values()(let-values()(call-expand-observe obs_101 'prim-#%stratified)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_9)(syntax-disarm$1 s_564)))"
+"(let-values(((disarmed-s_9)(syntax-disarm$1 s_566)))"
 "(let-values(((ok?_43 #%stratified-body223_0 body224_0)"
-"(let-values(((s_565) disarmed-s_9))"
-"(let-values(((orig-s_48) s_565))"
+"(let-values(((s_567) disarmed-s_9))"
+"(let-values(((orig-s_48) s_567))"
 "(let-values(((#%stratified-body223_1 body224_1)"
-"(let-values(((s_566)(if(syntax?$1 s_565)(syntax-e$1 s_565) s_565)))"
-"(if(pair? s_566)"
+"(let-values(((s_568)(if(syntax?$1 s_567)(syntax-e$1 s_567) s_567)))"
+"(if(pair? s_568)"
 "(let-values(((#%stratified-body225_0)"
-"(let-values(((s_567)(car s_566))) s_567))"
+"(let-values(((s_569)(car s_568))) s_569))"
 "((body226_0)"
-"(let-values(((s_568)(cdr s_566)))"
-"(let-values(((s_569)"
-"(if(syntax?$1 s_568)"
-"(syntax-e$1 s_568)"
-" s_568)))"
-"(let-values(((flat-s_42)(to-syntax-list.1 s_569)))"
+"(let-values(((s_570)(cdr s_568)))"
+"(let-values(((s_571)"
+"(if(syntax?$1 s_570)"
+"(syntax-e$1 s_570)"
+" s_570)))"
+"(let-values(((flat-s_42)(to-syntax-list.1 s_571)))"
 "(if(not flat-s_42)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_48))"
@@ -67536,40 +67602,40 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
 "(values #t #%stratified-body223_1 body224_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx227_0) ctx_82)((s228_1) s_564)((temp229_1) #t))"
+"(let-values(((ctx227_0) ctx_84)((s228_1) s_566)((temp229_1) #t))"
 "(keep-as-needed120.1 #f #f temp229_1 #t #f #f ctx227_0 s228_1))))"
 "(let-values(((exp-body_5)"
 "(let-values(((temp230_2) body224_0)"
-"((ctx231_0) ctx_82)"
+"((ctx231_0) ctx_84)"
 "((temp232_1) #t)"
 "((rebuild-s233_0) rebuild-s_7))"
 "(expand-body7.1 rebuild-s233_0 temp232_1 #t temp230_2 ctx231_0))))"
-"(if(expand-context-to-parsed? ctx_82)"
+"(if(expand-context-to-parsed? ctx_84)"
 "(parsed-begin12.1 rebuild-s_7 exp-body_5)"
 "(let-values(((rebuild-s234_0) rebuild-s_7)"
 "((temp235_1)"
 "(if(null?(cdr exp-body_5))"
 "(car exp-body_5)"
-"(list*(core-id 'begin(expand-context-phase ctx_82)) exp-body_5))))"
+"(list*(core-id 'begin(expand-context-phase ctx_84)) exp-body_5))))"
 "(rebuild5.1 #f #f rebuild-s234_0 temp235_1)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_570 ctx_83)"
+"(lambda(s_572 ctx_85)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_104)(expand-context-observer ctx_83)))"
-"(if obs_104(let-values()(let-values()(call-expand-observe obs_104 'prim-#%datum)))(void)))"
+"(let-values(((obs_102)(expand-context-observer ctx_85)))"
+"(if obs_102(let-values()(let-values()(call-expand-observe obs_102 'prim-#%datum)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_10)(syntax-disarm$1 s_570)))"
+"(let-values(((disarmed-s_10)(syntax-disarm$1 s_572)))"
 "(let-values(((ok?_44 #%datum236_0 datum237_0)"
-"(let-values(((s_571) disarmed-s_10))"
-"(let-values(((orig-s_49) s_571))"
+"(let-values(((s_573) disarmed-s_10))"
+"(let-values(((orig-s_49) s_573))"
 "(let-values(((#%datum236_1 datum237_1)"
-"(let-values(((s_572)(if(syntax?$1 s_571)(syntax-e$1 s_571) s_571)))"
-"(if(pair? s_572)"
-"(let-values(((#%datum238_0)(let-values(((s_573)(car s_572))) s_573))"
-"((datum239_0)(let-values(((s_574)(cdr s_572))) s_574)))"
+"(let-values(((s_574)(if(syntax?$1 s_573)(syntax-e$1 s_573) s_573)))"
+"(if(pair? s_574)"
+"(let-values(((#%datum238_0)(let-values(((s_575)(car s_574))) s_575))"
+"((datum239_0)(let-values(((s_576)(cdr s_574))) s_576)))"
 "(values #%datum238_0 datum239_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_49)))))"
 "(values #t #%datum236_1 datum237_1))))))"
@@ -67581,35 +67647,35 @@ static const char *startup_source =
 "                                 (raise-syntax-error$1 '#%datum \"keyword misused as an expression\" #f datum_2))"
 "(void))"
 "(values))))"
-"(let-values(((phase_151)(expand-context-phase ctx_83)))"
-"(if(if(expand-context-to-parsed? ctx_83)(free-id-set-empty?(expand-context-stops ctx_83)) #f)"
-"(parsed-quote14.1(keep-properties-only~ s_570)(syntax->datum$1 datum_2))"
-"(let-values(((s240_0) s_570)((temp241_1)(list(core-id 'quote phase_151) datum_2)))"
+"(let-values(((phase_150)(expand-context-phase ctx_85)))"
+"(if(if(expand-context-to-parsed? ctx_85)(free-id-set-empty?(expand-context-stops ctx_85)) #f)"
+"(parsed-quote14.1(keep-properties-only~ s_572)(syntax->datum$1 datum_2))"
+"(let-values(((s240_0) s_572)((temp241_1)(list(core-id 'quote phase_150) datum_2)))"
 "(rebuild5.1 #f #f s240_0 temp241_1))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_575 ctx_84)"
+"(lambda(s_577 ctx_86)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_105)(expand-context-observer ctx_84)))"
-"(if obs_105(let-values()(let-values()(call-expand-observe obs_105 'prim-#%app)))(void)))"
+"(let-values(((obs_103)(expand-context-observer ctx_86)))"
+"(if obs_103(let-values()(let-values()(call-expand-observe obs_103 'prim-#%app)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_11)(syntax-disarm$1 s_575)))"
+"(let-values(((disarmed-s_11)(syntax-disarm$1 s_577)))"
 "(let-values(((ok?_45 #%app242_0 e243_0)"
-"(let-values(((s_576) disarmed-s_11))"
-"(let-values(((orig-s_50) s_576))"
+"(let-values(((s_578) disarmed-s_11))"
+"(let-values(((orig-s_50) s_578))"
 "(let-values(((#%app242_1 e243_1)"
-"(let-values(((s_577)(if(syntax?$1 s_576)(syntax-e$1 s_576) s_576)))"
-"(if(pair? s_577)"
-"(let-values(((#%app244_0)(let-values(((s_578)(car s_577))) s_578))"
+"(let-values(((s_579)(if(syntax?$1 s_578)(syntax-e$1 s_578) s_578)))"
+"(if(pair? s_579)"
+"(let-values(((#%app244_0)(let-values(((s_580)(car s_579))) s_580))"
 "((e245_0)"
-"(let-values(((s_579)(cdr s_577)))"
-"(let-values(((s_580)"
-"(if(syntax?$1 s_579)"
-"(syntax-e$1 s_579)"
-" s_579)))"
-"(let-values(((flat-s_43)(to-syntax-list.1 s_580)))"
+"(let-values(((s_581)(cdr s_579)))"
+"(let-values(((s_582)"
+"(if(syntax?$1 s_581)"
+"(syntax-e$1 s_581)"
+" s_581)))"
+"(let-values(((flat-s_43)(to-syntax-list.1 s_582)))"
 "(if(not flat-s_43)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_50))"
@@ -67620,22 +67686,22 @@ static const char *startup_source =
 "(let-values(((es_3) e243_0))"
 "(if(null? es_3)"
 "(let-values()"
-"(let-values(((phase_152)(expand-context-phase ctx_84)))"
-"(if(expand-context-to-parsed? ctx_84)"
-"(parsed-quote14.1(keep-properties-only~ s_575) null)"
-"(let-values(((s246_0) s_575)((temp247_0)(list(core-id 'quote phase_152) null)))"
+"(let-values(((phase_151)(expand-context-phase ctx_86)))"
+"(if(expand-context-to-parsed? ctx_86)"
+"(parsed-quote14.1(keep-properties-only~ s_577) null)"
+"(let-values(((s246_0) s_577)((temp247_0)(list(core-id 'quote phase_151) null)))"
 "(rebuild5.1 #f #f s246_0 temp247_0)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_8)"
-"(let-values(((ctx248_0) ctx_84)"
-"((s249_0) s_575)"
+"(let-values(((ctx248_0) ctx_86)"
+"((s249_0) s_577)"
 "((keep-for-parsed?250_0) keep-for-parsed?_1))"
 "(keep-as-needed120.1 #f #f #f #f keep-for-parsed?250_0 #t ctx248_0 s249_0))))"
 "(let-values(((prefixless_0)(cdr(syntax-e$1 disarmed-s_11))))"
 "(let-values(((rebuild-prefixless_0)"
 "(if(syntax?$1 prefixless_0)"
-"(let-values(((ctx251_0) ctx_84)"
+"(let-values(((ctx251_0) ctx_86)"
 "((prefixless252_0) prefixless_0)"
 "((keep-for-parsed?253_0) keep-for-parsed?_1))"
 "(keep-as-needed120.1"
@@ -67648,19 +67714,19 @@ static const char *startup_source =
 " ctx251_0"
 " prefixless252_0))"
 " #f)))"
-"(let-values(((expr-ctx_1)(as-expression-context ctx_84)))"
+"(let-values(((expr-ctx_1)(as-expression-context ctx_86)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_106)(expand-context-observer expr-ctx_1)))"
-"(if obs_106"
+"(let-values(((obs_104)(expand-context-observer expr-ctx_1)))"
+"(if obs_104"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_106"
+" obs_104"
 " 'enter-list"
-"(datum->syntax$1 #f es_3 s_575))"
-"(call-expand-observe obs_106 'next))))"
+"(datum->syntax$1 #f es_3 s_577))"
+"(call-expand-observe obs_104 'next))))"
 "(void)))"
 "(values))))"
 "(let-values(((rest-es_0)(cdr es_3)))"
@@ -67690,14 +67756,14 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_107)"
+"(let-values(((obs_105)"
 "(expand-context-observer"
 " expr-ctx_1)))"
-"(if obs_107"
+"(if obs_105"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_107"
+" obs_105"
 " 'next)))"
 "(void)))"
 "(let-values(((e256_0)"
@@ -67723,7 +67789,7 @@ static const char *startup_source =
 " for-loop_320)"
 " null"
 " lst_403))))))"
-"(if(expand-context-to-parsed? ctx_84)"
+"(if(expand-context-to-parsed? ctx_86)"
 "(let-values()"
 "(parsed-app7.1"
 "(let-values(((or-part_379) rebuild-prefixless_0))"
@@ -67739,12 +67805,12 @@ static const char *startup_source =
 "(rebuild5.1 #f #f rebuild-prefixless260_0 exp-es261_0))"
 " exp-es_1))))"
 "(begin"
-"(let-values(((obs_108)(expand-context-observer expr-ctx_1)))"
-"(if obs_108"
+"(let-values(((obs_106)(expand-context-observer expr-ctx_1)))"
+"(if obs_106"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_108"
+" obs_106"
 " 'exit-list"
 "(datum->syntax$1 #f es_4 rebuild-s_8))))"
 "(void)))"
@@ -67754,34 +67820,34 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_581 ctx_85)"
+"(lambda(s_583 ctx_87)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_109)(expand-context-observer ctx_85)))"
-"(if obs_109(let-values()(let-values()(call-expand-observe obs_109 'prim-quote)))(void)))"
+"(let-values(((obs_107)(expand-context-observer ctx_87)))"
+"(if obs_107(let-values()(let-values()(call-expand-observe obs_107 'prim-quote)))(void)))"
 "(values))))"
 "(let-values(((ok?_46 quote262_0 datum263_0)"
-"(let-values(((s_582)(syntax-disarm$1 s_581)))"
-"(let-values(((orig-s_51) s_582))"
+"(let-values(((s_584)(syntax-disarm$1 s_583)))"
+"(let-values(((orig-s_51) s_584))"
 "(let-values(((quote262_1 datum263_1)"
-"(let-values(((s_583)(if(syntax?$1 s_582)(syntax-e$1 s_582) s_582)))"
-"(if(pair? s_583)"
-"(let-values(((quote264_0)(let-values(((s_584)(car s_583))) s_584))"
+"(let-values(((s_585)(if(syntax?$1 s_584)(syntax-e$1 s_584) s_584)))"
+"(if(pair? s_585)"
+"(let-values(((quote264_0)(let-values(((s_586)(car s_585))) s_586))"
 "((datum265_0)"
-"(let-values(((s_585)(cdr s_583)))"
-"(let-values(((s_586)"
-"(if(syntax?$1 s_585)"
-"(syntax-e$1 s_585)"
-" s_585)))"
-"(if(pair? s_586)"
+"(let-values(((s_587)(cdr s_585)))"
+"(let-values(((s_588)"
+"(if(syntax?$1 s_587)"
+"(syntax-e$1 s_587)"
+" s_587)))"
+"(if(pair? s_588)"
 "(let-values(((datum266_0)"
-"(let-values(((s_587)(car s_586))) s_587))"
+"(let-values(((s_589)(car s_588))) s_589))"
 "(()"
-"(let-values(((s_588)(cdr s_586)))"
+"(let-values(((s_590)(cdr s_588)))"
 "(let-values(((s_281)"
-"(if(syntax?$1 s_588)"
-"(syntax-e$1 s_588)"
-" s_588)))"
+"(if(syntax?$1 s_590)"
+"(syntax-e$1 s_590)"
+" s_590)))"
 "(if(null? s_281)"
 "(values)"
 "(raise-syntax-error$1"
@@ -67793,41 +67859,41 @@ static const char *startup_source =
 "(values quote264_0 datum265_0))"
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
 "(values #t quote262_1 datum263_1))))))"
-"(if(expand-context-to-parsed? ctx_85)"
-"(parsed-quote14.1(keep-properties-only~ s_581)(syntax->datum$1 datum263_0))"
-" s_581))))))"
+"(if(expand-context-to-parsed? ctx_87)"
+"(parsed-quote14.1(keep-properties-only~ s_583)(syntax->datum$1 datum263_0))"
+" s_583))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_589 ctx_86)"
+"(lambda(s_591 ctx_88)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_110)(expand-context-observer ctx_86)))"
-"(if obs_110"
-"(let-values()(let-values()(call-expand-observe obs_110 'prim-quote-syntax)))"
+"(let-values(((obs_108)(expand-context-observer ctx_88)))"
+"(if obs_108"
+"(let-values()(let-values()(call-expand-observe obs_108 'prim-quote-syntax)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_12)(syntax-disarm$1 s_589)))"
+"(let-values(((disarmed-s_12)(syntax-disarm$1 s_591)))"
 "(let-values(((ok?_47 quote-syntax267_0 datum268_0)"
-"(let-values(((s_590) disarmed-s_12))"
-"(if(let-values(((s_591)(if(syntax?$1 s_590)(syntax-e$1 s_590) s_590)))"
-"(if(pair? s_591)"
-"(if(let-values(((s_592)(car s_591))) #t)"
-"(let-values(((s_593)(cdr s_591)))"
-"(let-values(((s_594)(if(syntax?$1 s_593)(syntax-e$1 s_593) s_593)))"
-"(if(pair? s_594)"
-"(if(let-values(((s_595)(car s_594))) #t)"
-"(let-values(((s_596)(cdr s_594)))"
-"(let-values(((s_597)(if(syntax?$1 s_596)(syntax-e$1 s_596) s_596)))"
-"(if(pair? s_597)"
-"(if(let-values(((s_598)(car s_597)))"
-"(let-values(((s_599)"
-"(if(syntax?$1 s_598)(syntax-e$1 s_598) s_598)))"
-"(eq? '#:local s_599)))"
-"(let-values(((s_600)(cdr s_597)))"
+"(let-values(((s_592) disarmed-s_12))"
+"(if(let-values(((s_593)(if(syntax?$1 s_592)(syntax-e$1 s_592) s_592)))"
+"(if(pair? s_593)"
+"(if(let-values(((s_594)(car s_593))) #t)"
+"(let-values(((s_595)(cdr s_593)))"
+"(let-values(((s_596)(if(syntax?$1 s_595)(syntax-e$1 s_595) s_595)))"
+"(if(pair? s_596)"
+"(if(let-values(((s_597)(car s_596))) #t)"
+"(let-values(((s_598)(cdr s_596)))"
+"(let-values(((s_599)(if(syntax?$1 s_598)(syntax-e$1 s_598) s_598)))"
+"(if(pair? s_599)"
+"(if(let-values(((s_600)(car s_599)))"
 "(let-values(((s_601)"
 "(if(syntax?$1 s_600)(syntax-e$1 s_600) s_600)))"
-"(null? s_601)))"
+"(eq? '#:local s_601)))"
+"(let-values(((s_602)(cdr s_599)))"
+"(let-values(((s_603)"
+"(if(syntax?$1 s_602)(syntax-e$1 s_602) s_602)))"
+"(null? s_603)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -67836,23 +67902,23 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((quote-syntax267_1 datum268_1)"
-"(let-values(((s_602)(if(syntax?$1 s_590)(syntax-e$1 s_590) s_590)))"
+"(let-values(((s_604)(if(syntax?$1 s_592)(syntax-e$1 s_592) s_592)))"
 "(let-values(((quote-syntax269_0)"
-"(let-values(((s_603)(car s_602))) s_603))"
+"(let-values(((s_605)(car s_604))) s_605))"
 "((datum270_0)"
-"(let-values(((s_604)(cdr s_602)))"
-"(let-values(((s_605)"
-"(if(syntax?$1 s_604)"
-"(syntax-e$1 s_604)"
-" s_604)))"
+"(let-values(((s_606)(cdr s_604)))"
+"(let-values(((s_607)"
+"(if(syntax?$1 s_606)"
+"(syntax-e$1 s_606)"
+" s_606)))"
 "(let-values(((datum271_0)"
-"(let-values(((s_606)(car s_605))) s_606))"
+"(let-values(((s_608)(car s_607))) s_608))"
 "(()"
-"(let-values(((s_607)(cdr s_605)))"
+"(let-values(((s_609)(cdr s_607)))"
 "(let-values(((s_293)"
-"(if(syntax?$1 s_607)"
-"(syntax-e$1 s_607)"
-" s_607)))"
+"(if(syntax?$1 s_609)"
+"(syntax-e$1 s_609)"
+" s_609)))"
 "(let-values((()"
 "(let-values(((s_294)"
 "(car"
@@ -67865,15 +67931,15 @@ static const char *startup_source =
 " s_294)))"
 "(values))))"
 "(()"
-"(let-values(((s_608)"
+"(let-values(((s_610)"
 "(cdr"
 " s_293)))"
-"(let-values(((s_609)"
+"(let-values(((s_611)"
 "(if(syntax?$1"
-" s_608)"
+" s_610)"
 "(syntax-e$1"
-" s_608)"
-" s_608)))"
+" s_610)"
+" s_610)))"
 "(values)))))"
 "(values))))))"
 "(values datum271_0))))))"
@@ -67881,31 +67947,31 @@ static const char *startup_source =
 "(values #t quote-syntax267_1 datum268_1)))"
 "(values #f #f #f)))))"
 "(let-values(((ok?_48 quote-syntax272_0 datum273_0)"
-"(let-values(((s_610) disarmed-s_12))"
+"(let-values(((s_612) disarmed-s_12))"
 "(if(if(not ok?_47) #t #f)"
-"(let-values(((orig-s_52) s_610))"
+"(let-values(((orig-s_52) s_612))"
 "(let-values(((quote-syntax272_1 datum273_1)"
-"(let-values(((s_611)(if(syntax?$1 s_610)(syntax-e$1 s_610) s_610)))"
-"(if(pair? s_611)"
+"(let-values(((s_613)(if(syntax?$1 s_612)(syntax-e$1 s_612) s_612)))"
+"(if(pair? s_613)"
 "(let-values(((quote-syntax274_0)"
-"(let-values(((s_612)(car s_611))) s_612))"
+"(let-values(((s_614)(car s_613))) s_614))"
 "((datum275_0)"
-"(let-values(((s_613)(cdr s_611)))"
-"(let-values(((s_614)"
-"(if(syntax?$1 s_613)"
-"(syntax-e$1 s_613)"
-" s_613)))"
-"(if(pair? s_614)"
+"(let-values(((s_615)(cdr s_613)))"
+"(let-values(((s_616)"
+"(if(syntax?$1 s_615)"
+"(syntax-e$1 s_615)"
+" s_615)))"
+"(if(pair? s_616)"
 "(let-values(((datum276_0)"
-"(let-values(((s_615)(car s_614)))"
-" s_615))"
+"(let-values(((s_617)(car s_616)))"
+" s_617))"
 "(()"
-"(let-values(((s_616)(cdr s_614)))"
-"(let-values(((s_617)"
-"(if(syntax?$1 s_616)"
-"(syntax-e$1 s_616)"
-" s_616)))"
-"(if(null? s_617)"
+"(let-values(((s_618)(cdr s_616)))"
+"(let-values(((s_619)"
+"(if(syntax?$1 s_618)"
+"(syntax-e$1 s_618)"
+" s_618)))"
+"(if(null? s_619)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67924,55 +67990,55 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(reference-records-all-used!(expand-context-reference-records ctx_86))"
+"(reference-records-all-used!(expand-context-reference-records ctx_88))"
 "(values))))"
 "(let-values(((ok?_49 _277_0 _278_0 kw279_0)"
 "(let-values(((s_302) disarmed-s_12))"
 "(let-values(((orig-s_53) s_302))"
 "(let-values(((_277_1 _278_1 kw279_1)"
-"(let-values(((s_618)"
+"(let-values(((s_620)"
 "(if(syntax?$1 s_302)(syntax-e$1 s_302) s_302)))"
-"(if(pair? s_618)"
+"(if(pair? s_620)"
 "(let-values(((_280_0)"
-"(let-values(((s_619)(car s_618))) s_619))"
+"(let-values(((s_621)(car s_620))) s_621))"
 "((_281_0 kw282_0)"
-"(let-values(((s_620)(cdr s_618)))"
-"(let-values(((s_621)"
-"(if(syntax?$1 s_620)"
-"(syntax-e$1 s_620)"
-" s_620)))"
-"(if(pair? s_621)"
-"(let-values(((_283_0)"
-"(let-values(((s_622)"
-"(car s_621)))"
-" s_622))"
-"((kw284_0)"
+"(let-values(((s_622)(cdr s_620)))"
 "(let-values(((s_623)"
-"(cdr s_621)))"
+"(if(syntax?$1 s_622)"
+"(syntax-e$1 s_622)"
+" s_622)))"
+"(if(pair? s_623)"
+"(let-values(((_283_0)"
 "(let-values(((s_624)"
-"(if(syntax?$1"
-" s_623)"
-"(syntax-e$1"
-" s_623)"
-" s_623)))"
-"(if(pair? s_624)"
-"(let-values(((kw285_0)"
+"(car s_623)))"
+" s_624))"
+"((kw284_0)"
 "(let-values(((s_625)"
-"(car"
-" s_624)))"
-" s_625))"
-"(()"
+"(cdr s_623)))"
 "(let-values(((s_626)"
-"(cdr"
-" s_624)))"
-"(let-values(((s_627)"
 "(if(syntax?$1"
-" s_626)"
+" s_625)"
 "(syntax-e$1"
-" s_626)"
+" s_625)"
+" s_625)))"
+"(if(pair? s_626)"
+"(let-values(((kw285_0)"
+"(let-values(((s_627)"
+"(car"
 " s_626)))"
+" s_627))"
+"(()"
+"(let-values(((s_628)"
+"(cdr"
+" s_626)))"
+"(let-values(((s_629)"
+"(if(syntax?$1"
+" s_628)"
+"(syntax-e$1"
+" s_628)"
+" s_628)))"
 "(if(null?"
-" s_627)"
+" s_629)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67991,43 +68057,43 @@ static const char *startup_source =
 "(values _280_0 _281_0 kw282_0))"
 "                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
 "(values #t _277_1 _278_1 kw279_1))))))"
-"(if(expand-context-to-parsed? ctx_86)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_589) datum268_0)"
-"(let-values(((s286_0) s_589)((temp287_0)(list quote-syntax267_0 datum268_0 kw279_0)))"
+"(if(expand-context-to-parsed? ctx_88)"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_591) datum268_0)"
+"(let-values(((s286_0) s_591)((temp287_0)(list quote-syntax267_0 datum268_0 kw279_0)))"
 "(rebuild5.1 #f #f s286_0 temp287_0))))))"
 "(let-values()"
-"(let-values(((datum-s_0)(remove-scopes datum273_0(expand-context-scopes ctx_86))))"
-"(if(if(expand-context-to-parsed? ctx_86)(free-id-set-empty?(expand-context-stops ctx_86)) #f)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_589) datum-s_0)"
-"(let-values(((s288_0) s_589)((temp289_0)(list quote-syntax272_0 datum-s_0)))"
+"(let-values(((datum-s_0)(remove-scopes datum273_0(expand-context-scopes ctx_88))))"
+"(if(if(expand-context-to-parsed? ctx_88)(free-id-set-empty?(expand-context-stops ctx_88)) #f)"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_591) datum-s_0)"
+"(let-values(((s288_0) s_591)((temp289_0)(list quote-syntax272_0 datum-s_0)))"
 "(rebuild5.1 #f #f s288_0 temp289_0)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
-"(lambda(s_628 ctx_87)"
+"(lambda(s_630 ctx_89)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_111)(expand-context-observer ctx_87)))"
-"(if obs_111(let-values()(let-values()(call-expand-observe obs_111 'prim-if)))(void)))"
+"(let-values(((obs_109)(expand-context-observer ctx_89)))"
+"(if obs_109(let-values()(let-values()(call-expand-observe obs_109 'prim-if)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_13)(syntax-disarm$1 s_628)))"
+"(let-values(((disarmed-s_13)(syntax-disarm$1 s_630)))"
 "(let-values(((ok?_50 _290_0 _291_0 _292_0)"
-"(let-values(((s_629) disarmed-s_13))"
-"(if(let-values(((s_630)(if(syntax?$1 s_629)(syntax-e$1 s_629) s_629)))"
-"(if(pair? s_630)"
-"(if(let-values(((s_631)(car s_630))) #t)"
-"(let-values(((s_632)(cdr s_630)))"
-"(let-values(((s_633)(if(syntax?$1 s_632)(syntax-e$1 s_632) s_632)))"
-"(if(pair? s_633)"
-"(if(let-values(((s_634)(car s_633))) #t)"
-"(let-values(((s_635)(cdr s_633)))"
-"(let-values(((s_636)(if(syntax?$1 s_635)(syntax-e$1 s_635) s_635)))"
-"(if(pair? s_636)"
-"(if(let-values(((s_637)(car s_636))) #t)"
-"(let-values(((s_638)(cdr s_636)))"
-"(let-values(((s_639)"
-"(if(syntax?$1 s_638)(syntax-e$1 s_638) s_638)))"
-"(null? s_639)))"
+"(let-values(((s_631) disarmed-s_13))"
+"(if(let-values(((s_632)(if(syntax?$1 s_631)(syntax-e$1 s_631) s_631)))"
+"(if(pair? s_632)"
+"(if(let-values(((s_633)(car s_632))) #t)"
+"(let-values(((s_634)(cdr s_632)))"
+"(let-values(((s_635)(if(syntax?$1 s_634)(syntax-e$1 s_634) s_634)))"
+"(if(pair? s_635)"
+"(if(let-values(((s_636)(car s_635))) #t)"
+"(let-values(((s_637)(cdr s_635)))"
+"(let-values(((s_638)(if(syntax?$1 s_637)(syntax-e$1 s_637) s_637)))"
+"(if(pair? s_638)"
+"(if(let-values(((s_639)(car s_638))) #t)"
+"(let-values(((s_640)(cdr s_638)))"
+"(let-values(((s_641)"
+"(if(syntax?$1 s_640)(syntax-e$1 s_640) s_640)))"
+"(null? s_641)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -68036,37 +68102,37 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((_290_1 _291_1 _292_1)"
-"(let-values(((s_640)(if(syntax?$1 s_629)(syntax-e$1 s_629) s_629)))"
-"(let-values(((_293_0)(let-values(((s_641)(car s_640))) s_641))"
+"(let-values(((s_642)(if(syntax?$1 s_631)(syntax-e$1 s_631) s_631)))"
+"(let-values(((_293_0)(let-values(((s_643)(car s_642))) s_643))"
 "((_294_0 _295_0)"
-"(let-values(((s_642)(cdr s_640)))"
-"(let-values(((s_643)"
-"(if(syntax?$1 s_642)"
-"(syntax-e$1 s_642)"
-" s_642)))"
+"(let-values(((s_644)(cdr s_642)))"
+"(let-values(((s_645)"
+"(if(syntax?$1 s_644)"
+"(syntax-e$1 s_644)"
+" s_644)))"
 "(let-values(((_296_0)"
-"(let-values(((s_644)(car s_643))) s_644))"
+"(let-values(((s_646)(car s_645))) s_646))"
 "((_297_0)"
-"(let-values(((s_645)(cdr s_643)))"
-"(let-values(((s_646)"
-"(if(syntax?$1 s_645)"
-"(syntax-e$1 s_645)"
-" s_645)))"
-"(let-values(((_298_0)"
-"(let-values(((s_647)"
-"(car"
-" s_646)))"
-" s_647))"
-"(()"
+"(let-values(((s_647)(cdr s_645)))"
 "(let-values(((s_648)"
-"(cdr"
-" s_646)))"
+"(if(syntax?$1 s_647)"
+"(syntax-e$1 s_647)"
+" s_647)))"
+"(let-values(((_298_0)"
 "(let-values(((s_649)"
-"(if(syntax?$1"
-" s_648)"
-"(syntax-e$1"
-" s_648)"
+"(car"
 " s_648)))"
+" s_649))"
+"(()"
+"(let-values(((s_650)"
+"(cdr"
+" s_648)))"
+"(let-values(((s_651)"
+"(if(syntax?$1"
+" s_650)"
+"(syntax-e$1"
+" s_650)"
+" s_650)))"
 "(values)))))"
 "(values _298_0))))))"
 "(values _296_0 _297_0))))))"
@@ -68076,67 +68142,67 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if ok?_50"
-"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_628))"
+"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_630))"
 "(void))"
 "(values))))"
 "(let-values(((ok?_51 if299_0 tst300_0 thn301_0 els302_0)"
-"(let-values(((s_650) disarmed-s_13))"
-"(let-values(((orig-s_54) s_650))"
+"(let-values(((s_652) disarmed-s_13))"
+"(let-values(((orig-s_54) s_652))"
 "(let-values(((if299_1 tst300_1 thn301_1 els302_1)"
-"(let-values(((s_651)(if(syntax?$1 s_650)(syntax-e$1 s_650) s_650)))"
-"(if(pair? s_651)"
-"(let-values(((if303_0)(let-values(((s_652)(car s_651))) s_652))"
+"(let-values(((s_653)(if(syntax?$1 s_652)(syntax-e$1 s_652) s_652)))"
+"(if(pair? s_653)"
+"(let-values(((if303_0)(let-values(((s_654)(car s_653))) s_654))"
 "((tst304_0 thn305_0 els306_0)"
-"(let-values(((s_653)(cdr s_651)))"
-"(let-values(((s_654)"
-"(if(syntax?$1 s_653)"
-"(syntax-e$1 s_653)"
-" s_653)))"
-"(if(pair? s_654)"
+"(let-values(((s_655)(cdr s_653)))"
+"(let-values(((s_656)"
+"(if(syntax?$1 s_655)"
+"(syntax-e$1 s_655)"
+" s_655)))"
+"(if(pair? s_656)"
 "(let-values(((tst307_0)"
-"(let-values(((s_655)(car s_654)))"
-" s_655))"
+"(let-values(((s_657)(car s_656)))"
+" s_657))"
 "((thn308_0 els309_0)"
-"(let-values(((s_656)(cdr s_654)))"
-"(let-values(((s_657)"
-"(if(syntax?$1 s_656)"
-"(syntax-e$1 s_656)"
-" s_656)))"
-"(if(pair? s_657)"
-"(let-values(((thn310_0)"
-"(let-values(((s_658)"
-"(car"
-" s_657)))"
-" s_658))"
-"((els311_0)"
+"(let-values(((s_658)(cdr s_656)))"
 "(let-values(((s_659)"
-"(cdr"
-" s_657)))"
+"(if(syntax?$1 s_658)"
+"(syntax-e$1 s_658)"
+" s_658)))"
+"(if(pair? s_659)"
+"(let-values(((thn310_0)"
 "(let-values(((s_660)"
-"(if(syntax?$1"
-" s_659)"
-"(syntax-e$1"
-" s_659)"
-" s_659)))"
-"(if(pair?"
-" s_660)"
-"(let-values(((els312_0)"
-"(let-values(((s_661)"
 "(car"
-" s_660)))"
-" s_661))"
-"(()"
-"(let-values(((s_662)"
+" s_659)))"
+" s_660))"
+"((els311_0)"
+"(let-values(((s_661)"
 "(cdr"
-" s_660)))"
-"(let-values(((s_663)"
+" s_659)))"
+"(let-values(((s_662)"
 "(if(syntax?$1"
-" s_662)"
+" s_661)"
 "(syntax-e$1"
+" s_661)"
+" s_661)))"
+"(if(pair?"
 " s_662)"
+"(let-values(((els312_0)"
+"(let-values(((s_663)"
+"(car"
 " s_662)))"
+" s_663))"
+"(()"
+"(let-values(((s_664)"
+"(cdr"
+" s_662)))"
+"(let-values(((s_665)"
+"(if(syntax?$1"
+" s_664)"
+"(syntax-e$1"
+" s_664)"
+" s_664)))"
 "(if(null?"
-" s_663)"
+" s_665)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68161,21 +68227,21 @@ static const char *startup_source =
 "(values if303_0 tst304_0 thn305_0 els306_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_54)))))"
 "(values #t if299_1 tst300_1 thn301_1 els302_1))))))"
-"(let-values(((expr-ctx_2)(as-expression-context ctx_87)))"
+"(let-values(((expr-ctx_2)(as-expression-context ctx_89)))"
 "(let-values(((tail-ctx_0)"
-"(let-values(((expr-ctx313_0) expr-ctx_2)((ctx314_0) ctx_87))"
+"(let-values(((expr-ctx313_0) expr-ctx_2)((ctx314_0) ctx_89))"
 "(as-tail-context23.1 ctx314_0 expr-ctx313_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx315_0) ctx_87)((s316_0) s_628))"
+"(let-values(((ctx315_0) ctx_89)((s316_0) s_630))"
 "(keep-as-needed120.1 #f #f #f #f #f #f ctx315_0 s316_0))))"
 "(let-values(((exp-tst_0)"
 "(let-values(((temp317_0) tst300_0)((expr-ctx318_0) expr-ctx_2))"
 "(expand9.1 #f #f #f #f #f #f temp317_0 expr-ctx318_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_112)(expand-context-observer ctx_87)))"
-"(if obs_112"
-"(let-values()(let-values()(call-expand-observe obs_112 'next)))"
+"(let-values(((obs_110)(expand-context-observer ctx_89)))"
+"(if obs_110"
+"(let-values()(let-values()(call-expand-observe obs_110 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-thn_0)"
@@ -68183,15 +68249,15 @@ static const char *startup_source =
 "(expand9.1 #f #f #f #f #f #f temp319_0 tail-ctx320_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_113)(expand-context-observer ctx_87)))"
-"(if obs_113"
-"(let-values()(let-values()(call-expand-observe obs_113 'next)))"
+"(let-values(((obs_111)(expand-context-observer ctx_89)))"
+"(if obs_111"
+"(let-values()(let-values()(call-expand-observe obs_111 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-els_0)"
 "(let-values(((temp321_0) els302_0)((tail-ctx322_0) tail-ctx_0))"
 "(expand9.1 #f #f #f #f #f #f temp321_0 tail-ctx322_0))))"
-"(if(expand-context-to-parsed? ctx_87)"
+"(if(expand-context-to-parsed? ctx_89)"
 "(parsed-if8.1 rebuild-s_9 exp-tst_0 exp-thn_0 exp-els_0)"
 "(let-values(((rebuild-s323_0) rebuild-s_9)"
 "((temp324_0)(list if299_0 exp-tst_0 exp-thn_0 exp-els_0)))"
@@ -68199,73 +68265,73 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_664 ctx_88)"
+"(lambda(s_666 ctx_90)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_114)(expand-context-observer ctx_88)))"
-"(if obs_114"
-"(let-values()(let-values()(call-expand-observe obs_114 'prim-with-continuation-mark)))"
+"(let-values(((obs_112)(expand-context-observer ctx_90)))"
+"(if obs_112"
+"(let-values()(let-values()(call-expand-observe obs_112 'prim-with-continuation-mark)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_14)(syntax-disarm$1 s_664)))"
+"(let-values(((disarmed-s_14)(syntax-disarm$1 s_666)))"
 "(let-values(((ok?_52 with-continuation-mark325_0 key326_0 val327_0 body328_0)"
-"(let-values(((s_665) disarmed-s_14))"
-"(let-values(((orig-s_55) s_665))"
+"(let-values(((s_667) disarmed-s_14))"
+"(let-values(((orig-s_55) s_667))"
 "(let-values(((with-continuation-mark325_1 key326_1 val327_1 body328_1)"
-"(let-values(((s_666)(if(syntax?$1 s_665)(syntax-e$1 s_665) s_665)))"
-"(if(pair? s_666)"
+"(let-values(((s_668)(if(syntax?$1 s_667)(syntax-e$1 s_667) s_667)))"
+"(if(pair? s_668)"
 "(let-values(((with-continuation-mark329_0)"
-"(let-values(((s_667)(car s_666))) s_667))"
+"(let-values(((s_669)(car s_668))) s_669))"
 "((key330_0 val331_0 body332_0)"
-"(let-values(((s_668)(cdr s_666)))"
-"(let-values(((s_669)"
-"(if(syntax?$1 s_668)"
-"(syntax-e$1 s_668)"
-" s_668)))"
-"(if(pair? s_669)"
+"(let-values(((s_670)(cdr s_668)))"
+"(let-values(((s_671)"
+"(if(syntax?$1 s_670)"
+"(syntax-e$1 s_670)"
+" s_670)))"
+"(if(pair? s_671)"
 "(let-values(((key333_0)"
-"(let-values(((s_670)(car s_669)))"
-" s_670))"
+"(let-values(((s_672)(car s_671)))"
+" s_672))"
 "((val334_0 body335_0)"
-"(let-values(((s_671)(cdr s_669)))"
-"(let-values(((s_672)"
-"(if(syntax?$1 s_671)"
-"(syntax-e$1 s_671)"
-" s_671)))"
-"(if(pair? s_672)"
-"(let-values(((val336_0)"
-"(let-values(((s_673)"
-"(car"
-" s_672)))"
-" s_673))"
-"((body337_0)"
+"(let-values(((s_673)(cdr s_671)))"
 "(let-values(((s_674)"
-"(cdr"
-" s_672)))"
+"(if(syntax?$1 s_673)"
+"(syntax-e$1 s_673)"
+" s_673)))"
+"(if(pair? s_674)"
+"(let-values(((val336_0)"
 "(let-values(((s_675)"
-"(if(syntax?$1"
-" s_674)"
-"(syntax-e$1"
-" s_674)"
-" s_674)))"
-"(if(pair? s_675)"
-"(let-values(((body338_0)"
-"(let-values(((s_676)"
 "(car"
-" s_675)))"
-" s_676))"
-"(()"
-"(let-values(((s_677)"
+" s_674)))"
+" s_675))"
+"((body337_0)"
+"(let-values(((s_676)"
 "(cdr"
-" s_675)))"
-"(let-values(((s_678)"
+" s_674)))"
+"(let-values(((s_677)"
 "(if(syntax?$1"
-" s_677)"
+" s_676)"
 "(syntax-e$1"
-" s_677)"
+" s_676)"
+" s_676)))"
+"(if(pair? s_677)"
+"(let-values(((body338_0)"
+"(let-values(((s_678)"
+"(car"
 " s_677)))"
+" s_678))"
+"(()"
+"(let-values(((s_679)"
+"(cdr"
+" s_677)))"
+"(let-values(((s_680)"
+"(if(syntax?$1"
+" s_679)"
+"(syntax-e$1"
+" s_679)"
+" s_679)))"
 "(if(null?"
-" s_678)"
+" s_680)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68287,18 +68353,18 @@ static const char *startup_source =
 "(values with-continuation-mark329_0 key330_0 val331_0 body332_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_55)))))"
 "(values #t with-continuation-mark325_1 key326_1 val327_1 body328_1))))))"
-"(let-values(((expr-ctx_3)(as-expression-context ctx_88)))"
+"(let-values(((expr-ctx_3)(as-expression-context ctx_90)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx339_0) ctx_88)((s340_0) s_664))"
+"(let-values(((ctx339_0) ctx_90)((s340_0) s_666))"
 "(keep-as-needed120.1 #f #f #f #f #f #f ctx339_0 s340_0))))"
 "(let-values(((exp-key_0)"
 "(let-values(((temp341_0) key326_0)((expr-ctx342_0) expr-ctx_3))"
 "(expand9.1 #f #f #f #f #f #f temp341_0 expr-ctx342_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_115)(expand-context-observer ctx_88)))"
-"(if obs_115"
-"(let-values()(let-values()(call-expand-observe obs_115 'next)))"
+"(let-values(((obs_113)(expand-context-observer ctx_90)))"
+"(if obs_113"
+"(let-values()(let-values()(call-expand-observe obs_113 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-val_0)"
@@ -68306,18 +68372,18 @@ static const char *startup_source =
 "(expand9.1 #f #f #f #f #f #f temp343_0 expr-ctx344_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_116)(expand-context-observer ctx_88)))"
-"(if obs_116"
-"(let-values()(let-values()(call-expand-observe obs_116 'next)))"
+"(let-values(((obs_114)(expand-context-observer ctx_90)))"
+"(if obs_114"
+"(let-values()(let-values()(call-expand-observe obs_114 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-body_6)"
 "(let-values(((temp345_0) body328_0)"
 "((temp346_0)"
-"(let-values(((expr-ctx347_0) expr-ctx_3)((ctx348_0) ctx_88))"
+"(let-values(((expr-ctx347_0) expr-ctx_3)((ctx348_0) ctx_90))"
 "(as-tail-context23.1 ctx348_0 expr-ctx347_0))))"
 "(expand9.1 #f #f #f #f #f #f temp345_0 temp346_0))))"
-"(if(expand-context-to-parsed? ctx_88)"
+"(if(expand-context-to-parsed? ctx_90)"
 "(parsed-with-continuation-mark10.1 rebuild-s_10 exp-key_0 exp-val_0 exp-body_6)"
 "(let-values(((rebuild-s349_0) rebuild-s_10)"
 "((temp350_0)(list with-continuation-mark325_0 exp-key_0 exp-val_0 exp-body_6)))"
@@ -68332,32 +68398,32 @@ static const char *startup_source =
 "(let-values(((list-start-index_0) list-start-index14_0))"
 "(let-values(((last-is-tail?_0) last-is-tail?15_0))"
 "(let-values()"
-"(lambda(s_679 ctx_89)"
+"(lambda(s_681 ctx_91)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_117)(expand-context-observer ctx_89)))"
-"(if obs_117"
-"(let-values()(let-values()(call-expand-observe obs_117 log-tag_1)))"
+"(let-values(((obs_115)(expand-context-observer ctx_91)))"
+"(if obs_115"
+"(let-values()(let-values()(call-expand-observe obs_115 log-tag_1)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_15)(syntax-disarm$1 s_679)))"
+"(let-values(((disarmed-s_15)(syntax-disarm$1 s_681)))"
 "(let-values(((ok?_53 begin351_0 e352_0)"
-"(let-values(((s_680) disarmed-s_15))"
-"(let-values(((orig-s_56) s_680))"
+"(let-values(((s_682) disarmed-s_15))"
+"(let-values(((orig-s_56) s_682))"
 "(let-values(((begin351_1 e352_1)"
-"(let-values(((s_681)"
-"(if(syntax?$1 s_680)(syntax-e$1 s_680) s_680)))"
-"(if(pair? s_681)"
+"(let-values(((s_683)"
+"(if(syntax?$1 s_682)(syntax-e$1 s_682) s_682)))"
+"(if(pair? s_683)"
 "(let-values(((begin353_0)"
-"(let-values(((s_682)(car s_681))) s_682))"
+"(let-values(((s_684)(car s_683))) s_684))"
 "((e354_0)"
-"(let-values(((s_683)(cdr s_681)))"
-"(let-values(((s_684)"
-"(if(syntax?$1 s_683)"
-"(syntax-e$1 s_683)"
-" s_683)))"
+"(let-values(((s_685)(cdr s_683)))"
+"(let-values(((s_686)"
+"(if(syntax?$1 s_685)"
+"(syntax-e$1 s_685)"
+" s_685)))"
 "(let-values(((flat-s_44)"
-"(to-syntax-list.1 s_684)))"
+"(to-syntax-list.1 s_686)))"
 "(if(not flat-s_44)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -68376,10 +68442,10 @@ static const char *startup_source =
 "(values #t begin351_1 e352_1))))))"
 "(let-values(((expr-ctx_4)"
 "(if last-is-tail?_0"
-"(as-begin-expression-context ctx_89)"
-"(as-expression-context ctx_89))))"
+"(as-begin-expression-context ctx_91)"
+"(as-expression-context ctx_91))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx355_0) ctx_89)((s356_0) s_679))"
+"(let-values(((ctx355_0) ctx_91)((s356_0) s_681))"
 "(keep-as-needed120.1 #f #f #f #f #f #f ctx355_0 s356_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_124)"
@@ -68389,17 +68455,17 @@ static const char *startup_source =
 "(begin"
 "(if(zero? index_6)"
 "(let-values()"
-"(let-values(((obs_118)"
-"(expand-context-observer ctx_89)))"
-"(if obs_118"
+"(let-values(((obs_116)"
+"(expand-context-observer ctx_91)))"
+"(if obs_116"
 "(let-values()"
 "(begin"
 "(if(zero? list-start-index_0)"
 "(void)"
 "(let-values()"
-"(call-expand-observe obs_118 'next)))"
+"(call-expand-observe obs_116 'next)))"
 "(call-expand-observe"
-" obs_118"
+" obs_116"
 " 'enter-list"
 "(datum->syntax$1 #f es_5 rebuild-s_11))))"
 "(void))))"
@@ -68409,13 +68475,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((rest-es_1)(cdr es_5)))"
 "(begin"
-"(let-values(((obs_119)"
+"(let-values(((obs_117)"
 "(expand-context-observer"
-" ctx_89)))"
-"(if obs_119"
+" ctx_91)))"
+"(if obs_117"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_119 'next)))"
+"(call-expand-observe obs_117 'next)))"
 "(void)))"
 "(cons"
 "(let-values(((temp357_0)(car es_5))"
@@ -68426,7 +68492,7 @@ static const char *startup_source =
 "(let-values(((expr-ctx359_0)"
 " expr-ctx_4)"
 "((ctx360_0)"
-" ctx_89))"
+" ctx_91))"
 "(as-tail-context23.1"
 " ctx360_0"
 " expr-ctx359_0))"
@@ -68445,16 +68511,16 @@ static const char *startup_source =
 " e352_0"
 " list-start-index_0)))"
 "(begin"
-"(let-values(((obs_120)(expand-context-observer ctx_89)))"
-"(if obs_120"
+"(let-values(((obs_118)(expand-context-observer ctx_91)))"
+"(if obs_118"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_120"
+" obs_118"
 " 'exit-list"
 "(datum->syntax$1 #f(list-tail exp-es_2 list-start-index_0) rebuild-s_11))))"
 "(void)))"
-"(if(expand-context-to-parsed? ctx_89)"
+"(if(expand-context-to-parsed? ctx_91)"
 "(parsed-begin_0 rebuild-s_11 exp-es_2)"
 "(let-values(((rebuild-s361_0) rebuild-s_11)((temp362_0)(cons begin351_0 exp-es_2)))"
 "(rebuild5.1 #f #f rebuild-s361_0 temp362_0)))))))))))))))))))"
@@ -68467,39 +68533,39 @@ static const char *startup_source =
 "((temp365_0) 0)"
 "((temp366_0) #t))"
 "(make-begin20.1 temp366_0 temp365_0 temp363_0 parsed-begin364_0))))"
-"(lambda(s_685 ctx_90)"
-"(let-values(((context_24)(expand-context-context ctx_90)))"
+"(lambda(s_687 ctx_92)"
+"(let-values(((context_24)(expand-context-context ctx_92)))"
 "(if(let-values(((or-part_380)(eq? context_24 'top-level)))"
 "(if or-part_380 or-part_380(eq? context_24 'module)))"
 "(let-values()"
-"(let-values(((disarmed-s_16)(syntax-disarm$1 s_685)))"
+"(let-values(((disarmed-s_16)(syntax-disarm$1 s_687)))"
 "(let-values(((ok?_54 begin367_0)"
-"(let-values(((s_686) disarmed-s_16))"
-"(if(let-values(((s_687)(if(syntax?$1 s_686)(syntax-e$1 s_686) s_686)))"
-"(if(pair? s_687)"
-"(if(let-values(((s_688)(car s_687))) #t)"
-"(let-values(((s_689)(cdr s_687)))"
-"(let-values(((s_690)(if(syntax?$1 s_689)(syntax-e$1 s_689) s_689)))"
-"(null? s_690)))"
+"(let-values(((s_688) disarmed-s_16))"
+"(if(let-values(((s_689)(if(syntax?$1 s_688)(syntax-e$1 s_688) s_688)))"
+"(if(pair? s_689)"
+"(if(let-values(((s_690)(car s_689))) #t)"
+"(let-values(((s_691)(cdr s_689)))"
+"(let-values(((s_692)(if(syntax?$1 s_691)(syntax-e$1 s_691) s_691)))"
+"(null? s_692)))"
 " #f)"
 " #f))"
 "(let-values()"
 "(let-values(((begin367_1)"
-"(let-values(((s_691)(if(syntax?$1 s_686)(syntax-e$1 s_686) s_686)))"
+"(let-values(((s_693)(if(syntax?$1 s_688)(syntax-e$1 s_688) s_688)))"
 "(let-values(((begin368_0)"
-"(let-values(((s_692)(car s_691))) s_692))"
+"(let-values(((s_694)(car s_693))) s_694))"
 "(()"
-"(let-values(((s_693)(cdr s_691)))"
-"(let-values(((s_694)"
-"(if(syntax?$1 s_693)"
-"(syntax-e$1 s_693)"
-" s_693)))"
+"(let-values(((s_695)(cdr s_693)))"
+"(let-values(((s_696)"
+"(if(syntax?$1 s_695)"
+"(syntax-e$1 s_695)"
+" s_695)))"
 "(values)))))"
 "(values begin368_0)))))"
 "(values #t begin367_1)))"
 "(values #f #f)))))"
-"(if ok?_54 s_685(nonempty-begin_0 s_685 ctx_90)))))"
-"(let-values()(nonempty-begin_0 s_685 ctx_90))))))))"
+"(if ok?_54 s_687(nonempty-begin_0 s_687 ctx_92)))))"
+"(let-values()(nonempty-begin_0 s_687 ctx_92))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
@@ -68507,14 +68573,14 @@ static const char *startup_source =
 "(make-begin20.1 temp372_0 temp371_0 temp369_0 parsed-begin0370_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
-"(lambda(id_121 ctx_91)"
+"(lambda(id_121 ctx_93)"
 "(begin"
-"(if(if(expand-context-need-eventually-defined ctx_91)(>=(expand-context-phase ctx_91) 1) #f)"
+"(if(if(expand-context-need-eventually-defined ctx_93)(>=(expand-context-phase ctx_93) 1) #f)"
 "(let-values()"
 "(begin"
 "(hash-update!"
-"(expand-context-need-eventually-defined ctx_91)"
-"(expand-context-phase ctx_91)"
+"(expand-context-need-eventually-defined ctx_93)"
+"(expand-context-phase ctx_93)"
 "(lambda(l_87)(cons id_121 l_87))"
 " null)"
 " #t))"
@@ -68526,58 +68592,58 @@ static const char *startup_source =
 "(lambda(s375_0 ctx376_0 implicit-omitted?373_0 implicit-omitted?374_0)"
 "(begin"
 " 'core377"
-"(let-values(((s_695) s375_0))"
-"(let-values(((ctx_92) ctx376_0))"
+"(let-values(((s_697) s375_0))"
+"(let-values(((ctx_94) ctx376_0))"
 "(let-values(((implicit-omitted?_0)(if implicit-omitted?374_0 implicit-omitted?373_0 #f)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_121)(expand-context-observer ctx_92)))"
-"(if obs_121"
+"(let-values(((obs_119)(expand-context-observer ctx_94)))"
+"(if obs_119"
 "(let-values()"
-"(let-values()(call-expand-observe obs_121 'prim-#%top)))"
+"(let-values()(call-expand-observe obs_119 'prim-#%top)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_17)(syntax-disarm$1 s_695)))"
+"(let-values(((disarmed-s_17)(syntax-disarm$1 s_697)))"
 "(let-values(((id_122)"
 "(if implicit-omitted?_0"
-"(let-values() s_695)"
+"(let-values() s_697)"
 "(let-values()"
 "(let-values(((ok?_55 #%top379_0 id380_0)"
-"(let-values(((s_696) disarmed-s_17))"
-"(let-values(((orig-s_57) s_696))"
+"(let-values(((s_698) disarmed-s_17))"
+"(let-values(((orig-s_57) s_698))"
 "(let-values(((#%top379_1 id380_1)"
-"(let-values(((s_697)"
-"(if(syntax?$1 s_696)"
-"(syntax-e$1 s_696)"
-" s_696)))"
-"(if(pair? s_697)"
-"(let-values(((#%top381_0)"
-"(let-values(((s_698)"
-"(car"
-" s_697)))"
-" s_698))"
-"((id382_0)"
 "(let-values(((s_699)"
+"(if(syntax?$1 s_698)"
+"(syntax-e$1 s_698)"
+" s_698)))"
+"(if(pair? s_699)"
+"(let-values(((#%top381_0)"
+"(let-values(((s_700)"
+"(car"
+" s_699)))"
+" s_700))"
+"((id382_0)"
+"(let-values(((s_701)"
 "(cdr"
-" s_697)))"
+" s_699)))"
 "(if(let-values(((or-part_381)"
 "(if(syntax?$1"
-" s_699)"
+" s_701)"
 "(symbol?"
 "(syntax-e$1"
-" s_699))"
+" s_701))"
 " #f)))"
 "(if or-part_381"
 " or-part_381"
 "(symbol?"
-" s_699)))"
-" s_699"
+" s_701)))"
+" s_701"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"not an identifier\""
 " orig-s_57"
-" s_699)))))"
+" s_701)))))"
 "(values #%top381_0 id382_0))"
 "(raise-syntax-error$1"
 " #f"
@@ -68587,7 +68653,7 @@ static const char *startup_source =
 " id380_0)))))"
 "(let-values(((b_93)"
 "(let-values(((id383_0) id_122)"
-"((temp384_0)(expand-context-phase ctx_92))"
+"((temp384_0)(expand-context-phase ctx_94))"
 "((temp385_0) 'ambiguous))"
 "(resolve+shift30.1"
 " temp385_0"
@@ -68603,25 +68669,25 @@ static const char *startup_source =
 " id383_0"
 " temp384_0))))"
 "(if(eq? b_93 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_122 ctx_92))"
+"(let-values()(raise-ambiguous-error id_122 ctx_94))"
 "(if(if b_93"
 "(if(module-binding? b_93)"
-"(eq?(module-binding-module b_93)(root-expand-context-self-mpi ctx_92))"
+"(eq?(module-binding-module b_93)(root-expand-context-self-mpi ctx_94))"
 " #f)"
 " #f)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_92)"
+"(if(expand-context-to-parsed? ctx_94)"
 "(parsed-id2.1 id_122 b_93 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_93))"
-"(let-values() s_695)"
+"(let-values() s_697)"
 "(let-values() id_122))))"
-"(if(register-eventual-variable!? id_122 ctx_92)"
+"(if(register-eventual-variable!? id_122 ctx_94)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_92)"
+"(if(expand-context-to-parsed? ctx_94)"
 "(parsed-id2.1 id_122 b_93 #f)"
 " id_122))"
 "(let-values()"
-"(if(not(expand-context-allow-unbound? ctx_92))"
+"(if(not(expand-context-allow-unbound? ctx_94))"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
@@ -68629,16 +68695,16 @@ static const char *startup_source =
 " id_122"
 " #f"
 " null"
-"(syntax-debug-info-string id_122 ctx_92)))"
+"(syntax-debug-info-string id_122 ctx_94)))"
 "(let-values()"
 "(let-values(((tl-id_1)"
 "(add-scope"
 " id_122"
-"(root-expand-context-top-level-bind-scope ctx_92))))"
+"(root-expand-context-top-level-bind-scope ctx_94))))"
 "(let-values(((tl-b_1)"
 "(let-values(((tl-id386_0) tl-id_1)"
 "((temp387_0)"
-"(expand-context-phase ctx_92)))"
+"(expand-context-phase ctx_94)))"
 "(resolve40.1"
 " #f"
 " #f"
@@ -68652,48 +68718,48 @@ static const char *startup_source =
 " temp387_0))))"
 "(if tl-b_1"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_92)"
+"(if(expand-context-to-parsed? ctx_94)"
 "(parsed-top-id4.1 tl-id_1 tl-b_1 #f)"
 "(if implicit-omitted?_0"
 "(let-values() id_122)"
 "(let-values()"
 "(let-values(((ok?_56 #%top388_0 id389_0)"
-"(let-values(((s_700) disarmed-s_17))"
-"(let-values(((orig-s_58) s_700))"
+"(let-values(((s_702) disarmed-s_17))"
+"(let-values(((orig-s_58) s_702))"
 "(let-values(((#%top388_1 id389_1)"
-"(let-values(((s_701)"
-"(if(syntax?$1"
-" s_700)"
-"(syntax-e$1"
-" s_700)"
-" s_700)))"
-"(if(pair? s_701)"
-"(let-values(((#%top390_0)"
-"(let-values(((s_702)"
-"(car"
-" s_701)))"
-" s_702))"
-"((id391_0)"
 "(let-values(((s_703)"
+"(if(syntax?$1"
+" s_702)"
+"(syntax-e$1"
+" s_702)"
+" s_702)))"
+"(if(pair? s_703)"
+"(let-values(((#%top390_0)"
+"(let-values(((s_704)"
+"(car"
+" s_703)))"
+" s_704))"
+"((id391_0)"
+"(let-values(((s_705)"
 "(cdr"
-" s_701)))"
+" s_703)))"
 "(if(let-values(((or-part_382)"
 "(if(syntax?$1"
-" s_703)"
+" s_705)"
 "(symbol?"
 "(syntax-e$1"
-" s_703))"
+" s_705))"
 " #f)))"
 "(if or-part_382"
 " or-part_382"
 "(symbol?"
-" s_703)))"
-" s_703"
+" s_705)))"
+" s_705"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                      \"not an identifier\""
 " orig-s_58"
-" s_703)))))"
+" s_705)))))"
 "(values"
 " #%top390_0"
 " id391_0))"
@@ -68702,80 +68768,80 @@ static const char *startup_source =
 "                                                                                                    \"bad syntax\""
 " orig-s_58)))))"
 "(values #t #%top388_1 id389_1))))))"
-"(let-values(((s392_0) s_695)"
+"(let-values(((s392_0) s_697)"
 "((temp393_0)(cons #%top388_0 id_122)))"
 "(rebuild5.1 #f #f s392_0 temp393_0)))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_92)"
+"(if(expand-context-to-parsed? ctx_94)"
 "(parsed-top-id4.1 id_122 b_93 #f)"
-" s_695)))))))))))))))))))))))"
+" s_697)))))))))))))))))))))))"
 "(case-lambda"
-"((s_704 ctx_93)(core377_0 s_704 ctx_93 #f #f))"
-"((s_705 ctx_94 implicit-omitted?373_1)(core377_0 s_705 ctx_94 implicit-omitted?373_1 #t))))))"
+"((s_706 ctx_95)(core377_0 s_706 ctx_95 #f #f))"
+"((s_707 ctx_96 implicit-omitted?373_1)(core377_0 s_707 ctx_96 implicit-omitted?373_1 #t))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
-"(lambda(s_706 ctx_95)"
+"(lambda(s_708 ctx_97)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_122)(expand-context-observer ctx_95)))"
-"(if obs_122(let-values()(let-values()(call-expand-observe obs_122 'prim-set!)))(void)))"
+"(let-values(((obs_120)(expand-context-observer ctx_97)))"
+"(if obs_120(let-values()(let-values()(call-expand-observe obs_120 'prim-set!)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_18)(syntax-disarm$1 s_706)))"
+"(let-values(((disarmed-s_18)(syntax-disarm$1 s_708)))"
 "(let-values(((ok?_57 set!394_0 id395_0 rhs396_0)"
-"(let-values(((s_707) disarmed-s_18))"
-"(let-values(((orig-s_59) s_707))"
+"(let-values(((s_709) disarmed-s_18))"
+"(let-values(((orig-s_59) s_709))"
 "(let-values(((set!394_1 id395_1 rhs396_1)"
-"(let-values(((s_708)(if(syntax?$1 s_707)(syntax-e$1 s_707) s_707)))"
-"(if(pair? s_708)"
-"(let-values(((set!397_0)(let-values(((s_709)(car s_708))) s_709))"
+"(let-values(((s_710)(if(syntax?$1 s_709)(syntax-e$1 s_709) s_709)))"
+"(if(pair? s_710)"
+"(let-values(((set!397_0)(let-values(((s_711)(car s_710))) s_711))"
 "((id398_0 rhs399_0)"
-"(let-values(((s_710)(cdr s_708)))"
-"(let-values(((s_711)"
-"(if(syntax?$1 s_710)"
-"(syntax-e$1 s_710)"
-" s_710)))"
-"(if(pair? s_711)"
-"(let-values(((id400_0)"
-"(let-values(((s_712)(car s_711)))"
-"(if(let-values(((or-part_383)"
+"(let-values(((s_712)(cdr s_710)))"
+"(let-values(((s_713)"
 "(if(syntax?$1 s_712)"
+"(syntax-e$1 s_712)"
+" s_712)))"
+"(if(pair? s_713)"
+"(let-values(((id400_0)"
+"(let-values(((s_714)(car s_713)))"
+"(if(let-values(((or-part_383)"
+"(if(syntax?$1 s_714)"
 "(symbol?"
 "(syntax-e$1"
-" s_712))"
+" s_714))"
 " #f)))"
 "(if or-part_383"
 " or-part_383"
-"(symbol? s_712)))"
-" s_712"
+"(symbol? s_714)))"
+" s_714"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                    \"not an identifier\""
 " orig-s_59"
-" s_712))))"
+" s_714))))"
 "((rhs401_0)"
-"(let-values(((s_713)(cdr s_711)))"
-"(let-values(((s_714)"
-"(if(syntax?$1 s_713)"
-"(syntax-e$1 s_713)"
-" s_713)))"
-"(if(pair? s_714)"
-"(let-values(((rhs402_0)"
-"(let-values(((s_715)"
-"(car"
-" s_714)))"
-" s_715))"
-"(()"
+"(let-values(((s_715)(cdr s_713)))"
 "(let-values(((s_716)"
-"(cdr"
-" s_714)))"
+"(if(syntax?$1 s_715)"
+"(syntax-e$1 s_715)"
+" s_715)))"
+"(if(pair? s_716)"
+"(let-values(((rhs402_0)"
 "(let-values(((s_717)"
-"(if(syntax?$1"
-" s_716)"
-"(syntax-e$1"
-" s_716)"
+"(car"
 " s_716)))"
-"(if(null? s_717)"
+" s_717))"
+"(()"
+"(let-values(((s_718)"
+"(cdr"
+" s_716)))"
+"(let-values(((s_719)"
+"(if(syntax?$1"
+" s_718)"
+"(syntax-e$1"
+" s_718)"
+" s_718)))"
+"(if(null? s_719)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68798,7 +68864,7 @@ static const char *startup_source =
 " 'rename-loop"
 "(let-values(((binding_30)"
 "(let-values(((id403_0) id_123)"
-"((temp404_0)(expand-context-phase ctx_95))"
+"((temp404_0)(expand-context-phase ctx_97))"
 "((temp405_0) 'ambiguous)"
 "((temp406_0) #t))"
 "(resolve+shift30.1"
@@ -68817,31 +68883,31 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if(eq? binding_30 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_123 ctx_95))"
+"(let-values()(raise-ambiguous-error id_123 ctx_97))"
 "(void))"
 "(values))))"
 "(let-values(((t_59 primitive?_11 insp_24 protected?_12)"
 "(if binding_30"
 "(let-values(((binding407_0) binding_30)"
-"((ctx408_0) ctx_95)"
-"((s409_0) s_706))"
+"((ctx408_0) ctx_97)"
+"((s409_0) s_708))"
 "(lookup62.1 #f #f #f #f binding407_0 ctx408_0 s409_0))"
 "(values #f #f #f #f))))"
 "(begin"
-"(let-values(((obs_123)(expand-context-observer ctx_95)))"
-"(if obs_123"
+"(let-values(((obs_121)(expand-context-observer ctx_97)))"
+"(if obs_121"
 "(let-values()"
-"(let-values()(call-expand-observe obs_123 'resolve id_123)))"
+"(let-values()(call-expand-observe obs_121 'resolve id_123)))"
 "(void)))"
 "(if(let-values(((or-part_384)(variable? t_59)))"
 "(if or-part_384"
 " or-part_384"
 "(if(not binding_30)"
 "(let-values(((or-part_385)"
-"(register-eventual-variable!? id_123 ctx_95)))"
+"(register-eventual-variable!? id_123 ctx_97)))"
 "(if or-part_385"
 " or-part_385"
-"(expand-context-allow-unbound? ctx_95)))"
+"(expand-context-allow-unbound? ctx_97)))"
 " #f)))"
 "(let-values()"
 "(let-values((()"
@@ -68850,24 +68916,24 @@ static const char *startup_source =
 "(not"
 "(eq?"
 "(module-binding-module binding_30)"
-"(root-expand-context-self-mpi ctx_95)))"
+"(root-expand-context-self-mpi ctx_97)))"
 " #f)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                                    \"cannot mutate module-required identifier\""
-" s_706"
+" s_708"
 " id_123))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_124)"
-"(expand-context-observer ctx_95)))"
-"(if obs_124"
+"(let-values(((obs_122)"
+"(expand-context-observer ctx_97)))"
+"(if obs_122"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_124 'next)))"
+"(call-expand-observe obs_122 'next)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -68875,7 +68941,7 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_30)"
 "(values))))"
 "(let-values(((rebuild-s_12)"
-"(let-values(((ctx410_0) ctx_95)((s411_0) s_706))"
+"(let-values(((ctx410_0) ctx_97)((s411_0) s_708))"
 "(keep-as-needed120.1"
 " #f"
 " #f"
@@ -68888,7 +68954,7 @@ static const char *startup_source =
 "(let-values(((exp-rhs_5)"
 "(let-values(((temp412_0) rhs396_0)"
 "((temp413_0)"
-"(as-expression-context ctx_95)))"
+"(as-expression-context ctx_97)))"
 "(expand9.1"
 " #f"
 " #f"
@@ -68898,7 +68964,7 @@ static const char *startup_source =
 " #f"
 " temp412_0"
 " temp413_0))))"
-"(if(expand-context-to-parsed? ctx_95)"
+"(if(expand-context-to-parsed? ctx_97)"
 "(parsed-set!9.1"
 " rebuild-s_12"
 "(parsed-id2.1 id_123 binding_30 #f)"
@@ -68912,7 +68978,7 @@ static const char *startup_source =
 "((temp418_0)"
 "(free-id-set-empty-or-just-module*?"
 "(expand-context-stops"
-" ctx_95))))"
+" ctx_97))))"
 "(substitute-variable6.1"
 " temp418_0"
 " id416_0"
@@ -68924,35 +68990,35 @@ static const char *startup_source =
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" s_706"
+" s_708"
 " id_123"
 " null"
-"(syntax-debug-info-string id_123 ctx_95)))"
+"(syntax-debug-info-string id_123 ctx_97)))"
 "(if(1/set!-transformer? t_59)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_59 ctx_95)"
+"(if(not-in-this-expand-context? t_59 ctx_97)"
 "(let-values()"
 "(let-values(((temp419_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_706"
+" s_708"
 " disarmed-s_18"
 " set!394_0"
 " rhs396_0"
 " id_123"
 " from-rename?_0"
-" ctx_95)"
+" ctx_97)"
 " t_59"
-" ctx_95))"
-"((ctx420_0) ctx_95))"
+" ctx_97))"
+"((ctx420_0) ctx_97))"
 "(expand9.1 #f #f #f #f #f #f temp419_0 ctx420_0)))"
 "(let-values()"
 "(let-values(((exp-s_14 re-ctx_1)"
 "(let-values(((t421_0) t_59)"
 "((insp422_0) insp_24)"
-"((s423_0) s_706)"
+"((s423_0) s_708)"
 "((orig-id424_0) orig-id_1)"
-"((ctx425_0) ctx_95)"
+"((ctx425_0) ctx_97)"
 "((binding426_0) binding_30)"
 "((orig-id427_0) orig-id_1))"
 "(apply-transformer52.1"
@@ -68964,7 +69030,7 @@ static const char *startup_source =
 " orig-id424_0"
 " ctx425_0"
 " binding426_0))))"
-"(if(expand-context-just-once? ctx_95)"
+"(if(expand-context-just-once? ctx_97)"
 "(let-values() exp-s_14)"
 "(let-values()"
 "(let-values(((exp-s428_0) exp-s_14)"
@@ -68980,27 +69046,27 @@ static const char *startup_source =
 " re-ctx429_0))))))))"
 "(if(1/rename-transformer? t_59)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_59 ctx_95)"
+"(if(not-in-this-expand-context? t_59 ctx_97)"
 "(let-values()"
 "(let-values(((temp430_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_706"
+" s_708"
 " disarmed-s_18"
 " set!394_0"
 " rhs396_0"
 " id_123"
 " from-rename?_0"
-" ctx_95"
+" ctx_97"
 " t_59)"
 " t_59"
-" ctx_95))"
-"((ctx431_0) ctx_95))"
+" ctx_97))"
+"((ctx431_0) ctx_97))"
 "(expand9.1 #f #f #f #f #f #f temp430_0 ctx431_0)))"
 "(let-values()"
 "(rename-loop_0"
 "(syntax-track-origin$1"
-"(rename-transformer-target-in-context t_59 ctx_95)"
+"(rename-transformer-target-in-context t_59 ctx_97)"
 " id_123"
 " id_123)"
 " #t))))"
@@ -69008,7 +69074,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                      \"cannot mutate syntax identifier\""
-" s_706"
+" s_708"
 " id_123))))))))))))))"
 " rename-loop_0)"
 " orig-id_1"
@@ -69019,13 +69085,13 @@ static const char *startup_source =
 "(lambda(s25_0 disarmed-s26_0 set!-id27_0 id28_0 rhs-s29_0 from-rename?30_0 ctx31_0 t23_0 t24_0)"
 "(begin"
 " 'substitute-set!-rename32"
-"(let-values(((s_718) s25_0))"
+"(let-values(((s_720) s25_0))"
 "(let-values(((disarmed-s_19) disarmed-s26_0))"
 "(let-values(((set!-id_0) set!-id27_0))"
 "(let-values(((id_124) id28_0))"
 "(let-values(((rhs-s_0) rhs-s29_0))"
 "(let-values(((from-rename?_1) from-rename?30_0))"
-"(let-values(((ctx_96) ctx31_0))"
+"(let-values(((ctx_98) ctx31_0))"
 "(let-values(((t_60)(if t24_0 t23_0 #f)))"
 "(let-values()"
 "(if(let-values(((or-part_386) t_60))"
@@ -69033,7 +69099,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_60"
-"(rename-transformer-target-in-context t_60 ctx_96)"
+"(rename-transformer-target-in-context t_60 ctx_98)"
 " id_124)))"
 "(syntax-rearm$1"
 "(datum->syntax$1"
@@ -69041,93 +69107,93 @@ static const char *startup_source =
 "(list set!-id_0 new-id_1 rhs-s_0)"
 " disarmed-s_19"
 " disarmed-s_19)"
-" s_718)))"
-"(let-values() s_718)))))))))))))))"
+" s_720)))"
+"(let-values() s_720)))))))))))))))"
 "(case-lambda"
-"((s_719 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_97)"
-"(begin(substitute-set!-rename32_0 s_719 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_97 #f #f)))"
-"((s_720 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_98 t23_1)"
-"(substitute-set!-rename32_0 s_720 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_98 t23_1 #t)))))"
+"((s_721 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_99)"
+"(begin(substitute-set!-rename32_0 s_721 disarmed-s_20 set!-id_1 id_125 rhs-s_1 from-rename?_2 ctx_99 #f #f)))"
+"((s_722 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_100 t23_1)"
+"(substitute-set!-rename32_0 s_722 disarmed-s_21 set!-id_2 id_126 rhs-s_2 from-rename?_3 ctx_100 t23_1 #t)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_721 ctx_99)"
+"(lambda(s_723 ctx_101)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_125)(expand-context-observer ctx_99)))"
-"(if obs_125"
-"(let-values()(let-values()(call-expand-observe obs_125 'prim-#%variable-reference)))"
+"(let-values(((obs_123)(expand-context-observer ctx_101)))"
+"(if obs_123"
+"(let-values()(let-values()(call-expand-observe obs_123 'prim-#%variable-reference)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_22)(syntax-disarm$1 s_721)))"
+"(let-values(((disarmed-s_22)(syntax-disarm$1 s_723)))"
 "(let-values(((ok?_58 #%variable-reference432_0 id433_0)"
-"(let-values(((s_722) disarmed-s_22))"
-"(if(let-values(((s_723)(if(syntax?$1 s_722)(syntax-e$1 s_722) s_722)))"
-"(if(pair? s_723)"
-"(if(let-values(((s_724)(car s_723))) #t)"
-"(let-values(((s_725)(cdr s_723)))"
-"(let-values(((s_726)(if(syntax?$1 s_725)(syntax-e$1 s_725) s_725)))"
-"(if(pair? s_726)"
-"(if(let-values(((s_727)(car s_726)))"
+"(let-values(((s_724) disarmed-s_22))"
+"(if(let-values(((s_725)(if(syntax?$1 s_724)(syntax-e$1 s_724) s_724)))"
+"(if(pair? s_725)"
+"(if(let-values(((s_726)(car s_725))) #t)"
+"(let-values(((s_727)(cdr s_725)))"
+"(let-values(((s_728)(if(syntax?$1 s_727)(syntax-e$1 s_727) s_727)))"
+"(if(pair? s_728)"
+"(if(let-values(((s_729)(car s_728)))"
 "(let-values(((or-part_387)"
-"(if(syntax?$1 s_727)(symbol?(syntax-e$1 s_727)) #f)))"
-"(if or-part_387 or-part_387(symbol? s_727))))"
-"(let-values(((s_728)(cdr s_726)))"
-"(let-values(((s_729)(if(syntax?$1 s_728)(syntax-e$1 s_728) s_728)))"
-"(null? s_729)))"
+"(if(syntax?$1 s_729)(symbol?(syntax-e$1 s_729)) #f)))"
+"(if or-part_387 or-part_387(symbol? s_729))))"
+"(let-values(((s_730)(cdr s_728)))"
+"(let-values(((s_731)(if(syntax?$1 s_730)(syntax-e$1 s_730) s_730)))"
+"(null? s_731)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 "(let-values()"
 "(let-values(((#%variable-reference432_1 id433_1)"
-"(let-values(((s_730)(if(syntax?$1 s_722)(syntax-e$1 s_722) s_722)))"
+"(let-values(((s_732)(if(syntax?$1 s_724)(syntax-e$1 s_724) s_724)))"
 "(let-values(((#%variable-reference434_0)"
-"(let-values(((s_731)(car s_730))) s_731))"
+"(let-values(((s_733)(car s_732))) s_733))"
 "((id435_0)"
-"(let-values(((s_732)(cdr s_730)))"
-"(let-values(((s_733)"
-"(if(syntax?$1 s_732)"
-"(syntax-e$1 s_732)"
-" s_732)))"
+"(let-values(((s_734)(cdr s_732)))"
+"(let-values(((s_735)"
+"(if(syntax?$1 s_734)"
+"(syntax-e$1 s_734)"
+" s_734)))"
 "(let-values(((id436_0)"
-"(let-values(((s_734)(car s_733))) s_734))"
+"(let-values(((s_736)(car s_735))) s_736))"
 "(()"
-"(let-values(((s_735)(cdr s_733)))"
-"(let-values(((s_736)"
-"(if(syntax?$1 s_735)"
-"(syntax-e$1 s_735)"
-" s_735)))"
+"(let-values(((s_737)(cdr s_735)))"
+"(let-values(((s_738)"
+"(if(syntax?$1 s_737)"
+"(syntax-e$1 s_737)"
+" s_737)))"
 "(values)))))"
 "(values id436_0))))))"
 "(values #%variable-reference434_0 id435_0)))))"
 "(values #t #%variable-reference432_1 id433_1)))"
 "(values #f #f #f)))))"
 "(let-values(((ok?_59 #%variable-reference437_0 #%top438_0 id439_0)"
-"(let-values(((s_737) disarmed-s_22))"
+"(let-values(((s_739) disarmed-s_22))"
 "(if(if(not ok?_58)"
-"(let-values(((s_738)(if(syntax?$1 s_737)(syntax-e$1 s_737) s_737)))"
-"(if(pair? s_738)"
-"(if(let-values(((s_739)(car s_738))) #t)"
-"(let-values(((s_740)(cdr s_738)))"
-"(let-values(((s_741)(if(syntax?$1 s_740)(syntax-e$1 s_740) s_740)))"
-"(if(pair? s_741)"
-"(if(let-values(((s_742)(car s_741)))"
-"(let-values(((s_743)"
-"(if(syntax?$1 s_742)(syntax-e$1 s_742) s_742)))"
+"(let-values(((s_740)(if(syntax?$1 s_739)(syntax-e$1 s_739) s_739)))"
+"(if(pair? s_740)"
+"(if(let-values(((s_741)(car s_740))) #t)"
+"(let-values(((s_742)(cdr s_740)))"
+"(let-values(((s_743)(if(syntax?$1 s_742)(syntax-e$1 s_742) s_742)))"
 "(if(pair? s_743)"
-"(if(let-values(((s_744)(car s_743))) #t)"
-"(let-values(((s_745)(cdr s_743)))"
+"(if(let-values(((s_744)(car s_743)))"
+"(let-values(((s_745)"
+"(if(syntax?$1 s_744)(syntax-e$1 s_744) s_744)))"
+"(if(pair? s_745)"
+"(if(let-values(((s_746)(car s_745))) #t)"
+"(let-values(((s_747)(cdr s_745)))"
 "(let-values(((or-part_388)"
-"(if(syntax?$1 s_745)"
-"(symbol?(syntax-e$1 s_745))"
+"(if(syntax?$1 s_747)"
+"(symbol?(syntax-e$1 s_747))"
 " #f)))"
-"(if or-part_388 or-part_388(symbol? s_745))))"
+"(if or-part_388 or-part_388(symbol? s_747))))"
 " #f)"
 " #f)))"
-"(let-values(((s_746)(cdr s_741)))"
-"(let-values(((s_747)(if(syntax?$1 s_746)(syntax-e$1 s_746) s_746)))"
-"(null? s_747)))"
+"(let-values(((s_748)(cdr s_743)))"
+"(let-values(((s_749)(if(syntax?$1 s_748)(syntax-e$1 s_748) s_748)))"
+"(null? s_749)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -69135,61 +69201,61 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(let-values(((#%variable-reference437_1 #%top438_1 id439_1)"
-"(let-values(((s_748)(if(syntax?$1 s_737)(syntax-e$1 s_737) s_737)))"
+"(let-values(((s_750)(if(syntax?$1 s_739)(syntax-e$1 s_739) s_739)))"
 "(let-values(((#%variable-reference440_0)"
-"(let-values(((s_749)(car s_748))) s_749))"
+"(let-values(((s_751)(car s_750))) s_751))"
 "((#%top441_0 id442_0)"
-"(let-values(((s_750)(cdr s_748)))"
-"(let-values(((s_751)"
-"(if(syntax?$1 s_750)"
-"(syntax-e$1 s_750)"
-" s_750)))"
-"(let-values(((#%top443_0 id444_0)"
-"(let-values(((s_752)(car s_751)))"
+"(let-values(((s_752)(cdr s_750)))"
 "(let-values(((s_753)"
 "(if(syntax?$1 s_752)"
 "(syntax-e$1 s_752)"
 " s_752)))"
-"(let-values(((#%top445_0)"
-"(let-values(((s_754)"
-"(car"
-" s_753)))"
-" s_754))"
-"((id446_0)"
+"(let-values(((#%top443_0 id444_0)"
+"(let-values(((s_754)(car s_753)))"
 "(let-values(((s_755)"
-"(cdr"
-" s_753)))"
+"(if(syntax?$1 s_754)"
+"(syntax-e$1 s_754)"
+" s_754)))"
+"(let-values(((#%top445_0)"
+"(let-values(((s_756)"
+"(car"
 " s_755)))"
+" s_756))"
+"((id446_0)"
+"(let-values(((s_757)"
+"(cdr"
+" s_755)))"
+" s_757)))"
 "(values #%top445_0 id446_0)))))"
 "(()"
-"(let-values(((s_756)(cdr s_751)))"
-"(let-values(((s_757)"
-"(if(syntax?$1 s_756)"
-"(syntax-e$1 s_756)"
-" s_756)))"
+"(let-values(((s_758)(cdr s_753)))"
+"(let-values(((s_759)"
+"(if(syntax?$1 s_758)"
+"(syntax-e$1 s_758)"
+" s_758)))"
 "(values)))))"
 "(values #%top443_0 id444_0))))))"
 "(values #%variable-reference440_0 #%top441_0 id442_0)))))"
 "(values #t #%variable-reference437_1 #%top438_1 id439_1)))"
 "(values #f #f #f #f)))))"
 "(let-values(((ok?_60 #%variable-reference447_0)"
-"(let-values(((s_758) disarmed-s_22))"
+"(let-values(((s_760) disarmed-s_22))"
 "(if(if(not(let-values(((or-part_389) ok?_58))(if or-part_389 or-part_389 ok?_59)))"
 " #t"
 " #f)"
-"(let-values(((orig-s_60) s_758))"
+"(let-values(((orig-s_60) s_760))"
 "(let-values(((#%variable-reference447_1)"
-"(let-values(((s_759)(if(syntax?$1 s_758)(syntax-e$1 s_758) s_758)))"
-"(if(pair? s_759)"
+"(let-values(((s_761)(if(syntax?$1 s_760)(syntax-e$1 s_760) s_760)))"
+"(if(pair? s_761)"
 "(let-values(((#%variable-reference448_0)"
-"(let-values(((s_760)(car s_759))) s_760))"
+"(let-values(((s_762)(car s_761))) s_762))"
 "(()"
-"(let-values(((s_761)(cdr s_759)))"
-"(let-values(((s_762)"
-"(if(syntax?$1 s_761)"
-"(syntax-e$1 s_761)"
-" s_761)))"
-"(if(null? s_762)"
+"(let-values(((s_763)(cdr s_761)))"
+"(let-values(((s_764)"
+"(if(syntax?$1 s_763)"
+"(syntax-e$1 s_763)"
+" s_763)))"
+"(if(null? s_764)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69204,91 +69270,91 @@ static const char *startup_source =
 "(let-values(((var-id_0)(if ok?_58 id433_0 id439_0)))"
 "(let-values(((binding_31)"
 "(let-values(((var-id449_0) var-id_0)"
-"((temp450_0)(expand-context-phase ctx_99))"
+"((temp450_0)(expand-context-phase ctx_101))"
 "((temp451_0) 'ambiguous))"
 "(resolve+shift30.1 temp451_0 #t #f #f #f #f #f #f #f #f var-id449_0 temp450_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_31 'ambiguous)"
-"(let-values()(raise-ambiguous-error var-id_0 ctx_99))"
+"(let-values()(raise-ambiguous-error var-id_0 ctx_101))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if(let-values(((or-part_391) binding_31))"
-"(if or-part_391 or-part_391(expand-context-allow-unbound? ctx_99)))"
+"(if or-part_391 or-part_391(expand-context-allow-unbound? ctx_101)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                              \"unbound identifier\""
-" s_721"
+" s_723"
 " var-id_0"
 " null"
-"(syntax-debug-info-string var-id_0 ctx_99))))"
+"(syntax-debug-info-string var-id_0 ctx_101))))"
 "(values))))"
 "(let-values(((t_61 primitive?_12 insp-of-t_7 protected?_13)"
 "(if binding_31"
 "(let-values(((binding452_0) binding_31)"
-"((ctx453_0) ctx_99)"
+"((ctx453_0) ctx_101)"
 "((var-id454_0) var-id_0)"
-"((s455_0) s_721)"
-"((temp456_0)(expand-context-in-local-expand? ctx_99)))"
+"((s455_0) s_723)"
+"((temp456_0)(expand-context-in-local-expand? ctx_101)))"
 "(lookup62.1 s455_0 #t temp456_0 #t binding452_0 ctx453_0 var-id454_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(if(if t_61(not(variable? t_61)) #f)"
 "(let-values()"
-"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_721))"
+"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_723))"
 "(void))"
-"(if(expand-context-to-parsed? ctx_99)"
+"(if(expand-context-to-parsed? ctx_101)"
 "(parsed-#%variable-reference11.1"
-"(keep-properties-only~ s_721)"
+"(keep-properties-only~ s_723)"
 "(if ok?_59"
 "(let-values()(parsed-top-id4.1 var-id_0 binding_31 #f))"
 "(let-values()(parsed-id2.1 var-id_0 binding_31 #f))))"
-" s_721))))))))"
+" s_723))))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_99)"
-"(parsed-#%variable-reference11.1(keep-properties-only~ s_721) #f)"
-" s_721)))))))))))"
+"(if(expand-context-to-parsed? ctx_101)"
+"(parsed-#%variable-reference11.1(keep-properties-only~ s_723) #f)"
+" s_723)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_763 ctx_100)"
+"(lambda(s_765 ctx_102)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_126)(expand-context-observer ctx_100)))"
-"(if obs_126"
-"(let-values()(let-values()(call-expand-observe obs_126 'prim-#%expression)))"
+"(let-values(((obs_124)(expand-context-observer ctx_102)))"
+"(if obs_124"
+"(let-values()(let-values()(call-expand-observe obs_124 'prim-#%expression)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_23)(syntax-disarm$1 s_763)))"
+"(let-values(((disarmed-s_23)(syntax-disarm$1 s_765)))"
 "(let-values(((ok?_61 #%expression457_0 e458_0)"
-"(let-values(((s_764) disarmed-s_23))"
-"(let-values(((orig-s_61) s_764))"
+"(let-values(((s_766) disarmed-s_23))"
+"(let-values(((orig-s_61) s_766))"
 "(let-values(((#%expression457_1 e458_1)"
-"(let-values(((s_765)(if(syntax?$1 s_764)(syntax-e$1 s_764) s_764)))"
-"(if(pair? s_765)"
+"(let-values(((s_767)(if(syntax?$1 s_766)(syntax-e$1 s_766) s_766)))"
+"(if(pair? s_767)"
 "(let-values(((#%expression459_0)"
-"(let-values(((s_766)(car s_765))) s_766))"
+"(let-values(((s_768)(car s_767))) s_768))"
 "((e460_0)"
-"(let-values(((s_767)(cdr s_765)))"
-"(let-values(((s_768)"
-"(if(syntax?$1 s_767)"
-"(syntax-e$1 s_767)"
-" s_767)))"
-"(if(pair? s_768)"
+"(let-values(((s_769)(cdr s_767)))"
+"(let-values(((s_770)"
+"(if(syntax?$1 s_769)"
+"(syntax-e$1 s_769)"
+" s_769)))"
+"(if(pair? s_770)"
 "(let-values(((e461_0)"
-"(let-values(((s_769)(car s_768)))"
-" s_769))"
+"(let-values(((s_771)(car s_770)))"
+" s_771))"
 "(()"
-"(let-values(((s_770)(cdr s_768)))"
-"(let-values(((s_771)"
-"(if(syntax?$1 s_770)"
-"(syntax-e$1 s_770)"
-" s_770)))"
-"(if(null? s_771)"
+"(let-values(((s_772)(cdr s_770)))"
+"(let-values(((s_773)"
+"(if(syntax?$1 s_772)"
+"(syntax-e$1 s_772)"
+" s_772)))"
+"(if(null? s_773)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69300,43 +69366,43 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_61)))))"
 "(values #t #%expression457_1 e458_1))))))"
 "(let-values(((rebuild-s_13)"
-"(let-values(((ctx462_0) ctx_100)((s463_0) s_763)((temp464_0) #t))"
+"(let-values(((ctx462_0) ctx_102)((s463_0) s_765)((temp464_0) #t))"
 "(keep-as-needed120.1 temp464_0 #t #f #f #f #f ctx462_0 s463_0))))"
 "(let-values(((exp-e_0)"
 "(let-values(((temp465_0) e458_0)"
 "((temp466_0)"
-"(let-values(((temp467_0)(as-expression-context ctx_100))"
-"((ctx468_0) ctx_100))"
+"(let-values(((temp467_0)(as-expression-context ctx_102))"
+"((ctx468_0) ctx_102))"
 "(as-tail-context23.1 ctx468_0 temp467_0))))"
 "(expand9.1 #f #f #f #f #f #f temp465_0 temp466_0))))"
-"(if(expand-context-to-parsed? ctx_100)"
+"(if(expand-context-to-parsed? ctx_102)"
 " exp-e_0"
-"(let-values(((tmp_63)"
-"(if(not(expand-context-in-local-expand? ctx_100))"
-"(expand-context-context ctx_100)"
+"(if(let-values(((or-part_392)"
+"(if(expand-context-in-local-expand? ctx_102)"
+"(expand-context-keep-#%expression? ctx_102)"
 " #f)))"
-"(if(equal? tmp_63 'expression)"
+"(if or-part_392 or-part_392(eq? 'top-level(expand-context-context ctx_102))))"
+"(let-values()"
+"(let-values(((rebuild-s469_0) rebuild-s_13)((temp470_0)(list #%expression457_0 exp-e_0)))"
+"(rebuild5.1 #f #f rebuild-s469_0 temp470_0)))"
 "(let-values()"
 "(let-values(((result-s_13)(syntax-track-origin$1 exp-e_0 rebuild-s_13)))"
 "(begin"
-"(let-values(((obs_127)(expand-context-observer ctx_100)))"
-"(if obs_127"
-"(let-values()(let-values()(call-expand-observe obs_127 'tag result-s_13)))"
+"(let-values(((obs_125)(expand-context-observer ctx_102)))"
+"(if obs_125"
+"(let-values()(let-values()(call-expand-observe obs_125 'tag result-s_13)))"
 "(void)))"
-" result-s_13)))"
-"(let-values()"
-"(let-values(((rebuild-s469_0) rebuild-s_13)((temp470_0)(list #%expression457_0 exp-e_0)))"
-"(rebuild5.1 #f #f rebuild-s469_0 temp470_0))))))))))))))"
-" (void (add-core-form!* 'unquote (lambda (s_772 ctx_101) (raise-syntax-error$1 #f \"not in quasiquote\" s_772))))"
-" (void (add-core-form!* 'unquote-splicing (lambda (s_773 ctx_102) (raise-syntax-error$1 #f \"not in quasiquote\" s_773))))"
+" result-s_13)))))))))))))"
+" (void (add-core-form!* 'unquote (lambda (s_774 ctx_103) (raise-syntax-error$1 #f \"not in quasiquote\" s_774))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_775 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_775))))"
 "(define-values"
 "(binding-for-transformer?)"
-"(lambda(b_42 id_127 at-phase_12 ns_124)"
+"(lambda(b_42 id_127 at-phase_12 ns_123)"
 "(begin"
 "(if(not at-phase_12)"
 "(let-values()"
 "(let-values(((m_30)"
-"(namespace->module ns_124(1/module-path-index-resolve(module-binding-nominal-module b_42)))))"
+"(namespace->module ns_123(1/module-path-index-resolve(module-binding-nominal-module b_42)))))"
 "(let-values(((b/p_4)"
 "(hash-ref"
 "(hash-ref(module-provides m_30)(module-binding-nominal-phase b_42) '#hasheq())"
@@ -69348,7 +69414,7 @@ static const char *startup_source =
 "(let-values(((b1_8) b_42)"
 "((empty-env2_0) empty-env)"
 "((null3_0) null)"
-"((ns4_1) ns_124)"
+"((ns4_1) ns_123)"
 "((at-phase5_0) at-phase_12)"
 "((id6_0) id_127))"
 "(binding-lookup50.1 #f #f #f #f b1_8 empty-env2_0 null3_0 ns4_1 at-phase5_0 id6_0))))"
@@ -69357,9 +69423,9 @@ static const char *startup_source =
 "(define-values(provide-form-name) 'provide)"
 "(define-values"
 "(parse-and-expand-provides!)"
-"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_46 ctx_103)"
+"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_46 ctx_105)"
 "(begin"
-"(let-values(((ns_126)(expand-context-namespace ctx_103)))"
+"(let-values(((ns_125)(expand-context-namespace ctx_105)))"
 "((letrec-values(((loop_115)"
 "(lambda(specs_1 at-phase_13 protected?_15 layer_6)"
 "(begin"
@@ -69432,11 +69498,11 @@ static const char *startup_source =
 " fm_2)"
 " orig-s_62"
 " spec_0)))))))"
-"(let-values(((tmp_64)"
+"(let-values(((tmp_63)"
 " fm_2))"
 "(let-values(((index_7)"
 "(if(symbol?"
-" tmp_64)"
+" tmp_63)"
 "(hash-ref"
 " '#hasheq((all-defined"
 " ."
@@ -69476,7 +69542,7 @@ static const char *startup_source =
 "(struct"
 " ."
 " 6))"
-" tmp_64"
+" tmp_63"
 "(lambda()"
 " 0))"
 " 0)))"
@@ -69500,7 +69566,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " spec_0)"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -69530,50 +69596,50 @@ static const char *startup_source =
 "(let-values(((for-meta3_1"
 " phase-level4_1"
 " spec5_1)"
-"(let-values(((s_455)"
+"(let-values(((s_456)"
 "(if(syntax?$1"
 " s_167)"
 "(syntax-e$1"
 " s_167)"
 " s_167)))"
 "(if(pair?"
-" s_455)"
+" s_456)"
 "(let-values(((for-meta6_0)"
-"(let-values(((s_484)"
+"(let-values(((s_485)"
 "(car"
-" s_455)))"
-" s_484))"
+" s_456)))"
+" s_485))"
 "((phase-level7_0"
 " spec8_0)"
-"(let-values(((s_774)"
-"(cdr"
-" s_455)))"
-"(let-values(((s_775)"
-"(if(syntax?$1"
-" s_774)"
-"(syntax-e$1"
-" s_774)"
-" s_774)))"
-"(if(pair?"
-" s_775)"
-"(let-values(((phase-level9_0)"
 "(let-values(((s_776)"
-"(car"
-" s_775)))"
-" s_776))"
-"((spec10_0)"
-"(let-values(((s_492)"
 "(cdr"
-" s_775)))"
+" s_456)))"
 "(let-values(((s_777)"
 "(if(syntax?$1"
-" s_492)"
+" s_776)"
 "(syntax-e$1"
-" s_492)"
-" s_492)))"
+" s_776)"
+" s_776)))"
+"(if(pair?"
+" s_777)"
+"(let-values(((phase-level9_0)"
+"(let-values(((s_778)"
+"(car"
+" s_777)))"
+" s_778))"
+"((spec10_0)"
+"(let-values(((s_493)"
+"(cdr"
+" s_777)))"
+"(let-values(((s_779)"
+"(if(syntax?$1"
+" s_493)"
+"(syntax-e$1"
+" s_493)"
+" s_493)))"
 "(let-values(((flat-s_45)"
 "(to-syntax-list.1"
-" s_777)))"
+" s_779)))"
 "(if(not"
 " flat-s_45)"
 "(let-values()"
@@ -69671,20 +69737,20 @@ static const char *startup_source =
 "(if(pair?"
 " s_24)"
 "(let-values(((for-syntax15_0)"
-"(let-values(((s_499)"
+"(let-values(((s_501)"
 "(car"
 " s_24)))"
-" s_499))"
+" s_501))"
 "((spec16_0)"
-"(let-values(((s_457)"
+"(let-values(((s_458)"
 "(cdr"
 " s_24)))"
 "(let-values(((s_307)"
 "(if(syntax?$1"
-" s_457)"
+" s_458)"
 "(syntax-e$1"
-" s_457)"
-" s_457)))"
+" s_458)"
+" s_458)))"
 "(let-values(((flat-s_46)"
 "(to-syntax-list.1"
 " s_307)))"
@@ -69745,29 +69811,29 @@ static const char *startup_source =
 "(let-values(((ok?_64"
 " for-label19_0"
 " spec20_0)"
-"(let-values(((s_501)"
+"(let-values(((s_503)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_65)"
-" s_501))"
+" s_503))"
 "(let-values(((for-label19_1"
 " spec20_1)"
-"(let-values(((s_483)"
+"(let-values(((s_484)"
 "(if(syntax?$1"
-" s_501)"
+" s_503)"
 "(syntax-e$1"
-" s_501)"
-" s_501)))"
+" s_503)"
+" s_503)))"
 "(if(pair?"
-" s_483)"
+" s_484)"
 "(let-values(((for-label21_0)"
 "(let-values(((s_168)"
 "(car"
-" s_483)))"
+" s_484)))"
 " s_168))"
 "((spec22_0)"
 "(let-values(((s_27)"
 "(cdr"
-" s_483)))"
+" s_484)))"
 "(let-values(((s_28)"
 "(if(syntax?$1"
 " s_27)"
@@ -69849,29 +69915,29 @@ static const char *startup_source =
 " s_50))"
 "(let-values(((protect25_1"
 " p-spec26_1)"
-"(let-values(((s_778)"
+"(let-values(((s_780)"
 "(if(syntax?$1"
 " s_50)"
 "(syntax-e$1"
 " s_50)"
 " s_50)))"
 "(if(pair?"
-" s_778)"
+" s_780)"
 "(let-values(((protect27_0)"
-"(let-values(((s_505)"
+"(let-values(((s_507)"
 "(car"
-" s_778)))"
-" s_505))"
+" s_780)))"
+" s_507))"
 "((p-spec28_0)"
-"(let-values(((s_506)"
+"(let-values(((s_508)"
 "(cdr"
-" s_778)))"
+" s_780)))"
 "(let-values(((s_52)"
 "(if(syntax?$1"
-" s_506)"
+" s_508)"
 "(syntax-e$1"
-" s_506)"
-" s_506)))"
+" s_508)"
+" s_508)))"
 "(let-values(((flat-s_48)"
 "(to-syntax-list.1"
 " s_52)))"
@@ -69935,53 +70001,53 @@ static const char *startup_source =
 "(let-values(((rename31_1"
 " id:from32_1"
 " id:to33_1)"
-"(let-values(((s_779)"
+"(let-values(((s_781)"
 "(if(syntax?$1"
 " s_321)"
 "(syntax-e$1"
 " s_321)"
 " s_321)))"
 "(if(pair?"
-" s_779)"
+" s_781)"
 "(let-values(((rename34_0)"
-"(let-values(((s_780)"
+"(let-values(((s_782)"
 "(car"
-" s_779)))"
-" s_780))"
+" s_781)))"
+" s_782))"
 "((id:from35_0"
 " id:to36_0)"
-"(let-values(((s_781)"
+"(let-values(((s_783)"
 "(cdr"
-" s_779)))"
+" s_781)))"
 "(let-values(((s_34)"
 "(if(syntax?$1"
-" s_781)"
+" s_783)"
 "(syntax-e$1"
-" s_781)"
-" s_781)))"
+" s_783)"
+" s_783)))"
 "(if(pair?"
 " s_34)"
 "(let-values(((id:from37_0)"
-"(let-values(((s_460)"
+"(let-values(((s_461)"
 "(car"
 " s_34)))"
-"(if(let-values(((or-part_392)"
+"(if(let-values(((or-part_393)"
 "(if(syntax?$1"
-" s_460)"
+" s_461)"
 "(symbol?"
 "(syntax-e$1"
-" s_460))"
+" s_461))"
 " #f)))"
-"(if or-part_392"
-" or-part_392"
+"(if or-part_393"
+" or-part_393"
 "(symbol?"
-" s_460)))"
-" s_460"
+" s_461)))"
+" s_461"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
 " orig-s_67"
-" s_460))))"
+" s_461))))"
 "((id:to38_0)"
 "(let-values(((s_414)"
 "(cdr"
@@ -69998,15 +70064,15 @@ static const char *startup_source =
 "(let-values(((s_60)"
 "(car"
 " s_415)))"
-"(if(let-values(((or-part_207)"
+"(if(let-values(((or-part_208)"
 "(if(syntax?$1"
 " s_60)"
 "(symbol?"
 "(syntax-e$1"
 " s_60))"
 " #f)))"
-"(if or-part_207"
-" or-part_207"
+"(if or-part_208"
+" or-part_208"
 "(symbol?"
 " s_60)))"
 " s_60"
@@ -70016,17 +70082,17 @@ static const char *startup_source =
 " orig-s_67"
 " s_60))))"
 "(()"
-"(let-values(((s_782)"
+"(let-values(((s_784)"
 "(cdr"
 " s_415)))"
-"(let-values(((s_783)"
+"(let-values(((s_785)"
 "(if(syntax?$1"
-" s_782)"
+" s_784)"
 "(syntax-e$1"
-" s_782)"
-" s_782)))"
+" s_784)"
+" s_784)))"
 "(if(null?"
-" s_783)"
+" s_785)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -70065,7 +70131,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:to33_0)"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70110,30 +70176,30 @@ static const char *startup_source =
 " s_324))"
 "((id:struct44_0"
 " id:field45_0)"
-"(let-values(((s_461)"
+"(let-values(((s_462)"
 "(cdr"
 " s_67)))"
 "(let-values(((s_203)"
 "(if(syntax?$1"
-" s_461)"
+" s_462)"
 "(syntax-e$1"
-" s_461)"
-" s_461)))"
+" s_462)"
+" s_462)))"
 "(if(pair?"
 " s_203)"
 "(let-values(((id:struct46_0)"
 "(let-values(((s_326)"
 "(car"
 " s_203)))"
-"(if(let-values(((or-part_393)"
+"(if(let-values(((or-part_394)"
 "(if(syntax?$1"
 " s_326)"
 "(symbol?"
 "(syntax-e$1"
 " s_326))"
 " #f)))"
-"(if or-part_393"
-" or-part_393"
+"(if or-part_394"
+" or-part_394"
 "(symbol?"
 " s_326)))"
 " s_326"
@@ -70143,21 +70209,21 @@ static const char *startup_source =
 " orig-s_68"
 " s_326))))"
 "((id:field47_0)"
-"(let-values(((s_784)"
+"(let-values(((s_786)"
 "(cdr"
 " s_203)))"
-"(let-values(((s_785)"
+"(let-values(((s_787)"
 "(if(syntax?$1"
-" s_784)"
+" s_786)"
 "(syntax-e$1"
-" s_784)"
-" s_784)))"
+" s_786)"
+" s_786)))"
 "(if(pair?"
-" s_785)"
+" s_787)"
 "(let-values(((id:field48_0)"
 "(let-values(((s_205)"
 "(car"
-" s_785)))"
+" s_787)))"
 "(let-values(((s_206)"
 "(if(syntax?$1"
 " s_205)"
@@ -70192,7 +70258,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_406)"
-"(let-values(((s_786)"
+"(let-values(((s_788)"
 "(unsafe-car"
 " lst_406))"
 "((rest_236)"
@@ -70205,23 +70271,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:field49_0)"
 "(let-values()"
-"(if(let-values(((or-part_394)"
+"(if(let-values(((or-part_395)"
 "(if(syntax?$1"
-" s_786)"
+" s_788)"
 "(symbol?"
 "(syntax-e$1"
-" s_786))"
+" s_788))"
 " #f)))"
-"(if or-part_394"
-" or-part_394"
+"(if or-part_395"
+" or-part_395"
 "(symbol?"
-" s_786)))"
-" s_786"
+" s_788)))"
+" s_788"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_68"
-" s_786)))))"
+" s_788)))))"
 "(cons"
 " id:field49_0"
 " id:field_3)))))"
@@ -70242,15 +70308,15 @@ static const char *startup_source =
 "(()"
 "(let-values(((s_421)"
 "(cdr"
-" s_785)))"
-"(let-values(((s_524)"
+" s_787)))"
+"(let-values(((s_526)"
 "(if(syntax?$1"
 " s_421)"
 "(syntax-e$1"
 " s_421)"
 " s_421)))"
 "(if(null?"
-" s_524)"
+" s_526)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -70288,7 +70354,7 @@ static const char *startup_source =
 " orig-s_62"
 " id:field42_0"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70330,23 +70396,23 @@ static const char *startup_source =
 "(let-values(((s_68)"
 "(cdr"
 " s_158)))"
-"(let-values(((s_787)"
+"(let-values(((s_789)"
 "(if(syntax?$1"
 " s_68)"
 "(syntax-e$1"
 " s_68)"
 " s_68)))"
 "(if(pair?"
-" s_787)"
+" s_789)"
 "(let-values(((mod-path54_0)"
-"(let-values(((s_443)"
+"(let-values(((s_444)"
 "(car"
-" s_787)))"
-" s_443))"
+" s_789)))"
+" s_444))"
 "(()"
 "(let-values(((s_104)"
 "(cdr"
-" s_787)))"
+" s_789)))"
 "(let-values(((s_169)"
 "(if(syntax?$1"
 " s_104)"
@@ -70384,10 +70450,10 @@ static const char *startup_source =
 " self_30"
 " null"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15"
-" ctx_103)"
+" ctx_105)"
 "(values"
 " null"
 "(list"
@@ -70409,30 +70475,30 @@ static const char *startup_source =
 "(let-values(((all-from-except55_1"
 " mod-path56_1"
 " id57_1)"
-"(let-values(((s_516)"
+"(let-values(((s_518)"
 "(if(syntax?$1"
 " s_110)"
 "(syntax-e$1"
 " s_110)"
 " s_110)))"
 "(if(pair?"
-" s_516)"
+" s_518)"
 "(let-values(((all-from-except58_0)"
-"(let-values(((s_526)"
+"(let-values(((s_528)"
 "(car"
-" s_516)))"
-" s_526))"
+" s_518)))"
+" s_528))"
 "((mod-path59_0"
 " id60_0)"
-"(let-values(((s_788)"
+"(let-values(((s_790)"
 "(cdr"
-" s_516)))"
+" s_518)))"
 "(let-values(((s_330)"
 "(if(syntax?$1"
-" s_788)"
+" s_790)"
 "(syntax-e$1"
-" s_788)"
-" s_788)))"
+" s_790)"
+" s_790)))"
 "(if(pair?"
 " s_330)"
 "(let-values(((mod-path61_0)"
@@ -70491,15 +70557,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
-"(if(let-values(((or-part_395)"
+"(if(let-values(((or-part_396)"
 "(if(syntax?$1"
 " s_116)"
 "(symbol?"
 "(syntax-e$1"
 " s_116))"
 " #f)))"
-"(if or-part_395"
-" or-part_395"
+"(if or-part_396"
+" or-part_396"
 "(symbol?"
 " s_116)))"
 " s_116"
@@ -70552,10 +70618,10 @@ static const char *startup_source =
 " self_30"
 " id57_0"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15"
-" ctx_103)"
+" ctx_105)"
 "(values"
 " null"
 "(list"
@@ -70574,28 +70640,28 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((ok?_70"
 " all-defined64_0)"
-"(let-values(((s_789)"
+"(let-values(((s_791)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_71)"
-" s_789))"
+" s_791))"
 "(let-values(((all-defined64_1)"
-"(let-values(((s_446)"
+"(let-values(((s_447)"
 "(if(syntax?$1"
-" s_789)"
+" s_791)"
 "(syntax-e$1"
-" s_789)"
-" s_789)))"
+" s_791)"
+" s_791)))"
 "(if(pair?"
-" s_446)"
+" s_447)"
 "(let-values(((all-defined65_0)"
 "(let-values(((s_122)"
 "(car"
-" s_446)))"
+" s_447)))"
 " s_122))"
 "(()"
 "(let-values(((s_123)"
 "(cdr"
-" s_446)))"
+" s_447)))"
 "(let-values(((s_124)"
 "(if(syntax?$1"
 " s_123)"
@@ -70626,7 +70692,7 @@ static const char *startup_source =
 " null"
 " #f"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70642,38 +70708,38 @@ static const char *startup_source =
 "(let-values(((ok?_71"
 " all-defined-except66_0"
 " id67_0)"
-"(let-values(((s_468)"
+"(let-values(((s_469)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_72)"
-" s_468))"
+" s_469))"
 "(let-values(((all-defined-except66_1"
 " id67_1)"
-"(let-values(((s_790)"
+"(let-values(((s_792)"
 "(if(syntax?$1"
-" s_468)"
+" s_469)"
 "(syntax-e$1"
-" s_468)"
-" s_468)))"
+" s_469)"
+" s_469)))"
 "(if(pair?"
-" s_790)"
+" s_792)"
 "(let-values(((all-defined-except68_0)"
 "(let-values(((s_430)"
 "(car"
-" s_790)))"
+" s_792)))"
 " s_430))"
 "((id69_0)"
-"(let-values(((s_791)"
+"(let-values(((s_793)"
 "(cdr"
-" s_790)))"
-"(let-values(((s_792)"
+" s_792)))"
+"(let-values(((s_794)"
 "(if(syntax?$1"
-" s_791)"
+" s_793)"
 "(syntax-e$1"
-" s_791)"
-" s_791)))"
+" s_793)"
+" s_793)))"
 "(let-values(((flat-s_50)"
 "(to-syntax-list.1"
-" s_792)))"
+" s_794)))"
 "(if(not"
 " flat-s_50)"
 "(let-values()"
@@ -70699,7 +70765,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_410)"
-"(let-values(((s_448)"
+"(let-values(((s_449)"
 "(unsafe-car"
 " lst_410))"
 "((rest_238)"
@@ -70712,23 +70778,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id70_0)"
 "(let-values()"
-"(if(let-values(((or-part_396)"
+"(if(let-values(((or-part_397)"
 "(if(syntax?$1"
-" s_448)"
+" s_449)"
 "(symbol?"
 "(syntax-e$1"
-" s_448))"
+" s_449))"
 " #f)))"
-"(if or-part_396"
-" or-part_396"
+"(if or-part_397"
+" or-part_397"
 "(symbol?"
-" s_448)))"
-" s_448"
+" s_449)))"
+" s_449"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                         \"not an identifier\""
 " orig-s_72"
-" s_448)))))"
+" s_449)))))"
 "(cons"
 " id70_0"
 " id_135)))))"
@@ -70765,7 +70831,7 @@ static const char *startup_source =
 " id67_0"
 " #f"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70784,25 +70850,25 @@ static const char *startup_source =
 "(let-values(((ok?_72"
 " prefix-all-defined71_0"
 " id:prefix72_0)"
-"(let-values(((s_793)"
+"(let-values(((s_795)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_73)"
-" s_793))"
+" s_795))"
 "(let-values(((prefix-all-defined71_1"
 " id:prefix72_1)"
 "(let-values(((s_229)"
 "(if(syntax?$1"
-" s_793)"
+" s_795)"
 "(syntax-e$1"
-" s_793)"
-" s_793)))"
+" s_795)"
+" s_795)))"
 "(if(pair?"
 " s_229)"
 "(let-values(((prefix-all-defined73_0)"
-"(let-values(((s_794)"
+"(let-values(((s_796)"
 "(car"
 " s_229)))"
-" s_794))"
+" s_796))"
 "((id:prefix74_0)"
 "(let-values(((s_230)"
 "(cdr"
@@ -70819,15 +70885,15 @@ static const char *startup_source =
 "(let-values(((s_334)"
 "(car"
 " s_231)))"
-"(if(let-values(((or-part_397)"
+"(if(let-values(((or-part_398)"
 "(if(syntax?$1"
 " s_334)"
 "(symbol?"
 "(syntax-e$1"
 " s_334))"
 " #f)))"
-"(if or-part_397"
-" or-part_397"
+"(if or-part_398"
+" or-part_398"
 "(symbol?"
 " s_334)))"
 " s_334"
@@ -70879,7 +70945,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:prefix72_0)"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -70899,19 +70965,19 @@ static const char *startup_source =
 " prefix-all-defined-except76_0"
 " id:prefix77_0"
 " id78_0)"
-"(let-values(((s_795)"
+"(let-values(((s_797)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_74)"
-" s_795))"
+" s_797))"
 "(let-values(((prefix-all-defined-except76_1"
 " id:prefix77_1"
 " id78_1)"
 "(let-values(((s_346)"
 "(if(syntax?$1"
-" s_795)"
+" s_797)"
 "(syntax-e$1"
-" s_795)"
-" s_795)))"
+" s_797)"
+" s_797)))"
 "(if(pair?"
 " s_346)"
 "(let-values(((prefix-all-defined-except79_0)"
@@ -70933,26 +70999,26 @@ static const char *startup_source =
 "(if(pair?"
 " s_350)"
 "(let-values(((id:prefix82_0)"
-"(let-values(((s_796)"
+"(let-values(((s_798)"
 "(car"
 " s_350)))"
 "(if(let-values(((or-part_344)"
 "(if(syntax?$1"
-" s_796)"
+" s_798)"
 "(symbol?"
 "(syntax-e$1"
-" s_796))"
+" s_798))"
 " #f)))"
 "(if or-part_344"
 " or-part_344"
 "(symbol?"
-" s_796)))"
-" s_796"
+" s_798)))"
+" s_798"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
 " orig-s_74"
-" s_796))))"
+" s_798))))"
 "((id83_0)"
 "(let-values(((s_241)"
 "(cdr"
@@ -70991,7 +71057,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_412)"
-"(let-values(((s_533)"
+"(let-values(((s_535)"
 "(unsafe-car"
 " lst_412))"
 "((rest_239)"
@@ -71004,23 +71070,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id84_2)"
 "(let-values()"
-"(if(let-values(((or-part_398)"
+"(if(let-values(((or-part_399)"
 "(if(syntax?$1"
-" s_533)"
+" s_535)"
 "(symbol?"
 "(syntax-e$1"
-" s_533))"
+" s_535))"
 " #f)))"
-"(if or-part_398"
-" or-part_398"
+"(if or-part_399"
+" or-part_399"
 "(symbol?"
-" s_533)))"
-" s_533"
+" s_535)))"
+" s_535"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_74"
-" s_533)))))"
+" s_535)))))"
 "(cons"
 " id84_2"
 " id_140)))))"
@@ -71067,7 +71133,7 @@ static const char *startup_source =
 "(syntax-e$1"
 " id:prefix77_0)"
 " at-phase_13"
-" ns_126"
+" ns_125"
 " rp_1"
 " protected?_15)"
 "(values"
@@ -71095,40 +71161,40 @@ static const char *startup_source =
 "(if(pair?"
 " s_369)"
 "(let-values(((expand88_0)"
-"(let-values(((s_797)"
-"(car"
-" s_369)))"
-" s_797))"
-"((id89_1"
-" datum90_0)"
-"(let-values(((s_798)"
-"(cdr"
-" s_369)))"
-"(let-values(((s_540)"
-"(if(syntax?$1"
-" s_798)"
-"(syntax-e$1"
-" s_798)"
-" s_798)))"
-"(if(pair?"
-" s_540)"
-"(let-values(((id91_0"
-" datum92_0)"
 "(let-values(((s_799)"
 "(car"
-" s_540)))"
+" s_369)))"
+" s_799))"
+"((id89_1"
+" datum90_0)"
 "(let-values(((s_800)"
+"(cdr"
+" s_369)))"
+"(let-values(((s_542)"
 "(if(syntax?$1"
-" s_799)"
-"(syntax-e$1"
-" s_799)"
-" s_799)))"
-"(if(pair?"
 " s_800)"
+"(syntax-e$1"
+" s_800)"
+" s_800)))"
+"(if(pair?"
+" s_542)"
+"(let-values(((id91_0"
+" datum92_0)"
+"(let-values(((s_801)"
+"(car"
+" s_542)))"
+"(let-values(((s_802)"
+"(if(syntax?$1"
+" s_801)"
+"(syntax-e$1"
+" s_801)"
+" s_801)))"
+"(if(pair?"
+" s_802)"
 "(let-values(((id93_1)"
 "(let-values(((s_376)"
 "(car"
-" s_800)))"
+" s_802)))"
 "(if(let-values(((or-part_115)"
 "(if(syntax?$1"
 " s_376)"
@@ -71149,7 +71215,7 @@ static const char *startup_source =
 "((datum94_0)"
 "(let-values(((s_377)"
 "(cdr"
-" s_800)))"
+" s_802)))"
 " s_377)))"
 "(values"
 " id93_1"
@@ -71161,7 +71227,7 @@ static const char *startup_source =
 "(()"
 "(let-values(((s_378)"
 "(cdr"
-" s_540)))"
+" s_542)))"
 "(let-values(((s_379)"
 "(if(syntax?$1"
 " s_378)"
@@ -71198,54 +71264,54 @@ static const char *startup_source =
 "(let-values(((ok?_75"
 " expand95_0"
 " form96_0)"
-"(let-values(((s_801)"
+"(let-values(((s_803)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_76)"
-" s_801))"
+" s_803))"
 "(let-values(((expand95_1"
 " form96_1)"
-"(let-values(((s_802)"
-"(if(syntax?$1"
-" s_801)"
-"(syntax-e$1"
-" s_801)"
-" s_801)))"
-"(if(pair?"
-" s_802)"
-"(let-values(((expand97_0)"
-"(let-values(((s_133)"
-"(car"
-" s_802)))"
-" s_133))"
-"((form98_0)"
-"(let-values(((s_803)"
-"(cdr"
-" s_802)))"
-"(let-values(((s_543)"
+"(let-values(((s_804)"
 "(if(syntax?$1"
 " s_803)"
 "(syntax-e$1"
 " s_803)"
 " s_803)))"
 "(if(pair?"
-" s_543)"
+" s_804)"
+"(let-values(((expand97_0)"
+"(let-values(((s_133)"
+"(car"
+" s_804)))"
+" s_133))"
+"((form98_0)"
+"(let-values(((s_805)"
+"(cdr"
+" s_804)))"
+"(let-values(((s_545)"
+"(if(syntax?$1"
+" s_805)"
+"(syntax-e$1"
+" s_805)"
+" s_805)))"
+"(if(pair?"
+" s_545)"
 "(let-values(((form99_0)"
 "(let-values(((s_382)"
 "(car"
-" s_543)))"
+" s_545)))"
 " s_382))"
 "(()"
 "(let-values(((s_383)"
 "(cdr"
-" s_543)))"
-"(let-values(((s_804)"
+" s_545)))"
+"(let-values(((s_806)"
 "(if(syntax?$1"
 " s_383)"
 "(syntax-e$1"
 " s_383)"
 " s_383)))"
 "(if(null?"
-" s_804)"
+" s_806)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -71271,22 +71337,22 @@ static const char *startup_source =
 "(let-values(((exp-spec_0)"
 "(let-values(((temp104_5)"
 " form96_0)"
-"((temp105_4)"
-"(let-values(((v_263)"
-" ctx_103))"
-"(let-values(((the-struct_98)"
-" v_263))"
+"((temp105_5)"
+"(let-values(((v_265)"
+" ctx_105))"
+"(let-values(((the-struct_99)"
+" v_265))"
 "(if(expand-context/outer?"
-" the-struct_98)"
+" the-struct_99)"
 "(let-values(((def-ctx-scopes106_0)"
 "(box"
 " null))"
 "((inner107_0)"
-"(let-values(((the-struct_99)"
+"(let-values(((the-struct_100)"
 "(root-expand-context/outer-inner"
-" v_263)))"
+" v_265)))"
 "(if(expand-context/inner?"
-" the-struct_99)"
+" the-struct_100)"
 "(let-values(((stops108_0)"
 "(free-id-set"
 " at-phase_13"
@@ -71296,91 +71362,93 @@ static const char *startup_source =
 " at-phase_13)))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-counter"
-" the-struct_99)"
+" the-struct_100)"
 "(root-expand-context/inner-lift-key"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-to-parsed?"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-phase"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-namespace"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-just-once?"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-module-begin-k"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_99)"
+" the-struct_100)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_100)"
 " stops108_0"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-lifts"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-lift-envs"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-module-lifts"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-require-lifts"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-requires+provides"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-observer"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-for-serializable?"
-" the-struct_99)"
+" the-struct_100)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_99)))"
+" the-struct_100)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                       \"expand-context/inner?\""
-" the-struct_99)))))"
+" the-struct_100)))))"
 "(expand-context/outer1.1"
 " inner107_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_98)"
+" the-struct_99)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_98)"
+" the-struct_99)"
 "(root-expand-context/outer-frame-id"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-context"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-env"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-scopes"
-" the-struct_98)"
+" the-struct_99)"
 " def-ctx-scopes106_0"
 "(expand-context/outer-binding-layer"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-reference-records"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-only-immediate?"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_98)"
+" the-struct_99)"
 "(expand-context/outer-name"
-" the-struct_98)))"
+" the-struct_99)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                     \"expand-context/outer?\""
-" the-struct_98))))))"
+" the-struct_99))))))"
 "(expand9.1"
 " #f"
 " #f"
@@ -71389,7 +71457,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp104_5"
-" temp105_4))))"
+" temp105_5))))"
 "(let-values((()"
 "(begin"
 "(if(if(pair?"
@@ -71417,30 +71485,30 @@ static const char *startup_source =
 "(let-values(((ok?_76"
 " begin100_0"
 " spec101_0)"
-"(let-values(((s_547)"
+"(let-values(((s_549)"
 " exp-spec_0))"
 "(let-values(((orig-s_77)"
-" s_547))"
+" s_549))"
 "(let-values(((begin100_1"
 " spec101_1)"
-"(let-values(((s_489)"
+"(let-values(((s_490)"
 "(if(syntax?$1"
-" s_547)"
+" s_549)"
 "(syntax-e$1"
-" s_547)"
-" s_547)))"
+" s_549)"
+" s_549)))"
 "(if(pair?"
-" s_489)"
+" s_490)"
 "(let-values(((begin102_0)"
 "(let-values(((s_263)"
 "(car"
-" s_489)))"
+" s_490)))"
 " s_263))"
 "((spec103_0)"
 "(let-values(((s_134)"
 "(cdr"
-" s_489)))"
-"(let-values(((s_805)"
+" s_490)))"
+"(let-values(((s_807)"
 "(if(syntax?$1"
 " s_134)"
 "(syntax-e$1"
@@ -71448,7 +71516,7 @@ static const char *startup_source =
 " s_134)))"
 "(let-values(((flat-s_52)"
 "(to-syntax-list.1"
-" s_805)))"
+" s_807)))"
 "(if(not"
 " flat-s_52)"
 "(let-values()"
@@ -71516,9 +71584,9 @@ static const char *startup_source =
 " 'raw)))))"
 "(define-values"
 "(parse-identifier!)"
-"(lambda(spec_1 orig-s_78 sym_105 at-phase_14 ns_127 rp_2 protected?_16)"
+"(lambda(spec_1 orig-s_78 sym_105 at-phase_14 ns_126 rp_2 protected?_16)"
 "(begin"
-"(let-values(((b_94)(resolve+shift/extra-inspector spec_1 at-phase_14 ns_127)))"
+"(let-values(((b_94)(resolve+shift/extra-inspector spec_1 at-phase_14 ns_126)))"
 "(let-values((()"
 "(begin"
 "(if b_94"
@@ -71530,10 +71598,10 @@ static const char *startup_source =
 " orig-s_78"
 " spec_1)))"
 "(values))))"
-"(let-values(((as-transformer?_7)(binding-for-transformer? b_94 spec_1 at-phase_14 ns_127)))"
+"(let-values(((as-transformer?_7)(binding-for-transformer? b_94 spec_1 at-phase_14 ns_126)))"
 "(let-values(((immed-b_0)"
-"(let-values(((spec118_0) spec_1)((at-phase119_0) at-phase_14)((temp120_4) #t))"
-"(resolve+shift30.1 #f #f #f #f #f #f temp120_4 #t #f #f spec118_0 at-phase119_0))))"
+"(let-values(((spec118_0) spec_1)((at-phase119_0) at-phase_14)((temp120_3) #t))"
+"(resolve+shift30.1 #f #f #f #f #f #f temp120_3 #t #f #f spec118_0 at-phase119_0))))"
 "(let-values(((rp109_0) rp_2)"
 "((sym110_0) sym_105)"
 "((at-phase111_0) at-phase_14)"
@@ -71555,7 +71623,7 @@ static const char *startup_source =
 " orig-s115_0)))))))))"
 "(define-values"
 "(parse-struct!)"
-"(lambda(id:struct_0 orig-s_79 fields_0 at-phase_15 ns_128 rp_3 protected?_17)"
+"(lambda(id:struct_0 orig-s_79 fields_0 at-phase_15 ns_127 rp_3 protected?_17)"
 "(begin"
 "(let-values(((mk_0)"
 "(lambda(fmt_1)"
@@ -71595,7 +71663,7 @@ static const char *startup_source =
 " orig-s_79"
 "(syntax-e$1 id_141)"
 " at-phase_15"
-" ns_128"
+" ns_127"
 " rp_3"
 " protected?_17)))"
 "(values)))))"
@@ -71634,7 +71702,7 @@ static const char *startup_source =
 " orig-s_79"
 "(syntax-e$1 get-id_0)"
 " at-phase_15"
-" ns_128"
+" ns_127"
 " rp_3"
 " protected?_17)"
 "(parse-identifier!"
@@ -71642,7 +71710,7 @@ static const char *startup_source =
 " orig-s_79"
 "(syntax-e$1 set-id_0)"
 " at-phase_15"
-" ns_128"
+" ns_127"
 " rp_3"
 " protected?_17)))))"
 "(values)))))"
@@ -71654,7 +71722,7 @@ static const char *startup_source =
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
-"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_129 rp_4 protected?_18 ctx_104)"
+"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_106)"
 "(begin"
 "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
@@ -71664,11 +71732,11 @@ static const char *startup_source =
 "(let-values()"
 "                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_80 mod-path-stx_0)))"
 "(values))))"
-"(let-values(((mpi_57)(module-path->mpi/context mod-path_33 ctx_104)))"
-"(parse-all-from-module mpi_57 #f orig-s_80 except-ids_0 #f at-phase_16 ns_129 rp_4 protected?_18)))))))"
+"(let-values(((mpi_57)(module-path->mpi/context mod-path_33 ctx_106)))"
+"(parse-all-from-module mpi_57 #f orig-s_80 except-ids_0 #f at-phase_16 ns_128 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
-"(lambda(mpi_58 matching-stx_0 orig-s_81 except-ids_1 prefix-sym_0 at-phase_17 ns_130 rp_5 protected?_19)"
+"(lambda(mpi_58 matching-stx_0 orig-s_81 except-ids_1 prefix-sym_0 at-phase_17 ns_129 rp_5 protected?_19)"
 "(begin"
 "(let-values(((requireds_2)(extract-module-requires rp_5 mpi_58 at-phase_17)))"
 "(let-values(((phase-desc_0)"
@@ -71718,14 +71786,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id_142)"
 "(required-id i_192)))"
-"(let-values(((phase_153)"
+"(let-values(((phase_152)"
 "(required-phase"
 " i_192)))"
-"(if(let-values(((or-part_399)"
+"(if(let-values(((or-part_400)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
-" phase_153"
+" phase_152"
 " at-phase_17)"
 "(free-identifier=?$1"
 " id_142"
@@ -71733,12 +71801,12 @@ static const char *startup_source =
 " matching-stx_0"
 "(syntax-e$1"
 " id_142))"
-" phase_153"
-" phase_153)"
+" phase_152"
+" phase_152)"
 " #f))"
 " #f)))"
-"(if or-part_399"
-" or-part_399"
+"(if or-part_400"
+" or-part_400"
 "(let-values(((lst_419)"
 " except-ids_1))"
 "(begin"
@@ -71769,8 +71837,8 @@ static const char *startup_source =
 "(if(free-identifier=?$1"
 " id_142"
 " except-id_0"
-" phase_153"
-" phase_153)"
+" phase_152"
+" phase_152)"
 "(hash-set!"
 " found_0"
 " except-id_0"
@@ -71798,13 +71866,13 @@ static const char *startup_source =
 "(let-values(((b_95)"
 "(resolve+shift/extra-inspector"
 " id_142"
-" phase_153"
-" ns_130)))"
+" phase_152"
+" ns_129)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
 " id_142)"
 "((phase131_0)"
-" phase_153)"
+" phase_152)"
 "((temp132_1)"
 " #t))"
 "(resolve+shift30.1"
@@ -71822,12 +71890,12 @@ static const char *startup_source =
 " phase131_0))))"
 "(let-values(((rp121_0)"
 " rp_5)"
-"((temp122_4)"
+"((temp122_3)"
 "(add-prefix_1"
 "(syntax-e$1"
 " id_142)))"
 "((phase123_0)"
-" phase_153)"
+" phase_152)"
 "((b124_0)"
 " b_95)"
 "((immed-b125_0)"
@@ -71845,7 +71913,7 @@ static const char *startup_source =
 " protected?128_0"
 " temp129_2"
 " rp121_0"
-" temp122_4"
+" temp122_3"
 " phase123_0"
 " b124_0"
 " immed-b125_0"
@@ -71880,13 +71948,13 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(let-values(((or-part_400)"
+"(if(let-values(((or-part_401)"
 "(hash-ref"
 " found_0"
 " except-id_1"
 " #f)))"
-"(if or-part_400"
-" or-part_400"
+"(if or-part_401"
+" or-part_401"
 "(let-values(((lst_125)"
 " requireds_2))"
 "(begin"
@@ -71917,14 +71985,14 @@ static const char *startup_source =
 "(let-values(((id_143)"
 "(required-id"
 " i_72)))"
-"(let-values(((phase_154)"
+"(let-values(((phase_153)"
 "(required-phase"
 " i_72)))"
 "(free-identifier=?$1"
 " id_143"
 " except-id_1"
-" phase_154"
-" phase_154)))))))"
+" phase_153"
+" phase_153)))))))"
 "(values"
 " result_137)))))"
 "(if(if(not"
@@ -72003,11 +72071,11 @@ static const char *startup_source =
 "(parsed-define-values-syms"
 " p_36))"
 " p_36))"
-"(if(let-values(((or-part_208)"
+"(if(let-values(((or-part_209)"
 "(parsed-#%declare?"
 " p_36)))"
-"(if or-part_208"
-" or-part_208"
+"(if or-part_209"
+" or-part_209"
 "(let-values(((or-part_3)"
 "(parsed-module?"
 " p_36)))"
@@ -72075,14 +72143,14 @@ static const char *startup_source =
 " for-loop_82)"
 " lst_78)))"
 "(void)"
-"(let-values(((tmp_65)(cross-phase-primitive-name(parsed-app-rator e_93))))"
-"(if(if(equal? tmp_65 'cons) #t(equal? tmp_65 'list))"
+"(let-values(((tmp_64)(cross-phase-primitive-name(parsed-app-rator e_93))))"
+"(if(if(equal? tmp_64 'cons) #t(equal? tmp_64 'list))"
 "(let-values()(check-count 1 num-results_0 enclosing_15))"
-"(if(equal? tmp_65 'make-struct-type)"
+"(if(equal? tmp_64 'make-struct-type)"
 "(let-values()(check-count 5 num-results_0 enclosing_15))"
-"(if(equal? tmp_65 'make-struct-type-property)"
+"(if(equal? tmp_64 'make-struct-type-property)"
 "(let-values()(check-count 3 num-results_0 enclosing_15))"
-"(if(equal? tmp_65 'gensym)"
+"(if(equal? tmp_64 'gensym)"
 "(let-values()"
 "(if(let-values(((or-part_364)(= 0(length rands_1))))"
 "(if or-part_364"
@@ -72092,7 +72160,7 @@ static const char *startup_source =
 " #f)))"
 "(void)"
 "(let-values()(disallow e_93))))"
-"(if(equal? tmp_65 'string->uninterned-symbol)"
+"(if(equal? tmp_64 'string->uninterned-symbol)"
 "(let-values()"
 "(if(if(= 1(length rands_1))(quoted-string?(car rands_1)) #f)"
 "(void)"
@@ -72180,9 +72248,9 @@ static const char *startup_source =
 "(if(let-values(((or-part_86)(not normal-b_1)))"
 "(if or-part_86"
 " or-part_86"
-"(let-values(((or-part_289)(parsed-top-id? id_144)))"
-"(if or-part_289"
-" or-part_289"
+"(let-values(((or-part_290)(parsed-top-id? id_144)))"
+"(if or-part_290"
+" or-part_290"
 "(if(not(symbol? normal-b_1))"
 "(eq?(module-binding-module normal-b_1) self-mpi_6)"
 " #f)))))"
@@ -72235,8 +72303,8 @@ static const char *startup_source =
 " lst_23)))"
 "(void)"
 "(check-body-no-disallowed-expr_0(parsed-let_-values-body e_40))))"
-"(if(let-values(((or-part_401)(parsed-quote-syntax? e_40)))"
-"(if or-part_401 or-part_401(parsed-#%variable-reference? e_40)))"
+"(if(let-values(((or-part_402)(parsed-quote-syntax? e_40)))"
+"(if or-part_402 or-part_402(parsed-#%variable-reference? e_40)))"
 "(let-values()(disallow e_40))"
 "(let-values()(void)))))))))))))))"
 "((check-body-no-disallowed-expr_0)"
@@ -72292,7 +72360,7 @@ static const char *startup_source =
 "(let-values(((or-part_163)(string? d_37)))"
 "(if or-part_163"
 " or-part_163"
-"(let-values(((or-part_250)(bytes? d_37)))(if or-part_250 or-part_250(null? d_37)))))))))))"
+"(let-values(((or-part_251)(bytes? d_37)))(if or-part_251 or-part_251(null? d_37)))))))))))"
 "(let-values()(void))"
 "(let-values()(disallow e_12))))))"
 "(define-values"
@@ -72322,100 +72390,101 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'module"
-"(lambda(s_43 ctx_105)"
+"(lambda(s_43 ctx_107)"
 "(begin"
-"(if(eq?(expand-context-context ctx_105) 'top-level)"
+"(if(eq?(expand-context-context ctx_107) 'top-level)"
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_128)(expand-context-observer ctx_105)))"
-"(if obs_128(let-values()(let-values()(call-expand-observe obs_128 'prim-module)))(void)))"
+"(let-values(((obs_126)(expand-context-observer ctx_107)))"
+"(if obs_126(let-values()(let-values()(call-expand-observe obs_126 'prim-module)))(void)))"
 "             (raise-syntax-error$1 #f \"allowed only at the top level\" s_43))))"
 "(let-values()"
-"(let-values(((s223_1) s_43)((ctx224_0) ctx_105)((temp225_1) #f))"
+"(let-values(((s223_1) s_43)((ctx224_0) ctx_107)((temp225_1) #f))"
 "(expand-module18.1 #f #f #f #f #f #f #f #f #f #f #f #f #f #f s223_1 ctx224_0 temp225_1)))))))"
 "(void"
 "(add-core-form!*"
 " 'module*"
-"(lambda(s_806 ctx_106)"
+"(lambda(s_808 ctx_108)"
 "(begin"
-"(let-values(((obs_129)(expand-context-observer ctx_106)))"
-"(if obs_129(let-values()(let-values()(call-expand-observe obs_129 'prim-module)))(void)))"
-"       (raise-syntax-error$1 #f \"illegal use (not in a module top-level)\" s_806)))))"
+"(let-values(((obs_127)(expand-context-observer ctx_108)))"
+"(if obs_127(let-values()(let-values()(call-expand-observe obs_127 'prim-module)))(void)))"
+"       (raise-syntax-error$1 #f \"illegal use (not in a module top-level)\" s_808)))))"
 "(void"
 "(add-core-form!*"
 " '#%module-begin"
-"(lambda(s_89 ctx_107)"
+"(lambda(s_89 ctx_109)"
 "(begin"
-"(let-values(((obs_130)(expand-context-observer ctx_107)))"
-"(if obs_130(let-values()(let-values()(call-expand-observe obs_130 'prim-module-begin)))(void)))"
-"(if(eq?(expand-context-context ctx_107) 'module-begin)"
+"(let-values(((obs_128)(expand-context-observer ctx_109)))"
+"(if obs_128(let-values()(let-values()(call-expand-observe obs_128 'prim-module-begin)))(void)))"
+"(if(eq?(expand-context-context ctx_109) 'module-begin)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not in a module-definition context\" s_89)))"
-"(if(expand-context-module-begin-k ctx_107)"
+"(if(expand-context-module-begin-k ctx_109)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not currently transforming a module\" s_89)))"
-"((expand-context-module-begin-k ctx_107)"
+"((expand-context-module-begin-k ctx_109)"
 " s_89"
-"(let-values(((v_264) ctx_107))"
-"(let-values(((the-struct_100) v_264))"
-"(if(expand-context/outer? the-struct_100)"
+"(let-values(((v_266) ctx_109))"
+"(let-values(((the-struct_101) v_266))"
+"(if(expand-context/outer? the-struct_101)"
 "(let-values(((inner226_0)"
-"(let-values(((the-struct_101)(root-expand-context/outer-inner v_264)))"
-"(if(expand-context/inner? the-struct_101)"
+"(let-values(((the-struct_102)(root-expand-context/outer-inner v_266)))"
+"(if(expand-context/inner? the-struct_102)"
 "(let-values(((module-begin-k227_0) #f))"
 "(expand-context/inner2.1"
-"(root-expand-context/inner-self-mpi the-struct_101)"
-"(root-expand-context/inner-module-scopes the-struct_101)"
-"(root-expand-context/inner-top-level-bind-scope the-struct_101)"
-"(root-expand-context/inner-all-scopes-stx the-struct_101)"
-"(root-expand-context/inner-defined-syms the-struct_101)"
-"(root-expand-context/inner-counter the-struct_101)"
-"(root-expand-context/inner-lift-key the-struct_101)"
-"(expand-context/inner-to-parsed? the-struct_101)"
-"(expand-context/inner-phase the-struct_101)"
-"(expand-context/inner-namespace the-struct_101)"
-"(expand-context/inner-just-once? the-struct_101)"
+"(root-expand-context/inner-self-mpi the-struct_102)"
+"(root-expand-context/inner-module-scopes the-struct_102)"
+"(root-expand-context/inner-top-level-bind-scope the-struct_102)"
+"(root-expand-context/inner-all-scopes-stx the-struct_102)"
+"(root-expand-context/inner-defined-syms the-struct_102)"
+"(root-expand-context/inner-counter the-struct_102)"
+"(root-expand-context/inner-lift-key the-struct_102)"
+"(expand-context/inner-to-parsed? the-struct_102)"
+"(expand-context/inner-phase the-struct_102)"
+"(expand-context/inner-namespace the-struct_102)"
+"(expand-context/inner-just-once? the-struct_102)"
 " module-begin-k227_0"
-"(expand-context/inner-allow-unbound? the-struct_101)"
-"(expand-context/inner-in-local-expand? the-struct_101)"
-"(expand-context/inner-stops the-struct_101)"
-"(expand-context/inner-declared-submodule-names the-struct_101)"
-"(expand-context/inner-lifts the-struct_101)"
-"(expand-context/inner-lift-envs the-struct_101)"
-"(expand-context/inner-module-lifts the-struct_101)"
-"(expand-context/inner-require-lifts the-struct_101)"
-"(expand-context/inner-to-module-lifts the-struct_101)"
-"(expand-context/inner-requires+provides the-struct_101)"
-"(expand-context/inner-observer the-struct_101)"
-"(expand-context/inner-for-serializable? the-struct_101)"
-"(expand-context/inner-should-not-encounter-macros? the-struct_101)))"
-"                                (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_101)))))"
+"(expand-context/inner-allow-unbound? the-struct_102)"
+"(expand-context/inner-in-local-expand? the-struct_102)"
+"(expand-context/inner-keep-#%expression? the-struct_102)"
+"(expand-context/inner-stops the-struct_102)"
+"(expand-context/inner-declared-submodule-names the-struct_102)"
+"(expand-context/inner-lifts the-struct_102)"
+"(expand-context/inner-lift-envs the-struct_102)"
+"(expand-context/inner-module-lifts the-struct_102)"
+"(expand-context/inner-require-lifts the-struct_102)"
+"(expand-context/inner-to-module-lifts the-struct_102)"
+"(expand-context/inner-requires+provides the-struct_102)"
+"(expand-context/inner-observer the-struct_102)"
+"(expand-context/inner-for-serializable? the-struct_102)"
+"(expand-context/inner-should-not-encounter-macros? the-struct_102)))"
+"                                (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_102)))))"
 "(expand-context/outer1.1"
 " inner226_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_100)"
-"(root-expand-context/outer-use-site-scopes the-struct_100)"
-"(root-expand-context/outer-frame-id the-struct_100)"
-"(expand-context/outer-context the-struct_100)"
-"(expand-context/outer-env the-struct_100)"
-"(expand-context/outer-post-expansion-scope-action the-struct_100)"
-"(expand-context/outer-scopes the-struct_100)"
-"(expand-context/outer-def-ctx-scopes the-struct_100)"
-"(expand-context/outer-binding-layer the-struct_100)"
-"(expand-context/outer-reference-records the-struct_100)"
-"(expand-context/outer-only-immediate? the-struct_100)"
-"(expand-context/outer-need-eventually-defined the-struct_100)"
-"(expand-context/outer-current-introduction-scopes the-struct_100)"
-"(expand-context/outer-name the-struct_100)))"
-"              (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_100)))))))))"
+"(root-expand-context/outer-post-expansion-scope the-struct_101)"
+"(root-expand-context/outer-use-site-scopes the-struct_101)"
+"(root-expand-context/outer-frame-id the-struct_101)"
+"(expand-context/outer-context the-struct_101)"
+"(expand-context/outer-env the-struct_101)"
+"(expand-context/outer-post-expansion-scope-action the-struct_101)"
+"(expand-context/outer-scopes the-struct_101)"
+"(expand-context/outer-def-ctx-scopes the-struct_101)"
+"(expand-context/outer-binding-layer the-struct_101)"
+"(expand-context/outer-reference-records the-struct_101)"
+"(expand-context/outer-only-immediate? the-struct_101)"
+"(expand-context/outer-need-eventually-defined the-struct_101)"
+"(expand-context/outer-current-introduction-scopes the-struct_101)"
+"(expand-context/outer-name the-struct_101)))"
+"              (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_101)))))))))"
 "(void"
 "(add-core-form!*"
 " '#%declare"
-"(lambda(s_807 ctx_108)"
+"(lambda(s_809 ctx_110)"
 "(begin"
-"(let-values(((obs_131)(expand-context-observer ctx_108)))"
-"(if obs_131(let-values()(let-values()(call-expand-observe obs_131 'prim-declare)))(void)))"
-"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_807)))))"
+"(let-values(((obs_129)(expand-context-observer ctx_110)))"
+"(if obs_129(let-values()(let-values()(call-expand-observe obs_129 'prim-declare)))(void)))"
+"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_809)))))"
 "(define-values"
 "(expand-module18.1)"
 "(lambda(always-produce-compiled?1_0"
@@ -72437,7 +72506,7 @@ static const char *startup_source =
 " enclosing-self17_0)"
 "(begin"
 " 'expand-module18"
-"(let-values(((s_482) s15_0))"
+"(let-values(((s_483) s15_0))"
 "(let-values(((init-ctx_0) init-ctx16_0))"
 "(let-values(((enclosing-self_1) enclosing-self17_0))"
 "(let-values(((always-produce-compiled?_0)(if always-produce-compiled?8_0 always-produce-compiled?1_0 #f)))"
@@ -72458,13 +72527,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_132)(expand-context-observer init-ctx_0)))"
-"(if obs_132"
+"(let-values(((obs_130)(expand-context-observer init-ctx_0)))"
+"(if obs_130"
 "(let-values()"
-"(let-values()(call-expand-observe obs_132 'prim-module)))"
+"(let-values()(call-expand-observe obs_130 'prim-module)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_24)(syntax-disarm$1 s_482)))"
+"(let-values(((disarmed-s_24)(syntax-disarm$1 s_483)))"
 "(let-values(((ok?_77 module228_0 id:module-name229_0 initial-require230_0 body231_0)"
 "(let-values(((s_52) disarmed-s_24))"
 "(let-values(((orig-s_82) s_52))"
@@ -72472,66 +72541,66 @@ static const char *startup_source =
 " id:module-name229_1"
 " initial-require230_1"
 " body231_1)"
-"(let-values(((s_808)"
+"(let-values(((s_810)"
 "(if(syntax?$1 s_52)"
 "(syntax-e$1 s_52)"
 " s_52)))"
-"(if(pair? s_808)"
+"(if(pair? s_810)"
 "(let-values(((module232_0)"
-"(let-values(((s_318)(car s_808)))"
+"(let-values(((s_318)(car s_810)))"
 " s_318))"
 "((id:module-name233_0"
 " initial-require234_0"
 " body235_0)"
-"(let-values(((s_55)(cdr s_808)))"
+"(let-values(((s_55)(cdr s_810)))"
 "(let-values(((s_319)"
 "(if(syntax?$1 s_55)"
 "(syntax-e$1 s_55)"
 " s_55)))"
 "(if(pair? s_319)"
 "(let-values(((id:module-name236_0)"
-"(let-values(((s_809)"
+"(let-values(((s_811)"
 "(car"
 " s_319)))"
 "(if(let-values(((or-part_50)"
 "(if(syntax?$1"
-" s_809)"
+" s_811)"
 "(symbol?"
 "(syntax-e$1"
-" s_809))"
+" s_811))"
 " #f)))"
 "(if or-part_50"
 " or-part_50"
 "(symbol?"
-" s_809)))"
-" s_809"
+" s_811)))"
+" s_811"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                           \"not an identifier\""
 " orig-s_82"
-" s_809))))"
+" s_811))))"
 "((initial-require237_0"
 " body238_0)"
-"(let-values(((s_508)"
+"(let-values(((s_510)"
 "(cdr"
 " s_319)))"
-"(let-values(((s_810)"
+"(let-values(((s_812)"
 "(if(syntax?$1"
-" s_508)"
+" s_510)"
 "(syntax-e$1"
-" s_508)"
-" s_508)))"
+" s_510)"
+" s_510)))"
 "(if(pair?"
-" s_810)"
+" s_812)"
 "(let-values(((initial-require239_0)"
 "(let-values(((s_320)"
 "(car"
-" s_810)))"
+" s_812)))"
 " s_320))"
 "((body240_0)"
 "(let-values(((s_321)"
 "(cdr"
-" s_810)))"
+" s_812)))"
 "(let-values(((s_305)"
 "(if(syntax?$1"
 " s_321)"
@@ -72579,7 +72648,7 @@ static const char *startup_source =
 " body231_1))))))"
 "(let-values(((rebuild-s_14)"
 "(let-values(((init-ctx253_0) init-ctx_0)"
-"((s254_0) s_482)"
+"((s254_0) s_483)"
 "((temp255_0) #t)"
 "((temp256_0) #t))"
 "(keep-as-needed120.1"
@@ -72594,19 +72663,19 @@ static const char *startup_source =
 "(let-values(((initial-require_0)(syntax->datum$1 initial-require230_0)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_206) keep-enclosing-scope-at-phase_0))"
-"(if or-part_206"
-" or-part_206"
+"(if(let-values(((or-part_207) keep-enclosing-scope-at-phase_0))"
+"(if or-part_207"
+" or-part_207"
 "(1/module-path? initial-require_0)))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"not a module path\""
-" s_482"
+" s_483"
 " initial-require230_0)))"
 "(values))))"
-"(let-values(((phase_155) 0))"
+"(let-values(((phase_154) 0))"
 "(let-values(((module-name-sym_0)(syntax-e$1 id:module-name229_0)))"
 "(let-values(((outside-scope_1)(new-scope 'module)))"
 "(let-values(((inside-scope_0)(new-multi-scope module-name-sym_0)))"
@@ -72687,7 +72756,7 @@ static const char *startup_source =
 " ns243_0)"
 "(begin"
 " 'make-m-ns244"
-"(let-values(((ns_131) ns243_0))"
+"(let-values(((ns_130) ns243_0))"
 "(let-values(((for-submodule?_1)"
 "(if for-submodule?242_0"
 " for-submodule?241_0"
@@ -72696,7 +72765,7 @@ static const char *startup_source =
 " #f))))"
 "(let-values()"
 "(let-values(((ns262_0)"
-" ns_131)"
+" ns_130)"
 "((self263_0)"
 " self_14)"
 "((root-ctx264_0)"
@@ -72718,115 +72787,117 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp266_1))))"
-"(let-values(((ctx_109)"
-"(let-values(((v_111)"
+"(let-values(((ctx_111)"
+"(let-values(((v_105)"
 "(copy-root-expand-context"
 " init-ctx_0"
 " root-ctx_6)))"
-"(let-values(((the-struct_102)"
-" v_111))"
+"(let-values(((the-struct_103)"
+" v_105))"
 "(if(expand-context/outer?"
-" the-struct_102)"
+" the-struct_103)"
 "(let-values(((post-expansion-scope-action267_0)"
 " add-scope)"
 "((inner268_0)"
-"(let-values(((the-struct_103)"
+"(let-values(((the-struct_104)"
 "(root-expand-context/outer-inner"
-" v_111)))"
+" v_105)))"
 "(if(expand-context/inner?"
-" the-struct_103)"
+" the-struct_104)"
 "(let-values(((allow-unbound?269_0)"
 " #f)"
 "((namespace270_0)"
 " m-ns_18)"
 "((phase271_0)"
-" phase_155)"
+" phase_154)"
 "((just-once?272_0)"
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-counter"
-" the-struct_103)"
+" the-struct_104)"
 "(root-expand-context/inner-lift-key"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-to-parsed?"
-" the-struct_103)"
+" the-struct_104)"
 " phase271_0"
 " namespace270_0"
 " just-once?272_0"
 "(expand-context/inner-module-begin-k"
-" the-struct_103)"
+" the-struct_104)"
 " allow-unbound?269_0"
 "(expand-context/inner-in-local-expand?"
-" the-struct_103)"
+" the-struct_104)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_104)"
 "(expand-context/inner-stops"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-lifts"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-lift-envs"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-module-lifts"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-require-lifts"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-requires+provides"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-observer"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-for-serializable?"
-" the-struct_103)"
+" the-struct_104)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_103)))"
+" the-struct_104)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                 \"expand-context/inner?\""
-" the-struct_103)))))"
+" the-struct_104)))))"
 "(expand-context/outer1.1"
 " inner268_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_102)"
+" the-struct_103)"
 "(root-expand-context/outer-frame-id"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-context"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-env"
-" the-struct_102)"
+" the-struct_103)"
 " post-expansion-scope-action267_0"
 "(expand-context/outer-scopes"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-binding-layer"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-reference-records"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-only-immediate?"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_102)"
+" the-struct_103)"
 "(expand-context/outer-name"
-" the-struct_102)))"
+" the-struct_103)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                               \"expand-context/outer?\""
-" the-struct_102))))))"
+" the-struct_103))))))"
 "(let-values(((bodys_4)"
 "(let-values(((scoped-s_0)"
 "(apply-module-scopes_0"
@@ -72836,51 +72907,51 @@ static const char *startup_source =
 " _274_0"
 " _275_0"
 " body276_0)"
-"(let-values(((s_811)"
+"(let-values(((s_813)"
 " scoped-s_0))"
 "(let-values(((orig-s_83)"
-" s_811))"
+" s_813))"
 "(let-values(((_273_1"
 " _274_1"
 " _275_1"
 " body276_1)"
-"(let-values(((s_812)"
+"(let-values(((s_814)"
 "(if(syntax?$1"
-" s_811)"
+" s_813)"
 "(syntax-e$1"
-" s_811)"
-" s_811)))"
+" s_813)"
+" s_813)))"
 "(if(pair?"
-" s_812)"
+" s_814)"
 "(let-values(((_277_2)"
 "(let-values(((s_70)"
 "(car"
-" s_812)))"
+" s_814)))"
 " s_70))"
 "((_278_2"
 " _279_0"
 " body280_0)"
 "(let-values(((s_208)"
 "(cdr"
-" s_812)))"
-"(let-values(((s_442)"
+" s_814)))"
+"(let-values(((s_443)"
 "(if(syntax?$1"
 " s_208)"
 "(syntax-e$1"
 " s_208)"
 " s_208)))"
 "(if(pair?"
-" s_442)"
+" s_443)"
 "(let-values(((_281_1)"
 "(let-values(((s_99)"
 "(car"
-" s_442)))"
+" s_443)))"
 " s_99))"
 "((_282_0"
 " body283_0)"
 "(let-values(((s_39)"
 "(cdr"
-" s_442)))"
+" s_443)))"
 "(let-values(((s_157)"
 "(if(syntax?$1"
 " s_39)"
@@ -72890,20 +72961,20 @@ static const char *startup_source =
 "(if(pair?"
 " s_157)"
 "(let-values(((_284_0)"
-"(let-values(((s_465)"
+"(let-values(((s_466)"
 "(car"
 " s_157)))"
-" s_465))"
+" s_466))"
 "((body285_0)"
-"(let-values(((s_466)"
+"(let-values(((s_467)"
 "(cdr"
 " s_157)))"
 "(let-values(((s_328)"
 "(if(syntax?$1"
-" s_466)"
+" s_467)"
 "(syntax-e$1"
-" s_466)"
-" s_466)))"
+" s_467)"
+" s_467)))"
 "(let-values(((flat-s_54)"
 "(to-syntax-list.1"
 " s_328)))"
@@ -73031,14 +73102,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_133)"
+"(let-values(((obs_131)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_133"
+"(if obs_131"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_133"
+" obs_131"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -73079,22 +73150,22 @@ static const char *startup_source =
 "(set! again?_0"
 " #t)"
 "(values))))"
-"(let-values(((ctx_110)"
-"(let-values(((v_265)"
+"(let-values(((ctx_112)"
+"(let-values(((v_267)"
 " mb-init-ctx_0))"
-"(let-values(((the-struct_104)"
-" v_265))"
-"(if(expand-context/outer?"
-" the-struct_104)"
-"(let-values(((inner306_0)"
 "(let-values(((the-struct_105)"
-"(root-expand-context/outer-inner"
-" v_265)))"
-"(if(expand-context/inner?"
+" v_267))"
+"(if(expand-context/outer?"
 " the-struct_105)"
+"(let-values(((inner306_0)"
+"(let-values(((the-struct_106)"
+"(root-expand-context/outer-inner"
+" v_267)))"
+"(if(expand-context/inner?"
+" the-struct_106)"
 "(let-values(((module-begin-k307_0)"
-"(lambda(s_789"
-" ctx_111)"
+"(lambda(s_791"
+" ctx_113)"
 "(begin"
 " 'module-begin-k307"
 "(let-values(((new-requires+provides_0)"
@@ -73130,8 +73201,8 @@ static const char *startup_source =
 " compiled-module-box313_0)))"
 "(lambda()"
 "(module-begin-k_1"
-" s_789"
-" ctx_111))"
+" s_791"
+" ctx_113))"
 "(lambda()"
 "(begin"
 "(set! requires+provides_6"
@@ -73142,92 +73213,94 @@ static const char *startup_source =
 " compiled-module-box310_0))))))))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-counter"
-" the-struct_105)"
+" the-struct_106)"
 "(root-expand-context/inner-lift-key"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-to-parsed?"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-phase"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-namespace"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-just-once?"
-" the-struct_105)"
+" the-struct_106)"
 " module-begin-k307_0"
 "(expand-context/inner-allow-unbound?"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_105)"
+" the-struct_106)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_106)"
 "(expand-context/inner-stops"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-lifts"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-lift-envs"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-module-lifts"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-require-lifts"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-requires+provides"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-observer"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-for-serializable?"
-" the-struct_105)"
+" the-struct_106)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_105)))"
+" the-struct_106)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                    \"expand-context/inner?\""
-" the-struct_105)))))"
+" the-struct_106)))))"
 "(expand-context/outer1.1"
 " inner306_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_104)"
+" the-struct_105)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_104)"
+" the-struct_105)"
 "(root-expand-context/outer-frame-id"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-context"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-env"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-scopes"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-binding-layer"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-reference-records"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-only-immediate?"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_104)"
+" the-struct_105)"
 "(expand-context/outer-name"
-" the-struct_104)))"
+" the-struct_105)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                  \"expand-context/outer?\""
-" the-struct_104))))))"
+" the-struct_105))))))"
 "(let-values(((added-s_2)"
 "(add-scope"
 " mb-s_0"
@@ -73236,7 +73309,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_21)"
 "(expand-context-observer"
-" ctx_110)))"
+" ctx_112)))"
 "(if obs_21"
 "(let-values()"
 "(let-values()"
@@ -73252,29 +73325,29 @@ static const char *startup_source =
 "(let-values(((ok?_79"
 " #%module-begin301_0"
 " body302_0)"
-"(let-values(((s_813)"
+"(let-values(((s_815)"
 " disarmed-mb-s_0))"
 "(let-values(((orig-s_84)"
-" s_813))"
+" s_815))"
 "(let-values(((#%module-begin301_1"
 " body302_1)"
-"(let-values(((s_467)"
+"(let-values(((s_468)"
 "(if(syntax?$1"
-" s_813)"
+" s_815)"
 "(syntax-e$1"
-" s_813)"
-" s_813)))"
+" s_815)"
+" s_815)))"
 "(if(pair?"
-" s_467)"
+" s_468)"
 "(let-values(((#%module-begin303_0)"
 "(let-values(((s_221)"
 "(car"
-" s_467)))"
+" s_468)))"
 " s_221))"
 "((body304_0)"
 "(let-values(((s_222)"
 "(cdr"
-" s_467)))"
+" s_468)))"
 "(let-values(((s_223)"
 "(if(syntax?$1"
 " s_222)"
@@ -73308,7 +73381,7 @@ static const char *startup_source =
 " body302_0))"
 "(let-values(((rebuild-mb-s_0)"
 "(let-values(((ctx316_0)"
-" ctx_110)"
+" ctx_112)"
 "((mb-s317_0)"
 " mb-s_0))"
 "(keep-as-needed120.1"
@@ -73331,7 +73404,7 @@ static const char *startup_source =
 "(let-values(((expression-expanded-bodys_0)"
 "((letrec-values(((pass-1-and-2-loop_0)"
 "(lambda(bodys_16"
-" phase_156)"
+" phase_155)"
 "(begin"
 " 'pass-1-and-2-loop"
 "(let-values(((def-ctx-scopes_8)"
@@ -73339,14 +73412,14 @@ static const char *startup_source =
 " null)))"
 "(let-values(((to-parsed?_5)"
 "(expand-context-to-parsed?"
-" ctx_110)))"
+" ctx_112)))"
 "(let-values(((partial-body-ctx_0)"
-"(let-values(((v_146)"
-" ctx_110))"
-"(let-values(((the-struct_106)"
-" v_146))"
+"(let-values(((v_148)"
+" ctx_112))"
+"(let-values(((the-struct_107)"
+" v_148))"
 "(if(expand-context/outer?"
-" the-struct_106)"
+" the-struct_107)"
 "(let-values(((context326_0)"
 " 'module)"
 "((def-ctx-scopes327_0)"
@@ -73354,22 +73427,22 @@ static const char *startup_source =
 "((need-eventually-defined328_0)"
 " need-eventually-defined_1)"
 "((inner329_0)"
-"(let-values(((the-struct_107)"
+"(let-values(((the-struct_108)"
 "(root-expand-context/outer-inner"
-" v_146)))"
+" v_148)))"
 "(if(expand-context/inner?"
-" the-struct_107)"
+" the-struct_108)"
 "(let-values(((phase330_0)"
-" phase_156)"
+" phase_155)"
 "((namespace331_0)"
 "(namespace->namespace-at-phase"
 " m-ns_18"
-" phase_156))"
+" phase_155))"
 "((stops332_0)"
 "(free-id-set"
-" phase_156"
+" phase_155"
 "(module-expand-stop-ids"
-" phase_156)))"
+" phase_155)))"
 "((declared-submodule-names333_0)"
 " declared-submodule-names_3)"
 "((lift-key334_0)"
@@ -73389,11 +73462,11 @@ static const char *startup_source =
 " temp339_1)))"
 "((module-lifts336_0)"
 "(make-module-lift-context"
-" phase_156"
+" phase_155"
 " #t))"
 "((require-lifts337_0)"
 "(make-require-lift-context"
-" phase_156"
+" phase_155"
 "(let-values(((m-ns340_0)"
 " m-ns_18)"
 "((self341_0)"
@@ -73409,7 +73482,7 @@ static const char *startup_source =
 " requires+provides342_0))))"
 "((to-module-lifts338_0)"
 "(let-values(((phase344_0)"
-" phase_156)"
+" phase_155)"
 "((module-ends345_0)"
 " module-ends_0)"
 "((temp346_1)"
@@ -73420,86 +73493,88 @@ static const char *startup_source =
 " phase344_0))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_107)"
+" the-struct_108)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_107)"
+" the-struct_108)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_107)"
+" the-struct_108)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_107)"
+" the-struct_108)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_107)"
+" the-struct_108)"
 "(root-expand-context/inner-counter"
-" the-struct_107)"
+" the-struct_108)"
 " lift-key334_0"
 "(expand-context/inner-to-parsed?"
-" the-struct_107)"
+" the-struct_108)"
 " phase330_0"
 " namespace331_0"
 "(expand-context/inner-just-once?"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-module-begin-k"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_107)"
+" the-struct_108)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_108)"
 " stops332_0"
 " declared-submodule-names333_0"
 " lifts335_0"
 "(expand-context/inner-lift-envs"
-" the-struct_107)"
+" the-struct_108)"
 " module-lifts336_0"
 " require-lifts337_0"
 " to-module-lifts338_0"
 "(expand-context/inner-requires+provides"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-observer"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-for-serializable?"
-" the-struct_107)"
+" the-struct_108)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_107)))"
+" the-struct_108)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                                  \"expand-context/inner?\""
-" the-struct_107)))))"
+" the-struct_108)))))"
 "(expand-context/outer1.1"
 " inner329_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_106)"
+" the-struct_107)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_106)"
+" the-struct_107)"
 "(root-expand-context/outer-frame-id"
-" the-struct_106)"
+" the-struct_107)"
 " context326_0"
 "(expand-context/outer-env"
-" the-struct_106)"
+" the-struct_107)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_106)"
+" the-struct_107)"
 "(expand-context/outer-scopes"
-" the-struct_106)"
+" the-struct_107)"
 " def-ctx-scopes327_0"
 "(expand-context/outer-binding-layer"
-" the-struct_106)"
+" the-struct_107)"
 "(expand-context/outer-reference-records"
-" the-struct_106)"
+" the-struct_107)"
 "(expand-context/outer-only-immediate?"
-" the-struct_106)"
+" the-struct_107)"
 " need-eventually-defined328_0"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_106)"
+" the-struct_107)"
 "(expand-context/outer-name"
-" the-struct_106)))"
+" the-struct_107)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                \"expand-context/outer?\""
-" the-struct_106))))))"
+" the-struct_107))))))"
 "(let-values(((partially-expanded-bodys_0)"
 "(let-values(((bodys347_0)"
 " bodys_16)"
 "((phase348_0)"
-" phase_156)"
+" phase_155)"
 "((partial-body-ctx349_0)"
 " partial-body-ctx_0)"
 "((m-ns350_0)"
@@ -73547,41 +73622,41 @@ static const char *startup_source =
 " bodys347_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_134)"
+"(let-values(((obs_132)"
 "(expand-context-observer"
 " partial-body-ctx_0)))"
-"(if obs_134"
+"(if obs_132"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_134"
+" obs_132"
 " 'next-group)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_6)"
-"(let-values(((v_266)"
+"(let-values(((v_268)"
 "(accumulate-def-ctx-scopes"
 " partial-body-ctx_0"
 " def-ctx-scopes_8)))"
-"(let-values(((the-struct_108)"
-" v_266))"
+"(let-values(((the-struct_109)"
+" v_268))"
 "(if(expand-context/outer?"
-" the-struct_108)"
+" the-struct_109)"
 "(let-values(((def-ctx-scopes363_0)"
 " #f)"
 "((post-expansion-scope364_0)"
 " #f)"
 "((inner365_0)"
-"(let-values(((the-struct_109)"
+"(let-values(((the-struct_110)"
 "(root-expand-context/outer-inner"
-" v_266)))"
+" v_268)))"
 "(if(expand-context/inner?"
-" the-struct_109)"
+" the-struct_110)"
 "(let-values(((stops366_0)"
 " empty-free-id-set)"
 "((to-module-lifts367_0)"
 "(let-values(((phase368_0)"
-" phase_156)"
+" phase_155)"
 "((module-ends369_0)"
 " module-ends_0)"
 "((temp370_0)"
@@ -73592,93 +73667,95 @@ static const char *startup_source =
 " phase368_0))))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-counter"
-" the-struct_109)"
+" the-struct_110)"
 "(root-expand-context/inner-lift-key"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-to-parsed?"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-phase"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-namespace"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-just-once?"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-module-begin-k"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_109)"
+" the-struct_110)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_110)"
 " stops366_0"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-lifts"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-lift-envs"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-module-lifts"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-require-lifts"
-" the-struct_109)"
+" the-struct_110)"
 " to-module-lifts367_0"
 "(expand-context/inner-requires+provides"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-observer"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-for-serializable?"
-" the-struct_109)"
+" the-struct_110)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_109)))"
+" the-struct_110)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                                        \"expand-context/inner?\""
-" the-struct_109)))))"
+" the-struct_110)))))"
 "(expand-context/outer1.1"
 " inner365_0"
 " post-expansion-scope364_0"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_108)"
+" the-struct_109)"
 "(root-expand-context/outer-frame-id"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-context"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-env"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-scopes"
-" the-struct_108)"
+" the-struct_109)"
 " def-ctx-scopes363_0"
 "(expand-context/outer-binding-layer"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-reference-records"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-only-immediate?"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_108)"
+" the-struct_109)"
 "(expand-context/outer-name"
-" the-struct_108)))"
+" the-struct_109)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                                      \"expand-context/outer?\""
-" the-struct_108))))))"
+" the-struct_109))))))"
 "(let-values(((partially-expanded-bodys318_0)"
 " partially-expanded-bodys_0)"
 "((phase319_0)"
-" phase_156)"
+" phase_155)"
 "((body-ctx320_0)"
 " body-ctx_6)"
 "((self321_0)"
@@ -73702,25 +73779,25 @@ static const char *startup_source =
 " partially-expanded-bodys318_0))))))))))))"
 " pass-1-and-2-loop_0)"
 " bodys_15"
-" phase_155)))"
+" phase_154)))"
 "(let-values((()"
 "(begin"
 "(check-defined-by-now"
 " need-eventually-defined_1"
 " self_14"
-" ctx_110"
+" ctx_112"
 " requires+provides_6)"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_80)"
+"(let-values(((obs_78)"
 "(expand-context-observer"
-" ctx_110)))"
-"(if obs_80"
+" ctx_112)))"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_80"
+" obs_78"
 " 'next-group)))"
 "(void)))"
 "(values))))"
@@ -73734,11 +73811,11 @@ static const char *startup_source =
 "((m-ns374_0)"
 " m-ns_18)"
 "((phase375_0)"
-" phase_155)"
+" phase_154)"
 "((self376_0)"
 " self_14)"
 "((ctx377_0)"
-" ctx_110))"
+" ctx_112))"
 "(resolve-provides115.1"
 " ctx377_0"
 " declared-submodule-names373_0"
@@ -73775,14 +73852,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_135)"
+"(let-values(((obs_133)"
 "(expand-context-observer"
-" ctx_110)))"
-"(if obs_135"
+" ctx_112)))"
+"(if obs_133"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_135"
+" obs_133"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -73796,10 +73873,10 @@ static const char *startup_source =
 " #t"
 " m-ns378_0))))"
 "(let-values(((submod-ctx_0)"
-"(let-values(((v_267)"
-" ctx_110))"
+"(let-values(((v_269)"
+" ctx_112))"
 "(let-values(((the-struct_24)"
-" v_267))"
+" v_269))"
 "(if(expand-context/outer?"
 " the-struct_24)"
 "(let-values(((frame-id380_0)"
@@ -73807,67 +73884,69 @@ static const char *startup_source =
 "((post-expansion-scope381_0)"
 " #f)"
 "((inner382_0)"
-"(let-values(((the-struct_110)"
+"(let-values(((the-struct_111)"
 "(root-expand-context/outer-inner"
-" v_267)))"
+" v_269)))"
 "(if(expand-context/inner?"
-" the-struct_110)"
+" the-struct_111)"
 "(let-values(((namespace383_0)"
 " submod-m-ns_0))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-counter"
-" the-struct_110)"
+" the-struct_111)"
 "(root-expand-context/inner-lift-key"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-to-parsed?"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-phase"
-" the-struct_110)"
+" the-struct_111)"
 " namespace383_0"
 "(expand-context/inner-just-once?"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-module-begin-k"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_110)"
+" the-struct_111)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_111)"
 "(expand-context/inner-stops"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-lifts"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-lift-envs"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-module-lifts"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-require-lifts"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-requires+provides"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-observer"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-for-serializable?"
-" the-struct_110)"
+" the-struct_111)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_110)))"
+" the-struct_111)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                                          \"expand-context/inner?\""
-" the-struct_110)))))"
+" the-struct_111)))))"
 "(expand-context/outer1.1"
 " inner382_0"
 " post-expansion-scope381_0"
@@ -73950,7 +74029,7 @@ static const char *startup_source =
 "((declare-enclosing-module396_0)"
 " declare-enclosing-module_0)"
 "((phase397_0)"
-" phase_155)"
+" phase_154)"
 "((self398_0)"
 " self_14)"
 "((requires+provides399_0)"
@@ -74016,110 +74095,112 @@ static const char *startup_source =
 "(let-values()"
 " mb-result-s_0)))))))))))))))))))))))))))))))))"
 "(let-values(((mb-ctx_0)"
-"(let-values(((v_268)"
-" ctx_109))"
-"(let-values(((the-struct_111)"
-" v_268))"
+"(let-values(((v_270)"
+" ctx_111))"
+"(let-values(((the-struct_112)"
+" v_270))"
 "(if(expand-context/outer?"
-" the-struct_111)"
+" the-struct_112)"
 "(let-values(((context409_0)"
 " 'module-begin)"
 "((inner410_0)"
-"(let-values(((the-struct_112)"
+"(let-values(((the-struct_113)"
 "(root-expand-context/outer-inner"
-" v_268)))"
+" v_270)))"
 "(if(expand-context/inner?"
-" the-struct_112)"
+" the-struct_113)"
 "(let-values(((module-begin-k411_0)"
 " module-begin-k_1)"
 "((in-local-expand?412_0)"
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-counter"
-" the-struct_112)"
+" the-struct_113)"
 "(root-expand-context/inner-lift-key"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-to-parsed?"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-phase"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-namespace"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-just-once?"
-" the-struct_112)"
+" the-struct_113)"
 " module-begin-k411_0"
 "(expand-context/inner-allow-unbound?"
-" the-struct_112)"
+" the-struct_113)"
 " in-local-expand?412_0"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_113)"
 "(expand-context/inner-stops"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-lifts"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-lift-envs"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-module-lifts"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-require-lifts"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-requires+provides"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-observer"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-for-serializable?"
-" the-struct_112)"
+" the-struct_113)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_112)))"
+" the-struct_113)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                             \"expand-context/inner?\""
-" the-struct_112)))))"
+" the-struct_113)))))"
 "(expand-context/outer1.1"
 " inner410_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_111)"
+" the-struct_112)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_111)"
+" the-struct_112)"
 "(root-expand-context/outer-frame-id"
-" the-struct_111)"
+" the-struct_112)"
 " context409_0"
 "(expand-context/outer-env"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-scopes"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-binding-layer"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-reference-records"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-only-immediate?"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_111)"
+" the-struct_112)"
 "(expand-context/outer-name"
-" the-struct_111)))"
+" the-struct_112)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                           \"expand-context/outer?\""
-" the-struct_111))))))"
+" the-struct_112))))))"
 "(let-values(((mb-scopes-s_0)"
 "(if keep-enclosing-scope-at-phase_0"
 "(apply-module-scopes_0"
@@ -74142,9 +74223,9 @@ static const char *startup_source =
 "((mb-def-ctx-scopes418_0)"
 " mb-def-ctx-scopes_0)"
 "((phase419_0)"
-" phase_155)"
+" phase_154)"
 "((s420_0)"
-" s_482))"
+" s_483))"
 "(ensure-module-begin36.1"
 " mb-ctx417_0"
 " mb-def-ctx-scopes418_0"
@@ -74178,11 +74259,11 @@ static const char *startup_source =
 " self_14"
 " self_14)))"
 "(let-values(((result-form_0)"
-"(if(let-values(((or-part_402)"
+"(if(let-values(((or-part_403)"
 "(expand-context-to-parsed?"
 " init-ctx_0)))"
-"(if or-part_402"
-" or-part_402"
+"(if or-part_403"
+" or-part_403"
 " always-produce-compiled?_0))"
 "(parsed-module25.1"
 " rebuild-s_14"
@@ -74304,14 +74385,14 @@ static const char *startup_source =
 " #t)"
 " result-s_17)))"
 "(begin"
-"(let-values(((obs_136)"
+"(let-values(((obs_134)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_136"
+"(if obs_134"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_136"
+" obs_134"
 " 'rename-one"
 " result-s_18)))"
 "(void)))"
@@ -74337,55 +74418,55 @@ static const char *startup_source =
 "(let-values(((module-name-sym_1) module-name-sym21_0))"
 "(let-values(((scopes-s_0) scopes-s22_0))"
 "(let-values()"
-"(let-values(((ctx_112) ctx24_0))"
+"(let-values(((ctx_114) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
-"(let-values(((phase_157) phase26_3))"
+"(let-values(((phase_156) phase26_3))"
 "(let-values(((s_138) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
 "(begin"
 " 'make-mb-ctx"
-"(let-values(((v_269) ctx_112))"
-"(let-values(((the-struct_113) v_269))"
-"(if(expand-context/outer? the-struct_113)"
+"(let-values(((v_271) ctx_114))"
+"(let-values(((the-struct_114) v_271))"
+"(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_269)))"
+"((inner431_0)(root-expand-context/outer-inner v_271)))"
 "(expand-context/outer1.1"
 " inner431_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_113)"
-"(root-expand-context/outer-use-site-scopes the-struct_113)"
-"(root-expand-context/outer-frame-id the-struct_113)"
+"(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"
-"(expand-context/outer-env the-struct_113)"
-"(expand-context/outer-post-expansion-scope-action the-struct_113)"
-"(expand-context/outer-scopes the-struct_113)"
+"(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"
-"(expand-context/outer-binding-layer the-struct_113)"
-"(expand-context/outer-reference-records the-struct_113)"
+"(expand-context/outer-binding-layer the-struct_114)"
+"(expand-context/outer-reference-records the-struct_114)"
 " only-immediate?429_0"
-"(expand-context/outer-need-eventually-defined the-struct_113)"
-"(expand-context/outer-current-introduction-scopes the-struct_113)"
-"(expand-context/outer-name the-struct_113)))"
+"(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)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                 \"expand-context/outer?\""
-" the-struct_113))))))))"
+" the-struct_114))))))))"
 "(let-values(((mb_1)"
 "(if(= 1(length bodys_17))"
 "(let-values()"
 "(begin"
-"(let-values(((obs_137)(expand-context-observer ctx_112)))"
-"(if obs_137"
+"(let-values(((obs_135)(expand-context-observer ctx_114)))"
+"(if obs_135"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_137 'rename-one(car bodys_17))))"
+"(call-expand-observe obs_135 'rename-one(car bodys_17))))"
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1(car bodys_17)) phase_157))"
+"(core-form-sym(syntax-disarm$1(car bodys_17)) phase_156))"
 "(let-values()(car bodys_17))"
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
@@ -74408,13 +74489,13 @@ static const char *startup_source =
 " '#%module-begin"
 "(core-form-sym"
 "(syntax-disarm$1 partly-expanded-body_0)"
-" phase_157))"
+" phase_156))"
 "(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_157)"
+"((phase437_0) phase_156)"
 "((module-name-sym438_0) module-name-sym_1)"
 "((temp439_0)(make-mb-ctx_0))"
 "((temp440_0) #f))"
@@ -74431,7 +74512,7 @@ static const char *startup_source =
 "(let-values(((bodys441_0) bodys_17)"
 "((s442_0) s_138)"
 "((scopes-s443_0) scopes-s_0)"
-"((phase444_0) phase_157)"
+"((phase444_0) phase_156)"
 "((module-name-sym445_0) module-name-sym_1)"
 "((temp446_0)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
@@ -74457,9 +74538,9 @@ static const char *startup_source =
 "(begin"
 " 'add-module-begin47"
 "(let-values(((bodys_18) bodys41_0))"
-"(let-values(((s_814) s42_0))"
+"(let-values(((s_816) s42_0))"
 "(let-values(((scopes-s_1) scopes-s43_0))"
-"(let-values(((phase_158) phase44_1))"
+"(let-values(((phase_157) phase44_1))"
 "(let-values(((module-name-sym_2) module-name-sym45_0))"
 "(let-values(((mb-ctx_1) mb-ctx46_0))"
 "(let-values(((log-rename-one?_0)(if log-rename-one?40_0 log-rename-one?39_0 #t)))"
@@ -74468,34 +74549,34 @@ 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_158))"
+"(if(let-values(((mb-id447_0) mb-id_0)((phase448_0) phase_157))"
 "(resolve40.1 #f #f #f #f #f #f #f #f mb-id447_0 phase448_0))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                               \"no #%module-begin binding in the module's language\""
-" s_814)))"
+" s_816)))"
 "(values))))"
 "(let-values(((mb_2)"
-"(datum->syntax$1 disarmed-scopes-s_0(list* mb-id_0 bodys_18) s_814 s_814)))"
+"(datum->syntax$1 disarmed-scopes-s_0(list* mb-id_0 bodys_18) s_816 s_816)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_138)(expand-context-observer mb-ctx_1)))"
-"(if obs_138"
+"(let-values(((obs_136)(expand-context-observer mb-ctx_1)))"
+"(if obs_136"
 "(let-values()"
-"(let-values()(call-expand-observe obs_138 'tag mb_2)))"
+"(let-values()(call-expand-observe obs_136 'tag mb_2)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if log-rename-one?_0"
 "(let-values()"
-"(let-values(((obs_139)(expand-context-observer mb-ctx_1)))"
-"(if obs_139"
+"(let-values(((obs_137)(expand-context-observer mb-ctx_1)))"
+"(if obs_137"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_139 'rename-one mb_2)))"
+"(call-expand-observe obs_137 'rename-one mb_2)))"
 "(void))))"
 "(void))"
 "(values))))"
@@ -74508,13 +74589,13 @@ static const char *startup_source =
 "(begin"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_158))"
+"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_157))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                           \"expansion of #%module-begin is not a #%plain-module-begin form\""
-" s_814"
+" s_816"
 " partly-expanded-mb_0)))"
 " partly-expanded-mb_0)))))))))))))))))))"
 "(define-values"
@@ -74530,13 +74611,13 @@ static const char *startup_source =
 " enclosing-self_2"
 " enclosing-mod_2)"
 "(begin"
-"(lambda(s_815)"
+"(lambda(s_817)"
 "(let-values()"
 "(let-values(((s-without-enclosing_0)"
 "(if keep-enclosing-scope-at-phase_1"
-" s_815"
+" s_817"
 "(remove-use-site-scopes"
-"(remove-scopes s_815(root-expand-context-module-scopes init-ctx_1))"
+"(remove-scopes s_817(root-expand-context-module-scopes init-ctx_1))"
 " init-ctx_1))))"
 "(let-values(((s-with-edges_0)"
 "(add-scope(add-scope s-without-enclosing_0 outside-scope_2) inside-scope_1)))"
@@ -74615,14 +74696,14 @@ static const char *startup_source =
 "(if(if tail?_52(not(zero? phase_53)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_140)"
+"(let-values(((obs_138)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_140"
+"(if obs_138"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_140"
+" obs_138"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -74638,14 +74719,14 @@ static const char *startup_source =
 "(expand-context-to-module-lifts"
 " partial-body-ctx_1)))))"
 "(begin"
-"(let-values(((obs_141)"
+"(let-values(((obs_139)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_141"
+"(if obs_139"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_141"
+" obs_139"
 " 'module-lift-end-loop"
 " bodys_21)))"
 "(void)))"
@@ -74662,14 +74743,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_1)(cdr bodys_20)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_142)"
+"(let-values(((obs_140)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_142"
+"(if obs_140"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_142"
+" obs_140"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -74703,14 +74784,14 @@ static const char *startup_source =
 " exp-body_7"
 " rest-bodys_1))"
 "(void))"
-"(let-values(((obs_143)"
+"(let-values(((obs_141)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_143"
+"(if obs_141"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_143"
+" obs_141"
 " 'rename-one"
 " exp-body_7)))"
 "(void)))"
@@ -74718,41 +74799,41 @@ static const char *startup_source =
 "(lambda()"
 "(begin"
 " 'finish"
-"(let-values(((tmp_66)"
+"(let-values(((tmp_65)"
 "(core-form-sym"
 " disarmed-exp-body_1"
 " phase_53)))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'begin)"
 "(let-values()"
 "(let-values(((ok?_80"
 " begin460_0"
 " e461_1)"
-"(let-values(((s_816)"
+"(let-values(((s_818)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_85)"
-" s_816))"
+" s_818))"
 "(let-values(((begin460_1"
 " e461_2)"
-"(let-values(((s_817)"
+"(let-values(((s_819)"
 "(if(syntax?$1"
-" s_816)"
+" s_818)"
 "(syntax-e$1"
-" s_816)"
-" s_816)))"
+" s_818)"
+" s_818)))"
 "(if(pair?"
-" s_817)"
+" s_819)"
 "(let-values(((begin462_0)"
-"(let-values(((s_818)"
+"(let-values(((s_820)"
 "(car"
-" s_817)))"
-" s_818))"
+" s_819)))"
+" s_820))"
 "((e463_0)"
 "(let-values(((s_153)"
 "(cdr"
-" s_817)))"
-"(let-values(((s_819)"
+" s_819)))"
+"(let-values(((s_821)"
 "(if(syntax?$1"
 " s_153)"
 "(syntax-e$1"
@@ -74760,7 +74841,7 @@ static const char *startup_source =
 " s_153)))"
 "(let-values(((flat-s_56)"
 "(to-syntax-list.1"
-" s_819)))"
+" s_821)))"
 "(if(not"
 " flat-s_56)"
 "(let-values()"
@@ -74795,14 +74876,14 @@ static const char *startup_source =
 " e461_1)"
 " rest-bodys_1)))"
 "(begin"
-"(let-values(((obs_144)"
+"(let-values(((obs_142)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_144"
+"(if obs_142"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_144"
+" obs_142"
 " 'splice"
 " spliced-bodys_0)))"
 "(void)))"
@@ -74810,27 +74891,27 @@ static const char *startup_source =
 " tail?_52"
 " spliced-bodys_0))))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'begin-for-syntax)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_145)"
+"(let-values(((obs_143)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_145"
+"(if obs_143"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_145"
+" obs_143"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_145"
+" obs_143"
 " 'prim-begin-for-syntax)"
 "(call-expand-observe"
-" obs_145"
+" obs_143"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -74846,52 +74927,52 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_146)"
+"(let-values(((obs_144)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_146"
+"(if obs_144"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_146"
+" obs_144"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_81"
 " begin-for-syntax464_0"
 " e465_0)"
-"(let-values(((s_820)"
+"(let-values(((s_822)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_86)"
-" s_820))"
+" s_822))"
 "(let-values(((begin-for-syntax464_1"
 " e465_1)"
-"(let-values(((s_821)"
-"(if(syntax?$1"
-" s_820)"
-"(syntax-e$1"
-" s_820)"
-" s_820)))"
-"(if(pair?"
-" s_821)"
-"(let-values(((begin-for-syntax466_0)"
-"(let-values(((s_822)"
-"(car"
-" s_821)))"
-" s_822))"
-"((e467_0)"
 "(let-values(((s_823)"
-"(cdr"
-" s_821)))"
-"(let-values(((s_824)"
 "(if(syntax?$1"
-" s_823)"
+" s_822)"
 "(syntax-e$1"
+" s_822)"
+" s_822)))"
+"(if(pair?"
 " s_823)"
+"(let-values(((begin-for-syntax466_0)"
+"(let-values(((s_824)"
+"(car"
 " s_823)))"
+" s_824))"
+"((e467_0)"
+"(let-values(((s_825)"
+"(cdr"
+" s_823)))"
+"(let-values(((s_826)"
+"(if(syntax?$1"
+" s_825)"
+"(syntax-e$1"
+" s_825)"
+" s_825)))"
 "(let-values(((flat-s_57)"
 "(to-syntax-list.1"
-" s_824)))"
+" s_826)))"
 "(if(not"
 " flat-s_57)"
 "(let-values()"
@@ -74918,14 +74999,14 @@ static const char *startup_source =
 "(add1"
 " phase_53))))"
 "(begin"
-"(let-values(((obs_147)"
+"(let-values(((obs_145)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_147"
+"(if obs_145"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_147"
+" obs_145"
 " 'next-group)))"
 "(void)))"
 "(namespace-run-available-modules!"
@@ -74942,14 +75023,14 @@ static const char *startup_source =
 "(namespace-visit-available-modules!"
 " m-ns_19"
 " phase_53)"
-"(let-values(((obs_148)"
+"(let-values(((obs_146)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_148"
+"(if obs_146"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_148"
+" obs_146"
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
@@ -75012,24 +75093,24 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1))))))))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'define-values)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_149)"
+"(let-values(((obs_147)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_149"
+"(if obs_147"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_149"
+" obs_147"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_149"
+" obs_147"
 " 'prim-define-values))))"
 "(void)))"
 "(values))))"
@@ -75037,52 +75118,52 @@ static const char *startup_source =
 " define-values468_0"
 " id469_0"
 " rhs470_0)"
-"(let-values(((s_825)"
+"(let-values(((s_827)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_87)"
-" s_825))"
+" s_827))"
 "(let-values(((define-values468_1"
 " id469_1"
 " rhs470_1)"
-"(let-values(((s_826)"
+"(let-values(((s_828)"
 "(if(syntax?$1"
-" s_825)"
+" s_827)"
 "(syntax-e$1"
-" s_825)"
-" s_825)))"
+" s_827)"
+" s_827)))"
 "(if(pair?"
-" s_826)"
+" s_828)"
 "(let-values(((define-values471_0)"
-"(let-values(((s_827)"
+"(let-values(((s_829)"
 "(car"
-" s_826)))"
-" s_827))"
+" s_828)))"
+" s_829))"
 "((id472_0"
 " rhs473_0)"
-"(let-values(((s_828)"
-"(cdr"
-" s_826)))"
-"(let-values(((s_829)"
-"(if(syntax?$1"
-" s_828)"
-"(syntax-e$1"
-" s_828)"
-" s_828)))"
-"(if(pair?"
-" s_829)"
-"(let-values(((id474_0)"
 "(let-values(((s_830)"
-"(car"
-" s_829)))"
+"(cdr"
+" s_828)))"
 "(let-values(((s_831)"
 "(if(syntax?$1"
 " s_830)"
 "(syntax-e$1"
 " s_830)"
 " s_830)))"
+"(if(pair?"
+" s_831)"
+"(let-values(((id474_0)"
+"(let-values(((s_832)"
+"(car"
+" s_831)))"
+"(let-values(((s_833)"
+"(if(syntax?$1"
+" s_832)"
+"(syntax-e$1"
+" s_832)"
+" s_832)))"
 "(let-values(((flat-s_58)"
 "(to-syntax-list.1"
-" s_831)))"
+" s_833)))"
 "(if(not"
 " flat-s_58)"
 "(let-values()"
@@ -75108,7 +75189,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_148)"
-"(let-values(((s_832)"
+"(let-values(((s_834)"
 "(unsafe-car"
 " lst_148))"
 "((rest_249)"
@@ -75121,23 +75202,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id487_0)"
 "(let-values()"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_404)"
 "(if(syntax?$1"
-" s_832)"
+" s_834)"
 "(symbol?"
 "(syntax-e$1"
-" s_832))"
+" s_834))"
 " #f)))"
-"(if or-part_403"
-" or-part_403"
+"(if or-part_404"
+" or-part_404"
 "(symbol?"
-" s_832)))"
-" s_832"
+" s_834)))"
+" s_834"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                             \"not an identifier\""
 " orig-s_87"
-" s_832)))))"
+" s_834)))))"
 "(cons"
 " id487_0"
 " id_149)))))"
@@ -75156,34 +75237,34 @@ static const char *startup_source =
 "(reverse$1"
 " id_146))))))))"
 "((rhs475_0)"
-"(let-values(((s_833)"
-"(cdr"
-" s_829)))"
-"(let-values(((s_834)"
-"(if(syntax?$1"
-" s_833)"
-"(syntax-e$1"
-" s_833)"
-" s_833)))"
-"(if(pair?"
-" s_834)"
-"(let-values(((rhs476_0)"
 "(let-values(((s_835)"
-"(car"
-" s_834)))"
-" s_835))"
-"(()"
-"(let-values(((s_836)"
 "(cdr"
-" s_834)))"
-"(let-values(((s_837)"
+" s_831)))"
+"(let-values(((s_836)"
 "(if(syntax?$1"
-" s_836)"
+" s_835)"
 "(syntax-e$1"
+" s_835)"
+" s_835)))"
+"(if(pair?"
 " s_836)"
+"(let-values(((rhs476_0)"
+"(let-values(((s_837)"
+"(car"
 " s_836)))"
+" s_837))"
+"(()"
+"(let-values(((s_838)"
+"(cdr"
+" s_836)))"
+"(let-values(((s_839)"
+"(if(syntax?$1"
+" s_838)"
+"(syntax-e$1"
+" s_838)"
+" s_838)))"
 "(if(null?"
-" s_837)"
+" s_839)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -75297,14 +75378,14 @@ static const char *startup_source =
 " requires+provides484_0"
 " syms485_0"
 " phase486_0))"
-"(let-values(((obs_150)"
+"(let-values(((obs_148)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_150"
+"(if obs_148"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_150"
+" obs_148"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
@@ -75324,27 +75405,27 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1))))))))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'define-syntaxes)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_151)"
+"(let-values(((obs_149)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_151"
+"(if obs_149"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_151"
+" obs_149"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_151"
+" obs_149"
 " 'prim-define-syntaxes)"
 "(call-expand-observe"
-" obs_151"
+" obs_149"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -75355,14 +75436,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_152)"
+"(let-values(((obs_150)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_152"
+"(if obs_150"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_152"
+" obs_150"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -75370,52 +75451,52 @@ static const char *startup_source =
 " define-syntaxes496_0"
 " id497_0"
 " rhs498_0)"
-"(let-values(((s_838)"
+"(let-values(((s_840)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_88)"
-" s_838))"
+" s_840))"
 "(let-values(((define-syntaxes496_1"
 " id497_1"
 " rhs498_1)"
-"(let-values(((s_839)"
+"(let-values(((s_841)"
 "(if(syntax?$1"
-" s_838)"
+" s_840)"
 "(syntax-e$1"
-" s_838)"
-" s_838)))"
+" s_840)"
+" s_840)))"
 "(if(pair?"
-" s_839)"
+" s_841)"
 "(let-values(((define-syntaxes499_0)"
-"(let-values(((s_840)"
+"(let-values(((s_842)"
 "(car"
-" s_839)))"
-" s_840))"
+" s_841)))"
+" s_842))"
 "((id500_0"
 " rhs501_0)"
-"(let-values(((s_841)"
-"(cdr"
-" s_839)))"
-"(let-values(((s_842)"
-"(if(syntax?$1"
-" s_841)"
-"(syntax-e$1"
-" s_841)"
-" s_841)))"
-"(if(pair?"
-" s_842)"
-"(let-values(((id502_0)"
 "(let-values(((s_843)"
-"(car"
-" s_842)))"
+"(cdr"
+" s_841)))"
 "(let-values(((s_844)"
 "(if(syntax?$1"
 " s_843)"
 "(syntax-e$1"
 " s_843)"
 " s_843)))"
+"(if(pair?"
+" s_844)"
+"(let-values(((id502_0)"
+"(let-values(((s_845)"
+"(car"
+" s_844)))"
+"(let-values(((s_846)"
+"(if(syntax?$1"
+" s_845)"
+"(syntax-e$1"
+" s_845)"
+" s_845)))"
 "(let-values(((flat-s_59)"
 "(to-syntax-list.1"
-" s_844)))"
+" s_846)))"
 "(if(not"
 " flat-s_59)"
 "(let-values()"
@@ -75441,7 +75522,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_431)"
-"(let-values(((s_845)"
+"(let-values(((s_847)"
 "(unsafe-car"
 " lst_431))"
 "((rest_250)"
@@ -75454,23 +75535,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id516_0)"
 "(let-values()"
-"(if(let-values(((or-part_404)"
+"(if(let-values(((or-part_405)"
 "(if(syntax?$1"
-" s_845)"
+" s_847)"
 "(symbol?"
 "(syntax-e$1"
-" s_845))"
+" s_847))"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
+"(if or-part_405"
+" or-part_405"
 "(symbol?"
-" s_845)))"
-" s_845"
+" s_847)))"
+" s_847"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                   \"not an identifier\""
 " orig-s_88"
-" s_845)))))"
+" s_847)))))"
 "(cons"
 " id516_0"
 " id_154)))))"
@@ -75489,34 +75570,34 @@ static const char *startup_source =
 "(reverse$1"
 " id_151))))))))"
 "((rhs503_0)"
-"(let-values(((s_846)"
-"(cdr"
-" s_842)))"
-"(let-values(((s_847)"
-"(if(syntax?$1"
-" s_846)"
-"(syntax-e$1"
-" s_846)"
-" s_846)))"
-"(if(pair?"
-" s_847)"
-"(let-values(((rhs504_0)"
-"(let-values(((s_564)"
-"(car"
-" s_847)))"
-" s_564))"
-"(()"
 "(let-values(((s_848)"
 "(cdr"
-" s_847)))"
+" s_844)))"
 "(let-values(((s_849)"
 "(if(syntax?$1"
 " s_848)"
 "(syntax-e$1"
 " s_848)"
 " s_848)))"
-"(if(null?"
+"(if(pair?"
 " s_849)"
+"(let-values(((rhs504_0)"
+"(let-values(((s_566)"
+"(car"
+" s_849)))"
+" s_566))"
+"(()"
+"(let-values(((s_850)"
+"(cdr"
+" s_849)))"
+"(let-values(((s_851)"
+"(if(syntax?$1"
+" s_850)"
+"(syntax-e$1"
+" s_850)"
+" s_850)))"
+"(if(null?"
+" s_851)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -75646,20 +75727,20 @@ static const char *startup_source =
 "((ids528_0)"
 " ids_46)"
 "((temp529_0)"
-"(let-values(((v_270)"
+"(let-values(((v_272)"
 " partial-body-ctx_1))"
-"(let-values(((the-struct_114)"
-" v_270))"
+"(let-values(((the-struct_115)"
+" v_272))"
 "(if(expand-context/outer?"
-" the-struct_114)"
+" the-struct_115)"
 "(let-values(((need-eventually-defined531_0)"
 " need-eventually-defined_2)"
 "((inner532_0)"
-"(let-values(((the-struct_115)"
+"(let-values(((the-struct_116)"
 "(root-expand-context/outer-inner"
-" v_270)))"
+" v_272)))"
 "(if(expand-context/inner?"
-" the-struct_115)"
+" the-struct_116)"
 "(let-values(((lifts533_0)"
 " #f)"
 "((module-lifts534_0)"
@@ -75668,89 +75749,91 @@ static const char *startup_source =
 " #f))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-counter"
-" the-struct_115)"
+" the-struct_116)"
 "(root-expand-context/inner-lift-key"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-to-parsed?"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-phase"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-namespace"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-just-once?"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-module-begin-k"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_115)"
+" the-struct_116)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_116)"
 "(expand-context/inner-stops"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_115)"
+" the-struct_116)"
 " lifts533_0"
 "(expand-context/inner-lift-envs"
-" the-struct_115)"
+" the-struct_116)"
 " module-lifts534_0"
 "(expand-context/inner-require-lifts"
-" the-struct_115)"
+" the-struct_116)"
 " to-module-lifts535_0"
 "(expand-context/inner-requires+provides"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-observer"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-for-serializable?"
-" the-struct_115)"
+" the-struct_116)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_115)))"
+" the-struct_116)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                                     \"expand-context/inner?\""
-" the-struct_115)))))"
+" the-struct_116)))))"
 "(expand-context/outer1.1"
 " inner532_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_114)"
+" the-struct_115)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_114)"
+" the-struct_115)"
 "(root-expand-context/outer-frame-id"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-context"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-env"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-scopes"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-binding-layer"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-reference-records"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-only-immediate?"
-" the-struct_114)"
+" the-struct_115)"
 " need-eventually-defined531_0"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_114)"
+" the-struct_115)"
 "(expand-context/outer-name"
-" the-struct_114)))"
+" the-struct_115)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                   \"expand-context/outer?\""
-" the-struct_114)))))"
+" the-struct_115)))))"
 "((temp530_0)"
 " #f))"
 "(expand+eval-for-syntaxes-binding109.1"
@@ -75854,14 +75937,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_153)"
+"(let-values(((obs_151)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_153"
+"(if obs_151"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_153"
+" obs_151"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
@@ -75900,24 +75983,24 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1)))))))))))))))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " '#%require)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_154)"
+"(let-values(((obs_152)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_154"
+"(if obs_152"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_154"
+" obs_152"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_154"
+" obs_152"
 " 'prim-require))))"
 "(void)))"
 "(values))))"
@@ -75928,38 +76011,38 @@ static const char *startup_source =
 "(let-values(((ok?_84"
 " #%require538_0"
 " req539_0)"
-"(let-values(((s_574)"
+"(let-values(((s_576)"
 " ready-body_0))"
 "(let-values(((orig-s_89)"
-" s_574))"
+" s_576))"
 "(let-values(((#%require538_1"
 " req539_1)"
-"(let-values(((s_850)"
-"(if(syntax?$1"
-" s_574)"
-"(syntax-e$1"
-" s_574)"
-" s_574)))"
-"(if(pair?"
-" s_850)"
-"(let-values(((#%require540_0)"
-"(let-values(((s_851)"
-"(car"
-" s_850)))"
-" s_851))"
-"((req541_0)"
 "(let-values(((s_852)"
-"(cdr"
-" s_850)))"
-"(let-values(((s_853)"
 "(if(syntax?$1"
-" s_852)"
+" 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(((s_854)"
+"(cdr"
+" s_852)))"
+"(let-values(((s_855)"
+"(if(syntax?$1"
+" s_854)"
+"(syntax-e$1"
+" s_854)"
+" s_854)))"
 "(let-values(((flat-s_60)"
 "(to-syntax-list.1"
-" s_853)))"
+" s_855)))"
 "(if(not"
 " flat-s_60)"
 "(let-values()"
@@ -76024,14 +76107,14 @@ static const char *startup_source =
 " m-ns545_0"
 " phase546_0"
 " requires+provides548_0))"
-"(let-values(((obs_155)"
+"(let-values(((obs_153)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_155"
+"(if obs_153"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_155"
+" obs_153"
 " 'exit-prim"
 " ready-body_0)))"
 "(void)))"
@@ -76041,7 +76124,7 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1)))))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " '#%provide)"
 "(let-values()"
 "(cons"
@@ -76050,7 +76133,7 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1)))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'module)"
 "(let-values()"
 "(let-values(((ready-body_1)"
@@ -76097,26 +76180,26 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1)))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " 'module*)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_156)"
+"(let-values(((obs_154)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_156"
+"(if obs_154"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_156"
+" obs_154"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_156"
+" obs_154"
 " 'prim-submodule*)"
 "(call-expand-observe"
-" obs_156"
+" obs_154"
 " 'exit-prim"
 " exp-body_7))))"
 "(void)))"
@@ -76126,44 +76209,44 @@ static const char *startup_source =
 " tail?_52"
 " rest-bodys_1))))"
 "(if(equal?"
-" tmp_66"
+" tmp_65"
 " '#%declare)"
 "(let-values()"
 "(let-values(((ok?_85"
 " #%declare559_0"
 " kw560_0)"
-"(let-values(((s_854)"
+"(let-values(((s_856)"
 " disarmed-exp-body_1))"
 "(let-values(((orig-s_90)"
-" s_854))"
+" s_856))"
 "(let-values(((#%declare559_1"
 " kw560_1)"
-"(let-values(((s_855)"
-"(if(syntax?$1"
-" s_854)"
-"(syntax-e$1"
-" s_854)"
-" s_854)))"
-"(if(pair?"
-" s_855)"
-"(let-values(((#%declare561_0)"
-"(let-values(((s_856)"
-"(car"
-" s_855)))"
-" s_856))"
-"((kw562_0)"
 "(let-values(((s_857)"
-"(cdr"
-" s_855)))"
-"(let-values(((s_858)"
 "(if(syntax?$1"
-" s_857)"
+" 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(((s_859)"
+"(cdr"
+" s_857)))"
+"(let-values(((s_860)"
+"(if(syntax?$1"
+" s_859)"
+"(syntax-e$1"
+" s_859)"
+" s_859)))"
 "(let-values(((flat-s_61)"
 "(to-syntax-list.1"
-" s_858)))"
+" s_860)))"
 "(if(not"
 " flat-s_61)"
 "(let-values()"
@@ -76309,7 +76392,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_159)"
+"(lambda(ids_47 rhs_23 phase_158)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
 "(let-values(((lst_440) ids_47))"
@@ -76344,7 +76427,7 @@ static const char *startup_source =
 "(let-values(((scoped-ids563_0) scoped-ids_0)"
 "((defined-syms564_0) defined-syms_13)"
 "((self565_0) self_34)"
-"((phase566_0) phase_159)"
+"((phase566_0) phase_158)"
 "((all-scopes-stx567_0) all-scopes-stx_6)"
 "((frame-id568_0) frame-id_17)"
 "((requires+provides569_0) requires+provides_8))"
@@ -76368,16 +76451,16 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_159) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_158) '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)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
-"(lambda(bodys_22 ctx_113)"
+"(lambda(bodys_22 ctx_115)"
 "(begin"
-"(let-values(((sc_39)(root-expand-context-post-expansion-scope ctx_113)))"
+"(let-values(((sc_39)(root-expand-context-post-expansion-scope ctx_115)))"
 "(if sc_39"
 "(reverse$1"
 "(let-values(((lst_442) bodys_22))"
@@ -76416,7 +76499,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons99"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys98_0))"
-"(let-values(((phase_160) phase84_0))"
+"(let-values(((phase_159) 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))"
@@ -76430,15 +76513,15 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_23)"
 "(let-values()"
-"(if(if tail?_53(not(zero? phase_160)) #f)"
+"(if(if tail?_53(not(zero? phase_159)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_157)(expand-context-observer body-ctx_7)))"
-"(if obs_157"
+"(let-values(((obs_155)(expand-context-observer body-ctx_7)))"
+"(if obs_155"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_157"
+" obs_155"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -76454,13 +76537,13 @@ static const char *startup_source =
 "(if(null? bodys_24)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_158)"
+"(let-values(((obs_156)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_158"
+"(if obs_156"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_158"
+" obs_156"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -76473,25 +76556,25 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_159)"
+"(let-values(((obs_157)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_159"
+"(if obs_157"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_159 'next)))"
+"(call-expand-observe obs_157 'next)))"
 "(void)))"
 "(values))))"
 "(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_405)"
+"(if(let-values(((or-part_406)"
 "(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)"
@@ -76508,86 +76591,86 @@ static const char *startup_source =
 "(let-values(((syms_26)"
 "(semi-parsed-define-values-syms"
 " body_24)))"
-"(let-values(((s_859)"
+"(let-values(((s_861)"
 "(semi-parsed-define-values-s"
 " body_24)))"
 "(let-values(((ok?_86"
 " define-values570_0"
 " _571_0"
 " _572_0)"
-"(let-values(((s_860)"
+"(let-values(((s_862)"
 "(syntax-disarm$1"
-" s_859)))"
+" s_861)))"
 "(if(if(not"
 "(expand-context-to-parsed?"
 " rhs-ctx_2))"
 " #t"
 " #f)"
 "(let-values(((orig-s_91)"
-" s_860))"
+" s_862))"
 "(let-values(((define-values570_1"
 " _571_1"
 " _572_1)"
-"(let-values(((s_861)"
+"(let-values(((s_863)"
 "(if(syntax?$1"
-" s_860)"
+" s_862)"
 "(syntax-e$1"
-" s_860)"
-" s_860)))"
+" s_862)"
+" s_862)))"
 "(if(pair?"
-" s_861)"
+" s_863)"
 "(let-values(((define-values573_0)"
-"(let-values(((s_862)"
+"(let-values(((s_864)"
 "(car"
-" s_861)))"
-" s_862))"
+" s_863)))"
+" s_864))"
 "((_574_0"
 " _575_0)"
-"(let-values(((s_863)"
-"(cdr"
-" s_861)))"
-"(let-values(((s_864)"
-"(if(syntax?$1"
-" s_863)"
-"(syntax-e$1"
-" s_863)"
-" s_863)))"
-"(if(pair?"
-" s_864)"
-"(let-values(((_576_0)"
 "(let-values(((s_865)"
-"(car"
-" s_864)))"
-" s_865))"
-"((_577_0)"
+"(cdr"
+" s_863)))"
 "(let-values(((s_866)"
-"(cdr"
-" s_864)))"
-"(let-values(((s_867)"
 "(if(syntax?$1"
-" s_866)"
+" s_865)"
 "(syntax-e$1"
-" s_866)"
-" s_866)))"
+" s_865)"
+" s_865)))"
 "(if(pair?"
-" s_867)"
-"(let-values(((_578_0)"
-"(let-values(((s_868)"
+" s_866)"
+"(let-values(((_576_0)"
+"(let-values(((s_867)"
 "(car"
-" s_867)))"
-" s_868))"
-"(()"
-"(let-values(((s_869)"
+" s_866)))"
+" s_867))"
+"((_577_0)"
+"(let-values(((s_868)"
 "(cdr"
-" s_867)))"
-"(let-values(((s_870)"
+" s_866)))"
+"(let-values(((s_869)"
 "(if(syntax?$1"
-" s_869)"
+" s_868)"
 "(syntax-e$1"
+" s_868)"
+" s_868)))"
+"(if(pair?"
 " s_869)"
+"(let-values(((_578_0)"
+"(let-values(((s_870)"
+"(car"
 " s_869)))"
+" s_870))"
+"(()"
+"(let-values(((s_871)"
+"(cdr"
+" s_869)))"
+"(let-values(((s_872)"
+"(if(syntax?$1"
+" s_871)"
+"(syntax-e$1"
+" s_871)"
+" s_871)))"
 "(if(null?"
-" s_870)"
+" s_872)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -76628,7 +76711,7 @@ static const char *startup_source =
 "(let-values(((rhs-ctx579_0)"
 " rhs-ctx_2)"
 "((s580_0)"
-" s_859)"
+" s_861)"
 "((temp581_0)"
 " #t))"
 "(keep-as-needed120.1"
@@ -76711,15 +76794,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((disarmed-body_0)"
 "(syntax-disarm$1 body_24)))"
-"(let-values(((tmp_67)"
+"(let-values(((tmp_66)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_160)))"
-"(if(if(equal? tmp_67 '#%require)"
+" phase_159)))"
+"(if(if(equal? tmp_66 '#%require)"
 " #t"
-"(if(equal? tmp_67 '#%provide)"
+"(if(equal? tmp_66 '#%provide)"
 " #t"
-"(equal? tmp_67 'module*)))"
+"(equal? tmp_66 'module*)))"
 "(let-values() body_24)"
 "(let-values()"
 "(let-values()"
@@ -76777,14 +76860,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_160)"
+"(let-values(((obs_158)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_160"
+"(if obs_158"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_160"
+" obs_158"
 " 'module-lift-loop"
 "(append"
 " lifted-requires_0"
@@ -76798,7 +76881,7 @@ static const char *startup_source =
 "(let-values(((exp-lifted-modules_0)"
 "(let-values(((lifted-modules592_0)"
 " lifted-modules_0)"
-"((phase593_0) phase_160)"
+"((phase593_0) phase_159)"
 "((self594_0) self_35)"
 "((body-ctx595_0)"
 " body-ctx_7)"
@@ -76825,14 +76908,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_111)"
+"(let-values(((obs_109)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_111"
+"(if obs_109"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_111"
+" obs_109"
 " 'next)))"
 "(void)))))"
 "(append"
@@ -76849,7 +76932,7 @@ static const char *startup_source =
 " partially-expanded-bodys_1)))))))))))))"
 "(define-values"
 "(check-defined-by-now)"
-"(lambda(need-eventually-defined_3 self_36 ctx_114 requires+provides_9)"
+"(lambda(need-eventually-defined_3 self_36 ctx_116 requires+provides_9)"
 "(begin"
 "(begin"
 "(let-values(((ht_169) need-eventually-defined_3))"
@@ -76860,7 +76943,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_193"
-"(let-values(((phase_161 l_89)(hash-iterate-key+value ht_169 i_193)))"
+"(let-values(((phase_160 l_89)(hash-iterate-key+value ht_169 i_193)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76896,7 +76979,7 @@ static const char *startup_source =
 "(let-values(((id600_0)"
 " id_158)"
 "((phase601_0)"
-" phase_161))"
+" phase_160))"
 "(resolve+shift30.1"
 " #f"
 " #f"
@@ -76932,7 +77015,7 @@ static const char *startup_source =
 " requires+provides_9"
 "(module-binding-sym"
 " b_97)"
-" phase_161)"
+" phase_160)"
 " #f)))"
 "(if(eq?"
 " bound-kind_0"
@@ -76955,21 +77038,21 @@ static const char *startup_source =
 "                                                                                                                                                                \"identifier treated as a variable, but later bound differently\")))"
 "(format"
 "                                                                                                                                                           \"\\n  at phase: ~a\""
-"(let-values(((tmp_68)"
-" phase_161))"
+"(let-values(((tmp_67)"
+" phase_160))"
 "(if(equal?"
-" tmp_68"
+" tmp_67"
 " 1)"
 "(let-values()"
 "                                                                                                                                                                 \"1; the transformer environment\")"
 "(let-values()"
-" phase_161)))))"
+" phase_160)))))"
 " id_158"
 " #f"
 " null"
 "(syntax-debug-info-string"
 " id_158"
-" ctx_114))))))))"
+" ctx_116))))))))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
@@ -77002,93 +77085,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_162) phase105_0))"
+"(let-values(((phase_161) phase105_0))"
 "(let-values(((self_37) self106_0))"
-"(let-values(((ctx_115) ctx107_0))"
+"(let-values(((ctx_117) ctx107_0))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_127)"
-"(lambda(bodys_25 phase_163)"
+"(lambda(bodys_25 phase_162)"
 "(begin"
 " 'loop"
 "(if(null? bodys_25)"
 "(let-values() null)"
-"(if(let-values(((or-part_407)(parsed?(car bodys_25))))"
-"(if or-part_407 or-part_407(expanded+parsed?(car bodys_25))))"
+"(if(let-values(((or-part_408)(parsed?(car bodys_25))))"
+"(if or-part_408 or-part_408(expanded+parsed?(car bodys_25))))"
 "(let-values()"
-"(cons(car bodys_25)(loop_127(cdr bodys_25) phase_163)))"
+"(cons(car bodys_25)(loop_127(cdr bodys_25) phase_162)))"
 "(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_163))))"
+"(add1 phase_162))))"
 "(cons"
-"(let-values(((the-struct_116)(car bodys_25)))"
-"(if(semi-parsed-begin-for-syntax? the-struct_116)"
+"(let-values(((the-struct_117)(car bodys_25)))"
+"(if(semi-parsed-begin-for-syntax? the-struct_117)"
 "(let-values(((body602_0) nested-bodys_2))"
 "(semi-parsed-begin-for-syntax3.1"
-"(semi-parsed-begin-for-syntax-s the-struct_116)"
+"(semi-parsed-begin-for-syntax-s the-struct_117)"
 " body602_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
-" the-struct_116)))"
-"(loop_127(cdr bodys_25) phase_163))))"
+" the-struct_117)))"
+"(loop_127(cdr bodys_25) phase_162))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_25))))"
-"(let-values(((tmp_69)"
-"(core-form-sym disarmed-body_1 phase_163)))"
-"(if(equal? tmp_69 '#%provide)"
+"(let-values(((tmp_68)"
+"(core-form-sym disarmed-body_1 phase_162)))"
+"(if(equal? tmp_68 '#%provide)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_161)"
+"(let-values(((obs_159)"
 "(expand-context-observer"
-" ctx_115)))"
-"(if obs_161"
+" ctx_117)))"
+"(if obs_159"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_161"
+" obs_159"
 " 'enter-prim"
 "(car bodys_25))"
 "(call-expand-observe"
-" obs_161"
+" obs_159"
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
 "(let-values(((ok?_87 #%provide603_0 spec604_0)"
-"(let-values(((s_871) disarmed-body_1))"
-"(let-values(((orig-s_92) s_871))"
+"(let-values(((s_873) disarmed-body_1))"
+"(let-values(((orig-s_92) s_873))"
 "(let-values(((#%provide603_1"
 " spec604_1)"
-"(let-values(((s_872)"
-"(if(syntax?$1"
-" s_871)"
-"(syntax-e$1"
-" s_871)"
-" s_871)))"
-"(if(pair? s_872)"
-"(let-values(((#%provide605_0)"
-"(let-values(((s_873)"
-"(car"
-" s_872)))"
-" s_873))"
-"((spec606_0)"
-"(let-values(((s_665)"
-"(cdr"
-" s_872)))"
 "(let-values(((s_874)"
 "(if(syntax?$1"
-" s_665)"
+" s_873)"
 "(syntax-e$1"
-" s_665)"
-" s_665)))"
+" s_873)"
+" s_873)))"
+"(if(pair? s_874)"
+"(let-values(((#%provide605_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)))"
 "(let-values(((flat-s_62)"
 "(to-syntax-list.1"
-" s_874)))"
+" s_876)))"
 "(if(not"
 " flat-s_62)"
 "(let-values()"
@@ -77115,117 +77198,119 @@ static const char *startup_source =
 "(car bodys_25)"
 " requires+provides_10"
 " self_37"
-" phase_163"
-"(let-values(((v_271) ctx_115))"
-"(let-values(((the-struct_117)"
-" v_271))"
+" phase_162"
+"(let-values(((v_273) ctx_117))"
+"(let-values(((the-struct_118)"
+" v_273))"
 "(if(expand-context/outer?"
-" the-struct_117)"
+" the-struct_118)"
 "(let-values(((context607_0)"
 " 'top-level)"
 "((inner608_0)"
-"(let-values(((the-struct_118)"
+"(let-values(((the-struct_119)"
 "(root-expand-context/outer-inner"
-" v_271)))"
+" v_273)))"
 "(if(expand-context/inner?"
-" the-struct_118)"
+" the-struct_119)"
 "(let-values(((phase609_0)"
-" phase_163)"
+" phase_162)"
 "((namespace610_0)"
 "(namespace->namespace-at-phase"
 " m-ns_20"
-" phase_163))"
+" phase_162))"
 "((requires+provides611_0)"
 " requires+provides_10)"
 "((declared-submodule-names612_0)"
 " declared-submodule-names_6))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-counter"
-" the-struct_118)"
+" the-struct_119)"
 "(root-expand-context/inner-lift-key"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-to-parsed?"
-" the-struct_118)"
+" the-struct_119)"
 " phase609_0"
 " namespace610_0"
 "(expand-context/inner-just-once?"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-module-begin-k"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_118)"
+" the-struct_119)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_119)"
 "(expand-context/inner-stops"
-" the-struct_118)"
+" the-struct_119)"
 " declared-submodule-names612_0"
 "(expand-context/inner-lifts"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-lift-envs"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-module-lifts"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-require-lifts"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_118)"
+" the-struct_119)"
 " requires+provides611_0"
 "(expand-context/inner-observer"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-for-serializable?"
-" the-struct_118)"
+" the-struct_119)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_118)))"
+" the-struct_119)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                          \"expand-context/inner?\""
-" the-struct_118)))))"
+" the-struct_119)))))"
 "(expand-context/outer1.1"
 " inner608_0"
 "(root-expand-context/outer-post-expansion-scope"
-" the-struct_117)"
+" the-struct_118)"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_117)"
+" the-struct_118)"
 "(root-expand-context/outer-frame-id"
-" the-struct_117)"
+" the-struct_118)"
 " context607_0"
 "(expand-context/outer-env"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-scopes"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-binding-layer"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-reference-records"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-only-immediate?"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_117)"
+" the-struct_118)"
 "(expand-context/outer-name"
-" the-struct_117)))"
+" the-struct_118)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                        \"expand-context/outer?\""
-" the-struct_117)))))))"
-"(if(expand-context-to-parsed? ctx_115)"
+" the-struct_118)))))))"
+"(if(expand-context-to-parsed? ctx_117)"
 "(let-values()"
-"(loop_127(cdr bodys_25) phase_163))"
+"(loop_127(cdr bodys_25) phase_162))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
@@ -77242,14 +77327,14 @@ static const char *startup_source =
 " temp613_0"
 " temp614_0)))))"
 "(begin"
-"(let-values(((obs_162)"
+"(let-values(((obs_160)"
 "(expand-context-observer"
-" ctx_115)))"
-"(if obs_162"
+" ctx_117)))"
+"(if obs_160"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_162"
+" obs_160"
 " 'exit-prim"
 " new-s_10)))"
 "(void)))"
@@ -77257,14 +77342,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_127"
 "(cdr bodys_25)"
-" phase_163))))))))))"
+" phase_162))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_25)"
-"(loop_127(cdr bodys_25) phase_163))))))))))))))"
+"(loop_127(cdr bodys_25) phase_162))))))))))))))"
 " loop_127)"
 " expression-expanded-bodys_1"
-" phase_162)))))))))))))"
+" phase_161)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion139.1)"
 "(lambda(ctx125_0"
@@ -77288,7 +77373,7 @@ static const char *startup_source =
 "(let-values(((self_38) self122_0))"
 "(let-values(((enclosing-self_3) enclosing123_0))"
 "(let-values(((root-ctx_7) root-ctx124_0))"
-"(let-values(((ctx_116) ctx125_0))"
+"(let-values(((ctx_118) ctx125_0))"
 "(let-values(((modules-being-compiled_6) modules-being-compiled126_0))"
 "(let-values(((compiled-module-box_1) fill127_0))"
 "(let-values()"
@@ -77309,8 +77394,8 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_408) enclosing-self_3))"
-"(if or-part_408 or-part_408 self_38)))))"
+"(let-values(((or-part_409) enclosing-self_3))"
+"(if or-part_409 or-part_409 self_38)))))"
 "(let-values(((compiled-module_0)"
 "(let-values(((parsed-mod615_0) parsed-mod_0)"
 "((temp616_0)"
@@ -77334,7 +77419,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f)))"
-"((temp617_0)(expand-context-for-serializable? ctx_116))"
+"((temp617_0)(expand-context-for-serializable? ctx_118))"
 "((modules-being-compiled618_0) modules-being-compiled_6)"
 "((temp619_0) #f))"
 "(compile-module13.1"
@@ -77376,16 +77461,16 @@ static const char *startup_source =
 " compiled-module623_0)))))))))))))))))))))))))"
 "(define-values"
 "(attach-root-expand-context-properties)"
-"(lambda(s_875 root-ctx_8 orig-self_1 new-self_2)"
+"(lambda(s_877 root-ctx_8 orig-self_1 new-self_2)"
 "(begin"
-"(let-values(((s_876)"
-"(syntax-property$1 s_875 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
-"(let-values(((s_877)"
+"(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_876"
+" s_878"
 " 'module-body-inside-context"
 "(add-scope empty-syntax(root-expand-context-post-expansion-scope root-ctx_8)))))"
-" s_877)))))"
+" s_879)))))"
 "(define-values"
 "(expand-post-submodules165.1)"
 "(lambda(all-scopes-s147_0"
@@ -77404,7 +77489,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_164) phase143_1))"
+"(let-values(((phase_163) 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))"
@@ -77416,7 +77501,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx152_0))"
 "(let-values()"
 "((letrec-values(((loop_128)"
-"(lambda(bodys_26 phase_165)"
+"(lambda(bodys_26 phase_164)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
@@ -77430,37 +77515,37 @@ static const char *startup_source =
 "(semi-parsed-begin-for-syntax-s"
 " body_25)))"
 "(let-values(((ok?_88 begin-for-syntax625_0 _626_0)"
-"(let-values(((s_878)"
+"(let-values(((s_880)"
 "(syntax-disarm$1"
 " body-s_0)))"
-"(let-values(((orig-s_93) s_878))"
+"(let-values(((orig-s_93) s_880))"
 "(let-values(((begin-for-syntax625_1"
 " _626_1)"
-"(let-values(((s_879)"
-"(if(syntax?$1"
-" s_878)"
-"(syntax-e$1"
-" s_878)"
-" s_878)))"
-"(if(pair? s_879)"
-"(let-values(((begin-for-syntax627_0)"
-"(let-values(((s_880)"
-"(car"
-" s_879)))"
-" s_880))"
-"((_628_0)"
 "(let-values(((s_881)"
-"(cdr"
-" s_879)))"
-"(let-values(((s_882)"
 "(if(syntax?$1"
-" s_881)"
+" s_880)"
 "(syntax-e$1"
-" s_881)"
+" s_880)"
+" s_880)))"
+"(if(pair? s_881)"
+"(let-values(((begin-for-syntax627_0)"
+"(let-values(((s_882)"
+"(car"
 " s_881)))"
+" s_882))"
+"((_628_0)"
+"(let-values(((s_883)"
+"(cdr"
+" s_881)))"
+"(let-values(((s_884)"
+"(if(syntax?$1"
+" s_883)"
+"(syntax-e$1"
+" s_883)"
+" s_883)))"
 "(let-values(((flat-s_63)"
 "(to-syntax-list.1"
-" s_882)))"
+" s_884)))"
 "(if(not"
 " flat-s_63)"
 "(let-values()"
@@ -77499,7 +77584,7 @@ static const char *startup_source =
 "(loop_128"
 "(semi-parsed-begin-for-syntax-body"
 " body_25)"
-"(add1 phase_165))))"
+"(add1 phase_164))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -77522,21 +77607,21 @@ static const char *startup_source =
 " rebuild-body-s631_0"
 " temp632_0))"
 " parsed-bfs_0))"
-"(loop_128 rest-bodys_3 phase_165))))))))"
-"(if(let-values(((or-part_409)(parsed? body_25)))"
-"(if or-part_409"
-" or-part_409"
+"(loop_128 rest-bodys_3 phase_164))))))))"
+"(if(let-values(((or-part_410)(parsed? body_25)))"
+"(if or-part_410"
+" or-part_410"
 "(expanded+parsed? body_25)))"
 "(let-values()"
-"(cons body_25(loop_128 rest-bodys_3 phase_165)))"
+"(cons body_25(loop_128 rest-bodys_3 phase_164)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_25)))"
-"(let-values(((tmp_70)"
+"(let-values(((tmp_69)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_165)))"
-"(if(equal? tmp_70 'module*)"
+" phase_164)))"
+"(if(equal? tmp_69 'module*)"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -77551,60 +77636,60 @@ static const char *startup_source =
 " module*633_0"
 " name634_0"
 " _635_0)"
-"(let-values(((s_703)"
-" disarmed-body_2))"
-"(if(let-values(((s_883)"
-"(if(syntax?$1"
-" s_703)"
-"(syntax-e$1"
-" s_703)"
-" s_703)))"
-"(if(pair? s_883)"
-"(if(let-values(((s_884)"
-"(car"
-" s_883)))"
-" #t)"
-"(let-values(((s_885)"
-"(cdr"
-" s_883)))"
-"(let-values(((s_704)"
-"(if(syntax?$1"
-" s_885)"
-"(syntax-e$1"
-" s_885)"
-" s_885)))"
-"(if(pair?"
-" s_704)"
-"(if(let-values(((s_886)"
-"(car"
-" s_704)))"
-" #t)"
 "(let-values(((s_705)"
-"(cdr"
-" s_704)))"
-"(let-values(((s_887)"
+" disarmed-body_2))"
+"(if(let-values(((s_885)"
 "(if(syntax?$1"
 " s_705)"
 "(syntax-e$1"
 " s_705)"
 " s_705)))"
-"(if(pair?"
-" s_887)"
-"(if(let-values(((s_888)"
+"(if(pair? s_885)"
+"(if(let-values(((s_886)"
 "(car"
-" s_887)))"
+" s_885)))"
+" #t)"
+"(let-values(((s_887)"
+"(cdr"
+" s_885)))"
 "(let-values(((s_706)"
 "(if(syntax?$1"
-" s_888)"
+" s_887)"
 "(syntax-e$1"
-" s_888)"
-" s_888)))"
-"(eq?"
-" #f"
+" s_887)"
+" s_887)))"
+"(if(pair?"
+" s_706)"
+"(if(let-values(((s_888)"
+"(car"
+" s_706)))"
+" #t)"
+"(let-values(((s_707)"
+"(cdr"
 " s_706)))"
 "(let-values(((s_889)"
+"(if(syntax?$1"
+" s_707)"
+"(syntax-e$1"
+" s_707)"
+" s_707)))"
+"(if(pair?"
+" s_889)"
+"(if(let-values(((s_890)"
+"(car"
+" s_889)))"
+"(let-values(((s_708)"
+"(if(syntax?$1"
+" s_890)"
+"(syntax-e$1"
+" s_890)"
+" s_890)))"
+"(eq?"
+" #f"
+" s_708)))"
+"(let-values(((s_891)"
 "(cdr"
-" s_887)))"
+" s_889)))"
 " #t)"
 " #f)"
 " #f)))"
@@ -77616,59 +77701,59 @@ static const char *startup_source =
 "(let-values(((module*633_1"
 " name634_1"
 " _635_1)"
-"(let-values(((s_890)"
+"(let-values(((s_892)"
 "(if(syntax?$1"
-" s_703)"
+" s_705)"
 "(syntax-e$1"
-" s_703)"
-" s_703)))"
+" s_705)"
+" s_705)))"
 "(let-values(((module*636_0)"
-"(let-values(((s_891)"
+"(let-values(((s_893)"
 "(car"
-" s_890)))"
-" s_891))"
+" s_892)))"
+" s_893))"
 "((name637_0"
 " _638_0)"
-"(let-values(((s_892)"
-"(cdr"
-" s_890)))"
-"(let-values(((s_893)"
-"(if(syntax?$1"
-" s_892)"
-"(syntax-e$1"
-" s_892)"
-" s_892)))"
-"(let-values(((name639_0)"
 "(let-values(((s_894)"
-"(car"
-" s_893)))"
-" s_894))"
-"((_640_0)"
-"(let-values(((s_895)"
 "(cdr"
-" s_893)))"
-"(let-values(((s_896)"
+" s_892)))"
+"(let-values(((s_895)"
 "(if(syntax?$1"
-" s_895)"
+" s_894)"
 "(syntax-e$1"
-" s_895)"
-" s_895)))"
-"(let-values((()"
-"(let-values(((s_897)"
+" s_894)"
+" s_894)))"
+"(let-values(((name639_0)"
+"(let-values(((s_896)"
 "(car"
-" s_896)))"
+" s_895)))"
+" s_896))"
+"((_640_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_899)"
+"(let-values(((s_901)"
 "(cdr"
-" s_896)))"
-" s_899)))"
+" s_898)))"
+" s_901)))"
 "(values"
 " _641_0))))))"
 "(values"
@@ -77694,7 +77779,7 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_165)))"
+" phase_164)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
@@ -77748,27 +77833,27 @@ static const char *startup_source =
 "(if(expanded+parsed?"
 " submod_4)"
 "(let-values()"
-"(let-values(((the-struct_119)"
+"(let-values(((the-struct_120)"
 " submod_4))"
 "(if(expanded+parsed?"
-" the-struct_119)"
+" the-struct_120)"
 "(let-values(((s654_0)"
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_165)))"
+" phase_164)))"
 "(expanded+parsed1.1"
 " s654_0"
 "(expanded+parsed-parsed"
-" the-struct_119)))"
+" the-struct_120)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                     \"expanded+parsed?\""
-" the-struct_119))))"
+" the-struct_120))))"
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_165))))))))"
+" phase_164))))))))"
 "(let-values()"
 "(let-values(((ready-body655_0)"
 " ready-body_2)"
@@ -77807,33 +77892,33 @@ static const char *startup_source =
 " submod_3"
 "(loop_128"
 " rest-bodys_3"
-" phase_165)))))))"
+" phase_164)))))))"
 "(let-values()"
 "(cons"
 " body_25"
 "(loop_128"
 " rest-bodys_3"
-" phase_165)))))))))))))))))"
+" phase_164)))))))))))))))))"
 " loop_128)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_164)))))))))))))))))"
+" phase_163)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
-"(lambda(ctx_117)"
+"(lambda(ctx_119)"
 "(begin"
 "(free-id-set-member?"
-"(expand-context-stops ctx_117)"
-"(expand-context-phase ctx_117)"
-"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_117))))))"
+"(expand-context-stops ctx_119)"
+"(expand-context-phase ctx_119)"
+"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_119))))))"
 "(define-values"
 "(check-ids-unbound173.1)"
 "(lambda(in168_0 ids170_0 phase171_1 requires+provides172_0)"
 "(begin"
 " 'check-ids-unbound173"
 "(let-values(((ids_49) ids170_0))"
-"(let-values(((phase_166) phase171_1))"
+"(let-values(((phase_165) phase171_1))"
 "(let-values(((requires+provides_13) requires+provides172_0))"
-"(let-values(((s_719) in168_0))"
+"(let-values(((s_721) in168_0))"
 "(let-values()"
 "(begin"
 "(let-values(((lst_446) ids_49))"
@@ -77858,8 +77943,8 @@ static const char *startup_source =
 " requires+provides_13)"
 "((id664_0) id_159)"
 "((phase665_0)"
-" phase_166)"
-"((s666_0) s_719)"
+" phase_165)"
+"((s666_0) s_721)"
 "((temp667_0) 'module))"
 "(check-not-defined95.1"
 " #f"
@@ -77886,7 +77971,7 @@ static const char *startup_source =
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_27 phase_167 m-ns_22 self_40 ctx_118)"
+"(lambda(bodys_27 phase_166 m-ns_22 self_40 ctx_120)"
 "(begin"
 "(begin"
 "(let-values(((lst_448) bodys_27))"
@@ -77920,9 +78005,9 @@ static const char *startup_source =
 " ids_50"
 "(parsed-define-values-rhs"
 " p_89)"
-" phase_167"
+" phase_166"
 " m-ns_22"
-" ctx_118)))"
+" ctx_120)))"
 "(begin"
 "(let-values(((lst_450) ids_50)"
 "((lst_451)"
@@ -77985,7 +78070,7 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_22"
-" phase_167"
+" phase_166"
 " sym_110"
 " val_87))"
 "(values)))))"
@@ -78003,19 +78088,19 @@ static const char *startup_source =
 " lst_451"
 " lst_452)))"
 "(void)))))"
-"(if(let-values(((or-part_410)"
-"(parsed-define-syntaxes?"
-" p_89)))"
-"(if or-part_410"
-" or-part_410"
-"(semi-parsed-begin-for-syntax?"
-" p_89)))"
-"(let-values()(void))"
 "(if(let-values(((or-part_411)"
-"(parsed-#%declare?"
+"(parsed-define-syntaxes?"
 " p_89)))"
 "(if or-part_411"
 " or-part_411"
+"(semi-parsed-begin-for-syntax?"
+" p_89)))"
+"(let-values()(void))"
+"(if(let-values(((or-part_412)"
+"(parsed-#%declare?"
+" p_89)))"
+"(if or-part_412"
+" or-part_412"
 "(syntax?$1 p_89)))"
 "(let-values()(void))"
 "(let-values()"
@@ -78026,7 +78111,7 @@ static const char *startup_source =
 " #f"
 " parameterization-key)"
 " current-expand-context"
-" ctx_118"
+" ctx_120"
 " 1/current-namespace"
 " m-ns_22)"
 "(let-values()"
@@ -78036,7 +78121,7 @@ static const char *startup_source =
 "(let-values(((m-ns668_0)"
 " m-ns_22)"
 "((phase669_0)"
-" phase_167))"
+" phase_166))"
 "(make-compile-context14.1"
 " #f"
 " #f"
@@ -78078,9 +78163,9 @@ static const char *startup_source =
 " ctx196_0)"
 "(begin"
 " 'expand-submodule197"
-"(let-values(((s_900) s194_0))"
+"(let-values(((s_902) s194_0))"
 "(let-values(((self_41) self195_0))"
-"(let-values(((ctx_119) ctx196_0))"
+"(let-values(((ctx_121) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
 "(let-values(((keep-enclosing-scope-at-phase_2)"
 "(if keep-enclosing-scope-at-phase186_0 keep-enclosing-scope-at-phase177_0 #f)))"
@@ -78102,47 +78187,47 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_163)(expand-context-observer ctx_119)))"
-"(if obs_163"
+"(let-values(((obs_161)(expand-context-observer ctx_121)))"
+"(if obs_161"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_163 'enter-prim s_900)"
+"(call-expand-observe obs_161 'enter-prim s_902)"
 "(call-expand-observe"
-" obs_163"
+" obs_161"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
 "(let-values(((ok?_90 module670_0 name671_0 _672_0)"
-"(let-values(((s_756) s_900))"
-"(let-values(((orig-s_94) s_756))"
+"(let-values(((s_758) s_902))"
+"(let-values(((orig-s_94) s_758))"
 "(let-values(((module670_1 name671_1 _672_1)"
-"(let-values(((s_901)"
-"(if(syntax?$1 s_756)"
-"(syntax-e$1 s_756)"
-" s_756)))"
-"(if(pair? s_901)"
-"(let-values(((module673_0)"
-"(let-values(((s_761)(car s_901)))"
-" s_761))"
-"((name674_0 _675_0)"
-"(let-values(((s_762)(cdr s_901)))"
-"(let-values(((s_902)"
-"(if(syntax?$1"
-" s_762)"
-"(syntax-e$1 s_762)"
-" s_762)))"
-"(if(pair? s_902)"
-"(let-values(((name676_0)"
 "(let-values(((s_903)"
-"(car"
-" s_902)))"
-" s_903))"
-"((_677_0)"
+"(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)"
-"(cdr"
-" s_902)))"
+"(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"
 " s_904)))"
+" s_905))"
+"((_677_0)"
+"(let-values(((s_906)"
+"(cdr"
+" s_904)))"
+" s_906)))"
 "(values name676_0 _677_0))"
 "(raise-syntax-error$1"
 " #f"
@@ -78154,137 +78239,139 @@ static const char *startup_source =
 "                                                                       \"bad syntax\""
 " orig-s_94)))))"
 "(values #t module670_1 name671_1 _672_1))))))"
-"(let-values(((name_81)(syntax-e$1 name671_0)))"
+"(let-values(((name_80)(syntax-e$1 name671_0)))"
 "(let-values((()"
 "(begin"
-"(if(hash-ref declared-submodule-names_8 name_81 #f)"
+"(if(hash-ref declared-submodule-names_8 name_80 #f)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"submodule already declared with the same name\""
-" s_900"
-" name_81))"
+" s_902"
+" name_80))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(hash-set!"
 " declared-submodule-names_8"
-" name_81"
+" name_80"
 "(syntax-e$1 module670_0))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_164)(expand-context-observer ctx_119)))"
-"(if obs_164"
+"(let-values(((obs_162)(expand-context-observer ctx_121)))"
+"(if obs_162"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_164 'enter-prim s_900)))"
+"(call-expand-observe obs_162 'enter-prim s_902)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
-"(let-values(((s678_0) s_900)"
+"(let-values(((s678_0) s_902)"
 "((temp679_0)"
-"(let-values(((v_272) ctx_119))"
-"(let-values(((the-struct_120) v_272))"
-"(if(expand-context/outer? the-struct_120)"
+"(let-values(((v_274) ctx_121))"
+"(let-values(((the-struct_121) v_274))"
+"(if(expand-context/outer? the-struct_121)"
 "(let-values(((context688_0) 'module)"
 "((post-expansion-scope689_0)"
 " #f)"
 "((inner690_0)"
-"(let-values(((the-struct_121)"
+"(let-values(((the-struct_122)"
 "(root-expand-context/outer-inner"
-" v_272)))"
+" v_274)))"
 "(if(expand-context/inner?"
-" the-struct_121)"
+" the-struct_122)"
 "(let-values(((stops691_0)"
 " empty-free-id-set))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-module-scopes"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-all-scopes-stx"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-defined-syms"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-counter"
-" the-struct_121)"
+" the-struct_122)"
 "(root-expand-context/inner-lift-key"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-to-parsed?"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-phase"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-namespace"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-just-once?"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-module-begin-k"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-allow-unbound?"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-in-local-expand?"
-" the-struct_121)"
+" the-struct_122)"
+"(expand-context/inner-keep-#%expression?"
+" the-struct_122)"
 " stops691_0"
 "(expand-context/inner-declared-submodule-names"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-lifts"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-lift-envs"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-module-lifts"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-require-lifts"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-to-module-lifts"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-requires+provides"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-observer"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-for-serializable?"
-" the-struct_121)"
+" the-struct_122)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_121)))"
+" the-struct_122)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                 \"expand-context/inner?\""
-" the-struct_121)))))"
+" the-struct_122)))))"
 "(expand-context/outer1.1"
 " inner690_0"
 " post-expansion-scope689_0"
 "(root-expand-context/outer-use-site-scopes"
-" the-struct_120)"
+" the-struct_121)"
 "(root-expand-context/outer-frame-id"
-" the-struct_120)"
+" the-struct_121)"
 " context688_0"
 "(expand-context/outer-env"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-post-expansion-scope-action"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-scopes"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-def-ctx-scopes"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-binding-layer"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-reference-records"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-only-immediate?"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-need-eventually-defined"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-current-introduction-scopes"
-" the-struct_120)"
+" the-struct_121)"
 "(expand-context/outer-name"
-" the-struct_120)))"
+" the-struct_121)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                               \"expand-context/outer?\""
-" the-struct_120)))))"
+" the-struct_121)))))"
 "((self680_0) self_41)"
 "((temp681_0) #t)"
 "((keep-enclosing-scope-at-phase682_0)"
@@ -78317,18 +78404,18 @@ static const char *startup_source =
 " self680_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_165)"
-"(expand-context-observer ctx_119)))"
-"(if obs_165"
+"(let-values(((obs_163)"
+"(expand-context-observer ctx_121)))"
+"(if obs_163"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_165"
+" obs_163"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))"
 "(values))))"
-"(let-values(((ns_132)(expand-context-namespace ctx_119)))"
+"(let-values(((ns_131)(expand-context-namespace ctx_121)))"
 "(let-values(((module-name_3)(1/module-path-index-resolve self_41)))"
 "(let-values(((root-module-name_1)"
 "(resolved-module-path-root-name module-name_3)))"
@@ -78338,7 +78425,7 @@ static const char *startup_source =
 "(expanded+parsed-parsed submod_5)"
 " submod_5))"
 "((temp693_0)"
-"(let-values(((ns698_0) ns_132)"
+"(let-values(((ns698_0) ns_131)"
 "((self699_0) self_41)"
 "((temp700_0)"
 "(1/resolved-module-path-name"
@@ -78359,7 +78446,7 @@ static const char *startup_source =
 "((temp694_0) #t)"
 "((temp695_0)"
 "(expand-context-for-serializable?"
-" ctx_119))"
+" ctx_121))"
 "((modules-being-compiled696_0)"
 " modules-being-compiled_8)"
 "((temp697_0) #f))"
@@ -78379,14 +78466,14 @@ static const char *startup_source =
 "(begin"
 "(hash-set!"
 " compiled-submodules_5"
-" name_81"
+" name_80"
 "(cons is-star?_0 compiled-submodule_0))"
 "(with-continuation-mark"
 " parameterization-key"
 "(extend-parameterization"
 "(continuation-mark-set-first #f parameterization-key)"
 " 1/current-namespace"
-" ns_132"
+" ns_131"
 " 1/current-module-declare-name"
 "(1/make-resolved-module-path root-module-name_1))"
 "(let-values()"
@@ -78404,13 +78491,13 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_126)"
-"(expand-context-observer ctx_119)))"
-"(if obs_126"
+"(let-values(((obs_124)"
+"(expand-context-observer ctx_121)))"
+"(if obs_124"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_126"
+" obs_124"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))))"
@@ -78418,67 +78505,67 @@ static const char *startup_source =
 "(let-values() submod_5)"
 "(if(expanded+parsed? submod_5)"
 "(let-values()"
-"(let-values(((the-struct_122) submod_5))"
-"(if(expanded+parsed? the-struct_122)"
+"(let-values(((the-struct_123) submod_5))"
+"(if(expanded+parsed? the-struct_123)"
 "(let-values(((parsed703_0)"
-"(let-values(((the-struct_123)"
+"(let-values(((the-struct_124)"
 "(expanded+parsed-parsed"
 " submod_5)))"
-"(if(parsed-module? the-struct_123)"
+"(if(parsed-module? the-struct_124)"
 "(let-values(((star?704_0) #t))"
 "(parsed-module25.1"
-"(parsed-s the-struct_123)"
+"(parsed-s the-struct_124)"
 " star?704_0"
 "(parsed-module-name-id"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-self"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-requires"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-provides"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-root-ctx-simple?"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-encoded-root-ctx"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-body"
-" the-struct_123)"
+" the-struct_124)"
 "(parsed-module-compiled-module"
-" the-struct_123)"
-"(parsed-module-compiled-submodules"
-" the-struct_123)))"
-"(raise-argument-error"
-" 'struct-copy"
-"                                                                                       \"parsed-module?\""
-" the-struct_123)))))"
-"(expanded+parsed1.1"
-"(expanded+parsed-s the-struct_122)"
-" parsed703_0))"
-"(raise-argument-error"
-" 'struct-copy"
-"                                                                     \"expanded+parsed?\""
-" the-struct_122))))"
-"(let-values()"
-"(let-values(((the-struct_124) submod_5))"
-"(if(parsed-module? the-struct_124)"
-"(let-values(((star?705_0) #t))"
-"(parsed-module25.1"
-"(parsed-s the-struct_124)"
-" star?705_0"
-"(parsed-module-name-id the-struct_124)"
-"(parsed-module-self the-struct_124)"
-"(parsed-module-requires the-struct_124)"
-"(parsed-module-provides the-struct_124)"
-"(parsed-module-root-ctx-simple? the-struct_124)"
-"(parsed-module-encoded-root-ctx the-struct_124)"
-"(parsed-module-body the-struct_124)"
-"(parsed-module-compiled-module the-struct_124)"
+" the-struct_124)"
 "(parsed-module-compiled-submodules"
 " the-struct_124)))"
 "(raise-argument-error"
 " 'struct-copy"
+"                                                                                       \"parsed-module?\""
+" the-struct_124)))))"
+"(expanded+parsed1.1"
+"(expanded+parsed-s the-struct_123)"
+" parsed703_0))"
+"(raise-argument-error"
+" 'struct-copy"
+"                                                                     \"expanded+parsed?\""
+" the-struct_123))))"
+"(let-values()"
+"(let-values(((the-struct_125) submod_5))"
+"(if(parsed-module? the-struct_125)"
+"(let-values(((star?705_0) #t))"
+"(parsed-module25.1"
+"(parsed-s the-struct_125)"
+" star?705_0"
+"(parsed-module-name-id the-struct_125)"
+"(parsed-module-self the-struct_125)"
+"(parsed-module-requires the-struct_125)"
+"(parsed-module-provides the-struct_125)"
+"(parsed-module-root-ctx-simple? the-struct_125)"
+"(parsed-module-encoded-root-ctx the-struct_125)"
+"(parsed-module-body the-struct_125)"
+"(parsed-module-compiled-module the-struct_125)"
+"(parsed-module-compiled-submodules"
+" the-struct_125)))"
+"(raise-argument-error"
+" 'struct-copy"
 "                                                                     \"parsed-module?\""
-" the-struct_124)))))))))))))))))))))))))))))))))))"
+" the-struct_125)))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(expand-non-module*-submodules212.1)"
 "(lambda(compiled-submodules202_0"
@@ -78492,9 +78579,9 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules212"
 "(let-values(((bodys_28) bodys208_0))"
-"(let-values(((phase_168) phase209_0))"
+"(let-values(((phase_167) phase209_0))"
 "(let-values(((self_42) self210_0))"
-"(let-values(((ctx_120) ctx211_0))"
+"(let-values(((ctx_122) ctx211_0))"
 "(let-values(((mpis-to-reset_5) mpis-to-reset200_0))"
 "(let-values(((declared-submodule-names_9) declared-submodule-names201_0))"
 "(let-values(((compiled-submodules_6) compiled-submodules202_0))"
@@ -78519,19 +78606,19 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((tmp_71)"
+"(let-values(((tmp_70)"
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_27)"
-" phase_168)))"
-"(if(equal? tmp_71 'module)"
+" phase_167)))"
+"(if(equal? tmp_70 'module)"
 "(let-values()"
 "(let-values(((body706_0)"
 " body_27)"
 "((self707_0)"
 " self_42)"
 "((ctx708_0)"
-" ctx_120)"
+" ctx_122)"
 "((temp709_0)"
 " #f)"
 "((mpis-to-reset710_0)"
@@ -78579,37 +78666,37 @@ 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_905 phase_169)"
+"(lambda(s_907 phase_168)"
 "(let-values(((ok?_91 #%require714_0 req715_0)"
-"(let-values(((s_906)(syntax-disarm$1 s_905)))"
-"(let-values(((orig-s_95) s_906))"
+"(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_907)"
-"(if(syntax?$1 s_906)(syntax-e$1 s_906) s_906)))"
-"(if(pair? s_907)"
+"(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_908)(car s_907))) s_908))"
+"(let-values(((s_910)(car s_909))) s_910))"
 "((req717_0)"
-"(let-values(((s_909)(cdr s_907)))"
-"(let-values(((s_910)"
-"(if(syntax?$1 s_909)"
-"(syntax-e$1 s_909)"
-" s_909)))"
-"(if(pair? s_910)"
-"(let-values(((req718_0)"
-"(let-values(((s_911)"
-"(car s_910)))"
-" s_911))"
-"(()"
+"(let-values(((s_911)(cdr s_909)))"
 "(let-values(((s_912)"
-"(cdr s_910)))"
+"(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(((s_915)"
 "(if(syntax?$1"
-" s_912)"
+" s_914)"
 "(syntax-e$1"
-" s_912)"
-" s_912)))"
-"(if(null? s_913)"
+" s_914)"
+" s_914)))"
+"(if(null? s_915)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -78624,11 +78711,11 @@ static const char *startup_source =
 "                                                      (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_905)"
+"((s720_0) s_907)"
 "((self721_0) self_43)"
 "((m-ns722_0) m-ns_23)"
-"((phase723_0) phase_169)"
-"((phase724_0) phase_169)"
+"((phase723_0) phase_168)"
+"((phase724_0) phase_168)"
 "((requires+provides725_0) requires+provides_14)"
 "((declared-submodule-names726_0) declared-submodule-names_10)"
 "((temp727_0) 'require))"
@@ -78698,15 +78785,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_166)(expand-context-observer partial-body-ctx_2)))"
-"(if obs_166"
+"(let-values(((obs_164)(expand-context-observer partial-body-ctx_2)))"
+"(if obs_164"
 "(let-values()"
 "(let-values(((s-lifted-defns_0)(lifted-defns-extract-syntax lifted-defns_3)))"
 "(let-values((()"
 "(begin"
-"(call-expand-observe obs_166 'rename-list(cons exp-body_10 rest-bodys_4))"
+"(call-expand-observe obs_164 'rename-list(cons exp-body_10 rest-bodys_4))"
 "(values))))"
-"(let-values((()(begin(call-expand-observe obs_166 'module-lift-loop s-lifted-defns_0)(values))))"
+"(let-values((()(begin(call-expand-observe obs_164 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
 "(let-values(((lst_460) s-lifted-defns_0))"
@@ -78730,38 +78817,38 @@ static const char *startup_source =
 "(let-values(((ok?_92"
 " define-values732_0"
 " _733_0)"
-"(let-values(((s_914)"
+"(let-values(((s_916)"
 " s-lifted-defn_0))"
 "(let-values(((orig-s_96)"
-" s_914))"
+" s_916))"
 "(let-values(((define-values732_1"
 " _733_1)"
-"(let-values(((s_915)"
-"(if(syntax?$1"
-" s_914)"
-"(syntax-e$1"
-" s_914)"
-" s_914)))"
-"(if(pair?"
-" s_915)"
-"(let-values(((define-values734_0)"
-"(let-values(((s_916)"
-"(car"
-" s_915)))"
-" s_916))"
-"((_735_0)"
 "(let-values(((s_917)"
-"(cdr"
-" s_915)))"
-"(let-values(((s_918)"
 "(if(syntax?$1"
-" s_917)"
+" 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)))"
+"(let-values(((s_920)"
+"(if(syntax?$1"
+" s_919)"
+"(syntax-e$1"
+" s_919)"
+" s_919)))"
 "(let-values(((flat-s_64)"
 "(to-syntax-list.1"
-" s_918)))"
+" s_920)))"
 "(if(not"
 " flat-s_64)"
 "(let-values()"
@@ -78784,44 +78871,44 @@ static const char *startup_source =
 " _733_1))))))"
 "(begin"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'next)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'visit"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'resolve"
 " define-values732_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'prim-stop)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'exit-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'return"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'rename-one"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'prim-define-values)"
 "(call-expand-observe"
-" obs_166"
+" obs_164"
 " 'exit-prim"
 " s-lifted-defn_0))))"
 "(values)))))"
@@ -78833,51 +78920,51 @@ static const char *startup_source =
 "(values))))"
 "(let-values()"
 "(let-values(((ok?_93 form-id728_0 _729_0)"
-"(let-values(((s_919) exp-body_10))"
-"(let-values(((orig-s_97) s_919))"
+"(let-values(((s_921) exp-body_10))"
+"(let-values(((orig-s_97) s_921))"
 "(let-values(((form-id728_1 _729_1)"
-"(let-values(((s_920)"
-"(if(syntax?$1 s_919)(syntax-e$1 s_919) s_919)))"
-"(if(pair? s_920)"
+"(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_921)(car s_920))) s_921))"
+"(let-values(((s_923)(car s_922))) s_923))"
 "((_731_0)"
-"(let-values(((s_922)(cdr s_920))) s_922)))"
+"(let-values(((s_924)(cdr s_922))) s_924)))"
 "(values form-id730_0 _731_0))"
 "                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))"
 "(values #t form-id728_1 _729_1))))))"
 "(begin"
-"(call-expand-observe obs_166 'next)"
-"(call-expand-observe obs_166 'visit exp-body_10)"
-"(call-expand-observe obs_166 'resolve form-id728_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)))))))))"
+"(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)))))))))"
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
-"(lambda(ctx_121 defn_1)"
+"(lambda(ctx_123 defn_1)"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_121)))"
-"(if obs_167"
+"(let-values(((obs_165)(expand-context-observer ctx_123)))"
+"(if obs_165"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
 "(let-values(((ok?_94 define-values736_0 _737_0)"
-"(let-values(((s_923) s-defn_0))"
-"(let-values(((orig-s_98) s_923))"
+"(let-values(((s_925) s-defn_0))"
+"(let-values(((orig-s_98) s_925))"
 "(let-values(((define-values736_1 _737_1)"
-"(let-values(((s_924)(if(syntax?$1 s_923)(syntax-e$1 s_923) s_923)))"
-"(if(pair? s_924)"
+"(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_925)(car s_924))) s_925))"
+"(let-values(((s_927)(car s_926))) s_927))"
 "((_739_0)"
-"(let-values(((s_926)(cdr s_924)))"
-"(let-values(((s_927)"
-"(if(syntax?$1 s_926)"
-"(syntax-e$1 s_926)"
-" s_926)))"
-"(let-values(((flat-s_65)(to-syntax-list.1 s_927)))"
+"(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)))"
 "(if(not flat-s_65)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -78889,30 +78976,30 @@ static const char *startup_source =
 "                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
 "(values #t define-values736_1 _737_1))))))"
 "(begin"
-"(call-expand-observe obs_167 'visit s-defn_0)"
-"(call-expand-observe obs_167 'resolve define-values736_0)"
-"(call-expand-observe obs_167 'enter-prim s-defn_0)"
-"(call-expand-observe obs_167 'prim-define-values)))))"
+"(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)))))"
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
-"(lambda(ctx_122 defn_2 exp-rhs_8)"
+"(lambda(ctx_124 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_168)(expand-context-observer ctx_122)))"
-"(if obs_168"
+"(let-values(((obs_166)(expand-context-observer ctx_124)))"
+"(if obs_166"
 "(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_168 'exit-prim s-defn_1)(call-expand-observe obs_168 'return s-defn_1))))"
+"(begin(call-expand-observe obs_166 'exit-prim s-defn_1)(call-expand-observe obs_166 'return s-defn_1))))"
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
-"(lambda(ids_51 s_71 ctx_123)"
+"(lambda(ids_51 s_71 ctx_125)"
 "(begin"
-"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_123)))"
+"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_125)))"
 "(let-values(((tl-ids_2)"
 "(reverse$1"
 "(let-values(((lst_6) ids_51))"
@@ -78935,7 +79022,7 @@ static const char *startup_source =
 "(let-values()"
 "(remove-use-site-scopes"
 " id_161"
-" ctx_123))"
+" ctx_125))"
 " fold-var_62))))"
 "(values fold-var_403)))))"
 "(if(not #f)(for-loop_105 fold-var_61 rest_40) fold-var_61)))"
@@ -78945,7 +79032,7 @@ static const char *startup_source =
 " lst_6))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_123))((s3_4) s_71))"
+"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_125))((s3_4) s_71))"
 "(check-no-duplicate-ids8.1 #f #f tl-ids1_0 temp2_9 s3_4 #f #f))"
 "(values))))"
 "(let-values(((tmp-bind-ids_0)"
@@ -78980,16 +79067,16 @@ static const char *startup_source =
 " for-loop_348)"
 " null"
 " lst_101))))))"
-"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_123)))))))))"
+"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_125)))))))))"
 "(void"
 "(add-core-form!*"
 " 'define-values"
 "(lambda(s_0 ctx_7)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_7)))"
-"(if obs_169"
-"(let-values()(let-values()(call-expand-observe obs_169 'prim-define-values)))"
+"(let-values(((obs_167)(expand-context-observer ctx_7)))"
+"(if obs_167"
+"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-values)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -79000,13 +79087,13 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((disarmed-s_25)(syntax-disarm$1 s_0)))"
 "(let-values(((ok?_25 define-values1_0 id2_1 rhs3_0)"
-"(let-values(((s_450) s_0))"
-"(let-values(((orig-s_99) s_450))"
+"(let-values(((s_451) s_0))"
+"(let-values(((orig-s_99) s_451))"
 "(let-values(((define-values1_1 id2_2 rhs3_1)"
-"(let-values(((s_75)(if(syntax?$1 s_450)(syntax-e$1 s_450) s_450)))"
+"(let-values(((s_75)(if(syntax?$1 s_451)(syntax-e$1 s_451) s_451)))"
 "(if(pair? s_75)"
 "(let-values(((define-values4_0)"
-"(let-values(((s_451)(car s_75))) s_451))"
+"(let-values(((s_452)(car s_75))) s_452))"
 "((id5_0 rhs6_0)"
 "(let-values(((s_166)(cdr s_75)))"
 "(let-values(((s_5)"
@@ -79094,11 +79181,11 @@ static const char *startup_source =
 " lst_80)))))"
 "(reverse$1 id_6))))))))"
 "((rhs8_0)"
-"(let-values(((s_806)(cdr s_5)))"
+"(let-values(((s_808)(cdr s_5)))"
 "(let-values(((s_35)"
-"(if(syntax?$1 s_806)"
-"(syntax-e$1 s_806)"
-" s_806)))"
+"(if(syntax?$1 s_808)"
+"(syntax-e$1 s_808)"
+" s_808)))"
 "(if(pair? s_35)"
 "(let-values(((rhs9_0)"
 "(let-values(((s_89)"
@@ -79109,14 +79196,14 @@ static const char *startup_source =
 "(let-values(((s_167)"
 "(cdr"
 " s_35)))"
-"(let-values(((s_491)"
+"(let-values(((s_492)"
 "(if(syntax?$1"
 " s_167)"
 "(syntax-e$1"
 " s_167)"
 " s_167)))"
 "(if(null?"
-" s_491)"
+" s_492)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -79144,22 +79231,22 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'define-syntaxes"
-"(lambda(s_185 ctx_124)"
+"(lambda(s_185 ctx_126)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_3)(expand-context-observer ctx_124)))"
+"(let-values(((obs_3)(expand-context-observer ctx_126)))"
 "(if obs_3"
 "(let-values()(let-values()(call-expand-observe obs_3 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_170)(expand-context-observer ctx_124)))"
-"(if obs_170(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))(void)))"
+"(let-values(((obs_168)(expand-context-observer ctx_126)))"
+"(if obs_168(let-values()(let-values()(call-expand-observe obs_168 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_124) 'top-level)"
+"(if(eq?(expand-context-context ctx_126) 'top-level)"
 "(void)"
 "                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_185)))"
 "(values))))"
@@ -79171,20 +79258,20 @@ 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_928)(car s_22))) s_928))"
+"(let-values(((s_930)(car s_22))) s_930))"
 "((id19_1 rhs20_0)"
 "(let-values(((s_25)(cdr s_22)))"
-"(let-values(((s_499)"
+"(let-values(((s_501)"
 "(if(syntax?$1 s_25)"
 "(syntax-e$1 s_25)"
 " s_25)))"
-"(if(pair? s_499)"
+"(if(pair? s_501)"
 "(let-values(((id21_0)"
-"(let-values(((s_929)(car s_499)))"
+"(let-values(((s_931)(car s_501)))"
 "(let-values(((s_90)"
-"(if(syntax?$1 s_929)"
-"(syntax-e$1 s_929)"
-" s_929)))"
+"(if(syntax?$1 s_931)"
+"(syntax-e$1 s_931)"
+" s_931)))"
 "(let-values(((flat-s_67)"
 "(to-syntax-list.1"
 " s_90)))"
@@ -79212,7 +79299,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_463)"
-"(let-values(((s_930)"
+"(let-values(((s_932)"
 "(unsafe-car"
 " lst_463))"
 "((rest_266)"
@@ -79225,23 +79312,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id24_1)"
 "(let-values()"
-"(if(let-values(((or-part_209)"
+"(if(let-values(((or-part_210)"
 "(if(syntax?$1"
-" s_930)"
+" s_932)"
 "(symbol?"
 "(syntax-e$1"
-" s_930))"
+" s_932))"
 " #f)))"
-"(if or-part_209"
-" or-part_209"
+"(if or-part_210"
+" or-part_210"
 "(symbol?"
-" s_930)))"
-" s_930"
+" s_932)))"
+" s_932"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                            \"not an identifier\""
 " orig-s_100"
-" s_930)))))"
+" s_932)))))"
 "(cons"
 " id24_1"
 " id_167)))))"
@@ -79259,29 +79346,29 @@ static const char *startup_source =
 " lst_462)))))"
 "(reverse$1 id_91))))))))"
 "((rhs22_0)"
-"(let-values(((s_426)(cdr s_499)))"
+"(let-values(((s_426)(cdr s_501)))"
 "(let-values(((s_174)"
 "(if(syntax?$1 s_426)"
 "(syntax-e$1 s_426)"
 " s_426)))"
 "(if(pair? s_174)"
 "(let-values(((rhs23_2)"
-"(let-values(((s_500)"
+"(let-values(((s_502)"
 "(car"
 " s_174)))"
-" s_500))"
+" s_502))"
 "(()"
 "(let-values(((s_46)"
 "(cdr"
 " s_174)))"
-"(let-values(((s_503)"
+"(let-values(((s_505)"
 "(if(syntax?$1"
 " s_46)"
 "(syntax-e$1"
 " s_46)"
 " s_46)))"
 "(if(null?"
-" s_503)"
+" s_505)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -79300,36 +79387,36 @@ static const char *startup_source =
 "(values define-syntaxes18_0 id19_1 rhs20_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_100)))))"
 "(values #t define-syntaxes15_1 id16_2 rhs17_1))))))"
-"(let-values(((ids_53 syms_28)(as-expand-time-top-level-bindings id16_1 s_185 ctx_124)))"
+"(let-values(((ids_53 syms_28)(as-expand-time-top-level-bindings id16_1 s_185 ctx_126)))"
 "(let-values(((exp-rhs_10)"
-"(let-values(((temp25_7) rhs17_0)((temp26_6)(as-named-context ctx_124 ids_53)))"
+"(let-values(((temp25_7) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_53)))"
 "(expand-transformer92.1 #f #f #f #f #f #f #f #f #f #f #f #f temp25_7 temp26_6))))"
-"(if(expand-context-to-parsed? ctx_124)"
+"(if(expand-context-to-parsed? ctx_126)"
 "(parsed-define-syntaxes20.1 s_185 ids_53 syms_28 exp-rhs_10)"
 "(let-values(((s27_3) s_185)((temp28_7)(list define-syntaxes15_0 ids_53 exp-rhs_10)))"
 "(rebuild5.1 #f #f s27_3 temp28_7)))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin-for-syntax"
-"(lambda(s_483 ctx_125)"
+"(lambda(s_484 ctx_127)"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_125) 'top-level)"
+"(if(eq?(expand-context-context ctx_127) 'top-level)"
 "(void)"
-"                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_483)))"
+"                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_484)))"
 "(values))))"
 "(let-values(((ok?_37 begin-for-syntax29_0 form30_0)"
-"(let-values(((s_931) s_483))"
-"(let-values(((orig-s_101) s_931))"
+"(let-values(((s_933) s_484))"
+"(let-values(((orig-s_101) s_933))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
-"(let-values(((s_49)(if(syntax?$1 s_931)(syntax-e$1 s_931) s_931)))"
+"(let-values(((s_49)(if(syntax?$1 s_933)(syntax-e$1 s_933) s_933)))"
 "(if(pair? s_49)"
 "(let-values(((begin-for-syntax31_0)(let-values(((s_51)(car s_49))) s_51))"
 "((form32_0)"
 "(let-values(((s_94)(cdr s_49)))"
-"(let-values(((s_778)"
+"(let-values(((s_780)"
 "(if(syntax?$1 s_94)(syntax-e$1 s_94) s_94)))"
-"(let-values(((flat-s_68)(to-syntax-list.1 s_778)))"
+"(let-values(((flat-s_68)(to-syntax-list.1 s_780)))"
 "(if(not flat-s_68)"
 "(let-values()"
 "                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_101))"
@@ -79339,83 +79426,84 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)(expand-context-observer ctx_125)))"
-"(if obs_171"
-"(let-values()(let-values()(call-expand-observe obs_171 'prim-begin-for-syntax)))"
+"(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)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_31)(expand-context-observer ctx_125)))"
+"(let-values(((obs_31)(expand-context-observer ctx_127)))"
 "(if obs_31"
 "(let-values()(let-values()(call-expand-observe obs_31 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values(((trans-ctx_1)"
-"(let-values(((ctx33_0) ctx_125)((temp34_5) 'top-level)((temp35_4) #t))"
+"(let-values(((ctx33_0) ctx_127)((temp34_5) 'top-level)((temp35_4) #t))"
 "(context->transformer-context100.1 temp35_4 #t ctx33_0 temp34_5 #t))))"
 "(let-values(((lift-ctx_7)"
 "(let-values(((temp36_9)(make-top-level-lift trans-ctx_1)))"
 "(make-lift-context6.1 #f #f temp36_9))))"
 "(let-values(((capture-ctx_1)"
-"(let-values(((v_273) trans-ctx_1))"
-"(let-values(((the-struct_125) v_273))"
-"(if(expand-context/outer? the-struct_125)"
+"(let-values(((v_275) trans-ctx_1))"
+"(let-values(((the-struct_126) v_275))"
+"(if(expand-context/outer? the-struct_126)"
 "(let-values(((inner37_0)"
-"(let-values(((the-struct_126)"
-"(root-expand-context/outer-inner v_273)))"
-"(if(expand-context/inner? the-struct_126)"
+"(let-values(((the-struct_127)"
+"(root-expand-context/outer-inner v_275)))"
+"(if(expand-context/inner? the-struct_127)"
 "(let-values(((lift-key38_0)(generate-lift-key))"
 "((lifts39_0) lift-ctx_7))"
 "(expand-context/inner2.1"
-"(root-expand-context/inner-self-mpi the-struct_126)"
-"(root-expand-context/inner-module-scopes the-struct_126)"
+"(root-expand-context/inner-self-mpi the-struct_127)"
+"(root-expand-context/inner-module-scopes the-struct_127)"
 "(root-expand-context/inner-top-level-bind-scope"
-" the-struct_126)"
-"(root-expand-context/inner-all-scopes-stx the-struct_126)"
-"(root-expand-context/inner-defined-syms the-struct_126)"
-"(root-expand-context/inner-counter the-struct_126)"
+" the-struct_127)"
+"(root-expand-context/inner-all-scopes-stx the-struct_127)"
+"(root-expand-context/inner-defined-syms the-struct_127)"
+"(root-expand-context/inner-counter the-struct_127)"
 " lift-key38_0"
-"(expand-context/inner-to-parsed? the-struct_126)"
-"(expand-context/inner-phase the-struct_126)"
-"(expand-context/inner-namespace the-struct_126)"
-"(expand-context/inner-just-once? the-struct_126)"
-"(expand-context/inner-module-begin-k the-struct_126)"
-"(expand-context/inner-allow-unbound? the-struct_126)"
-"(expand-context/inner-in-local-expand? the-struct_126)"
-"(expand-context/inner-stops the-struct_126)"
-"(expand-context/inner-declared-submodule-names the-struct_126)"
+"(expand-context/inner-to-parsed? the-struct_127)"
+"(expand-context/inner-phase the-struct_127)"
+"(expand-context/inner-namespace the-struct_127)"
+"(expand-context/inner-just-once? the-struct_127)"
+"(expand-context/inner-module-begin-k the-struct_127)"
+"(expand-context/inner-allow-unbound? the-struct_127)"
+"(expand-context/inner-in-local-expand? the-struct_127)"
+"(expand-context/inner-keep-#%expression? the-struct_127)"
+"(expand-context/inner-stops the-struct_127)"
+"(expand-context/inner-declared-submodule-names the-struct_127)"
 " lifts39_0"
-"(expand-context/inner-lift-envs the-struct_126)"
-"(expand-context/inner-module-lifts the-struct_126)"
-"(expand-context/inner-require-lifts the-struct_126)"
-"(expand-context/inner-to-module-lifts the-struct_126)"
-"(expand-context/inner-requires+provides the-struct_126)"
-"(expand-context/inner-observer the-struct_126)"
-"(expand-context/inner-for-serializable? the-struct_126)"
+"(expand-context/inner-lift-envs the-struct_127)"
+"(expand-context/inner-module-lifts the-struct_127)"
+"(expand-context/inner-require-lifts the-struct_127)"
+"(expand-context/inner-to-module-lifts the-struct_127)"
+"(expand-context/inner-requires+provides the-struct_127)"
+"(expand-context/inner-observer the-struct_127)"
+"(expand-context/inner-for-serializable? the-struct_127)"
 "(expand-context/inner-should-not-encounter-macros?"
-" the-struct_126)))"
+" the-struct_127)))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                        \"expand-context/inner?\""
-" the-struct_126)))))"
+" the-struct_127)))))"
 "(expand-context/outer1.1"
 " inner37_0"
-"(root-expand-context/outer-post-expansion-scope the-struct_125)"
-"(root-expand-context/outer-use-site-scopes the-struct_125)"
-"(root-expand-context/outer-frame-id the-struct_125)"
-"(expand-context/outer-context the-struct_125)"
-"(expand-context/outer-env the-struct_125)"
-"(expand-context/outer-post-expansion-scope-action the-struct_125)"
-"(expand-context/outer-scopes the-struct_125)"
-"(expand-context/outer-def-ctx-scopes the-struct_125)"
-"(expand-context/outer-binding-layer the-struct_125)"
-"(expand-context/outer-reference-records the-struct_125)"
-"(expand-context/outer-only-immediate? the-struct_125)"
-"(expand-context/outer-need-eventually-defined the-struct_125)"
-"(expand-context/outer-current-introduction-scopes the-struct_125)"
-"(expand-context/outer-name the-struct_125)))"
-"                                     (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_125))))))"
+"(root-expand-context/outer-post-expansion-scope the-struct_126)"
+"(root-expand-context/outer-use-site-scopes the-struct_126)"
+"(root-expand-context/outer-frame-id the-struct_126)"
+"(expand-context/outer-context the-struct_126)"
+"(expand-context/outer-env the-struct_126)"
+"(expand-context/outer-post-expansion-scope-action the-struct_126)"
+"(expand-context/outer-scopes the-struct_126)"
+"(expand-context/outer-def-ctx-scopes the-struct_126)"
+"(expand-context/outer-binding-layer the-struct_126)"
+"(expand-context/outer-reference-records the-struct_126)"
+"(expand-context/outer-only-immediate? the-struct_126)"
+"(expand-context/outer-need-eventually-defined the-struct_126)"
+"(expand-context/outer-current-introduction-scopes the-struct_126)"
+"(expand-context/outer-name the-struct_126)))"
+"                                     (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_126))))))"
 "(let-values(((all-exp-forms_0)"
 "((letrec-values(((loop_63)"
 "(lambda(forms_0)"
@@ -79423,15 +79511,15 @@ static const char *startup_source =
 " 'loop"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_172)"
-"(expand-context-observer ctx_125)))"
-"(if obs_172"
+"(let-values(((obs_170)"
+"(expand-context-observer ctx_127)))"
+"(if obs_170"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_172"
+" obs_170"
 " 'enter-list"
-"(datum->syntax$1 #f form30_0 s_483))))"
+"(datum->syntax$1 #f form30_0 s_484))))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-forms_0)"
@@ -79445,32 +79533,32 @@ static const char *startup_source =
 "(reverse$1"
 " accum_1)))"
 "(begin"
-"(let-values(((obs_64)"
+"(let-values(((obs_171)"
 "(expand-context-observer"
-" ctx_125)))"
-"(if obs_64"
+" ctx_127)))"
+"(if obs_171"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_64"
+" obs_171"
 " 'exit-list"
 "(datum->syntax$1"
 " #f"
 " forms_2"
-" s_483))))"
+" s_484))))"
 "(void)))"
 " forms_2)))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_173)"
+"(let-values(((obs_61)"
 "(expand-context-observer"
-" ctx_125)))"
-"(if obs_173"
+" ctx_127)))"
+"(if obs_61"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_173"
+" obs_61"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -79503,14 +79591,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_174)"
+"(let-values(((obs_64)"
 "(expand-context-observer"
-" ctx_125)))"
-"(if obs_174"
+" ctx_127)))"
+"(if obs_64"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_174"
+" obs_64"
 " 'module-lift-loop"
 " lifts_15)))"
 "(void)))"
@@ -79539,22 +79627,22 @@ static const char *startup_source =
 " exp-forms_0)))))))))))))"
 " loop_63)"
 " form30_0)))"
-"(if(expand-context-to-parsed? ctx_125)"
-"(parsed-begin-for-syntax21.1 s_483 all-exp-forms_0)"
-"(let-values(((s45_0) s_483)((temp46_3)(cons begin-for-syntax29_0 all-exp-forms_0)))"
+"(if(expand-context-to-parsed? ctx_127)"
+"(parsed-begin-for-syntax21.1 s_484 all-exp-forms_0)"
+"(let-values(((s45_0) s_484)((temp46_3)(cons begin-for-syntax29_0 all-exp-forms_0)))"
 "(rebuild5.1 #f #f s45_0 temp46_3))))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%require"
-"(lambda(s_412 ctx_126)"
+"(lambda(s_412 ctx_128)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_10)(expand-context-observer ctx_126)))"
+"(let-values(((obs_10)(expand-context-observer ctx_128)))"
 "(if obs_10(let-values()(let-values()(call-expand-observe obs_10 'prim-require)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_126) 'top-level)"
+"(if(eq?(expand-context-context ctx_128) 'top-level)"
 "(void)"
 "                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_412)))"
 "(values))))"
@@ -79567,11 +79655,11 @@ static const char *startup_source =
 "(if(pair? s_200)"
 "(let-values(((#%require49_0)(let-values(((s_63)(car s_200))) s_63))"
 "((req50_0)"
-"(let-values(((s_521)(cdr s_200)))"
+"(let-values(((s_523)(cdr s_200)))"
 "(let-values(((s_416)"
-"(if(syntax?$1 s_521)"
-"(syntax-e$1 s_521)"
-" s_521)))"
+"(if(syntax?$1 s_523)"
+"(syntax-e$1 s_523)"
+" s_523)))"
 "(let-values(((flat-s_69)(to-syntax-list.1 s_416)))"
 "(if(not flat-s_69)"
 "(let-values()"
@@ -79618,12 +79706,12 @@ static const char *startup_source =
 " null"
 " lst_464)))))"
 "((s52_0) s_412)"
-"((temp53_4) #f)"
-"((temp54_6)(expand-context-namespace ctx_126))"
-"((temp55_4)(expand-context-phase ctx_126))"
-"((temp56_3)(let-values(((temp59_9) #f))(make-requires+provides8.1 #f #f temp59_9)))"
-"((temp57_1) 'require)"
-"((temp58_5) #t))"
+"((temp53_5) #f)"
+"((temp54_6)(expand-context-namespace ctx_128))"
+"((temp55_3)(expand-context-phase ctx_128))"
+"((temp56_3)(let-values(((temp59_7) #f))(make-requires+provides8.1 #f #f temp59_7)))"
+"((temp57_2) 'require)"
+"((temp58_4) #t))"
 "(parse-and-perform-requires!30.1"
 " #f"
 " #f"
@@ -79631,7 +79719,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp58_5"
+" temp58_4"
 " #t"
 " #f"
 " #f"
@@ -79641,23 +79729,23 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp53_4"
+" temp53_5"
 " #t"
-" temp57_1"
+" temp57_2"
 " temp51_4"
 " s52_0"
 " temp54_6"
-" temp55_4"
+" temp55_3"
 " temp56_3))"
-"(if(expand-context-to-parsed? ctx_126)(parsed-require23.1 s_412) s_412))))))))))"
+"(if(expand-context-to-parsed? ctx_128)(parsed-require23.1 s_412) s_412))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%provide"
-"(lambda(s_784 ctx_127)"
+"(lambda(s_786 ctx_129)"
 "(begin"
-"(let-values(((obs_175)(expand-context-observer ctx_127)))"
-"(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_784)))))"
+"(let-values(((obs_172)(expand-context-observer ctx_129)))"
+"(if obs_172(let-values()(let-values()(call-expand-observe obs_172 'prim-provide)))(void)))"
+"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_786)))))"
 "(define-values(ns)(make-namespace))"
 "(void"
 "(begin"
@@ -79698,7 +79786,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_3"
-"(let-values(((name_82)(hash-iterate-key ht_170 i_3)))"
+"(let-values(((name_81)(hash-iterate-key ht_170 i_3)))"
 "(let-values(((table_218)"
 "(let-values(((table_231) table_230))"
 "(let-values(((table_186)"
@@ -79706,7 +79794,7 @@ static const char *startup_source =
 "(let-values(((key_95 val_88)"
 "(let-values()"
 "(values"
-"(let-values() name_82)"
+"(let-values() name_81)"
 " #t))))"
 "(hash-set table_231 key_95 val_88)))))"
 "(values table_186)))))"
@@ -79728,7 +79816,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_188"
-"(let-values(((name_83)(hash-iterate-key ht_171 i_188)))"
+"(let-values(((name_82)(hash-iterate-key ht_171 i_188)))"
 "(let-values(((table_117)"
 "(let-values(((table_110) table_189))"
 "(let-values(((table_111)"
@@ -79736,7 +79824,7 @@ static const char *startup_source =
 "(let-values(((key_96 val_89)"
 "(let-values()"
 "(values"
-"(let-values() name_83)"
+"(let-values() name_82)"
 " #t))))"
 "(hash-set table_110 key_96 val_89)))))"
 "(values table_111)))))"
@@ -79757,33 +79845,33 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_20)"
-"(let-values(((name_84)(unsafe-car lst_20))((rest_6)(unsafe-cdr lst_20)))"
+"(let-values(((name_83)(unsafe-car lst_20))((rest_6)(unsafe-cdr lst_20)))"
 "(let-values((()"
 "(let-values()"
-"(if(eq? name_84 '#%kernel)"
+"(if(eq? name_83 '#%kernel)"
 "(values)"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((name30_0) name_84)"
+"(let-values(((name30_0) name_83)"
 "((ns31_5) ns)"
 "((temp32_5)"
 "(let-values(((or-part_164)"
 "(eq?"
-" name_84"
+" name_83"
 " '#%foreign)))"
 "(if or-part_164"
 " or-part_164"
-"(let-values(((or-part_305)"
+"(let-values(((or-part_306)"
 "(eq?"
-" name_84"
+" name_83"
 " '#%futures)))"
-"(if or-part_305"
-" or-part_305"
+"(if or-part_306"
+" or-part_306"
 "(eq?"
-" name_84"
+" name_83"
 " '#%unsafe)))))))"
 "(copy-runtime-module!26.1"
 " #f"
@@ -79814,5 +79902,5 @@ static const char *startup_source =
 "(declare-reexporting-module!50.1 ns35_1 temp36_6 #t temp33_4 temp34_6))"
 "(1/current-namespace ns)"
 "(1/dynamic-require ''#%kernel 0)))"
-"(define-values(datum->kernel-syntax)(lambda(s_776)(begin(1/datum->syntax core-stx s_776)))))"
+"(define-values(datum->kernel-syntax)(lambda(s_778)(begin(1/datum->syntax core-stx s_778)))))"
 ;