diff --git a/racket/src/expander/expand/body.rkt b/racket/src/expander/expand/body.rkt
index ca2a42c036..43d70d808c 100644
--- a/racket/src/expander/expand/body.rkt
+++ b/racket/src/expander/expand/body.rkt
@@ -128,8 +128,11 @@
          (log-expand body-ctx 'rename-one (datum->syntax #f (list ids (m 'rhs))))
          (define new-dups (check-no-duplicate-ids ids phase exp-body dups))
          (define counter (root-expand-context-counter ctx))
+         (define local-sym (and (expand-context-normalize-locals? ctx) 'loc))
          (define keys (for/list ([id (in-list ids)])
-                        (add-local-binding! id phase counter #:frame-id frame-id #:in exp-body)))
+                        (add-local-binding! id phase counter
+                                            #:frame-id frame-id #:in exp-body
+                                            #:local-sym local-sym)))
          (define extended-env (for/fold ([env (expand-context-env body-ctx)]) ([key (in-list keys)]
                                                                                [id (in-list ids)])
                                 (env-extend env key (local-variable id))))
@@ -174,8 +177,11 @@
          (log-expand body-ctx 'rename-one (datum->syntax #f (list ids (m 'rhs))))
          (define new-dups (check-no-duplicate-ids ids phase exp-body dups))
          (define counter (root-expand-context-counter ctx))
+         (define local-sym (and (expand-context-normalize-locals? ctx) 'mac))
          (define keys (for/list ([id (in-list ids)])
-                        (add-local-binding! id phase counter #:frame-id frame-id #:in exp-body)))
+                        (add-local-binding! id phase counter
+                                            #:frame-id frame-id #:in exp-body
+                                            #:local-sym local-sym)))
          (log-expand body-ctx 'prepare-env)
          (prepare-next-phase-namespace ctx)
          (log-expand body-ctx 'enter-bind)
diff --git a/racket/src/expander/expand/context.rkt b/racket/src/expander/expand/context.rkt
index 862bab3865..7c2e991a3c 100644
--- a/racket/src/expander/expand/context.rkt
+++ b/racket/src/expander/expand/context.rkt
@@ -69,6 +69,7 @@
           observer   ; logging observer (for the macro debugger)
           for-serializable? ; accumulate submodules as serializable?
           to-correlated-linklet? ; compile to machine-independent linklets?
+          normalize-locals? ; forget original local-variable names
           should-not-encounter-macros?)) ; #t when "expanding" to parse
 
 (define (make-expand-context ns
@@ -117,6 +118,7 @@
                   observer
                   for-serializable?
                   to-correlated-linklet?
+                  to-correlated-linklet? ; normalize-locals?
                   #f))
 
 (define (copy-root-expand-context ctx root-ctx)
diff --git a/racket/src/expander/expand/definition-context.rkt b/racket/src/expander/expand/definition-context.rkt
index 9cac04a6f1..434d449dea 100644
--- a/racket/src/expander/expand/definition-context.rkt
+++ b/racket/src/expander/expand/definition-context.rkt
@@ -83,9 +83,12 @@
                        (add-intdef-scopes (add-intdef-scopes pre-id intdef #:always? #t)
                                           extra-intdefs)))
   (log-expand ctx 'rename-list intdef-ids)
+  (define counter (root-expand-context-counter ctx))
+  (define local-sym (and (expand-context-normalize-locals? ctx) 'loc))
   (define syms (for/list ([intdef-id (in-list intdef-ids)])
-                 (add-local-binding! intdef-id phase (root-expand-context-counter ctx)
-                                     #:frame-id (internal-definition-context-frame-id intdef))))
+                 (add-local-binding! intdef-id phase counter
+                                     #:frame-id (internal-definition-context-frame-id intdef)
+                                     #:local-sym local-sym)))
   (define vals
     (cond
      [s
diff --git a/racket/src/expander/expand/env.rkt b/racket/src/expander/expand/env.rkt
index a5587d47a2..c1cc9210a8 100644
--- a/racket/src/expander/expand/env.rkt
+++ b/racket/src/expander/expand/env.rkt
@@ -96,12 +96,15 @@
                                #:shadow-except shadow-except))
 
 ;; Helper for registering a local binding in a set of scopes:
-(define (add-local-binding! id phase counter #:frame-id [frame-id #f] #:in [in-s #f])
+(define (add-local-binding! id phase counter
+                            #:local-sym local-sym
+                            #:frame-id [frame-id #f]
+                            #:in [in-s #f])
   (check-id-taint id in-s)
   (define c (add1 (unbox counter)))
   (set-box! counter c)
   (define sym (syntax-content id))
-  (define key (string->uninterned-symbol (string-append (symbol->string sym)
+  (define key (string->uninterned-symbol (string-append (symbol->string (or local-sym sym))
                                                         "_"
                                                         (number->string c))))
   (add-binding-in-scopes! (syntax-scope-set id phase) sym (make-local-binding key #:frame-id frame-id))
diff --git a/racket/src/expander/expand/expr.rkt b/racket/src/expander/expand/expr.rkt
index ec10738123..6cbf40bf8f 100644
--- a/racket/src/expander/expand/expr.rkt
+++ b/racket/src/expander/expand/expr.rkt
@@ -39,8 +39,9 @@
   ;; Bind each argument and generate a corresponding key for the
   ;; expand-time environment:
   (define counter (root-expand-context-counter ctx))
+  (define local-sym (and (expand-context-normalize-locals? ctx) 'arg))
   (define keys (for/list ([id (in-list ids)])
-                 (add-local-binding! id phase counter #:in s)))
+                 (add-local-binding! id phase counter #:in s #:local-sym local-sym)))
   (define body-env (for/fold ([env (expand-context-env ctx)]) ([key (in-list keys)]
                                                                [id (in-list ids)])
                      (env-extend env key (local-variable id))))
@@ -198,12 +199,17 @@
     ;; Bind each left-hand identifier and generate a corresponding key
     ;; fo the expand-time environment:
     (define counter (root-expand-context-counter ctx))
+    (define local-sym (and (expand-context-normalize-locals? ctx) 'loc))
     (define trans-keyss (for/list ([ids (in-list trans-idss)])
                           (for/list ([id (in-list ids)])
-                            (add-local-binding! id phase counter #:frame-id frame-id #:in s))))
+                            (add-local-binding! id phase counter
+                                                #:frame-id frame-id #:in s
+                                                 #:local-sym local-sym))))
     (define val-keyss (for/list ([ids (in-list val-idss)])
                         (for/list ([id (in-list ids)])
-                          (add-local-binding! id phase counter #:frame-id frame-id #:in s))))
+                          (add-local-binding! id phase counter
+                                              #:frame-id frame-id #:in s
+                                              #:local-sym local-sym))))
     ;; Add new scope to body:
     (define bodys (for/list ([body (in-list (if syntaxes? (stx-m 'body) (val-m 'body)))])
                     (define new-body (add-scope body sc))
diff --git a/racket/src/expander/expand/lift-context.rkt b/racket/src/expander/expand/lift-context.rkt
index 035d123646..d71d9cb8ae 100644
--- a/racket/src/expander/expand/lift-context.rkt
+++ b/racket/src/expander/expand/lift-context.rkt
@@ -71,11 +71,11 @@
 (define (get-and-clear-lifts! lifts)
   (box-clear! (lift-context-lifts lifts)))
 
-(define (make-local-lift lift-env counter)
+(define (make-local-lift lift-env counter local-sym)
   (lambda (ids rhs phase)
     (define keys
       (for/list ([id (in-list ids)])
-        (define key (add-local-binding! id phase counter))
+        (define key (add-local-binding! id phase counter #:local-sym local-sym))
         (set-box! lift-env (env-extend (unbox lift-env) key variable))
         key))
     (values ids (lifted-bind ids keys rhs))))
diff --git a/racket/src/expander/expand/main.rkt b/racket/src/expander/expand/main.rkt
index a6747a7e8b..e54c7dee50 100644
--- a/racket/src/expander/expand/main.rkt
+++ b/racket/src/expander/expand/main.rkt
@@ -544,7 +544,9 @@
     (define lift-env (and local? (box empty-env)))
     (define lift-ctx (make-lift-context
                       (if local?
-                          (make-local-lift lift-env (root-expand-context-counter ctx))
+                          (make-local-lift lift-env
+                                           (root-expand-context-counter ctx)
+                                           (and (expand-context-normalize-locals? ctx) 'lift))
                           (make-top-level-lift ctx))
                       #:module*-ok? (and (not local?) (eq? context 'module))))
     (define capture-ctx (struct*-copy expand-context ctx
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index a453f5e80f..4e3b285bc1 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -15290,11 +15290,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(check-id-taint id_0 in-s_0)"
-"(let-values(((temp55_0)(syntax-scope-set id_0 phase_0))"
-"((temp56_0)(syntax-e$1 id_0))"
-"((binding57_0) binding_0)"
-"((just-for-nominal?58_0) just-for-nominal?_0))"
-"(add-binding-in-scopes!20.1 just-for-nominal?58_0 temp55_0 temp56_0 binding57_0))))))))))))"
+"(let-values(((temp57_0)(syntax-scope-set id_0 phase_0))"
+"((temp58_0)(syntax-e$1 id_0))"
+"((binding59_0) binding_0)"
+"((just-for-nominal?60_0) just-for-nominal?_0))"
+"(add-binding-in-scopes!20.1 just-for-nominal?60_0 temp57_0 temp58_0 binding59_0))))))))))))"
 "(define-values"
 "(add-bulk-binding!27.1)"
 "(lambda(in20_0 shadow-except21_0 s24_0 binding25_0 phase26_0)"
@@ -15310,20 +15310,21 @@ static const char *startup_source =
 "(if(syntax-tainted?$1 s_0)"
 "                      (let-values () (raise-syntax-error$1 #f \"cannot bind from tainted syntax\" in-s_0 s_0))"
 "(void))"
-"(let-values(((temp59_0)(syntax-scope-set s_0 phase_0))"
-"((binding60_0) binding_0)"
-"((shadow-except61_0) shadow-except_0))"
-"(add-bulk-binding-in-scopes!27.1 shadow-except61_0 temp59_0 binding60_0))))))))))))"
+"(let-values(((temp61_0)(syntax-scope-set s_0 phase_0))"
+"((binding62_0) binding_0)"
+"((shadow-except63_0) shadow-except_0))"
+"(add-bulk-binding-in-scopes!27.1 shadow-except63_0 temp61_0 binding62_0))))))))))))"
 "(define-values"
-"(add-local-binding!37.1)"
-"(lambda(frame-id30_0 in31_0 id34_0 phase35_0 counter36_0)"
+"(add-local-binding!39.1)"
+"(lambda(frame-id31_0 in32_0 local-sym30_0 id36_0 phase37_0 counter38_0)"
 "(begin"
-" 'add-local-binding!37"
-"(let-values(((id_0) id34_0))"
-"(let-values(((phase_0) phase35_0))"
-"(let-values(((counter_0) counter36_0))"
-"(let-values(((frame-id_0) frame-id30_0))"
-"(let-values(((in-s_0) in31_0))"
+" 'add-local-binding!39"
+"(let-values(((id_0) id36_0))"
+"(let-values(((phase_0) phase37_0))"
+"(let-values(((counter_0) counter38_0))"
+"(let-values(((local-sym_0) local-sym30_0))"
+"(let-values(((frame-id_0) frame-id31_0))"
+"(let-values(((in-s_0) in32_0))"
 "(let-values()"
 "(let-values((()(begin(check-id-taint id_0 in-s_0)(values))))"
 "(let-values(((c_0)(add1(unbox counter_0))))"
@@ -15331,15 +15332,19 @@ static const char *startup_source =
 "(let-values(((sym_0)(syntax-content id_0)))"
 "(let-values(((key_0)"
 "(string->uninterned-symbol"
-"                                         (string-append (symbol->string sym_0) \"_\" (number->string c_0)))))"
+"(string-append"
+"(symbol->string"
+"(let-values(((or-part_0) local-sym_0))(if or-part_0 or-part_0 sym_0)))"
+"                                            \"_\""
+"(number->string c_0)))))"
 "(begin"
-"(let-values(((temp62_0)(syntax-scope-set id_0 phase_0))"
-"((sym63_0) sym_0)"
-"((temp64_0)"
-"(let-values(((key65_0) key_0)((frame-id66_0) frame-id_0))"
-"(make-local-binding7.1 frame-id66_0 #f key65_0))))"
-"(add-binding-in-scopes!20.1 #f temp62_0 sym63_0 temp64_0))"
-" key_0)))))))))))))))"
+"(let-values(((temp64_0)(syntax-scope-set id_0 phase_0))"
+"((sym65_0) sym_0)"
+"((temp66_0)"
+"(let-values(((key67_0) key_0)((frame-id68_0) frame-id_0))"
+"(make-local-binding7.1 frame-id68_0 #f key67_0))))"
+"(add-binding-in-scopes!20.1 #f temp64_0 sym65_0 temp66_0))"
+" key_0))))))))))))))))"
 "(define-values"
 "(check-id-taint)"
 "(lambda(id_0 in-s_0)"
@@ -15348,18 +15353,18 @@ static const char *startup_source =
 "        (let-values () (raise-syntax-error$1 #f \"cannot bind tainted identifier\" in-s_0 id_0))"
 "(void)))))"
 "(define-values"
-"(binding-lookup50.1)"
-"(lambda(in40_0 out-of-context-as-variable?41_0 b44_0 env45_0 lift-envs46_0 ns47_0 phase48_0 id49_0)"
+"(binding-lookup52.1)"
+"(lambda(in42_0 out-of-context-as-variable?43_0 b46_0 env47_0 lift-envs48_0 ns49_0 phase50_0 id51_0)"
 "(begin"
-" 'binding-lookup50"
-"(let-values(((b_0) b44_0))"
-"(let-values(((env_0) env45_0))"
-"(let-values(((lift-envs_0) lift-envs46_0))"
-"(let-values(((ns_0) ns47_0))"
-"(let-values(((phase_0) phase48_0))"
-"(let-values(((id_0) id49_0))"
-"(let-values(((in-s_0) in40_0))"
-"(let-values(((out-of-context-as-variable?_0) out-of-context-as-variable?41_0))"
+" 'binding-lookup52"
+"(let-values(((b_0) b46_0))"
+"(let-values(((env_0) env47_0))"
+"(let-values(((lift-envs_0) lift-envs48_0))"
+"(let-values(((ns_0) ns49_0))"
+"(let-values(((phase_0) phase50_0))"
+"(let-values(((id_0) id51_0))"
+"(let-values(((in-s_0) in42_0))"
+"(let-values(((out-of-context-as-variable?_0) out-of-context-as-variable?43_0))"
 "(let-values()"
 "(if(module-binding? b_0)"
 "(let-values()"
@@ -15596,6 +15601,7 @@ static const char *startup_source =
 " expand-context/inner-observer"
 " expand-context/inner-for-serializable?"
 " expand-context/inner-to-correlated-linklet?"
+" expand-context/inner-normalize-locals?"
 " expand-context/inner-should-not-encounter-macros?)"
 "(let-values(((struct:_0 make-_0 ?_0 -ref_0 -set!_0)"
 "(let-values()"
@@ -15603,13 +15609,13 @@ static const char *startup_source =
 "(make-struct-type"
 " 'expand-context/inner"
 " struct:root-expand-context/inner"
-" 20"
+" 21"
 " 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 18 19)"
+" '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20)"
 " #f"
 " 'expand-context/inner)))))"
 "(values"
@@ -15635,7 +15641,8 @@ static const char *startup_source =
 "(make-struct-field-accessor -ref_0 16 'observer)"
 "(make-struct-field-accessor -ref_0 17 'for-serializable?)"
 "(make-struct-field-accessor -ref_0 18 'to-correlated-linklet?)"
-"(make-struct-field-accessor -ref_0 19 'should-not-encounter-macros?))))"
+"(make-struct-field-accessor -ref_0 19 'normalize-locals?)"
+"(make-struct-field-accessor -ref_0 20 'should-not-encounter-macros?))))"
 "(define-values"
 "(expand-context/make)"
 "(lambda(self-mpi_0"
@@ -15678,6 +15685,7 @@ static const char *startup_source =
 " observer_0"
 " for-serializable?_0"
 " to-correlated-linklet?_0"
+" normalize-locals?_0"
 " should-not-encounter-macros?_0)"
 "(begin"
 "(expand-context/outer1.1"
@@ -15708,6 +15716,7 @@ static const char *startup_source =
 " observer_0"
 " for-serializable?_0"
 " to-correlated-linklet?_0"
+" normalize-locals?_0"
 " should-not-encounter-macros?_0)"
 " post-expansion_0"
 " use-site-scopes_0"
@@ -15798,6 +15807,9 @@ static const char *startup_source =
 "(expand-context-to-correlated-linklet?)"
 "(lambda(v_0)(begin(expand-context/inner-to-correlated-linklet?(root-expand-context/outer-inner v_0)))))"
 "(define-values"
+"(expand-context-normalize-locals?)"
+"(lambda(v_0)(begin(expand-context/inner-normalize-locals?(root-expand-context/outer-inner v_0)))))"
+"(define-values"
 "(expand-context-should-not-encounter-macros?)"
 "(lambda(v_0)(begin(expand-context/inner-should-not-encounter-macros?(root-expand-context/outer-inner v_0)))))"
 "(define-values"
@@ -15853,6 +15865,7 @@ static const char *startup_source =
 " observer_0"
 " for-serializable?_0"
 " to-correlated-linklet?_0"
+" to-correlated-linklet?_0"
 " #f)))))))))))"
 "(define-values"
 "(copy-root-expand-context)"
@@ -15903,6 +15916,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros? the-struct_1)))"
 "                              (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_1)))))"
 "(expand-context/outer1.1"
@@ -16107,6 +16121,7 @@ static const char *startup_source =
 " observer53_0"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 " should-not-encounter-macros?54_0))"
 "                              (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_1)))))"
 "(expand-context/outer1.1"
@@ -41540,7 +41555,7 @@ static const char *startup_source =
 "(define-values(get-and-clear-lifts!)(lambda(lifts_0)(begin(box-clear!(lift-context-lifts lifts_0)))))"
 "(define-values"
 "(make-local-lift)"
-"(lambda(lift-env_0 counter_0)"
+"(lambda(lift-env_0 counter_0 local-sym_0)"
 "(begin"
 "(lambda(ids_0 rhs_0 phase_0)"
 "(let-values(((keys_0)"
@@ -41569,10 +41584,13 @@ static const char *startup_source =
 "((phase33_0)"
 " phase_0)"
 "((counter34_0)"
-" counter_0))"
-"(add-local-binding!37.1"
+" counter_0)"
+"((local-sym35_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
 " #f"
 " #f"
+" local-sym35_0"
 " id32_0"
 " phase33_0"
 " counter34_0))))"
@@ -43364,7 +43382,7 @@ static const char *startup_source =
 "((id213_0) id_0)"
 "((in-s214_0) in-s_0)"
 "((out-of-context-as-variable?215_0) out-of-context-as-variable?_0))"
-"(binding-lookup50.1"
+"(binding-lookup52.1"
 " in-s214_0"
 " out-of-context-as-variable?215_0"
 " b208_0"
@@ -43420,7 +43438,11 @@ static const char *startup_source =
 "(if local?_0"
 "(make-local-lift"
 " lift-env_0"
-"(root-expand-context-counter ctx_1))"
+"(root-expand-context-counter ctx_1)"
+"(if(expand-context-normalize-locals?"
+" ctx_1)"
+" 'lift"
+" #f))"
 "(make-top-level-lift ctx_1)))"
 "((temp217_0)"
 "(if(not local?_0)"
@@ -43511,6 +43533,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -43715,6 +43739,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros? the-struct_1)))"
 "                                            (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_1)))))"
 "(expand-context/outer1.1"
@@ -44365,6 +44390,11 @@ static const char *startup_source =
 " intdef-ids_0)))"
 "(void)))"
 "(values))))"
+"(let-values(((counter_0)(root-expand-context-counter ctx_0)))"
+"(let-values(((local-sym_0)"
+"(if(expand-context-normalize-locals? ctx_0)"
+" 'loc"
+" #f)))"
 "(let-values(((syms_0)"
 "(reverse$1"
 "(let-values(((lst_0) intdef-ids_0))"
@@ -44395,18 +44425,20 @@ static const char *startup_source =
 " intdef-id_0)"
 "((phase55_0)"
 " phase_0)"
-"((temp56_0)"
-"(root-expand-context-counter"
-" ctx_0))"
+"((counter56_0)"
+" counter_0)"
 "((temp57_0)"
 "(internal-definition-context-frame-id"
-" intdef_0)))"
-"(add-local-binding!37.1"
+" intdef_0))"
+"((local-sym58_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
 " temp57_0"
 " #f"
+" local-sym58_0"
 " intdef-id54_0"
 " phase55_0"
-" temp56_0)))"
+" counter56_0)))"
 " fold-var_1))))"
 "(values"
 " fold-var_2)))))"
@@ -44424,14 +44456,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((input-s_0)"
 "(flip-introduction-scopes"
-"(let-values(((s58_0) s_0)"
-"((all-intdefs59_0)"
+"(let-values(((s59_0) s_0)"
+"((all-intdefs60_0)"
 " all-intdefs_0))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
-" s58_0"
-" all-intdefs59_0))"
+" s59_0"
+" all-intdefs60_0))"
 " ctx_0)))"
 "(let-values(((tmp-env_0)"
 "(let-values(((lst_0) syms_0)"
@@ -44492,7 +44524,8 @@ static const char *startup_source =
 " env_1)))"
 " env_0)))))"
 " for-loop_0)"
-"(expand-context-env ctx_0)"
+"(expand-context-env"
+" ctx_0)"
 " lst_0"
 " lst_1)))))"
 "(let-values((()"
@@ -44513,20 +44546,20 @@ static const char *startup_source =
 " 'syntax-local-bind-syntaxes"
 " input-s_0"
 " ids_0"
-"(let-values(((temp60_0)"
+"(let-values(((temp61_0)"
 "(let-values(((v_0)"
 " ctx_0))"
 "(let-values(((the-struct_0)"
 " v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((env63_0)"
+"(let-values(((env64_0)"
 " tmp-env_0)"
-"((inner64_0)"
+"((inner65_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner64_0"
+" inner65_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -44535,7 +44568,7 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-context"
 " the-struct_0)"
-" env63_0"
+" env64_0"
 "(expand-context/outer-scopes"
 " the-struct_0)"
 "(expand-context/outer-def-ctx-scopes"
@@ -44556,21 +44589,21 @@ static const char *startup_source =
 " the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                \"expand-context/outer?\""
+"                                                                                                                    \"expand-context/outer?\""
 " the-struct_0)))))"
-"((temp61_0)"
+"((temp62_0)"
 " 'expression)"
-"((all-intdefs62_0)"
+"((all-intdefs63_0)"
 " all-intdefs_0))"
 "(make-local-expand-context42.1"
-" temp61_0"
-" all-intdefs62_0"
+" temp62_0"
+" all-intdefs63_0"
 " #t"
 " unsafe-undefined"
 " #f"
 " #f"
 " #f"
-" temp60_0)))))"
+" temp61_0)))))"
 "(begin"
 "(let-values(((obs_0)"
 "(expand-context-observer"
@@ -44592,7 +44625,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_0)))"
 "((letrec-values(((for-loop_0)"
-"(lambda(fold-var_0 lst_1)"
+"(lambda(fold-var_0"
+" lst_1)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_1)"
@@ -44624,7 +44658,8 @@ static const char *startup_source =
 " null"
 " lst_0))))))))"
 "(let-values(((env-mixins_0)"
-"(internal-definition-context-env-mixins intdef_0)))"
+"(internal-definition-context-env-mixins"
+" intdef_0)))"
 "(begin"
 "(set-box!"
 " env-mixins_0"
@@ -44716,7 +44751,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()"
 "(call-expand-observe obs_0 'exit-local-bind)))"
-"(void))))))))))))))))))))))))))"
+"(void))))))))))))))))))))))))))))"
 "(case-lambda"
 "((ids_0 s_0 intdef_0)(begin 'syntax-local-bind-syntaxes(syntax-local-bind-syntaxes11_0 ids_0 s_0 intdef_0 '())))"
 "((ids_0 s_0 intdef_0 extra-intdefs7_0)(syntax-local-bind-syntaxes11_0 ids_0 s_0 intdef_0 extra-intdefs7_0)))))"
@@ -44778,10 +44813,10 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_0)))"
-"(let-values(((s65_0) s_0)"
-"((intdef66_0) intdef_0)"
-"((temp67_0) #t)"
-"((temp68_0)"
+"(let-values(((s66_0) s_0)"
+"((intdef67_0) intdef_0)"
+"((temp68_0) #t)"
+"((temp69_0)"
 "(let-values(((tmp_0) mode_0))"
 "(if(equal? tmp_0 'add)"
 "(let-values() add-scope)"
@@ -44794,7 +44829,7 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                                       \"(or/c 'add 'remove 'flip)\""
 " mode_0))))))))"
-"(add-intdef-scopes24.1 temp68_0 temp67_0 s65_0 intdef66_0)))))))))))"
+"(add-intdef-scopes24.1 temp69_0 temp68_0 s66_0 intdef67_0)))))))))))"
 "(case-lambda"
 "((intdef_0 s_0)"
 "(begin 'internal-definition-context-introduce(internal-definition-context-introduce16_0 intdef_0 s_0 'flip)))"
@@ -45024,9 +45059,9 @@ static const char *startup_source =
 "(let-values(((v_0) ctx_0))"
 "(let-values(((the-struct_0) v_0))"
 "(if(expand-context/outer? the-struct_0)"
-"(let-values(((context69_0) context_0)"
-"((env70_0)(add-intdef-bindings(expand-context-env ctx_0) intdefs_0))"
-"((use-site-scopes71_0)"
+"(let-values(((context70_0) context_0)"
+"((env71_0)(add-intdef-bindings(expand-context-env ctx_0) intdefs_0))"
+"((use-site-scopes72_0)"
 "(if(let-values(((or-part_0)(eq? context_0 'module)))"
 "(if or-part_0"
 " or-part_0"
@@ -45036,7 +45071,7 @@ static const char *startup_source =
 "(root-expand-context-use-site-scopes ctx_0)))"
 "(if or-part_0 or-part_0(box null)))"
 " #f))"
-"((frame-id72_0)"
+"((frame-id73_0)"
 "(let-values(((x_0)"
 "(let-values(((a_0) intdefs_0))"
 "(if(list? a_0)"
@@ -45085,7 +45120,7 @@ static const char *startup_source =
 " for-loop_0)"
 "(root-expand-context-frame-id ctx_0)"
 " x_0))))"
-"((post-expansion73_0)"
+"((post-expansion74_0)"
 "(let-values(((pe_0)"
 "(if same-kind?_0"
 "(if(let-values(((or-part_0)(pair? context_0)))"
@@ -45101,34 +45136,34 @@ static const char *startup_source =
 "(let-values()"
 "(lambda(s_0)"
 "(begin"
-" 'post-expansion73"
-"(let-values(((temp79_0)(apply-post-expansion pe_0 s_0))"
-"((intdefs80_0) intdefs_0))"
+" 'post-expansion74"
+"(let-values(((temp80_0)(apply-post-expansion pe_0 s_0))"
+"((intdefs81_0) intdefs_0))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
-" temp79_0"
-" intdefs80_0)))))"
+" temp80_0"
+" intdefs81_0)))))"
 "(let-values() pe_0))))"
-"((scopes74_0)(append def-ctx-scopes_0(expand-context-scopes ctx_0)))"
-"((only-immediate?75_0)(not stop-ids_0))"
-"((current-introduction-scopes76_0) null)"
-"((need-eventually-defined77_0)"
+"((scopes75_0)(append def-ctx-scopes_0(expand-context-scopes ctx_0)))"
+"((only-immediate?76_0)(not stop-ids_0))"
+"((current-introduction-scopes77_0) null)"
+"((need-eventually-defined78_0)"
 "(let-values(((ht_0)(expand-context-need-eventually-defined ctx_0)))"
 "(if track-to-be-defined?_0"
 "(let-values() ht_0)"
 "(if ht_0(let-values()(make-hasheqv))(let-values() #f)))))"
-"((inner78_0)"
+"((inner79_0)"
 "(let-values(((the-struct_1)(root-expand-context/outer-inner v_0)))"
 "(if(expand-context/inner? the-struct_1)"
-"(let-values(((to-parsed?81_0)"
+"(let-values(((to-parsed?82_0)"
 "(if to-parsed-ok?_0"
 "(expand-context-to-parsed? ctx_0)"
 " #f))"
-"((just-once?82_0) #f)"
-"((in-local-expand?83_0) #t)"
-"((keep-#%expression?84_0) keep-#%expression?_0)"
-"((stops85_0)"
+"((just-once?83_0) #f)"
+"((in-local-expand?84_0) #t)"
+"((keep-#%expression?85_0) keep-#%expression?_0)"
+"((stops86_0)"
 "(free-id-set"
 " phase_0"
 "(let-values(((or-part_0) all-stop-ids_0))"
@@ -45141,15 +45176,15 @@ static const char *startup_source =
 "(root-expand-context/inner-defined-syms the-struct_1)"
 "(root-expand-context/inner-counter the-struct_1)"
 "(root-expand-context/inner-lift-key the-struct_1)"
-" to-parsed?81_0"
+" to-parsed?82_0"
 "(expand-context/inner-phase the-struct_1)"
 "(expand-context/inner-namespace the-struct_1)"
-" just-once?82_0"
+" just-once?83_0"
 "(expand-context/inner-module-begin-k the-struct_1)"
 "(expand-context/inner-allow-unbound? the-struct_1)"
-" in-local-expand?83_0"
-" keep-#%expression?84_0"
-" stops85_0"
+" in-local-expand?84_0"
+" keep-#%expression?85_0"
+" stops86_0"
 "(expand-context/inner-declared-submodule-names the-struct_1)"
 "(expand-context/inner-lifts the-struct_1)"
 "(expand-context/inner-lift-envs the-struct_1)"
@@ -45160,6 +45195,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -45167,19 +45203,19 @@ static const char *startup_source =
 "                                                       \"expand-context/inner?\""
 " the-struct_1)))))"
 "(expand-context/outer1.1"
-" inner78_0"
-" post-expansion73_0"
-" use-site-scopes71_0"
-" frame-id72_0"
-" context69_0"
-" env70_0"
-" scopes74_0"
+" inner79_0"
+" post-expansion74_0"
+" use-site-scopes72_0"
+" frame-id73_0"
+" context70_0"
+" env71_0"
+" scopes75_0"
 "(expand-context/outer-def-ctx-scopes the-struct_0)"
 "(expand-context/outer-binding-layer the-struct_0)"
 "(expand-context/outer-reference-records the-struct_0)"
-" only-immediate?75_0"
-" need-eventually-defined77_0"
-" current-introduction-scopes76_0"
+" only-immediate?76_0"
+" need-eventually-defined78_0"
+" current-introduction-scopes77_0"
 "(expand-context/outer-current-use-scopes the-struct_0)"
 "(expand-context/outer-name the-struct_0)))"
 "(raise-argument-error"
@@ -48206,7 +48242,7 @@ static const char *startup_source =
 "((temp120_0)"
 "(namespace-phase ns_0))"
 "((id121_0) id_0))"
-"(binding-lookup50.1"
+"(binding-lookup52.1"
 " #f"
 " #f"
 " b116_0"
@@ -48910,6 +48946,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros? the-struct_1)))"
 "(raise-argument-error"
 " 'struct-copy"
@@ -49075,6 +49112,8 @@ static const char *startup_source =
 " for-serializable?182_0"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -49195,6 +49234,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -49723,6 +49764,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -65440,6 +65483,11 @@ static const char *startup_source =
 "(let-values(((counter_0)"
 "(root-expand-context-counter"
 " ctx_0)))"
+"(let-values(((local-sym_0)"
+"(if(expand-context-normalize-locals?"
+" ctx_0)"
+" 'loc"
+" #f)))"
 "(let-values(((keys_0)"
 "(reverse$1"
 "(let-values(((lst_0)"
@@ -65480,10 +65528,13 @@ static const char *startup_source =
 "((frame-id105_0)"
 " frame-id_0)"
 "((exp-body106_0)"
-" exp-body_0))"
-"(add-local-binding!37.1"
+" exp-body_0)"
+"((local-sym107_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
 " frame-id105_0"
 " exp-body106_0"
+" local-sym107_0"
 " id102_0"
 " phase103_0"
 " counter104_0)))"
@@ -65573,17 +65624,17 @@ static const char *startup_source =
 " v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((env107_0)"
+"(let-values(((env108_0)"
 " extended-env_0)"
-"((binding-layer108_0)"
+"((binding-layer109_0)"
 "(maybe-increment-binding-layer_0"
 " ids_0"
 " body-ctx_1))"
-"((inner109_0)"
+"((inner110_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner109_0"
+" inner110_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -65592,12 +65643,12 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-context"
 " the-struct_0)"
-" env107_0"
+" env108_0"
 "(expand-context/outer-scopes"
 " the-struct_0)"
 "(expand-context/outer-def-ctx-scopes"
 " the-struct_0)"
-" binding-layer108_0"
+" binding-layer109_0"
 "(expand-context/outer-reference-records"
 " the-struct_0)"
 "(expand-context/outer-only-immediate?"
@@ -65612,7 +65663,7 @@ static const char *startup_source =
 " the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                      \"expand-context/outer?\""
+"                                                                                                        \"expand-context/outer?\""
 " the-struct_0))))"
 " rest-bodys_0"
 " null"
@@ -65764,18 +65815,18 @@ static const char *startup_source =
 " lst_0))))"
 " val-rhss_0))"
 "(cons"
-"(let-values(((body-ctx110_0)"
+"(let-values(((body-ctx111_0)"
 " body-ctx_1)"
-"((exp-body111_0)"
+"((exp-body112_0)"
 " exp-body_0)"
-"((temp112_0)"
+"((temp113_0)"
 " #t))"
 "(keep-as-needed119.1"
-" temp112_0"
+" temp113_0"
 " #f"
 " #f"
-" body-ctx110_0"
-" exp-body111_0))"
+" body-ctx111_0"
+" exp-body112_0))"
 "(append"
 "(reverse$1"
 "(let-values(((lst_0)"
@@ -65825,7 +65876,7 @@ static const char *startup_source =
 " trans-idss_0"
 " trans-stxs_0"
 " stx-clauses_0"
-" new-dups_0))))))))))"
+" new-dups_0)))))))))))"
 "(if(equal? tmp_0 'define-syntaxes)"
 "(let-values()"
 "(let-values((()"
@@ -65842,16 +65893,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_0"
-" define-syntaxes113_0"
-" id114_0"
-" rhs115_0)"
+" define-syntaxes114_0"
+" id115_0"
+" rhs116_0)"
 "(let-values(((s_1)"
 " disarmed-exp-body_0))"
 "(let-values(((orig-s_0)"
 " s_1))"
-"(let-values(((define-syntaxes113_0"
-" id114_0"
-" rhs115_0)"
+"(let-values(((define-syntaxes114_0"
+" id115_0"
+" rhs116_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1"
 " s_1)"
@@ -65860,13 +65911,13 @@ static const char *startup_source =
 " s_1)))"
 "(if(pair?"
 " s_2)"
-"(let-values(((define-syntaxes116_0)"
+"(let-values(((define-syntaxes117_0)"
 "(let-values(((s_3)"
 "(car"
 " s_2)))"
 " s_3))"
-"((id117_0"
-" rhs118_0)"
+"((id118_0"
+" rhs119_0)"
 "(let-values(((s_3)"
 "(cdr"
 " s_2)))"
@@ -65878,7 +65929,7 @@ static const char *startup_source =
 " s_3)))"
 "(if(pair?"
 " s_4)"
-"(let-values(((id119_0)"
+"(let-values(((id120_0)"
 "(let-values(((s_5)"
 "(car"
 " s_4)))"
@@ -65927,7 +65978,7 @@ static const char *startup_source =
 " id_0))"
 "(let-values(((id_2)"
 "(let-values()"
-"(let-values(((id122_0)"
+"(let-values(((id123_0)"
 "(let-values()"
 "(if(let-values(((or-part_0)"
 "(if(syntax?$1"
@@ -65947,7 +65998,7 @@ static const char *startup_source =
 " orig-s_0"
 " s_7)))))"
 "(cons"
-" id122_0"
+" id123_0"
 " id_1)))))"
 "(values"
 " id_2)))))"
@@ -65963,7 +66014,7 @@ static const char *startup_source =
 " lst_0)))))"
 "(reverse$1"
 " id_0))))))))"
-"((rhs120_0)"
+"((rhs121_0)"
 "(let-values(((s_5)"
 "(cdr"
 " s_4)))"
@@ -65975,7 +66026,7 @@ static const char *startup_source =
 " s_5)))"
 "(if(pair?"
 " s_6)"
-"(let-values(((rhs121_0)"
+"(let-values(((rhs122_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
@@ -65998,34 +66049,34 @@ static const char *startup_source =
 "                                                                                                                                                                                   \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" rhs121_0))"
+" rhs122_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                               \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" id119_0"
-" rhs120_0))"
+" id120_0"
+" rhs121_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                           \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" define-syntaxes116_0"
-" id117_0"
-" rhs118_0))"
+" define-syntaxes117_0"
+" id118_0"
+" rhs119_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                       \"bad syntax\""
 " orig-s_0)))))"
 "(values"
 " #t"
-" define-syntaxes113_0"
-" id114_0"
-" rhs115_0))))))"
+" define-syntaxes114_0"
+" id115_0"
+" rhs116_0))))))"
 "(let-values(((ids_0)"
 "(remove-use-site-scopes"
-" id114_0"
+" id115_0"
 " body-ctx_1)))"
 "(let-values((()"
 "(begin"
@@ -66042,27 +66093,32 @@ static const char *startup_source =
 " #f"
 "(list"
 " ids_0"
-" rhs115_0)))))"
+" rhs116_0)))))"
 "(void)))"
 "(values))))"
 "(let-values(((new-dups_0)"
-"(let-values(((ids123_0)"
+"(let-values(((ids124_0)"
 " ids_0)"
-"((phase124_0)"
+"((phase125_0)"
 " phase_0)"
-"((exp-body125_0)"
+"((exp-body126_0)"
 " exp-body_0)"
-"((dups126_0)"
+"((dups127_0)"
 " dups_0))"
 "(check-no-duplicate-ids7.1"
 " unsafe-undefined"
-" ids123_0"
-" phase124_0"
-" exp-body125_0"
-" dups126_0))))"
+" ids124_0"
+" phase125_0"
+" exp-body126_0"
+" dups127_0))))"
 "(let-values(((counter_0)"
 "(root-expand-context-counter"
 " ctx_0)))"
+"(let-values(((local-sym_0)"
+"(if(expand-context-normalize-locals?"
+" ctx_0)"
+" 'mac"
+" #f)))"
 "(let-values(((keys_0)"
 "(reverse$1"
 "(let-values(((lst_0)"
@@ -66094,22 +66150,25 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id127_0)"
+"(let-values(((id128_0)"
 " id_0)"
-"((phase128_0)"
+"((phase129_0)"
 " phase_0)"
-"((counter129_0)"
+"((counter130_0)"
 " counter_0)"
-"((frame-id130_0)"
+"((frame-id131_0)"
 " frame-id_0)"
-"((exp-body131_0)"
-" exp-body_0))"
-"(add-local-binding!37.1"
-" frame-id130_0"
-" exp-body131_0"
-" id127_0"
-" phase128_0"
-" counter129_0)))"
+"((exp-body132_0)"
+" exp-body_0)"
+"((local-sym133_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
+" frame-id131_0"
+" exp-body132_0"
+" local-sym133_0"
+" id128_0"
+" phase129_0"
+" counter130_0)))"
 " fold-var_1))))"
 "(values"
 " fold-var_2)))))"
@@ -66157,7 +66216,7 @@ static const char *startup_source =
 "(let-values(((vals_0)"
 "(eval-for-syntaxes-binding"
 " 'define-syntaxes"
-" rhs115_0"
+" rhs116_0"
 " ids_0"
 " body-ctx_1)))"
 "(let-values(((extended-env_0)"
@@ -66269,17 +66328,17 @@ static const char *startup_source =
 " v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((env132_0)"
+"(let-values(((env134_0)"
 " extended-env_0)"
-"((binding-layer133_0)"
+"((binding-layer135_0)"
 "(maybe-increment-binding-layer_0"
 " ids_0"
 " body-ctx_1))"
-"((inner134_0)"
+"((inner136_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner134_0"
+" inner136_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -66288,12 +66347,12 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-context"
 " the-struct_0)"
-" env132_0"
+" env134_0"
 "(expand-context/outer-scopes"
 " the-struct_0)"
 "(expand-context/outer-def-ctx-scopes"
 " the-struct_0)"
-" binding-layer133_0"
+" binding-layer135_0"
 "(expand-context/outer-reference-records"
 " the-struct_0)"
 "(expand-context/outer-only-immediate?"
@@ -66308,7 +66367,7 @@ static const char *startup_source =
 " the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                  \"expand-context/outer?\""
+"                                                                                                                    \"expand-context/outer?\""
 " the-struct_0))))"
 " rest-bodys_0"
 " done-bodys_0"
@@ -66320,28 +66379,28 @@ static const char *startup_source =
 " ids_0"
 " trans-idss_0)"
 "(cons"
-"(let-values(((body-ctx135_0)"
+"(let-values(((body-ctx137_0)"
 " body-ctx_1)"
-"((exp-body136_0)"
+"((exp-body138_0)"
 " exp-body_0)"
-"((temp137_0)"
+"((temp139_0)"
 " #t))"
 "(keep-as-needed119.1"
-" temp137_0"
+" temp139_0"
 " #f"
 " #f"
-" body-ctx135_0"
-" exp-body136_0))"
+" body-ctx137_0"
+" exp-body138_0))"
 " trans-stxs_0)"
 "(cons"
 "(datum->syntax$1"
 " #f"
 "(list"
 " ids_0"
-" rhs115_0)"
+" rhs116_0)"
 " exp-body_0)"
 " stx-clauses_0)"
-" new-dups_0)))))))))))))))"
+" new-dups_0))))))))))))))))"
 "(let-values()"
 "(if stratified?_0"
 "(let-values()"
@@ -66459,31 +66518,31 @@ static const char *startup_source =
 " def-ctx-scopes_0)))"
 "(let-values(((the-struct_0) v_0))"
 "(if(expand-context/outer? the-struct_0)"
-"(let-values(((context138_0) 'expression)"
-"((use-site-scopes139_0)(box null))"
-"((scopes140_0)"
+"(let-values(((context140_0) 'expression)"
+"((use-site-scopes141_0)(box null))"
+"((scopes142_0)"
 "(append"
 "(unbox"
 "(root-expand-context-use-site-scopes"
 " body-ctx_0))"
 "(expand-context-scopes body-ctx_0)))"
-"((only-immediate?141_0) #f)"
-"((def-ctx-scopes142_0) #f)"
-"((post-expansion143_0) #f)"
-"((inner144_0)"
+"((only-immediate?143_0) #f)"
+"((def-ctx-scopes144_0) #f)"
+"((post-expansion145_0) #f)"
+"((inner146_0)"
 "(root-expand-context/outer-inner v_0)))"
 "(expand-context/outer1.1"
-" inner144_0"
-" post-expansion143_0"
-" use-site-scopes139_0"
+" inner146_0"
+" post-expansion145_0"
+" use-site-scopes141_0"
 "(root-expand-context/outer-frame-id the-struct_0)"
-" context138_0"
+" context140_0"
 "(expand-context/outer-env the-struct_0)"
-" scopes140_0"
-" def-ctx-scopes142_0"
+" scopes142_0"
+" def-ctx-scopes144_0"
 "(expand-context/outer-binding-layer the-struct_0)"
 "(expand-context/outer-reference-records the-struct_0)"
-" only-immediate?141_0"
+" only-immediate?143_0"
 "(expand-context/outer-need-eventually-defined"
 " the-struct_0)"
 "(expand-context/outer-current-introduction-scopes"
@@ -66583,9 +66642,9 @@ static const char *startup_source =
 " obs_0"
 " 'next)))"
 "(void)))"
-"(let-values(((done-body145_0)"
+"(let-values(((done-body147_0)"
 " done-body_0)"
-"((temp146_0)"
+"((temp148_0)"
 "(if(if name_0"
 "(="
 " i_0"
@@ -66597,13 +66656,13 @@ static const char *startup_source =
 " v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((name147_0)"
+"(let-values(((name149_0)"
 " name_0)"
-"((inner148_0)"
+"((inner150_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner148_0"
+" inner150_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -66630,7 +66689,7 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-current-use-scopes"
 " the-struct_0)"
-" name147_0))"
+" name149_0))"
 "(raise-argument-error"
 " 'struct-copy"
 "                                                                                                                                                                             \"expand-context/outer?\""
@@ -66640,8 +66699,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" done-body145_0"
-" temp146_0))))"
+" done-body147_0"
+" temp148_0))))"
 " fold-var_1))))"
 "(values"
 " fold-var_2)))))"
@@ -66705,29 +66764,29 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-s_0)"
-"(let-values(((val-idss149_0) val-idss_0)"
-"((val-keyss150_0) val-keyss_0)"
-"((val-rhss151_0) val-rhss_0)"
-"((track-stxs152_0) track-stxs_0)"
-"((temp153_0)(not stratified?_0))"
-"((frame-id154_0) frame-id_0)"
-"((finish-ctx155_0) finish-ctx_0)"
-"((s156_0) s_0)"
-"((temp157_0)(pair? stx-clauses_0))"
-"((finish-bodys158_0) finish-bodys_0)"
-"((temp159_0) #f))"
+"(let-values(((val-idss151_0) val-idss_0)"
+"((val-keyss152_0) val-keyss_0)"
+"((val-rhss153_0) val-rhss_0)"
+"((track-stxs154_0) track-stxs_0)"
+"((temp155_0)(not stratified?_0))"
+"((frame-id156_0) frame-id_0)"
+"((finish-ctx157_0) finish-ctx_0)"
+"((s158_0) s_0)"
+"((temp159_0)(pair? stx-clauses_0))"
+"((finish-bodys160_0) finish-bodys_0)"
+"((temp161_0) #f))"
 "(expand-and-split-bindings-by-reference52.1"
-" finish-ctx155_0"
-" frame-id154_0"
-" finish-bodys158_0"
-" temp157_0"
-" s156_0"
-" temp153_0"
+" finish-ctx157_0"
+" frame-id156_0"
+" finish-bodys160_0"
 " temp159_0"
-" val-idss149_0"
-" val-keyss150_0"
-" val-rhss151_0"
-" track-stxs152_0))))"
+" s158_0"
+" temp155_0"
+" temp161_0"
+" val-idss151_0"
+" val-keyss152_0"
+" val-rhss153_0"
+" track-stxs154_0))))"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer body-ctx_0)))"
 "(if obs_0"
@@ -66846,9 +66905,9 @@ static const char *startup_source =
 " accum-keyss_0"
 " accum-rhss_0))"
 " exp-body_0))"
-"(let-values(((track?160_0) track?_1)"
-"((s161_0) s_0)"
-"((temp162_0)"
+"(let-values(((track?162_0) track?_1)"
+"((s163_0) s_0)"
+"((temp164_0)"
 "(list*"
 "(if(null? accum-idss_0)"
 "(core-id"
@@ -66863,9 +66922,9 @@ static const char *startup_source =
 " accum-track-stxs_0)"
 " exp-body_0)))"
 "(rebuild5.1"
-" track?160_0"
-" s161_0"
-" temp162_0)))))"
+" track?162_0"
+" s163_0"
+" temp164_0)))))"
 "(begin"
 "(let-values(((obs_0)"
 "(expand-context-observer ctx_0)))"
@@ -66896,8 +66955,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((ids_0)(car idss_1)))"
 "(let-values(((expanded-rhs_0)"
-"(let-values(((temp163_0)(car rhss_1))"
-"((temp164_0)"
+"(let-values(((temp165_0)(car rhss_1))"
+"((temp166_0)"
 "(as-named-context"
 " ctx_0"
 " ids_0)))"
@@ -66905,8 +66964,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp163_0"
-" temp164_0))))"
+" temp165_0"
+" temp166_0))))"
 "(let-values(((track-stx_0)(car track-stxs_1)))"
 "(let-values(((local-or-forward-references?_0)"
 "(reference-record-forward-references?"
@@ -66957,11 +67016,11 @@ static const char *startup_source =
 "(car keyss_1)"
 " expanded-rhs_0))"
 " exp-rest_0)"
-"(let-values(((track?165_0)"
+"(let-values(((track?167_0)"
 " track?_1)"
-"((s166_0)"
+"((s168_0)"
 " s_0)"
-"((temp167_0)"
+"((temp169_0)"
 "(list*"
 "(core-id"
 " 'let-values"
@@ -66973,9 +67032,9 @@ static const char *startup_source =
 " track-stx_0))"
 " exp-rest_0)))"
 "(rebuild5.1"
-" track?165_0"
-" s166_0"
-" temp167_0)))))"
+" track?167_0"
+" s168_0"
+" temp169_0)))))"
 "(begin"
 "(let-values(((obs_0)"
 "(expand-context-observer"
@@ -67037,11 +67096,11 @@ static const char *startup_source =
 " accum-keyss_0"
 " accum-rhss_0)))"
 " exp-rest_0)"
-"(let-values(((track?168_0)"
+"(let-values(((track?170_0)"
 " track?_1)"
-"((s169_0)"
+"((s171_0)"
 " s_0)"
-"((temp170_0)"
+"((temp172_0)"
 "(list*"
 "(core-id"
 " 'letrec-values"
@@ -67058,9 +67117,9 @@ static const char *startup_source =
 " accum-track-stxs_0))"
 " exp-rest_0)))"
 "(rebuild5.1"
-" track?168_0"
-" s169_0"
-" temp170_0)))))"
+" track?170_0"
+" s171_0"
+" temp172_0)))))"
 "(begin"
 "(let-values(((obs_0)"
 "(expand-context-observer"
@@ -67240,6 +67299,7 @@ static const char *startup_source =
 "(check-no-duplicate-ids7.1 temp36_0 ids33_0 phase34_0 s35_0 unsafe-undefined))"
 "(values))))"
 "(let-values(((counter_0)(root-expand-context-counter ctx_0)))"
+"(let-values(((local-sym_0)(if(expand-context-normalize-locals? ctx_0) 'arg #f)))"
 "(let-values(((keys_0)"
 "(reverse$1"
 "(let-values(((lst_0) ids_0))"
@@ -67267,16 +67327,21 @@ static const char *startup_source =
 "((counter39_0)"
 " counter_0)"
 "((s40_0)"
-" s_0))"
-"(add-local-binding!37.1"
+" s_0)"
+"((local-sym41_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
 " #f"
 " s40_0"
+" local-sym41_0"
 " id37_0"
 " phase38_0"
 " counter39_0)))"
 " fold-var_1))))"
 "(values fold-var_2)))))"
-"(if(not #f)(for-loop_0 fold-var_1 rest_0) fold-var_1)))"
+"(if(not #f)"
+"(for-loop_0 fold-var_1 rest_0)"
+" fold-var_1)))"
 " fold-var_0)))))"
 " for-loop_0)"
 " null"
@@ -67331,7 +67396,8 @@ static const char *startup_source =
 "(let-values(((body_0)(unsafe-car lst_1))"
 "((rest_0)(unsafe-cdr lst_1)))"
 "(let-values(((fold-var_1)"
-"(let-values(((fold-var_1) fold-var_0))"
+"(let-values(((fold-var_1)"
+" fold-var_0))"
 "(let-values(((fold-var_2)"
 "(let-values()"
 "(cons"
@@ -67365,22 +67431,22 @@ static const char *startup_source =
 "(let-values(((v_0) ctx_0))"
 "(let-values(((the-struct_0) v_0))"
 "(if(expand-context/outer? the-struct_0)"
-"(let-values(((env41_0) body-env_0)"
-"((scopes42_0)(cons sc_0(expand-context-scopes ctx_0)))"
-"((binding-layer43_0)"
+"(let-values(((env42_0) body-env_0)"
+"((scopes43_0)(cons sc_0(expand-context-scopes ctx_0)))"
+"((binding-layer44_0)"
 "(increment-binding-layer ids_0 ctx_0 sc_0))"
-"((frame-id44_0) #f)"
-"((inner45_0)(root-expand-context/outer-inner v_0)))"
+"((frame-id45_0) #f)"
+"((inner46_0)(root-expand-context/outer-inner v_0)))"
 "(expand-context/outer1.1"
-" inner45_0"
+" inner46_0"
 "(root-expand-context/outer-post-expansion the-struct_0)"
 "(root-expand-context/outer-use-site-scopes the-struct_0)"
-" frame-id44_0"
+" frame-id45_0"
 "(expand-context/outer-context the-struct_0)"
-" env41_0"
-" scopes42_0"
+" env42_0"
+" scopes43_0"
 "(expand-context/outer-def-ctx-scopes the-struct_0)"
-" binding-layer43_0"
+" binding-layer44_0"
 "(expand-context/outer-reference-records the-struct_0)"
 "(expand-context/outer-only-immediate? the-struct_0)"
 "(expand-context/outer-need-eventually-defined the-struct_0)"
@@ -67389,20 +67455,20 @@ static const char *startup_source =
 "(expand-context/outer-name the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                               \"expand-context/outer?\""
+"                                                 \"expand-context/outer?\""
 " the-struct_0))))))"
 "(let-values(((exp-body_0)"
-"(let-values(((sc-bodys46_0) sc-bodys_0)"
-"((body-ctx47_0) body-ctx_0)"
-"((temp48_0)"
-"(let-values(((ctx49_0) ctx_0)((s50_0) s_0)((temp51_0) #t))"
-"(keep-as-needed119.1 #f temp51_0 #f ctx49_0 s50_0))))"
-"(expand-body7.1 temp48_0 #f sc-bodys46_0 body-ctx47_0))))"
+"(let-values(((sc-bodys47_0) sc-bodys_0)"
+"((body-ctx48_0) body-ctx_0)"
+"((temp49_0)"
+"(let-values(((ctx50_0) ctx_0)((s51_0) s_0)((temp52_0) #t))"
+"(keep-as-needed119.1 #f temp52_0 #f ctx50_0 s51_0))))"
+"(expand-body7.1 temp49_0 #f sc-bodys47_0 body-ctx48_0))))"
 "(values"
 "(if(expand-context-to-parsed? ctx_0)"
 "(unflatten-like-formals keys_0 formals_0)"
 " sc-formals_0)"
-" exp-body_0))))))))))))))))"
+" exp-body_0)))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'lambda"
@@ -67413,21 +67479,21 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 lambda52_0 formals53_0 body54_0)"
+"(let-values(((ok?_0 lambda53_0 formals54_0 body55_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((lambda52_0 formals53_0 body54_0)"
+"(let-values(((lambda53_0 formals54_0 body55_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((lambda55_0)(let-values(((s_3)(car s_2))) s_3))"
-"((formals56_0 body57_0)"
+"(let-values(((lambda56_0)(let-values(((s_3)(car s_2))) s_3))"
+"((formals57_0 body58_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((formals58_0)"
+"(let-values(((formals59_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
-"((body59_0)"
+"((body60_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
@@ -67449,38 +67515,38 @@ static const char *startup_source =
 "                                                                                            \"bad syntax\""
 " orig-s_0))"
 "(let-values() flat-s_0))))))))"
-"(values formals58_0 body59_0))"
+"(values formals59_0 body60_0))"
 "                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values lambda55_0 formals56_0 body57_0))"
+"(values lambda56_0 formals57_0 body58_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t lambda52_0 formals53_0 body54_0))))))"
+"(values #t lambda53_0 formals54_0 body55_0))))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx60_0) ctx_0)((s61_0) s_0)((temp62_0) #t))"
-"(keep-as-needed119.1 #f #f temp62_0 ctx60_0 s61_0))))"
+"(let-values(((ctx61_0) ctx_0)((s62_0) s_0)((temp63_0) #t))"
+"(keep-as-needed119.1 #f #f temp63_0 ctx61_0 s62_0))))"
 "(let-values(((formals_0 body_0)"
-"(lambda-clause-expander s_0 disarmed-s_0 formals53_0 body54_0 ctx_0 'lambda-renames)))"
+"(lambda-clause-expander s_0 disarmed-s_0 formals54_0 body55_0 ctx_0 'lambda-renames)))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-lambda5.1 rebuild-s_0 formals_0 body_0)"
-"(let-values(((rebuild-s63_0) rebuild-s_0)((temp64_0)(list* lambda52_0 formals_0 body_0)))"
-"(rebuild5.1 #t rebuild-s63_0 temp64_0)))))))))))"
+"(let-values(((rebuild-s64_0) rebuild-s_0)((temp65_0)(list* lambda53_0 formals_0 body_0)))"
+"(rebuild5.1 #t rebuild-s64_0 temp65_0)))))))))))"
 "(void"
 "(add-core-form!*"
 " 'λ"
 "(lambda(s_0)"
-"(let-values(((ok?_0 lam-id65_0 formals66_0 _67_0)"
+"(let-values(((ok?_0 lam-id66_0 formals67_0 _68_0)"
 "(let-values(((s_1) s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((lam-id65_0 formals66_0 _67_0)"
+"(let-values(((lam-id66_0 formals67_0 _68_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((lam-id68_0)(let-values(((s_3)(car s_2))) s_3))"
-"((formals69_0 _70_0)"
+"(let-values(((lam-id69_0)(let-values(((s_3)(car s_2))) s_3))"
+"((formals70_0 _71_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((formals71_0)"
+"(let-values(((formals72_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
-"((_72_0)"
+"((_73_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
@@ -67501,21 +67567,21 @@ static const char *startup_source =
 "                                                                                        \"bad syntax\""
 " orig-s_0))"
 "(let-values() flat-s_0))))))))"
-"(values formals71_0 _72_0))"
+"(values formals72_0 _73_0))"
 "                                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values lam-id68_0 formals69_0 _70_0))"
+"(values lam-id69_0 formals70_0 _71_0))"
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t lam-id65_0 formals66_0 _67_0))))))"
-"(let-values(((ids_0)(parse-and-flatten-formals formals66_0 #f s_0)))"
-"(let-values(((ctx_0)(let-values(((temp77_0) #t))(get-current-expand-context18.1 temp77_0 'unexpected))))"
+"(values #t lam-id66_0 formals67_0 _68_0))))))"
+"(let-values(((ids_0)(parse-and-flatten-formals formals67_0 #f s_0)))"
+"(let-values(((ctx_0)(let-values(((temp78_0) #t))(get-current-expand-context18.1 temp78_0 'unexpected))))"
 "(let-values(((phase_0)(if ctx_0(expand-context-phase ctx_0) 0)))"
 "(begin"
-"               (let-values (((ids73_0) ids_0) ((phase74_0) phase_0) ((s75_0) s_0) ((temp76_0) \"argument name\"))"
-"(check-no-duplicate-ids7.1 temp76_0 ids73_0 phase74_0 s75_0 unsafe-undefined))"
+"               (let-values (((ids74_0) ids_0) ((phase75_0) phase_0) ((s76_0) s_0) ((temp77_0) \"argument name\"))"
+"(check-no-duplicate-ids7.1 temp77_0 ids74_0 phase75_0 s76_0 unsafe-undefined))"
 "(datum->syntax$1"
 " s_0"
 "(cons"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_0) 'lambda lam-id65_0 lam-id65_0)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_0) 'lambda lam-id66_0 lam-id66_0)"
 "(cdr(syntax-e$1 s_0)))"
 " s_0"
 " s_0)))))))))"
@@ -67529,14 +67595,14 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-case-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 case-lambda78_0 formals79_0 body80_0)"
+"(let-values(((ok?_0 case-lambda79_0 formals80_0 body81_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((case-lambda78_0 formals79_0 body80_0)"
+"(let-values(((case-lambda79_0 formals80_0 body81_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((case-lambda81_0)(let-values(((s_3)(car s_2))) s_3))"
-"((formals82_0 body83_0)"
+"(let-values(((case-lambda82_0)(let-values(((s_3)(car s_2))) s_3))"
+"((formals83_0 body84_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
@@ -67576,8 +67642,8 @@ static const char *startup_source =
 "(let-values(((formals_2"
 " body_2)"
 "(let-values()"
-"(let-values(((formals90_0"
-" body91_0)"
+"(let-values(((formals91_0"
+" body92_0)"
 "(let-values()"
 "(let-values(((s_6)"
 "(if(syntax?$1"
@@ -67587,12 +67653,12 @@ static const char *startup_source =
 " s_5)))"
 "(if(pair?"
 " s_6)"
-"(let-values(((formals84_0)"
+"(let-values(((formals85_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
 " s_7))"
-"((body85_0)"
+"((body86_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
@@ -67622,18 +67688,18 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_1))))))))"
 "(values"
-" formals84_0"
-" body85_0))"
+" formals85_0"
+" body86_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                      \"bad syntax\""
 " orig-s_0))))))"
 "(values"
 "(cons"
-" formals90_0"
+" formals91_0"
 " formals_1)"
 "(cons"
-" body91_0"
+" body92_0"
 " body_1))))))"
 "(values"
 " formals_2"
@@ -67657,17 +67723,17 @@ static const char *startup_source =
 "(values"
 "(reverse$1 formals_0)"
 "(reverse$1 body_0))))))))))"
-"(values case-lambda81_0 formals82_0 body83_0))"
+"(values case-lambda82_0 formals83_0 body84_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t case-lambda78_0 formals79_0 body80_0))))))"
-"(let-values(((ok?_1 case-lambda86_0 clause87_0)"
+"(values #t case-lambda79_0 formals80_0 body81_0))))))"
+"(let-values(((ok?_1 case-lambda87_0 clause88_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((case-lambda86_0 clause87_0)"
+"(let-values(((case-lambda87_0 clause88_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((case-lambda88_0)(let-values(((s_3)(car s_2))) s_3))"
-"((clause89_0)"
+"(let-values(((case-lambda89_0)(let-values(((s_3)(car s_2))) s_3))"
+"((clause90_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
@@ -67676,15 +67742,15 @@ static const char *startup_source =
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))"
 "(let-values() flat-s_0)))))))"
-"(values case-lambda88_0 clause89_0))"
+"(values case-lambda89_0 clause90_0))"
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t case-lambda86_0 clause87_0))))))"
+"(values #t case-lambda87_0 clause88_0))))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx92_0) ctx_0)((s93_0) s_0)((temp94_0) #t))"
-"(keep-as-needed119.1 #f #f temp94_0 ctx92_0 s93_0))))"
+"(let-values(((ctx93_0) ctx_0)((s94_0) s_0)((temp95_0) #t))"
+"(keep-as-needed119.1 #f #f temp95_0 ctx93_0 s94_0))))"
 "(let-values(((clauses_0)"
 "(reverse$1"
-"(let-values(((lst_0) formals79_0)((lst_1) body80_0)((lst_2) clause87_0))"
+"(let-values(((lst_0) formals80_0)((lst_1) body81_0)((lst_2) clause88_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -67726,16 +67792,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((rebuild-clause_0)"
-"(let-values(((ctx95_0)"
+"(let-values(((ctx96_0)"
 " ctx_0)"
-"((clause96_0)"
+"((clause97_0)"
 " clause_0))"
 "(keep-as-needed119.1"
 " #f"
 " #f"
 " #f"
-" ctx95_0"
-" clause96_0))))"
+" ctx96_0"
+" clause97_0))))"
 "(let-values(((exp-formals_0"
 " exp-body_0)"
 "(lambda-clause-expander"
@@ -67750,16 +67816,16 @@ static const char *startup_source =
 "(list"
 " exp-formals_0"
 " exp-body_0)"
-"(let-values(((rebuild-clause97_0)"
+"(let-values(((rebuild-clause98_0)"
 " rebuild-clause_0)"
-"((temp98_0)"
+"((temp99_0)"
 "(list*"
 " exp-formals_0"
 " exp-body_0)))"
 "(rebuild5.1"
 " #t"
-" rebuild-clause97_0"
-" temp98_0)))))))"
+" rebuild-clause98_0"
+" temp99_0)))))))"
 " fold-var_1))))"
 "(values fold-var_2)))))"
 "(if(not #f)"
@@ -67773,8 +67839,8 @@ static const char *startup_source =
 " lst_2))))))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-case-lambda6.1 rebuild-s_0 clauses_0)"
-"(let-values(((rebuild-s99_0) rebuild-s_0)((temp100_0)(list* case-lambda78_0 clauses_0)))"
-"(rebuild5.1 #t rebuild-s99_0 temp100_0))))))))))))"
+"(let-values(((rebuild-s100_0) rebuild-s_0)((temp101_0)(list* case-lambda79_0 clauses_0)))"
+"(rebuild5.1 #t rebuild-s100_0 temp101_0))))))))))))"
 "(define-values"
 "(parse-and-flatten-formals)"
 "(lambda(all-formals_0 sc_0 s_0)"
@@ -67848,39 +67914,39 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
 "(let-values(((ok?_0"
-" letrec-syntaxes+values101_0"
-" id:trans102_0"
-" trans-rhs103_0"
-" id:val104_0"
-" val-rhs105_0"
-" body106_0)"
+" letrec-syntaxes+values102_0"
+" id:trans103_0"
+" trans-rhs104_0"
+" id:val105_0"
+" val-rhs106_0"
+" body107_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(if syntaxes?_0 #t #f)"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((letrec-syntaxes+values101_0"
-" id:trans102_0"
-" trans-rhs103_0"
-" id:val104_0"
-" val-rhs105_0"
-" body106_0)"
+"(let-values(((letrec-syntaxes+values102_0"
+" id:trans103_0"
+" trans-rhs104_0"
+" id:val105_0"
+" val-rhs106_0"
+" body107_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((letrec-syntaxes+values107_0)"
+"(let-values(((letrec-syntaxes+values108_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((id:trans108_0"
-" trans-rhs109_0"
-" id:val110_0"
-" val-rhs111_0"
-" body112_0)"
+"((id:trans109_0"
+" trans-rhs110_0"
+" id:val111_0"
+" val-rhs112_0"
+" body113_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(if(pair? s_4)"
-"(let-values(((id:trans113_0"
-" trans-rhs114_0)"
+"(let-values(((id:trans114_0"
+" trans-rhs115_0)"
 "(let-values(((s_5)"
 "(car"
 " s_4)))"
@@ -67934,8 +68000,8 @@ static const char *startup_source =
 "(let-values(((id:trans_2"
 " trans-rhs_2)"
 "(let-values()"
-"(let-values(((id:trans144_0"
-" trans-rhs145_0)"
+"(let-values(((id:trans145_0"
+" trans-rhs146_0)"
 "(let-values()"
 "(let-values(((s_8)"
 "(if(syntax?$1"
@@ -67945,7 +68011,7 @@ static const char *startup_source =
 " s_7)))"
 "(if(pair?"
 " s_8)"
-"(let-values(((id:trans118_0)"
+"(let-values(((id:trans119_0)"
 "(let-values(((s_9)"
 "(car"
 " s_8)))"
@@ -67994,7 +68060,7 @@ static const char *startup_source =
 " id:trans_2))"
 "(let-values(((id:trans_4)"
 "(let-values()"
-"(let-values(((id:trans146_0)"
+"(let-values(((id:trans147_0)"
 "(let-values()"
 "(if(let-values(((or-part_0)"
 "(if(syntax?$1"
@@ -68014,7 +68080,7 @@ static const char *startup_source =
 " orig-s_0"
 " s_11)))))"
 "(cons"
-" id:trans146_0"
+" id:trans147_0"
 " id:trans_3)))))"
 "(values"
 " id:trans_4)))))"
@@ -68030,7 +68096,7 @@ static const char *startup_source =
 " lst_2)))))"
 "(reverse$1"
 " id:trans_2))))))))"
-"((trans-rhs119_0)"
+"((trans-rhs120_0)"
 "(let-values(((s_9)"
 "(cdr"
 " s_8)))"
@@ -68042,7 +68108,7 @@ static const char *startup_source =
 " s_9)))"
 "(if(pair?"
 " s_10)"
-"(let-values(((trans-rhs120_0)"
+"(let-values(((trans-rhs121_0)"
 "(let-values(((s_11)"
 "(car"
 " s_10)))"
@@ -68065,24 +68131,24 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                                   \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" trans-rhs120_0))"
+" trans-rhs121_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                               \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" id:trans118_0"
-" trans-rhs119_0))"
+" id:trans119_0"
+" trans-rhs120_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                           \"bad syntax\""
 " orig-s_0))))))"
 "(values"
 "(cons"
-" id:trans144_0"
+" id:trans145_0"
 " id:trans_1)"
 "(cons"
-" trans-rhs145_0"
+" trans-rhs146_0"
 " trans-rhs_1))))))"
 "(values"
 " id:trans_2"
@@ -68108,9 +68174,9 @@ static const char *startup_source =
 " id:trans_0)"
 "(reverse$1"
 " trans-rhs_0)))))))))"
-"((id:val115_0"
-" val-rhs116_0"
-" body117_0)"
+"((id:val116_0"
+" val-rhs117_0"
+" body118_0)"
 "(let-values(((s_5)"
 "(cdr"
 " s_4)))"
@@ -68121,8 +68187,8 @@ static const char *startup_source =
 " s_5)"
 " s_5)))"
 "(if(pair? s_6)"
-"(let-values(((id:val121_0"
-" val-rhs122_0)"
+"(let-values(((id:val122_0"
+" val-rhs123_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
@@ -68177,8 +68243,8 @@ static const char *startup_source =
 "(let-values(((id:val_2"
 " val-rhs_2)"
 "(let-values()"
-"(let-values(((id:val147_0"
-" val-rhs148_0)"
+"(let-values(((id:val148_0"
+" val-rhs149_0)"
 "(let-values()"
 "(let-values(((s_10)"
 "(if(syntax?$1"
@@ -68188,7 +68254,7 @@ static const char *startup_source =
 " s_9)))"
 "(if(pair?"
 " s_10)"
-"(let-values(((id:val124_0)"
+"(let-values(((id:val125_0)"
 "(let-values(((s_11)"
 "(car"
 " s_10)))"
@@ -68237,7 +68303,7 @@ static const char *startup_source =
 " id:val_2))"
 "(let-values(((id:val_4)"
 "(let-values()"
-"(let-values(((id:val149_0)"
+"(let-values(((id:val150_0)"
 "(let-values()"
 "(if(let-values(((or-part_0)"
 "(if(syntax?$1"
@@ -68257,7 +68323,7 @@ static const char *startup_source =
 " orig-s_0"
 " s_13)))))"
 "(cons"
-" id:val149_0"
+" id:val150_0"
 " id:val_3)))))"
 "(values"
 " id:val_4)))))"
@@ -68273,7 +68339,7 @@ static const char *startup_source =
 " lst_2)))))"
 "(reverse$1"
 " id:val_2))))))))"
-"((val-rhs125_0)"
+"((val-rhs126_0)"
 "(let-values(((s_11)"
 "(cdr"
 " s_10)))"
@@ -68285,7 +68351,7 @@ static const char *startup_source =
 " s_11)))"
 "(if(pair?"
 " s_12)"
-"(let-values(((val-rhs126_0)"
+"(let-values(((val-rhs127_0)"
 "(let-values(((s_13)"
 "(car"
 " s_12)))"
@@ -68308,24 +68374,24 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                                                       \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" val-rhs126_0))"
+" val-rhs127_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                   \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" id:val124_0"
-" val-rhs125_0))"
+" id:val125_0"
+" val-rhs126_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                               \"bad syntax\""
 " orig-s_0))))))"
 "(values"
 "(cons"
-" id:val147_0"
+" id:val148_0"
 " id:val_1)"
 "(cons"
-" val-rhs148_0"
+" val-rhs149_0"
 " val-rhs_1))))))"
 "(values"
 " id:val_2"
@@ -68351,7 +68417,7 @@ static const char *startup_source =
 " id:val_0)"
 "(reverse$1"
 " val-rhs_0)))))))))"
-"((body123_0)"
+"((body124_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
@@ -68381,59 +68447,59 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_0))))))))"
 "(values"
-" id:val121_0"
-" val-rhs122_0"
-" body123_0))"
+" id:val122_0"
+" val-rhs123_0"
+" body124_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                       \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" id:trans113_0"
-" trans-rhs114_0"
-" id:val115_0"
-" val-rhs116_0"
-" body117_0))"
+" id:trans114_0"
+" trans-rhs115_0"
+" id:val116_0"
+" val-rhs117_0"
+" body118_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                   \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" letrec-syntaxes+values107_0"
-" id:trans108_0"
-" trans-rhs109_0"
-" id:val110_0"
-" val-rhs111_0"
-" body112_0))"
+" letrec-syntaxes+values108_0"
+" id:trans109_0"
+" trans-rhs110_0"
+" id:val111_0"
+" val-rhs112_0"
+" body113_0))"
 "                                                              (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
 "(values"
 " #t"
-" letrec-syntaxes+values101_0"
-" id:trans102_0"
-" trans-rhs103_0"
-" id:val104_0"
-" val-rhs105_0"
-" body106_0)))"
+" letrec-syntaxes+values102_0"
+" id:trans103_0"
+" trans-rhs104_0"
+" id:val105_0"
+" val-rhs106_0"
+" body107_0)))"
 "(values #f #f #f #f #f #f #f)))))"
-"(let-values(((ok?_1 let-values127_0 id:val128_0 val-rhs129_0 body130_0)"
+"(let-values(((ok?_1 let-values128_0 id:val129_0 val-rhs130_0 body131_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(if(not syntaxes?_0) #t #f)"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((let-values127_0 id:val128_0 val-rhs129_0 body130_0)"
+"(let-values(((let-values128_0 id:val129_0 val-rhs130_0 body131_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((let-values131_0)"
+"(let-values(((let-values132_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((id:val132_0 val-rhs133_0 body134_0)"
+"((id:val133_0 val-rhs134_0 body135_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(if(pair? s_4)"
-"(let-values(((id:val135_0"
-" val-rhs136_0)"
+"(let-values(((id:val136_0"
+" val-rhs137_0)"
 "(let-values(((s_5)"
 "(car"
 " s_4)))"
@@ -68488,8 +68554,8 @@ static const char *startup_source =
 "(let-values(((id:val_2"
 " val-rhs_2)"
 "(let-values()"
-"(let-values(((id:val150_0"
-" val-rhs151_0)"
+"(let-values(((id:val151_0"
+" val-rhs152_0)"
 "(let-values()"
 "(let-values(((s_8)"
 "(if(syntax?$1"
@@ -68499,7 +68565,7 @@ static const char *startup_source =
 " s_7)))"
 "(if(pair?"
 " s_8)"
-"(let-values(((id:val138_0)"
+"(let-values(((id:val139_0)"
 "(let-values(((s_9)"
 "(car"
 " s_8)))"
@@ -68548,7 +68614,7 @@ static const char *startup_source =
 " id:val_2))"
 "(let-values(((id:val_4)"
 "(let-values()"
-"(let-values(((id:val152_0)"
+"(let-values(((id:val153_0)"
 "(let-values()"
 "(if(let-values(((or-part_0)"
 "(if(syntax?$1"
@@ -68568,7 +68634,7 @@ static const char *startup_source =
 " orig-s_0"
 " s_11)))))"
 "(cons"
-" id:val152_0"
+" id:val153_0"
 " id:val_3)))))"
 "(values"
 " id:val_4)))))"
@@ -68584,7 +68650,7 @@ static const char *startup_source =
 " lst_2)))))"
 "(reverse$1"
 " id:val_2))))))))"
-"((val-rhs139_0)"
+"((val-rhs140_0)"
 "(let-values(((s_9)"
 "(cdr"
 " s_8)))"
@@ -68596,7 +68662,7 @@ static const char *startup_source =
 " s_9)))"
 "(if(pair?"
 " s_10)"
-"(let-values(((val-rhs140_0)"
+"(let-values(((val-rhs141_0)"
 "(let-values(((s_11)"
 "(car"
 " s_10)))"
@@ -68619,24 +68685,24 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                                     \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" val-rhs140_0))"
+" val-rhs141_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                 \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" id:val138_0"
-" val-rhs139_0))"
+" id:val139_0"
+" val-rhs140_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                             \"bad syntax\""
 " orig-s_0))))))"
 "(values"
 "(cons"
-" id:val150_0"
+" id:val151_0"
 " id:val_1)"
 "(cons"
-" val-rhs151_0"
+" val-rhs152_0"
 " val-rhs_1))))))"
 "(values"
 " id:val_2"
@@ -68662,7 +68728,7 @@ static const char *startup_source =
 " id:val_0)"
 "(reverse$1"
 " val-rhs_0)))))))))"
-"((body137_0)"
+"((body138_0)"
 "(let-values(((s_5)"
 "(cdr"
 " s_4)))"
@@ -68692,20 +68758,20 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_0))))))))"
 "(values"
-" id:val135_0"
-" val-rhs136_0"
-" body137_0))"
+" id:val136_0"
+" val-rhs137_0"
+" body138_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                     \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" let-values131_0"
-" id:val132_0"
-" val-rhs133_0"
-" body134_0))"
+" let-values132_0"
+" id:val133_0"
+" val-rhs134_0"
+" body135_0))"
 "                                                                (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t let-values127_0 id:val128_0 val-rhs129_0 body130_0)))"
+"(values #t let-values128_0 id:val129_0 val-rhs130_0 body131_0)))"
 "(values #f #f #f #f #f)))))"
 "(let-values(((sc_0)(new-scope 'local)))"
 "(let-values(((body-sc_0)(if rec?_0(new-scope 'letrec-body) #f)))"
@@ -68713,7 +68779,7 @@ static const char *startup_source =
 "(let-values(((frame-id_0)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_0)"
 "(reverse$1"
-"(let-values(((lst_0)(if syntaxes?_0 id:trans102_0 null)))"
+"(let-values(((lst_0)(if syntaxes?_0 id:trans103_0 null)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -68791,7 +68857,7 @@ static const char *startup_source =
 " lst_0))))))"
 "(let-values(((val-idss_0)"
 "(reverse$1"
-"(let-values(((lst_0)(if syntaxes?_0 id:val104_0 id:val128_0)))"
+"(let-values(((lst_0)(if syntaxes?_0 id:val105_0 id:val129_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -68872,7 +68938,7 @@ static const char *startup_source =
 "(if rec?_0"
 "(reverse$1"
 "(let-values(((lst_0)"
-"(if syntaxes?_0 val-rhs105_0 val-rhs129_0)))"
+"(if syntaxes?_0 val-rhs106_0 val-rhs130_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -68909,17 +68975,17 @@ static const char *startup_source =
 " for-loop_0)"
 " null"
 " lst_0))))"
-"(if syntaxes?_0 val-rhs105_0 val-rhs129_0))))"
+"(if syntaxes?_0 val-rhs106_0 val-rhs130_0))))"
 "(let-values(((val-clauses_0)"
 "(if syntaxes?_0"
 "(let-values()"
-"(let-values(((ok?_2 _153_0 _154_0 clause155_0 _156_0)"
+"(let-values(((ok?_2 _154_0 _155_0 clause156_0 _157_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((_153_0"
-" _154_0"
-" clause155_0"
-" _156_0)"
+"(let-values(((_154_0"
+" _155_0"
+" clause156_0"
+" _157_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1"
 " s_1)"
@@ -68927,14 +68993,14 @@ static const char *startup_source =
 " s_1)"
 " s_1)))"
 "(if(pair? s_2)"
-"(let-values(((_157_0)"
+"(let-values(((_158_0)"
 "(let-values(((s_3)"
 "(car"
 " s_2)))"
 " s_3))"
-"((_158_0"
-" clause159_0"
-" _160_0)"
+"((_159_0"
+" clause160_0"
+" _161_0)"
 "(let-values(((s_3)"
 "(cdr"
 " s_2)))"
@@ -68946,13 +69012,13 @@ static const char *startup_source =
 " s_3)))"
 "(if(pair?"
 " s_4)"
-"(let-values(((_161_0)"
+"(let-values(((_162_0)"
 "(let-values(((s_5)"
 "(car"
 " s_4)))"
 " s_5))"
-"((clause162_0"
-" _163_0)"
+"((clause163_0"
+" _164_0)"
 "(let-values(((s_5)"
 "(cdr"
 " s_4)))"
@@ -68964,7 +69030,7 @@ static const char *startup_source =
 " s_5)))"
 "(if(pair?"
 " s_6)"
-"(let-values(((clause164_0)"
+"(let-values(((clause165_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
@@ -68986,47 +69052,47 @@ static const char *startup_source =
 " orig-s_0))"
 "(let-values()"
 " flat-s_0))))))"
-"((_165_0)"
+"((_166_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
 " s_7)))"
 "(values"
-" clause164_0"
-" _165_0))"
+" clause165_0"
+" _166_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                         \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" _161_0"
-" clause162_0"
-" _163_0))"
+" _162_0"
+" clause163_0"
+" _164_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                     \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" _157_0"
 " _158_0"
-" clause159_0"
-" _160_0))"
+" _159_0"
+" clause160_0"
+" _161_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                 \"bad syntax\""
 " orig-s_0)))))"
 "(values"
 " #t"
-" _153_0"
 " _154_0"
-" clause155_0"
-" _156_0))))))"
-" clause155_0))"
+" _155_0"
+" clause156_0"
+" _157_0))))))"
+" clause156_0))"
 "(let-values()"
-"(let-values(((ok?_2 _166_0 clause167_0 _168_0)"
+"(let-values(((ok?_2 _167_0 clause168_0 _169_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((_166_0 clause167_0 _168_0)"
+"(let-values(((_167_0 clause168_0 _169_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1"
 " s_1)"
@@ -69034,13 +69100,13 @@ static const char *startup_source =
 " s_1)"
 " s_1)))"
 "(if(pair? s_2)"
-"(let-values(((_169_0)"
+"(let-values(((_170_0)"
 "(let-values(((s_3)"
 "(car"
 " s_2)))"
 " s_3))"
-"((clause170_0"
-" _171_0)"
+"((clause171_0"
+" _172_0)"
 "(let-values(((s_3)"
 "(cdr"
 " s_2)))"
@@ -69052,7 +69118,7 @@ static const char *startup_source =
 " s_3)))"
 "(if(pair?"
 " s_4)"
-"(let-values(((clause172_0)"
+"(let-values(((clause173_0)"
 "(let-values(((s_5)"
 "(car"
 " s_4)))"
@@ -69074,45 +69140,47 @@ static const char *startup_source =
 " orig-s_0))"
 "(let-values()"
 " flat-s_0))))))"
-"((_173_0)"
+"((_174_0)"
 "(let-values(((s_5)"
 "(cdr"
 " s_4)))"
 " s_5)))"
 "(values"
-" clause172_0"
-" _173_0))"
+" clause173_0"
+" _174_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                     \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" _169_0"
-" clause170_0"
-" _171_0))"
+" _170_0"
+" clause171_0"
+" _172_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                 \"bad syntax\""
 " orig-s_0)))))"
 "(values"
 " #t"
-" _166_0"
-" clause167_0"
-" _168_0))))))"
-" clause167_0)))))"
+" _167_0"
+" clause168_0"
+" _169_0))))))"
+" clause168_0)))))"
 "(let-values((()"
 "(begin"
-"(let-values(((temp141_0)(list trans-idss_0 val-idss_0))"
-"((phase142_0) phase_0)"
-"((s143_0) s_0))"
+"(let-values(((temp142_0)(list trans-idss_0 val-idss_0))"
+"((phase143_0) phase_0)"
+"((s144_0) s_0))"
 "(check-no-duplicate-ids7.1"
 " unsafe-undefined"
-" temp141_0"
-" phase142_0"
-" s143_0"
+" temp142_0"
+" phase143_0"
+" s144_0"
 " unsafe-undefined))"
 "(values))))"
 "(let-values(((counter_0)(root-expand-context-counter ctx_0)))"
+"(let-values(((local-sym_0)"
+"(if(expand-context-normalize-locals? ctx_0) 'loc #f)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
 "(let-values(((lst_0) trans-idss_0))"
@@ -69169,22 +69237,25 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id174_0)"
+"(let-values(((id175_0)"
 " id_0)"
-"((phase175_0)"
+"((phase176_0)"
 " phase_0)"
-"((counter176_0)"
+"((counter177_0)"
 " counter_0)"
-"((frame-id177_0)"
+"((frame-id178_0)"
 " frame-id_0)"
-"((s178_0)"
-" s_0))"
-"(add-local-binding!37.1"
-" frame-id177_0"
-" s178_0"
-" id174_0"
-" phase175_0"
-" counter176_0)))"
+"((s179_0)"
+" s_0)"
+"((local-sym180_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
+" frame-id178_0"
+" s179_0"
+" local-sym180_0"
+" id175_0"
+" phase176_0"
+" counter177_0)))"
 " fold-var_3))))"
 "(values"
 " fold-var_4)))))"
@@ -69266,22 +69337,25 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((id179_0)"
+"(let-values(((id181_0)"
 " id_0)"
-"((phase180_0)"
+"((phase182_0)"
 " phase_0)"
-"((counter181_0)"
+"((counter183_0)"
 " counter_0)"
-"((frame-id182_0)"
+"((frame-id184_0)"
 " frame-id_0)"
-"((s183_0)"
-" s_0))"
-"(add-local-binding!37.1"
-" frame-id182_0"
-" s183_0"
-" id179_0"
-" phase180_0"
-" counter181_0)))"
+"((s185_0)"
+" s_0)"
+"((local-sym186_0)"
+" local-sym_0))"
+"(add-local-binding!39.1"
+" frame-id184_0"
+" s185_0"
+" local-sym186_0"
+" id181_0"
+" phase182_0"
+" counter183_0)))"
 " fold-var_3))))"
 "(values"
 " fold-var_4)))))"
@@ -69310,7 +69384,9 @@ static const char *startup_source =
 "(let-values(((bodys_0)"
 "(reverse$1"
 "(let-values(((lst_0)"
-"(if syntaxes?_0 body106_0 body130_0)))"
+"(if syntaxes?_0"
+" body107_0"
+" body131_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -69368,7 +69444,7 @@ static const char *startup_source =
 " val-rhss_0"
 " bodys_0"
 " trans-idss_0"
-"(if syntaxes?_0 trans-rhs103_0 #f)"
+"(if syntaxes?_0 trans-rhs104_0 #f)"
 " sc_0))"
 "(void)))"
 "(values))))"
@@ -69394,7 +69470,7 @@ static const char *startup_source =
 "(reverse$1"
 "(let-values(((lst_0)"
 "(if syntaxes?_0"
-" trans-rhs103_0"
+" trans-rhs104_0"
 " '()))"
 "((lst_1) trans-idss_0))"
 "(begin"
@@ -69412,7 +69488,8 @@ static const char *startup_source =
 " lst_3)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_2)"
+"(if(if(pair?"
+" lst_2)"
 "(pair? lst_3)"
 " #f)"
 "(let-values(((rhs_0)"
@@ -69505,7 +69582,8 @@ static const char *startup_source =
 " 'for-loop"
 "(if(if(pair?"
 " lst_2)"
-"(pair? lst_3)"
+"(pair?"
+" lst_3)"
 " #f)"
 "(let-values(((keys_0)"
 "(unsafe-car"
@@ -69743,7 +69821,8 @@ static const char *startup_source =
 " lst_8))))))"
 "(values"
 " env_2)))))"
-"(if(not #f)"
+"(if(not"
+" #f)"
 "(for-loop_0"
 " env_1"
 " rest_0"
@@ -69766,9 +69845,9 @@ static const char *startup_source =
 "(let-values(((the-struct_0) v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((env184_0)"
+"(let-values(((env187_0)"
 " rec-env_0)"
-"((scopes185_0)"
+"((scopes188_0)"
 "(let-values(((scopes_0)"
 "(cons"
 " sc_0"
@@ -69779,24 +69858,24 @@ static const char *startup_source =
 " body-sc_0"
 " scopes_0)"
 " scopes_0)))"
-"((reference-records186_0)"
+"((reference-records189_0)"
 "(if split-by-reference?_0"
 "(cons"
 " frame-id_0"
 " orig-rrs_0)"
 " orig-rrs_0))"
-"((binding-layer187_0)"
+"((binding-layer190_0)"
 "(increment-binding-layer"
 "(cons"
 " trans-idss_0"
 " val-idss_0)"
 " ctx_0"
 " sc_0))"
-"((inner188_0)"
+"((inner191_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner188_0"
+" inner191_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -69805,12 +69884,12 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-context"
 " the-struct_0)"
-" env184_0"
-" scopes185_0"
+" env187_0"
+" scopes188_0"
 "(expand-context/outer-def-ctx-scopes"
 " the-struct_0)"
-" binding-layer187_0"
-" reference-records186_0"
+" binding-layer190_0"
+" reference-records189_0"
 "(expand-context/outer-only-immediate?"
 " the-struct_0)"
 "(expand-context/outer-need-eventually-defined"
@@ -69823,26 +69902,28 @@ static const char *startup_source =
 " the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                         \"expand-context/outer?\""
+"                                                                                           \"expand-context/outer?\""
 " the-struct_0))))))"
 "(let-values(((letrec-values-id_0)"
 "(if(not"
 "(expand-context-to-parsed?"
 " ctx_0))"
 "(if syntaxes?_0"
-"(core-id 'letrec-values phase_0)"
-" let-values127_0)"
+"(core-id"
+" 'letrec-values"
+" phase_0)"
+" let-values128_0)"
 " #f)))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx189_0) ctx_0)"
-"((s190_0) s_0)"
-"((temp191_0) #t))"
+"(let-values(((ctx192_0) ctx_0)"
+"((s193_0) s_0)"
+"((temp194_0) #t))"
 "(keep-as-needed119.1"
 " #f"
-" temp191_0"
+" temp194_0"
 " #f"
-" ctx189_0"
-" s190_0))))"
+" ctx192_0"
+" s193_0))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
 " ctx_0)"
@@ -69854,7 +69935,8 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_0)))"
+"(check-list"
+" lst_0)))"
 "((letrec-values(((for-loop_0)"
 "(lambda(fold-var_0"
 " lst_1)"
@@ -69985,13 +70067,13 @@ static const char *startup_source =
 " v_0))"
 "(if(expand-context/outer?"
 " the-struct_0)"
-"(let-values(((reference-records195_0)"
+"(let-values(((reference-records198_0)"
 " orig-rrs_0)"
-"((inner196_0)"
+"((inner199_0)"
 "(root-expand-context/outer-inner"
 " v_0)))"
 "(expand-context/outer1.1"
-" inner196_0"
+" inner199_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_0)"
 "(root-expand-context/outer-use-site-scopes"
@@ -70008,7 +70090,7 @@ static const char *startup_source =
 " the-struct_0)"
 "(expand-context/outer-binding-layer"
 " the-struct_0)"
-" reference-records195_0"
+" reference-records198_0"
 "(expand-context/outer-only-immediate?"
 " the-struct_0)"
 "(expand-context/outer-need-eventually-defined"
@@ -70021,25 +70103,25 @@ static const char *startup_source =
 " the-struct_0)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                       \"expand-context/outer?\""
+"                                                                                                                         \"expand-context/outer?\""
 " the-struct_0))))))"
-"(let-values(((bodys192_0)"
+"(let-values(((bodys195_0)"
 " bodys_0)"
-"((temp193_0)"
-"(let-values(((body-ctx197_0)"
+"((temp196_0)"
+"(let-values(((body-ctx200_0)"
 " body-ctx_0)"
-"((ctx198_0)"
+"((ctx201_0)"
 " ctx_0))"
 "(as-tail-context24.1"
-" ctx198_0"
-" body-ctx197_0)))"
-"((rebuild-s194_0)"
+" ctx201_0"
+" body-ctx200_0)))"
+"((rebuild-s197_0)"
 " rebuild-s_0))"
 "(expand-body7.1"
-" rebuild-s194_0"
+" rebuild-s197_0"
 " #f"
-" bodys192_0"
-" temp193_0))))))))"
+" bodys195_0"
+" temp196_0))))))))"
 "(let-values(((result-s_0)"
 "(if(not"
 " split-by-reference?_0)"
@@ -70143,9 +70225,9 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-rhs_0)"
-"(let-values(((rhs199_0)"
+"(let-values(((rhs202_0)"
 " rhs_0)"
-"((temp200_0)"
+"((temp203_0)"
 "(if rec?_0"
 "(as-named-context"
 " rec-ctx_0"
@@ -70157,8 +70239,8 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" rhs199_0"
-" temp200_0))))"
+" rhs202_0"
+" temp203_0))))"
 "(if(expand-context-to-parsed?"
 " ctx_0)"
 "(list"
@@ -70211,57 +70293,58 @@ static const char *startup_source =
 " val-name-idss_0"
 " clauses_0"
 " exp-body_0))"
-"(let-values(((rebuild-s201_0)"
+"(let-values(((rebuild-s204_0)"
 " rebuild-s_0)"
-"((temp202_0)"
+"((temp205_0)"
 "(list*"
 " letrec-values-id_0"
 " clauses_0"
 " exp-body_0)))"
 "(rebuild5.1"
 " #t"
-" rebuild-s201_0"
-" temp202_0)))))))"
+" rebuild-s204_0"
+" temp205_0)))))))"
 "(let-values()"
-"(let-values(((val-idss203_0)"
+"(let-values(((val-idss206_0)"
 " val-idss_0)"
-"((val-keyss204_0)"
+"((val-keyss207_0)"
 " val-keyss_0)"
-"((val-rhss205_0)"
+"((val-rhss208_0)"
 " val-rhss_0)"
-"((val-clauses206_0)"
+"((val-clauses209_0)"
 " val-clauses_0)"
-"((temp207_0)"
+"((temp210_0)"
 " #t)"
-"((frame-id208_0)"
+"((frame-id211_0)"
 " frame-id_0)"
-"((rec-ctx209_0)"
+"((rec-ctx212_0)"
 " rec-ctx_0)"
-"((rebuild-s210_0)"
+"((rebuild-s213_0)"
 " rebuild-s_0)"
-"((syntaxes?211_0)"
+"((syntaxes?214_0)"
 " syntaxes?_0)"
-"((get-body212_0)"
+"((get-body215_0)"
 " get-body_0)"
-"((temp213_0)"
+"((temp216_0)"
 " #t))"
 "(expand-and-split-bindings-by-reference52.1"
-" rec-ctx209_0"
-" frame-id208_0"
-" get-body212_0"
-" syntaxes?211_0"
-" rebuild-s210_0"
-" temp207_0"
-" temp213_0"
-" val-idss203_0"
-" val-keyss204_0"
-" val-rhss205_0"
-" val-clauses206_0))))))"
-"(if(expand-context-to-parsed? ctx_0)"
+" rec-ctx212_0"
+" frame-id211_0"
+" get-body215_0"
+" syntaxes?214_0"
+" rebuild-s213_0"
+" temp210_0"
+" temp216_0"
+" val-idss206_0"
+" val-keyss207_0"
+" val-rhss208_0"
+" val-clauses209_0))))))"
+"(if(expand-context-to-parsed?"
+" ctx_0)"
 " result-s_0"
 "(attach-disappeared-transformer-bindings"
 " result-s_0"
-" trans-idss_0)))))))))))))))))))))))))))))))))))))))))))"
+" trans-idss_0))))))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(log-let-renames)"
 "(lambda(obs_0 renames-log-tag_0 val-idss_0 val-rhss_0 bodys_0 trans-idss_0 trans-rhss_0 sc_0)"
@@ -70359,21 +70442,21 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'let-values"
-"(let-values(((temp214_0) 'prim-let-values))(make-let-values-form11.1 temp214_0 #f 'let-renames #f #f))))"
+"(let-values(((temp217_0) 'prim-let-values))(make-let-values-form11.1 temp217_0 #f 'let-renames #f #f))))"
 "(void"
 "(add-core-form!*"
 " 'letrec-values"
-"(let-values(((temp215_0) #t)((temp216_0) 'prim-letrec-values))"
-"(make-let-values-form11.1 temp216_0 temp215_0 'let-renames #f #f))))"
+"(let-values(((temp218_0) #t)((temp219_0) 'prim-letrec-values))"
+"(make-let-values-form11.1 temp219_0 temp218_0 'let-renames #f #f))))"
 "(void"
 "(add-core-form!*"
 " 'letrec-syntaxes+values"
-"(let-values(((temp217_0) #t)"
-"((temp218_0) #t)"
-"((temp219_0) #t)"
-"((temp220_0) 'prim-letrec-syntaxes+values)"
-"((temp221_0) 'letrec-syntaxes-renames))"
-"(make-let-values-form11.1 temp220_0 temp218_0 temp221_0 temp219_0 temp217_0))))"
+"(let-values(((temp220_0) #t)"
+"((temp221_0) #t)"
+"((temp222_0) #t)"
+"((temp223_0) 'prim-letrec-syntaxes+values)"
+"((temp224_0) 'letrec-syntaxes-renames))"
+"(make-let-values-form11.1 temp223_0 temp221_0 temp224_0 temp222_0 temp220_0))))"
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
@@ -70384,15 +70467,15 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-#%stratified)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 #%stratified-body222_0 body223_0)"
+"(let-values(((ok?_0 #%stratified-body225_0 body226_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%stratified-body222_0 body223_0)"
+"(let-values(((#%stratified-body225_0 body226_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%stratified-body224_0)"
+"(let-values(((#%stratified-body227_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((body225_0)"
+"((body228_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
@@ -70404,26 +70487,26 @@ static const char *startup_source =
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))"
 "(let-values() flat-s_0))))))))"
-"(values #%stratified-body224_0 body225_0))"
+"(values #%stratified-body227_0 body228_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t #%stratified-body222_0 body223_0))))))"
+"(values #t #%stratified-body225_0 body226_0))))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx226_0) ctx_0)((s227_0) s_0)((temp228_0) #t))"
-"(keep-as-needed119.1 #f temp228_0 #f ctx226_0 s227_0))))"
+"(let-values(((ctx229_0) ctx_0)((s230_0) s_0)((temp231_0) #t))"
+"(keep-as-needed119.1 #f temp231_0 #f ctx229_0 s230_0))))"
 "(let-values(((exp-body_0)"
-"(let-values(((temp229_0) body223_0)"
-"((ctx230_0) ctx_0)"
-"((temp231_0) #t)"
-"((rebuild-s232_0) rebuild-s_0))"
-"(expand-body7.1 rebuild-s232_0 temp231_0 temp229_0 ctx230_0))))"
+"(let-values(((temp232_0) body226_0)"
+"((ctx233_0) ctx_0)"
+"((temp234_0) #t)"
+"((rebuild-s235_0) rebuild-s_0))"
+"(expand-body7.1 rebuild-s235_0 temp234_0 temp232_0 ctx233_0))))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-begin12.1 rebuild-s_0 exp-body_0)"
-"(let-values(((rebuild-s233_0) rebuild-s_0)"
-"((temp234_0)"
+"(let-values(((rebuild-s236_0) rebuild-s_0)"
+"((temp237_0)"
 "(if(null?(cdr exp-body_0))"
 "(car exp-body_0)"
 "(list*(core-id 'begin(expand-context-phase ctx_0)) exp-body_0))))"
-"(rebuild5.1 #t rebuild-s233_0 temp234_0)))))))))))"
+"(rebuild5.1 #t rebuild-s236_0 temp237_0)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
@@ -70434,18 +70517,18 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-#%datum)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 #%datum235_0 datum236_0)"
+"(let-values(((ok?_0 #%datum238_0 datum239_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%datum235_0 datum236_0)"
+"(let-values(((#%datum238_0 datum239_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%datum237_0)(let-values(((s_3)(car s_2))) s_3))"
-"((datum238_0)(let-values(((s_3)(cdr s_2))) s_3)))"
-"(values #%datum237_0 datum238_0))"
+"(let-values(((#%datum240_0)(let-values(((s_3)(car s_2))) s_3))"
+"((datum241_0)(let-values(((s_3)(cdr s_2))) s_3)))"
+"(values #%datum240_0 datum241_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t #%datum235_0 datum236_0))))))"
-"(let-values(((datum_0) datum236_0))"
+"(values #t #%datum238_0 datum239_0))))))"
+"(let-values(((datum_0) datum239_0))"
 "(let-values((()"
 "(begin"
 "(if(if(syntax?$1 datum_0)(keyword?(syntax-e$1 datum_0)) #f)"
@@ -70456,8 +70539,8 @@ static const char *startup_source =
 "(let-values(((phase_0)(expand-context-phase ctx_0)))"
 "(if(if(expand-context-to-parsed? ctx_0)(free-id-set-empty?(expand-context-stops ctx_0)) #f)"
 "(parsed-quote14.1(keep-properties-only~ s_0)(syntax->datum$1 datum_0))"
-"(let-values(((s239_0) s_0)((temp240_0)(list(core-id 'quote phase_0) datum_0)))"
-"(rebuild5.1 #t s239_0 temp240_0))))))))))))"
+"(let-values(((s242_0) s_0)((temp243_0)(list(core-id 'quote phase_0) datum_0)))"
+"(rebuild5.1 #t s242_0 temp243_0))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
@@ -70468,14 +70551,14 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-#%app)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 #%app241_0 e242_0)"
+"(let-values(((ok?_0 #%app244_0 e245_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%app241_0 e242_0)"
+"(let-values(((#%app244_0 e245_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%app243_0)(let-values(((s_3)(car s_2))) s_3))"
-"((e244_0)"
+"(let-values(((#%app246_0)(let-values(((s_3)(car s_2))) s_3))"
+"((e247_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
@@ -70484,31 +70567,31 @@ static const char *startup_source =
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))"
 "(let-values() flat-s_0)))))))"
-"(values #%app243_0 e244_0))"
+"(values #%app246_0 e247_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t #%app241_0 e242_0))))))"
-"(let-values(((es_0) e242_0))"
+"(values #t #%app244_0 e245_0))))))"
+"(let-values(((es_0) e245_0))"
 "(if(null? es_0)"
 "(let-values()"
 "(let-values(((phase_0)(expand-context-phase ctx_0)))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-quote14.1(keep-properties-only~ s_0) null)"
-"(let-values(((s245_0) s_0)((temp246_0)(list(core-id 'quote phase_0) null)))"
-"(rebuild5.1 #t s245_0 temp246_0)))))"
+"(let-values(((s248_0) s_0)((temp249_0)(list(core-id 'quote phase_0) null)))"
+"(rebuild5.1 #t s248_0 temp249_0)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_0)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx247_0) ctx_0)"
-"((s248_0) s_0)"
-"((keep-for-parsed?249_0) keep-for-parsed?_0))"
-"(keep-as-needed119.1 #f #f keep-for-parsed?249_0 ctx247_0 s248_0))))"
+"(let-values(((ctx250_0) ctx_0)"
+"((s251_0) s_0)"
+"((keep-for-parsed?252_0) keep-for-parsed?_0))"
+"(keep-as-needed119.1 #f #f keep-for-parsed?252_0 ctx250_0 s251_0))))"
 "(let-values(((prefixless_0)(cdr(syntax-e$1 disarmed-s_0))))"
 "(let-values(((rebuild-prefixless_0)"
 "(if(syntax?$1 prefixless_0)"
-"(let-values(((ctx250_0) ctx_0)"
-"((prefixless251_0) prefixless_0)"
-"((keep-for-parsed?252_0) keep-for-parsed?_0))"
-"(keep-as-needed119.1 #f #f keep-for-parsed?252_0 ctx250_0 prefixless251_0))"
+"(let-values(((ctx253_0) ctx_0)"
+"((prefixless254_0) prefixless_0)"
+"((keep-for-parsed?255_0) keep-for-parsed?_0))"
+"(keep-as-needed119.1 #f #f keep-for-parsed?255_0 ctx253_0 prefixless254_0))"
 " #f)))"
 "(let-values(((expr-ctx_0)(as-expression-context ctx_0)))"
 "(let-values((()"
@@ -70527,8 +70610,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((rest-es_0)(cdr es_0)))"
 "(let-values(((exp-rator_0)"
-"(let-values(((temp253_0)(car es_0))((expr-ctx254_0) expr-ctx_0))"
-"(expand9.1 #f #f #f temp253_0 expr-ctx254_0))))"
+"(let-values(((temp256_0)(car es_0))((expr-ctx257_0) expr-ctx_0))"
+"(expand9.1 #f #f #f temp256_0 expr-ctx257_0))))"
 "(let-values(((exp-es_0)"
 "(reverse$1"
 "(let-values(((lst_0) rest-es_0))"
@@ -70561,16 +70644,16 @@ static const char *startup_source =
 " obs_0"
 " 'next)))"
 "(void)))"
-"(let-values(((e255_0)"
+"(let-values(((e258_0)"
 " e_0)"
-"((expr-ctx256_0)"
+"((expr-ctx259_0)"
 " expr-ctx_0))"
 "(expand9.1"
 " #f"
 " #f"
 " #f"
-" e255_0"
-" expr-ctx256_0))))"
+" e258_0"
+" expr-ctx259_0))))"
 " fold-var_1))))"
 "(values fold-var_2)))))"
 "(if(not #f)"
@@ -70591,9 +70674,9 @@ static const char *startup_source =
 "(let-values(((es_1)"
 "(let-values(((exp-es_1)(cons exp-rator_0 exp-es_0)))"
 "(if rebuild-prefixless_0"
-"(let-values(((rebuild-prefixless259_0) rebuild-prefixless_0)"
-"((exp-es260_0) exp-es_1))"
-"(rebuild5.1 #t rebuild-prefixless259_0 exp-es260_0))"
+"(let-values(((rebuild-prefixless262_0) rebuild-prefixless_0)"
+"((exp-es263_0) exp-es_1))"
+"(rebuild5.1 #t rebuild-prefixless262_0 exp-es263_0))"
 " exp-es_1))))"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer expr-ctx_0)))"
@@ -70605,9 +70688,9 @@ static const char *startup_source =
 " 'exit-list"
 "(datum->syntax$1 #f es_1 rebuild-s_0))))"
 "(void)))"
-"(let-values(((rebuild-s257_0) rebuild-s_0)"
-"((temp258_0)(cons #%app241_0 es_1)))"
-"(rebuild5.1 #t rebuild-s257_0 temp258_0))))))))))))))))))))))))"
+"(let-values(((rebuild-s260_0) rebuild-s_0)"
+"((temp261_0)(cons #%app244_0 es_1)))"
+"(rebuild5.1 #t rebuild-s260_0 temp261_0))))))))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'quote"
@@ -70617,19 +70700,19 @@ static const char *startup_source =
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-quote)))(void)))"
 "(values))))"
-"(let-values(((ok?_0 quote261_0 datum262_0)"
+"(let-values(((ok?_0 quote264_0 datum265_0)"
 "(let-values(((s_1)(syntax-disarm$1 s_0)))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((quote261_0 datum262_0)"
+"(let-values(((quote264_0 datum265_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((quote263_0)(let-values(((s_3)(car s_2))) s_3))"
-"((datum264_0)"
+"(let-values(((quote266_0)(let-values(((s_3)(car s_2))) s_3))"
+"((datum267_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((datum265_0)"
+"(let-values(((datum268_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
@@ -70643,13 +70726,13 @@ static const char *startup_source =
 " #f"
 "                                                                                    \"bad syntax\""
 " orig-s_0))))))"
-"(values datum265_0))"
+"(values datum268_0))"
 "                                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values quote263_0 datum264_0))"
+"(values quote266_0 datum267_0))"
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t quote261_0 datum262_0))))))"
+"(values #t quote264_0 datum265_0))))))"
 "(if(expand-context-to-parsed? ctx_0)"
-"(parsed-quote14.1(keep-properties-only~ s_0)(syntax->datum$1 datum262_0))"
+"(parsed-quote14.1(keep-properties-only~ s_0)(syntax->datum$1 datum265_0))"
 " s_0))))))"
 "(void"
 "(add-core-form!*"
@@ -70661,7 +70744,7 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-quote-syntax)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 quote-syntax266_0 datum267_0)"
+"(let-values(((ok?_0 quote-syntax269_0 datum270_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
@@ -70686,14 +70769,14 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((quote-syntax266_0 datum267_0)"
+"(let-values(((quote-syntax269_0 datum270_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
-"(let-values(((quote-syntax268_0)(let-values(((s_3)(car s_2))) s_3))"
-"((datum269_0)"
+"(let-values(((quote-syntax271_0)(let-values(((s_3)(car s_2))) s_3))"
+"((datum272_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
-"(let-values(((datum270_0)"
+"(let-values(((datum273_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
@@ -70722,26 +70805,26 @@ static const char *startup_source =
 " s_7)))"
 "(values)))))"
 "(values))))))"
-"(values datum270_0))))))"
-"(values quote-syntax268_0 datum269_0)))))"
-"(values #t quote-syntax266_0 datum267_0)))"
+"(values datum273_0))))))"
+"(values quote-syntax271_0 datum272_0)))))"
+"(values #t quote-syntax269_0 datum270_0)))"
 "(values #f #f #f)))))"
-"(let-values(((ok?_1 quote-syntax271_0 datum272_0)"
+"(let-values(((ok?_1 quote-syntax274_0 datum275_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(if(not ok?_0) #t #f)"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((quote-syntax271_0 datum272_0)"
+"(let-values(((quote-syntax274_0 datum275_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((quote-syntax273_0)(let-values(((s_3)(car s_2))) s_3))"
-"((datum274_0)"
+"(let-values(((quote-syntax276_0)(let-values(((s_3)(car s_2))) s_3))"
+"((datum277_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(if(pair? s_4)"
-"(let-values(((datum275_0)"
+"(let-values(((datum278_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
@@ -70755,37 +70838,37 @@ static const char *startup_source =
 " #f"
 "                                                                                          \"bad syntax\""
 " orig-s_0))))))"
-"(values datum275_0))"
+"(values datum278_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                      \"bad syntax\""
 " orig-s_0))))))"
-"(values quote-syntax273_0 datum274_0))"
+"(values quote-syntax276_0 datum277_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t quote-syntax271_0 datum272_0)))"
+"(values #t quote-syntax274_0 datum275_0)))"
 "(values #f #f #f)))))"
 "(if ok?_0"
 "(let-values()"
 "(let-values((()"
 "(begin(reference-records-all-used!(expand-context-reference-records ctx_0))(values))))"
-"(let-values(((ok?_2 _276_0 _277_0 kw278_0)"
+"(let-values(((ok?_2 _279_0 _280_0 kw281_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((_276_0 _277_0 kw278_0)"
+"(let-values(((_279_0 _280_0 kw281_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((_279_0)(let-values(((s_3)(car s_2))) s_3))"
-"((_280_0 kw281_0)"
+"(let-values(((_282_0)(let-values(((s_3)(car s_2))) s_3))"
+"((_283_0 kw284_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(if(pair? s_4)"
-"(let-values(((_282_0)"
+"(let-values(((_285_0)"
 "(let-values(((s_5)(car s_4)))"
 " s_5))"
-"((kw283_0)"
+"((kw286_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1"
@@ -70794,7 +70877,7 @@ static const char *startup_source =
 " s_5)"
 " s_5)))"
 "(if(pair? s_6)"
-"(let-values(((kw284_0)"
+"(let-values(((kw287_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
@@ -70816,33 +70899,33 @@ static const char *startup_source =
 " #f"
 "                                                                                                                    \"bad syntax\""
 " orig-s_0))))))"
-"(values kw284_0))"
+"(values kw287_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                \"bad syntax\""
 " orig-s_0))))))"
-"(values _282_0 kw283_0))"
+"(values _285_0 kw286_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                            \"bad syntax\""
 " orig-s_0))))))"
-"(values _279_0 _280_0 kw281_0))"
+"(values _282_0 _283_0 kw284_0))"
 "                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t _276_0 _277_0 kw278_0))))))"
+"(values #t _279_0 _280_0 kw281_0))))))"
 "(if(expand-context-to-parsed? ctx_0)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_0) datum267_0)"
-"(let-values(((s285_0) s_0)((temp286_0)(list quote-syntax266_0 datum267_0 kw278_0)))"
-"(rebuild5.1 #t s285_0 temp286_0))))))"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_0) datum270_0)"
+"(let-values(((s288_0) s_0)((temp289_0)(list quote-syntax269_0 datum270_0 kw281_0)))"
+"(rebuild5.1 #t s288_0 temp289_0))))))"
 "(let-values()"
 "(let-values(((use-site-scopes_0)(root-expand-context-use-site-scopes ctx_0)))"
 "(let-values(((datum-s_0)"
 "(remove-scopes"
-"(remove-scopes datum272_0(expand-context-scopes ctx_0))"
+"(remove-scopes datum275_0(expand-context-scopes ctx_0))"
 "(if use-site-scopes_0(unbox use-site-scopes_0) '()))))"
 "(if(if(expand-context-to-parsed? ctx_0)(free-id-set-empty?(expand-context-stops ctx_0)) #f)"
 "(parsed-quote-syntax15.1(keep-properties-only~ s_0) datum-s_0)"
-"(let-values(((s287_0) s_0)((temp288_0)(list quote-syntax271_0 datum-s_0)))"
-"(rebuild5.1 #t s287_0 temp288_0))))))))))))))"
+"(let-values(((s290_0) s_0)((temp291_0)(list quote-syntax274_0 datum-s_0)))"
+"(rebuild5.1 #t s290_0 temp291_0))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
@@ -70853,7 +70936,7 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-if)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 _289_0 _290_0 _291_0)"
+"(let-values(((ok?_0 _292_0 _293_0 _294_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
@@ -70876,22 +70959,22 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((_289_0 _290_0 _291_0)"
+"(let-values(((_292_0 _293_0 _294_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
-"(let-values(((_292_0)(let-values(((s_3)(car s_2))) s_3))"
-"((_293_0 _294_0)"
+"(let-values(((_295_0)(let-values(((s_3)(car s_2))) s_3))"
+"((_296_0 _297_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
-"(let-values(((_295_0)"
+"(let-values(((_298_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
-"((_296_0)"
+"((_299_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
 "(syntax-e$1 s_5)"
 " s_5)))"
-"(let-values(((_297_0)"
+"(let-values(((_300_0)"
 "(let-values(((s_7)"
 "(car s_6)))"
 " s_7))"
@@ -70905,10 +70988,10 @@ static const char *startup_source =
 " s_7)"
 " s_7)))"
 "(values)))))"
-"(values _297_0))))))"
-"(values _295_0 _296_0))))))"
-"(values _292_0 _293_0 _294_0)))))"
-"(values #t _289_0 _290_0 _291_0)))"
+"(values _300_0))))))"
+"(values _298_0 _299_0))))))"
+"(values _295_0 _296_0 _297_0)))))"
+"(values #t _292_0 _293_0 _294_0)))"
 "(values #f #f #f #f)))))"
 "(let-values((()"
 "(begin"
@@ -70916,35 +70999,35 @@ static const char *startup_source =
 "                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_0))"
 "(void))"
 "(values))))"
-"(let-values(((ok?_1 if298_0 tst299_0 thn300_0 els301_0)"
+"(let-values(((ok?_1 if301_0 tst302_0 thn303_0 els304_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((if298_0 tst299_0 thn300_0 els301_0)"
+"(let-values(((if301_0 tst302_0 thn303_0 els304_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((if302_0)(let-values(((s_3)(car s_2))) s_3))"
-"((tst303_0 thn304_0 els305_0)"
+"(let-values(((if305_0)(let-values(((s_3)(car s_2))) s_3))"
+"((tst306_0 thn307_0 els308_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(if(pair? s_4)"
-"(let-values(((tst306_0)"
+"(let-values(((tst309_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
-"((thn307_0 els308_0)"
+"((thn310_0 els311_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
 "(syntax-e$1 s_5)"
 " s_5)))"
 "(if(pair? s_6)"
-"(let-values(((thn309_0)"
+"(let-values(((thn312_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
 " s_7))"
-"((els310_0)"
+"((els313_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
@@ -70956,7 +71039,7 @@ static const char *startup_source =
 " s_7)))"
 "(if(pair?"
 " s_8)"
-"(let-values(((els311_0)"
+"(let-values(((els314_0)"
 "(let-values(((s_9)"
 "(car"
 " s_8)))"
@@ -70979,34 +71062,34 @@ static const char *startup_source =
 "                                                                                                                                  \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" els311_0))"
+" els314_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                              \"bad syntax\""
 " orig-s_0))))))"
-"(values thn309_0 els310_0))"
+"(values thn312_0 els313_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                          \"bad syntax\""
 " orig-s_0))))))"
-"(values tst306_0 thn307_0 els308_0))"
+"(values tst309_0 thn310_0 els311_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                      \"bad syntax\""
 " orig-s_0))))))"
-"(values if302_0 tst303_0 thn304_0 els305_0))"
+"(values if305_0 tst306_0 thn307_0 els308_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t if298_0 tst299_0 thn300_0 els301_0))))))"
+"(values #t if301_0 tst302_0 thn303_0 els304_0))))))"
 "(let-values(((expr-ctx_0)(as-expression-context ctx_0)))"
 "(let-values(((tail-ctx_0)"
-"(let-values(((expr-ctx312_0) expr-ctx_0)((ctx313_0) ctx_0))"
-"(as-tail-context24.1 ctx313_0 expr-ctx312_0))))"
+"(let-values(((expr-ctx315_0) expr-ctx_0)((ctx316_0) ctx_0))"
+"(as-tail-context24.1 ctx316_0 expr-ctx315_0))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx314_0) ctx_0)((s315_0) s_0))"
-"(keep-as-needed119.1 #f #f #f ctx314_0 s315_0))))"
+"(let-values(((ctx317_0) ctx_0)((s318_0) s_0))"
+"(keep-as-needed119.1 #f #f #f ctx317_0 s318_0))))"
 "(let-values(((exp-tst_0)"
-"(let-values(((temp316_0) tst299_0)((expr-ctx317_0) expr-ctx_0))"
-"(expand9.1 #f #f #f temp316_0 expr-ctx317_0))))"
+"(let-values(((temp319_0) tst302_0)((expr-ctx320_0) expr-ctx_0))"
+"(expand9.1 #f #f #f temp319_0 expr-ctx320_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
@@ -71015,8 +71098,8 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-thn_0)"
-"(let-values(((temp318_0) thn300_0)((tail-ctx319_0) tail-ctx_0))"
-"(expand9.1 #f #f #f temp318_0 tail-ctx319_0))))"
+"(let-values(((temp321_0) thn303_0)((tail-ctx322_0) tail-ctx_0))"
+"(expand9.1 #f #f #f temp321_0 tail-ctx322_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
@@ -71025,13 +71108,13 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-els_0)"
-"(let-values(((temp320_0) els301_0)((tail-ctx321_0) tail-ctx_0))"
-"(expand9.1 #f #f #f temp320_0 tail-ctx321_0))))"
+"(let-values(((temp323_0) els304_0)((tail-ctx324_0) tail-ctx_0))"
+"(expand9.1 #f #f #f temp323_0 tail-ctx324_0))))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-if8.1 rebuild-s_0 exp-tst_0 exp-thn_0 exp-els_0)"
-"(let-values(((rebuild-s322_0) rebuild-s_0)"
-"((temp323_0)(list if298_0 exp-tst_0 exp-thn_0 exp-els_0)))"
-"(rebuild5.1 #t rebuild-s322_0 temp323_0)))))))))))))))))))"
+"(let-values(((rebuild-s325_0) rebuild-s_0)"
+"((temp326_0)(list if301_0 exp-tst_0 exp-thn_0 exp-els_0)))"
+"(rebuild5.1 #t rebuild-s325_0 temp326_0)))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
@@ -71044,34 +71127,34 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 with-continuation-mark324_0 key325_0 val326_0 body327_0)"
+"(let-values(((ok?_0 with-continuation-mark327_0 key328_0 val329_0 body330_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((with-continuation-mark324_0 key325_0 val326_0 body327_0)"
+"(let-values(((with-continuation-mark327_0 key328_0 val329_0 body330_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((with-continuation-mark328_0)"
+"(let-values(((with-continuation-mark331_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((key329_0 val330_0 body331_0)"
+"((key332_0 val333_0 body334_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((key332_0)"
+"(let-values(((key335_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
-"((val333_0 body334_0)"
+"((val336_0 body337_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
 "(syntax-e$1 s_5)"
 " s_5)))"
 "(if(pair? s_6)"
-"(let-values(((val335_0)"
+"(let-values(((val338_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
 " s_7))"
-"((body336_0)"
+"((body339_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
@@ -71082,7 +71165,7 @@ static const char *startup_source =
 " s_7)"
 " s_7)))"
 "(if(pair? s_8)"
-"(let-values(((body337_0)"
+"(let-values(((body340_0)"
 "(let-values(((s_9)"
 "(car"
 " s_8)))"
@@ -71105,36 +71188,36 @@ static const char *startup_source =
 "                                                                                                                              \"bad syntax\""
 " orig-s_0))))))"
 "(values"
-" body337_0))"
+" body340_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"bad syntax\""
 " orig-s_0))))))"
-"(values val335_0 body336_0))"
+"(values val338_0 body339_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
 " orig-s_0))))))"
-"(values key332_0 val333_0 body334_0))"
+"(values key335_0 val336_0 body337_0))"
 "                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values with-continuation-mark328_0 key329_0 val330_0 body331_0))"
+"(values with-continuation-mark331_0 key332_0 val333_0 body334_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t with-continuation-mark324_0 key325_0 val326_0 body327_0))))))"
+"(values #t with-continuation-mark327_0 key328_0 val329_0 body330_0))))))"
 "(let-values(((expr-ctx_0)(as-expression-context ctx_0)))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx338_0) ctx_0)((s339_0) s_0))"
-"(keep-as-needed119.1 #f #f #f ctx338_0 s339_0))))"
+"(let-values(((ctx341_0) ctx_0)((s342_0) s_0))"
+"(keep-as-needed119.1 #f #f #f ctx341_0 s342_0))))"
 "(let-values(((exp-key_0)"
-"(let-values(((temp340_0) key325_0)((expr-ctx341_0) expr-ctx_0))"
-"(expand9.1 #f #f #f temp340_0 expr-ctx341_0))))"
+"(let-values(((temp343_0) key328_0)((expr-ctx344_0) expr-ctx_0))"
+"(expand9.1 #f #f #f temp343_0 expr-ctx344_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'next)))(void)))"
 "(values))))"
 "(let-values(((exp-val_0)"
-"(let-values(((temp342_0) val326_0)((expr-ctx343_0) expr-ctx_0))"
-"(expand9.1 #f #f #f temp342_0 expr-ctx343_0))))"
+"(let-values(((temp345_0) val329_0)((expr-ctx346_0) expr-ctx_0))"
+"(expand9.1 #f #f #f temp345_0 expr-ctx346_0))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
@@ -71143,16 +71226,16 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((exp-body_0)"
-"(let-values(((temp344_0) body327_0)"
-"((temp345_0)"
-"(let-values(((expr-ctx346_0) expr-ctx_0)((ctx347_0) ctx_0))"
-"(as-tail-context24.1 ctx347_0 expr-ctx346_0))))"
-"(expand9.1 #f #f #f temp344_0 temp345_0))))"
+"(let-values(((temp347_0) body330_0)"
+"((temp348_0)"
+"(let-values(((expr-ctx349_0) expr-ctx_0)((ctx350_0) ctx_0))"
+"(as-tail-context24.1 ctx350_0 expr-ctx349_0))))"
+"(expand9.1 #f #f #f temp347_0 temp348_0))))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-with-continuation-mark10.1 rebuild-s_0 exp-key_0 exp-val_0 exp-body_0)"
-"(let-values(((rebuild-s348_0) rebuild-s_0)"
-"((temp349_0)(list with-continuation-mark324_0 exp-key_0 exp-val_0 exp-body_0)))"
-"(rebuild5.1 #t rebuild-s348_0 temp349_0))))))))))))))))"
+"(let-values(((rebuild-s351_0) rebuild-s_0)"
+"((temp352_0)(list with-continuation-mark327_0 exp-key_0 exp-val_0 exp-body_0)))"
+"(rebuild5.1 #t rebuild-s351_0 temp352_0))))))))))))))))"
 "(define-values"
 "(make-begin20.1)"
 "(lambda(last-is-tail?15_0 list-start-index14_0 log-tag18_0 parsed-begin19_0)"
@@ -71172,15 +71255,15 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 begin350_0 e351_0)"
+"(let-values(((ok?_0 begin353_0 e354_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((begin350_0 e351_0)"
+"(let-values(((begin353_0 e354_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((begin352_0)"
+"(let-values(((begin355_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((e353_0)"
+"((e356_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)"
@@ -71201,16 +71284,16 @@ static const char *startup_source =
 "                                                                                     \"bad syntax\""
 " orig-s_0))"
 "(let-values() flat-s_0))))))))"
-"(values begin352_0 e353_0))"
+"(values begin355_0 e356_0))"
 "                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t begin350_0 e351_0))))))"
+"(values #t begin353_0 e354_0))))))"
 "(let-values(((expr-ctx_0)"
 "(if last-is-tail?_0"
 "(as-begin-expression-context ctx_0)"
 "(as-expression-context ctx_0))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx354_0) ctx_0)((s355_0) s_0))"
-"(keep-as-needed119.1 #f #f #f ctx354_0 s355_0))))"
+"(let-values(((ctx357_0) ctx_0)((s358_0) s_0))"
+"(keep-as-needed119.1 #f #f #f ctx357_0 s358_0))))"
 "(let-values(((exp-es_0)"
 "((letrec-values(((loop_0)"
 "(lambda(es_0 index_0)"
@@ -71248,23 +71331,23 @@ static const char *startup_source =
 "(call-expand-observe obs_0 'next)))"
 "(void)))"
 "(cons"
-"(let-values(((temp356_0)(car es_0))"
-"((temp357_0)"
+"(let-values(((temp359_0)(car es_0))"
+"((temp360_0)"
 "(if(if last-is-tail?_0"
 "(null? rest-es_0)"
 " #f)"
-"(let-values(((expr-ctx358_0)"
+"(let-values(((expr-ctx361_0)"
 " expr-ctx_0)"
-"((ctx359_0)"
+"((ctx362_0)"
 " ctx_0))"
 "(as-tail-context24.1"
-" ctx359_0"
-" expr-ctx358_0))"
+" ctx362_0"
+" expr-ctx361_0))"
 " expr-ctx_0)))"
-"(expand9.1 #f #f #f temp356_0 temp357_0))"
+"(expand9.1 #f #f #f temp359_0 temp360_0))"
 "(loop_0 rest-es_0(sub1 index_0))))))))))))"
 " loop_0)"
-" e351_0"
+" e354_0"
 " list-start-index_0)))"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
@@ -71278,23 +71361,23 @@ static const char *startup_source =
 "(void)))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-begin_0 rebuild-s_0 exp-es_0)"
-"(let-values(((rebuild-s360_0) rebuild-s_0)((temp361_0)(cons begin350_0 exp-es_0)))"
-"(rebuild5.1 #t rebuild-s360_0 temp361_0)))))))))))))))))))"
+"(let-values(((rebuild-s363_0) rebuild-s_0)((temp364_0)(cons begin353_0 exp-es_0)))"
+"(rebuild5.1 #t rebuild-s363_0 temp364_0)))))))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin"
 "(let-values(((nonempty-begin_0)"
-"(let-values(((temp362_0) 'prim-begin)"
-"((parsed-begin363_0) parsed-begin12.1)"
-"((temp364_0) 0)"
-"((temp365_0) #t))"
-"(make-begin20.1 temp365_0 temp364_0 temp362_0 parsed-begin363_0))))"
+"(let-values(((temp365_0) 'prim-begin)"
+"((parsed-begin366_0) parsed-begin12.1)"
+"((temp367_0) 0)"
+"((temp368_0) #t))"
+"(make-begin20.1 temp368_0 temp367_0 temp365_0 parsed-begin366_0))))"
 "(lambda(s_0 ctx_0)"
 "(let-values(((context_0)(expand-context-context ctx_0)))"
 "(if(let-values(((or-part_0)(eq? context_0 'top-level)))(if or-part_0 or-part_0(eq? context_0 'module)))"
 "(let-values()"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 begin366_0)"
+"(let-values(((ok?_0 begin369_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
@@ -71304,9 +71387,9 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((begin366_0)"
+"(let-values(((begin369_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
-"(let-values(((begin367_0)(let-values(((s_3)(car s_2))) s_3))"
+"(let-values(((begin370_0)(let-values(((s_3)(car s_2))) s_3))"
 "(()"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
@@ -71314,16 +71397,16 @@ static const char *startup_source =
 "(syntax-e$1 s_3)"
 " s_3)))"
 "(values)))))"
-"(values begin367_0)))))"
-"(values #t begin366_0)))"
+"(values begin370_0)))))"
+"(values #t begin369_0)))"
 "(values #f #f)))))"
 "(if ok?_0 s_0(nonempty-begin_0 s_0 ctx_0)))))"
 "(let-values()(nonempty-begin_0 s_0 ctx_0))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
-"(let-values(((temp368_0) 'prim-begin0)((parsed-begin0369_0) parsed-begin013.1)((temp370_0) 1)((temp371_0) #f))"
-"(make-begin20.1 temp371_0 temp370_0 temp368_0 parsed-begin0369_0))))"
+"(let-values(((temp371_0) 'prim-begin0)((parsed-begin0372_0) parsed-begin013.1)((temp373_0) 1)((temp374_0) #f))"
+"(make-begin20.1 temp374_0 temp373_0 temp371_0 parsed-begin0372_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
 "(lambda(id_0 ctx_0)"
@@ -71341,13 +71424,13 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%top"
-"(let-values(((core375_0)"
-"(lambda(s373_0 ctx374_0 implicit-omitted?372_0)"
+"(let-values(((core378_0)"
+"(lambda(s376_0 ctx377_0 implicit-omitted?375_0)"
 "(begin"
-" 'core375"
-"(let-values(((s_0) s373_0))"
-"(let-values(((ctx_0) ctx374_0))"
-"(let-values(((implicit-omitted?_0) implicit-omitted?372_0))"
+" 'core378"
+"(let-values(((s_0) s376_0))"
+"(let-values(((ctx_0) ctx377_0))"
+"(let-values(((implicit-omitted?_0) implicit-omitted?375_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -71361,21 +71444,21 @@ static const char *startup_source =
 "(if implicit-omitted?_0"
 "(let-values() s_0)"
 "(let-values()"
-"(let-values(((ok?_0 #%top377_0 id378_0)"
+"(let-values(((ok?_0 #%top380_0 id381_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%top377_0 id378_0)"
+"(let-values(((#%top380_0 id381_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1 s_1)"
 "(syntax-e$1 s_1)"
 " s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%top379_0)"
+"(let-values(((#%top382_0)"
 "(let-values(((s_3)"
 "(car"
 " s_2)))"
 " s_3))"
-"((id380_0)"
+"((id383_0)"
 "(let-values(((s_3)"
 "(cdr"
 " s_2)))"
@@ -71396,25 +71479,25 @@ static const char *startup_source =
 "                                                                                                          \"not an identifier\""
 " orig-s_0"
 " s_3)))))"
-"(values #%top379_0 id380_0))"
+"(values #%top382_0 id383_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                        \"bad syntax\""
 " orig-s_0)))))"
-"(values #t #%top377_0 id378_0))))))"
-" id378_0)))))"
+"(values #t #%top380_0 id381_0))))))"
+" id381_0)))))"
 "(let-values(((b_0)"
-"(let-values(((id381_0) id_0)"
-"((temp382_0)(expand-context-phase ctx_0))"
-"((temp383_0) 'ambiguous))"
+"(let-values(((id384_0) id_0)"
+"((temp385_0)(expand-context-phase ctx_0))"
+"((temp386_0) 'ambiguous))"
 "(resolve+shift28.1"
-" temp383_0"
+" temp386_0"
 " #f"
 " null"
 " unsafe-undefined"
 " #f"
-" id381_0"
-" temp382_0))))"
+" id384_0"
+" temp385_0))))"
 "(if(eq? b_0 'ambiguous)"
 "(let-values()(raise-ambiguous-error id_0 ctx_0))"
 "(if(if b_0"
@@ -71447,10 +71530,10 @@ static const char *startup_source =
 " id_0"
 "(root-expand-context-top-level-bind-scope ctx_0))))"
 "(let-values(((tl-b_0)"
-"(let-values(((tl-id384_0) tl-id_0)"
-"((temp385_0)"
+"(let-values(((tl-id387_0) tl-id_0)"
+"((temp388_0)"
 "(expand-context-phase ctx_0)))"
-"(resolve40.1 #f #f null #f tl-id384_0 temp385_0))))"
+"(resolve40.1 #f #f null #f tl-id387_0 temp388_0))))"
 "(if tl-b_0"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_0)"
@@ -71458,10 +71541,10 @@ static const char *startup_source =
 "(if implicit-omitted?_0"
 "(let-values() id_0)"
 "(let-values()"
-"(let-values(((ok?_0 #%top386_0 id387_0)"
+"(let-values(((ok?_0 #%top389_0 id390_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%top386_0 id387_0)"
+"(let-values(((#%top389_0 id390_0)"
 "(let-values(((s_2)"
 "(if(syntax?$1"
 " s_1)"
@@ -71469,12 +71552,12 @@ static const char *startup_source =
 " s_1)"
 " s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%top388_0)"
+"(let-values(((#%top391_0)"
 "(let-values(((s_3)"
 "(car"
 " s_2)))"
 " s_3))"
-"((id389_0)"
+"((id392_0)"
 "(let-values(((s_3)"
 "(cdr"
 " s_2)))"
@@ -71496,23 +71579,23 @@ static const char *startup_source =
 " orig-s_0"
 " s_3)))))"
 "(values"
-" #%top388_0"
-" id389_0))"
+" #%top391_0"
+" id392_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                    \"bad syntax\""
 " orig-s_0)))))"
-"(values #t #%top386_0 id387_0))))))"
-"(let-values(((s390_0) s_0)"
-"((temp391_0)(cons #%top386_0 id_0)))"
-"(rebuild5.1 #t s390_0 temp391_0)))))))"
+"(values #t #%top389_0 id390_0))))))"
+"(let-values(((s393_0) s_0)"
+"((temp394_0)(cons #%top389_0 id_0)))"
+"(rebuild5.1 #t s393_0 temp394_0)))))))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-top-id4.1 id_0 b_0 #f)"
 " s_0)))))))))))))))))))))))"
 "(case-lambda"
-"((s_0 ctx_0)(core375_0 s_0 ctx_0 #f))"
-"((s_0 ctx_0 implicit-omitted?372_0)(core375_0 s_0 ctx_0 implicit-omitted?372_0))))))"
+"((s_0 ctx_0)(core378_0 s_0 ctx_0 #f))"
+"((s_0 ctx_0 implicit-omitted?375_0)(core378_0 s_0 ctx_0 implicit-omitted?375_0))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
@@ -71523,19 +71606,19 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-set!)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 set!392_0 id393_0 rhs394_0)"
+"(let-values(((ok?_0 set!395_0 id396_0 rhs397_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((set!392_0 id393_0 rhs394_0)"
+"(let-values(((set!395_0 id396_0 rhs397_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((set!395_0)(let-values(((s_3)(car s_2))) s_3))"
-"((id396_0 rhs397_0)"
+"(let-values(((set!398_0)(let-values(((s_3)(car s_2))) s_3))"
+"((id399_0 rhs400_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((id398_0)"
+"(let-values(((id401_0)"
 "(let-values(((s_5)(car s_4)))"
 "(if(let-values(((or-part_0)"
 "(if(syntax?$1 s_5)"
@@ -71551,14 +71634,14 @@ static const char *startup_source =
 "                                                                                    \"not an identifier\""
 " orig-s_0"
 " s_5))))"
-"((rhs399_0)"
+"((rhs402_0)"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
 "(syntax-e$1 s_5)"
 " s_5)))"
 "(if(pair? s_6)"
-"(let-values(((rhs400_0)"
+"(let-values(((rhs403_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
@@ -71579,34 +71662,34 @@ static const char *startup_source =
 " #f"
 "                                                                                                          \"bad syntax\""
 " orig-s_0))))))"
-"(values rhs400_0))"
+"(values rhs403_0))"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                      \"bad syntax\""
 " orig-s_0))))))"
-"(values id398_0 rhs399_0))"
+"(values id401_0 rhs402_0))"
 "                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values set!395_0 id396_0 rhs397_0))"
+"(values set!398_0 id399_0 rhs400_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t set!392_0 id393_0 rhs394_0))))))"
-"(let-values(((orig-id_0) id393_0))"
+"(values #t set!395_0 id396_0 rhs397_0))))))"
+"(let-values(((orig-id_0) id396_0))"
 "((letrec-values(((rename-loop_0)"
 "(lambda(id_0 from-rename?_0)"
 "(begin"
 " 'rename-loop"
 "(let-values(((binding_0)"
-"(let-values(((id401_0) id_0)"
-"((temp402_0)(expand-context-phase ctx_0))"
-"((temp403_0) 'ambiguous)"
-"((temp404_0) #t))"
+"(let-values(((id404_0) id_0)"
+"((temp405_0)(expand-context-phase ctx_0))"
+"((temp406_0) 'ambiguous)"
+"((temp407_0) #t))"
 "(resolve+shift28.1"
-" temp403_0"
+" temp406_0"
 " #f"
 " null"
-" temp404_0"
+" temp407_0"
 " #f"
-" id401_0"
-" temp402_0))))"
+" id404_0"
+" temp405_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_0 'ambiguous)"
@@ -71615,10 +71698,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((t_0 primitive?_0 insp_0 protected?_0)"
 "(if binding_0"
-"(let-values(((binding405_0) binding_0)"
-"((ctx406_0) ctx_0)"
-"((s407_0) s_0))"
-"(lookup62.1 #f #f binding405_0 ctx406_0 s407_0))"
+"(let-values(((binding408_0) binding_0)"
+"((ctx409_0) ctx_0)"
+"((s410_0) s_0))"
+"(lookup62.1 #f #f binding408_0 ctx409_0 s410_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(let-values(((obs_0)(expand-context-observer ctx_0)))"
@@ -71664,33 +71747,33 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_0)"
 "(values))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx408_0) ctx_0)((s409_0) s_0))"
-"(keep-as-needed119.1 #f #f #f ctx408_0 s409_0))))"
+"(let-values(((ctx411_0) ctx_0)((s412_0) s_0))"
+"(keep-as-needed119.1 #f #f #f ctx411_0 s412_0))))"
 "(let-values(((exp-rhs_0)"
-"(let-values(((temp410_0) rhs394_0)"
-"((temp411_0)"
+"(let-values(((temp413_0) rhs397_0)"
+"((temp414_0)"
 "(as-expression-context ctx_0)))"
-"(expand9.1 #f #f #f temp410_0 temp411_0))))"
+"(expand9.1 #f #f #f temp413_0 temp414_0))))"
 "(if(expand-context-to-parsed? ctx_0)"
 "(parsed-set!9.1"
 " rebuild-s_0"
 "(parsed-id2.1 id_0 binding_0 #f)"
 " exp-rhs_0)"
-"(let-values(((rebuild-s412_0) rebuild-s_0)"
-"((temp413_0)"
-"(list"
-" set!392_0"
-"(let-values(((id414_0) id_0)"
-"((t415_0) t_0)"
+"(let-values(((rebuild-s415_0) rebuild-s_0)"
 "((temp416_0)"
+"(list"
+" set!395_0"
+"(let-values(((id417_0) id_0)"
+"((t418_0) t_0)"
+"((temp419_0)"
 "(free-id-set-empty-or-just-module*?"
 "(expand-context-stops ctx_0))))"
 "(substitute-variable6.1"
-" temp416_0"
-" id414_0"
-" t415_0))"
+" temp419_0"
+" id417_0"
+" t418_0))"
 " exp-rhs_0)))"
-"(rebuild5.1 #t rebuild-s412_0 temp413_0)))))))))"
+"(rebuild5.1 #t rebuild-s415_0 temp416_0)))))))))"
 "(if(not binding_0)"
 "(let-values()"
 "(raise-unbound-syntax-error"
@@ -71704,62 +71787,62 @@ static const char *startup_source =
 "(let-values()"
 "(if(not-in-this-expand-context? t_0 ctx_0)"
 "(let-values()"
-"(let-values(((temp417_0)"
+"(let-values(((temp420_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
 " s_0"
 " disarmed-s_0"
-" set!392_0"
-" rhs394_0"
+" set!395_0"
+" rhs397_0"
 " id_0"
 " from-rename?_0"
 " ctx_0)"
 " t_0"
 " ctx_0))"
-"((ctx418_0) ctx_0))"
-"(expand9.1 #f #f #f temp417_0 ctx418_0)))"
+"((ctx421_0) ctx_0))"
+"(expand9.1 #f #f #f temp420_0 ctx421_0)))"
 "(let-values()"
 "(let-values(((exp-s_0 re-ctx_0)"
-"(let-values(((t419_0) t_0)"
-"((insp420_0) insp_0)"
-"((s421_0) s_0)"
-"((orig-id422_0) orig-id_0)"
-"((ctx423_0) ctx_0)"
-"((binding424_0) binding_0)"
-"((orig-id425_0) orig-id_0))"
+"(let-values(((t422_0) t_0)"
+"((insp423_0) insp_0)"
+"((s424_0) s_0)"
+"((orig-id425_0) orig-id_0)"
+"((ctx426_0) ctx_0)"
+"((binding427_0) binding_0)"
+"((orig-id428_0) orig-id_0))"
 "(apply-transformer52.1"
+" orig-id428_0"
+" t422_0"
+" insp423_0"
+" s424_0"
 " orig-id425_0"
-" t419_0"
-" insp420_0"
-" s421_0"
-" orig-id422_0"
-" ctx423_0"
-" binding424_0))))"
+" ctx426_0"
+" binding427_0))))"
 "(if(expand-context-just-once? ctx_0)"
 "(let-values() exp-s_0)"
 "(let-values()"
-"(let-values(((exp-s426_0) exp-s_0)"
-"((re-ctx427_0) re-ctx_0))"
-"(expand9.1 #f #f #f exp-s426_0 re-ctx427_0))))))))"
+"(let-values(((exp-s429_0) exp-s_0)"
+"((re-ctx430_0) re-ctx_0))"
+"(expand9.1 #f #f #f exp-s429_0 re-ctx430_0))))))))"
 "(if(1/rename-transformer? t_0)"
 "(let-values()"
 "(if(not-in-this-expand-context? t_0 ctx_0)"
 "(let-values()"
-"(let-values(((temp428_0)"
+"(let-values(((temp431_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
 " s_0"
 " disarmed-s_0"
-" set!392_0"
-" rhs394_0"
+" set!395_0"
+" rhs397_0"
 " id_0"
 " from-rename?_0"
 " ctx_0"
 " t_0)"
 " t_0"
 " ctx_0))"
-"((ctx429_0) ctx_0))"
-"(expand9.1 #f #f #f temp428_0 ctx429_0)))"
+"((ctx432_0) ctx_0))"
+"(expand9.1 #f #f #f temp431_0 ctx432_0)))"
 "(let-values()"
 "(rename-loop_0"
 "(syntax-track-origin$1"
@@ -71820,7 +71903,7 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 #%variable-reference430_0 id431_0)"
+"(let-values(((ok?_0 #%variable-reference433_0 id434_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
@@ -71840,15 +71923,15 @@ static const char *startup_source =
 " #f)"
 " #f))"
 "(let-values()"
-"(let-values(((#%variable-reference430_0 id431_0)"
+"(let-values(((#%variable-reference433_0 id434_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
-"(let-values(((#%variable-reference432_0)"
+"(let-values(((#%variable-reference435_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((id433_0)"
+"((id436_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
-"(let-values(((id434_0)"
+"(let-values(((id437_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
@@ -71857,11 +71940,11 @@ static const char *startup_source =
 "(syntax-e$1 s_5)"
 " s_5)))"
 "(values)))))"
-"(values id434_0))))))"
-"(values #%variable-reference432_0 id433_0)))))"
-"(values #t #%variable-reference430_0 id431_0)))"
+"(values id437_0))))))"
+"(values #%variable-reference435_0 id436_0)))))"
+"(values #t #%variable-reference433_0 id434_0)))"
 "(values #f #f #f)))))"
-"(let-values(((ok?_1 #%variable-reference435_0 #%top436_0 id437_0)"
+"(let-values(((ok?_1 #%variable-reference438_0 #%top439_0 id440_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(if(not ok?_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
@@ -71891,31 +71974,31 @@ static const char *startup_source =
 " #f))"
 " #f)"
 "(let-values()"
-"(let-values(((#%variable-reference435_0 #%top436_0 id437_0)"
+"(let-values(((#%variable-reference438_0 #%top439_0 id440_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
-"(let-values(((#%variable-reference438_0)"
+"(let-values(((#%variable-reference441_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
-"((#%top439_0 id440_0)"
+"((#%top442_0 id443_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
-"(let-values(((#%top441_0 id442_0)"
+"(let-values(((#%top444_0 id445_0)"
 "(let-values(((s_5)(car s_4)))"
 "(let-values(((s_6)"
 "(if(syntax?$1 s_5)"
 "(syntax-e$1 s_5)"
 " s_5)))"
-"(let-values(((#%top443_0)"
+"(let-values(((#%top446_0)"
 "(let-values(((s_7)"
 "(car"
 " s_6)))"
 " s_7))"
-"((id444_0)"
+"((id447_0)"
 "(let-values(((s_7)"
 "(cdr"
 " s_6)))"
 " s_7)))"
-"(values #%top443_0 id444_0)))))"
+"(values #%top446_0 id447_0)))))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
 "(let-values(((s_6)"
@@ -71923,18 +72006,18 @@ static const char *startup_source =
 "(syntax-e$1 s_5)"
 " s_5)))"
 "(values)))))"
-"(values #%top441_0 id442_0))))))"
-"(values #%variable-reference438_0 #%top439_0 id440_0)))))"
-"(values #t #%variable-reference435_0 #%top436_0 id437_0)))"
+"(values #%top444_0 id445_0))))))"
+"(values #%variable-reference441_0 #%top442_0 id443_0)))))"
+"(values #t #%variable-reference438_0 #%top439_0 id440_0)))"
 "(values #f #f #f #f)))))"
-"(let-values(((ok?_2 #%variable-reference445_0)"
+"(let-values(((ok?_2 #%variable-reference448_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(if(if(not(let-values(((or-part_0) ok?_0))(if or-part_0 or-part_0 ok?_1))) #t #f)"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%variable-reference445_0)"
+"(let-values(((#%variable-reference448_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%variable-reference446_0)"
+"(let-values(((#%variable-reference449_0)"
 "(let-values(((s_3)(car s_2))) s_3))"
 "(()"
 "(let-values(((s_3)(cdr s_2)))"
@@ -71948,18 +72031,18 @@ static const char *startup_source =
 " #f"
 "                                                                        \"bad syntax\""
 " orig-s_0))))))"
-"(values #%variable-reference446_0))"
+"(values #%variable-reference449_0))"
 "                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t #%variable-reference445_0)))"
+"(values #t #%variable-reference448_0)))"
 "(values #f #f)))))"
 "(if(let-values(((or-part_0) ok?_0))(if or-part_0 or-part_0 ok?_1))"
 "(let-values()"
-"(let-values(((var-id_0)(if ok?_0 id431_0 id437_0)))"
+"(let-values(((var-id_0)(if ok?_0 id434_0 id440_0)))"
 "(let-values(((binding_0)"
-"(let-values(((var-id447_0) var-id_0)"
-"((temp448_0)(expand-context-phase ctx_0))"
-"((temp449_0) 'ambiguous))"
-"(resolve+shift28.1 temp449_0 #f null unsafe-undefined #f var-id447_0 temp448_0))))"
+"(let-values(((var-id450_0) var-id_0)"
+"((temp451_0)(expand-context-phase ctx_0))"
+"((temp452_0) 'ambiguous))"
+"(resolve+shift28.1 temp452_0 #f null unsafe-undefined #f var-id450_0 temp451_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_0 'ambiguous)"
@@ -71982,12 +72065,12 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((t_0 primitive?_0 insp-of-t_0 protected?_0)"
 "(if binding_0"
-"(let-values(((binding450_0) binding_0)"
-"((ctx451_0) ctx_0)"
-"((var-id452_0) var-id_0)"
-"((s453_0) s_0)"
-"((temp454_0)(expand-context-in-local-expand? ctx_0)))"
-"(lookup62.1 s453_0 temp454_0 binding450_0 ctx451_0 var-id452_0))"
+"(let-values(((binding453_0) binding_0)"
+"((ctx454_0) ctx_0)"
+"((var-id455_0) var-id_0)"
+"((s456_0) s_0)"
+"((temp457_0)(expand-context-in-local-expand? ctx_0)))"
+"(lookup62.1 s456_0 temp457_0 binding453_0 ctx454_0 var-id455_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(if(if t_0(not(variable? t_0)) #f)"
@@ -72017,19 +72100,19 @@ static const char *startup_source =
 "(if obs_0(let-values()(let-values()(call-expand-observe obs_0 'prim-#%expression)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_0)(syntax-disarm$1 s_0)))"
-"(let-values(((ok?_0 #%expression455_0 e456_0)"
+"(let-values(((ok?_0 #%expression458_0 e459_0)"
 "(let-values(((s_1) disarmed-s_0))"
 "(let-values(((orig-s_0) s_1))"
-"(let-values(((#%expression455_0 e456_0)"
+"(let-values(((#%expression458_0 e459_0)"
 "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))"
 "(if(pair? s_2)"
-"(let-values(((#%expression457_0)(let-values(((s_3)(car s_2))) s_3))"
-"((e458_0)"
+"(let-values(((#%expression460_0)(let-values(((s_3)(car s_2))) s_3))"
+"((e461_0)"
 "(let-values(((s_3)(cdr s_2)))"
 "(let-values(((s_4)"
 "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))"
 "(if(pair? s_4)"
-"(let-values(((e459_0)"
+"(let-values(((e462_0)"
 "(let-values(((s_5)(car s_4))) s_5))"
 "(()"
 "(let-values(((s_5)(cdr s_4)))"
@@ -72043,20 +72126,20 @@ static const char *startup_source =
 " #f"
 "                                                                                      \"bad syntax\""
 " orig-s_0))))))"
-"(values e459_0))"
+"(values e462_0))"
 "                                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))"
-"(values #%expression457_0 e458_0))"
+"(values #%expression460_0 e461_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))"
-"(values #t #%expression455_0 e456_0))))))"
+"(values #t #%expression458_0 e459_0))))))"
 "(let-values(((rebuild-s_0)"
-"(let-values(((ctx460_0) ctx_0)((s461_0) s_0)((temp462_0) #t))"
-"(keep-as-needed119.1 temp462_0 #f #f ctx460_0 s461_0))))"
+"(let-values(((ctx463_0) ctx_0)((s464_0) s_0)((temp465_0) #t))"
+"(keep-as-needed119.1 temp465_0 #f #f ctx463_0 s464_0))))"
 "(let-values(((exp-e_0)"
-"(let-values(((temp463_0) e456_0)"
-"((temp464_0)"
-"(let-values(((temp465_0)(as-expression-context ctx_0))((ctx466_0) ctx_0))"
-"(as-tail-context24.1 ctx466_0 temp465_0))))"
-"(expand9.1 #f #f #f temp463_0 temp464_0))))"
+"(let-values(((temp466_0) e459_0)"
+"((temp467_0)"
+"(let-values(((temp468_0)(as-expression-context ctx_0))((ctx469_0) ctx_0))"
+"(as-tail-context24.1 ctx469_0 temp468_0))))"
+"(expand9.1 #f #f #f temp466_0 temp467_0))))"
 "(if(expand-context-to-parsed? ctx_0)"
 " exp-e_0"
 "(if(let-values(((or-part_0)"
@@ -72065,8 +72148,8 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_0 or-part_0(eq? 'top-level(expand-context-context ctx_0))))"
 "(let-values()"
-"(let-values(((rebuild-s467_0) rebuild-s_0)((temp468_0)(list #%expression455_0 exp-e_0)))"
-"(rebuild5.1 #t rebuild-s467_0 temp468_0)))"
+"(let-values(((rebuild-s470_0) rebuild-s_0)((temp471_0)(list #%expression458_0 exp-e_0)))"
+"(rebuild5.1 #t rebuild-s470_0 temp471_0)))"
 "(let-values()"
 "(let-values(((result-s_0)(syntax-track-origin$1 exp-e_0 rebuild-s_0)))"
 "(begin"
@@ -72099,7 +72182,7 @@ static const char *startup_source =
 "((ns4_0) ns_0)"
 "((at-phase5_0) at-phase_0)"
 "((id6_0) id_0))"
-"(binding-lookup50.1 #f #f b1_0 empty-env2_0 null3_0 ns4_0 at-phase5_0 id6_0))))"
+"(binding-lookup52.1 #f #f b1_0 empty-env2_0 null3_0 ns4_0 at-phase5_0 id6_0))))"
 "(not(variable? val_0))))))))"
 "(define-values(layers) '(raw phaseless id))"
 "(define-values(provide-form-name) 'provide)"
@@ -74087,6 +74170,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -75125,6 +75210,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros? the-struct_1)))"
 "                                (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_1)))))"
 "(expand-context/outer1.1"
@@ -75489,6 +75575,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -75905,6 +75993,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -76172,6 +76262,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -76358,6 +76450,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -76588,6 +76682,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -76813,6 +76909,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -78534,6 +78632,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -79992,6 +80092,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -80996,6 +81098,8 @@ static const char *startup_source =
 " the-struct_1)"
 "(expand-context/inner-to-correlated-linklet?"
 " the-struct_1)"
+"(expand-context/inner-normalize-locals?"
+" the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"
@@ -82082,6 +82186,7 @@ static const char *startup_source =
 "(expand-context/inner-observer the-struct_1)"
 "(expand-context/inner-for-serializable? the-struct_1)"
 "(expand-context/inner-to-correlated-linklet? the-struct_1)"
+"(expand-context/inner-normalize-locals? the-struct_1)"
 "(expand-context/inner-should-not-encounter-macros?"
 " the-struct_1)))"
 "(raise-argument-error"