From c7318cab33de113ec475d7e9fd6b0ceab8fcb61d Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 12 Jun 2018 16:21:17 -0600
Subject: [PATCH] expander: fix `syntax-local-bind-syntaxes` for `local-expand`

Bind variables in a way that allows `local-expand` (with an empty stop
list) to replace a reference to the binding with one that has the same
scopes as the binding.
---
 .../scribblings/reference/stx-trans.scrbl     |    8 +-
 pkgs/racket-test-core/tests/racket/macro.rktl |   27 +
 .../expander/expand/definition-context.rkt    |    7 +-
 racket/src/racket/src/startup.inc             | 6916 +++++++++--------
 4 files changed, 3506 insertions(+), 3452 deletions(-)

diff --git a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
index d23986cb9e..2a2590eb9b 100644
--- a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
+++ b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
@@ -275,11 +275,15 @@ The @racket[stop-ids] argument controls how far @racket[local-expand] expands @r
 
        When @racket[#%plain-module-begin] is not in @racket[stop-ids], the
        @racket[#%plain-module-begin] transformer detects and expands sub-forms (such as
-       @racket[define-values]) regardless of the identifiers presence in @racket[stop-ids].}
+       @racket[define-values]) regardless of the identifiers presence in @racket[stop-ids].
+
+       Expansion does not replace the scopes in a local-variable
+       reference to match the binding identifier.}
 
  @item{If @racket[stop-ids] is @racket[#f] instead of a list, then @racket[stx] is expanded only as
        long as the outermost form of @racket[stx] is a macro (i.e. expansion does @emph{not} proceed
-       to sub-expressions). @racketid[#%app], @racketid[#%datum], and @racketid[#%top] identifiers are
+       to sub-expressions, and it does not replace the scopes in a local-variable reference to match the
+       binding identifier). The @racketid[#%app], @racketid[#%datum], and @racketid[#%top] identifiers are
        never introduced.}]
 
 Independent of @racket[stop-ids], when @racket[local-expand] encounters an identifier that has a local
diff --git a/pkgs/racket-test-core/tests/racket/macro.rktl b/pkgs/racket-test-core/tests/racket/macro.rktl
index 4725a92ca4..691ac74903 100644
--- a/pkgs/racket-test-core/tests/racket/macro.rktl
+++ b/pkgs/racket-test-core/tests/racket/macro.rktl
@@ -2234,6 +2234,33 @@
       (expand-in-modbeg
        (m)))))
 
+;; ----------------------------------------
+;; Make sure `syntax-local-bind-syntaxes` binds variables in a way
+;; that `local-expand` replaces a use with the binding scopes.
+
+(module uses-definition-context-and-local-expand-to-replace racket/base
+  (require (for-syntax racket/base))
+
+  (define-syntax (m stx)
+    (syntax-case stx ()
+      [(_ id)
+       (let ()
+         (define intdef (syntax-local-make-definition-context))
+         (syntax-local-bind-syntaxes (list #'id)
+                                     #f ; => local variable
+                                     intdef)
+         (define raw-bind-id (internal-definition-context-introduce intdef #'id))
+         (define raw-ex-id (local-expand ((make-syntax-introducer) #'id) 'expression null intdef))
+         (define bind-id (syntax-local-identifier-as-binding raw-bind-id))
+         (define ex-id (syntax-local-identifier-as-binding raw-ex-id))
+         #`(list #,(free-identifier=? bind-id ex-id)
+                 #,(bound-identifier=? bind-id ex-id)))]))
+
+  (define result (m x))
+  (provide result))
+
+(test '(#t #t) dynamic-require ''uses-definition-context-and-local-expand-to-replace 'result)
+
 ;; ----------------------------------------
 
 (report-errs)
diff --git a/racket/src/expander/expand/definition-context.rkt b/racket/src/expander/expand/definition-context.rkt
index fb0844a583..45d716aca6 100644
--- a/racket/src/expander/expand/definition-context.rkt
+++ b/racket/src/expander/expand/definition-context.rkt
@@ -90,8 +90,9 @@
     (cond
      [s
       (define input-s (flip-introduction-scopes (add-intdef-scopes s all-intdefs) ctx))
-      (define tmp-env (for/fold ([env (expand-context-env ctx)]) ([sym (in-list syms)])
-                        (hash-set env sym variable)))
+      (define tmp-env (for/fold ([env (expand-context-env ctx)]) ([sym (in-list syms)]
+                                                                  [intdef-id (in-list intdef-ids)])
+                        (hash-set env sym (local-variable intdef-id))))
       (log-expand ctx 'enter-bind)
       (define vals
         (eval-for-syntaxes-binding 'syntax-local-bind-syntaxes
@@ -103,7 +104,7 @@
       (log-expand ctx 'exit-bind)
       vals]
      [else
-      (for/list ([id (in-list ids)]) variable)]))
+      (for/list ([intdef-id (in-list intdef-ids)]) (local-variable intdef-id))]))
   (define env-mixins (internal-definition-context-env-mixins intdef))
   (set-box! env-mixins (append (for/list ([intdef-id (in-list intdef-ids)]
                                           [sym (in-list syms)]
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index de0450564d..8f35f1a4c9 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -41020,26 +41020,43 @@ static const char *startup_source =
 " all-intdefs59_0))"
 " ctx_44)))"
 "(let-values(((tmp-env_0)"
-"(let-values(((lst_288) syms_20))"
+"(let-values(((lst_288) syms_20)"
+"((lst_140)"
+" intdef-ids_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list lst_288)))"
-"((letrec-values(((for-loop_255)"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list lst_140)))"
+"((letrec-values(((for-loop_173)"
 "(lambda(env_7"
-" lst_105)"
+" lst_141"
+" lst_289)"
 "(begin"
 " 'for-loop"
-"(if(pair?"
-" lst_105)"
+"(if(if(pair?"
+" lst_141)"
+"(pair?"
+" lst_289)"
+" #f)"
 "(let-values(((sym_72)"
 "(unsafe-car"
-" lst_105))"
+" lst_141))"
 "((rest_164)"
 "(unsafe-cdr"
-" lst_105)))"
+" lst_141))"
+"((intdef-id_1)"
+"(unsafe-car"
+" lst_289))"
+"((rest_165)"
+"(unsafe-cdr"
+" lst_289)))"
 "(let-values(((env_8)"
 "(let-values(((env_9)"
 " env_7))"
@@ -41048,19 +41065,22 @@ static const char *startup_source =
 "(hash-set"
 " env_9"
 " sym_72"
-" variable))))"
+"(local-variable1.1"
+" intdef-id_1)))))"
 "(values"
 " env_10)))))"
 "(if(not"
 " #f)"
-"(for-loop_255"
+"(for-loop_173"
 " env_8"
-" rest_164)"
+" rest_164"
+" rest_165)"
 " env_8)))"
 " env_7)))))"
-" for-loop_255)"
+" for-loop_173)"
 "(expand-context-env ctx_44)"
-" lst_288)))))"
+" lst_288"
+" lst_140)))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_31)"
@@ -41080,17 +41100,17 @@ static const char *startup_source =
 " input-s_0"
 " ids_25"
 "(let-values(((temp60_2)"
-"(let-values(((v_194)"
+"(let-values(((v_77)"
 " ctx_44))"
 "(let-values(((the-struct_65)"
-" v_194))"
+" v_77))"
 "(if(expand-context/outer?"
 " the-struct_65)"
 "(let-values(((env63_0)"
 " tmp-env_0)"
 "((inner64_0)"
 "(root-expand-context/outer-inner"
-" v_194)))"
+" v_77)))"
 "(expand-context/outer1.1"
 " inner64_0"
 "(root-expand-context/outer-post-expansion"
@@ -41151,44 +41171,45 @@ static const char *startup_source =
 " vals_6))))))"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_289) ids_25))"
+"(let-values(((lst_106) intdef-ids_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_289)))"
-"((letrec-values(((for-loop_256)"
-"(lambda(fold-var_185"
-" lst_290)"
+"(let-values()(check-list lst_106)))"
+"((letrec-values(((for-loop_80)"
+"(lambda(fold-var_101"
+" lst_50)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_290)"
-"(let-values(((id_71)"
+"(if(pair? lst_50)"
+"(let-values(((intdef-id_2)"
 "(unsafe-car"
-" lst_290))"
-"((rest_165)"
+" lst_50))"
+"((rest_53)"
 "(unsafe-cdr"
-" lst_290)))"
-"(let-values(((fold-var_101)"
-"(let-values(((fold-var_245)"
-" fold-var_185))"
-"(let-values(((fold-var_246)"
+" lst_50)))"
+"(let-values(((fold-var_102)"
+"(let-values(((fold-var_103)"
+" fold-var_101))"
+"(let-values(((fold-var_104)"
 "(let-values()"
 "(cons"
 "(let-values()"
-" variable)"
-" fold-var_245))))"
+"(local-variable1.1"
+" intdef-id_2))"
+" fold-var_103))))"
 "(values"
-" fold-var_246)))))"
+" fold-var_104)))))"
 "(if(not #f)"
-"(for-loop_256"
-" fold-var_101"
-" rest_165)"
-" fold-var_101)))"
-" fold-var_185)))))"
-" for-loop_256)"
+"(for-loop_80"
+" fold-var_102"
+" rest_53)"
+" fold-var_102)))"
+" fold-var_101)))))"
+" for-loop_80)"
 " null"
-" lst_289))))))))"
+" lst_106))))))))"
 "(let-values(((env-mixins_0)"
 "(internal-definition-context-env-mixins intdef_0)))"
 "(begin"
@@ -41196,40 +41217,40 @@ static const char *startup_source =
 " env-mixins_0"
 "(append"
 "(reverse$1"
-"(let-values(((lst_291) intdef-ids_0)"
-"((lst_51) syms_20)"
-"((lst_292) vals_5))"
+"(let-values(((lst_290) intdef-ids_0)"
+"((lst_195) syms_20)"
+"((lst_291) vals_5))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
+"(let-values()(check-list lst_290)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_195)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
 "(let-values()(check-list lst_291)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_51)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_292)))"
-"((letrec-values(((for-loop_257)"
-"(lambda(fold-var_36"
-" lst_195"
+"((letrec-values(((for-loop_255)"
+"(lambda(fold-var_245"
+" lst_292"
 " lst_293"
 " lst_294)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_195)"
+"(if(if(pair? lst_292)"
 "(if(pair? lst_293)"
 "(pair? lst_294)"
 " #f)"
 " #f)"
-"(let-values(((intdef-id_1)"
+"(let-values(((intdef-id_3)"
 "(unsafe-car"
-" lst_195))"
+" lst_292))"
 "((rest_166)"
 "(unsafe-cdr"
-" lst_195))"
+" lst_292))"
 "((sym_73)"
 "(unsafe-car"
 " lst_293))"
@@ -41242,40 +41263,40 @@ static const char *startup_source =
 "((rest_168)"
 "(unsafe-cdr"
 " lst_294)))"
+"(let-values(((fold-var_246)"
 "(let-values(((fold-var_247)"
+" fold-var_245))"
 "(let-values(((fold-var_248)"
-" fold-var_36))"
-"(let-values(((fold-var_249)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(begin"
 "(maybe-install-free=id-in-context!"
 " val_70"
-" intdef-id_1"
+" intdef-id_3"
 " phase_7"
 " ctx_44)"
 "(env-mixin2.1"
-" intdef-id_1"
+" intdef-id_3"
 " sym_73"
 " val_70"
 "(make-weak-hasheq))))"
-" fold-var_248))))"
+" fold-var_247))))"
 "(values"
-" fold-var_249)))))"
+" fold-var_248)))))"
 "(if(not #f)"
-"(for-loop_257"
-" fold-var_247"
+"(for-loop_255"
+" fold-var_246"
 " rest_166"
 " rest_167"
 " rest_168)"
-" fold-var_247)))"
-" fold-var_36)))))"
-" for-loop_257)"
+" fold-var_246)))"
+" fold-var_245)))))"
+" for-loop_255)"
 " null"
-" lst_291"
-" lst_51"
-" lst_292))))"
+" lst_290"
+" lst_195"
+" lst_291))))"
 "(unbox env-mixins_0)))"
 "(let-values(((obs_33)(expand-context-observer ctx_44)))"
 "(if obs_33"
@@ -41284,9 +41305,10 @@ static const char *startup_source =
 "(call-expand-observe obs_33 'exit-local-bind)))"
 "(void))))))))))))))))))))))))))"
 "(case-lambda"
-"((ids_26 s_201 intdef_1)"
-"(begin 'syntax-local-bind-syntaxes(syntax-local-bind-syntaxes11_0 ids_26 s_201 intdef_1 '())))"
-"((ids_27 s_61 intdef_2 extra-intdefs7_1)(syntax-local-bind-syntaxes11_0 ids_27 s_61 intdef_2 extra-intdefs7_1)))))"
+"((ids_26 s_202 intdef_1)"
+"(begin 'syntax-local-bind-syntaxes(syntax-local-bind-syntaxes11_0 ids_26 s_202 intdef_1 '())))"
+"((ids_13 s_424 intdef_2 extra-intdefs7_1)"
+"(syntax-local-bind-syntaxes11_0 ids_13 s_424 intdef_2 extra-intdefs7_1)))))"
 "(define-values"
 "(1/internal-definition-context-binding-identifiers)"
 "(lambda(intdef_3)"
@@ -41301,29 +41323,29 @@ static const char *startup_source =
 "             \"internal-definition-context?\""
 " intdef_3)))"
 "(reverse$1"
-"(let-values(((lst_295)(unbox(internal-definition-context-env-mixins intdef_3))))"
+"(let-values(((lst_29)(unbox(internal-definition-context-env-mixins intdef_3))))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_295)))"
-"((letrec-values(((for-loop_258)"
-"(lambda(fold-var_193 lst_296)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_29)))"
+"((letrec-values(((for-loop_14)"
+"(lambda(fold-var_249 lst_295)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_296)"
-"(let-values(((env-mixin_0)(unsafe-car lst_296))"
-"((rest_169)(unsafe-cdr lst_296)))"
+"(if(pair? lst_295)"
+"(let-values(((env-mixin_0)(unsafe-car lst_295))"
+"((rest_169)(unsafe-cdr lst_295)))"
 "(let-values(((fold-var_250)"
-"(let-values(((fold-var_251) fold-var_193))"
+"(let-values(((fold-var_251) fold-var_249))"
 "(let-values(((fold-var_252)"
 "(let-values()"
 "(cons"
 "(let-values()(env-mixin-id env-mixin_0))"
 " fold-var_251))))"
 "(values fold-var_252)))))"
-"(if(not #f)(for-loop_258 fold-var_250 rest_169) fold-var_250)))"
-" fold-var_193)))))"
-" for-loop_258)"
+"(if(not #f)(for-loop_14 fold-var_250 rest_169) fold-var_250)))"
+" fold-var_249)))))"
+" for-loop_14)"
 " null"
-" lst_295))))))))"
+" lst_29))))))))"
 "(define-values"
 "(1/internal-definition-context-introduce)"
 "(let-values(((internal-definition-context-introduce16_0)"
@@ -41331,7 +41353,7 @@ static const char *startup_source =
 "(begin"
 " 'internal-definition-context-introduce16"
 "(let-values(((intdef_4) intdef14_0))"
-"(let-values(((s_424) s15_0))"
+"(let-values(((s_37) s15_0))"
 "(let-values(((mode_13) mode13_0))"
 "(let-values()"
 "(begin"
@@ -41342,11 +41364,11 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                   \"internal-definition-context?\""
 " intdef_4)))"
-"(if(syntax?$1 s_424)"
+"(if(syntax?$1 s_37)"
 "(void)"
 "(let-values()"
-"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_424)))"
-"(let-values(((s65_0) s_424)"
+"                                  (raise-argument-error 'internal-definition-context-introduce \"syntax?\" s_37)))"
+"(let-values(((s65_0) s_37)"
 "((intdef66_0) intdef_4)"
 "((temp67_1) #t)"
 "((temp68_1)"
@@ -41364,9 +41386,9 @@ static const char *startup_source =
 " mode_13))))))))"
 "(add-intdef-scopes24.1 temp68_1 temp67_1 s65_0 intdef66_0)))))))))))"
 "(case-lambda"
-"((intdef_5 s_67)"
-"(begin 'internal-definition-context-introduce(internal-definition-context-introduce16_0 intdef_5 s_67 'flip)))"
-"((intdef_6 s_68 mode13_1)(internal-definition-context-introduce16_0 intdef_6 s_68 mode13_1)))))"
+"((intdef_5 s_207)"
+"(begin 'internal-definition-context-introduce(internal-definition-context-introduce16_0 intdef_5 s_207 'flip)))"
+"((intdef_6 s_425 mode13_1)(internal-definition-context-introduce16_0 intdef_6 s_425 mode13_1)))))"
 "(define-values"
 "(1/internal-definition-context-seal)"
 "(lambda(intdef_7)"
@@ -41380,15 +41402,15 @@ static const char *startup_source =
 "(void)))))"
 "(define-values"
 "(1/identifier-remove-from-definition-context)"
-"(lambda(id_72 intdef_8)"
+"(lambda(id_71 intdef_8)"
 "(begin"
 " 'identifier-remove-from-definition-context"
 "(begin"
-"(if(identifier? id_72)"
+"(if(identifier? id_71)"
 "(void)"
-"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_72)))"
-"(if(let-values(((or-part_207)(1/internal-definition-context? intdef_8)))"
-"(if or-part_207 or-part_207(if(list? intdef_8)(andmap2 1/internal-definition-context? intdef_8) #f)))"
+"          (let-values () (raise-argument-error 'identifier-remove-from-definition-context \"identifier?\" id_71)))"
+"(if(let-values(((or-part_179)(1/internal-definition-context? intdef_8)))"
+"(if or-part_179 or-part_179(if(list? intdef_8)(andmap2 1/internal-definition-context? intdef_8) #f)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -41402,25 +41424,25 @@ static const char *startup_source =
 "(if(not a_49)(let-values() null)(let-values()(list a_49)))))))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_259)"
-"(lambda(id_73 a_50)"
+"((letrec-values(((for-loop_209)"
+"(lambda(id_72 a_50)"
 "(begin"
 " 'for-loop"
 "(if(pair? a_50)"
 "(let-values(((intdef_9)(car a_50)))"
-"(let-values(((id_74)"
-"(let-values(((id_75) id_73))"
-"(let-values(((id_76)"
+"(let-values(((id_73)"
+"(let-values(((id_74) id_72))"
+"(let-values(((id_75)"
 "(let-values()"
 "(1/internal-definition-context-introduce"
 " intdef_9"
-" id_75"
+" id_74"
 " 'remove))))"
-"(values id_76)))))"
-"(if(not #f)(for-loop_259 id_74(cdr a_50)) id_74)))"
-" id_73)))))"
-" for-loop_259)"
-" id_72"
+"(values id_75)))))"
+"(if(not #f)(for-loop_209 id_73(cdr a_50)) id_73)))"
+" id_72)))))"
+" for-loop_209)"
+" id_71"
 " x_76)))))))"
 "(define-values"
 "(intdefs?)"
@@ -41446,7 +41468,7 @@ static const char *startup_source =
 "(if(not a_51)(let-values() null)(let-values()(list a_51)))))))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_260)"
+"((letrec-values(((for-loop_256)"
 "(lambda(env_12 a_52)"
 "(begin"
 " 'for-loop"
@@ -41480,14 +41502,14 @@ static const char *startup_source =
 "(let-values(((env-mixin_1)"
 "(car"
 " env-mixins_2)))"
-"(let-values(((or-part_180)"
+"(let-values(((or-part_279)"
 "(hash-ref"
 "(env-mixin-cache"
 " env-mixin_1)"
 " env_16"
 " #f)))"
-"(if or-part_180"
-" or-part_180"
+"(if or-part_279"
+" or-part_279"
 "(let-values(((new-env_0)"
 "(env-extend"
 "(loop_97"
@@ -41509,9 +41531,9 @@ static const char *startup_source =
 " parent-env_0"
 " env-mixins_1)))))))"
 "(values env_15)))))"
-"(if(not #f)(for-loop_260 env_13(cdr a_52)) env_13)))"
+"(if(not #f)(for-loop_256 env_13(cdr a_52)) env_13)))"
 " env_12)))))"
-" for-loop_260)"
+" for-loop_256)"
 " env_11"
 " x_79))))))"
 "(define-values"
@@ -41519,7 +41541,7 @@ static const char *startup_source =
 "(lambda(action19_0 always?18_0 s22_0 intdefs23_0)"
 "(begin"
 " 'add-intdef-scopes24"
-"(let-values(((s_39) s22_0))"
+"(let-values(((s_426) s22_0))"
 "(let-values(((intdefs_1) intdefs23_0))"
 "(let-values(((always?_0) always?18_0))"
 "(let-values(((action_0)(if(eq? action19_0 unsafe-undefined) add-scope action19_0)))"
@@ -41531,32 +41553,32 @@ static const char *startup_source =
 "(if(not a_53)(let-values() null)(let-values()(list a_53)))))))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_261)"
-"(lambda(s_425 a_54)"
+"((letrec-values(((for-loop_257)"
+"(lambda(s_71 a_54)"
 "(begin"
 " 'for-loop"
 "(if(pair? a_54)"
 "(let-values(((intdef_11)(car a_54)))"
-"(let-values(((s_323)"
-"(let-values(((s_71) s_425))"
-"(if(let-values(((or-part_279) always?_0))"
-"(if or-part_279"
-" or-part_279"
+"(let-values(((s_427)"
+"(let-values(((s_214) s_71))"
+"(if(let-values(((or-part_280) always?_0))"
+"(if or-part_280"
+" or-part_280"
 "(internal-definition-context-add-scope?"
 " intdef_11)))"
-"(let-values(((s_426) s_71))"
-"(let-values(((s_427)"
+"(let-values(((s_428) s_214))"
+"(let-values(((s_215)"
 "(let-values()"
 "(action_0"
-" s_426"
+" s_428"
 "(internal-definition-context-scope"
 " intdef_11)))))"
-"(values s_427)))"
-" s_71))))"
-"(if(not #f)(for-loop_261 s_323(cdr a_54)) s_323)))"
-" s_425)))))"
-" for-loop_261)"
-" s_39"
+"(values s_215)))"
+" s_214))))"
+"(if(not #f)(for-loop_257 s_427(cdr a_54)) s_427)))"
+" s_71)))))"
+" for-loop_257)"
+" s_426"
 " x_80)))))))))))"
 "(define-values"
 "(make-local-expand-context42.1)"
@@ -41580,9 +41602,9 @@ static const char *startup_source =
 "(let-values(((keep-#%expression?_1) keep-#%expression?33_0))"
 "(let-values()"
 "(let-values(((same-kind?_0)"
-"(let-values(((or-part_280)(eq? context_9(expand-context-context ctx_45))))"
-"(if or-part_280"
-" or-part_280"
+"(let-values(((or-part_281)(eq? context_9(expand-context-context ctx_45))))"
+"(if or-part_281"
+" or-part_281"
 "(if(list? context_9)(list?(expand-context-context ctx_45)) #f)))))"
 "(let-values(((all-stop-ids_0)"
 "(if stop-ids_1(stop-ids->all-stop-ids stop-ids_1 phase_110) #f)))"
@@ -41590,23 +41612,23 @@ static const char *startup_source =
 "(if(expand-context-def-ctx-scopes ctx_45)"
 "(unbox(expand-context-def-ctx-scopes ctx_45))"
 " null)))"
-"(let-values(((v_195) ctx_45))"
-"(let-values(((the-struct_66) v_195))"
+"(let-values(((v_194) ctx_45))"
+"(let-values(((the-struct_66) v_194))"
 "(if(expand-context/outer? the-struct_66)"
 "(let-values(((context69_0) context_9)"
 "((env70_0)(add-intdef-bindings(expand-context-env ctx_45) intdefs_2))"
 "((use-site-scopes71_0)"
-"(if(let-values(((or-part_281)(eq? context_9 'module)))"
-"(if or-part_281"
-" or-part_281"
-"(let-values(((or-part_282)(eq? context_9 'module-begin)))"
-"(if or-part_282 or-part_282(list? context_9)))))"
+"(if(let-values(((or-part_282)(eq? context_9 'module)))"
+"(if or-part_282"
+" or-part_282"
+"(let-values(((or-part_133)(eq? context_9 'module-begin)))"
+"(if or-part_133 or-part_133(list? context_9)))))"
 "(let-values(((or-part_283)"
 "(root-expand-context-use-site-scopes ctx_45)))"
 "(if or-part_283 or-part_283(box null)))"
 " #f))"
 "((frame-id72_0)"
-"(let-values(((x_81)"
+"(let-values(((x_5)"
 "(let-values(((a_55) intdefs_2))"
 "(if(list? a_55)"
 "(let-values()(reverse$1 a_55))"
@@ -41615,7 +41637,7 @@ static const char *startup_source =
 "(let-values()(list a_55)))))))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_262)"
+"((letrec-values(((for-loop_258)"
 "(lambda(frame-id_9 a_56)"
 "(begin"
 " 'for-loop"
@@ -41648,14 +41670,14 @@ static const char *startup_source =
 "(values"
 " frame-id_12)))))"
 "(if(not #f)"
-"(for-loop_262"
+"(for-loop_258"
 " frame-id_10"
 "(cdr a_56))"
 " frame-id_10)))"
 " frame-id_9)))))"
-" for-loop_262)"
+" for-loop_258)"
 "(root-expand-context-frame-id ctx_45)"
-" x_81))))"
+" x_5))))"
 "((post-expansion73_0)"
 "(let-values(((pe_2)"
 "(if same-kind?_0"
@@ -41670,10 +41692,10 @@ static const char *startup_source =
 " #f)))"
 "(if(if intdefs_2(not(null? intdefs_2)) #f)"
 "(let-values()"
-"(lambda(s_116)"
+"(lambda(s_225)"
 "(begin"
 " 'post-expansion73"
-"(let-values(((temp79_0)(apply-post-expansion pe_2 s_116))"
+"(let-values(((temp79_0)(apply-post-expansion pe_2 s_225))"
 "((intdefs80_0) intdefs_2))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
@@ -41692,7 +41714,7 @@ static const char *startup_source =
 "(if ht_135(let-values()(make-hasheqv))(let-values() #f)))))"
 "((inner78_0)"
 "(let-values(((the-struct_67)"
-"(root-expand-context/outer-inner v_195)))"
+"(root-expand-context/outer-inner v_194)))"
 "(if(expand-context/inner? the-struct_67)"
 "(let-values(((to-parsed?81_0)"
 "(if to-parsed-ok?_0"
@@ -41760,11 +41782,11 @@ static const char *startup_source =
 " the-struct_66)))))))))))))))))))"
 "(define-values"
 "(flip-introduction-scopes)"
-"(lambda(s_428 ctx_46)(begin(flip-scopes s_428(expand-context-current-introduction-scopes ctx_46)))))"
+"(lambda(s_429 ctx_46)(begin(flip-scopes s_429(expand-context-current-introduction-scopes ctx_46)))))"
 "(define-values"
 "(flip-introduction-and-use-scopes)"
-"(lambda(s_429 ctx_47)"
-"(begin(flip-scopes(flip-introduction-scopes s_429 ctx_47)(expand-context-current-use-scopes ctx_47)))))"
+"(lambda(s_229 ctx_47)"
+"(begin(flip-scopes(flip-introduction-scopes s_229 ctx_47)(expand-context-current-use-scopes ctx_47)))))"
 "(define-values"
 "(1/syntax-transforming?)"
 "(lambda()"
@@ -41819,22 +41841,22 @@ static const char *startup_source =
 "(flip-introduction-and-use-scopes s_430 ctx_9))))))))"
 "(define-values"
 "(1/syntax-local-identifier-as-binding)"
-"(lambda(id_77)"
+"(lambda(id_76)"
 "(begin"
 " 'syntax-local-identifier-as-binding"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_77)"
+"(if(identifier? id_76)"
 "(void)"
 "(let-values()"
-"                              (raise-argument-error 'syntax-local-identifier-as-binding \"identifier?\" id_77)))"
+"                              (raise-argument-error 'syntax-local-identifier-as-binding \"identifier?\" id_76)))"
 "(values))))"
 "(let-values(((ctx_52)"
 "(let-values(((temp63_2) 'syntax-local-identifier-as-binding))"
 "(get-current-expand-context16.1 #f temp63_2))))"
-"(remove-use-site-scopes id_77 ctx_52))))))))"
+"(remove-use-site-scopes id_76 ctx_52))))))))"
 "(define-values"
 "(1/syntax-local-phase-level)"
 "(lambda()"
@@ -41851,8 +41873,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ctx_54)"
 "(let-values(((who66_0) 'syntax-local-name))(get-current-expand-context16.1 #f who66_0))))"
-"(let-values(((id_78)(expand-context-name ctx_54)))"
-"(if id_78(datum->syntax$1 #f(syntax-e$1 id_78) id_78) #f))))))))"
+"(let-values(((id_77)(expand-context-name ctx_54)))"
+"(if id_77(datum->syntax$1 #f(syntax-e$1 id_77) id_77) #f))))))))"
 "(define-values"
 "(1/make-syntax-introducer)"
 "(let-values(((make-syntax-introducer2_0)"
@@ -42028,26 +42050,26 @@ static const char *startup_source =
 "(begin"
 " 'do-syntax-local-value15"
 "(let-values(((who_19) who11_0))"
-"(let-values(((id_79) id12_0))"
+"(let-values(((id_78) id12_0))"
 "(let-values(((intdefs_3) intdefs13_0))"
 "(let-values(((failure-thunk_0) failure-thunk14_0))"
 "(let-values(((immediate?_1) immediate?9_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(identifier? id_79)"
+"(if(identifier? id_78)"
 "(void)"
-"                                    (let-values () (raise-argument-error who_19 \"identifier?\" id_79)))"
+"                                    (let-values () (raise-argument-error who_19 \"identifier?\" id_78)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if((lambda(x_82)"
-"(let-values(((or-part_210)(not x_82)))"
+"(if((lambda(x_81)"
+"(let-values(((or-part_210)(not x_81)))"
 "(if or-part_210"
 " or-part_210"
 "((lambda(p_50)"
 "(if(procedure? p_50)(procedure-arity-includes? p_50 0) #f))"
-" x_82))))"
+" x_81))))"
 " failure-thunk_0)"
 "(void)"
 "(let-values()"
@@ -42067,14 +42089,14 @@ static const char *startup_source =
 "(let-values(((who81_0) who_19))(get-current-expand-context16.1 #f who81_0))))"
 "(let-values(((ctx_11)"
 "(if intdefs_3"
-"(let-values(((v_196) current-ctx_0))"
-"(let-values(((the-struct_68) v_196))"
+"(let-values(((v_195) current-ctx_0))"
+"(let-values(((the-struct_68) v_195))"
 "(if(expand-context/outer? the-struct_68)"
 "(let-values(((env82_0)"
 "(add-intdef-bindings"
 "(expand-context-env current-ctx_0)"
 " intdefs_3))"
-"((inner83_0)(root-expand-context/outer-inner v_196)))"
+"((inner83_0)(root-expand-context/outer-inner v_195)))"
 "(expand-context/outer1.1"
 " inner83_0"
 "(root-expand-context/outer-post-expansion the-struct_68)"
@@ -42101,7 +42123,7 @@ static const char *startup_source =
 "(let-values(((obs_34)(expand-context-observer ctx_11)))"
 "(if obs_34"
 "(let-values()"
-"(let-values()(call-expand-observe obs_34 'local-value id_79)))"
+"(let-values()(call-expand-observe obs_34 'local-value id_78)))"
 "(void)))"
 "(values))))"
 "(let-values(((phase_72)(expand-context-phase ctx_11)))"
@@ -42210,40 +42232,40 @@ static const char *startup_source =
 "(let-values()(values v_39 #f))"
 "(let-values() v_39)))))))))))))))"
 " loop_98)"
-"(flip-introduction-scopes id_79 ctx_11))))))))))))))))))"
+"(flip-introduction-scopes id_78 ctx_11))))))))))))))))))"
 "(define-values"
 "(1/syntax-local-value)"
 "(let-values(((syntax-local-value21_0)"
 "(lambda(id20_0 failure-thunk18_0 intdef19_0)"
 "(begin"
 " 'syntax-local-value21"
-"(let-values(((id_80) id20_0))"
+"(let-values(((id_79) id20_0))"
 "(let-values(((failure-thunk_1) failure-thunk18_0))"
 "(let-values(((intdef_13) intdef19_0))"
 "(let-values()"
 "(let-values(((temp91_1) 'syntax-local-value)"
 "((temp92_1) #f)"
-"((id93_1) id_80)"
+"((id93_1) id_79)"
 "((intdef94_0) intdef_13)"
 "((failure-thunk95_0) failure-thunk_1))"
 "(do-syntax-local-value15.1 temp92_1 temp91_1 id93_1 intdef94_0 failure-thunk95_0))))))))))"
 "(case-lambda"
-"((id_81)(begin 'syntax-local-value(syntax-local-value21_0 id_81 #f #f)))"
+"((id_80)(begin 'syntax-local-value(syntax-local-value21_0 id_80 #f #f)))"
 "((id_63 failure-thunk_2 intdef19_1)(syntax-local-value21_0 id_63 failure-thunk_2 intdef19_1))"
-"((id_82 failure-thunk18_1)(syntax-local-value21_0 id_82 failure-thunk18_1 #f)))))"
+"((id_81 failure-thunk18_1)(syntax-local-value21_0 id_81 failure-thunk18_1 #f)))))"
 "(define-values"
 "(1/syntax-local-value/immediate)"
 "(let-values(((syntax-local-value/immediate26_0)"
 "(lambda(id25_2 failure-thunk23_0 intdef24_0)"
 "(begin"
 " 'syntax-local-value/immediate26"
-"(let-values(((id_71) id25_2))"
+"(let-values(((id_82) id25_2))"
 "(let-values(((failure-thunk_3) failure-thunk23_0))"
 "(let-values(((intdef_14) intdef24_0))"
 "(let-values()"
 "(let-values(((temp96_1) 'syntax-local-value/immediate)"
 "((temp97_1) #t)"
-"((id98_0) id_71)"
+"((id98_0) id_82)"
 "((intdef99_0) intdef_14)"
 "((failure-thunk100_0) failure-thunk_3))"
 "(do-syntax-local-value15.1"
@@ -42277,7 +42299,7 @@ static const char *startup_source =
 "                              (if lifts_8 (void) (let-values () (raise-arguments-error who_20 \"no lift target\")))"
 "(values))))"
 "(let-values(((counter_4)(root-expand-context-counter ctx_55)))"
-"(let-values(((ids_28)"
+"(let-values(((ids_27)"
 "(reverse$1"
 "(let-values(((start_39) 0)((end_29) n_29)((inc_23) 1))"
 "(begin"
@@ -42328,13 +42350,13 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_39)(expand-context-observer ctx_55)))"
 "(if obs_39"
-"(let-values()(let-values()(call-expand-observe obs_39 'lift-expr ids_28 s_34)))"
+"(let-values()(let-values()(call-expand-observe obs_39 'lift-expr ids_27 s_34)))"
 "(void)))"
 "(map2"
 "(lambda(id_86)(flip-introduction-scopes id_86 ctx_55))"
 "(add-lifted!"
 " lifts_8"
-" ids_28"
+" ids_27"
 "(flip-introduction-scopes s_34 ctx_55)"
 "(expand-context-phase ctx_55))))))))))))))"
 "(define-values"
@@ -42479,17 +42501,17 @@ static const char *startup_source =
 "(let-values(((phase_113)"
 " pos_107))"
 "(let-values(((s_321)"
-"(let-values(((s_425)"
-" s_434))"
 "(let-values(((s_435)"
+" s_434))"
+"(let-values(((s_436)"
 "(let-values()"
 "(shift-wrap_0"
-" s_425"
+" s_435"
 "(sub1"
 " phase_113)"
 " lift-ctx_4))))"
 "(values"
-" s_435)))))"
+" s_436)))))"
 "(if(not #f)"
 "(for-loop_131"
 " s_321"
@@ -42530,8 +42552,8 @@ static const char *startup_source =
 "(lambda(s_110 phase_114 require-lift-ctx_0)"
 "(require-spec-shift-for-syntax s_110)))"
 "((temp119_0)"
-"(lambda(s_436 phase_115 require-lift-ctx_1)"
-"(wrap-form '#%require(add-scope s_436 sc_35) phase_115))))"
+"(lambda(s_437 phase_115 require-lift-ctx_1)"
+"(wrap-form '#%require(add-scope s_437 sc_35) phase_115))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-require!117_0"
 " expand-context-require-lifts115_0"
@@ -42573,7 +42595,7 @@ static const char *startup_source =
 "((to-module-lift-context-wrt-phase125_0) to-module-lift-context-wrt-phase)"
 "((add-lifted-to-module-provide!126_0) add-lifted-to-module-provide!)"
 "((temp127_2)"
-"(lambda(s_437 phase_116 to-module-lift-ctx_0)(wrap-form 'for-syntax s_437 #f)))"
+"(lambda(s_438 phase_116 to-module-lift-ctx_0)(wrap-form 'for-syntax s_438 #f)))"
 "((temp128_2)"
 "(lambda(s_116 phase_117 to-module-lift-ctx_1)"
 "(wrap-form '#%provide s_116 phase_117))))"
@@ -42614,8 +42636,8 @@ static const char *startup_source =
 "(wrap-form '#%expression orig-s_32 phase_118)"
 " orig-s_32)))"
 "((temp137_1)"
-"(lambda(s_438 phase_119 to-module-lift-ctx_3)"
-"(wrap-form 'begin-for-syntax s_438 phase_119))))"
+"(lambda(s_439 phase_119 to-module-lift-ctx_3)"
+"(wrap-form 'begin-for-syntax s_439 phase_119))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-to-module-end!135_0"
 " expand-context-to-module-lifts133_0"
@@ -42714,12 +42736,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_136)))"
-"((letrec-values(((for-loop_263)"
+"((letrec-values(((for-loop_259)"
 "(lambda(fold-var_257 i_161)"
 "(begin"
 " 'for-loop"
 "(if i_161"
-"(let-values(((phase_121 ids_29)"
+"(let-values(((phase_121 ids_28)"
 "(hash-iterate-key+value ht_136 i_161)))"
 "(let-values(((fold-var_207)"
 "(let-values(((fold-var_258) fold-var_257))"
@@ -42727,16 +42749,16 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(cons phase_121 ids_29))"
+"(cons phase_121 ids_28))"
 " fold-var_258))))"
 "(values fold-var_259)))))"
 "(if(not #f)"
-"(for-loop_263"
+"(for-loop_259"
 " fold-var_207"
 "(hash-iterate-next ht_136 i_161))"
 " fold-var_207)))"
 " fold-var_257)))))"
-" for-loop_263)"
+" for-loop_259)"
 " null"
 "(hash-iterate-first ht_136)))))"
 " #f)))))))))))))"
@@ -42744,15 +42766,15 @@ static const char *startup_source =
 "(requireds->phase-ht)"
 "(lambda(requireds_1)"
 "(begin"
-"(let-values(((lst_297) requireds_1))"
+"(let-values(((lst_296) requireds_1))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_297)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_296)))"
 "((letrec-values(((for-loop_139)"
-"(lambda(ht_137 lst_298)"
+"(lambda(ht_137 lst_297)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_298)"
-"(let-values(((r_43)(unsafe-car lst_298))((rest_170)(unsafe-cdr lst_298)))"
+"(if(pair? lst_297)"
+"(let-values(((r_43)(unsafe-car lst_297))((rest_170)(unsafe-cdr lst_297)))"
 "(let-values(((ht_138)"
 "(let-values(((ht_139) ht_137))"
 "(let-values(((ht_140)"
@@ -42767,7 +42789,7 @@ static const char *startup_source =
 " ht_137)))))"
 " for-loop_139)"
 "(hasheqv)"
-" lst_297))))))"
+" lst_296))))))"
 "(define-values"
 "(1/syntax-local-module-exports)"
 "(lambda(mod-path_9)"
@@ -42813,7 +42835,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_141)))"
-"((letrec-values(((for-loop_264)"
+"((letrec-values(((for-loop_260)"
 "(lambda(fold-var_260 i_162)"
 "(begin"
 " 'for-loop"
@@ -42838,7 +42860,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash-keys"
 " ht_142)))"
-"((letrec-values(((for-loop_265)"
+"((letrec-values(((for-loop_261)"
 "(lambda(fold-var_264"
 " i_12)"
 "(begin"
@@ -42861,24 +42883,24 @@ static const char *startup_source =
 " fold-var_267)))))"
 "(if(not"
 " #f)"
-"(for-loop_265"
+"(for-loop_261"
 " fold-var_265"
 "(hash-iterate-next"
 " ht_142"
 " i_12))"
 " fold-var_265)))"
 " fold-var_264)))))"
-" for-loop_265)"
+" for-loop_261)"
 " null"
 "(hash-iterate-first"
 " ht_142)))))))"
 " fold-var_262))))"
 "(values fold-var_263)))))"
 "(if(not #f)"
-"(for-loop_264 fold-var_261(hash-iterate-next ht_141 i_162))"
+"(for-loop_260 fold-var_261(hash-iterate-next ht_141 i_162))"
 " fold-var_261)))"
 " fold-var_260)))))"
-" for-loop_264)"
+" for-loop_260)"
 " null"
 "(hash-iterate-first ht_141))))))))))))))))"
 "(define-values"
@@ -42898,7 +42920,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_143)))"
-"((letrec-values(((for-loop_266)"
+"((letrec-values(((for-loop_262)"
 "(lambda(fold-var_268 i_163)"
 "(begin"
 " 'for-loop"
@@ -42916,10 +42938,10 @@ static const char *startup_source =
 "(values fold-var_272)))"
 " fold-var_270))))"
 "(if(not #f)"
-"(for-loop_266 fold-var_269(hash-iterate-next ht_143 i_163))"
+"(for-loop_262 fold-var_269(hash-iterate-next ht_143 i_163))"
 " fold-var_269)))"
 " fold-var_268)))))"
-" for-loop_266)"
+" for-loop_262)"
 " null"
 "(hash-iterate-first ht_143))))))))))))"
 "(define-values"
@@ -43058,7 +43080,7 @@ static const char *startup_source =
 "(begin"
 " 'datum->syntax6"
 "(let-values(((stx-c_4) stx-c4_1))"
-"(let-values(((s_439) s5_2))"
+"(let-values(((s_440) s5_2))"
 "(let-values(((stx-l_2) stx-l1_0))"
 "(let-values(((stx-p_1) stx-p2_0))"
 "(let-values()"
@@ -43096,22 +43118,22 @@ static const char *startup_source =
 "(if or-part_294 or-part_294(syntax?$1 stx-p_1)))"
 "(void)"
 "                                        (let-values () (raise-argument-error 'datum->syntax \"(or #f syntax?)\" stx-p_1)))"
-"(datum->syntax$1 stx-c_4 s_439(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
+"(datum->syntax$1 stx-c_4 s_440(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
 "(case-lambda"
 "((stx-c_5 s_77)(begin 'datum->syntax(datum->syntax6_1 stx-c_5 s_77 #f #f #f)))"
 "((stx-c_6 s_4 stx-l_3 stx-p_2 ignored3_1)(datum->syntax6_1 stx-c_6 s_4 stx-l_3 stx-p_2 ignored3_1))"
-"((stx-c_7 s_440 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_440 stx-l_4 stx-p2_1 #f))"
+"((stx-c_7 s_441 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_441 stx-l_4 stx-p2_1 #f))"
 "((stx-c_8 s_181 stx-l1_1)(datum->syntax6_1 stx-c_8 s_181 stx-l1_1 #f #f)))))"
 "(define-values"
 "(1/syntax->list)"
-"(lambda(s_441)"
+"(lambda(s_442)"
 "(begin"
 " 'syntax->list"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_441) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_441)))"
-"(syntax->list$1 s_441)))))))"
+"            (if (syntax?$1 s_442) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_442)))"
+"(syntax->list$1 s_442)))))))"
 "(define-values"
 "(1/syntax-original?)"
 "(lambda(s_167)"
@@ -43298,16 +43320,16 @@ static const char *startup_source =
 "(identifier-binding$1 id_95(sub1(1/syntax-local-phase-level)))))))))"
 "(define-values"
 "(1/identifier-label-binding)"
-"(lambda(id_79)"
+"(lambda(id_78)"
 "(begin"
 " 'identifier-label-binding"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(identifier? id_79)"
+"(if(identifier? id_78)"
 "(void)"
-"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_79)))"
-"(identifier-binding$1 id_79 #f)))))))"
+"              (let-values () (raise-argument-error 'identifier-label-binding \"identifier?\" id_78)))"
+"(identifier-binding$1 id_78 #f)))))))"
 "(define-values"
 "(1/identifier-binding-symbol)"
 "(let-values(((identifier-binding-symbol30_0)"
@@ -43382,23 +43404,23 @@ static const char *startup_source =
 "(syntax-debug-info$1 s_412 phase_77 all-bindings?_1))))))))))))"
 "(case-lambda"
 "((s_86)(begin 'syntax-debug-info(syntax-debug-info39_0 s_86 unsafe-undefined #f)))"
-"((s_442 phase_128 all-bindings?37_1)(syntax-debug-info39_0 s_442 phase_128 all-bindings?37_1))"
+"((s_443 phase_128 all-bindings?37_1)(syntax-debug-info39_0 s_443 phase_128 all-bindings?37_1))"
 "((s_29 phase36_1)(syntax-debug-info39_0 s_29 phase36_1 #f)))))"
 "(define-values"
 "(1/syntax-shift-phase-level)"
-"(lambda(s_443 phase_129)"
+"(lambda(s_444 phase_129)"
 "(begin"
 " 'syntax-shift-phase-level"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_443)"
+"(if(syntax?$1 s_444)"
 "(void)"
-"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_443)))"
+"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_444)))"
 "(if(phase? phase_129)"
 "(void)"
 "(let-values()(raise-argument-error 'syntax-shift-phase-level phase?-string phase_129)))"
-"(syntax-shift-phase-level$1 s_443 phase_129)))))))"
+"(syntax-shift-phase-level$1 s_444 phase_129)))))))"
 "(define-values"
 "(1/syntax-track-origin)"
 "(lambda(new-stx_8 old-stx_4 id_101)"
@@ -43424,7 +43446,7 @@ static const char *startup_source =
 "(void)"
 "                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_101)))"
 "(values))))"
-"(let-values(((s_444)(syntax-track-origin$1 new-stx_8 old-stx_4 id_101)))"
+"(let-values(((s_445)(syntax-track-origin$1 new-stx_8 old-stx_4 id_101)))"
 "(let-values(((ctx_67)"
 "(let-values(((temp60_3) #t))(get-current-expand-context16.1 temp60_3 'unexpected))))"
 "(begin"
@@ -43432,10 +43454,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((obs_44)(expand-context-observer ctx_67)))"
 "(if obs_44"
-"(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_444)))"
+"(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_445)))"
 "(void))))"
 "(void))"
-" s_444)))))))))))"
+" s_445)))))))))))"
 "(define-values"
 "(1/namespace-attach-module)"
 "(let-values(((namespace-attach-module4_0)"
@@ -43772,7 +43794,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((lst_299)"
+"(let-values(((lst_298)"
 "(module-requires"
 " m_20)))"
 "(begin"
@@ -43781,19 +43803,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_299)))"
-"((letrec-values(((for-loop_267)"
-"(lambda(lst_300)"
+" lst_298)))"
+"((letrec-values(((for-loop_263)"
+"(lambda(lst_299)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_300)"
+" lst_299)"
 "(let-values(((phase+reqs_1)"
 "(unsafe-car"
-" lst_300))"
+" lst_299))"
 "((rest_171)"
 "(unsafe-cdr"
-" lst_300)))"
+" lst_299)))"
 "(let-values((()"
 "(let-values(((lst_225)"
 "(cdr"
@@ -43847,12 +43869,12 @@ static const char *startup_source =
 " lst_225)))))"
 "(if(not"
 " #f)"
-"(for-loop_267"
+"(for-loop_263"
 " rest_171)"
 "(values))))"
 "(values))))))"
-" for-loop_267)"
-" lst_299)))"
+" for-loop_263)"
+" lst_298)))"
 "(void)"
 "(let-values(((lst_276)"
 "(module-submodule-names"
@@ -43933,7 +43955,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_145)))"
-"((letrec-values(((for-loop_268)"
+"((letrec-values(((for-loop_264)"
 "(lambda(i_164)"
 "(begin"
 " 'for-loop"
@@ -44040,11 +44062,11 @@ static const char *startup_source =
 "(hash-iterate-first"
 " ht_146))))))"
 "(if(not #f)"
-"(for-loop_268"
+"(for-loop_264"
 "(hash-iterate-next ht_145 i_164))"
 "(values))))"
 "(values))))))"
-" for-loop_268)"
+" for-loop_264)"
 "(hash-iterate-first ht_145))))"
 "(values))))"
 "(let-values()"
@@ -44062,7 +44084,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_147)))"
-"((letrec-values(((for-loop_269)"
+"((letrec-values(((for-loop_265)"
 "(lambda(i_21)"
 "(begin"
 " 'for-loop"
@@ -44081,11 +44103,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_269"
+"(for-loop_265"
 "(hash-iterate-next ht_147 i_21))"
 "(values))))"
 "(values))))))"
-" for-loop_269)"
+" for-loop_265)"
 "(hash-iterate-first ht_147))))"
 "(void))))))))))))))))))))))))"
 "(define-values"
@@ -44223,7 +44245,7 @@ static const char *startup_source =
 "(let-values()(add-ns-scopes_0 s_2)))))))))))))))))))"
 "(case-lambda"
 "((s_78)(begin 'namespace-syntax-introduce(namespace-syntax-introduce3_0 s_78 unsafe-undefined)))"
-"((s_445 ns1_2)(namespace-syntax-introduce3_0 s_445 ns1_2)))))"
+"((s_446 ns1_2)(namespace-syntax-introduce3_0 s_446 ns1_2)))))"
 "(define-values"
 "(namespace-datum-introduce)"
 "(lambda(s_181)(begin(1/namespace-syntax-introduce(1/datum->syntax #f s_181)))))"
@@ -44515,7 +44537,7 @@ static const char *startup_source =
 " ns_11))"
 "(void))"
 "(values))))"
-"(let-values(((v_197"
+"(let-values(((v_196"
 " primitive?_8"
 " extra-inspector_9"
 " protected?_9)"
@@ -44539,7 +44561,7 @@ static const char *startup_source =
 " id121_0))"
 "(values variable #f #f #f))))"
 "(begin"
-"(if(variable? v_197)"
+"(if(variable? v_196)"
 "(void)"
 "(let-values()"
 "(escape_0"
@@ -44738,29 +44760,29 @@ static const char *startup_source =
 "(lambda(s3_1 ns1_4 compile2_0)"
 "(begin"
 " 'eval4"
-"(let-values(((s_446) s3_1))"
+"(let-values(((s_447) s3_1))"
 "(let-values(((ns_87)(if(eq? ns1_4 unsafe-undefined)(1/current-namespace) ns1_4)))"
 "(let-values(((compile_1)"
 "(if(eq? compile2_0 unsafe-undefined)"
 "(lambda(s_75 ns_55)(begin 'compile(1/compile s_75 ns_55 #f)))"
 " compile2_0)))"
 "(let-values()"
-"(if(let-values(((or-part_28)(compiled-in-memory? s_446)))"
+"(if(let-values(((or-part_28)(compiled-in-memory? s_447)))"
 "(if or-part_28"
 " or-part_28"
-"(let-values(((or-part_294)(1/linklet-directory? s_446)))"
-"(if or-part_294 or-part_294(1/linklet-bundle? s_446)))))"
-"(let-values()(eval-compiled s_446 ns_87))"
-"(if(if(syntax?$1 s_446)"
-"(let-values(((or-part_297)(compiled-in-memory?(1/syntax-e s_446))))"
+"(let-values(((or-part_294)(1/linklet-directory? s_447)))"
+"(if or-part_294 or-part_294(1/linklet-bundle? s_447)))))"
+"(let-values()(eval-compiled s_447 ns_87))"
+"(if(if(syntax?$1 s_447)"
+"(let-values(((or-part_297)(compiled-in-memory?(1/syntax-e s_447))))"
 "(if or-part_297"
 " or-part_297"
-"(let-values(((or-part_298)(1/linklet-directory?(1/syntax-e s_446))))"
-"(if or-part_298 or-part_298(1/linklet-bundle?(1/syntax-e s_446))))))"
+"(let-values(((or-part_298)(1/linklet-directory?(1/syntax-e s_447))))"
+"(if or-part_298 or-part_298(1/linklet-bundle?(1/syntax-e s_447))))))"
 " #f)"
-"(let-values()(eval-compiled(1/syntax->datum s_446) ns_87))"
+"(let-values()(eval-compiled(1/syntax->datum s_447) ns_87))"
 "(let-values()"
-"(let-values(((s66_0) s_446)"
+"(let-values(((s66_0) s_447)"
 "((ns67_1) ns_87)"
 "((temp68_2)"
 "(lambda(s_180 ns_88 tail?_52)"
@@ -44768,9 +44790,9 @@ static const char *startup_source =
 "((temp69_0) #f))"
 "(per-top-level54.1 #f #f temp69_0 #t #f temp68_2 #f s66_0 ns67_1)))))))))))))"
 "(case-lambda"
-"((s_445)(begin 'eval(eval4_0 s_445 unsafe-undefined unsafe-undefined)))"
+"((s_446)(begin 'eval(eval4_0 s_446 unsafe-undefined unsafe-undefined)))"
 "((s_76 ns_89 compile2_1)(eval4_0 s_76 ns_89 compile2_1))"
-"((s_441 ns1_5)(eval4_0 s_441 ns1_5 unsafe-undefined)))))"
+"((s_442 ns1_5)(eval4_0 s_442 ns1_5 unsafe-undefined)))))"
 "(define-values"
 "(eval-compiled)"
 "(let-values(((eval-compiled9_0)"
@@ -44811,10 +44833,10 @@ static const char *startup_source =
 "(let-values(((s72_0) s_184)"
 "((ns73_0) ns_93)"
 "((temp74_0)"
-"(lambda(s_447 ns_47 as-tail?_4)"
+"(lambda(s_448 ns_47 as-tail?_4)"
 "(list"
 "(compile-single$1"
-" s_447"
+" s_448"
 " ns_47"
 " expand_0"
 " serializable?_4"
@@ -44844,8 +44866,8 @@ static const char *startup_source =
 " cs77_0))))))))))))))"
 "(case-lambda"
 "((s_11)(begin 'compile(compile16_0 s_11 unsafe-undefined #t unsafe-undefined #f)))"
-"((s_448 ns_94 serializable?_5 expand_1 to-source?14_1)"
-"(compile16_0 s_448 ns_94 serializable?_5 expand_1 to-source?14_1))"
+"((s_449 ns_94 serializable?_5 expand_1 to-source?14_1)"
+"(compile16_0 s_449 ns_94 serializable?_5 expand_1 to-source?14_1))"
 "((s_14 ns_95 serializable?_6 expand13_1)(compile16_0 s_14 ns_95 serializable?_6 expand13_1 #f))"
 "((s_15 ns_96 serializable?12_1)(compile16_0 s_15 ns_96 serializable?12_1 unsafe-undefined #f))"
 "((s_83 ns11_2)(compile16_0 s_83 ns11_2 #t unsafe-undefined #f)))))"
@@ -44859,7 +44881,7 @@ static const char *startup_source =
 "(let-values(((ns_63)(if(eq? ns18_1 unsafe-undefined)(1/current-namespace) ns18_1)))"
 "(let-values()(1/compile s_20 ns_63 #t expand$1 #t))))))))"
 "(case-lambda"
-"((s_449)(begin(compile-to-linklets20_0 s_449 unsafe-undefined)))"
+"((s_450)(begin(compile-to-linklets20_0 s_450 unsafe-undefined)))"
 "((s_22 ns18_2)(compile-to-linklets20_0 s_22 ns18_2)))))"
 "(define-values"
 "(struct:lifted-parsed-begin"
@@ -44890,10 +44912,10 @@ static const char *startup_source =
 "(make-struct-field-accessor -ref_80 1 'last))))"
 "(define-values"
 "(compile-single$1)"
-"(lambda(s_450 ns_97 expand_2 serializable?_7 to-source?_5)"
+"(lambda(s_451 ns_97 expand_2 serializable?_7 to-source?_5)"
 "(begin"
 " 'compile-single"
-"(let-values(((exp-s_4)(expand_2 s_450 ns_97 #f #t serializable?_7)))"
+"(let-values(((exp-s_4)(expand_2 s_451 ns_97 #f #t serializable?_7)))"
 "((letrec-values(((loop_100)"
 "(lambda(exp-s_5)"
 "(begin"
@@ -44933,14 +44955,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_168)))"
 "((letrec-values(((for-loop_5)"
-"(lambda(fold-var_273 lst_301)"
+"(lambda(fold-var_273 lst_300)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_301)"
+"(if(pair? lst_300)"
 "(let-values(((e_74)"
-"(unsafe-car lst_301))"
+"(unsafe-car lst_300))"
 "((rest_88)"
-"(unsafe-cdr lst_301)))"
+"(unsafe-cdr lst_300)))"
 "(let-values(((fold-var_166)"
 "(let-values(((fold-var_167)"
 " fold-var_273))"
@@ -44984,7 +45006,7 @@ static const char *startup_source =
 "(lambda(s27_1 ns23_0 observable?24_0 to-parsed?25_0 serializable?26_0)"
 "(begin"
 " 'expand28"
-"(let-values(((s_451) s27_1))"
+"(let-values(((s_452) s27_1))"
 "(let-values(((ns_98)(if(eq? ns23_0 unsafe-undefined)(1/current-namespace) ns23_0)))"
 "(let-values(((observable?_0) observable?24_0))"
 "(let-values(((to-parsed?_2) to-parsed?25_0))"
@@ -45000,7 +45022,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s94_1) s_451)"
+"(let-values(((s94_1) s_452)"
 "((ns95_0) ns_98)"
 "((temp96_2)"
 "(lambda(s_314 ns_99 as-tail?_5)"
@@ -45024,12 +45046,12 @@ static const char *startup_source =
 " s94_1"
 " ns95_0))))))))))))))))"
 "(case-lambda"
-"((s_452)(begin 'expand(expand28_0 s_452 unsafe-undefined #f #f #f)))"
-"((s_453 ns_9 observable?_1 to-parsed?_3 serializable?26_1)"
-"(expand28_0 s_453 ns_9 observable?_1 to-parsed?_3 serializable?26_1))"
-"((s_454 ns_100 observable?_2 to-parsed?25_1)(expand28_0 s_454 ns_100 observable?_2 to-parsed?25_1 #f))"
+"((s_453)(begin 'expand(expand28_0 s_453 unsafe-undefined #f #f #f)))"
+"((s_454 ns_9 observable?_1 to-parsed?_3 serializable?26_1)"
+"(expand28_0 s_454 ns_9 observable?_1 to-parsed?_3 serializable?26_1))"
+"((s_455 ns_100 observable?_2 to-parsed?25_1)(expand28_0 s_455 ns_100 observable?_2 to-parsed?25_1 #f))"
 "((s_305 ns_101 observable?24_1)(expand28_0 s_305 ns_101 observable?24_1 #f #f))"
-"((s_455 ns23_1)(expand28_0 s_455 ns23_1 #f #f #f)))))"
+"((s_456 ns23_1)(expand28_0 s_456 ns23_1 #f #f #f)))))"
 "(define-values"
 "(expand-single)"
 "(lambda(s_58 ns_102 observer_3 to-parsed?_4 serializable?_9)"
@@ -45113,7 +45135,7 @@ static const char *startup_source =
 "(let-values(((s114_0) s_66)"
 "((ns115_0) ns_103)"
 "((temp116_0)"
-"(lambda(s_456 ns_104 as-tail?_6)(expand-single-once s_456 ns_104)))"
+"(lambda(s_425 ns_104 as-tail?_6)(expand-single-once s_425 ns_104)))"
 "((cons117_0) cons)"
 "((re-pair118_0) re-pair)"
 "((temp119_1) #t)"
@@ -45270,13 +45292,13 @@ static const char *startup_source =
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
-"(let-values(((v_198) ctx_69))"
-"(let-values(((the-struct_71) v_198))"
+"(let-values(((v_197) ctx_69))"
+"(let-values(((the-struct_71) v_197))"
 "(if(expand-context/outer? the-struct_71)"
 "(let-values(((inner134_0)"
 "(let-values(((the-struct_72)"
 "(root-expand-context/outer-inner"
-" v_198)))"
+" v_197)))"
 "(if(expand-context/inner?"
 " the-struct_72)"
 "(let-values(((phase135_1)"
@@ -45389,15 +45411,15 @@ static const char *startup_source =
 "(let-values(((require-lifts_5 lifts_12 exp-s_7)"
 "(expand-capturing-lifts"
 " s_461"
-"(let-values(((v_199) tl-ctx_0))"
-"(let-values(((the-struct_73) v_199))"
+"(let-values(((v_198) tl-ctx_0))"
+"(let-values(((the-struct_73) v_198))"
 "(if(expand-context/outer? the-struct_73)"
 "(let-values(((only-immediate?139_0)"
 " #t)"
 "((inner140_0)"
 "(let-values(((the-struct_74)"
 "(root-expand-context/outer-inner"
-" v_199)))"
+" v_198)))"
 "(if(expand-context/inner?"
 " the-struct_74)"
 "(let-values(((phase141_0)"
@@ -45588,15 +45610,15 @@ static const char *startup_source =
 " s_162)))"
 " s_115))"
 "((e149_0)"
-"(let-values(((s_437)"
+"(let-values(((s_438)"
 "(cdr"
 " s_162)))"
 "(let-values(((s_224)"
 "(if(syntax?$1"
-" s_437)"
+" s_438)"
 "(syntax-e$1"
-" s_437)"
-" s_437)))"
+" s_438)"
+" s_438)))"
 "(let-values(((flat-s_21)"
 "(to-syntax-list.1"
 " s_224)))"
@@ -45816,19 +45838,19 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_208)))"
-"((letrec-values(((for-loop_270)"
+"((letrec-values(((for-loop_266)"
 "(lambda(fold-var_274"
-" lst_302)"
+" lst_301)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_302)"
+" lst_301)"
 "(let-values(((s_467)"
 "(unsafe-car"
-" lst_302))"
+" lst_301))"
 "((rest_113)"
 "(unsafe-cdr"
-" lst_302)))"
+" lst_301)))"
 "(let-values(((fold-var_257)"
 "(let-values(((fold-var_275)"
 " fold-var_274))"
@@ -45857,12 +45879,12 @@ static const char *startup_source =
 " fold-var_205)))))"
 "(if(not"
 " #f)"
-"(for-loop_270"
+"(for-loop_266"
 " fold-var_257"
 " rest_113)"
 " fold-var_257)))"
 " fold-var_274)))))"
-" for-loop_270)"
+" for-loop_266)"
 " null"
 " lst_208))))))"
 "(if wrap_2"
@@ -45927,12 +45949,12 @@ static const char *startup_source =
 "(let-values(((exp-s_8)"
 "(let-values(((s155_0) s_343)"
 "((temp156_0)"
-"(let-values(((v_200) ctx_70))"
-"(let-values(((the-struct_75) v_200))"
+"(let-values(((v_199) ctx_70))"
+"(let-values(((the-struct_75) v_199))"
 "(if(expand-context/outer? the-struct_75)"
 "(let-values(((inner157_0)"
 "(let-values(((the-struct_76)"
-"(root-expand-context/outer-inner v_200)))"
+"(root-expand-context/outer-inner v_199)))"
 "(if(expand-context/inner? the-struct_76)"
 "(let-values(((lifts158_0) lift-ctx_6)"
 "((module-lifts159_0) lift-ctx_6)"
@@ -46085,18 +46107,18 @@ static const char *startup_source =
 "(lifted-parsed-begin22.1"
 "(append"
 "(reverse$1"
-"(let-values(((lst_303) require-lifts_6))"
+"(let-values(((lst_302) require-lifts_6))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_303)))"
-"((letrec-values(((for-loop_271)"
-"(lambda(fold-var_276 lst_304)"
+"(let-values()(check-list lst_302)))"
+"((letrec-values(((for-loop_267)"
+"(lambda(fold-var_276 lst_303)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_304)"
-"(let-values(((req_19)(unsafe-car lst_304))"
-"((rest_173)(unsafe-cdr lst_304)))"
+"(if(pair? lst_303)"
+"(let-values(((req_19)(unsafe-car lst_303))"
+"((rest_173)(unsafe-cdr lst_303)))"
 "(let-values(((fold-var_277)"
 "(let-values(((fold-var_278) fold-var_276))"
 "(let-values(((fold-var_279)"
@@ -46106,24 +46128,24 @@ static const char *startup_source =
 "(parsed-require23.1 req_19))"
 " fold-var_278))))"
 "(values fold-var_279)))))"
-"(if(not #f)(for-loop_271 fold-var_277 rest_173) fold-var_277)))"
+"(if(not #f)(for-loop_267 fold-var_277 rest_173) fold-var_277)))"
 " fold-var_276)))))"
-" for-loop_271)"
+" for-loop_267)"
 " null"
-" lst_303))))"
+" lst_302))))"
 "(reverse$1"
-"(let-values(((lst_305)(get-lifts-as-lists lifts_13)))"
+"(let-values(((lst_304)(get-lifts-as-lists lifts_13)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_305)))"
-"((letrec-values(((for-loop_272)"
-"(lambda(fold-var_280 lst_306)"
+"(let-values()(check-list lst_304)))"
+"((letrec-values(((for-loop_268)"
+"(lambda(fold-var_280 lst_305)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_306)"
-"(let-values(((ids+syms+rhs_0)(unsafe-car lst_306))"
-"((rest_174)(unsafe-cdr lst_306)))"
+"(if(pair? lst_305)"
+"(let-values(((ids+syms+rhs_0)(unsafe-car lst_305))"
+"((rest_174)(unsafe-cdr lst_305)))"
 "(let-values(((fold-var_281)"
 "(let-values(((fold-var_282) fold-var_280))"
 "(let-values(((fold-var_283)"
@@ -46167,11 +46189,11 @@ static const char *startup_source =
 " dv_0)))))"
 " fold-var_282))))"
 "(values fold-var_283)))))"
-"(if(not #f)(for-loop_272 fold-var_281 rest_174) fold-var_281)))"
+"(if(not #f)(for-loop_268 fold-var_281 rest_174) fold-var_281)))"
 " fold-var_280)))))"
-" for-loop_272)"
+" for-loop_268)"
 " null"
-" lst_305)))))"
+" lst_304)))))"
 " exp-s_9))))))))))"
 "(define-values"
 "(log-top-lift-begin-before)"
@@ -46360,7 +46382,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_149)))"
-"((letrec-values(((for-loop_273)"
+"((letrec-values(((for-loop_269)"
 "(lambda(result_116 i_166)"
 "(begin"
 " 'for-loop"
@@ -46389,15 +46411,15 @@ static const char *startup_source =
 " #f)"
 " #f)))))"
 "(values result_118)))))"
-"(if(if(not((lambda x_83(not result_117)) k_35 v_3))"
+"(if(if(not((lambda x_82(not result_117)) k_35 v_3))"
 "(not #f)"
 " #f)"
-"(for-loop_273"
+"(for-loop_269"
 " result_117"
 "(hash-iterate-next ht_149 i_166))"
 " result_117)))"
 " result_116)))))"
-" for-loop_273)"
+" for-loop_269)"
 " #t"
 "(hash-iterate-first ht_149))))"
 " #f))))))"
@@ -46428,12 +46450,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_150)))"
-"((letrec-values(((for-loop_274)"
+"((letrec-values(((for-loop_270)"
 "(lambda(table_208 i_167)"
 "(begin"
 " 'for-loop"
 "(if i_167"
-"(let-values(((k_36 v_201)(hash-iterate-key+value ht_150 i_167)))"
+"(let-values(((k_36 v_200)(hash-iterate-key+value ht_150 i_167)))"
 "(let-values(((table_209)"
 "(let-values(((table_180) table_208))"
 "(let-values(((table_210)"
@@ -46442,17 +46464,17 @@ static const char *startup_source =
 "(let-values()"
 "(values"
 " k_36"
-"(to-path v_201)))))"
+"(to-path v_200)))))"
 "(hash-set"
 " table_180"
 " key_82"
 " val_77)))))"
 "(values table_210)))))"
 "(if(not #f)"
-"(for-loop_274 table_209(hash-iterate-next ht_150 i_167))"
+"(for-loop_270 table_209(hash-iterate-next ht_150 i_167))"
 " table_209)))"
 " table_208)))))"
-" for-loop_274)"
+" for-loop_270)"
 " '#hash()"
 "(hash-iterate-first ht_150)))))))))"
 " l_8)))))))"
@@ -46495,17 +46517,17 @@ static const char *startup_source =
 "(let-values()"
 "(make-parameter"
 " 'modify-seconds"
-"(lambda(v_202)"
+"(lambda(v_201)"
 "(begin"
 "(if((lambda(v_69)"
 "(let-values(((or-part_32)(eq? v_69 'modify-seconds)))"
 "(if or-part_32 or-part_32(eq? v_69 'exists))))"
-" v_202)"
+" v_201)"
 "(void)"
-"             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_202)))"
-" v_202))))))"
+"             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_201)))"
+" v_201))))))"
 "(define-values(1/use-collection-link-paths)(make-parameter #t(lambda(v_82)(if v_82 #t #f))))"
-"(define-values(1/use-user-specific-search-paths)(make-parameter #t(lambda(v_203)(if v_203 #t #f))))"
+"(define-values(1/use-user-specific-search-paths)(make-parameter #t(lambda(v_202)(if v_202 #t #f))))"
 "(define-values(complete-path-string?)(lambda(p_57)(begin(if(path-string? p_57)(complete-path? p_57) #f))))"
 "(define-values"
 "(relative-path-string?$1)"
@@ -46557,15 +46579,15 @@ static const char *startup_source =
 "(define-values(1/expand)(lambda(s_9)(begin 'expand(expand$1(intro s_9)(1/current-namespace) #t))))"
 "(define-values"
 "(1/expand-syntax)"
-"(lambda(s_439)"
+"(lambda(s_440)"
 "(begin"
 " 'expand-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_439) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_439)))"
-"(expand$1 s_439(1/current-namespace) #t)))))))"
-"(define-values(1/expand-once)(lambda(s_446)(begin 'expand-once(expand-once$1(intro s_446)))))"
+"            (if (syntax?$1 s_440) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_440)))"
+"(expand$1 s_440(1/current-namespace) #t)))))))"
+"(define-values(1/expand-once)(lambda(s_447)(begin 'expand-once(expand-once$1(intro s_447)))))"
 "(define-values"
 "(1/expand-syntax-once)"
 "(lambda(s_178)"
@@ -47334,7 +47356,7 @@ static const char *startup_source =
 "(lambda()"
 "(call-with-default-reading-parameterization"
 "(lambda()"
-"(let-values(((v_204)"
+"(let-values(((v_203)"
 "(if(no-file-stamp? ts_1)"
 " null"
 "(let-values(((links-path11_0) links-path_0)"
@@ -47351,7 +47373,7 @@ static const char *startup_source =
 "(call-with-input-file*61.1 'binary links-path11_0 temp12_3)))))"
 "(let-values((()"
 "(begin"
-"(if(if(list? v_204)"
+"(if(if(list? v_203)"
 "(andmap2"
 "(lambda(p_66)"
 "(if(list? p_66)"
@@ -47372,7 +47394,7 @@ static const char *startup_source =
 " #f)"
 " #f)"
 " #f))"
-" v_204)"
+" v_203)"
 " #f)"
 "(void)"
 "                                                  (let-values () (error \"ill-formed content\")))"
@@ -47410,8 +47432,8 @@ static const char *startup_source =
 "(let-values()(hash-set! ht_151 #f null)))"
 "(hash-for-each"
 " ht_151"
-"(lambda(k_38 v_205)"
-"(hash-set! ht_151 k_38(cons dir_1 v_205))))))"
+"(lambda(k_38 v_204)"
+"(hash-set! ht_151 k_38(cons dir_1 v_204))))))"
 "(let-values()"
 "(let-values(((s_485)(string->symbol(car p_67))))"
 "(hash-set!"
@@ -47419,10 +47441,10 @@ static const char *startup_source =
 " s_485"
 "(cons(box dir_1)(hash-ref ht_151 s_485 null)))))))))"
 "(void)))"
-" v_204)"
+" v_203)"
 "(hash-for-each"
 " ht_151"
-"(lambda(k_39 v_206)(hash-set! ht_151 k_39(reverse$1 v_206))))"
+"(lambda(k_39 v_205)(hash-set! ht_151 k_39(reverse$1 v_205))))"
 "(hash-set! links-cache links-path_0(cons ts_1 ht_151))"
 " ht_151))))))))))))))))))))))"
 "(define-values"
@@ -47664,13 +47686,13 @@ static const char *startup_source =
 "(if(null? l_83)"
 " null"
 "(let-values(((collects-path_1)(car l_83)))"
-"(let-values(((v_207)"
+"(let-values(((v_206)"
 "(exe-relative-path->complete-path"
 " collects-path_1)))"
-"(if v_207"
+"(if v_206"
 "(cons"
 "(simplify-path"
-"(path->complete-path v_207(current-directory)))"
+"(path->complete-path v_206(current-directory)))"
 "(loop_105(cdr l_83)))"
 "(loop_105(cdr l_83))))))))))"
 " loop_105)"
@@ -47690,14 +47712,14 @@ static const char *startup_source =
 "(let-values()"
 "(make-parameter"
 " #f"
-"(lambda(v_208)"
+"(lambda(v_207)"
 "(begin"
-"(if((lambda(x_84)"
-"(let-values(((or-part_11)(not x_84)))(if or-part_11 or-part_11(prop:readtable? x_84))))"
-" v_208)"
+"(if((lambda(x_83)"
+"(let-values(((or-part_11)(not x_83)))(if or-part_11 or-part_11(prop:readtable? x_83))))"
+" v_207)"
 "(void)"
-"             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_208)))"
-" v_208))))))"
+"             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_207)))"
+" v_207))))))"
 "(define-values"
 "(struct:read-config/outer"
 " read-config/outer1.1"
@@ -47824,43 +47846,43 @@ static const char *startup_source =
 " indentations_0"
 " keep-comment?_0))))"
 "(define-values(read-config-wrap)(lambda(v_27)(begin(read-config/outer-wrap v_27))))"
-"(define-values(read-config-line)(lambda(v_209)(begin(read-config/outer-line v_209))))"
-"(define-values(read-config-col)(lambda(v_210)(begin(read-config/outer-col v_210))))"
-"(define-values(read-config-pos)(lambda(v_211)(begin(read-config/outer-pos v_211))))"
-"(define-values(read-config-indentations)(lambda(v_212)(begin(read-config/outer-indentations v_212))))"
+"(define-values(read-config-line)(lambda(v_208)(begin(read-config/outer-line v_208))))"
+"(define-values(read-config-col)(lambda(v_209)(begin(read-config/outer-col v_209))))"
+"(define-values(read-config-pos)(lambda(v_210)(begin(read-config/outer-pos v_210))))"
+"(define-values(read-config-indentations)(lambda(v_211)(begin(read-config/outer-indentations v_211))))"
 "(define-values(read-config-keep-comment?)(lambda(v_98)(begin(read-config/outer-keep-comment? v_98))))"
 "(define-values"
 "(read-config-readtable)"
-"(lambda(v_213)(begin(read-config/inner-readtable(read-config/outer-inner v_213)))))"
+"(lambda(v_212)(begin(read-config/inner-readtable(read-config/outer-inner v_212)))))"
 "(define-values"
 "(read-config-next-readtable)"
-"(lambda(v_214)(begin(read-config/inner-next-readtable(read-config/outer-inner v_214)))))"
+"(lambda(v_213)(begin(read-config/inner-next-readtable(read-config/outer-inner v_213)))))"
 "(define-values"
 "(read-config-for-syntax?)"
-"(lambda(v_215)(begin(read-config/inner-for-syntax?(read-config/outer-inner v_215)))))"
+"(lambda(v_214)(begin(read-config/inner-for-syntax?(read-config/outer-inner v_214)))))"
 "(define-values(read-config-source)(lambda(v_76)(begin(read-config/inner-source(read-config/outer-inner v_76)))))"
 "(define-values"
 "(read-config-read-compiled)"
-"(lambda(v_216)(begin(read-config/inner-read-compiled(read-config/outer-inner v_216)))))"
+"(lambda(v_215)(begin(read-config/inner-read-compiled(read-config/outer-inner v_215)))))"
 "(define-values"
 "(read-config-dynamic-require)"
-"(lambda(v_217)(begin(read-config/inner-dynamic-require(read-config/outer-inner v_217)))))"
+"(lambda(v_216)(begin(read-config/inner-dynamic-require(read-config/outer-inner v_216)))))"
 "(define-values"
 "(read-config-module-declared?)"
-"(lambda(v_218)(begin(read-config/inner-module-declared?(read-config/outer-inner v_218)))))"
+"(lambda(v_217)(begin(read-config/inner-module-declared?(read-config/outer-inner v_217)))))"
 "(define-values"
 "(read-config-coerce)"
-"(lambda(v_207)(begin(read-config/inner-coerce(read-config/outer-inner v_207)))))"
+"(lambda(v_206)(begin(read-config/inner-coerce(read-config/outer-inner v_206)))))"
 "(define-values"
 "(read-config-coerce-key)"
-"(lambda(v_219)(begin(read-config/inner-coerce-key(read-config/outer-inner v_219)))))"
+"(lambda(v_218)(begin(read-config/inner-coerce-key(read-config/outer-inner v_218)))))"
 "(define-values"
 "(read-config-parameter-override)"
-"(lambda(v_220)(begin(read-config/inner-parameter-override(read-config/outer-inner v_220)))))"
+"(lambda(v_219)(begin(read-config/inner-parameter-override(read-config/outer-inner v_219)))))"
 "(define-values"
 "(read-config-parameter-cache)"
 "(lambda(v_40)(begin(read-config/inner-parameter-cache(read-config/outer-inner v_40)))))"
-"(define-values(read-config-st)(lambda(v_221)(begin(read-config/inner-st(read-config/outer-inner v_221)))))"
+"(define-values(read-config-st)(lambda(v_220)(begin(read-config/inner-st(read-config/outer-inner v_220)))))"
 "(define-values"
 "(struct:read-config-state"
 " read-config-state3.1"
@@ -47966,13 +47988,13 @@ static const char *startup_source =
 "(let-values(((local-graph?_0) reset-graph?33_0))"
 "(let-values(((keep-comment?_2) keep-comment?34_0))"
 "(let-values()"
-"(let-values(((v_222) config_0))"
-"(let-values(((the-struct_78) v_222))"
+"(let-values(((v_221) config_0))"
+"(let-values(((the-struct_78) v_221))"
 "(if(read-config/outer? the-struct_78)"
 "(let-values(((wrap55_0) wrap_5)"
 "((keep-comment?56_0) keep-comment?_2)"
 "((inner57_0)"
-"(let-values(((the-struct_79)(read-config/outer-inner v_222)))"
+"(let-values(((the-struct_79)(read-config/outer-inner v_221)))"
 "(if(read-config/inner? the-struct_79)"
 "(let-values(((for-syntax?58_0) for-syntax?_4)"
 "((readtable59_0) readtable_2)"
@@ -48014,16 +48036,16 @@ static const char *startup_source =
 "(let-values(((given-end-pos_0) end-pos45_0))"
 "(let-values()"
 "(let-values(((end-pos_0)"
-"(let-values(((or-part_306) given-end-pos_0))"
-"(if or-part_306"
-" or-part_306"
+"(let-values(((or-part_282) given-end-pos_0))"
+"(if or-part_282"
+" or-part_282"
 "(let-values(((end-line_0 end-col_0 end-pos_1)(port-next-location in_1)))"
 " end-pos_1)))))"
 "(srcloc"
-"(let-values(((or-part_307)(read-config-source config_1)))"
-"(if or-part_307"
-" or-part_307"
-"                     (let-values (((or-part_308) (object-name in_1))) (if or-part_308 or-part_308 \"UNKNOWN\"))))"
+"(let-values(((or-part_306)(read-config-source config_1)))"
+"(if or-part_306"
+" or-part_306"
+"                     (let-values (((or-part_307) (object-name in_1))) (if or-part_307 or-part_307 \"UNKNOWN\"))))"
 "(read-config-line config_1)"
 "(read-config-col config_1)"
 "(read-config-pos config_1)"
@@ -48034,13 +48056,13 @@ static const char *startup_source =
 "(reading-at)"
 "(lambda(config_2 line_2 col_1 pos_109)"
 "(begin"
-"(let-values(((v_223) config_2))"
-"(let-values(((the-struct_80) v_223))"
+"(let-values(((v_222) config_2))"
+"(let-values(((the-struct_80) v_222))"
 "(if(read-config/outer? the-struct_80)"
 "(let-values(((line62_0) line_2)"
 "((col63_0) col_1)"
 "((pos64_0) pos_109)"
-"((inner65_0)(read-config/outer-inner v_223)))"
+"((inner65_0)(read-config/outer-inner v_222)))"
 "(read-config/outer1.1"
 " inner65_0"
 "(read-config/outer-wrap the-struct_80)"
@@ -48054,10 +48076,10 @@ static const char *startup_source =
 "(disable-wrapping)"
 "(lambda(config_3)"
 "(begin"
-"(let-values(((v_224) config_3))"
-"(let-values(((the-struct_81) v_224))"
+"(let-values(((v_223) config_3))"
+"(let-values(((the-struct_81) v_223))"
 "(if(read-config/outer? the-struct_81)"
-"(let-values(((wrap66_0) #f)((inner67_0)(read-config/outer-inner v_224)))"
+"(let-values(((wrap66_0) #f)((inner67_0)(read-config/outer-inner v_223)))"
 "(read-config/outer1.1"
 " inner67_0"
 " wrap66_0"
@@ -48071,10 +48093,10 @@ static const char *startup_source =
 "(keep-comment)"
 "(lambda(config_4)"
 "(begin"
-"(let-values(((v_225) config_4))"
-"(let-values(((the-struct_82) v_225))"
+"(let-values(((v_224) config_4))"
+"(let-values(((the-struct_82) v_224))"
 "(if(read-config/outer? the-struct_82)"
-"(let-values(((keep-comment?68_0) #t)((inner69_0)(read-config/outer-inner v_225)))"
+"(let-values(((keep-comment?68_0) #t)((inner69_0)(read-config/outer-inner v_224)))"
 "(read-config/outer1.1"
 " inner69_0"
 "(read-config/outer-wrap the-struct_82)"
@@ -48111,11 +48133,11 @@ static const char *startup_source =
 "(if(eq?(read-config-readtable config_6)(read-config-next-readtable config_6))"
 "(let-values() config_6)"
 "(let-values()"
-"(let-values(((v_226) config_6))"
-"(let-values(((the-struct_84) v_226))"
+"(let-values(((v_225) config_6))"
+"(let-values(((the-struct_84) v_225))"
 "(if(read-config/outer? the-struct_84)"
 "(let-values(((inner72_0)"
-"(let-values(((the-struct_85)(read-config/outer-inner v_226)))"
+"(let-values(((the-struct_85)(read-config/outer-inner v_225)))"
 "(if(read-config/inner? the-struct_85)"
 "(let-values(((readtable73_0)(read-config-next-readtable config_6)))"
 "(read-config/inner2.1"
@@ -48152,26 +48174,26 @@ static const char *startup_source =
 "(if for-syntax?_5"
 "(let-values(((in1_0) in_2)((config2_0) config_7))(port+config->srcloc49.1 #f in1_0 config2_0))"
 " #f))))))"
-"(define-values(default-reader-guard$1)(lambda(v_227)(begin 'default-reader-guard v_227)))"
+"(define-values(default-reader-guard$1)(lambda(v_226)(begin 'default-reader-guard v_226)))"
 "(define-values"
 "(1/current-reader-guard)"
 "(make-parameter"
 " default-reader-guard$1"
-"(lambda(v_228)"
+"(lambda(v_227)"
 "(begin"
-"(if(if(procedure? v_228)(procedure-arity-includes? v_228 1) #f)"
+"(if(if(procedure? v_227)(procedure-arity-includes? v_227 1) #f)"
 "(void)"
-"         (let-values () (raise-argument-error 'current-reader-guard \"(procedure-arity-includes/c 1)\" v_228)))"
-" v_228))))"
+"         (let-values () (raise-argument-error 'current-reader-guard \"(procedure-arity-includes/c 1)\" v_227)))"
+" v_227))))"
 "(define-values(1/read-square-bracket-as-paren)(make-parameter #t(lambda(v_1)(if v_1 #t #f))))"
-"(define-values(1/read-curly-brace-as-paren)(make-parameter #t(lambda(v_229)(if v_229 #t #f))))"
-"(define-values(1/read-square-bracket-with-tag)(make-parameter #f(lambda(v_230)(if v_230 #t #f))))"
+"(define-values(1/read-curly-brace-as-paren)(make-parameter #t(lambda(v_228)(if v_228 #t #f))))"
+"(define-values(1/read-square-bracket-with-tag)(make-parameter #f(lambda(v_229)(if v_229 #t #f))))"
 "(define-values(1/read-curly-brace-with-tag)(make-parameter #f(lambda(v_66)(if v_66 #t #f))))"
 "(define-values(1/read-cdot)(make-parameter #f(lambda(v_31)(if v_31 #t #f))))"
 "(define-values(1/read-accept-graph)(make-parameter #t(lambda(v_67)(if v_67 #t #f))))"
 "(define-values(1/read-accept-compiled)(make-parameter #f(lambda(v_2)(if v_2 #t #f))))"
-"(define-values(1/read-accept-box)(make-parameter #t(lambda(v_231)(if v_231 #t #f))))"
-"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_232)(if v_232 #t #f))))"
+"(define-values(1/read-accept-box)(make-parameter #t(lambda(v_230)(if v_230 #t #f))))"
+"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_231)(if v_231 #t #f))))"
 "(define-values(1/read-accept-dot)(make-parameter #t(lambda(v_68)(if v_68 #t #f))))"
 "(define-values(1/read-accept-infix-dot)(make-parameter #t(lambda(v_32)(if v_32 #t #f))))"
 "(define-values(1/read-accept-quasiquote)(make-parameter #t(lambda(v_3)(if v_3 #t #f))))"
@@ -48192,11 +48214,11 @@ static const char *startup_source =
 "(override-parameter)"
 "(lambda(param_1 config_9 v_30)"
 "(begin"
-"(let-values(((v_233) config_9))"
-"(let-values(((the-struct_86) v_233))"
+"(let-values(((v_232) config_9))"
+"(let-values(((the-struct_86) v_232))"
 "(if(read-config/outer? the-struct_86)"
 "(let-values(((inner1_0)"
-"(let-values(((the-struct_87)(read-config/outer-inner v_233)))"
+"(let-values(((the-struct_87)(read-config/outer-inner v_232)))"
 "(if(read-config/inner? the-struct_87)"
 "(let-values(((parameter-override2_0)"
 "(hash-set(read-config-parameter-override config_9) param_1 v_30)))"
@@ -48523,7 +48545,7 @@ static const char *startup_source =
 "(lambda(c_58 config_11)"
 "(begin"
 "(let-values(((rt_2)(read-config-readtable config_11))((c_59) c_58))"
-"(if(let-values(((or-part_309)(not rt_2)))(if or-part_309 or-part_309(not(char? c_59))))"
+"(if(let-values(((or-part_308)(not rt_2)))(if or-part_308 or-part_308(not(char? c_59))))"
 "(let-values() c_59)"
 "(let-values()(*readtable-effective-char rt_2 c_59)))))))"
 "(define-values"
@@ -48547,7 +48569,7 @@ static const char *startup_source =
 "(lambda(handler_0 c_62 in_3 config_14 line_3 col_2 pos_110)"
 "(begin"
 "(let-values(((for-syntax?_6)(read-config-for-syntax? config_14)))"
-"(let-values(((v_234)"
+"(let-values(((v_233)"
 "(if(not for-syntax?_6)"
 "(let-values()"
 "(with-continuation-mark"
@@ -48569,7 +48591,7 @@ static const char *startup_source =
 " config_14)"
 "(let-values()"
 "(handler_0 c_62 in_3(read-config-source config_14) line_3 col_2 pos_110)))))))"
-"(if(1/special-comment? v_234) v_234(coerce v_234 in_3 config_14)))))))"
+"(if(1/special-comment? v_233) v_233(coerce v_233 in_3 config_14)))))))"
 "(define-values"
 "(1/readtable-mapping)"
 "(lambda(rt_5 c_63)"
@@ -48611,7 +48633,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_154)))"
-"((letrec-values(((for-loop_275)"
+"((letrec-values(((for-loop_271)"
 "(lambda(fold-var_85 i_168)"
 "(begin"
 " 'for-loop"
@@ -48627,10 +48649,10 @@ static const char *startup_source =
 "(values fold-var_13)))"
 " fold-var_88))))"
 "(if(not #f)"
-"(for-loop_275 fold-var_284(hash-iterate-next ht_154 i_168))"
+"(for-loop_271 fold-var_284(hash-iterate-next ht_154 i_168))"
 " fold-var_284)))"
 " fold-var_85)))))"
-" for-loop_275)"
+" for-loop_271)"
 " null"
 "(hash-iterate-first ht_154))))))))))"
 "(define-values"
@@ -48805,10 +48827,10 @@ static const char *startup_source =
 " in_10"
 " special1.1"
 " source_5))))"
-"(if(let-values(((or-part_310)"
+"(if(let-values(((or-part_309)"
 "(eof-object? c_66)))"
-"(if or-part_310"
-" or-part_310"
+"(if or-part_309"
+" or-part_309"
 "(eqv?"
 " '#\\newline"
 "(effective-char c_66 config_15))))"
@@ -48862,8 +48884,8 @@ static const char *startup_source =
 "(if(eq? c_69 'special)"
 "(special1.1 'special)"
 " c_69)))))"
-"(let-values(((or-part_311)(eqv? '#\\space c3_2)))"
-"(if or-part_311 or-part_311(eqv? '#\\/ c3_2))))"
+"(let-values(((or-part_310)(eqv? '#\\space c3_2)))"
+"(if or-part_310 or-part_310(eqv? '#\\/ c3_2))))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -48888,13 +48910,13 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(let-values((()(begin(consume-char in_5 '#\\;)(values))))"
-"(let-values(((v_235)(read-one_0 #f in_5 config_15)))"
+"(let-values(((v_234)(read-one_0 #f in_5 config_15)))"
 "(begin"
-"(if(eof-object? v_235)"
+"(if(eof-object? v_234)"
 "(let-values()"
 "(let-values(((in1_2) in_5)"
 "((config2_2) config_15)"
-"((v3_0) v_235)"
+"((v3_0) v_234)"
 "((temp4_2)"
 "                                                                            \"expected a commented-out element for `~a;`, but found end-of-file\")"
 "((ec5_0) ec_0))"
@@ -48995,9 +49017,9 @@ static const char *startup_source =
 "(let-values(((or-part_26)(char-whitespace? dc_0)))"
 "(if or-part_26"
 " or-part_26"
-"(let-values(((or-part_312)(char=? dc_0 '#\\()))"
-"(if or-part_312"
-" or-part_312"
+"(let-values(((or-part_311)(char=? dc_0 '#\\()))"
+"(if or-part_311"
+" or-part_311"
 "(let-values(((or-part_292)(char=? dc_0 '#\\))))"
 "(if or-part_292"
 " or-part_292"
@@ -49098,7 +49120,7 @@ static const char *startup_source =
 "              (let-values () (format \"~a, ~a, or ~a\" p_63 s_10 c_72))"
 "(if(let-values(((or-part_298) s_10))(if or-part_298 or-part_298 c_72))"
 "(let-values()"
-"                  (format \"~a or ~a\" p_63 (let-values (((or-part_310) s_10)) (if or-part_310 or-part_310 c_72))))"
+"                  (format \"~a or ~a\" p_63 (let-values (((or-part_309) s_10)) (if or-part_309 or-part_309 c_72))))"
 "(let-values() p_63)))))))))"
 "(define-values"
 "(struct:accum-string"
@@ -49306,7 +49328,7 @@ static const char *startup_source =
 " #f)))))"
 "(values result_120)))))"
 "(if(if(not"
-"((lambda x_85 result_82)"
+"((lambda x_84 result_82)"
 " indt_3))"
 "(not #f)"
 " #f)"
@@ -49364,14 +49386,14 @@ static const char *startup_source =
 "(let-values(((head_0) #f))"
 "(let-values(((indentation_0)(make-indentation closer_1 in_20 seq-config_0)))"
 "(let-values(((config_34)"
-"(let-values(((v_236) elem-config_0))"
-"(let-values(((the-struct_88) v_236))"
+"(let-values(((v_235) elem-config_0))"
+"(let-values(((the-struct_88) v_235))"
 "(if(read-config/outer? the-struct_88)"
 "(let-values(((indentations20_0)"
 "(cons"
 " indentation_0"
 "(read-config-indentations seq-config_0)))"
-"((inner21_0)(read-config/outer-inner v_236)))"
+"((inner21_0)(read-config/outer-inner v_235)))"
 "(read-config/outer1.1"
 " inner21_0"
 "(read-config/outer-wrap the-struct_88)"
@@ -49512,7 +49534,7 @@ static const char *startup_source =
 " temp32_1"
 "(list)))))"
 "(values))))"
-"(let-values(((v_237)"
+"(let-values(((v_236)"
 "(read-one/not-eof_0"
 " #f"
 " first-read-one_1"
@@ -49533,11 +49555,11 @@ static const char *startup_source =
 "(let-values()"
 "(if(null?"
 " accum_0)"
-" v_237"
+" v_236"
 "(append"
 "(reverse$1"
 " accum_0)"
-" v_237)))"
+" v_236)))"
 "(if(if(eqv?"
 " rest-ec_0"
 " '#\\.)"
@@ -49576,7 +49598,7 @@ static const char *startup_source =
 "(begin"
 "(set! head_0"
 "(box"
-" v_237))"
+" v_236))"
 "(values))))"
 "(let-values(((dot2-line_0"
 " dot2-col_0"
@@ -49740,11 +49762,11 @@ static const char *startup_source =
 "(consume-char in_6 c_68)"
 "(if accum-str_0(let-values()(accum-string-add! accum-str_0 c_68))(void))"
 "((letrec-values(((loop_110)"
-"(lambda(v_201 max-count_1)"
+"(lambda(v_200 max-count_1)"
 "(begin"
 " 'loop"
 "(if(zero? max-count_1)"
-"(let-values() v_201)"
+"(let-values() v_200)"
 "(let-values()"
 "(let-values(((c_76)"
 "(let-values(((in_25) in_6)"
@@ -49768,9 +49790,9 @@ static const char *startup_source =
 "(let-values()(accum-string-add! accum-str_0 c_76))"
 "(void))"
 "(loop_110"
-"(+(digit->number c_76)(* v_201 base_15))"
+"(+(digit->number c_76)(* v_200 base_15))"
 "(sub1 max-count_1))))"
-"(let-values() v_201)))))))))"
+"(let-values() v_200)))))))))"
 " loop_110)"
 "(+(digit->number c_68)(* init-v_0 base_15))"
 "(sub1 max-count_0))))"
@@ -49796,8 +49818,8 @@ static const char *startup_source =
 "(let-values(((or-part_266)(if(char>=? c_77 '#\\0)(char<=? c_77 '#\\9) #f)))"
 "(if or-part_266"
 " or-part_266"
-"(let-values(((or-part_313)(if(char>=? c_77 '#\\A)(char<=? c_77 '#\\F) #f)))"
-"(if or-part_313 or-part_313(if(char>=? c_77 '#\\a)(char<=? c_77 '#\\f) #f))))))))"
+"(let-values(((or-part_312)(if(char>=? c_77 '#\\A)(char<=? c_77 '#\\F) #f)))"
+"(if or-part_312 or-part_312(if(char>=? c_77 '#\\a)(char<=? c_77 '#\\f) #f))))))))"
 "(define-values"
 "(digit->number)"
 "(lambda(c_78)"
@@ -50069,13 +50091,13 @@ static const char *startup_source =
 "(read-special-number s_17 start_43 end_33 convert-mode_2)"
 " #f)))"
 "(if c1_29"
-"((lambda(v_238)"
+"((lambda(v_237)"
 "(if(eq? exactness_0 'exact)"
 "(let-values()"
 "(if(eq? convert-mode_2 'must-read)"
-"                                             (let-values () (format \"no exact representation for `~a`\" v_238))"
+"                                             (let-values () (format \"no exact representation for `~a`\" v_237))"
 "(let-values() #f)))"
-"(let-values() v_238)))"
+"(let-values() v_237)))"
 " c1_29)"
 "(let-values(((c2_3)"
 "(if(char-sign? c_64)"
@@ -50104,8 +50126,8 @@ static const char *startup_source =
 "((temp93_1) 'i)"
 "((v94_0) v_39)"
 "((temp95_0)"
-"(lambda(v_239 v2_0)"
-"(begin 'temp95(make-rectangular v_239 v2_0)))))"
+"(lambda(v_238 v2_0)"
+"(begin 'temp95(make-rectangular v_238 v2_0)))))"
 "(read-for-special-compound62.1"
 " temp93_1"
 " #f"
@@ -50147,8 +50169,8 @@ static const char *startup_source =
 "((temp103_0) #t)"
 "((v2104_0) v2_1)"
 "((temp105_1)"
-"(lambda(v2_2 v_216)"
-"(begin 'temp105(make-rectangular v_216 v2_2)))))"
+"(lambda(v2_2 v_215)"
+"(begin 'temp105(make-rectangular v_215 v2_2)))))"
 "(read-for-special-compound62.1"
 " temp102_0"
 " temp103_0"
@@ -50176,7 +50198,7 @@ static const char *startup_source =
 " #f)"
 " #f)))"
 "(if c4_0"
-"((lambda(v_218)"
+"((lambda(v_217)"
 "(let-values(((s106_0) s_17)"
 "((temp107_2)(+ start_43 7))"
 "((end108_0) end_33)"
@@ -50184,7 +50206,7 @@ static const char *startup_source =
 "((exactness110_0) exactness_0)"
 "((convert-mode111_0) convert-mode_2)"
 "((temp112_1) '@)"
-"((v113_0) v_218)"
+"((v113_0) v_217)"
 "((temp114_3)"
 "(lambda(v_142 v2_3)"
 "(begin 'temp114(make-polar v_142 v2_3)))))"
@@ -50261,7 +50283,7 @@ static const char *startup_source =
 "(lambda(in-complex21_0 radix-set?20_0 s24_2 start25_0 end26_0 radix27_0 exactness28_0 convert-mode29_0)"
 "(begin"
 " 'do-string->non-special-number30"
-"(let-values(((s_456) s24_2))"
+"(let-values(((s_425) s24_2))"
 "(let-values(((start_44) start25_0))"
 "(let-values(((end_34) end26_0))"
 "(let-values(((radix_5) radix27_0))"
@@ -50291,7 +50313,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                           \"no digits in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if must-i?_0(not i-pos_3) #f)"
 "(let-values()"
@@ -50299,13 +50321,13 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                             \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if sign-pos_0"
-"(let-values(((or-part_314)"
+"(let-values(((or-part_313)"
 "(if dot-pos_1(< dot-pos_1 sign-pos_0) #f)))"
-"(if or-part_314"
-" or-part_314"
+"(if or-part_313"
+" or-part_313"
 "(if slash-pos_0(< slash-pos_0 sign-pos_0) #f)))"
 " #f)"
 "(let-values()"
@@ -50313,11 +50335,11 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                               \"misplaced sign in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if i-pos_3"
 "(let-values()"
-"(let-values(((s133_0) s_456)"
+"(let-values(((s133_0) s_425)"
 "((start134_0) start_44)"
 "((sign-pos135_0) sign-pos_0)"
 "((sign-pos136_0) sign-pos_0)"
@@ -50344,7 +50366,7 @@ static const char *startup_source =
 " convert-mode144_0)))"
 "(if @-pos_0"
 "(let-values()"
-"(let-values(((s145_0) s_456)"
+"(let-values(((s145_0) s_425)"
 "((start146_0) start_44)"
 "((@-pos147_0) @-pos_0)"
 "((temp148_1)(add1 @-pos_0))"
@@ -50371,7 +50393,7 @@ static const char *startup_source =
 " convert-mode156_0)))"
 "(let-values()"
 "(string->real-number"
-" s_456"
+" s_425"
 " start_44"
 " end_34"
 " dot-pos_1"
@@ -50382,7 +50404,7 @@ static const char *startup_source =
 " exactness_1"
 " convert-mode_3))))))))"
 "(let-values()"
-"(let-values(((c_79)(string-ref s_456 i_170)))"
+"(let-values(((c_79)(string-ref s_425 i_170)))"
 "(if(digit? c_79 radix_5)"
 "(let-values()"
 "(loop_111"
@@ -50417,7 +50439,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                     \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_111"
@@ -50431,23 +50453,23 @@ static const char *startup_source =
 " slash-pos_0"
 " #f"
 "(if(> i_170 start_44)"
-"(let-values(((or-part_315)(not @-pos_0)))"
-"(if or-part_315"
-" or-part_315"
+"(let-values(((or-part_314)(not @-pos_0)))"
+"(if or-part_314"
+" or-part_314"
 "(> i_170(add1 @-pos_0))))"
 " #f)))))"
 "(if(char=? c_79 '#\\.)"
 "(let-values()"
-"(if(let-values(((or-part_316)"
+"(if(let-values(((or-part_315)"
 "(if exp-pos_0"
-"(let-values(((or-part_317)"
+"(let-values(((or-part_316)"
 "(not sign-pos_0)))"
-"(if or-part_317"
-" or-part_317"
-"(> exp-pos_0 sign-pos_0)))"
-" #f)))"
 "(if or-part_316"
 " or-part_316"
+"(> exp-pos_0 sign-pos_0)))"
+" #f)))"
+"(if or-part_315"
+" or-part_315"
 "(if dot-pos_1"
 "(let-values(((or-part_208)(not sign-pos_0)))"
 "(if or-part_208"
@@ -50459,12 +50481,12 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                       \"misplaced `.` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if slash-pos_0"
-"(let-values(((or-part_279)(not sign-pos_0)))"
-"(if or-part_279"
-" or-part_279"
+"(let-values(((or-part_317)(not sign-pos_0)))"
+"(if or-part_317"
+" or-part_317"
 "(> slash-pos_0 sign-pos_0)))"
 " #f)"
 "(let-values()"
@@ -50472,7 +50494,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_111"
@@ -50499,7 +50521,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                         \"decimal points and fractions annot be mixed `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(let-values(((or-part_319)"
 "(if exp-pos_0"
@@ -50512,10 +50534,10 @@ static const char *startup_source =
 "(if or-part_319"
 " or-part_319"
 "(if slash-pos_0"
-"(let-values(((or-part_321)"
+"(let-values(((or-part_280)"
 "(not sign-pos_0)))"
-"(if or-part_321"
-" or-part_321"
+"(if or-part_280"
+" or-part_280"
 "(> slash-pos_0 sign-pos_0)))"
 " #f)))"
 "(let-values()"
@@ -50523,7 +50545,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                           \"misplaced `/` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_111"
@@ -50537,52 +50559,52 @@ static const char *startup_source =
 " i_170"
 " #f"
 " must-i?_0)))))"
-"(if(let-values(((or-part_322)(char=? c_79 '#\\e)))"
+"(if(let-values(((or-part_321)(char=? c_79 '#\\e)))"
+"(if or-part_321"
+" or-part_321"
+"(let-values(((or-part_322)(char=? c_79 '#\\E)))"
 "(if or-part_322"
 " or-part_322"
-"(let-values(((or-part_323)(char=? c_79 '#\\E)))"
+"(let-values(((or-part_323)"
+"(char=? c_79 '#\\f)))"
 "(if or-part_323"
 " or-part_323"
 "(let-values(((or-part_324)"
-"(char=? c_79 '#\\f)))"
+"(char=? c_79 '#\\F)))"
 "(if or-part_324"
 " or-part_324"
 "(let-values(((or-part_325)"
-"(char=? c_79 '#\\F)))"
+"(char=? c_79 '#\\d)))"
 "(if or-part_325"
 " or-part_325"
-"(let-values(((or-part_326)"
-"(char=? c_79 '#\\d)))"
-"(if or-part_326"
-" or-part_326"
 "(let-values(((or-part_181)"
 "(char=? c_79 '#\\D)))"
 "(if or-part_181"
 " or-part_181"
-"(let-values(((or-part_327)"
+"(let-values(((or-part_326)"
 "(char=?"
 " c_79"
 " '#\\s)))"
-"(if or-part_327"
-" or-part_327"
-"(let-values(((or-part_328)"
+"(if or-part_326"
+" or-part_326"
+"(let-values(((or-part_327)"
 "(char=?"
 " c_79"
 " '#\\S)))"
-"(if or-part_328"
-" or-part_328"
+"(if or-part_327"
+" or-part_327"
 "(let-values(((or-part_209)"
 "(char=?"
 " c_79"
 " '#\\l)))"
 "(if or-part_209"
 " or-part_209"
-"(let-values(((or-part_329)"
+"(let-values(((or-part_328)"
 "(char=?"
 " c_79"
 " '#\\L)))"
-"(if or-part_329"
-" or-part_329"
+"(if or-part_328"
+" or-part_328"
 "(let-values(((or-part_173)"
 "(char=?"
 " c_79"
@@ -50600,10 +50622,10 @@ static const char *startup_source =
 "(format"
 "                                                                           \"misplaced `~a` in `~.a`\""
 " c_79"
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if(<(add1 i_170) end_34)"
-"(char-sign?(string-ref s_456(add1 i_170)))"
+"(char-sign?(string-ref s_425(add1 i_170)))"
 " #f)"
 "(let-values()"
 "(loop_111"
@@ -50615,8 +50637,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_330) exp-pos_0))"
-"(if or-part_330 or-part_330 i_170))"
+"(let-values(((or-part_329) exp-pos_0))"
+"(if or-part_329 or-part_329 i_170))"
 " must-i?_0))"
 "(let-values()"
 "(loop_111"
@@ -50628,8 +50650,8 @@ static const char *startup_source =
 " sign-pos_0"
 " dot-pos_1"
 " slash-pos_0"
-"(let-values(((or-part_331) exp-pos_0))"
-"(if or-part_331 or-part_331 i_170))"
+"(let-values(((or-part_330) exp-pos_0))"
+"(if or-part_330 or-part_330 i_170))"
 " must-i?_0)))))"
 "(if(char=? c_79 '#\\@)"
 "(let-values()"
@@ -50639,7 +50661,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                             \"cannot mix `@` and `i` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(let-values(((or-part_160) @-pos_0))"
 "(if or-part_160"
@@ -50650,7 +50672,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                               \"too many `@`s in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(= i_170 start_44)"
 "(let-values()"
@@ -50658,7 +50680,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                 \"`@` cannot be at start in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if must-i?_0"
 "(let-values()"
@@ -50666,7 +50688,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                   \"too many signs in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_111"
@@ -50680,36 +50702,36 @@ static const char *startup_source =
 " #f"
 " #f"
 " must-i?_0)))))))"
-"(if(if(let-values(((or-part_332)"
+"(if(if(let-values(((or-part_331)"
 "(char=? c_79 '#\\i)))"
-"(if or-part_332"
-" or-part_332"
+"(if or-part_331"
+" or-part_331"
 "(char=? c_79 '#\\I)))"
 " sign-pos_0"
 " #f)"
 "(let-values()"
-"(if(let-values(((or-part_333) @-pos_0))"
-"(if or-part_333"
-" or-part_333"
+"(if(let-values(((or-part_332) @-pos_0))"
+"(if or-part_332"
+" or-part_332"
 "(eq? in-complex_1 '@)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
 "(format"
 "                                                                               \"cannot mix `@` and `i` in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_334)"
+"(if(let-values(((or-part_333)"
 "(<(add1 i_170) end_34)))"
-"(if or-part_334"
-" or-part_334"
+"(if or-part_333"
+" or-part_333"
 "(eq? in-complex_1 'i)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
 "(format"
 "                                                                                 \"`i` must be at the end in `~.a`\""
-"(substring s_456 start_44 end_34)))"
+"(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(let-values()"
 "(loop_111"
@@ -50728,7 +50750,7 @@ static const char *startup_source =
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
-"                                                                              (format \"nul character in `~.a`\" s_456))"
+"                                                                              (format \"nul character in `~.a`\" s_425))"
 "(let-values() #f)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -50821,11 +50843,11 @@ static const char *startup_source =
 " radix168_0"
 " exactness170_0"
 " convert-mode172_0))))))"
-"(if(let-values(((or-part_335)(not v1_0)))"
-"(if or-part_335 or-part_335(not v2_6)))"
+"(if(let-values(((or-part_334)(not v1_0)))"
+"(if or-part_334 or-part_334(not v2_6)))"
 "(let-values() #f)"
-"(if(if(let-values(((or-part_336)(extflonum? v1_0)))"
-"(if or-part_336 or-part_336(extflonum? v2_6)))"
+"(if(if(let-values(((or-part_335)(extflonum? v1_0)))"
+"(if or-part_335 or-part_335(extflonum? v2_6)))"
 "(not(eq? convert-mode_4 'must-read))"
 " #f)"
 "(let-values()(fail-extflonum convert-mode_4 v1_0))"
@@ -50852,14 +50874,14 @@ static const char *startup_source =
 "(lambda()(begin 'extfl-mark?(char=?(char-downcase(string-ref s_333 exp-pos_1)) '#\\t)))))"
 "(let-values(((simple?_0)"
 "(if(not slash-pos_1)"
-"(if(let-values(((or-part_337)(eq? exactness_3 'inexact)))"
-"(if or-part_337"
-" or-part_337"
-"(let-values(((or-part_338)(eq? exactness_3 'decimal-as-inexact)))"
-"(if or-part_338 or-part_338(if(not dot-pos_2)(not exp-pos_1) #f)))))"
-"(if(let-values(((or-part_339)(not exp-pos_1)))"
-"(if or-part_339"
-" or-part_339"
+"(if(let-values(((or-part_336)(eq? exactness_3 'inexact)))"
+"(if or-part_336"
+" or-part_336"
+"(let-values(((or-part_337)(eq? exactness_3 'decimal-as-inexact)))"
+"(if or-part_337 or-part_337(if(not dot-pos_2)(not exp-pos_1) #f)))))"
+"(if(let-values(((or-part_338)(not exp-pos_1)))"
+"(if or-part_338"
+" or-part_338"
 "(let-values(((or-part_223)(not(eq? convert-mode_5 'number-or-false))))"
 "(if or-part_223 or-part_223(not(extfl-mark?_0))))))"
 "(not(if any-hashes?_1(hashes? s_333 start_45 end_35) #f))"
@@ -50887,9 +50909,9 @@ static const char *startup_source =
 "                          (format \"missing digits before exponent marker in `~.a`\" (substring s_333 start_45 end_35)))"
 "(let-values() #f)))"
 "(if(if exp-pos_1"
-"(let-values(((or-part_340)(= exp-pos_1(sub1 end_35))))"
-"(if or-part_340"
-" or-part_340"
+"(let-values(((or-part_339)(= exp-pos_1(sub1 end_35))))"
+"(if or-part_339"
+" or-part_339"
 "(if(= exp-pos_1(- end_35 2))(char-sign?(string-ref s_333(sub1 end_35))) #f)))"
 " #f)"
 "(let-values()"
@@ -50902,9 +50924,9 @@ static const char *startup_source =
 "(string->number$1"
 "(maybe-substring s_333 start_45 end_35)"
 " radix_7"
-"(if(let-values(((or-part_341)(eq? convert-mode_5 'number-or-false)))"
-"(if or-part_341"
-" or-part_341"
+"(if(let-values(((or-part_340)(eq? convert-mode_5 'number-or-false)))"
+"(if or-part_340"
+" or-part_340"
 "(let-values(((or-part_147)(not exp-pos_1)))"
 "(if or-part_147 or-part_147(not(extfl-mark?_0))))))"
 " 'number-or-false"
@@ -50966,7 +50988,7 @@ static const char *startup_source =
 " 'read)))"
 "(let-values()(real->double-flonum r_46)))))))))"
 "(let-values(((get-extfl?_0)(extfl-mark?_0)))"
-"(if(let-values(((or-part_342)(not m-v_0)))(if or-part_342 or-part_342(not e-v_0)))"
+"(if(let-values(((or-part_341)(not m-v_0)))(if or-part_341 or-part_341(not e-v_0)))"
 "(let-values() #f)"
 "(if(string? m-v_0)"
 "(let-values() m-v_0)"
@@ -50974,8 +50996,8 @@ static const char *startup_source =
 "(let-values() e-v_0)"
 "(if(if(eq? convert-mode_5 'number-or-false) get-extfl?_0 #f)"
 "(let-values() #f)"
-"(if(if(let-values(((or-part_343)(eq? exactness_3 'inexact)))"
-"(if or-part_343 or-part_343(eq? exactness_3 'decimal-as-inexact)))"
+"(if(if(let-values(((or-part_342)(eq? exactness_3 'inexact)))"
+"(if or-part_342 or-part_342(eq? exactness_3 'decimal-as-inexact)))"
 "(>(abs e-v_0)(if get-extfl?_0 6000 400))"
 " #f)"
 "(let-values()"
@@ -50997,8 +51019,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((n_32)(* m-v_0(expt radix_7 e-v_0))))"
 "(if(if(not get-extfl?_0)"
-"(let-values(((or-part_344)(eq? exactness_3 'exact)))"
-"(if or-part_344 or-part_344(eq? exactness_3 'decimal-as-exact)))"
+"(let-values(((or-part_343)(eq? exactness_3 'exact)))"
+"(if or-part_343 or-part_343(eq? exactness_3 'decimal-as-exact)))"
 " #f)"
 "(let-values() n_32)"
 "(if(if(eqv? n_32 0)(char=?(string-ref s_333 start_45) '#\\-) #f)"
@@ -51034,13 +51056,13 @@ static const char *startup_source =
 "(lambda(from-pos_0)"
 "(begin"
 " 'get-inexact?"
-"(let-values(((or-part_345)(eq? exactness_3 'inexact)))"
-"(if or-part_345"
-" or-part_345"
+"(let-values(((or-part_344)(eq? exactness_3 'inexact)))"
+"(if or-part_344"
+" or-part_344"
 "(if(not(eq? exactness_3 'exact))"
 "(hashes? s_333 from-pos_0 end_35)"
 " #f)))))))"
-"(if(let-values(((or-part_346)(not n-v_0)))(if or-part_346 or-part_346(not d-v_0)))"
+"(if(let-values(((or-part_345)(not n-v_0)))(if or-part_345 or-part_345(not d-v_0)))"
 "(let-values() #f)"
 "(if(string? n-v_0)"
 "(let-values() n-v_0)"
@@ -51116,8 +51138,8 @@ static const char *startup_source =
 "(sub1 i_171)"
 "(sub1 j_3)"
 "(if(= hashes-pos_0(add1 i_171)) i_171 hashes-pos_0))))))"
-"(if(let-values(((or-part_347)(char=? c_80 '#\\-)))"
-"(if or-part_347 or-part_347(char=? c_80 '#\\+)))"
+"(if(let-values(((or-part_346)(char=? c_80 '#\\-)))"
+"(if or-part_346 or-part_346(char=? c_80 '#\\+)))"
 "(let-values()"
 "(begin"
 "(string-set! new-str_0 j_3 c_80)"
@@ -51169,25 +51191,25 @@ static const char *startup_source =
 "(lambda(s_472 start_48 end_38 convert-mode_8)"
 "(begin"
 "(if(=(- end_38 start_48) 6)"
-"(if(let-values(((or-part_348)(char=?(string-ref s_472 start_48) '#\\+)))"
-"(if or-part_348 or-part_348(char=?(string-ref s_472 start_48) '#\\-)))"
-"(let-values(((or-part_349)"
+"(if(let-values(((or-part_347)(char=?(string-ref s_472 start_48) '#\\+)))"
+"(if or-part_347 or-part_347(char=?(string-ref s_472 start_48) '#\\-)))"
+"(let-values(((or-part_348)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 1))) '#\\i)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 2))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 3))) '#\\f)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 4))) '#\\.)"
-"(let-values(((or-part_350)"
+"(let-values(((or-part_349)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\0)"
 "(if(char=?(string-ref s_472 start_48) '#\\+) +inf.0 -inf.0)"
 " #f)))"
-"(if or-part_350"
-" or-part_350"
-"(let-values(((or-part_351)"
+"(if or-part_349"
+" or-part_349"
+"(let-values(((or-part_350)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\f)"
 "(if(char=?(string-ref s_472 start_48) '#\\+) +inf.f -inf.f)"
 " #f)))"
-"(if or-part_351"
-" or-part_351"
+"(if or-part_350"
+" or-part_350"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false))"
 "(if(char=?(string-ref s_472 start_48) '#\\+) '+inf.t '-inf.t)"
@@ -51197,20 +51219,20 @@ static const char *startup_source =
 " #f)"
 " #f)"
 " #f)))"
-"(if or-part_349"
-" or-part_349"
+"(if or-part_348"
+" or-part_348"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 1))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 2))) '#\\a)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 3))) '#\\n)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 4))) '#\\.)"
-"(let-values(((or-part_352)"
+"(let-values(((or-part_351)"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\0) +nan.0 #f)))"
+"(if or-part_351"
+" or-part_351"
+"(let-values(((or-part_352)"
+"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\f) +nan.f #f)))"
 "(if or-part_352"
 " or-part_352"
-"(let-values(((or-part_353)"
-"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\f) +nan.f #f)))"
-"(if or-part_353"
-" or-part_353"
 "(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false)) '+nan.t #f)"
 " #f)))))"
@@ -51222,10 +51244,10 @@ static const char *startup_source =
 " #f))))"
 "(define-values"
 "(fail-extflonum)"
-"(lambda(convert-mode_9 v_240)"
+"(lambda(convert-mode_9 v_239)"
 "(begin"
 "(if(eq? convert-mode_9 'must-read)"
-"        (let-values () (format \"cannot combine extflonum `~a` into complex number\" v_240))"
+"        (let-values () (format \"cannot combine extflonum `~a` into complex number\" v_239))"
 "(let-values() #f)))))"
 "(define-values"
 "(read-for-special-compound62.1)"
@@ -51249,19 +51271,19 @@ static const char *startup_source =
 "(let-values(((convert-mode_10) convert-mode59_0))"
 "(let-values(((in-complex_3) in-complex50_0))"
 "(let-values(((reading-first?_0) reading-first?51_0))"
-"(let-values(((v_241) v60_0))"
+"(let-values(((v_240) v60_0))"
 "(let-values(((combine_1) combine61_0))"
 "(let-values()"
 "(if(eq? exactness_5 'exact)"
 "(let-values()"
 "(if(eq? convert-mode_10 'must-read)"
-"                                  (let-values () (format \"no exact representation for `~a`\" v_241))"
+"                                  (let-values () (format \"no exact representation for `~a`\" v_240))"
 "(let-values() #f)))"
-"(if(if(extflonum? v_241)"
+"(if(if(extflonum? v_240)"
 "(let-values(((or-part_190)(not reading-first?_0)))"
 "(if or-part_190 or-part_190(not(eq? convert-mode_10 'must-read))))"
 " #f)"
-"(let-values()(fail-extflonum convert-mode_10 v_241))"
+"(let-values()(fail-extflonum convert-mode_10 v_240))"
 "(let-values()"
 "(let-values(((v2_7)"
 "(let-values(((s173_0) s_491)"
@@ -51285,9 +51307,9 @@ static const char *startup_source =
 "(let-values() v2_7)"
 "(if(not v2_7)"
 "(let-values() v2_7)"
-"(if(extflonum? v_241)"
-"(let-values()(fail-extflonum convert-mode_10 v_241))"
-"(let-values()(combine_1 v_241 v2_7)))))))))))))))))))))))"
+"(if(extflonum? v_240)"
+"(let-values()(fail-extflonum convert-mode_10 v_240))"
+"(let-values()(combine_1 v_240 v2_7)))))))))))))))))))))))"
 "(define-values"
 "(hashes?)"
 "(lambda(s_263 start_50 end_40)"
@@ -51296,15 +51318,15 @@ static const char *startup_source =
 "(normalise-inputs"
 " 'in-string"
 "                     \"string\""
-"(lambda(x_86)(string? x_86))"
-"(lambda(x_87)(unsafe-string-length x_87))"
+"(lambda(x_85)(string? x_85))"
+"(lambda(x_86)(unsafe-string-length x_86))"
 " s_263"
 " start_50"
 " end_40"
 " 1)))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_276)"
+"((letrec-values(((for-loop_272)"
 "(lambda(result_121 idx_5)"
 "(begin"
 " 'for-loop"
@@ -51315,11 +51337,11 @@ static const char *startup_source =
 "(let-values(((result_123)"
 "(let-values()(let-values()(char=? c_81 '#\\#)))))"
 "(values result_123)))))"
-"(if(if(not((lambda x_88 result_122) c_81))(not #f) #f)"
-"(for-loop_276 result_122(unsafe-fx+ idx_5 1))"
+"(if(if(not((lambda x_87 result_122) c_81))(not #f) #f)"
+"(for-loop_272 result_122(unsafe-fx+ idx_5 1))"
 " result_122)))"
 " result_121)))))"
-" for-loop_276)"
+" for-loop_272)"
 " #f"
 " start*_5))))))"
 "(define-values"
@@ -51332,8 +51354,8 @@ static const char *startup_source =
 "(normalise-inputs"
 " 'in-string"
 "                         \"string\""
-"(lambda(x_89)(string? x_89))"
-"(lambda(x_90)(unsafe-string-length x_90))"
+"(lambda(x_88)(string? x_88))"
+"(lambda(x_89)(unsafe-string-length x_89))"
 " s_271"
 " start_51"
 " end_41"
@@ -51344,7 +51366,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_52)))"
-"((letrec-values(((for-loop_277)"
+"((letrec-values(((for-loop_273)"
 "(lambda(idx_6 pos_115)"
 "(begin"
 " 'for-loop"
@@ -51361,9 +51383,9 @@ static const char *startup_source =
 "(string-set! new-s_9 i_121 c_82)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_277(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
+"(if(not #f)(for-loop_273(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
 "(values))))))"
-" for-loop_277)"
+" for-loop_273)"
 " start*_6"
 " start_52)))"
 "(void)"
@@ -51376,26 +51398,26 @@ static const char *startup_source =
 "(exactness-set?)"
 "(lambda(exactness_6)"
 "(begin"
-"(let-values(((or-part_354)(eq? exactness_6 'exact)))(if or-part_354 or-part_354(eq? exactness_6 'inexact))))))"
+"(let-values(((or-part_353)(eq? exactness_6 'exact)))(if or-part_353 or-part_353(eq? exactness_6 'inexact))))))"
 "(define-values"
 "(char-sign?)"
 "(lambda(c_83)"
-"(begin(let-values(((or-part_355)(char=? c_83 '#\\-)))(if or-part_355 or-part_355(char=? c_83 '#\\+))))))"
+"(begin(let-values(((or-part_354)(char=? c_83 '#\\-)))(if or-part_354 or-part_354(char=? c_83 '#\\+))))))"
 "(define-values"
 "(digit?)"
 "(lambda(c_84 radix_11)"
 "(begin"
-"(let-values(((v_242)(char->integer c_84)))"
+"(let-values(((v_241)(char->integer c_84)))"
+"(let-values(((or-part_355)"
+"(if(>= v_241(char->integer '#\\0))(<(- v_241(char->integer '#\\0)) radix_11) #f)))"
+"(if or-part_355"
+" or-part_355"
+"(if(> radix_11 10)"
 "(let-values(((or-part_356)"
-"(if(>= v_242(char->integer '#\\0))(<(- v_242(char->integer '#\\0)) radix_11) #f)))"
+"(if(>= v_241(char->integer '#\\a))(<(- v_241(-(char->integer '#\\a) 10)) radix_11) #f)))"
 "(if or-part_356"
 " or-part_356"
-"(if(> radix_11 10)"
-"(let-values(((or-part_357)"
-"(if(>= v_242(char->integer '#\\a))(<(- v_242(-(char->integer '#\\a) 10)) radix_11) #f)))"
-"(if or-part_357"
-" or-part_357"
-"(if(>= v_242(char->integer '#\\A))(<(- v_242(-(char->integer '#\\A) 10)) radix_11) #f)))"
+"(if(>= v_241(char->integer '#\\A))(<(- v_241(-(char->integer '#\\A) 10)) radix_11) #f)))"
 " #f)))))))"
 "(define-values"
 "(fail-bad-number)"
@@ -51514,11 +51536,11 @@ static const char *startup_source =
 " rt_10)"
 "((c_70)"
 " c_85))"
-"(if(let-values(((or-part_358)"
+"(if(let-values(((or-part_357)"
 "(not"
 " rt_11)))"
-"(if or-part_358"
-" or-part_358"
+"(if or-part_357"
+" or-part_357"
 "(not"
 "(char? c_70))))"
 "(let-values() c_70)"
@@ -51747,9 +51769,9 @@ static const char *startup_source =
 "(list temp30_4))))"
 "(void))"
 "(wrap"
-"(let-values(((or-part_359) num_0))"
-"(if or-part_359"
-" or-part_359"
+"(let-values(((or-part_358) num_0))"
+"(if or-part_358"
+" or-part_358"
 "(let-values(((or-part_166)"
 "(if(eq? mode_18 'keyword)"
 "(string->keyword str_29)"
@@ -51764,16 +51786,16 @@ static const char *startup_source =
 "(begin"
 "(let-values(((c_25)(read-char/skip-whitespace-and-comments init-c_0 read-one_3 in_5 config_15)))"
 "(let-values(((line_8 col_7 pos_116)(port-next-location* in_5 c_25)))"
-"          (let-values (((v_233) (read-number-literal c_25 in_5 config_15 \"#e\")))"
-"(if(fixnum? v_233)"
-"(let-values() v_233)"
-"(if(eof-object? v_233)"
-"(let-values() v_233)"
+"          (let-values (((v_232) (read-number-literal c_25 in_5 config_15 \"#e\")))"
+"(if(fixnum? v_232)"
+"(let-values() v_232)"
+"(if(eof-object? v_232)"
+"(let-values() v_232)"
 "(let-values()"
 "(let-values(((in1_3) in_5)"
 "((temp2_5)(reading-at config_15 line_8 col_7 pos_116))"
 "                               ((temp3_6) \"expected a fixnum, found ~a\")"
-"((v4_1) v_233))"
+"((v4_1) v_232))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -51898,7 +51920,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_264)))"
-"((letrec-values(((for-loop_278)"
+"((letrec-values(((for-loop_274)"
 "(lambda(i_3 lst_104)"
 "(begin"
 " 'for-loop"
@@ -51933,19 +51955,19 @@ static const char *startup_source =
 "(values"
 " i_173)))))"
 "(if(if(not"
-"((lambda x_91"
+"((lambda x_90"
 "(unsafe-fx="
 " i_172"
 " len_37))"
 " e_78))"
 "(not #f)"
 " #f)"
-"(for-loop_278"
+"(for-loop_274"
 " i_172"
 " rest_145)"
 " i_172)))"
 " i_3)))))"
-" for-loop_278)"
+" for-loop_274)"
 " 0"
 " lst_264)))))"
 " v_35))))))"
@@ -52007,7 +52029,7 @@ static const char *startup_source =
 "(values"
 " i_153)))))"
 "(if(if(not"
-"((lambda x_92"
+"((lambda x_91"
 "(unsafe-fx="
 " i_42"
 " len_38))"
@@ -52056,11 +52078,11 @@ static const char *startup_source =
 "(list temp25_7 expected-len26_0 len27_0))))"
 "(let-values()"
 "(let-values(((last-or_0)"
-"(lambda(v_243)"
+"(lambda(v_242)"
 "(begin"
 " 'last-or"
 "(if(null? seq_2)"
-"(wrap v_243 in_30 config_10 #f)"
+"(wrap v_242 in_30 config_10 #f)"
 "((letrec-values(((loop_113)"
 "(lambda(seq_3)"
 "(begin"
@@ -52114,19 +52136,19 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_54)))"
-"((letrec-values(((for-loop_267)"
-"(lambda(lst_300 pos_117)"
+"((letrec-values(((for-loop_263)"
+"(lambda(lst_299 pos_117)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_300)"
+"(if(if(pair? lst_299)"
 " #t"
 " #f)"
 "(let-values(((e_79)"
 "(unsafe-car"
-" lst_300))"
+" lst_299))"
 "((rest_175)"
 "(unsafe-cdr"
-" lst_300))"
+" lst_299))"
 "((i_174)"
 " pos_117))"
 "(let-values((()"
@@ -52142,12 +52164,12 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_267"
+"(for-loop_263"
 " rest_175"
 "(+ pos_117 1))"
 "(values))))"
 "(values))))))"
-" for-loop_267)"
+" for-loop_263)"
 " lst_8"
 " start_54)))"
 "(void)))"
@@ -52205,18 +52227,18 @@ static const char *startup_source =
 "(if(equal? tmp_45 'flonum)"
 "(let-values()"
 "(begin"
-"(let-values(((lst_307) seq_2)((start_56) 0))"
+"(let-values(((lst_306) seq_2)((start_56) 0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_307)))"
+"(let-values()(check-list lst_306)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-naturals start_56)))"
-"((letrec-values(((for-loop_279)"
+"((letrec-values(((for-loop_275)"
 "(lambda(lst_98 pos_118)"
 "(begin"
 " 'for-loop"
@@ -52245,15 +52267,15 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_279"
+"(for-loop_275"
 " rest_176"
 "(+"
 " pos_118"
 " 1))"
 "(values))))"
 "(values))))))"
-" for-loop_279)"
-" lst_307"
+" for-loop_275)"
+" lst_306"
 " start_56)))"
 "(void)))"
 "(let-values()(void))))))"
@@ -52387,7 +52409,7 @@ static const char *startup_source =
 "(let-values(((accum-str_2)(accum-string-init! config_42)))"
 "(let-values((()(begin(accum-string-add! accum-str_2 init-c_11)(values))))"
 "(let-values(((init-v_1)(digit->number init-c_11)))"
-"(let-values(((v_244)"
+"(let-values(((v_243)"
 "(let-values(((in69_0) in_34)"
 "((config70_0) config_42)"
 "((accum-str71_0) accum-str_2)"
@@ -52397,7 +52419,7 @@ static const char *startup_source =
 "((init-v75_0) init-v_1))"
 "(read-digits12.1 temp72_1 init-v74_0 temp73_0 init-v75_0 in69_0 config70_0 accum-str71_0))))"
 "(values"
-" v_244"
+" v_243"
 "(let-values(((accum-str76_0) accum-str_2)((config77_0) config_42))"
 "(accum-string-get!6.1 0 accum-str76_0 config77_0))"
 "(let-values(((in_35) in_34)((source_21)(read-config-source config_42)))"
@@ -52665,9 +52687,9 @@ static const char *startup_source =
 "(if(if(equal? tmp_45 '#\\=) #t(equal? tmp_45 '#\\#))"
 "(let-values()"
 "(begin"
-"(if(let-values(((or-part_309)(read-config-for-syntax? config_44)))"
-"(if or-part_309"
-" or-part_309"
+"(if(let-values(((or-part_308)(read-config-for-syntax? config_44)))"
+"(if or-part_308"
+" or-part_308"
 "(not(check-parameter 1/read-accept-graph config_44))))"
 "(let-values()"
 "(let-values(((in37_1) in_37)"
@@ -52827,9 +52849,9 @@ static const char *startup_source =
 "(lambda(config_45)"
 "(begin"
 "(let-values(((st_3)(read-config-st config_45)))"
-"(let-values(((or-part_360)(read-config-state-graph st_3)))"
-"(if or-part_360"
-" or-part_360"
+"(let-values(((or-part_359)(read-config-state-graph st_3)))"
+"(if or-part_359"
+" or-part_359"
 "(let-values(((ht_155)(make-hasheqv)))(begin(set-read-config-state-graph! st_3 ht_155) ht_155))))))))"
 "(define-values"
 "(coerce-key)"
@@ -53179,8 +53201,8 @@ static const char *startup_source =
 " temp63_4"
 "(list temp64_4))))"
 "(let-values()"
-"(let-values(((v_245)(read-one_8 c_88 in_41(keep-comment elem-config_1))))"
-"(if(1/special-comment? v_245)"
+"(let-values(((v_244)(read-one_8 c_88 in_41(keep-comment elem-config_1))))"
+"(if(1/special-comment? v_244)"
 "(let-values()"
 "((make-read-one-key+value"
 " read-one_8"
@@ -53243,7 +53265,7 @@ static const char *startup_source =
 " temp72_2"
 "(list temp73_2)))))"
 "(values))))"
-"(let-values(((v_246)(read-one_8 #f in_41 elem-config_1)))"
+"(let-values(((v_245)(read-one_8 #f in_41 elem-config_1)))"
 "(let-values(((closer-c_0)"
 "(read-char/skip-whitespace-and-comments #f read-one_8 in_41 config_46)))"
 "(let-values(((closer-line_0 closer-col_0 closer-pos_0)"
@@ -53272,7 +53294,7 @@ static const char *startup_source =
 " temp75_2"
 " temp77_1"
 "(list temp78_3)))))"
-"(cons(coerce-key k_41 elem-config_1) v_246))))))))))))))))))))))"
+"(cons(coerce-key k_41 elem-config_1) v_245))))))))))))))))))))))"
 "(define-values"
 "(read-string5.1)"
 "(lambda(mode1_1 in3_0 config4_0)"
@@ -53609,7 +53631,7 @@ static const char *startup_source =
 "(let-values(((init-v_3)"
 "(digit->number"
 " escaped-c_0)))"
-"(let-values(((v_202)"
+"(let-values(((v_201)"
 "(let-values(((in24_1)"
 " in_37)"
 "((config25_1)"
@@ -53633,7 +53655,7 @@ static const char *startup_source =
 " config25_1"
 " accum-str26_0))))"
 "(begin"
-"(if(<= v_202 255)"
+"(if(<= v_201 255)"
 "(void)"
 "(let-values()"
 "(let-values(((in31_2)"
@@ -53675,13 +53697,13 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_202)))))))))"
+" v_201)))))))))"
 "(if(unsafe-fx< index_3 14)"
 "(let-values()"
 "(let-values(((pos_13)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_247)"
+"(let-values(((v_246)"
 "(let-values(((in40_1)"
 " in_37)"
 "((config41_1)"
@@ -53701,13 +53723,13 @@ static const char *startup_source =
 " config41_1"
 " accum-str42_0))))"
 "(begin"
-"(if(integer? v_247)"
+"(if(integer? v_246)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_37"
 " config_44"
-" v_247"
+" v_246"
 " escaping-c_0"
 " escaped-c_0)))"
 "(set-accum-string-count!"
@@ -53716,7 +53738,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_247))))))"
+" v_246))))))"
 "(if(unsafe-fx< index_3 15)"
 "(let-values()"
 "(let-values((()"
@@ -53731,7 +53753,7 @@ static const char *startup_source =
 "(let-values(((pos_119)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_248)"
+"(let-values(((v_247)"
 "(let-values(((in45_0)"
 " in_37)"
 "((config46_1)"
@@ -53752,23 +53774,23 @@ static const char *startup_source =
 " accum-str47_0))))"
 "(begin"
 "(if(integer?"
-" v_248)"
+" v_247)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_37"
 " config_44"
-" v_248"
+" v_247"
 " escaping-c_0"
 " escaped-c_0)))"
 "(if(let-values(((or-part_63)"
 "(<"
-" v_248"
+" v_247"
 " 55296)))"
 "(if or-part_63"
 " or-part_63"
 "(>"
-" v_248"
+" v_247"
 " 57343)))"
 "(let-values()"
 "(begin"
@@ -53778,7 +53800,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_248))))"
+" v_247))))"
 "(let-values()"
 "(let-values(((next!_0)"
 "(lambda()"
@@ -53859,7 +53881,7 @@ static const char *startup_source =
 "(+"
 "(arithmetic-shift"
 "(-"
-" v_248"
+" v_247"
 " 55296)"
 " 10)"
 "(-"
@@ -53955,7 +53977,7 @@ static const char *startup_source =
 "(let-values(((pos_20)"
 "(accum-string-count"
 " accum-str_4)))"
-"(let-values(((v_249)"
+"(let-values(((v_248)"
 "(let-values(((in72_0)"
 " in_37)"
 "((config73_0)"
@@ -53976,26 +53998,26 @@ static const char *startup_source =
 " accum-str74_0))))"
 "(begin"
 "(if(integer?"
-" v_249)"
+" v_248)"
 "(void)"
 "(let-values()"
 "(no-hex-digits"
 " in_37"
 " config_44"
-" v_249"
+" v_248"
 " escaping-c_0"
 " escaped-c_0)))"
 "(if(if(let-values(((or-part_55)"
 "(<"
-" v_249"
+" v_248"
 " 55296)))"
 "(if or-part_55"
 " or-part_55"
 "(>"
-" v_249"
+" v_248"
 " 57343)))"
 "(<="
-" v_249"
+" v_248"
 " 1114111)"
 " #f)"
 "(let-values()"
@@ -54006,7 +54028,7 @@ static const char *startup_source =
 "(accum-string-add!"
 " accum-str_4"
 "(integer->char"
-" v_249))))"
+" v_248))))"
 "(let-values()"
 "(let-values(((in77_1)"
 " in_37)"
@@ -54189,14 +54211,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((lst_308)"
+"(let-values(((lst_307)"
 "(reverse$1 terminator-accum_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_308)))"
-"((letrec-values(((for-loop_280)"
+"(let-values()(check-list lst_307)))"
+"((letrec-values(((for-loop_276)"
 "(lambda(lst_28)"
 "(begin"
 " 'for-loop"
@@ -54219,12 +54241,12 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_280"
+"(for-loop_276"
 " rest_177)"
 "(values))))"
 "(values))))))"
-" for-loop_280)"
-" lst_308)))"
+" for-loop_276)"
+" lst_307)))"
 "(void))))"
 "(if(char=? c_92 '#\\newline)"
 "(let-values()"
@@ -54320,7 +54342,7 @@ static const char *startup_source =
 "(let-values(((in_51) in_4)"
 "((source_6)(read-config-source config_8)))"
 "(read-char-or-special in_51 special1.1 source_6))))"
-"(let-values(((v_231)"
+"(let-values(((v_230)"
 "(if(if(char? c3_6)(octal-digit? c3_6) #f)"
 "(let-values()"
 "(+"
@@ -54329,7 +54351,7 @@ static const char *startup_source =
 "(digit->number c3_6)))"
 "(let-values() #f))))"
 "(begin"
-"(if(if v_231(<= v_231 255) #f)"
+"(if(if v_230(<= v_230 255) #f)"
 "(void)"
 "(let-values()"
 "(let-values(((in9_2) in_4)"
@@ -54348,7 +54370,7 @@ static const char *startup_source =
 " config10_2"
 " temp12_7"
 "(list c13_1 c214_0 temp15_5)))))"
-"(integer->char v_231))))))"
+"(integer->char v_230))))))"
 "(let-values() c_95))))"
 "(if(let-values(((or-part_80)(char=? c_95 '#\\u)))"
 "(if or-part_80 or-part_80(char=? c_95 '#\\U)))"
@@ -55108,11 +55130,11 @@ static const char *startup_source =
 "(let-values(((or-part_305)(char-numeric? c_100)))"
 "(if or-part_305"
 " or-part_305"
-"(let-values(((or-part_361)(char=? '#\\- c_100)))"
-"(if or-part_361"
-" or-part_361"
-"(let-values(((or-part_362)(char=? '#\\+ c_100)))"
-"(if or-part_362 or-part_362(char=? '#\\_ c_100)))))))))"
+"(let-values(((or-part_360)(char=? '#\\- c_100)))"
+"(if or-part_360"
+" or-part_360"
+"(let-values(((or-part_361)(char=? '#\\+ c_100)))"
+"(if or-part_361 or-part_361(char=? '#\\_ c_100)))))))))"
 " #f))))"
 "(define-values"
 "(read-extension-prefix)"
@@ -55124,11 +55146,11 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_201)))"
 "((letrec-values(((for-loop_208)"
-"(lambda(lst_309)"
+"(lambda(lst_308)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_309)"
-"(let-values(((c_101)(unsafe-car lst_309))((rest_178)(unsafe-cdr lst_309)))"
+"(if(pair? lst_308)"
+"(let-values(((c_101)(unsafe-car lst_308))((rest_178)(unsafe-cdr lst_308)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -55203,7 +55225,7 @@ static const char *startup_source =
 "(let-values((()(begin(force-parameters! config_53)(values))))"
 "(let-values(((guard_0)(1/current-reader-guard)))"
 "(let-values(((mod-path_28)"
-"(let-values(((or-part_363)"
+"(let-values(((or-part_362)"
 "(if try-first-mod-path_0"
 "(let-values(((mod-path_29)(guard_0 try-first-mod-path_0)))"
 "(if((read-config-module-declared? config_53)"
@@ -55211,7 +55233,7 @@ static const char *startup_source =
 " mod-path_29"
 " #f))"
 " #f)))"
-"(if or-part_363 or-part_363(guard_0 mod-path-datum_0)))))"
+"(if or-part_362 or-part_362(guard_0 mod-path-datum_0)))))"
 "(let-values(((for-syntax?_8)(read-config-for-syntax? config_53)))"
 "(let-values(((dynamic-require_2)(read-config-dynamic-require config_53)))"
 "(let-values(((no-value_0)(gensym)))"
@@ -55610,15 +55632,15 @@ static const char *startup_source =
 "(let-values() eof)"
 "(if(not(char? c_31))"
 "(let-values()"
-"(let-values(((v_250)(special-value c_31)))"
-"(if(1/special-comment? v_250)"
-"(let-values()(if(read-config-keep-comment? config_58) v_250(read-undotted #f in_67 config_58)))"
-"(let-values()(coerce v_250 in_67(reading-at config_58 line_12 col_11 pos_121))))))"
+"(let-values(((v_249)(special-value c_31)))"
+"(if(1/special-comment? v_249)"
+"(let-values()(if(read-config-keep-comment? config_58) v_249(read-undotted #f in_67 config_58)))"
+"(let-values()(coerce v_249 in_67(reading-at config_58 line_12 col_11 pos_121))))))"
 "(let-values(((c2_8)(readtable-handler config_58 c_31)))"
 "(if c2_8"
 "((lambda(handler_3)"
-"(let-values(((v_251)(readtable-apply handler_3 c_31 in_67 config_58 line_12 col_11 pos_121)))"
-"(retry-special-comment v_251 in_67 config_58)))"
+"(let-values(((v_250)(readtable-apply handler_3 c_31 in_67 config_58 line_12 col_11 pos_121)))"
+"(retry-special-comment v_250 in_67 config_58)))"
 " c2_8)"
 "(let-values()"
 "(let-values(((ec_10)(effective-char c_31 config_58)))"
@@ -55687,14 +55709,14 @@ static const char *startup_source =
 "(if(unsafe-fx< index_4 2)"
 "(if(unsafe-fx< index_4 1)"
 "(let-values()"
-"(let-values(((v_252)"
+"(let-values(((v_251)"
 "(let-values(((c83_0) c_31)"
 "((in84_1) in_67)"
 "((r-config85_0) r-config_0)"
 "((temp86_3)"
-"(if(let-values(((or-part_321)(eq? c_31 ec_10)))"
-"(if or-part_321"
-" or-part_321"
+"(if(let-values(((or-part_280)(eq? c_31 ec_10)))"
+"(if or-part_280"
+" or-part_280"
 "(if(<(char->integer ec_10) 128)"
 "(char-numeric? ec_10)"
 " #f)))"
@@ -55706,7 +55728,7 @@ static const char *startup_source =
 " c83_0"
 " in84_1"
 " r-config85_0))))"
-"(retry-special-comment v_252 in_67 config_58)))"
+"(retry-special-comment v_251 in_67 config_58)))"
 "(let-values()(read-dispatch c_31 in_67 r-config_0 config_58)))"
 "(if(unsafe-fx< index_4 3)"
 "                                    (let-values () (read-quote read-one 'quote \"quoting \\\"'\\\"\" c_31 in_67 r-config_0))"
@@ -55826,10 +55848,10 @@ static const char *startup_source =
 "(list temp105_3))))"
 "(if(unsafe-fx< index_4 8)"
 "(let-values()"
-"(if(let-values(((or-part_364)"
+"(if(let-values(((or-part_363)"
 "(check-parameter 1/read-square-bracket-as-paren config_58)))"
-"(if or-part_364"
-" or-part_364"
+"(if or-part_363"
+" or-part_363"
 "(check-parameter 1/read-square-bracket-with-tag config_58)))"
 "(let-values()"
 "(wrap"
@@ -55909,10 +55931,10 @@ static const char *startup_source =
 "(list c124_0))))))))"
 "(if(unsafe-fx< index_4 10)"
 "(let-values()"
-"(if(let-values(((or-part_365)"
+"(if(let-values(((or-part_281)"
 "(check-parameter 1/read-curly-brace-as-paren config_58)))"
-"(if or-part_365"
-" or-part_365"
+"(if or-part_281"
+" or-part_281"
 "(check-parameter 1/read-curly-brace-with-tag config_58)))"
 "(let-values()"
 "(wrap"
@@ -55954,10 +55976,10 @@ static const char *startup_source =
 "(list c135_0))))))"
 "(if(unsafe-fx< index_4 11)"
 "(let-values()"
-"(if(let-values(((or-part_306)"
+"(if(let-values(((or-part_282)"
 "(check-parameter 1/read-curly-brace-as-paren config_58)))"
-"(if or-part_306"
-" or-part_306"
+"(if or-part_282"
+" or-part_282"
 "(check-parameter 1/read-curly-brace-with-tag config_58)))"
 "(let-values()"
 "(let-values(((in136_0) in_67)"
@@ -56051,9 +56073,9 @@ static const char *startup_source =
 "(let-values(((line_13)(read-config-line config_59)))"
 "(let-values(((col_12)(read-config-col config_59)))"
 "(let-values(((pos_122)(read-config-pos config_59)))"
-"(let-values(((v_253)"
+"(let-values(((v_252)"
 "(readtable-apply handler_4 c_106 in_69 config_59 line_13 col_12 pos_122)))"
-"(retry-special-comment v_253 in_69 orig-config_1))))))"
+"(retry-special-comment v_252 in_69 orig-config_1))))))"
 " c3_9)"
 "(let-values()"
 "(let-values()"
@@ -56368,8 +56390,8 @@ static const char *startup_source =
 "(if(eq? c_110 'special)(special1.1 'special) c_110)))))"
 "(if(char-delimiter? c2_13 config_59)"
 "(let-values()(wrap #f in_69 config_59 c_106))"
-"(if(let-values(((or-part_366)(char=? c2_13 '#\\x)))"
-"(if or-part_366 or-part_366(char=? c2_13 '#\\l)))"
+"(if(let-values(((or-part_364)(char=? c2_13 '#\\x)))"
+"(if or-part_364 or-part_364(char=? c2_13 '#\\l)))"
 "(let-values()"
 "(read-fixnum-or-flonum-vector"
 " read-one"
@@ -56620,11 +56642,11 @@ static const char *startup_source =
 "(list dispatch-c283_0)))))))))))))))))))))))))"
 "(define-values"
 "(retry-special-comment)"
-"(lambda(v_254 in_78 config_60)"
+"(lambda(v_253 in_78 config_60)"
 "(begin"
-"(if(1/special-comment? v_254)"
-"(let-values()(if(read-config-keep-comment? config_60) v_254(read-undotted #f in_78 config_60)))"
-"(let-values() v_254)))))"
+"(if(1/special-comment? v_253)"
+"(let-values()(if(read-config-keep-comment? config_60) v_253(read-undotted #f in_78 config_60)))"
+"(let-values() v_253)))))"
 "(define-values"
 "(1/module-declared?)"
 "(let-values(((module-declared?3_0)"
@@ -57094,17 +57116,17 @@ static const char *startup_source =
 "(define-values(read-module-declared?)(lambda(mod-path_30)(begin(1/module-declared? mod-path_30 #t))))"
 "(define-values"
 "(read-coerce)"
-"(lambda(for-syntax?_12 v_255 srcloc_12)"
+"(lambda(for-syntax?_12 v_254 srcloc_12)"
 "(begin"
 "(if(not for-syntax?_12)"
-"(let-values()(if(syntax?$1 v_255)(let-values()(syntax->datum$1 v_255))(let-values() v_255)))"
-"(if(syntax?$1 v_255)"
-"(let-values() v_255)"
-"(if(list? v_255)"
+"(let-values()(if(syntax?$1 v_254)(let-values()(syntax->datum$1 v_254))(let-values() v_254)))"
+"(if(syntax?$1 v_254)"
+"(let-values() v_254)"
+"(if(list? v_254)"
 "(let-values()"
 "(read-to-syntax"
 "(reverse$1"
-"(let-values(((lst_188) v_255))"
+"(let-values(((lst_188) v_254))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -57132,13 +57154,13 @@ static const char *startup_source =
 " lst_188))))"
 " srcloc_12"
 " #f))"
-"(if(pair? v_255)"
+"(if(pair? v_254)"
 "(let-values()"
 "(read-to-syntax"
-"(cons(read-coerce #t(car v_255) srcloc_12)(read-coerce #t(cdr v_255) srcloc_12))"
+"(cons(read-coerce #t(car v_254) srcloc_12)(read-coerce #t(cdr v_254) srcloc_12))"
 " srcloc_12"
 " #f))"
-"(let-values()(read-to-syntax v_255 srcloc_12 #f)))))))))"
+"(let-values()(read-to-syntax v_254 srcloc_12 #f)))))))))"
 "(define-values"
 "(read-coerce-key)"
 "(lambda(for-syntax?_0 k_42)"
@@ -57227,16 +57249,16 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                          (raise-argument-error 'read-syntax/recursive \"input-port?\" in_83)))"
-"(if((lambda(x_93)"
-"(let-values(((or-part_298)(not x_93)))"
-"(if or-part_298 or-part_298(char? x_93))))"
+"(if((lambda(x_92)"
+"(let-values(((or-part_298)(not x_92)))"
+"(if or-part_298 or-part_298(char? x_92))))"
 " start_59)"
 "(void)"
 "(let-values()"
 "                                          (raise-argument-error 'read-syntax/recursive \"(or/c char? #f)\" start_59)))"
-"(if((lambda(x_94)"
-"(let-values(((or-part_90)(not x_94)))"
-"(if or-part_90 or-part_90(1/readtable? x_94))))"
+"(if((lambda(x_93)"
+"(let-values(((or-part_90)(not x_93)))"
+"(if or-part_90 or-part_90(1/readtable? x_93))))"
 " readtable_7)"
 "(void)"
 "(let-values()"
@@ -57289,15 +57311,15 @@ static const char *startup_source =
 "(if(input-port? in_79)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'read/recursive \"input-port?\" in_79)))"
-"(if((lambda(x_95)"
-"(let-values(((or-part_31)(not x_95)))"
-"(if or-part_31 or-part_31(char? x_95))))"
+"(if((lambda(x_94)"
+"(let-values(((or-part_31)(not x_94)))"
+"(if or-part_31 or-part_31(char? x_94))))"
 " start_61)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'read/recursive \"(or/c char? #f)\" start_61)))"
-"(if((lambda(x_96)"
-"(let-values(((or-part_159)(not x_96)))"
-"(if or-part_159 or-part_159(1/readtable? x_96))))"
+"(if((lambda(x_95)"
+"(let-values(((or-part_159)(not x_95)))"
+"(if or-part_159 or-part_159(1/readtable? x_95))))"
 " readtable_9)"
 "(void)"
 "(let-values()"
@@ -57545,13 +57567,13 @@ static const char *startup_source =
 "(1/current-module-path-for-load)"
 "(make-parameter"
 " #f"
-"(lambda(v_235)"
+"(lambda(v_234)"
 "(begin"
-"(if(let-values(((or-part_67)(not v_235)))"
+"(if(let-values(((or-part_67)(not v_234)))"
 "(if or-part_67"
 " or-part_67"
-"(let-values(((or-part_68)(1/module-path? v_235)))"
-"(if or-part_68 or-part_68(if(syntax?$1 v_235)(1/module-path?(syntax->datum$1 v_235)) #f)))))"
+"(let-values(((or-part_68)(1/module-path? v_234)))"
+"(if or-part_68 or-part_68(if(syntax?$1 v_234)(1/module-path?(syntax->datum$1 v_234)) #f)))))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -57560,8 +57582,8 @@ static const char *startup_source =
 "             \"(or/c module-path?\""
 "             \" (and/c syntax? (lambda (stx) (module-path? (syntax->datum stx))))\""
 "             \" #f)\")"
-" v_235)))"
-" v_235))))"
+" v_234)))"
+" v_234))))"
 "(define-values"
 "(maybe-raise-missing-module)"
 "(lambda(name_73 filename_0 pre_0 rel_0 post_0 errstr_0)"
@@ -57639,7 +57661,7 @@ static const char *startup_source =
 " stop-ids56_0"
 " intdefs57_0)))))))))))"
 "(case-lambda"
-"((s_446 context_11 stop-ids_3)(begin 'local-expand(local-expand5_0 s_446 context_11 stop-ids_3 '())))"
+"((s_447 context_11 stop-ids_3)(begin 'local-expand(local-expand5_0 s_447 context_11 stop-ids_3 '())))"
 "((s_75 context_12 stop-ids_4 intdefs1_1)(local-expand5_0 s_75 context_12 stop-ids_4 intdefs1_1)))))"
 "(define-values"
 "(1/local-expand/capture-lifts)"
@@ -57757,8 +57779,8 @@ static const char *startup_source =
 "(begin"
 " 'local-transformer-expand/capture-lifts"
 "(local-transformer-expand/capture-lifts25_0 s_19 context_21 stop-ids_13 '() unsafe-undefined)))"
-"((s_449 context_22 stop-ids_14 intdefs_9 lift-key21_1)"
-"(local-transformer-expand/capture-lifts25_0 s_449 context_22 stop-ids_14 intdefs_9 lift-key21_1))"
+"((s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1)"
+"(local-transformer-expand/capture-lifts25_0 s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1))"
 "((s_494 context_23 stop-ids_15 intdefs20_1)"
 "(local-transformer-expand/capture-lifts25_0 s_494 context_23 stop-ids_15 intdefs20_1 unsafe-undefined)))))"
 "(define-values"
@@ -57856,9 +57878,9 @@ static const char *startup_source =
 "(let-values(((s_496)(datum->syntax$1 #f s-or-s-exp_0)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_367)(list? context_24)))"
-"(if or-part_367"
-" or-part_367"
+"(if(let-values(((or-part_365)(list? context_24)))"
+"(if or-part_365"
+" or-part_365"
 "(memq"
 " context_24"
 "(if as-transformer?_6"
@@ -57965,20 +57987,6 @@ static const char *startup_source =
 "(begin"
 "(if as-transformer?_6"
 "(let-values()"
-"(let-values(((obs_32)"
-"(expand-context-observer"
-" local-ctx_0)))"
-"(if obs_32"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_32"
-" 'phase-up)))"
-"(void))))"
-"(void))"
-"(values))))"
-"(let-values((()"
-"(begin"
 "(let-values(((obs_61)"
 "(expand-context-observer"
 " local-ctx_0)))"
@@ -57987,14 +57995,12 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_61"
-" 'local-pre"
-" input-s_1)))"
-"(void)))"
+" 'phase-up)))"
+"(void))))"
+"(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if stop-ids_16"
-"(let-values()"
 "(let-values(((obs_62)"
 "(expand-context-observer"
 " local-ctx_0)))"
@@ -58003,6 +58009,22 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_62"
+" 'local-pre"
+" input-s_1)))"
+"(void)))"
+"(values))))"
+"(let-values((()"
+"(begin"
+"(if stop-ids_16"
+"(let-values()"
+"(let-values(((obs_63)"
+"(expand-context-observer"
+" local-ctx_0)))"
+"(if obs_63"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_63"
 " 'start)))"
 "(void))))"
 "(void))"
@@ -58081,14 +58103,14 @@ static const char *startup_source =
 " local-ctx120_0))))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_63)"
+"(let-values(((obs_64)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_63"
+"(if obs_64"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_63"
+" obs_64"
 " 'local-post"
 " output-s_0)))"
 "(void)))"
@@ -58103,14 +58125,14 @@ static const char *startup_source =
 "(if skip-log-exit?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_64)"
+"(let-values(((obs_65)"
 "(expand-context-observer"
 " local-ctx_0)))"
-"(if obs_64"
+"(if obs_65"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_64"
+" obs_65"
 " 'exit-local"
 " result-s_8)))"
 "(void)))))"
@@ -58159,12 +58181,12 @@ static const char *startup_source =
 "(let-values()"
 "(taint-dispatch"
 " s_2"
-"(lambda(s_439)(syntax-arm$1 s_439 insp_21))"
+"(lambda(s_440)(syntax-arm$1 s_440 insp_21))"
 "(1/syntax-local-phase-level)))"
 "(let-values()(syntax-arm$1 s_2 insp_21))))))))))))))))"
 "(case-lambda"
 "((s_497)(begin 'syntax-arm(syntax-arm4_0 s_497 #f #f)))"
-"((s_446 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_446 maybe-insp_1 use-mode?2_1))"
+"((s_447 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_447 maybe-insp_1 use-mode?2_1))"
 "((s_75 maybe-insp1_1)(syntax-arm4_0 s_75 maybe-insp1_1 #f)))))"
 "(define-values"
 "(1/syntax-disarm)"
@@ -58181,8 +58203,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_310)(not maybe-insp_2)))"
-"(if or-part_310 or-part_310(inspector? maybe-insp_2)))"
+"(if(let-values(((or-part_309)(not maybe-insp_2)))"
+"(if or-part_309 or-part_309(inspector? maybe-insp_2)))"
 "(void)"
 "                              (let-values () (raise-argument-error 'syntax-disarm \"(or/c inspector? #f)\" maybe-insp_2)))"
 "(values))))"
@@ -58215,7 +58237,7 @@ static const char *startup_source =
 "(let-values()(syntax-rearm$1 s_180 from-s_2))))))))))))))"
 "(case-lambda"
 "((s_181 from-s_3)(begin 'syntax-rearm(syntax-rearm9_0 s_181 from-s_3 #f)))"
-"((s_441 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_441 from-s_4 use-mode?6_1)))))"
+"((s_442 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_442 from-s_4 use-mode?6_1)))))"
 "(define-values"
 "(1/syntax-taint)"
 "(lambda(s_5)"
@@ -58230,9 +58252,9 @@ static const char *startup_source =
 "(inspector-for-taint)"
 "(lambda(maybe-insp_3)"
 "(begin"
-"(let-values(((or-part_368) maybe-insp_3))"
-"(if or-part_368"
-" or-part_368"
+"(let-values(((or-part_366) maybe-insp_3))"
+"(if or-part_366"
+" or-part_366"
 "(let-values(((or-part_163)(current-module-code-inspector)))"
 "(if or-part_163 or-part_163(current-code-inspector))))))))"
 "(define-values"
@@ -58871,7 +58893,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_163)))"
-"((letrec-values(((for-loop_281)"
+"((letrec-values(((for-loop_277)"
 "(lambda(table_215 i_176)"
 "(begin"
 " 'for-loop"
@@ -58937,14 +58959,14 @@ static const char *startup_source =
 "(values"
 " table_216)))))"
 "(if(not #f)"
-"(for-loop_281"
+"(for-loop_277"
 " table_6"
 "(hash-iterate-next"
 " ht_163"
 " i_176))"
 " table_6)))"
 " table_215)))))"
-" for-loop_281)"
+" for-loop_277)"
 " '#hash()"
 "(hash-iterate-first ht_163))))))"
 "((temp75_4)"
@@ -58964,7 +58986,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_164)))"
-"((letrec-values(((for-loop_282)"
+"((letrec-values(((for-loop_278)"
 "(lambda(i_177)"
 "(begin"
 " 'for-loop"
@@ -58987,13 +59009,13 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_282"
+"(for-loop_278"
 "(hash-iterate-next"
 " ht_164"
 " i_177))"
 "(values))))"
 "(values))))))"
-" for-loop_282)"
+" for-loop_278)"
 "(hash-iterate-first ht_164))))"
 "(void)))"
 "(void)))))"
@@ -59078,15 +59100,15 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_159)))"
-"((letrec-values(((for-loop_283)"
-"(lambda(table_217 lst_310)"
+"((letrec-values(((for-loop_279)"
+"(lambda(table_217 lst_309)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_310)"
+"(if(pair? lst_309)"
 "(let-values(((require-mpi_0)"
-"(unsafe-car lst_310))"
+"(unsafe-car lst_309))"
 "((rest_180)"
-"(unsafe-cdr lst_310)))"
+"(unsafe-cdr lst_309)))"
 "(let-values(((table_218)"
 "(let-values(((m_29)"
 "(namespace->module"
@@ -59117,7 +59139,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash"
 " ht_165)))"
-"((letrec-values(((for-loop_284)"
+"((letrec-values(((for-loop_280)"
 "(lambda(table_141"
 " i_178)"
 "(begin"
@@ -59147,14 +59169,14 @@ static const char *startup_source =
 " table_220)))))"
 "(if(not"
 " #f)"
-"(for-loop_284"
+"(for-loop_280"
 " table_31"
 "(hash-iterate-next"
 " ht_165"
 " i_178))"
 " table_31)))"
 " table_141)))))"
-" for-loop_284)"
+" for-loop_280)"
 " table_140"
 "(hash-iterate-first"
 " ht_165))))))"
@@ -59162,10 +59184,10 @@ static const char *startup_source =
 " for-loop_187)"
 " table_217)))))"
 "(if(not #f)"
-"(for-loop_283 table_218 rest_180)"
+"(for-loop_279 table_218 rest_180)"
 " table_218)))"
 " table_217)))))"
-" for-loop_283)"
+" for-loop_279)"
 " '#hash()"
 " lst_159))))"
 " '#hasheqv()))"
@@ -59413,10 +59435,10 @@ static const char *startup_source =
 "(define-values(expobs-primitives)(hasheq 'current-expand-observe current-expand-observe))"
 "(define-values"
 "(struct:TH-place-channel TH-place-channel TH-place-channel? TH-place-channel-ref TH-place-channel-set!)"
-"(make-struct-type 'TH-place-channel #f 2 0 #f(list(cons prop:evt(lambda(x_97)(TH-place-channel-ref x_97 0))))))"
+"(make-struct-type 'TH-place-channel #f 2 0 #f(list(cons prop:evt(lambda(x_96)(TH-place-channel-ref x_96 0))))))"
 "(define-values"
 "(TH-place-channel-in TH-place-channel-out)"
-"(values(lambda(x_98)(TH-place-channel-ref x_98 0))(lambda(x_84)(TH-place-channel-ref x_84 1))))"
+"(values(lambda(x_97)(TH-place-channel-ref x_97 0))(lambda(x_83)(TH-place-channel-ref x_83 1))))"
 "(define-values"
 "(place-struct-primitives)"
 "(hasheq"
@@ -59540,8 +59562,8 @@ static const char *startup_source =
 "(check-module-form)"
 "(lambda(exp_0 filename_1)"
 "(begin"
-"(if(let-values(((or-part_312)(eof-object? exp_0)))"
-"(if or-part_312 or-part_312(eof-object?(1/syntax-e exp_0))))"
+"(if(let-values(((or-part_311)(eof-object? exp_0)))"
+"(if or-part_311 or-part_311(eof-object?(1/syntax-e exp_0))))"
 "(let-values()"
 "(if filename_1"
 "(error"
@@ -59795,7 +59817,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()(not(eq? c_52 0))))))"
 "(values result_126)))))"
-"(if(if(not((lambda x_99 result_125) c_52))(not #f) #f)"
+"(if(if(not((lambda x_98 result_125) c_52))(not #f) #f)"
 "(for-loop_237 result_125(unsafe-fx+ 1 pos_99))"
 " result_125)))"
 " result_124)))))"
@@ -59837,9 +59859,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()(begin(file-position i_183 pos_124)(values))))"
 "(let-values(((name-len_0)(read-number i_183)))"
-"(let-values(((v_256)(read-bytes name-len_0 i_183)))"
+"(let-values(((v_255)(read-bytes name-len_0 i_183)))"
 "(begin"
-"(if(if(bytes? v_256)(=(bytes-length v_256) name-len_0) #f)"
+"(if(if(bytes? v_255)(=(bytes-length v_255) name-len_0) #f)"
 "(void)"
 "(let-values()"
 "(error"
@@ -59853,10 +59875,10 @@ static const char *startup_source =
 "(object-name i_183)"
 " pos_124"
 " name-len_0"
-" v_256)))"
-"(if(bytes=? bstr_5 v_256)"
+" v_255)))"
+"(if(bytes=? bstr_5 v_255)"
 "(let-values()(read-number i_183))"
-"(if(bytes<? bstr_5 v_256)"
+"(if(bytes<? bstr_5 v_255)"
 "(let-values()"
 "(begin"
 "(read-number i_183)"
@@ -60118,9 +60140,9 @@ static const char *startup_source =
 "(let-values(((so_0)(get-so_0 file_1 #t)))"
 "(let-values(((alt-so_0)(get-so_0 alt-file_0 #t)))"
 "(let-values(((try-main?_0)"
-"(let-values(((or-part_369) main-path-d_0))"
-"(if or-part_369"
-" or-part_369"
+"(let-values(((or-part_367) main-path-d_0))"
+"(if or-part_367"
+" or-part_367"
 "(not alt-path-d_0)))))"
 "(let-values(((try-alt?_0)"
 "(if alt-file_0"
@@ -60249,12 +60271,12 @@ static const char *startup_source =
 "(car zo-d_1)"
 " expect-module_0)))))))"
 " c4_3)"
-"(if(let-values(((or-part_370)"
+"(if(let-values(((or-part_368)"
 "(not"
 "(pair?"
 " expect-module_0))))"
-"(if or-part_370"
-" or-part_370"
+"(if or-part_368"
+" or-part_368"
 "(car expect-module_0)))"
 "(let-values()"
 "(let-values(((p_77)"
@@ -60299,7 +60321,7 @@ static const char *startup_source =
 "(begin(let-values(((e_87)(hash-ref -module-hash-table-table reg_0 #f)))(if e_87(ephemeron-value e_87) #f)))))"
 "(define-values"
 "(registry-table-set!)"
-"(lambda(reg_1 v_206)(begin(hash-set! -module-hash-table-table reg_1(make-ephemeron reg_1 v_206)))))"
+"(lambda(reg_1 v_205)(begin(hash-set! -module-hash-table-table reg_1(make-ephemeron reg_1 v_205)))))"
 "(define-values(CACHE-N) 512)"
 "(define-values(-path-cache)(make-vector CACHE-N #f))"
 "(define-values"
@@ -60312,7 +60334,7 @@ static const char *startup_source =
 "(if l_84(let-values(((a_77)(1/assoc p_47 l_84)))(if a_77(cdr a_77) #f)) #f)))))))"
 "(define-values"
 "(path-cache-set!)"
-"(lambda(p_78 v_257)"
+"(lambda(p_78 v_256)"
 "(begin"
 "(let-values(((i_164)(modulo(abs(equal-hash-code p_78)) CACHE-N)))"
 "(let-values(((w_2)(vector-ref -path-cache i_164)))"
@@ -60321,7 +60343,7 @@ static const char *startup_source =
 " -path-cache"
 " i_164"
 "(make-weak-box"
-"(cons(cons p_78 v_257)(let-values(((or-part_65) l_19))(if or-part_65 or-part_65 null)))))))))))"
+"(cons(cons p_78 v_256)(let-values(((or-part_65) l_19))(if or-part_65 or-part_65 null)))))))))))"
 "(define-values(-loading-filename)(gensym))"
 "(define-values(-loading-prompt-tag)(make-continuation-prompt-tag 'module-loading))"
 "(define-values(-prev-relto) #f)"
@@ -60443,14 +60465,14 @@ static const char *startup_source =
 "(void))))"
 "(void))))"
 "(void)))))))"
-"((s_450 relto_0 stx_19)"
+"((s_451 relto_0 stx_19)"
 "(begin"
 "(log-message"
 "(current-logger)"
 " 'error"
 "                              \"default module name resolver called with three arguments (deprecated)\""
 " #f)"
-"(standard-module-name-resolver_0 s_450 relto_0 stx_19 #t)))"
+"(standard-module-name-resolver_0 s_451 relto_0 stx_19 #t)))"
 "((s_500 relto_1 stx_20 load?_7)"
 "(let-values((()"
 "(begin"
@@ -60466,8 +60488,8 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_360)(not relto_1)))"
-"(if or-part_360 or-part_360(1/resolved-module-path? relto_1)))"
+"(if(let-values(((or-part_359)(not relto_1)))"
+"(if or-part_359 or-part_359(1/resolved-module-path? relto_1)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -60540,9 +60562,9 @@ static const char *startup_source =
 "                                                     (if or-part_101 or-part_101 (equal? (cadr s_500) \"..\")))"
 "(if relto_1"
 "(let-values(((p_79)(1/resolved-module-path-name relto_1)))"
-"(let-values(((or-part_371)(symbol? p_79)))"
-"(if or-part_371"
-" or-part_371"
+"(let-values(((or-part_369)(symbol? p_79)))"
+"(if or-part_369"
+" or-part_369"
 "(if(pair? p_79)(symbol?(car p_79)) #f))))"
 " #f)"
 " #f)"
@@ -60607,10 +60629,10 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_41"
 " or-part_41"
-"(let-values(((or-part_372)"
+"(let-values(((or-part_370)"
 "(current-load-relative-directory)))"
-"(if or-part_372"
-" or-part_372"
+"(if or-part_370"
+" or-part_370"
 "(current-directory))))))))"
 "((get-reg_0)"
 "(lambda()"
@@ -60623,15 +60645,15 @@ static const char *startup_source =
 " 'show-collection-err"
 "(let-values(((msg_2)"
 "(string-append"
-"(let-values(((or-part_367)"
+"(let-values(((or-part_365)"
 "(if stx_20"
 "(if(error-print-source-location)"
 "(format-source-location"
 " stx_20)"
 " #f)"
 " #f)))"
-"(if or-part_367"
-" or-part_367"
+"(if or-part_365"
+" or-part_365"
 "                                                                                    \"standard-module-name-resolver\"))"
 "                                                                                \": \""
 "(regexp-replace"
@@ -60684,9 +60706,9 @@ static const char *startup_source =
 " p_82)))))"
 "((s_502)"
 "(if(if(pair? s_500)(eq? 'submod(car s_500)) #f)"
-"(let-values(((v_258)(cadr s_500)))"
-"                                                                 (if (let-values (((or-part_373) (equal? v_258 \".\")))"
-"                                                                       (if or-part_373 or-part_373 (equal? v_258 \"..\")))"
+"(let-values(((v_257)(cadr s_500)))"
+"                                                                 (if (let-values (((or-part_371) (equal? v_257 \".\")))"
+"                                                                       (if or-part_371 or-part_371 (equal? v_257 \"..\")))"
 "(if relto_1"
 "(let-values(((p_7)"
 "(1/resolved-module-path-name"
@@ -60696,7 +60718,7 @@ static const char *startup_source =
 " 'standard-module-name-resolver"
 "                                                                      \"no base path for relative submodule path: ~.s\""
 " s_500))"
-" v_258))"
+" v_257))"
 " s_500))"
 "((subm-path_0)"
 "(if(if(pair? s_500)(eq? 'submod(car s_500)) #f)"
@@ -60758,11 +60780,11 @@ static const char *startup_source =
 "(if(string? s_502)"
 "(let-values()"
 "(let-values(((dir_4)(get-dir_0)))"
-"(let-values(((or-part_374)"
+"(let-values(((or-part_372)"
 "(path-cache-get"
 "(cons s_502 dir_4))))"
-"(if or-part_374"
-" or-part_374"
+"(if or-part_372"
+" or-part_372"
 "(let-values(((cols_1 file_4)"
 "(split-relative-string"
 " s_502"
@@ -60853,8 +60875,8 @@ static const char *startup_source =
 "(get-dir_0)))))"
 "(void))))))))"
 "(begin"
-"(if(let-values(((or-part_375)(path? s-parsed_0)))"
-"(if or-part_375 or-part_375(vector? s-parsed_0)))"
+"(if(let-values(((or-part_373)(path? s-parsed_0)))"
+"(if or-part_373 or-part_373(vector? s-parsed_0)))"
 "(void)"
 "(let-values()"
 "(if stx_20"
@@ -60892,11 +60914,11 @@ static const char *startup_source =
 "(vector-ref s-parsed_0 4)"
 "(1/make-resolved-module-path filename_2))))"
 "(let-values(((hts_3)"
-"(let-values(((or-part_376)"
+"(let-values(((or-part_374)"
 "(registry-table-ref"
 "(get-reg_0))))"
-"(if or-part_376"
-" or-part_376"
+"(if or-part_374"
+" or-part_374"
 "(let-values(((hts_4)"
 "(cons"
 "(make-hasheq)"
@@ -61038,14 +61060,14 @@ static const char *startup_source =
 "(void))"
 "(if(if(not(vector? s-parsed_0))"
 "(if load?_7"
-"(let-values(((or-part_377)"
+"(let-values(((or-part_375)"
 "(string? s_502)))"
-"(if or-part_377"
-" or-part_377"
-"(let-values(((or-part_378)"
+"(if or-part_375"
+" or-part_375"
+"(let-values(((or-part_376)"
 "(symbol? s_502)))"
-"(if or-part_378"
-" or-part_378"
+"(if or-part_376"
+" or-part_376"
 "(if(pair? s_502)"
 "(eq?(car s_502) 'lib)"
 " #f)))))"
@@ -61139,11 +61161,11 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_65)(expand-context-observer ctx_77)))"
-"(if obs_65"
+"(let-values(((obs_66)(expand-context-observer ctx_77)))"
+"(if obs_66"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_65 'enter-block(datum->syntax$1 #f bodys_7))))"
+"(call-expand-observe obs_66 'enter-block(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
 "(let-values(((inside-sc_0)(new-scope 'intdef)))"
@@ -61181,12 +61203,12 @@ static const char *startup_source =
 " lst_22))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_66)(expand-context-observer ctx_77)))"
-"(if obs_66"
+"(let-values(((obs_67)(expand-context-observer ctx_77)))"
+"(if obs_67"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_66"
+" obs_67"
 " 'block-renames"
 "(datum->syntax$1 #f init-bodys_0)"
 "(datum->syntax$1 #f bodys_7))))"
@@ -61196,8 +61218,8 @@ static const char *startup_source =
 "(let-values(((frame-id_7)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
-"(let-values(((v_259) ctx_77))"
-"(let-values(((the-struct_90) v_259))"
+"(let-values(((v_258) ctx_77))"
+"(let-values(((the-struct_90) v_258))"
 "(if(expand-context/outer? the-struct_90)"
 "(let-values(((context51_0)(list(make-liberal-define-context)))"
 "((name52_0) #f)"
@@ -61216,7 +61238,7 @@ static const char *startup_source =
 "(cons"
 " frame-id_7"
 "(expand-context-reference-records ctx_77)))"
-"((inner60_0)(root-expand-context/outer-inner v_259)))"
+"((inner60_0)(root-expand-context/outer-inner v_258)))"
 "(expand-context/outer1.1"
 " inner60_0"
 " post-expansion55_0"
@@ -61238,13 +61260,13 @@ static const char *startup_source =
 "                                                   \"expand-context/outer?\""
 " the-struct_90))))))"
 "(let-values(((maybe-increment-binding-layer_0)"
-"(lambda(ids_30 body-ctx_1)"
+"(lambda(ids_29 body-ctx_1)"
 "(begin"
 " 'maybe-increment-binding-layer"
 "(if(eq?"
 "(expand-context-binding-layer body-ctx_1)"
 "(expand-context-binding-layer ctx_77))"
-"(increment-binding-layer ids_30 body-ctx_1 inside-sc_0)"
+"(increment-binding-layer ids_29 body-ctx_1 inside-sc_0)"
 "(expand-context-binding-layer body-ctx_1))))))"
 "(let-values(((name_80)(expand-context-name ctx_77)))"
 "((letrec-values(((loop_120)"
@@ -61293,14 +61315,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_0)(cdr bodys_8)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_67)"
+"(let-values(((obs_68)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_67"
+"(if obs_68"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_67"
+" obs_68"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -61311,17 +61333,17 @@ static const char *startup_source =
 "(null?"
 "(cdr bodys_8))"
 " #f)"
-"(let-values(((v_260)"
+"(let-values(((v_259)"
 " body-ctx_2))"
 "(let-values(((the-struct_91)"
-" v_260))"
+" v_259))"
 "(if(expand-context/outer?"
 " the-struct_91)"
 "(let-values(((name76_0)"
 " name_80)"
 "((inner77_0)"
 "(root-expand-context/outer-inner"
-" v_260)))"
+" v_259)))"
 "(expand-context/outer1.1"
 " inner77_0"
 "(root-expand-context/outer-post-expansion"
@@ -61372,14 +61394,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_68)"
+"(let-values(((obs_69)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_68"
+"(if obs_69"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_68"
+" obs_69"
 " 'prim-begin)))"
 "(void)))"
 "(values))))"
@@ -61404,15 +61426,15 @@ static const char *startup_source =
 " s_505)))"
 " s_176))"
 "((e81_0)"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(cdr"
 " s_505)))"
 "(let-values(((s_46)"
 "(if(syntax?$1"
-" s_450)"
+" s_451)"
 "(syntax-e$1"
-" s_450)"
-" s_450)))"
+" s_451)"
+" s_451)))"
 "(let-values(((flat-s_25)"
 "(to-syntax-list.1"
 " s_46)))"
@@ -61474,14 +61496,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_69)"
+"(let-values(((obs_70)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_69"
+"(if obs_70"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_69"
+" obs_70"
 " 'prim-define-values)))"
 "(void)))"
 "(values))))"
@@ -61505,10 +61527,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_51)"
 "(let-values(((define-values85_0)"
-"(let-values(((s_451)"
+"(let-values(((s_452)"
 "(car"
 " s_51)))"
-" s_451))"
+" s_452))"
 "((id86_0"
 " rhs87_0)"
 "(let-values(((s_506)"
@@ -61554,7 +61576,7 @@ static const char *startup_source =
 "(check-list"
 " lst_194)))"
 "((letrec-values(((for-loop_205)"
-"(lambda(id_82"
+"(lambda(id_81"
 " lst_13)"
 "(begin"
 " 'for-loop"
@@ -61568,8 +61590,8 @@ static const char *startup_source =
 " lst_13)))"
 "(let-values(((id_104)"
 "(let-values(((id_105)"
-" id_82))"
-"(let-values(((id_71)"
+" id_81))"
+"(let-values(((id_82)"
 "(let-values()"
 "(let-values(((id91_0)"
 "(let-values()"
@@ -61594,14 +61616,14 @@ static const char *startup_source =
 " id91_0"
 " id_105)))))"
 "(values"
-" id_71)))))"
+" id_82)))))"
 "(if(not"
 " #f)"
 "(for-loop_205"
 " id_104"
 " rest_105)"
 " id_104)))"
-" id_82)))))"
+" id_81)))))"
 " for-loop_205)"
 " null"
 " lst_194)))))"
@@ -61667,31 +61689,31 @@ static const char *startup_source =
 " define-values82_1"
 " id83_1"
 " rhs84_1))))))"
-"(let-values(((ids_31)"
+"(let-values(((ids_30)"
 "(remove-use-site-scopes"
 " id83_0"
 " body-ctx_2)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_70)"
+"(let-values(((obs_71)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_70"
+"(if obs_71"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_70"
+" obs_71"
 " 'rename-one"
 "(datum->syntax$1"
 " #f"
 "(list"
-" ids_31"
+" ids_30"
 " rhs84_0)))))"
 "(void)))"
 "(values))))"
 "(let-values(((new-dups_0)"
 "(let-values(((ids92_0)"
-" ids_31)"
+" ids_30)"
 "((phase93_0)"
 " phase_137)"
 "((exp-body94_0)"
@@ -61709,32 +61731,32 @@ static const char *startup_source =
 " ctx_77)))"
 "(let-values(((keys_5)"
 "(reverse$1"
-"(let-values(((lst_311)"
-" ids_31))"
+"(let-values(((lst_292)"
+" ids_30))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_311)))"
-"((letrec-values(((for-loop_285)"
+" lst_292)))"
+"((letrec-values(((for-loop_281)"
 "(lambda(fold-var_189"
-" lst_312)"
+" lst_310)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_312)"
+" lst_310)"
 "(let-values(((id_106)"
 "(unsafe-car"
-" lst_312))"
+" lst_310))"
 "((rest_181)"
 "(unsafe-cdr"
-" lst_312)))"
-"(let-values(((fold-var_248)"
-"(let-values(((fold-var_249)"
-" fold-var_189))"
+" lst_310)))"
 "(let-values(((fold-var_286)"
+"(let-values(((fold-var_287)"
+" fold-var_189))"
+"(let-values(((fold-var_288)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -61754,24 +61776,24 @@ static const char *startup_source =
 " id96_0"
 " phase97_0"
 " counter98_0)))"
-" fold-var_249))))"
+" fold-var_287))))"
 "(values"
-" fold-var_286)))))"
+" fold-var_288)))))"
 "(if(not"
 " #f)"
-"(for-loop_285"
-" fold-var_248"
+"(for-loop_281"
+" fold-var_286"
 " rest_181)"
-" fold-var_248)))"
+" fold-var_286)))"
 " fold-var_189)))))"
-" for-loop_285)"
+" for-loop_281)"
 " null"
-" lst_311))))))"
+" lst_292))))))"
 "(let-values(((extended-env_0)"
 "(let-values(((lst_228)"
 " keys_5)"
-"((lst_308)"
-" ids_31))"
+"((lst_307)"
+" ids_30))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -61784,30 +61806,30 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_308)))"
-"((letrec-values(((for-loop_280)"
+" lst_307)))"
+"((letrec-values(((for-loop_276)"
 "(lambda(env_17"
-" lst_313"
-" lst_296)"
+" lst_311"
+" lst_312)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_313)"
+" lst_311)"
 "(pair?"
-" lst_296)"
+" lst_312)"
 " #f)"
 "(let-values(((key_88)"
 "(unsafe-car"
-" lst_313))"
-"((rest_169)"
-"(unsafe-cdr"
-" lst_313))"
-"((id_107)"
-"(unsafe-car"
-" lst_296))"
+" lst_311))"
 "((rest_182)"
 "(unsafe-cdr"
-" lst_296)))"
+" lst_311))"
+"((id_107)"
+"(unsafe-car"
+" lst_312))"
+"((rest_183)"
+"(unsafe-cdr"
+" lst_312)))"
 "(let-values(((env_18)"
 "(let-values(((env_19)"
 " env_17))"
@@ -61822,33 +61844,33 @@ static const char *startup_source =
 " env_20)))))"
 "(if(not"
 " #f)"
-"(for-loop_280"
+"(for-loop_276"
 " env_18"
-" rest_169"
-" rest_182)"
+" rest_182"
+" rest_183)"
 " env_18)))"
 " env_17)))))"
-" for-loop_280)"
+" for-loop_276)"
 "(expand-context-env"
 " body-ctx_2)"
 " lst_228"
-" lst_308)))))"
+" lst_307)))))"
 "(loop_120"
-"(let-values(((v_261)"
+"(let-values(((v_260)"
 " body-ctx_2))"
 "(let-values(((the-struct_92)"
-" v_261))"
+" v_260))"
 "(if(expand-context/outer?"
 " the-struct_92)"
 "(let-values(((env101_0)"
 " extended-env_0)"
 "((binding-layer102_0)"
 "(maybe-increment-binding-layer_0"
-" ids_31"
+" ids_30"
 " body-ctx_2))"
 "((inner103_0)"
 "(root-expand-context/outer-inner"
-" v_261)))"
+" v_260)))"
 "(expand-context/outer1.1"
 " inner103_0"
 "(root-expand-context/outer-post-expansion"
@@ -61884,10 +61906,10 @@ static const char *startup_source =
 " rest-bodys_0"
 " null"
 "(cons"
-" ids_31"
+" ids_30"
 "(append"
 "(reverse$1"
-"(let-values(((lst_314)"
+"(let-values(((lst_313)"
 " done-bodys_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -61895,9 +61917,9 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_314)))"
-"((letrec-values(((for-loop_286)"
-"(lambda(fold-var_287"
+" lst_313)))"
+"((letrec-values(((for-loop_282)"
+"(lambda(fold-var_289"
 " lst_155)"
 "(begin"
 " 'for-loop"
@@ -61909,33 +61931,33 @@ static const char *startup_source =
 "((rest_79)"
 "(unsafe-cdr"
 " lst_155)))"
-"(let-values(((fold-var_288)"
-"(let-values(((fold-var_289)"
-" fold-var_287))"
 "(let-values(((fold-var_290)"
+"(let-values(((fold-var_291)"
+" fold-var_289))"
+"(let-values(((fold-var_292)"
 "(let-values()"
 "(cons"
 "(let-values()"
 " null)"
-" fold-var_289))))"
+" fold-var_291))))"
 "(values"
-" fold-var_290)))))"
+" fold-var_292)))))"
 "(if(not"
 " #f)"
-"(for-loop_286"
-" fold-var_288"
+"(for-loop_282"
+" fold-var_290"
 " rest_79)"
-" fold-var_288)))"
-" fold-var_287)))))"
-" for-loop_286)"
+" fold-var_290)))"
+" fold-var_289)))))"
+" for-loop_282)"
 " null"
-" lst_314))))"
+" lst_313))))"
 " val-idss_0))"
 "(cons"
 " keys_5"
 "(append"
 "(reverse$1"
-"(let-values(((lst_315)"
+"(let-values(((lst_314)"
 " done-bodys_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -61943,9 +61965,9 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_315)))"
-"((letrec-values(((for-loop_287)"
-"(lambda(fold-var_291"
+" lst_314)))"
+"((letrec-values(((for-loop_283)"
+"(lambda(fold-var_293"
 " lst_32)"
 "(begin"
 " 'for-loop"
@@ -61954,30 +61976,30 @@ static const char *startup_source =
 "(let-values(((done-body_1)"
 "(unsafe-car"
 " lst_32))"
-"((rest_183)"
+"((rest_184)"
 "(unsafe-cdr"
 " lst_32)))"
-"(let-values(((fold-var_292)"
-"(let-values(((fold-var_293)"
-" fold-var_291))"
+"(let-values(((fold-var_294)"
+"(let-values(((fold-var_295)"
+" fold-var_293))"
 "(let-values(((fold-var_141)"
 "(let-values()"
 "(cons"
 "(let-values()"
 " null)"
-" fold-var_293))))"
+" fold-var_295))))"
 "(values"
 " fold-var_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_287"
-" fold-var_292"
-" rest_183)"
-" fold-var_292)))"
-" fold-var_291)))))"
-" for-loop_287)"
+"(for-loop_283"
+" fold-var_294"
+" rest_184)"
+" fold-var_294)))"
+" fold-var_293)))))"
+" for-loop_283)"
 " null"
-" lst_315))))"
+" lst_314))))"
 " val-keyss_0))"
 "(cons"
 " rhs84_0"
@@ -61993,21 +62015,21 @@ static const char *startup_source =
 "(check-list"
 " lst_107)))"
 "((letrec-values(((for-loop_126)"
-"(lambda(fold-var_294"
-" lst_316)"
+"(lambda(fold-var_296"
+" lst_315)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_316)"
+" lst_315)"
 "(let-values(((done-body_2)"
 "(unsafe-car"
-" lst_316))"
-"((rest_184)"
+" lst_315))"
+"((rest_185)"
 "(unsafe-cdr"
-" lst_316)))"
-"(let-values(((fold-var_295)"
-"(let-values(((fold-var_296)"
-" fold-var_294))"
+" lst_315)))"
+"(let-values(((fold-var_297)"
+"(let-values(((fold-var_298)"
+" fold-var_296))"
 "(let-values(((fold-var_145)"
 "(let-values()"
 "(cons"
@@ -62016,16 +62038,16 @@ static const char *startup_source =
 " done-body_2"
 " s_492"
 " phase_137))"
-" fold-var_296))))"
+" fold-var_298))))"
 "(values"
 " fold-var_145)))))"
 "(if(not"
 " #f)"
 "(for-loop_126"
-" fold-var_295"
-" rest_184)"
-" fold-var_295)))"
-" fold-var_294)))))"
+" fold-var_297"
+" rest_185)"
+" fold-var_297)))"
+" fold-var_296)))))"
 " for-loop_126)"
 " null"
 " lst_107))))"
@@ -62043,38 +62065,38 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_157)))"
-"((letrec-values(((for-loop_288)"
-"(lambda(fold-var_297"
-" lst_317)"
+"((letrec-values(((for-loop_284)"
+"(lambda(fold-var_299"
+" lst_316)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_317)"
+" lst_316)"
 "(let-values(((done-body_3)"
 "(unsafe-car"
-" lst_317))"
-"((rest_185)"
+" lst_316))"
+"((rest_186)"
 "(unsafe-cdr"
-" lst_317)))"
+" lst_316)))"
 "(let-values(((fold-var_41)"
 "(let-values(((fold-var_42)"
-" fold-var_297))"
-"(let-values(((fold-var_298)"
+" fold-var_299))"
+"(let-values(((fold-var_300)"
 "(let-values()"
 "(cons"
 "(let-values()"
 " #f)"
 " fold-var_42))))"
 "(values"
-" fold-var_298)))))"
+" fold-var_300)))))"
 "(if(not"
 " #f)"
-"(for-loop_288"
+"(for-loop_284"
 " fold-var_41"
-" rest_185)"
+" rest_186)"
 " fold-var_41)))"
-" fold-var_297)))))"
-" for-loop_288)"
+" fold-var_299)))))"
+" for-loop_284)"
 " null"
 " lst_157))))"
 " track-stxs_0))"
@@ -62155,7 +62177,7 @@ static const char *startup_source =
 " orig-s_7))"
 "(let-values()"
 "(let-values(((id_108)"
-"(let-values(((lst_318)"
+"(let-values(((lst_317)"
 " flat-s_27))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -62163,20 +62185,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_318)))"
-"((letrec-values(((for-loop_289)"
+" lst_317)))"
+"((letrec-values(((for-loop_285)"
 "(lambda(id_109"
-" lst_319)"
+" lst_318)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_319)"
+" lst_318)"
 "(let-values(((s_159)"
 "(unsafe-car"
-" lst_319))"
-"((rest_186)"
+" lst_318))"
+"((rest_187)"
 "(unsafe-cdr"
-" lst_319)))"
+" lst_318)))"
 "(let-values(((id_65)"
 "(let-values(((id_110)"
 " id_109))"
@@ -62184,15 +62206,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id113_0)"
 "(let-values()"
-"(if(let-values(((or-part_379)"
+"(if(let-values(((or-part_377)"
 "(if(syntax?$1"
 " s_159)"
 "(symbol?"
 "(syntax-e$1"
 " s_159))"
 " #f)))"
-"(if or-part_379"
-" or-part_379"
+"(if or-part_377"
+" or-part_377"
 "(symbol?"
 " s_159)))"
 " s_159"
@@ -62208,14 +62230,14 @@ static const char *startup_source =
 " id_111)))))"
 "(if(not"
 " #f)"
-"(for-loop_289"
+"(for-loop_285"
 " id_65"
-" rest_186)"
+" rest_187)"
 " id_65)))"
 " id_109)))))"
-" for-loop_289)"
+" for-loop_285)"
 " null"
-" lst_318)))))"
+" lst_317)))))"
 "(reverse$1"
 " id_108))))))))"
 "((rhs111_0)"
@@ -62278,7 +62300,7 @@ static const char *startup_source =
 " define-syntaxes104_1"
 " id105_1"
 " rhs106_1))))))"
-"(let-values(((ids_32)"
+"(let-values(((ids_31)"
 "(remove-use-site-scopes"
 " id105_0"
 " body-ctx_2)))"
@@ -62296,13 +62318,13 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-" ids_32"
+" ids_31"
 " rhs106_0)))))"
 "(void)))"
 "(values))))"
 "(let-values(((new-dups_1)"
 "(let-values(((ids114_0)"
-" ids_32)"
+" ids_31)"
 "((phase115_0)"
 " phase_137)"
 "((exp-body116_0)"
@@ -62320,32 +62342,32 @@ static const char *startup_source =
 " ctx_77)))"
 "(let-values(((keys_6)"
 "(reverse$1"
-"(let-values(((lst_320)"
-" ids_32))"
+"(let-values(((lst_319)"
+" ids_31))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_320)))"
-"((letrec-values(((for-loop_290)"
-"(lambda(fold-var_299"
-" lst_321)"
+" lst_319)))"
+"((letrec-values(((for-loop_286)"
+"(lambda(fold-var_301"
+" lst_320)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_321)"
+" lst_320)"
 "(let-values(((id_112)"
 "(unsafe-car"
-" lst_321))"
-"((rest_187)"
+" lst_320))"
+"((rest_188)"
 "(unsafe-cdr"
-" lst_321)))"
-"(let-values(((fold-var_300)"
-"(let-values(((fold-var_301)"
-" fold-var_299))"
+" lst_320)))"
 "(let-values(((fold-var_302)"
+"(let-values(((fold-var_303)"
+" fold-var_301))"
+"(let-values(((fold-var_304)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -62365,37 +62387,19 @@ static const char *startup_source =
 " id118_0"
 " phase119_0"
 " counter120_0)))"
-" fold-var_301))))"
+" fold-var_303))))"
 "(values"
-" fold-var_302)))))"
+" fold-var_304)))))"
 "(if(not"
 " #f)"
-"(for-loop_290"
-" fold-var_300"
-" rest_187)"
-" fold-var_300)))"
-" fold-var_299)))))"
-" for-loop_290)"
+"(for-loop_286"
+" fold-var_302"
+" rest_188)"
+" fold-var_302)))"
+" fold-var_301)))))"
+" for-loop_286)"
 " null"
-" lst_320))))))"
-"(let-values((()"
-"(begin"
-"(let-values(((obs_71)"
-"(expand-context-observer"
-" body-ctx_2)))"
-"(if obs_71"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_71"
-" 'prepare-env)))"
-"(void)))"
-"(values))))"
-"(let-values((()"
-"(begin"
-"(prepare-next-phase-namespace"
-" ctx_77)"
-"(values))))"
+" lst_319))))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_72)"
@@ -62406,6 +62410,24 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_72"
+" 'prepare-env)))"
+"(void)))"
+"(values))))"
+"(let-values((()"
+"(begin"
+"(prepare-next-phase-namespace"
+" ctx_77)"
+"(values))))"
+"(let-values((()"
+"(begin"
+"(let-values(((obs_73)"
+"(expand-context-observer"
+" body-ctx_2)))"
+"(if obs_73"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_73"
 " 'enter-bind)))"
 "(void)))"
 "(values))))"
@@ -62413,21 +62435,27 @@ static const char *startup_source =
 "(eval-for-syntaxes-binding"
 " 'define-syntaxes"
 " rhs106_0"
-" ids_32"
+" ids_31"
 " body-ctx_2)))"
 "(let-values(((extended-env_1)"
-"(let-values(((lst_322)"
+"(let-values(((lst_321)"
 " keys_6)"
-"((lst_323)"
+"((lst_322)"
 " vals_8)"
-"((lst_324)"
-" ids_32))"
+"((lst_323)"
+" ids_31))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_321)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_322)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -62435,45 +62463,39 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_323)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_324)))"
-"((letrec-values(((for-loop_291)"
+"((letrec-values(((for-loop_287)"
 "(lambda(env_21"
+" lst_324"
 " lst_325"
-" lst_326"
-" lst_327)"
+" lst_326)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_325)"
+" lst_324)"
 "(if(pair?"
-" lst_326)"
+" lst_325)"
 "(pair?"
-" lst_327)"
+" lst_326)"
 " #f)"
 " #f)"
 "(let-values(((key_89)"
 "(unsafe-car"
-" lst_325))"
-"((rest_188)"
-"(unsafe-cdr"
-" lst_325))"
-"((val_41)"
-"(unsafe-car"
-" lst_326))"
+" lst_324))"
 "((rest_189)"
 "(unsafe-cdr"
-" lst_326))"
-"((id_113)"
+" lst_324))"
+"((val_41)"
 "(unsafe-car"
-" lst_327))"
+" lst_325))"
 "((rest_190)"
 "(unsafe-cdr"
-" lst_327)))"
+" lst_325))"
+"((id_113)"
+"(unsafe-car"
+" lst_326))"
+"((rest_191)"
+"(unsafe-cdr"
+" lst_326)))"
 "(let-values(((env_22)"
 "(let-values(((env_23)"
 " env_21))"
@@ -62493,46 +62515,46 @@ static const char *startup_source =
 " env_24)))))"
 "(if(not"
 " #f)"
-"(for-loop_291"
+"(for-loop_287"
 " env_22"
-" rest_188"
 " rest_189"
-" rest_190)"
+" rest_190"
+" rest_191)"
 " env_22)))"
 " env_21)))))"
-" for-loop_291)"
+" for-loop_287)"
 "(expand-context-env"
 " body-ctx_2)"
+" lst_321"
 " lst_322"
-" lst_323"
-" lst_324)))))"
+" lst_323)))))"
 "(begin"
-"(let-values(((obs_73)"
+"(let-values(((obs_74)"
 "(expand-context-observer"
 " body-ctx_2)))"
-"(if obs_73"
+"(if obs_74"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_73"
+" obs_74"
 " 'exit-bind)))"
 "(void)))"
 "(loop_120"
-"(let-values(((v_262)"
+"(let-values(((v_261)"
 " body-ctx_2))"
 "(let-values(((the-struct_93)"
-" v_262))"
+" v_261))"
 "(if(expand-context/outer?"
 " the-struct_93)"
 "(let-values(((env123_0)"
 " extended-env_1)"
 "((binding-layer124_0)"
 "(maybe-increment-binding-layer_0"
-" ids_32"
+" ids_31"
 " body-ctx_2))"
 "((inner125_0)"
 "(root-expand-context/outer-inner"
-" v_262)))"
+" v_261)))"
 "(expand-context/outer1.1"
 " inner125_0"
 "(root-expand-context/outer-post-expansion"
@@ -62572,13 +62594,13 @@ static const char *startup_source =
 " val-rhss_0"
 " track-stxs_0"
 "(cons"
-" ids_32"
+" ids_31"
 " trans-idss_1)"
 "(cons"
 "(datum->syntax$1"
 " #f"
 "(list"
-" ids_32"
+" ids_31"
 " rhs106_0)"
 " exp-body_0)"
 " stx-clauses_0)"
@@ -62684,11 +62706,11 @@ static const char *startup_source =
 "(void))"
 "(values))))"
 "(let-values(((finish-ctx_0)"
-"(let-values(((v_263)"
+"(let-values(((v_262)"
 "(accumulate-def-ctx-scopes"
 " body-ctx_3"
 " def-ctx-scopes_7)))"
-"(let-values(((the-struct_94) v_263))"
+"(let-values(((the-struct_94) v_262))"
 "(if(expand-context/outer? the-struct_94)"
 "(let-values(((context126_0) 'expression)"
 "((use-site-scopes127_0)(box null))"
@@ -62702,7 +62724,7 @@ static const char *startup_source =
 "((def-ctx-scopes130_0) #f)"
 "((post-expansion131_0) #f)"
 "((inner132_0)"
-"(root-expand-context/outer-inner v_263)))"
+"(root-expand-context/outer-inner v_262)))"
 "(expand-context/outer1.1"
 " inner132_0"
 " post-expansion131_0"
@@ -62734,20 +62756,6 @@ static const char *startup_source =
 "(if block->list?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_74)"
-"(expand-context-observer"
-" body-ctx_3)))"
-"(if obs_74"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_74"
-" 'next-group)))"
-"(void)))))"
-"(values))))"
-"(let-values(((last-i_1)(sub1(length done-bodys_1))))"
-"(let-values((()"
-"(begin"
 "(let-values(((obs_75)"
 "(expand-context-observer"
 " body-ctx_3)))"
@@ -62756,6 +62764,20 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_75"
+" 'next-group)))"
+"(void)))))"
+"(values))))"
+"(let-values(((last-i_1)(sub1(length done-bodys_1))))"
+"(let-values((()"
+"(begin"
+"(let-values(((obs_76)"
+"(expand-context-observer"
+" body-ctx_3)))"
+"(if obs_76"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_76"
 " 'enter-list"
 "(datum->syntax$1"
 " #f"
@@ -62777,8 +62799,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-naturals start_64)))"
-"((letrec-values(((for-loop_292)"
-"(lambda(fold-var_303"
+"((letrec-values(((for-loop_288)"
+"(lambda(fold-var_305"
 " lst_5"
 " pos_125)"
 "(begin"
@@ -62790,27 +62812,27 @@ static const char *startup_source =
 "(let-values(((done-body_4)"
 "(unsafe-car"
 " lst_5))"
-"((rest_191)"
+"((rest_192)"
 "(unsafe-cdr"
 " lst_5))"
 "((i_14)"
 " pos_125))"
-"(let-values(((fold-var_304)"
-"(let-values(((fold-var_305)"
-" fold-var_303))"
 "(let-values(((fold-var_306)"
+"(let-values(((fold-var_307)"
+" fold-var_305))"
+"(let-values(((fold-var_308)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_76)"
+"(let-values(((obs_77)"
 "(expand-context-observer"
 " body-ctx_3)))"
-"(if obs_76"
+"(if obs_77"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_76"
+" obs_77"
 " 'next)))"
 "(void)))"
 "(let-values(((done-body133_0)"
@@ -62821,17 +62843,17 @@ static const char *startup_source =
 " i_14"
 " last-i_1)"
 " #f)"
-"(let-values(((v_264)"
+"(let-values(((v_263)"
 " finish-ctx_0))"
 "(let-values(((the-struct_95)"
-" v_264))"
+" v_263))"
 "(if(expand-context/outer?"
 " the-struct_95)"
 "(let-values(((name135_0)"
 " name_81)"
 "((inner136_0)"
 "(root-expand-context/outer-inner"
-" v_264)))"
+" v_263)))"
 "(expand-context/outer1.1"
 " inner136_0"
 "(root-expand-context/outer-post-expansion"
@@ -62872,31 +62894,31 @@ static const char *startup_source =
 " #f"
 " done-body133_0"
 " temp134_3))))"
-" fold-var_305))))"
+" fold-var_307))))"
 "(values"
-" fold-var_306)))))"
+" fold-var_308)))))"
 "(if(not"
 " #f)"
-"(for-loop_292"
-" fold-var_304"
-" rest_191"
+"(for-loop_288"
+" fold-var_306"
+" rest_192"
 "(+"
 " pos_125"
 " 1))"
-" fold-var_304)))"
-" fold-var_303)))))"
-" for-loop_292)"
+" fold-var_306)))"
+" fold-var_305)))))"
+" for-loop_288)"
 " null"
 " lst_213"
 " start_64))))))"
 "(begin"
-"(let-values(((obs_77)"
+"(let-values(((obs_78)"
 "(expand-context-observer body-ctx_3)))"
-"(if obs_77"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_77"
+" obs_78"
 " 'exit-list"
 "(datum->syntax$1 #f exp-bodys_0))))"
 "(void)))"
@@ -62905,12 +62927,12 @@ static const char *startup_source =
 "(if(if(null? val-idss_1)(null? disappeared-transformer-bindings_0) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_78)(expand-context-observer finish-ctx_0)))"
-"(if obs_78"
+"(let-values(((obs_79)(expand-context-observer finish-ctx_0)))"
+"(if obs_79"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_78"
+" obs_79"
 " 'block->list"
 "(datum->syntax$1 s_233 done-bodys_1))))"
 "(void)))"
@@ -62918,12 +62940,12 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_79)"
+"(let-values(((obs_80)"
 "(expand-context-observer finish-ctx_0)))"
-"(if obs_79"
+"(if obs_80"
 "(let-values()"
 "(log-letrec-values$1"
-" obs_79"
+" obs_80"
 " finish-ctx_0"
 " s_233"
 " val-idss_1"
@@ -62958,13 +62980,13 @@ static const char *startup_source =
 " val-rhss139_0"
 " track-stxs140_0))))"
 "(begin"
-"(let-values(((obs_80)(expand-context-observer body-ctx_3)))"
-"(if obs_80"
+"(let-values(((obs_81)(expand-context-observer body-ctx_3)))"
+"(if obs_81"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_80 'exit-prim exp-s_12)"
-"(call-expand-observe obs_80 'return exp-s_12))))"
+"(call-expand-observe obs_81 'exit-prim exp-s_12)"
+"(call-expand-observe obs_81 'return exp-s_12))))"
 "(void)))"
 "(if(expand-context-to-parsed? body-ctx_3)"
 "(list exp-s_12)"
@@ -63058,16 +63080,16 @@ static const char *startup_source =
 " s149_0"
 " temp150_1)))))"
 "(begin"
-"(let-values(((obs_81)"
+"(let-values(((obs_82)"
 "(expand-context-observer ctx_78)))"
-"(if obs_81"
+"(if obs_82"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag? had-stxes?_0 ctx_78)"
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_81"
+" obs_82"
 " 'tag"
 " result-s_9))"
 "(void)))"
@@ -63076,22 +63098,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_82)"
+"(let-values(((obs_83)"
 "(expand-context-observer"
 " ctx_78)))"
-"(if obs_82"
+"(if obs_83"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_82 'next)))"
+"(call-expand-observe obs_83 'next)))"
 "(void)))"
 "(values))))"
-"(let-values(((ids_33)(car idss_2)))"
+"(let-values(((ids_32)(car idss_2)))"
 "(let-values(((expanded-rhs_0)"
 "(let-values(((temp151_1)(car rhss_2))"
 "((temp152_1)"
 "(as-named-context"
 " ctx_78"
-" ids_33)))"
+" ids_32)))"
 "(expand9.1"
 " #f"
 " #f"
@@ -63142,7 +63164,7 @@ static const char *startup_source =
 "(parsed-let-values17.1"
 "(keep-properties-only"
 " s_366)"
-"(list ids_33)"
+"(list ids_32)"
 "(list"
 "(list"
 "(car keyss_1)"
@@ -63159,7 +63181,7 @@ static const char *startup_source =
 " phase_138)"
 "(list"
 "(build-clause"
-" ids_33"
+" ids_32"
 " expanded-rhs_0"
 " track-stx_0))"
 " exp-rest_0)))"
@@ -63168,10 +63190,10 @@ static const char *startup_source =
 " s154_1"
 " temp155_2)))))"
 "(begin"
-"(let-values(((obs_83)"
+"(let-values(((obs_84)"
 "(expand-context-observer"
 " ctx_78)))"
-"(if obs_83"
+"(if obs_84"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
@@ -63180,7 +63202,7 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_83"
+" obs_84"
 " 'tag"
 " result-s_10))"
 "(void)))"
@@ -63189,9 +63211,9 @@ static const char *startup_source =
 "(list result-s_10)"
 " result-s_10))))))"
 "(if(if(not forward-references?_0)"
-"(let-values(((or-part_380) split?_0))"
-"(if or-part_380"
-" or-part_380"
+"(let-values(((or-part_378) split?_0))"
+"(if or-part_378"
+" or-part_378"
 "(null?(cdr idss_2))))"
 " #f)"
 "(let-values()"
@@ -63216,7 +63238,7 @@ static const char *startup_source =
 " s_366)"
 "(reverse$1"
 "(cons"
-" ids_33"
+" ids_32"
 " accum-idss_0))"
 "(reverse$1"
 "(cons"
@@ -63239,7 +63261,7 @@ static const char *startup_source =
 " phase_138)"
 "(build-clauses"
 "(cons"
-" ids_33"
+" ids_32"
 " accum-idss_0)"
 "(cons"
 " expanded-rhs_0"
@@ -63253,10 +63275,10 @@ static const char *startup_source =
 " s157_1"
 " temp158_1)))))"
 "(begin"
-"(let-values(((obs_84)"
+"(let-values(((obs_85)"
 "(expand-context-observer"
 " ctx_78)))"
-"(if obs_84"
+"(if obs_85"
 "(let-values()"
 "(if(if can-log?_0"
 "(log-tag?"
@@ -63265,7 +63287,7 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(call-expand-observe"
-" obs_84"
+" obs_85"
 " 'tag"
 " result-s_11))"
 "(void)))"
@@ -63279,7 +63301,7 @@ static const char *startup_source =
 "(cdr keyss_1)"
 "(cdr rhss_2)"
 "(cdr track-stxs_3)"
-"(cons ids_33 accum-idss_0)"
+"(cons ids_32 accum-idss_0)"
 "(cons(car keyss_1) accum-keyss_0)"
 "(cons expanded-rhs_0 accum-rhss_0)"
 "(cons track-stx_0 accum-track-stxs_0)"
@@ -63304,9 +63326,9 @@ static const char *startup_source =
 "(begin(map2 build-clause(reverse$1 accum-idss_1)(reverse$1 accum-rhss_1)(reverse$1 accum-track-stxs_1)))))"
 "(define-values"
 "(build-clause)"
-"(lambda(ids_34 rhs_19 track-stx_1)"
+"(lambda(ids_33 rhs_19 track-stx_1)"
 "(begin"
-"(let-values(((clause_2)(datum->syntax$1 #f(list ids_34 rhs_19))))"
+"(let-values(((clause_2)(datum->syntax$1 #f(list ids_33 rhs_19))))"
 "(if track-stx_1(syntax-track-origin$1 clause_2 track-stx_1) clause_2)))))"
 "(define-values"
 "(no-binds)"
@@ -63322,37 +63344,37 @@ static const char *startup_source =
 "(lambda(had-stxes?_1 ctx_79)(begin(if had-stxes?_1(not(expand-context-only-immediate? ctx_79)) #f))))"
 "(define-values"
 "(log-letrec-values$1)"
-"(lambda(obs_85 ctx_80 s_396 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
+"(lambda(obs_86 ctx_80 s_396 val-idss_2 val-rhss_2 track-stxs_4 stx-clauses_2 done-bodys_2)"
 "(begin"
 " 'log-letrec-values"
 "(let-values(((phase_140)(expand-context-phase ctx_80)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
-"(let-values(((lst_328) val-idss_2)((lst_329) val-rhss_2)((lst_330) track-stxs_4))"
+"(let-values(((lst_327) val-idss_2)((lst_328) val-rhss_2)((lst_329) track-stxs_4))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
+"(let-values()(check-list lst_327)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
 "(let-values()(check-list lst_328)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_329)))"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_330)))"
-"((letrec-values(((for-loop_293)"
-"(lambda(fold-var_307 lst_331 lst_332 lst_333)"
+"((letrec-values(((for-loop_289)"
+"(lambda(fold-var_309 lst_330 lst_331 lst_332)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_331)(if(pair? lst_332)(pair? lst_333) #f) #f)"
-"(let-values(((val-ids_0)(unsafe-car lst_331))"
-"((rest_192)(unsafe-cdr lst_331))"
-"((val-rhs_0)(unsafe-car lst_332))"
-"((rest_193)(unsafe-cdr lst_332))"
-"((track-stx_2)(unsafe-car lst_333))"
-"((rest_194)(unsafe-cdr lst_333)))"
-"(let-values(((fold-var_308)"
-"(let-values(((fold-var_309) fold-var_307))"
+"(if(if(pair? lst_330)(if(pair? lst_331)(pair? lst_332) #f) #f)"
+"(let-values(((val-ids_0)(unsafe-car lst_330))"
+"((rest_193)(unsafe-cdr lst_330))"
+"((val-rhs_0)(unsafe-car lst_331))"
+"((rest_194)(unsafe-cdr lst_331))"
+"((track-stx_2)(unsafe-car lst_332))"
+"((rest_195)(unsafe-cdr lst_332)))"
 "(let-values(((fold-var_310)"
+"(let-values(((fold-var_311) fold-var_309))"
+"(let-values(((fold-var_312)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -63360,17 +63382,17 @@ static const char *startup_source =
 " #f"
 "(list val-ids_0 val-rhs_0)"
 " track-stx_2))"
-" fold-var_309))))"
-"(values fold-var_310)))))"
+" fold-var_311))))"
+"(values fold-var_312)))))"
 "(if(not #f)"
-"(for-loop_293 fold-var_308 rest_192 rest_193 rest_194)"
-" fold-var_308)))"
-" fold-var_307)))))"
-" for-loop_293)"
+"(for-loop_289 fold-var_310 rest_193 rest_194 rest_195)"
+" fold-var_310)))"
+" fold-var_309)))))"
+" for-loop_289)"
 " null"
+" lst_327"
 " lst_328"
-" lst_329"
-" lst_330))))))"
+" lst_329))))))"
 "(let-values(((had-stxes?_2)(not(null? stx-clauses_2))))"
 "(let-values(((lv-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_140)))"
 "(let-values(((lv-s_0)"
@@ -63381,37 +63403,37 @@ static const char *startup_source =
 "(list* lv-id_0 clauses_0 done-bodys_2))"
 " s_396)))"
 "(begin"
-"(call-expand-observe obs_85 'block->letrec(list lv-s_0))"
-"(call-expand-observe obs_85 'visit lv-s_0)"
-"(call-expand-observe obs_85 'resolve lv-id_0)"
-"(call-expand-observe obs_85 'enter-prim lv-s_0)"
+"(call-expand-observe obs_86 'block->letrec(list lv-s_0))"
+"(call-expand-observe obs_86 'visit lv-s_0)"
+"(call-expand-observe obs_86 'resolve lv-id_0)"
+"(call-expand-observe obs_86 'enter-prim lv-s_0)"
 "(if had-stxes?_2"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_85 'prim-letrec-syntaxes+values)"
+"(call-expand-observe obs_86 'prim-letrec-syntaxes+values)"
 "(call-expand-observe"
-" obs_85"
+" obs_86"
 " 'letrec-syntaxes-renames"
 " stx-clauses_2"
 " clauses_0"
 "(datum->syntax$1 #f done-bodys_2 s_396))"
-"(call-expand-observe obs_85 'prepare-env)"
-"(call-expand-observe obs_85 'next-group)"
+"(call-expand-observe obs_86 'prepare-env)"
+"(call-expand-observe obs_86 'next-group)"
 "(if(null? val-idss_2)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_85 'prim-letrec-values)"
+"(call-expand-observe obs_86 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_85"
+" obs_86"
 " 'let-renames"
 " clauses_0"
 "(datum->syntax$1 #f done-bodys_2 s_396)))))))"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_85 'prim-letrec-values)"
+"(call-expand-observe obs_86 'prim-letrec-values)"
 "(call-expand-observe"
-" obs_85"
+" obs_86"
 " 'let-renames"
 " clauses_0"
 "(datum->syntax$1 #f done-bodys_2 s_396))))))))))))))"
@@ -63421,10 +63443,10 @@ static const char *startup_source =
 "(begin"
 "(let-values(((sc_37)(new-scope 'local)))"
 "(let-values(((phase_84)(expand-context-phase ctx_81)))"
-"(let-values(((ids_35)(parse-and-flatten-formals formals_1 sc_37 disarmed-s_5)))"
+"(let-values(((ids_34)(parse-and-flatten-formals formals_1 sc_37 disarmed-s_5)))"
 "(let-values((()"
 "(begin"
-"(let-values(((ids33_0) ids_35)"
+"(let-values(((ids33_0) ids_34)"
 "((phase34_1) phase_84)"
 "((s35_1) s_74)"
 "                                         ((temp36_8) \"argument name\"))"
@@ -63433,7 +63455,7 @@ static const char *startup_source =
 "(let-values(((counter_7)(root-expand-context-counter ctx_81)))"
 "(let-values(((keys_7)"
 "(reverse$1"
-"(let-values(((lst_88) ids_35))"
+"(let-values(((lst_88) ids_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -63475,7 +63497,7 @@ static const char *startup_source =
 " null"
 " lst_88))))))"
 "(let-values(((body-env_0)"
-"(let-values(((lst_80) keys_7)((lst_91) ids_35))"
+"(let-values(((lst_80) keys_7)((lst_91) ids_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -63489,9 +63511,9 @@ static const char *startup_source =
 " 'for-loop"
 "(if(if(pair? lst_82)(pair? lst_58) #f)"
 "(let-values(((key_90)(unsafe-car lst_82))"
-"((rest_195)(unsafe-cdr lst_82))"
+"((rest_196)(unsafe-cdr lst_82))"
 "((id_115)(unsafe-car lst_58))"
-"((rest_196)(unsafe-cdr lst_58)))"
+"((rest_197)(unsafe-cdr lst_58)))"
 "(let-values(((env_26)"
 "(let-values(((env_27) env_25))"
 "(let-values(((env_28)"
@@ -63503,7 +63525,7 @@ static const char *startup_source =
 " id_115)))))"
 "(values env_28)))))"
 "(if(not #f)"
-"(for-loop_49 env_26 rest_195 rest_196)"
+"(for-loop_49 env_26 rest_196 rest_197)"
 " env_26)))"
 " env_25)))))"
 " for-loop_49)"
@@ -63546,27 +63568,27 @@ static const char *startup_source =
 " lst_17))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_86)(expand-context-observer ctx_81)))"
-"(if obs_86"
+"(let-values(((obs_87)(expand-context-observer ctx_81)))"
+"(if obs_87"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_86"
+" obs_87"
 " log-renames-tag_0"
 " sc-formals_0"
 "(datum->syntax$1 #f sc-bodys_0))))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_4)"
-"(let-values(((v_265) ctx_81))"
-"(let-values(((the-struct_96) v_265))"
+"(let-values(((v_264) ctx_81))"
+"(let-values(((the-struct_96) v_264))"
 "(if(expand-context/outer? the-struct_96)"
 "(let-values(((env41_0) body-env_0)"
 "((scopes42_0)(cons sc_37(expand-context-scopes ctx_81)))"
 "((binding-layer43_0)"
-"(increment-binding-layer ids_35 ctx_81 sc_37))"
+"(increment-binding-layer ids_34 ctx_81 sc_37))"
 "((frame-id44_0) #f)"
-"((inner45_0)(root-expand-context/outer-inner v_265)))"
+"((inner45_0)(root-expand-context/outer-inner v_264)))"
 "(expand-context/outer1.1"
 " inner45_0"
 "(root-expand-context/outer-post-expansion the-struct_96)"
@@ -63605,8 +63627,8 @@ static const char *startup_source =
 "(lambda(s_13 ctx_82)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_87)(expand-context-observer ctx_82)))"
-"(if obs_87(let-values()(let-values()(call-expand-observe obs_87 'prim-lambda)))(void)))"
+"(let-values(((obs_88)(expand-context-observer ctx_82)))"
+"(if obs_88(let-values()(let-values()(call-expand-observe obs_88 'prim-lambda)))(void)))"
 "(values))))"
 "(let-values(((disarmed-s_6)(syntax-disarm$1 s_13)))"
 "(let-values(((ok?_37 lambda52_0 formals53_0 body54_0)"
@@ -63628,13 +63650,13 @@ static const char *startup_source =
 " s_175))"
 "((body59_0)"
 "(let-values(((s_176)(cdr s_174)))"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(if(syntax?$1 s_176)"
 "(syntax-e$1 s_176)"
 " s_176)))"
 "(let-values(((flat-s_28)"
 "(to-syntax-list.1"
-" s_450)))"
+" s_451)))"
 "(if(not flat-s_28)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -63707,11 +63729,11 @@ static const char *startup_source =
 "(values lam-id68_0 formals69_0 _70_0))"
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_41)))))"
 "(values #t lam-id65_1 formals66_1 _67_1))))))"
-"(let-values(((ids_36)(parse-and-flatten-formals formals66_0 #f s_26)))"
+"(let-values(((ids_35)(parse-and-flatten-formals formals66_0 #f s_26)))"
 "(let-values(((ctx_75)(let-values(((temp77_4) #t))(get-current-expand-context16.1 temp77_4 'unexpected))))"
 "(let-values(((phase_93)(if ctx_75(expand-context-phase ctx_75) 0)))"
 "(begin"
-"               (let-values (((ids73_0) ids_36) ((phase74_2) phase_93) ((s75_0) s_26) ((temp76_4) \"argument name\"))"
+"               (let-values (((ids73_0) ids_35) ((phase74_2) phase_93) ((s75_0) s_26) ((temp76_4) \"argument name\"))"
 "(check-no-duplicate-ids7.1 temp76_4 ids73_0 phase74_2 s75_0 unsafe-undefined))"
 "(datum->syntax$1"
 " s_26"
@@ -63723,15 +63745,15 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'case-lambda"
-"(lambda(s_453 ctx_83)"
+"(lambda(s_454 ctx_83)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_88)(expand-context-observer ctx_83)))"
-"(if obs_88"
-"(let-values()(let-values()(call-expand-observe obs_88 'prim-case-lambda)))"
+"(let-values(((obs_89)(expand-context-observer ctx_83)))"
+"(if obs_89"
+"(let-values()(let-values()(call-expand-observe obs_89 'prim-case-lambda)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_7)(syntax-disarm$1 s_453)))"
+"(let-values(((disarmed-s_7)(syntax-disarm$1 s_454)))"
 "(let-values(((ok?_39 case-lambda78_0 formals79_0 body80_0)"
 "(let-values(((s_519) disarmed-s_7))"
 "(let-values(((orig-s_42) s_519))"
@@ -63751,27 +63773,27 @@ static const char *startup_source =
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_42))"
 "(let-values()"
 "(let-values(((formals_3 body_12)"
-"(let-values(((lst_334) flat-s_30))"
+"(let-values(((lst_333) flat-s_30))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
-"(check-list lst_334)))"
-"((letrec-values(((for-loop_294)"
+"(check-list lst_333)))"
+"((letrec-values(((for-loop_290)"
 "(lambda(formals_4"
 " body_13"
-" lst_335)"
+" lst_334)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_335)"
+" lst_334)"
 "(let-values(((s_209)"
 "(unsafe-car"
-" lst_335))"
-"((rest_197)"
+" lst_334))"
+"((rest_198)"
 "(unsafe-cdr"
-" lst_335)))"
+" lst_334)))"
 "(let-values(((formals_5"
 " body_14)"
 "(let-values(((formals_6)"
@@ -63845,20 +63867,20 @@ static const char *startup_source =
 " body_16)))))"
 "(if(not"
 " #f)"
-"(for-loop_294"
+"(for-loop_290"
 " formals_5"
 " body_14"
-" rest_197)"
+" rest_198)"
 "(values"
 " formals_5"
 " body_14))))"
 "(values"
 " formals_4"
 " body_13))))))"
-" for-loop_294)"
+" for-loop_290)"
 " null"
 " null"
-" lst_334)))))"
+" lst_333)))))"
 "(values"
 "(reverse$1 formals_3)"
 "(reverse$1 body_12))))))))))"
@@ -63888,7 +63910,7 @@ static const char *startup_source =
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_43)))))"
 "(values #t case-lambda86_1 clause87_1))))))"
 "(let-values(((rebuild-s_5)"
-"(let-values(((ctx92_0) ctx_83)((s93_0) s_453)((temp94_0) #t))"
+"(let-values(((ctx92_0) ctx_83)((s93_0) s_454)((temp94_0) #t))"
 "(keep-as-needed119.1 #f #f temp94_0 ctx92_0 s93_0))))"
 "(let-values(((clauses_1)"
 "(reverse$1"
@@ -63904,34 +63926,34 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_112)))"
 "((letrec-values(((for-loop_31)"
-"(lambda(fold-var_197 lst_336 lst_337 lst_338)"
+"(lambda(fold-var_197 lst_335 lst_336 lst_337)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_336)"
-"(if(pair? lst_337)(pair? lst_338) #f)"
+"(if(if(pair? lst_335)"
+"(if(pair? lst_336)(pair? lst_337) #f)"
 " #f)"
-"(let-values(((formals_8)(unsafe-car lst_336))"
-"((rest_198)(unsafe-cdr lst_336))"
-"((body_17)(unsafe-car lst_337))"
-"((rest_199)(unsafe-cdr lst_337))"
-"((clause_3)(unsafe-car lst_338))"
-"((rest_200)(unsafe-cdr lst_338)))"
-"(let-values(((fold-var_311)"
-"(let-values(((fold-var_312) fold-var_197))"
+"(let-values(((formals_8)(unsafe-car lst_335))"
+"((rest_199)(unsafe-cdr lst_335))"
+"((body_17)(unsafe-car lst_336))"
+"((rest_200)(unsafe-cdr lst_336))"
+"((clause_3)(unsafe-car lst_337))"
+"((rest_201)(unsafe-cdr lst_337)))"
 "(let-values(((fold-var_313)"
+"(let-values(((fold-var_314) fold-var_197))"
+"(let-values(((fold-var_315)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_89)"
+"(let-values(((obs_90)"
 "(expand-context-observer"
 " ctx_83)))"
-"(if obs_89"
+"(if obs_90"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_89"
+" obs_90"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -63949,7 +63971,7 @@ static const char *startup_source =
 "(let-values(((exp-formals_0"
 " exp-body_3)"
 "(lambda-clause-expander"
-" s_453"
+" s_454"
 " disarmed-s_7"
 " formals_8"
 " body_17"
@@ -63970,11 +63992,11 @@ static const char *startup_source =
 " #t"
 " rebuild-clause97_0"
 " temp98_4)))))))"
-" fold-var_312))))"
-"(values fold-var_313)))))"
+" fold-var_314))))"
+"(values fold-var_315)))))"
 "(if(not #f)"
-"(for-loop_31 fold-var_311 rest_198 rest_199 rest_200)"
-" fold-var_311)))"
+"(for-loop_31 fold-var_313 rest_199 rest_200 rest_201)"
+" fold-var_313)))"
 " fold-var_197)))))"
 " for-loop_31)"
 " null"
@@ -64073,19 +64095,19 @@ static const char *startup_source =
 " id:val104_1"
 " val-rhs105_1"
 " body106_1)"
-"(let-values(((s_429)"
+"(let-values(((s_530)"
 "(if(syntax?$1 s_128)"
 "(syntax-e$1 s_128)"
 " s_128)))"
-"(if(pair? s_429)"
+"(if(pair? s_530)"
 "(let-values(((letrec-syntaxes+values107_0)"
-"(let-values(((s_530)(car s_429))) s_530))"
+"(let-values(((s_531)(car s_530))) s_531))"
 "((id:trans108_0"
 " trans-rhs109_0"
 " id:val110_0"
 " val-rhs111_0"
 " body112_0)"
-"(let-values(((s_230)(cdr s_429)))"
+"(let-values(((s_230)(cdr s_530)))"
 "(let-values(((s_231)"
 "(if(syntax?$1 s_230)"
 "(syntax-e$1 s_230)"
@@ -64115,7 +64137,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans_0"
 " trans-rhs_0)"
-"(let-values(((lst_339)"
+"(let-values(((lst_338)"
 " flat-s_33))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64123,21 +64145,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_339)))"
-"((letrec-values(((for-loop_295)"
+" lst_338)))"
+"((letrec-values(((for-loop_291)"
 "(lambda(id:trans_1"
 " trans-rhs_1"
-" lst_340)"
+" lst_339)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_340)"
+" lst_339)"
 "(let-values(((s_334)"
 "(unsafe-car"
-" lst_340))"
-"((rest_201)"
+" lst_339))"
+"((rest_202)"
 "(unsafe-cdr"
-" lst_340)))"
+" lst_339)))"
 "(let-values(((id:trans_2"
 " trans-rhs_2)"
 "(let-values(((id:trans_3)"
@@ -64150,18 +64172,18 @@ static const char *startup_source =
 "(let-values(((id:trans144_0"
 " trans-rhs145_0)"
 "(let-values()"
-"(let-values(((s_531)"
+"(let-values(((s_532)"
 "(if(syntax?$1"
 " s_334)"
 "(syntax-e$1"
 " s_334)"
 " s_334)))"
 "(if(pair?"
-" s_531)"
+" s_532)"
 "(let-values(((id:trans118_0)"
 "(let-values(((s_340)"
 "(car"
-" s_531)))"
+" s_532)))"
 "(let-values(((s_341)"
 "(if(syntax?$1"
 " s_340)"
@@ -64180,7 +64202,7 @@ static const char *startup_source =
 " orig-s_44))"
 "(let-values()"
 "(let-values(((id:trans_5)"
-"(let-values(((lst_341)"
+"(let-values(((lst_340)"
 " flat-s_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64188,18 +64210,18 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_341)))"
-"((letrec-values(((for-loop_296)"
+" lst_340)))"
+"((letrec-values(((for-loop_292)"
 "(lambda(id:trans_6"
 " lst_216)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_216)"
-"(let-values(((s_532)"
+"(let-values(((s_533)"
 "(unsafe-car"
 " lst_216))"
-"((rest_202)"
+"((rest_203)"
 "(unsafe-cdr"
 " lst_216)))"
 "(let-values(((id:trans_7)"
@@ -64209,23 +64231,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:trans146_0)"
 "(let-values()"
-"(if(let-values(((or-part_342)"
+"(if(let-values(((or-part_341)"
 "(if(syntax?$1"
-" s_532)"
+" s_533)"
 "(symbol?"
 "(syntax-e$1"
-" s_532))"
+" s_533))"
 " #f)))"
-"(if or-part_342"
-" or-part_342"
+"(if or-part_341"
+" or-part_341"
 "(symbol?"
-" s_532)))"
-" s_532"
+" s_533)))"
+" s_533"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                 \"not an identifier\""
 " orig-s_44"
-" s_532)))))"
+" s_533)))))"
 "(cons"
 " id:trans146_0"
 " id:trans_8)))))"
@@ -64233,37 +64255,37 @@ static const char *startup_source =
 " id:trans_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_296"
+"(for-loop_292"
 " id:trans_7"
-" rest_202)"
+" rest_203)"
 " id:trans_7)))"
 " id:trans_6)))))"
-" for-loop_296)"
+" for-loop_292)"
 " null"
-" lst_341)))))"
+" lst_340)))))"
 "(reverse$1"
 " id:trans_5))))))))"
 "((trans-rhs119_0)"
 "(let-values(((s_242)"
 "(cdr"
-" s_531)))"
-"(let-values(((s_533)"
+" s_532)))"
+"(let-values(((s_534)"
 "(if(syntax?$1"
 " s_242)"
 "(syntax-e$1"
 " s_242)"
 " s_242)))"
 "(if(pair?"
-" s_533)"
+" s_534)"
 "(let-values(((trans-rhs120_0)"
 "(let-values(((s_243)"
 "(car"
-" s_533)))"
+" s_534)))"
 " s_243))"
 "(()"
 "(let-values(((s_244)"
 "(cdr"
-" s_533)))"
+" s_534)))"
 "(let-values(((s_245)"
 "(if(syntax?$1"
 " s_244)"
@@ -64302,20 +64324,20 @@ static const char *startup_source =
 " trans-rhs_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_295"
+"(for-loop_291"
 " id:trans_2"
 " trans-rhs_2"
-" rest_201)"
+" rest_202)"
 "(values"
 " id:trans_2"
 " trans-rhs_2))))"
 "(values"
 " id:trans_1"
 " trans-rhs_1))))))"
-" for-loop_295)"
+" for-loop_291)"
 " null"
 " null"
-" lst_339)))))"
+" lst_338)))))"
 "(values"
 "(reverse$1"
 " id:trans_0)"
@@ -64324,27 +64346,27 @@ static const char *startup_source =
 "((id:val115_0"
 " val-rhs116_0"
 " body117_0)"
-"(let-values(((s_534)"
+"(let-values(((s_535)"
 "(cdr"
 " s_231)))"
 "(let-values(((s_347)"
 "(if(syntax?$1"
-" s_534)"
-"(syntax-e$1"
-" s_534)"
-" s_534)))"
-"(if(pair? s_347)"
-"(let-values(((id:val121_0"
-" val-rhs122_0)"
-"(let-values(((s_535)"
-"(car"
-" s_347)))"
-"(let-values(((s_246)"
-"(if(syntax?$1"
 " s_535)"
 "(syntax-e$1"
 " s_535)"
 " s_535)))"
+"(if(pair? s_347)"
+"(let-values(((id:val121_0"
+" val-rhs122_0)"
+"(let-values(((s_536)"
+"(car"
+" s_347)))"
+"(let-values(((s_246)"
+"(if(syntax?$1"
+" s_536)"
+"(syntax-e$1"
+" s_536)"
+" s_536)))"
 "(let-values(((flat-s_35)"
 "(to-syntax-list.1"
 " s_246)))"
@@ -64358,7 +64380,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val_0"
 " val-rhs_1)"
-"(let-values(((lst_342)"
+"(let-values(((lst_341)"
 " flat-s_35))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64366,21 +64388,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_342)))"
-"((letrec-values(((for-loop_297)"
+" lst_341)))"
+"((letrec-values(((for-loop_293)"
 "(lambda(id:val_1"
 " val-rhs_2"
-" lst_343)"
+" lst_342)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_343)"
-"(let-values(((s_536)"
+" lst_342)"
+"(let-values(((s_537)"
 "(unsafe-car"
-" lst_343))"
-"((rest_203)"
+" lst_342))"
+"((rest_204)"
 "(unsafe-cdr"
-" lst_343)))"
+" lst_342)))"
 "(let-values(((id:val_2"
 " val-rhs_3)"
 "(let-values(((id:val_3)"
@@ -64393,19 +64415,19 @@ static const char *startup_source =
 "(let-values(((id:val147_0"
 " val-rhs148_0)"
 "(let-values()"
-"(let-values(((s_537)"
+"(let-values(((s_538)"
 "(if(syntax?$1"
-" s_536)"
-"(syntax-e$1"
-" s_536)"
-" s_536)))"
-"(if(pair?"
 " s_537)"
+"(syntax-e$1"
+" s_537)"
+" s_537)))"
+"(if(pair?"
+" s_538)"
 "(let-values(((id:val124_0)"
 "(let-values(((s_473)"
 "(car"
-" s_537)))"
-"(let-values(((s_538)"
+" s_538)))"
+"(let-values(((s_539)"
 "(if(syntax?$1"
 " s_473)"
 "(syntax-e$1"
@@ -64413,7 +64435,7 @@ static const char *startup_source =
 " s_473)))"
 "(let-values(((flat-s_36)"
 "(to-syntax-list.1"
-" s_538)))"
+" s_539)))"
 "(if(not"
 " flat-s_36)"
 "(let-values()"
@@ -64423,7 +64445,7 @@ static const char *startup_source =
 " orig-s_44))"
 "(let-values()"
 "(let-values(((id:val_5)"
-"(let-values(((lst_344)"
+"(let-values(((lst_343)"
 " flat-s_36))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64431,15 +64453,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_344)))"
-"((letrec-values(((for-loop_298)"
+" lst_343)))"
+"((letrec-values(((for-loop_294)"
 "(lambda(id:val_6"
 " lst_123)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_123)"
-"(let-values(((s_539)"
+"(let-values(((s_540)"
 "(unsafe-car"
 " lst_123))"
 "((rest_62)"
@@ -64452,23 +64474,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val149_0)"
 "(let-values()"
-"(if(let-values(((or-part_381)"
+"(if(let-values(((or-part_379)"
 "(if(syntax?$1"
-" s_539)"
+" s_540)"
 "(symbol?"
 "(syntax-e$1"
-" s_539))"
+" s_540))"
 " #f)))"
-"(if or-part_381"
-" or-part_381"
+"(if or-part_379"
+" or-part_379"
 "(symbol?"
-" s_539)))"
-" s_539"
+" s_540)))"
+" s_540"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                     \"not an identifier\""
 " orig-s_44"
-" s_539)))))"
+" s_540)))))"
 "(cons"
 " id:val149_0"
 " id:val_8)))))"
@@ -64476,20 +64498,20 @@ static const char *startup_source =
 " id:val_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_298"
+"(for-loop_294"
 " id:val_7"
 " rest_62)"
 " id:val_7)))"
 " id:val_6)))))"
-" for-loop_298)"
+" for-loop_294)"
 " null"
-" lst_344)))))"
+" lst_343)))))"
 "(reverse$1"
 " id:val_5))))))))"
 "((val-rhs125_0)"
 "(let-values(((s_353)"
 "(cdr"
-" s_537)))"
+" s_538)))"
 "(let-values(((s_248)"
 "(if(syntax?$1"
 " s_353)"
@@ -64504,15 +64526,15 @@ static const char *startup_source =
 " s_248)))"
 " s_355))"
 "(()"
-"(let-values(((s_540)"
+"(let-values(((s_541)"
 "(cdr"
 " s_248)))"
 "(let-values(((s_356)"
 "(if(syntax?$1"
-" s_540)"
+" s_541)"
 "(syntax-e$1"
-" s_540)"
-" s_540)))"
+" s_541)"
+" s_541)))"
 "(if(null?"
 " s_356)"
 "(values)"
@@ -64545,20 +64567,20 @@ static const char *startup_source =
 " val-rhs_5)))))"
 "(if(not"
 " #f)"
-"(for-loop_297"
+"(for-loop_293"
 " id:val_2"
 " val-rhs_3"
-" rest_203)"
+" rest_204)"
 "(values"
 " id:val_2"
 " val-rhs_3))))"
 "(values"
 " id:val_1"
 " val-rhs_2))))))"
-" for-loop_297)"
+" for-loop_293)"
 " null"
 " null"
-" lst_342)))))"
+" lst_341)))))"
 "(values"
 "(reverse$1"
 " id:val_0)"
@@ -64642,23 +64664,23 @@ static const char *startup_source =
 "(let-values(((s_257)(car s_254)))"
 " s_257))"
 "((id:val132_0 val-rhs133_0 body134_0)"
-"(let-values(((s_541)(cdr s_254)))"
-"(let-values(((s_542)"
-"(if(syntax?$1 s_541)"
-"(syntax-e$1 s_541)"
-" s_541)))"
-"(if(pair? s_542)"
+"(let-values(((s_542)(cdr s_254)))"
+"(let-values(((s_543)"
+"(if(syntax?$1 s_542)"
+"(syntax-e$1 s_542)"
+" s_542)))"
+"(if(pair? s_543)"
 "(let-values(((id:val135_0"
 " val-rhs136_0)"
-"(let-values(((s_543)"
+"(let-values(((s_544)"
 "(car"
-" s_542)))"
+" s_543)))"
 "(let-values(((s_258)"
 "(if(syntax?$1"
-" s_543)"
+" s_544)"
 "(syntax-e$1"
-" s_543)"
-" s_543)))"
+" s_544)"
+" s_544)))"
 "(let-values(((flat-s_38)"
 "(to-syntax-list.1"
 " s_258)))"
@@ -64672,7 +64694,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val_10"
 " val-rhs_6)"
-"(let-values(((lst_306)"
+"(let-values(((lst_305)"
 " flat-s_38))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64680,21 +64702,21 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_306)))"
-"((letrec-values(((for-loop_299)"
+" lst_305)))"
+"((letrec-values(((for-loop_295)"
 "(lambda(id:val_11"
 " val-rhs_7"
-" lst_345)"
+" lst_344)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_345)"
-"(let-values(((s_544)"
+" lst_344)"
+"(let-values(((s_545)"
 "(unsafe-car"
-" lst_345))"
-"((rest_204)"
+" lst_344))"
+"((rest_205)"
 "(unsafe-cdr"
-" lst_345)))"
+" lst_344)))"
 "(let-values(((id:val_12"
 " val-rhs_8)"
 "(let-values(((id:val_13)"
@@ -64709,25 +64731,25 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((s_372)"
 "(if(syntax?$1"
-" s_544)"
-"(syntax-e$1"
-" s_544)"
-" s_544)))"
-"(if(pair?"
-" s_372)"
-"(let-values(((id:val138_0)"
-"(let-values(((s_545)"
-"(car"
-" s_372)))"
-"(let-values(((s_546)"
-"(if(syntax?$1"
 " s_545)"
 "(syntax-e$1"
 " s_545)"
 " s_545)))"
+"(if(pair?"
+" s_372)"
+"(let-values(((id:val138_0)"
+"(let-values(((s_546)"
+"(car"
+" s_372)))"
+"(let-values(((s_547)"
+"(if(syntax?$1"
+" s_546)"
+"(syntax-e$1"
+" s_546)"
+" s_546)))"
 "(let-values(((flat-s_39)"
 "(to-syntax-list.1"
-" s_546)))"
+" s_547)))"
 "(if(not"
 " flat-s_39)"
 "(let-values()"
@@ -64737,7 +64759,7 @@ static const char *startup_source =
 " orig-s_45))"
 "(let-values()"
 "(let-values(((id:val_15)"
-"(let-values(((lst_346)"
+"(let-values(((lst_345)"
 " flat-s_39))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64745,20 +64767,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_346)))"
-"((letrec-values(((for-loop_300)"
+" lst_345)))"
+"((letrec-values(((for-loop_296)"
 "(lambda(id:val_16"
-" lst_347)"
+" lst_346)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_347)"
-"(let-values(((s_547)"
+" lst_346)"
+"(let-values(((s_548)"
 "(unsafe-car"
-" lst_347))"
-"((rest_205)"
+" lst_346))"
+"((rest_206)"
 "(unsafe-cdr"
-" lst_347)))"
+" lst_346)))"
 "(let-values(((id:val_17)"
 "(let-values(((id:val_18)"
 " id:val_16))"
@@ -64766,23 +64788,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val152_0)"
 "(let-values()"
-"(if(let-values(((or-part_382)"
+"(if(let-values(((or-part_380)"
 "(if(syntax?$1"
-" s_547)"
+" s_548)"
 "(symbol?"
 "(syntax-e$1"
-" s_547))"
+" s_548))"
 " #f)))"
-"(if or-part_382"
-" or-part_382"
+"(if or-part_380"
+" or-part_380"
 "(symbol?"
-" s_547)))"
-" s_547"
+" s_548)))"
+" s_548"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                   \"not an identifier\""
 " orig-s_45"
-" s_547)))))"
+" s_548)))))"
 "(cons"
 " id:val152_0"
 " id:val_18)))))"
@@ -64790,14 +64812,14 @@ static const char *startup_source =
 " id:val_19)))))"
 "(if(not"
 " #f)"
-"(for-loop_300"
+"(for-loop_296"
 " id:val_17"
-" rest_205)"
+" rest_206)"
 " id:val_17)))"
 " id:val_16)))))"
-" for-loop_300)"
+" for-loop_296)"
 " null"
-" lst_346)))))"
+" lst_345)))))"
 "(reverse$1"
 " id:val_15))))))))"
 "((val-rhs139_0)"
@@ -64813,22 +64835,22 @@ static const char *startup_source =
 "(if(pair?"
 " s_260)"
 "(let-values(((val-rhs140_0)"
-"(let-values(((s_548)"
+"(let-values(((s_549)"
 "(car"
 " s_260)))"
-" s_548))"
+" s_549))"
 "(()"
-"(let-values(((s_549)"
+"(let-values(((s_550)"
 "(cdr"
 " s_260)))"
-"(let-values(((s_550)"
+"(let-values(((s_551)"
 "(if(syntax?$1"
-" s_549)"
-"(syntax-e$1"
-" s_549)"
-" s_549)))"
-"(if(null?"
 " s_550)"
+"(syntax-e$1"
+" s_550)"
+" s_550)))"
+"(if(null?"
+" s_551)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -64859,20 +64881,20 @@ static const char *startup_source =
 " val-rhs_10)))))"
 "(if(not"
 " #f)"
-"(for-loop_299"
+"(for-loop_295"
 " id:val_12"
 " val-rhs_8"
-" rest_204)"
+" rest_205)"
 "(values"
 " id:val_12"
 " val-rhs_8))))"
 "(values"
 " id:val_11"
 " val-rhs_7))))))"
-" for-loop_299)"
+" for-loop_295)"
 " null"
 " null"
-" lst_306)))))"
+" lst_305)))))"
 "(values"
 "(reverse$1"
 " id:val_10)"
@@ -64881,7 +64903,7 @@ static const char *startup_source =
 "((body137_0)"
 "(let-values(((s_261)"
 "(cdr"
-" s_542)))"
+" s_543)))"
 "(let-values(((s_262)"
 "(if(syntax?$1"
 " s_261)"
@@ -64928,29 +64950,108 @@ static const char *startup_source =
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
-"(let-values(((lst_348)(if syntaxes?_0 id:trans102_0 null)))"
+"(let-values(((lst_347)(if syntaxes?_0 id:trans102_0 null)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_348)))"
-"((letrec-values(((for-loop_301)"
-"(lambda(fold-var_314 lst_349)"
+"(let-values()(check-list lst_347)))"
+"((letrec-values(((for-loop_297)"
+"(lambda(fold-var_316 lst_348)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_349)"
-"(let-values(((ids_37)"
-"(unsafe-car lst_349))"
-"((rest_206)"
-"(unsafe-cdr lst_349)))"
+"(if(pair? lst_348)"
+"(let-values(((ids_36)"
+"(unsafe-car lst_348))"
+"((rest_207)"
+"(unsafe-cdr lst_348)))"
 "(let-values(((fold-var_113)"
 "(let-values(((fold-var_114)"
-" fold-var_314))"
+" fold-var_316))"
 "(let-values(((fold-var_115)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_350)"
+"(let-values(((lst_349)"
+" ids_36))"
+"(begin"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
+" lst_349)))"
+"((letrec-values(((for-loop_298)"
+"(lambda(fold-var_317"
+" lst_350)"
+"(begin"
+" 'for-loop"
+"(if(pair?"
+" lst_350)"
+"(let-values(((id_116)"
+"(unsafe-car"
+" lst_350))"
+"((rest_208)"
+"(unsafe-cdr"
+" lst_350)))"
+"(let-values(((fold-var_318)"
+"(let-values(((fold-var_319)"
+" fold-var_317))"
+"(let-values(((fold-var_320)"
+"(let-values()"
+"(cons"
+"(let-values()"
+"(add-scope"
+" id_116"
+" sc_39))"
+" fold-var_319))))"
+"(values"
+" fold-var_320)))))"
+"(if(not"
+" #f)"
+"(for-loop_298"
+" fold-var_318"
+" rest_208)"
+" fold-var_318)))"
+" fold-var_317)))))"
+" for-loop_298)"
+" null"
+" lst_349)))))"
+" fold-var_114))))"
+"(values"
+" fold-var_115)))))"
+"(if(not #f)"
+"(for-loop_297 fold-var_113 rest_207)"
+" fold-var_113)))"
+" fold-var_316)))))"
+" for-loop_297)"
+" null"
+" lst_347))))))"
+"(let-values(((val-idss_3)"
+"(reverse$1"
+"(let-values(((lst_351)(if syntaxes?_0 id:val104_0 id:val128_0)))"
+"(begin"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_351)))"
+"((letrec-values(((for-loop_299)"
+"(lambda(fold-var_321 lst_352)"
+"(begin"
+" 'for-loop"
+"(if(pair? lst_352)"
+"(let-values(((ids_37)"
+"(unsafe-car lst_352))"
+"((rest_209)"
+"(unsafe-cdr lst_352)))"
+"(let-values(((fold-var_322)"
+"(let-values(((fold-var_323)"
+" fold-var_321))"
+"(let-values(((fold-var_324)"
+"(let-values()"
+"(cons"
+"(let-values()"
+"(reverse$1"
+"(let-values(((lst_353)"
 " ids_37))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -64958,174 +65059,95 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_350)))"
-"((letrec-values(((for-loop_302)"
-"(lambda(fold-var_315"
-" lst_351)"
+" lst_353)))"
+"((letrec-values(((for-loop_300)"
+"(lambda(fold-var_325"
+" lst_354)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_351)"
-"(let-values(((id_116)"
-"(unsafe-car"
-" lst_351))"
-"((rest_207)"
-"(unsafe-cdr"
-" lst_351)))"
-"(let-values(((fold-var_316)"
-"(let-values(((fold-var_317)"
-" fold-var_315))"
-"(let-values(((fold-var_318)"
-"(let-values()"
-"(cons"
-"(let-values()"
-"(add-scope"
-" id_116"
-" sc_39))"
-" fold-var_317))))"
-"(values"
-" fold-var_318)))))"
-"(if(not"
-" #f)"
-"(for-loop_302"
-" fold-var_316"
-" rest_207)"
-" fold-var_316)))"
-" fold-var_315)))))"
-" for-loop_302)"
-" null"
-" lst_350)))))"
-" fold-var_114))))"
-"(values"
-" fold-var_115)))))"
-"(if(not #f)"
-"(for-loop_301 fold-var_113 rest_206)"
-" fold-var_113)))"
-" fold-var_314)))))"
-" for-loop_301)"
-" null"
-" lst_348))))))"
-"(let-values(((val-idss_3)"
-"(reverse$1"
-"(let-values(((lst_352)(if syntaxes?_0 id:val104_0 id:val128_0)))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_352)))"
-"((letrec-values(((for-loop_303)"
-"(lambda(fold-var_319 lst_353)"
-"(begin"
-" 'for-loop"
-"(if(pair? lst_353)"
-"(let-values(((ids_38)"
-"(unsafe-car lst_353))"
-"((rest_208)"
-"(unsafe-cdr lst_353)))"
-"(let-values(((fold-var_320)"
-"(let-values(((fold-var_321)"
-" fold-var_319))"
-"(let-values(((fold-var_322)"
-"(let-values()"
-"(cons"
-"(let-values()"
-"(reverse$1"
-"(let-values(((lst_354)"
-" ids_38))"
-"(begin"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_354)))"
-"((letrec-values(((for-loop_304)"
-"(lambda(fold-var_323"
-" lst_355)"
-"(begin"
-" 'for-loop"
-"(if(pair?"
-" lst_355)"
+" lst_354)"
 "(let-values(((id_117)"
 "(unsafe-car"
-" lst_355))"
-"((rest_209)"
+" lst_354))"
+"((rest_210)"
 "(unsafe-cdr"
-" lst_355)))"
-"(let-values(((fold-var_324)"
-"(let-values(((fold-var_325)"
-" fold-var_323))"
+" lst_354)))"
 "(let-values(((fold-var_326)"
+"(let-values(((fold-var_327)"
+" fold-var_325))"
+"(let-values(((fold-var_328)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
 " id_117"
 " sc_39))"
-" fold-var_325))))"
+" fold-var_327))))"
 "(values"
-" fold-var_326)))))"
+" fold-var_328)))))"
 "(if(not"
 " #f)"
-"(for-loop_304"
-" fold-var_324"
-" rest_209)"
-" fold-var_324)))"
-" fold-var_323)))))"
-" for-loop_304)"
+"(for-loop_300"
+" fold-var_326"
+" rest_210)"
+" fold-var_326)))"
+" fold-var_325)))))"
+" for-loop_300)"
 " null"
-" lst_354)))))"
-" fold-var_321))))"
+" lst_353)))))"
+" fold-var_323))))"
 "(values"
-" fold-var_322)))))"
+" fold-var_324)))))"
 "(if(not #f)"
-"(for-loop_303"
-" fold-var_320"
-" rest_208)"
-" fold-var_320)))"
-" fold-var_319)))))"
-" for-loop_303)"
+"(for-loop_299"
+" fold-var_322"
+" rest_209)"
+" fold-var_322)))"
+" fold-var_321)))))"
+" for-loop_299)"
 " null"
-" lst_352))))))"
+" lst_351))))))"
 "(let-values(((val-rhss_3)"
 "(if rec?_1"
 "(reverse$1"
-"(let-values(((lst_356)"
+"(let-values(((lst_355)"
 "(if syntaxes?_0 val-rhs105_0 val-rhs129_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_356)))"
-"((letrec-values(((for-loop_305)"
-"(lambda(fold-var_327 lst_357)"
+"(let-values()(check-list lst_355)))"
+"((letrec-values(((for-loop_301)"
+"(lambda(fold-var_329 lst_356)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_357)"
+"(if(pair? lst_356)"
 "(let-values(((rhs_20)"
-"(unsafe-car lst_357))"
-"((rest_210)"
-"(unsafe-cdr lst_357)))"
-"(let-values(((fold-var_328)"
-"(let-values(((fold-var_329)"
-" fold-var_327))"
+"(unsafe-car lst_356))"
+"((rest_211)"
+"(unsafe-cdr lst_356)))"
 "(let-values(((fold-var_330)"
+"(let-values(((fold-var_331)"
+" fold-var_329))"
+"(let-values(((fold-var_332)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
 " rhs_20"
 " sc_39))"
-" fold-var_329))))"
+" fold-var_331))))"
 "(values"
-" fold-var_330)))))"
+" fold-var_332)))))"
 "(if(not #f)"
-"(for-loop_305"
-" fold-var_328"
-" rest_210)"
-" fold-var_328)))"
-" fold-var_327)))))"
-" for-loop_305)"
+"(for-loop_301"
+" fold-var_330"
+" rest_211)"
+" fold-var_330)))"
+" fold-var_329)))))"
+" for-loop_301)"
 " null"
-" lst_356))))"
+" lst_355))))"
 "(if syntaxes?_0 val-rhs105_0 val-rhs129_0))))"
 "(let-values(((val-clauses_0)"
 "(if syntaxes?_0"
@@ -65137,63 +65159,63 @@ static const char *startup_source =
 " _154_1"
 " clause155_1"
 " _156_1)"
-"(let-values(((s_551)"
+"(let-values(((s_552)"
 "(if(syntax?$1"
 " s_142)"
 "(syntax-e$1"
 " s_142)"
 " s_142)))"
-"(if(pair? s_551)"
+"(if(pair? s_552)"
 "(let-values(((_157_0)"
-"(let-values(((s_552)"
+"(let-values(((s_553)"
 "(car"
-" s_551)))"
-" s_552))"
+" s_552)))"
+" s_553))"
 "((_158_0"
 " clause159_0"
 " _160_0)"
-"(let-values(((s_553)"
-"(cdr"
-" s_551)))"
 "(let-values(((s_554)"
-"(if(syntax?$1"
-" s_553)"
-"(syntax-e$1"
-" s_553)"
-" s_553)))"
-"(if(pair?"
-" s_554)"
-"(let-values(((_161_0)"
+"(cdr"
+" s_552)))"
 "(let-values(((s_555)"
-"(car"
+"(if(syntax?$1"
+" s_554)"
+"(syntax-e$1"
+" s_554)"
 " s_554)))"
-" s_555))"
+"(if(pair?"
+" s_555)"
+"(let-values(((_161_0)"
+"(let-values(((s_556)"
+"(car"
+" s_555)))"
+" s_556))"
 "((clause162_0"
 " _163_0)"
-"(let-values(((s_556)"
-"(cdr"
-" s_554)))"
 "(let-values(((s_557)"
-"(if(syntax?$1"
-" s_556)"
-"(syntax-e$1"
-" s_556)"
-" s_556)))"
-"(if(pair?"
-" s_557)"
-"(let-values(((clause164_0)"
+"(cdr"
+" s_555)))"
 "(let-values(((s_558)"
-"(car"
-" s_557)))"
-"(let-values(((s_559)"
 "(if(syntax?$1"
-" s_558)"
+" s_557)"
 "(syntax-e$1"
+" s_557)"
+" s_557)))"
+"(if(pair?"
 " s_558)"
+"(let-values(((clause164_0)"
+"(let-values(((s_559)"
+"(car"
 " s_558)))"
+"(let-values(((s_560)"
+"(if(syntax?$1"
+" s_559)"
+"(syntax-e$1"
+" s_559)"
+" s_559)))"
 "(let-values(((flat-s_41)"
 "(to-syntax-list.1"
-" s_559)))"
+" s_560)))"
 "(if(not"
 " flat-s_41)"
 "(let-values()"
@@ -65204,10 +65226,10 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_41))))))"
 "((_165_0)"
-"(let-values(((s_560)"
+"(let-values(((s_561)"
 "(cdr"
-" s_557)))"
-" s_560)))"
+" s_558)))"
+" s_561)))"
 "(values"
 " clause164_0"
 " _165_0))"
@@ -65244,44 +65266,44 @@ static const char *startup_source =
 "(let-values(((s_145) disarmed-s_8))"
 "(let-values(((orig-s_47) s_145))"
 "(let-values(((_166_1 clause167_1 _168_1)"
-"(let-values(((s_561)"
+"(let-values(((s_562)"
 "(if(syntax?$1"
 " s_145)"
 "(syntax-e$1"
 " s_145)"
 " s_145)))"
-"(if(pair? s_561)"
+"(if(pair? s_562)"
 "(let-values(((_169_0)"
-"(let-values(((s_562)"
+"(let-values(((s_563)"
 "(car"
-" s_561)))"
-" s_562))"
+" s_562)))"
+" s_563))"
 "((clause170_0"
 " _171_0)"
-"(let-values(((s_563)"
-"(cdr"
-" s_561)))"
 "(let-values(((s_564)"
-"(if(syntax?$1"
-" s_563)"
-"(syntax-e$1"
-" s_563)"
-" s_563)))"
-"(if(pair?"
-" s_564)"
-"(let-values(((clause172_0)"
+"(cdr"
+" s_562)))"
 "(let-values(((s_565)"
-"(car"
-" s_564)))"
-"(let-values(((s_566)"
 "(if(syntax?$1"
-" s_565)"
+" s_564)"
 "(syntax-e$1"
+" s_564)"
+" s_564)))"
+"(if(pair?"
 " s_565)"
+"(let-values(((clause172_0)"
+"(let-values(((s_566)"
+"(car"
 " s_565)))"
+"(let-values(((s_567)"
+"(if(syntax?$1"
+" s_566)"
+"(syntax-e$1"
+" s_566)"
+" s_566)))"
 "(let-values(((flat-s_42)"
 "(to-syntax-list.1"
-" s_566)))"
+" s_567)))"
 "(if(not"
 " flat-s_42)"
 "(let-values()"
@@ -65292,10 +65314,10 @@ static const char *startup_source =
 "(let-values()"
 " flat-s_42))))))"
 "((_173_0)"
-"(let-values(((s_567)"
+"(let-values(((s_568)"
 "(cdr"
-" s_564)))"
-" s_567)))"
+" s_565)))"
+" s_568)))"
 "(values"
 " clause172_0"
 " _173_0))"
@@ -65328,57 +65350,57 @@ static const char *startup_source =
 "(let-values(((counter_8)(root-expand-context-counter ctx_84)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
-"(let-values(((lst_358) trans-idss_2))"
+"(let-values(((lst_357) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_358)))"
-"((letrec-values(((for-loop_306)"
-"(lambda(fold-var_331 lst_359)"
+"(let-values()(check-list lst_357)))"
+"((letrec-values(((for-loop_302)"
+"(lambda(fold-var_333 lst_358)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_359)"
-"(let-values(((ids_39)"
+"(if(pair? lst_358)"
+"(let-values(((ids_38)"
 "(unsafe-car"
-" lst_359))"
-"((rest_211)"
+" lst_358))"
+"((rest_212)"
 "(unsafe-cdr"
-" lst_359)))"
-"(let-values(((fold-var_332)"
-"(let-values(((fold-var_333)"
-" fold-var_331))"
+" lst_358)))"
 "(let-values(((fold-var_334)"
+"(let-values(((fold-var_335)"
+" fold-var_333))"
+"(let-values(((fold-var_336)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_360)"
-" ids_39))"
+"(let-values(((lst_359)"
+" ids_38))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_360)))"
-"((letrec-values(((for-loop_307)"
-"(lambda(fold-var_335"
-" lst_361)"
+" lst_359)))"
+"((letrec-values(((for-loop_303)"
+"(lambda(fold-var_337"
+" lst_360)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_361)"
+" lst_360)"
 "(let-values(((id_118)"
 "(unsafe-car"
-" lst_361))"
-"((rest_212)"
+" lst_360))"
+"((rest_213)"
 "(unsafe-cdr"
-" lst_361)))"
-"(let-values(((fold-var_336)"
-"(let-values(((fold-var_337)"
-" fold-var_335))"
+" lst_360)))"
 "(let-values(((fold-var_338)"
+"(let-values(((fold-var_339)"
+" fold-var_337))"
+"(let-values(((fold-var_340)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65398,60 +65420,60 @@ static const char *startup_source =
 " id174_0"
 " phase175_0"
 " counter176_0)))"
-" fold-var_337))))"
+" fold-var_339))))"
 "(values"
-" fold-var_338)))))"
+" fold-var_340)))))"
 "(if(not"
 " #f)"
-"(for-loop_307"
-" fold-var_336"
-" rest_212)"
-" fold-var_336)))"
-" fold-var_335)))))"
-" for-loop_307)"
+"(for-loop_303"
+" fold-var_338"
+" rest_213)"
+" fold-var_338)))"
+" fold-var_337)))))"
+" for-loop_303)"
 " null"
-" lst_360)))))"
-" fold-var_333))))"
+" lst_359)))))"
+" fold-var_335))))"
 "(values"
-" fold-var_334)))))"
+" fold-var_336)))))"
 "(if(not #f)"
-"(for-loop_306"
-" fold-var_332"
-" rest_211)"
-" fold-var_332)))"
-" fold-var_331)))))"
-" for-loop_306)"
+"(for-loop_302"
+" fold-var_334"
+" rest_212)"
+" fold-var_334)))"
+" fold-var_333)))))"
+" for-loop_302)"
 " null"
-" lst_358))))))"
+" lst_357))))))"
 "(let-values(((val-keyss_2)"
 "(reverse$1"
-"(let-values(((lst_362) val-idss_3))"
+"(let-values(((lst_361) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_362)))"
-"((letrec-values(((for-loop_308)"
-"(lambda(fold-var_339 lst_363)"
+"(let-values()(check-list lst_361)))"
+"((letrec-values(((for-loop_304)"
+"(lambda(fold-var_341 lst_362)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_363)"
-"(let-values(((ids_40)"
+"(if(pair? lst_362)"
+"(let-values(((ids_39)"
 "(unsafe-car"
-" lst_363))"
-"((rest_213)"
+" lst_362))"
+"((rest_214)"
 "(unsafe-cdr"
-" lst_363)))"
-"(let-values(((fold-var_340)"
-"(let-values(((fold-var_341)"
-" fold-var_339))"
+" lst_362)))"
+"(let-values(((fold-var_342)"
+"(let-values(((fold-var_343)"
+" fold-var_341))"
 "(let-values(((fold-var_118)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(reverse$1"
 "(let-values(((lst_131)"
-" ids_40))"
+" ids_39))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -65459,23 +65481,23 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_131)))"
-"((letrec-values(((for-loop_309)"
-"(lambda(fold-var_342"
-" lst_364)"
+"((letrec-values(((for-loop_305)"
+"(lambda(fold-var_344"
+" lst_363)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_364)"
+" lst_363)"
 "(let-values(((id_119)"
 "(unsafe-car"
-" lst_364))"
-"((rest_214)"
+" lst_363))"
+"((rest_215)"
 "(unsafe-cdr"
-" lst_364)))"
-"(let-values(((fold-var_343)"
-"(let-values(((fold-var_344)"
-" fold-var_342))"
+" lst_363)))"
 "(let-values(((fold-var_345)"
+"(let-values(((fold-var_346)"
+" fold-var_344))"
+"(let-values(((fold-var_347)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -65495,54 +65517,54 @@ static const char *startup_source =
 " id179_0"
 " phase180_0"
 " counter181_0)))"
-" fold-var_344))))"
+" fold-var_346))))"
 "(values"
-" fold-var_345)))))"
+" fold-var_347)))))"
 "(if(not"
 " #f)"
-"(for-loop_309"
-" fold-var_343"
-" rest_214)"
-" fold-var_343)))"
-" fold-var_342)))))"
-" for-loop_309)"
+"(for-loop_305"
+" fold-var_345"
+" rest_215)"
+" fold-var_345)))"
+" fold-var_344)))))"
+" for-loop_305)"
 " null"
 " lst_131)))))"
-" fold-var_341))))"
+" fold-var_343))))"
 "(values"
 " fold-var_118)))))"
 "(if(not #f)"
-"(for-loop_308"
-" fold-var_340"
-" rest_213)"
-" fold-var_340)))"
-" fold-var_339)))))"
-" for-loop_308)"
+"(for-loop_304"
+" fold-var_342"
+" rest_214)"
+" fold-var_342)))"
+" fold-var_341)))))"
+" for-loop_304)"
 " null"
-" lst_362))))))"
+" lst_361))))))"
 "(let-values(((bodys_10)"
 "(reverse$1"
-"(let-values(((lst_365)"
+"(let-values(((lst_364)"
 "(if syntaxes?_0 body106_0 body130_0)))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_365)))"
-"((letrec-values(((for-loop_310)"
-"(lambda(fold-var_346 lst_366)"
+"(let-values()(check-list lst_364)))"
+"((letrec-values(((for-loop_306)"
+"(lambda(fold-var_348 lst_365)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_366)"
+"(if(pair? lst_365)"
 "(let-values(((body_18)"
 "(unsafe-car"
-" lst_366))"
-"((rest_215)"
+" lst_365))"
+"((rest_216)"
 "(unsafe-cdr"
-" lst_366)))"
+" lst_365)))"
 "(let-values(((fold-var_123)"
-"(let-values(((fold-var_347)"
-" fold-var_346))"
+"(let-values(((fold-var_349)"
+" fold-var_348))"
 "(let-values(((fold-var_48)"
 "(let-values()"
 "(cons"
@@ -65550,26 +65572,26 @@ static const char *startup_source =
 "(add-scope"
 " body_18"
 " sc_39))"
-" fold-var_347))))"
+" fold-var_349))))"
 "(values"
 " fold-var_48)))))"
 "(if(not #f)"
-"(for-loop_310"
+"(for-loop_306"
 " fold-var_123"
-" rest_215)"
+" rest_216)"
 " fold-var_123)))"
-" fold-var_346)))))"
-" for-loop_310)"
+" fold-var_348)))))"
+" for-loop_306)"
 " null"
-" lst_365))))))"
+" lst_364))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_90)"
+"(let-values(((obs_91)"
 "(expand-context-observer ctx_84)))"
-"(if obs_90"
+"(if obs_91"
 "(let-values()"
 "(log-let-renames"
-" obs_90"
+" obs_91"
 " renames-log-tag_0"
 " val-idss_3"
 " val-rhss_3"
@@ -65584,14 +65606,14 @@ static const char *startup_source =
 "(if syntaxes?_0"
 "(let-values()"
 "(begin"
-"(let-values(((obs_91)"
+"(let-values(((obs_92)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_91"
+"(if obs_92"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_91"
+" obs_92"
 " 'prepare-env)))"
 "(void)))"
 "(prepare-next-phase-namespace ctx_84)))"
@@ -65603,7 +65625,7 @@ static const char *startup_source =
 "(if syntaxes?_0"
 " trans-rhs103_0"
 " '()))"
-"((lst_367) trans-idss_2))"
+"((lst_366) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -65612,49 +65634,49 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_367)))"
-"((letrec-values(((for-loop_311)"
-"(lambda(fold-var_348"
-" lst_368"
-" lst_369)"
+"(let-values()(check-list lst_366)))"
+"((letrec-values(((for-loop_307)"
+"(lambda(fold-var_350"
+" lst_367"
+" lst_368)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_368)"
-"(pair? lst_369)"
+"(if(if(pair? lst_367)"
+"(pair? lst_368)"
 " #f)"
 "(let-values(((rhs_21)"
 "(unsafe-car"
-" lst_368))"
-"((rest_216)"
-"(unsafe-cdr"
-" lst_368))"
-"((ids_41)"
-"(unsafe-car"
-" lst_369))"
+" lst_367))"
 "((rest_217)"
 "(unsafe-cdr"
-" lst_369)))"
-"(let-values(((fold-var_349)"
-"(let-values(((fold-var_350)"
-" fold-var_348))"
+" lst_367))"
+"((ids_40)"
+"(unsafe-car"
+" lst_368))"
+"((rest_218)"
+"(unsafe-cdr"
+" lst_368)))"
 "(let-values(((fold-var_351)"
+"(let-values(((fold-var_352)"
+" fold-var_350))"
+"(let-values(((fold-var_353)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_92)"
+"(let-values(((obs_93)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_92"
+"(if obs_93"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_92"
+" obs_93"
 " 'next)"
 "(call-expand-observe"
-" obs_92"
+" obs_93"
 " 'enter-bind))))"
 "(void)))"
 "(values))))"
@@ -65664,111 +65686,111 @@ static const char *startup_source =
 "(add-scope"
 " rhs_21"
 " sc_39)"
-" ids_41"
+" ids_40"
 " ctx_84)))"
 "(begin"
-"(let-values(((obs_93)"
+"(let-values(((obs_94)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_93"
+"(if obs_94"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_93"
+" obs_94"
 " 'exit-bind)))"
 "(void)))"
 " trans-val_1))))"
-" fold-var_350))))"
+" fold-var_352))))"
 "(values"
-" fold-var_351)))))"
+" fold-var_353)))))"
 "(if(not #f)"
-"(for-loop_311"
-" fold-var_349"
-" rest_216"
-" rest_217)"
-" fold-var_349)))"
-" fold-var_348)))))"
-" for-loop_311)"
+"(for-loop_307"
+" fold-var_351"
+" rest_217"
+" rest_218)"
+" fold-var_351)))"
+" fold-var_350)))))"
+" for-loop_307)"
 " null"
 " lst_63"
-" lst_367))))))"
+" lst_366))))))"
 "(let-values(((rec-val-env_0)"
-"(let-values(((lst_370) val-keyss_2)"
+"(let-values(((lst_369) val-keyss_2)"
 "((lst_135) val-idss_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_370)))"
+"(let-values()(check-list lst_369)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_135)))"
-"((letrec-values(((for-loop_312)"
+"((letrec-values(((for-loop_308)"
 "(lambda(env_29"
-" lst_371"
-" lst_372)"
+" lst_370"
+" lst_371)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_371)"
-"(pair? lst_372)"
+" lst_370)"
+"(pair? lst_371)"
 " #f)"
 "(let-values(((keys_10)"
 "(unsafe-car"
-" lst_371))"
-"((rest_218)"
-"(unsafe-cdr"
-" lst_371))"
-"((ids_42)"
-"(unsafe-car"
-" lst_372))"
+" lst_370))"
 "((rest_219)"
 "(unsafe-cdr"
-" lst_372)))"
+" lst_370))"
+"((ids_41)"
+"(unsafe-car"
+" lst_371))"
+"((rest_220)"
+"(unsafe-cdr"
+" lst_371)))"
 "(let-values(((env_30)"
 "(let-values(((env_31)"
 " env_29))"
-"(let-values(((lst_373)"
+"(let-values(((lst_372)"
 " keys_10)"
-"((lst_374)"
-" ids_42))"
+"((lst_373)"
+" ids_41))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_372)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_373)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_374)))"
-"((letrec-values(((for-loop_313)"
+"((letrec-values(((for-loop_309)"
 "(lambda(env_32"
-" lst_375"
-" lst_376)"
+" lst_374"
+" lst_375)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_375)"
+" lst_374)"
 "(pair?"
-" lst_376)"
+" lst_375)"
 " #f)"
 "(let-values(((key_91)"
 "(unsafe-car"
-" lst_375))"
-"((rest_220)"
-"(unsafe-cdr"
-" lst_375))"
-"((id_120)"
-"(unsafe-car"
-" lst_376))"
+" lst_374))"
 "((rest_221)"
 "(unsafe-cdr"
-" lst_376)))"
+" lst_374))"
+"((id_120)"
+"(unsafe-car"
+" lst_375))"
+"((rest_222)"
+"(unsafe-cdr"
+" lst_375)))"
 "(let-values(((env_33)"
 "(let-values(((env_34)"
 " env_32))"
@@ -65783,94 +65805,100 @@ static const char *startup_source =
 " env_35)))))"
 "(if(not"
 " #f)"
-"(for-loop_313"
+"(for-loop_309"
 " env_33"
-" rest_220"
-" rest_221)"
+" rest_221"
+" rest_222)"
 " env_33)))"
 " env_32)))))"
-" for-loop_313)"
+" for-loop_309)"
 " env_31"
-" lst_373"
-" lst_374))))))"
+" lst_372"
+" lst_373))))))"
 "(if(not #f)"
-"(for-loop_312"
+"(for-loop_308"
 " env_30"
-" rest_218"
-" rest_219)"
+" rest_219"
+" rest_220)"
 " env_30)))"
 " env_29)))))"
-" for-loop_312)"
+" for-loop_308)"
 "(expand-context-env ctx_84)"
-" lst_370"
+" lst_369"
 " lst_135)))))"
 "(let-values(((rec-env_0)"
-"(let-values(((lst_377) trans-keyss_0)"
-"((lst_378) trans-valss_0)"
-"((lst_379) trans-idss_2))"
+"(let-values(((lst_376) trans-keyss_0)"
+"((lst_377) trans-valss_0)"
+"((lst_378) trans-idss_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
+"(let-values()(check-list lst_376)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
 "(let-values()(check-list lst_377)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_378)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_379)))"
-"((letrec-values(((for-loop_314)"
+"((letrec-values(((for-loop_310)"
 "(lambda(env_36"
+" lst_379"
 " lst_380"
-" lst_381"
-" lst_382)"
+" lst_381)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_380)"
+" lst_379)"
 "(if(pair?"
-" lst_381)"
+" lst_380)"
 "(pair?"
-" lst_382)"
+" lst_381)"
 " #f)"
 " #f)"
 "(let-values(((keys_11)"
 "(unsafe-car"
-" lst_380))"
-"((rest_222)"
-"(unsafe-cdr"
-" lst_380))"
-"((vals_9)"
-"(unsafe-car"
-" lst_381))"
+" lst_379))"
 "((rest_223)"
 "(unsafe-cdr"
-" lst_381))"
-"((ids_43)"
+" lst_379))"
+"((vals_9)"
 "(unsafe-car"
-" lst_382))"
+" lst_380))"
 "((rest_224)"
 "(unsafe-cdr"
-" lst_382)))"
+" lst_380))"
+"((ids_42)"
+"(unsafe-car"
+" lst_381))"
+"((rest_225)"
+"(unsafe-cdr"
+" lst_381)))"
 "(let-values(((env_37)"
 "(let-values(((env_38)"
 " env_36))"
 "(let-values(((env_39)"
 "(let-values()"
-"(let-values(((lst_383)"
+"(let-values(((lst_382)"
 " keys_11)"
-"((lst_384)"
+"((lst_383)"
 " vals_9)"
-"((lst_385)"
-" ids_43))"
+"((lst_384)"
+" ids_42))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_382)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_383)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -65878,45 +65906,39 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_384)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_385)))"
-"((letrec-values(((for-loop_315)"
+"((letrec-values(((for-loop_311)"
 "(lambda(env_40"
+" lst_385"
 " lst_386"
-" lst_387"
-" lst_388)"
+" lst_387)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_386)"
+" lst_385)"
 "(if(pair?"
-" lst_387)"
+" lst_386)"
 "(pair?"
-" lst_388)"
+" lst_387)"
 " #f)"
 " #f)"
 "(let-values(((key_92)"
 "(unsafe-car"
-" lst_386))"
-"((rest_225)"
-"(unsafe-cdr"
-" lst_386))"
-"((val_86)"
-"(unsafe-car"
-" lst_387))"
+" lst_385))"
 "((rest_226)"
 "(unsafe-cdr"
-" lst_387))"
-"((id_121)"
+" lst_385))"
+"((val_86)"
 "(unsafe-car"
-" lst_388))"
+" lst_386))"
 "((rest_227)"
 "(unsafe-cdr"
-" lst_388)))"
+" lst_386))"
+"((id_121)"
+"(unsafe-car"
+" lst_387))"
+"((rest_228)"
+"(unsafe-cdr"
+" lst_387)))"
 "(let-values(((env_41)"
 "(let-values(((env_42)"
 " env_40))"
@@ -65936,33 +65958,33 @@ static const char *startup_source =
 " env_43)))))"
 "(if(not"
 " #f)"
-"(for-loop_315"
+"(for-loop_311"
 " env_41"
-" rest_225"
 " rest_226"
-" rest_227)"
+" rest_227"
+" rest_228)"
 " env_41)))"
 " env_40)))))"
-" for-loop_315)"
+" for-loop_311)"
 " env_38"
+" lst_382"
 " lst_383"
-" lst_384"
-" lst_385))))))"
+" lst_384))))))"
 "(values"
 " env_39)))))"
 "(if(not #f)"
-"(for-loop_314"
+"(for-loop_310"
 " env_37"
-" rest_222"
 " rest_223"
-" rest_224)"
+" rest_224"
+" rest_225)"
 " env_37)))"
 " env_36)))))"
-" for-loop_314)"
+" for-loop_310)"
 " rec-val-env_0"
+" lst_376"
 " lst_377"
-" lst_378"
-" lst_379)))))"
+" lst_378)))))"
 "(let-values(((expr-ctx_0)"
 "(as-expression-context ctx_84)))"
 "(let-values(((orig-rrs_0)"
@@ -66057,7 +66079,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list lst_254)))"
 "((letrec-values(((for-loop_231)"
-"(lambda(fold-var_352"
+"(lambda(fold-var_354"
 " lst_255)"
 "(begin"
 " 'for-loop"
@@ -66069,15 +66091,15 @@ static const char *startup_source =
 "((rest_139)"
 "(unsafe-cdr"
 " lst_255)))"
-"(let-values(((fold-var_353)"
-"(let-values(((fold-var_354)"
-" fold-var_352))"
 "(let-values(((fold-var_355)"
+"(let-values(((fold-var_356)"
+" fold-var_354))"
+"(let-values(((fold-var_357)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_389)"
+"(let-values(((lst_388)"
 " val-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -66085,24 +66107,24 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_389)))"
-"((letrec-values(((for-loop_316)"
-"(lambda(fold-var_356"
-" lst_390)"
+" lst_388)))"
+"((letrec-values(((for-loop_312)"
+"(lambda(fold-var_358"
+" lst_389)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_390)"
+" lst_389)"
 "(let-values(((val-id_0)"
 "(unsafe-car"
-" lst_390))"
-"((rest_228)"
+" lst_389))"
+"((rest_229)"
 "(unsafe-cdr"
-" lst_390)))"
-"(let-values(((fold-var_357)"
+" lst_389)))"
+"(let-values(((fold-var_359)"
 "(let-values(((fold-var_132)"
-" fold-var_356))"
-"(let-values(((fold-var_358)"
+" fold-var_358))"
+"(let-values(((fold-var_360)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -66114,27 +66136,27 @@ static const char *startup_source =
 " val-id_0))"
 " fold-var_132))))"
 "(values"
-" fold-var_358)))))"
+" fold-var_360)))))"
 "(if(not"
 " #f)"
-"(for-loop_316"
-" fold-var_357"
-" rest_228)"
-" fold-var_357)))"
-" fold-var_356)))))"
-" for-loop_316)"
+"(for-loop_312"
+" fold-var_359"
+" rest_229)"
+" fold-var_359)))"
+" fold-var_358)))))"
+" for-loop_312)"
 " null"
-" lst_389)))))"
-" fold-var_354))))"
+" lst_388)))))"
+" fold-var_356))))"
 "(values"
-" fold-var_355)))))"
+" fold-var_357)))))"
 "(if(not"
 " #f)"
 "(for-loop_231"
-" fold-var_353"
+" fold-var_355"
 " rest_139)"
-" fold-var_353)))"
-" fold-var_352)))))"
+" fold-var_355)))"
+" fold-var_354)))))"
 " for-loop_231)"
 " null"
 " lst_254))))"
@@ -66143,13 +66165,13 @@ static const char *startup_source =
 "(begin"
 "(if syntaxes?_0"
 "(let-values()"
-"(let-values(((obs_94)"
+"(let-values(((obs_95)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_94"
+"(if obs_95"
 "(let-values()"
 "(log-letrec-values"
-" obs_94"
+" obs_95"
 " val-idss_3"
 " val-rhss_3"
 " bodys_10))"
@@ -66162,10 +66184,10 @@ static const char *startup_source =
 " 'get-body"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_95)"
+"(let-values(((obs_96)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_95"
+"(if obs_96"
 "(let-values()"
 "(if(not"
 "(if syntaxes?_0"
@@ -66174,23 +66196,23 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(call-expand-observe"
-" obs_95"
+" obs_96"
 " 'next-group))"
 "(void)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_5)"
-"(let-values(((v_266)"
+"(let-values(((v_265)"
 " rec-ctx_0))"
 "(let-values(((the-struct_98)"
-" v_266))"
+" v_265))"
 "(if(expand-context/outer?"
 " the-struct_98)"
 "(let-values(((reference-records195_0)"
 " orig-rrs_0)"
 "((inner196_0)"
 "(root-expand-context/outer-inner"
-" v_266)))"
+" v_265)))"
 "(expand-context/outer1.1"
 " inner196_0"
 "(root-expand-context/outer-post-expansion"
@@ -66249,11 +66271,11 @@ static const char *startup_source =
 "(reverse$1"
 "(let-values(((lst_150)"
 " val-name-idss_0)"
-"((lst_391)"
+"((lst_390)"
 " val-keyss_2)"
 "((lst_151)"
 " val-rhss_3)"
-"((lst_392)"
+"((lst_391)"
 " val-clauses_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -66267,7 +66289,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_391)))"
+" lst_390)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
@@ -66279,67 +66301,67 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_392)))"
-"((letrec-values(((for-loop_317)"
-"(lambda(fold-var_359"
+" lst_391)))"
+"((letrec-values(((for-loop_313)"
+"(lambda(fold-var_361"
+" lst_392"
 " lst_393"
 " lst_394"
-" lst_395"
-" lst_396)"
+" lst_395)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
+" lst_392)"
+"(if(pair?"
 " lst_393)"
 "(if(pair?"
 " lst_394)"
-"(if(pair?"
-" lst_395)"
 "(pair?"
-" lst_396)"
+" lst_395)"
 " #f)"
 " #f)"
 " #f)"
-"(let-values(((ids_44)"
+"(let-values(((ids_43)"
 "(unsafe-car"
-" lst_393))"
-"((rest_229)"
-"(unsafe-cdr"
-" lst_393))"
-"((keys_12)"
-"(unsafe-car"
-" lst_394))"
+" lst_392))"
 "((rest_230)"
 "(unsafe-cdr"
-" lst_394))"
-"((rhs_22)"
+" lst_392))"
+"((keys_12)"
 "(unsafe-car"
-" lst_395))"
+" lst_393))"
 "((rest_231)"
 "(unsafe-cdr"
-" lst_395))"
-"((clause_4)"
+" lst_393))"
+"((rhs_22)"
 "(unsafe-car"
-" lst_396))"
+" lst_394))"
 "((rest_232)"
 "(unsafe-cdr"
-" lst_396)))"
+" lst_394))"
+"((clause_4)"
+"(unsafe-car"
+" lst_395))"
+"((rest_233)"
+"(unsafe-cdr"
+" lst_395)))"
 "(let-values(((fold-var_51)"
-"(let-values(((fold-var_360)"
-" fold-var_359))"
-"(let-values(((fold-var_361)"
+"(let-values(((fold-var_362)"
+" fold-var_361))"
+"(let-values(((fold-var_363)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_96)"
+"(let-values(((obs_97)"
 "(expand-context-observer"
 " ctx_84)))"
-"(if obs_96"
+"(if obs_97"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_96"
+" obs_97"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -66350,10 +66372,10 @@ static const char *startup_source =
 "(if rec?_1"
 "(as-named-context"
 " rec-ctx_0"
-" ids_44)"
+" ids_43)"
 "(as-named-context"
 " expr-ctx_0"
-" ids_44))))"
+" ids_43))))"
 "(expand9.1"
 " #f"
 " #f"
@@ -66368,29 +66390,29 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-" ids_44"
+" ids_43"
 " exp-rhs_4)"
 " clause_4"
 " clause_4)))))"
-" fold-var_360))))"
+" fold-var_362))))"
 "(values"
-" fold-var_361)))))"
+" fold-var_363)))))"
 "(if(not"
 " #f)"
-"(for-loop_317"
+"(for-loop_313"
 " fold-var_51"
-" rest_229"
 " rest_230"
 " rest_231"
-" rest_232)"
+" rest_232"
+" rest_233)"
 " fold-var_51)))"
-" fold-var_359)))))"
-" for-loop_317)"
+" fold-var_361)))))"
+" for-loop_313)"
 " null"
 " lst_150"
-" lst_391"
+" lst_390"
 " lst_151"
-" lst_392))))))"
+" lst_391))))))"
 "(let-values(((exp-body_4)"
 "(get-body_1)))"
 "(begin"
@@ -66465,75 +66487,75 @@ static const char *startup_source =
 " trans-idss_2))))))))))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(log-let-renames)"
-"(lambda(obs_97 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_40)"
+"(lambda(obs_98 renames-log-tag_1 val-idss_4 val-rhss_4 bodys_11 trans-idss_3 trans-rhss_0 sc_40)"
 "(begin"
 "(let-values(((vals+body_0)"
 "(cons"
 "(reverse$1"
-"(let-values(((lst_397) val-idss_4)((lst_398) val-rhss_4))"
+"(let-values(((lst_396) val-idss_4)((lst_397) val-rhss_4))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
+"(let-values()(check-list lst_396)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
 "(let-values()(check-list lst_397)))"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_398)))"
-"((letrec-values(((for-loop_318)"
-"(lambda(fold-var_362 lst_399 lst_400)"
+"((letrec-values(((for-loop_314)"
+"(lambda(fold-var_364 lst_398 lst_399)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_399)(pair? lst_400) #f)"
-"(let-values(((val-ids_2)(unsafe-car lst_399))"
-"((rest_233)(unsafe-cdr lst_399))"
-"((val-rhs_11)(unsafe-car lst_400))"
-"((rest_234)(unsafe-cdr lst_400)))"
-"(let-values(((fold-var_363)"
-"(let-values(((fold-var_364) fold-var_362))"
+"(if(if(pair? lst_398)(pair? lst_399) #f)"
+"(let-values(((val-ids_2)(unsafe-car lst_398))"
+"((rest_234)(unsafe-cdr lst_398))"
+"((val-rhs_11)(unsafe-car lst_399))"
+"((rest_235)(unsafe-cdr lst_399)))"
 "(let-values(((fold-var_365)"
+"(let-values(((fold-var_366) fold-var_364))"
+"(let-values(((fold-var_367)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(datum->syntax$1"
 " #f"
 "(list val-ids_2 val-rhs_11)))"
-" fold-var_364))))"
-"(values fold-var_365)))))"
+" fold-var_366))))"
+"(values fold-var_367)))))"
 "(if(not #f)"
-"(for-loop_318 fold-var_363 rest_233 rest_234)"
-" fold-var_363)))"
-" fold-var_362)))))"
-" for-loop_318)"
+"(for-loop_314 fold-var_365 rest_234 rest_235)"
+" fold-var_365)))"
+" fold-var_364)))))"
+" for-loop_314)"
 " null"
-" lst_397"
-" lst_398))))"
+" lst_396"
+" lst_397))))"
 "(datum->syntax$1 #f bodys_11))))"
 "(call-expand-observe"
-" obs_97"
+" obs_98"
 " renames-log-tag_1"
 "(if(not trans-rhss_0)"
 " vals+body_0"
 "(cons"
 "(reverse$1"
-"(let-values(((lst_401) trans-idss_3)((lst_402) trans-rhss_0))"
+"(let-values(((lst_400) trans-idss_3)((lst_401) trans-rhss_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
+"(let-values()(check-list lst_400)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
 "(let-values()(check-list lst_401)))"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_402)))"
-"((letrec-values(((for-loop_319)"
-"(lambda(fold-var_366 lst_403 lst_404)"
+"((letrec-values(((for-loop_315)"
+"(lambda(fold-var_368 lst_402 lst_403)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_403)(pair? lst_404) #f)"
-"(let-values(((trans-ids_0)(unsafe-car lst_403))"
-"((rest_235)(unsafe-cdr lst_403))"
-"((trans-rhs_5)(unsafe-car lst_404))"
-"((rest_236)(unsafe-cdr lst_404)))"
-"(let-values(((fold-var_367)"
-"(let-values(((fold-var_368) fold-var_366))"
+"(if(if(pair? lst_402)(pair? lst_403) #f)"
+"(let-values(((trans-ids_0)(unsafe-car lst_402))"
+"((rest_236)(unsafe-cdr lst_402))"
+"((trans-rhs_5)(unsafe-car lst_403))"
+"((rest_237)(unsafe-cdr lst_403)))"
 "(let-values(((fold-var_369)"
+"(let-values(((fold-var_370) fold-var_368))"
+"(let-values(((fold-var_371)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -66542,27 +66564,27 @@ static const char *startup_source =
 "(list"
 " trans-ids_0"
 "(add-scope trans-rhs_5 sc_40))))"
-" fold-var_368))))"
-"(values fold-var_369)))))"
-"(if(not #f)(for-loop_319 fold-var_367 rest_235 rest_236) fold-var_367)))"
-" fold-var_366)))))"
-" for-loop_319)"
+" fold-var_370))))"
+"(values fold-var_371)))))"
+"(if(not #f)(for-loop_315 fold-var_369 rest_236 rest_237) fold-var_369)))"
+" fold-var_368)))))"
+" for-loop_315)"
 " null"
-" lst_401"
-" lst_402))))"
+" lst_400"
+" lst_401))))"
 " vals+body_0)))))))"
 "(define-values"
 "(log-letrec-values)"
-"(lambda(obs_98 val-idss_5 val-rhss_5 bodys_12)"
+"(lambda(obs_99 val-idss_5 val-rhss_5 bodys_12)"
 "(begin"
 "(begin"
-"(call-expand-observe obs_98 'next-group)"
+"(call-expand-observe obs_99 'next-group)"
 "(if(null? val-idss_5)"
 "(void)"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_98 'prim-letrec-values)"
-"(log-let-renames obs_98 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
+"(call-expand-observe obs_99 'prim-letrec-values)"
+"(log-let-renames obs_99 'let-renames val-idss_5 val-rhss_5 bodys_12 #f #f #f))))))))"
 "(void"
 "(add-core-form!*"
 " 'let-values"
@@ -66584,30 +66606,30 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_568 ctx_85)"
+"(lambda(s_569 ctx_85)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_99)(expand-context-observer ctx_85)))"
-"(if obs_99"
-"(let-values()(let-values()(call-expand-observe obs_99 'prim-#%stratified)))"
+"(let-values(((obs_100)(expand-context-observer ctx_85)))"
+"(if obs_100"
+"(let-values()(let-values()(call-expand-observe obs_100 'prim-#%stratified)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_9)(syntax-disarm$1 s_568)))"
+"(let-values(((disarmed-s_9)(syntax-disarm$1 s_569)))"
 "(let-values(((ok?_45 #%stratified-body222_0 body223_0)"
-"(let-values(((s_569) disarmed-s_9))"
-"(let-values(((orig-s_48) s_569))"
+"(let-values(((s_570) disarmed-s_9))"
+"(let-values(((orig-s_48) s_570))"
 "(let-values(((#%stratified-body222_1 body223_1)"
-"(let-values(((s_570)(if(syntax?$1 s_569)(syntax-e$1 s_569) s_569)))"
-"(if(pair? s_570)"
+"(let-values(((s_571)(if(syntax?$1 s_570)(syntax-e$1 s_570) s_570)))"
+"(if(pair? s_571)"
 "(let-values(((#%stratified-body224_0)"
-"(let-values(((s_571)(car s_570))) s_571))"
+"(let-values(((s_572)(car s_571))) s_572))"
 "((body225_0)"
-"(let-values(((s_572)(cdr s_570)))"
-"(let-values(((s_573)"
-"(if(syntax?$1 s_572)"
-"(syntax-e$1 s_572)"
-" s_572)))"
-"(let-values(((flat-s_43)(to-syntax-list.1 s_573)))"
+"(let-values(((s_573)(cdr s_571)))"
+"(let-values(((s_574)"
+"(if(syntax?$1 s_573)"
+"(syntax-e$1 s_573)"
+" s_573)))"
+"(let-values(((flat-s_43)(to-syntax-list.1 s_574)))"
 "(if(not flat-s_43)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_48))"
@@ -66619,7 +66641,7 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
 "(values #t #%stratified-body222_1 body223_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx226_0) ctx_85)((s227_0) s_568)((temp228_0) #t))"
+"(let-values(((ctx226_0) ctx_85)((s227_0) s_569)((temp228_0) #t))"
 "(keep-as-needed119.1 #f temp228_0 #f ctx226_0 s227_0))))"
 "(let-values(((exp-body_5)"
 "(let-values(((temp229_3) body223_0)"
@@ -66638,21 +66660,21 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_574 ctx_86)"
+"(lambda(s_575 ctx_86)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_100)(expand-context-observer ctx_86)))"
-"(if obs_100(let-values()(let-values()(call-expand-observe obs_100 'prim-#%datum)))(void)))"
+"(let-values(((obs_101)(expand-context-observer ctx_86)))"
+"(if obs_101(let-values()(let-values()(call-expand-observe obs_101 'prim-#%datum)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_10)(syntax-disarm$1 s_574)))"
+"(let-values(((disarmed-s_10)(syntax-disarm$1 s_575)))"
 "(let-values(((ok?_46 #%datum235_0 datum236_0)"
-"(let-values(((s_575) disarmed-s_10))"
-"(let-values(((orig-s_49) s_575))"
+"(let-values(((s_576) disarmed-s_10))"
+"(let-values(((orig-s_49) s_576))"
 "(let-values(((#%datum235_1 datum236_1)"
-"(let-values(((s_576)(if(syntax?$1 s_575)(syntax-e$1 s_575) s_575)))"
-"(if(pair? s_576)"
-"(let-values(((#%datum237_0)(let-values(((s_577)(car s_576))) s_577))"
-"((datum238_0)(let-values(((s_578)(cdr s_576))) s_578)))"
+"(let-values(((s_577)(if(syntax?$1 s_576)(syntax-e$1 s_576) s_576)))"
+"(if(pair? s_577)"
+"(let-values(((#%datum237_0)(let-values(((s_578)(car s_577))) s_578))"
+"((datum238_0)(let-values(((s_579)(cdr s_577))) s_579)))"
 "(values #%datum237_0 datum238_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_49)))))"
 "(values #t #%datum235_1 datum236_1))))))"
@@ -66666,33 +66688,33 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((phase_141)(expand-context-phase ctx_86)))"
 "(if(if(expand-context-to-parsed? ctx_86)(free-id-set-empty?(expand-context-stops ctx_86)) #f)"
-"(parsed-quote14.1(keep-properties-only~ s_574)(syntax->datum$1 datum_2))"
-"(let-values(((s239_0) s_574)((temp240_0)(list(core-id 'quote phase_141) datum_2)))"
+"(parsed-quote14.1(keep-properties-only~ s_575)(syntax->datum$1 datum_2))"
+"(let-values(((s239_0) s_575)((temp240_0)(list(core-id 'quote phase_141) datum_2)))"
 "(rebuild5.1 #t s239_0 temp240_0))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_579 ctx_87)"
+"(lambda(s_580 ctx_87)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_101)(expand-context-observer ctx_87)))"
-"(if obs_101(let-values()(let-values()(call-expand-observe obs_101 'prim-#%app)))(void)))"
+"(let-values(((obs_102)(expand-context-observer ctx_87)))"
+"(if obs_102(let-values()(let-values()(call-expand-observe obs_102 'prim-#%app)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_11)(syntax-disarm$1 s_579)))"
+"(let-values(((disarmed-s_11)(syntax-disarm$1 s_580)))"
 "(let-values(((ok?_47 #%app241_0 e242_0)"
-"(let-values(((s_580) disarmed-s_11))"
-"(let-values(((orig-s_50) s_580))"
+"(let-values(((s_581) disarmed-s_11))"
+"(let-values(((orig-s_50) s_581))"
 "(let-values(((#%app241_1 e242_1)"
-"(let-values(((s_581)(if(syntax?$1 s_580)(syntax-e$1 s_580) s_580)))"
-"(if(pair? s_581)"
-"(let-values(((#%app243_0)(let-values(((s_582)(car s_581))) s_582))"
+"(let-values(((s_582)(if(syntax?$1 s_581)(syntax-e$1 s_581) s_581)))"
+"(if(pair? s_582)"
+"(let-values(((#%app243_0)(let-values(((s_583)(car s_582))) s_583))"
 "((e244_0)"
-"(let-values(((s_583)(cdr s_581)))"
-"(let-values(((s_584)"
-"(if(syntax?$1 s_583)"
-"(syntax-e$1 s_583)"
-" s_583)))"
-"(let-values(((flat-s_44)(to-syntax-list.1 s_584)))"
+"(let-values(((s_584)(cdr s_582)))"
+"(let-values(((s_585)"
+"(if(syntax?$1 s_584)"
+"(syntax-e$1 s_584)"
+" s_584)))"
+"(let-values(((flat-s_44)(to-syntax-list.1 s_585)))"
 "(if(not flat-s_44)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_50))"
@@ -66705,14 +66727,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((phase_142)(expand-context-phase ctx_87)))"
 "(if(expand-context-to-parsed? ctx_87)"
-"(parsed-quote14.1(keep-properties-only~ s_579) null)"
-"(let-values(((s245_0) s_579)((temp246_1)(list(core-id 'quote phase_142) null)))"
+"(parsed-quote14.1(keep-properties-only~ s_580) null)"
+"(let-values(((s245_0) s_580)((temp246_1)(list(core-id 'quote phase_142) null)))"
 "(rebuild5.1 #t s245_0 temp246_1)))))"
 "(let-values()"
 "(let-values(((keep-for-parsed?_1)(eq?(system-type 'vm) 'chez-scheme)))"
 "(let-values(((rebuild-s_8)"
 "(let-values(((ctx247_0) ctx_87)"
-"((s248_0) s_579)"
+"((s248_0) s_580)"
 "((keep-for-parsed?249_0) keep-for-parsed?_1))"
 "(keep-as-needed119.1 #f #f keep-for-parsed?249_0 ctx247_0 s248_0))))"
 "(let-values(((prefixless_0)(cdr(syntax-e$1 disarmed-s_11))))"
@@ -66726,16 +66748,16 @@ static const char *startup_source =
 "(let-values(((expr-ctx_1)(as-expression-context ctx_87)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_102)(expand-context-observer expr-ctx_1)))"
-"(if obs_102"
+"(let-values(((obs_103)(expand-context-observer expr-ctx_1)))"
+"(if obs_103"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_102"
+" obs_103"
 " 'enter-list"
-"(datum->syntax$1 #f es_3 s_579))"
-"(call-expand-observe obs_102 'next))))"
+"(datum->syntax$1 #f es_3 s_580))"
+"(call-expand-observe obs_103 'next))))"
 "(void)))"
 "(values))))"
 "(let-values(((rest-es_0)(cdr es_3)))"
@@ -66744,35 +66766,35 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp253_1 expr-ctx254_0))))"
 "(let-values(((exp-es_0)"
 "(reverse$1"
-"(let-values(((lst_405) rest-es_0))"
+"(let-values(((lst_404) rest-es_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_405)))"
-"((letrec-values(((for-loop_320)"
-"(lambda(fold-var_370 lst_406)"
+"(let-values()(check-list lst_404)))"
+"((letrec-values(((for-loop_316)"
+"(lambda(fold-var_372 lst_405)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_406)"
-"(let-values(((e_90)(unsafe-car lst_406))"
-"((rest_237)"
-"(unsafe-cdr lst_406)))"
-"(let-values(((fold-var_371)"
-"(let-values(((fold-var_372)"
-" fold-var_370))"
+"(if(pair? lst_405)"
+"(let-values(((e_90)(unsafe-car lst_405))"
+"((rest_238)"
+"(unsafe-cdr lst_405)))"
 "(let-values(((fold-var_373)"
+"(let-values(((fold-var_374)"
+" fold-var_372))"
+"(let-values(((fold-var_375)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(begin"
-"(let-values(((obs_103)"
+"(let-values(((obs_104)"
 "(expand-context-observer"
 " expr-ctx_1)))"
-"(if obs_103"
+"(if obs_104"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_103"
+" obs_104"
 " 'next)))"
 "(void)))"
 "(let-values(((e255_0)"
@@ -66785,21 +66807,21 @@ static const char *startup_source =
 " #f"
 " e255_0"
 " expr-ctx256_0))))"
-" fold-var_372))))"
+" fold-var_374))))"
 "(values"
-" fold-var_373)))))"
+" fold-var_375)))))"
 "(if(not #f)"
-"(for-loop_320 fold-var_371 rest_237)"
-" fold-var_371)))"
-" fold-var_370)))))"
-" for-loop_320)"
+"(for-loop_316 fold-var_373 rest_238)"
+" fold-var_373)))"
+" fold-var_372)))))"
+" for-loop_316)"
 " null"
-" lst_405))))))"
+" lst_404))))))"
 "(if(expand-context-to-parsed? ctx_87)"
 "(let-values()"
 "(parsed-app7.1"
-"(let-values(((or-part_383) rebuild-prefixless_0))"
-"(if or-part_383 or-part_383 rebuild-s_8))"
+"(let-values(((or-part_381) rebuild-prefixless_0))"
+"(if or-part_381 or-part_381 rebuild-s_8))"
 " exp-rator_0"
 " exp-es_0))"
 "(let-values()"
@@ -66811,12 +66833,12 @@ static const char *startup_source =
 "(rebuild5.1 #t rebuild-prefixless259_0 exp-es260_0))"
 " exp-es_1))))"
 "(begin"
-"(let-values(((obs_104)(expand-context-observer expr-ctx_1)))"
-"(if obs_104"
+"(let-values(((obs_105)(expand-context-observer expr-ctx_1)))"
+"(if obs_105"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_104"
+" obs_105"
 " 'exit-list"
 "(datum->syntax$1 #f es_4 rebuild-s_8))))"
 "(void)))"
@@ -66826,35 +66848,35 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_585 ctx_88)"
+"(lambda(s_586 ctx_88)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_105)(expand-context-observer ctx_88)))"
-"(if obs_105(let-values()(let-values()(call-expand-observe obs_105 'prim-quote)))(void)))"
+"(let-values(((obs_106)(expand-context-observer ctx_88)))"
+"(if obs_106(let-values()(let-values()(call-expand-observe obs_106 'prim-quote)))(void)))"
 "(values))))"
 "(let-values(((ok?_48 quote261_0 datum262_0)"
-"(let-values(((s_282)(syntax-disarm$1 s_585)))"
+"(let-values(((s_282)(syntax-disarm$1 s_586)))"
 "(let-values(((orig-s_51) s_282))"
 "(let-values(((quote261_1 datum262_1)"
 "(let-values(((s_284)(if(syntax?$1 s_282)(syntax-e$1 s_282) s_282)))"
 "(if(pair? s_284)"
-"(let-values(((quote263_0)(let-values(((s_586)(car s_284))) s_586))"
+"(let-values(((quote263_0)(let-values(((s_587)(car s_284))) s_587))"
 "((datum264_0)"
-"(let-values(((s_587)(cdr s_284)))"
-"(let-values(((s_588)"
-"(if(syntax?$1 s_587)"
-"(syntax-e$1 s_587)"
-" s_587)))"
-"(if(pair? s_588)"
+"(let-values(((s_588)(cdr s_284)))"
+"(let-values(((s_589)"
+"(if(syntax?$1 s_588)"
+"(syntax-e$1 s_588)"
+" s_588)))"
+"(if(pair? s_589)"
 "(let-values(((datum265_0)"
-"(let-values(((s_589)(car s_588))) s_589))"
+"(let-values(((s_590)(car s_589))) s_590))"
 "(()"
-"(let-values(((s_590)(cdr s_588)))"
-"(let-values(((s_591)"
-"(if(syntax?$1 s_590)"
-"(syntax-e$1 s_590)"
-" s_590)))"
-"(if(null? s_591)"
+"(let-values(((s_591)(cdr s_589)))"
+"(let-values(((s_592)"
+"(if(syntax?$1 s_591)"
+"(syntax-e$1 s_591)"
+" s_591)))"
+"(if(null? s_592)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -66866,40 +66888,40 @@ static const char *startup_source =
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
 "(values #t quote261_1 datum262_1))))))"
 "(if(expand-context-to-parsed? ctx_88)"
-"(parsed-quote14.1(keep-properties-only~ s_585)(syntax->datum$1 datum262_0))"
-" s_585))))))"
+"(parsed-quote14.1(keep-properties-only~ s_586)(syntax->datum$1 datum262_0))"
+" s_586))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_592 ctx_89)"
+"(lambda(s_593 ctx_89)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_106)(expand-context-observer ctx_89)))"
-"(if obs_106"
-"(let-values()(let-values()(call-expand-observe obs_106 'prim-quote-syntax)))"
+"(let-values(((obs_107)(expand-context-observer ctx_89)))"
+"(if obs_107"
+"(let-values()(let-values()(call-expand-observe obs_107 'prim-quote-syntax)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_12)(syntax-disarm$1 s_592)))"
+"(let-values(((disarmed-s_12)(syntax-disarm$1 s_593)))"
 "(let-values(((ok?_49 quote-syntax266_0 datum267_0)"
 "(let-values(((s_291) disarmed-s_12))"
-"(if(let-values(((s_593)(if(syntax?$1 s_291)(syntax-e$1 s_291) s_291)))"
-"(if(pair? s_593)"
-"(if(let-values(((s_594)(car s_593))) #t)"
-"(let-values(((s_595)(cdr s_593)))"
-"(let-values(((s_292)(if(syntax?$1 s_595)(syntax-e$1 s_595) s_595)))"
+"(if(let-values(((s_594)(if(syntax?$1 s_291)(syntax-e$1 s_291) s_291)))"
+"(if(pair? s_594)"
+"(if(let-values(((s_595)(car s_594))) #t)"
+"(let-values(((s_596)(cdr s_594)))"
+"(let-values(((s_292)(if(syntax?$1 s_596)(syntax-e$1 s_596) s_596)))"
 "(if(pair? s_292)"
-"(if(let-values(((s_596)(car s_292))) #t)"
-"(let-values(((s_597)(cdr s_292)))"
-"(let-values(((s_293)(if(syntax?$1 s_597)(syntax-e$1 s_597) s_597)))"
+"(if(let-values(((s_597)(car s_292))) #t)"
+"(let-values(((s_598)(cdr s_292)))"
+"(let-values(((s_293)(if(syntax?$1 s_598)(syntax-e$1 s_598) s_598)))"
 "(if(pair? s_293)"
 "(if(let-values(((s_294)(car s_293)))"
 "(let-values(((s_295)"
 "(if(syntax?$1 s_294)(syntax-e$1 s_294) s_294)))"
 "(eq? '#:local s_295)))"
-"(let-values(((s_598)(cdr s_293)))"
-"(let-values(((s_599)"
-"(if(syntax?$1 s_598)(syntax-e$1 s_598) s_598)))"
-"(null? s_599)))"
+"(let-values(((s_599)(cdr s_293)))"
+"(let-values(((s_600)"
+"(if(syntax?$1 s_599)(syntax-e$1 s_599) s_599)))"
+"(null? s_600)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -66908,44 +66930,44 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((quote-syntax266_1 datum267_1)"
-"(let-values(((s_600)(if(syntax?$1 s_291)(syntax-e$1 s_291) s_291)))"
+"(let-values(((s_601)(if(syntax?$1 s_291)(syntax-e$1 s_291) s_291)))"
 "(let-values(((quote-syntax268_0)"
-"(let-values(((s_601)(car s_600))) s_601))"
+"(let-values(((s_602)(car s_601))) s_602))"
 "((datum269_0)"
-"(let-values(((s_602)(cdr s_600)))"
-"(let-values(((s_603)"
-"(if(syntax?$1 s_602)"
-"(syntax-e$1 s_602)"
-" s_602)))"
+"(let-values(((s_603)(cdr s_601)))"
+"(let-values(((s_604)"
+"(if(syntax?$1 s_603)"
+"(syntax-e$1 s_603)"
+" s_603)))"
 "(let-values(((datum270_0)"
-"(let-values(((s_604)(car s_603))) s_604))"
+"(let-values(((s_605)(car s_604))) s_605))"
 "(()"
-"(let-values(((s_605)(cdr s_603)))"
-"(let-values(((s_606)"
-"(if(syntax?$1 s_605)"
-"(syntax-e$1 s_605)"
-" s_605)))"
-"(let-values((()"
+"(let-values(((s_606)(cdr s_604)))"
 "(let-values(((s_607)"
-"(car"
+"(if(syntax?$1 s_606)"
+"(syntax-e$1 s_606)"
 " s_606)))"
+"(let-values((()"
 "(let-values(((s_608)"
-"(if(syntax?$1"
-" s_607)"
-"(syntax-e$1"
-" s_607)"
+"(car"
 " s_607)))"
+"(let-values(((s_609)"
+"(if(syntax?$1"
+" s_608)"
+"(syntax-e$1"
+" s_608)"
+" s_608)))"
 "(values))))"
 "(()"
-"(let-values(((s_609)"
-"(cdr"
-" s_606)))"
 "(let-values(((s_610)"
+"(cdr"
+" s_607)))"
+"(let-values(((s_611)"
 "(if(syntax?$1"
-" s_609)"
+" s_610)"
 "(syntax-e$1"
-" s_609)"
-" s_609)))"
+" s_610)"
+" s_610)))"
 "(values)))))"
 "(values))))))"
 "(values datum270_0))))))"
@@ -66953,26 +66975,26 @@ static const char *startup_source =
 "(values #t quote-syntax266_1 datum267_1)))"
 "(values #f #f #f)))))"
 "(let-values(((ok?_50 quote-syntax271_0 datum272_0)"
-"(let-values(((s_611) disarmed-s_12))"
+"(let-values(((s_612) disarmed-s_12))"
 "(if(if(not ok?_49) #t #f)"
-"(let-values(((orig-s_52) s_611))"
+"(let-values(((orig-s_52) s_612))"
 "(let-values(((quote-syntax271_1 datum272_1)"
-"(let-values(((s_612)(if(syntax?$1 s_611)(syntax-e$1 s_611) s_611)))"
-"(if(pair? s_612)"
+"(let-values(((s_613)(if(syntax?$1 s_612)(syntax-e$1 s_612) s_612)))"
+"(if(pair? s_613)"
 "(let-values(((quote-syntax273_0)"
-"(let-values(((s_297)(car s_612))) s_297))"
+"(let-values(((s_297)(car s_613))) s_297))"
 "((datum274_0)"
-"(let-values(((s_613)(cdr s_612)))"
-"(let-values(((s_614)"
-"(if(syntax?$1 s_613)"
-"(syntax-e$1 s_613)"
-" s_613)))"
-"(if(pair? s_614)"
+"(let-values(((s_614)(cdr s_613)))"
+"(let-values(((s_615)"
+"(if(syntax?$1 s_614)"
+"(syntax-e$1 s_614)"
+" s_614)))"
+"(if(pair? s_615)"
 "(let-values(((datum275_0)"
-"(let-values(((s_298)(car s_614)))"
+"(let-values(((s_298)(car s_615)))"
 " s_298))"
 "(()"
-"(let-values(((s_299)(cdr s_614)))"
+"(let-values(((s_299)(cdr s_615)))"
 "(let-values(((s_300)"
 "(if(syntax?$1 s_299)"
 "(syntax-e$1 s_299)"
@@ -66999,52 +67021,52 @@ static const char *startup_source =
 "(reference-records-all-used!(expand-context-reference-records ctx_89))"
 "(values))))"
 "(let-values(((ok?_51 _276_0 _277_0 kw278_0)"
-"(let-values(((s_615) disarmed-s_12))"
-"(let-values(((orig-s_53) s_615))"
+"(let-values(((s_616) disarmed-s_12))"
+"(let-values(((orig-s_53) s_616))"
 "(let-values(((_276_1 _277_1 kw278_1)"
-"(let-values(((s_616)"
-"(if(syntax?$1 s_615)(syntax-e$1 s_615) s_615)))"
-"(if(pair? s_616)"
+"(let-values(((s_617)"
+"(if(syntax?$1 s_616)(syntax-e$1 s_616) s_616)))"
+"(if(pair? s_617)"
 "(let-values(((_279_0)"
-"(let-values(((s_617)(car s_616))) s_617))"
+"(let-values(((s_618)(car s_617))) s_618))"
 "((_280_0 kw281_0)"
-"(let-values(((s_618)(cdr s_616)))"
-"(let-values(((s_619)"
-"(if(syntax?$1 s_618)"
-"(syntax-e$1 s_618)"
-" s_618)))"
-"(if(pair? s_619)"
-"(let-values(((_282_0)"
+"(let-values(((s_619)(cdr s_617)))"
 "(let-values(((s_620)"
-"(car s_619)))"
-" s_620))"
-"((kw283_0)"
+"(if(syntax?$1 s_619)"
+"(syntax-e$1 s_619)"
+" s_619)))"
+"(if(pair? s_620)"
+"(let-values(((_282_0)"
 "(let-values(((s_621)"
-"(cdr s_619)))"
+"(car s_620)))"
+" s_621))"
+"((kw283_0)"
 "(let-values(((s_622)"
-"(if(syntax?$1"
-" s_621)"
-"(syntax-e$1"
-" s_621)"
-" s_621)))"
-"(if(pair? s_622)"
-"(let-values(((kw284_0)"
+"(cdr s_620)))"
 "(let-values(((s_623)"
-"(car"
-" s_622)))"
-" s_623))"
-"(()"
-"(let-values(((s_624)"
-"(cdr"
-" s_622)))"
-"(let-values(((s_625)"
 "(if(syntax?$1"
-" s_624)"
+" s_622)"
 "(syntax-e$1"
-" s_624)"
-" s_624)))"
-"(if(null?"
+" s_622)"
+" s_622)))"
+"(if(pair? s_623)"
+"(let-values(((kw284_0)"
+"(let-values(((s_624)"
+"(car"
+" s_623)))"
+" s_624))"
+"(()"
+"(let-values(((s_625)"
+"(cdr"
+" s_623)))"
+"(let-values(((s_626)"
+"(if(syntax?$1"
 " s_625)"
+"(syntax-e$1"
+" s_625)"
+" s_625)))"
+"(if(null?"
+" s_626)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67064,8 +67086,8 @@ static const char *startup_source =
 "                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
 "(values #t _276_1 _277_1 kw278_1))))))"
 "(if(expand-context-to-parsed? ctx_89)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_592) datum267_0)"
-"(let-values(((s285_0) s_592)((temp286_0)(list quote-syntax266_0 datum267_0 kw278_0)))"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_593) datum267_0)"
+"(let-values(((s285_0) s_593)((temp286_0)(list quote-syntax266_0 datum267_0 kw278_0)))"
 "(rebuild5.1 #t s285_0 temp286_0))))))"
 "(let-values()"
 "(let-values(((use-site-scopes_2)(root-expand-context-use-site-scopes ctx_89)))"
@@ -67074,36 +67096,36 @@ static const char *startup_source =
 "(remove-scopes datum272_0(expand-context-scopes ctx_89))"
 "(if use-site-scopes_2(unbox use-site-scopes_2) '()))))"
 "(if(if(expand-context-to-parsed? ctx_89)(free-id-set-empty?(expand-context-stops ctx_89)) #f)"
-"(parsed-quote-syntax15.1(keep-properties-only~ s_592) datum-s_0)"
-"(let-values(((s287_0) s_592)((temp288_0)(list quote-syntax271_0 datum-s_0)))"
+"(parsed-quote-syntax15.1(keep-properties-only~ s_593) datum-s_0)"
+"(let-values(((s287_0) s_593)((temp288_0)(list quote-syntax271_0 datum-s_0)))"
 "(rebuild5.1 #t s287_0 temp288_0))))))))))))))"
 "(void"
 "(add-core-form!*"
 " 'if"
-"(lambda(s_626 ctx_90)"
+"(lambda(s_627 ctx_90)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_107)(expand-context-observer ctx_90)))"
-"(if obs_107(let-values()(let-values()(call-expand-observe obs_107 'prim-if)))(void)))"
+"(let-values(((obs_108)(expand-context-observer ctx_90)))"
+"(if obs_108(let-values()(let-values()(call-expand-observe obs_108 'prim-if)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_13)(syntax-disarm$1 s_626)))"
+"(let-values(((disarmed-s_13)(syntax-disarm$1 s_627)))"
 "(let-values(((ok?_52 _289_0 _290_0 _291_0)"
-"(let-values(((s_627) disarmed-s_13))"
-"(if(let-values(((s_628)(if(syntax?$1 s_627)(syntax-e$1 s_627) s_627)))"
-"(if(pair? s_628)"
-"(if(let-values(((s_629)(car s_628))) #t)"
-"(let-values(((s_630)(cdr s_628)))"
-"(let-values(((s_631)(if(syntax?$1 s_630)(syntax-e$1 s_630) s_630)))"
-"(if(pair? s_631)"
-"(if(let-values(((s_632)(car s_631))) #t)"
-"(let-values(((s_633)(cdr s_631)))"
-"(let-values(((s_634)(if(syntax?$1 s_633)(syntax-e$1 s_633) s_633)))"
-"(if(pair? s_634)"
-"(if(let-values(((s_635)(car s_634))) #t)"
-"(let-values(((s_636)(cdr s_634)))"
-"(let-values(((s_637)"
-"(if(syntax?$1 s_636)(syntax-e$1 s_636) s_636)))"
-"(null? s_637)))"
+"(let-values(((s_628) disarmed-s_13))"
+"(if(let-values(((s_629)(if(syntax?$1 s_628)(syntax-e$1 s_628) s_628)))"
+"(if(pair? s_629)"
+"(if(let-values(((s_630)(car s_629))) #t)"
+"(let-values(((s_631)(cdr s_629)))"
+"(let-values(((s_632)(if(syntax?$1 s_631)(syntax-e$1 s_631) s_631)))"
+"(if(pair? s_632)"
+"(if(let-values(((s_633)(car s_632))) #t)"
+"(let-values(((s_634)(cdr s_632)))"
+"(let-values(((s_635)(if(syntax?$1 s_634)(syntax-e$1 s_634) s_634)))"
+"(if(pair? s_635)"
+"(if(let-values(((s_636)(car s_635))) #t)"
+"(let-values(((s_637)(cdr s_635)))"
+"(let-values(((s_638)"
+"(if(syntax?$1 s_637)(syntax-e$1 s_637) s_637)))"
+"(null? s_638)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -67112,37 +67134,37 @@ static const char *startup_source =
 " #f))"
 "(let-values()"
 "(let-values(((_289_1 _290_1 _291_1)"
-"(let-values(((s_638)(if(syntax?$1 s_627)(syntax-e$1 s_627) s_627)))"
-"(let-values(((_292_0)(let-values(((s_639)(car s_638))) s_639))"
+"(let-values(((s_639)(if(syntax?$1 s_628)(syntax-e$1 s_628) s_628)))"
+"(let-values(((_292_0)(let-values(((s_640)(car s_639))) s_640))"
 "((_293_0 _294_0)"
-"(let-values(((s_640)(cdr s_638)))"
-"(let-values(((s_641)"
-"(if(syntax?$1 s_640)"
-"(syntax-e$1 s_640)"
-" s_640)))"
+"(let-values(((s_641)(cdr s_639)))"
+"(let-values(((s_642)"
+"(if(syntax?$1 s_641)"
+"(syntax-e$1 s_641)"
+" s_641)))"
 "(let-values(((_295_0)"
-"(let-values(((s_642)(car s_641))) s_642))"
+"(let-values(((s_643)(car s_642))) s_643))"
 "((_296_0)"
-"(let-values(((s_643)(cdr s_641)))"
-"(let-values(((s_644)"
-"(if(syntax?$1 s_643)"
-"(syntax-e$1 s_643)"
-" s_643)))"
-"(let-values(((_297_0)"
+"(let-values(((s_644)(cdr s_642)))"
 "(let-values(((s_645)"
-"(car"
+"(if(syntax?$1 s_644)"
+"(syntax-e$1 s_644)"
 " s_644)))"
-" s_645))"
-"(()"
+"(let-values(((_297_0)"
 "(let-values(((s_646)"
-"(cdr"
-" s_644)))"
+"(car"
+" s_645)))"
+" s_646))"
+"(()"
 "(let-values(((s_647)"
+"(cdr"
+" s_645)))"
+"(let-values(((s_648)"
 "(if(syntax?$1"
-" s_646)"
+" s_647)"
 "(syntax-e$1"
-" s_646)"
-" s_646)))"
+" s_647)"
+" s_647)))"
 "(values)))))"
 "(values _297_0))))))"
 "(values _295_0 _296_0))))))"
@@ -67152,67 +67174,67 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if ok?_52"
-"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_626))"
+"                             (let-values () (raise-syntax-error$1 #f \"missing an \\\"else\\\" expression\" s_627))"
 "(void))"
 "(values))))"
 "(let-values(((ok?_53 if298_0 tst299_0 thn300_0 els301_0)"
-"(let-values(((s_648) disarmed-s_13))"
-"(let-values(((orig-s_54) s_648))"
+"(let-values(((s_649) disarmed-s_13))"
+"(let-values(((orig-s_54) s_649))"
 "(let-values(((if298_1 tst299_1 thn300_1 els301_1)"
-"(let-values(((s_649)(if(syntax?$1 s_648)(syntax-e$1 s_648) s_648)))"
-"(if(pair? s_649)"
-"(let-values(((if302_0)(let-values(((s_650)(car s_649))) s_650))"
+"(let-values(((s_650)(if(syntax?$1 s_649)(syntax-e$1 s_649) s_649)))"
+"(if(pair? s_650)"
+"(let-values(((if302_0)(let-values(((s_651)(car s_650))) s_651))"
 "((tst303_0 thn304_0 els305_0)"
-"(let-values(((s_651)(cdr s_649)))"
-"(let-values(((s_652)"
-"(if(syntax?$1 s_651)"
-"(syntax-e$1 s_651)"
-" s_651)))"
-"(if(pair? s_652)"
+"(let-values(((s_652)(cdr s_650)))"
+"(let-values(((s_653)"
+"(if(syntax?$1 s_652)"
+"(syntax-e$1 s_652)"
+" s_652)))"
+"(if(pair? s_653)"
 "(let-values(((tst306_0)"
-"(let-values(((s_653)(car s_652)))"
-" s_653))"
+"(let-values(((s_654)(car s_653)))"
+" s_654))"
 "((thn307_0 els308_0)"
-"(let-values(((s_654)(cdr s_652)))"
-"(let-values(((s_655)"
-"(if(syntax?$1 s_654)"
-"(syntax-e$1 s_654)"
-" s_654)))"
-"(if(pair? s_655)"
-"(let-values(((thn309_0)"
+"(let-values(((s_655)(cdr s_653)))"
 "(let-values(((s_656)"
-"(car"
+"(if(syntax?$1 s_655)"
+"(syntax-e$1 s_655)"
 " s_655)))"
-" s_656))"
-"((els310_0)"
+"(if(pair? s_656)"
+"(let-values(((thn309_0)"
 "(let-values(((s_657)"
-"(cdr"
-" s_655)))"
-"(let-values(((s_658)"
-"(if(syntax?$1"
-" s_657)"
-"(syntax-e$1"
-" s_657)"
-" s_657)))"
-"(if(pair?"
-" s_658)"
-"(let-values(((els311_0)"
-"(let-values(((s_659)"
 "(car"
-" s_658)))"
-" s_659))"
-"(()"
-"(let-values(((s_660)"
+" s_656)))"
+" s_657))"
+"((els310_0)"
+"(let-values(((s_658)"
 "(cdr"
-" s_658)))"
-"(let-values(((s_661)"
+" s_656)))"
+"(let-values(((s_659)"
 "(if(syntax?$1"
-" s_660)"
+" s_658)"
 "(syntax-e$1"
-" s_660)"
-" s_660)))"
-"(if(null?"
+" s_658)"
+" s_658)))"
+"(if(pair?"
+" s_659)"
+"(let-values(((els311_0)"
+"(let-values(((s_660)"
+"(car"
+" s_659)))"
+" s_660))"
+"(()"
+"(let-values(((s_661)"
+"(cdr"
+" s_659)))"
+"(let-values(((s_662)"
+"(if(syntax?$1"
 " s_661)"
+"(syntax-e$1"
+" s_661)"
+" s_661)))"
+"(if(null?"
+" s_662)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67242,16 +67264,16 @@ static const char *startup_source =
 "(let-values(((expr-ctx312_0) expr-ctx_2)((ctx313_0) ctx_90))"
 "(as-tail-context22.1 ctx313_0 expr-ctx312_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx314_0) ctx_90)((s315_0) s_626))"
+"(let-values(((ctx314_0) ctx_90)((s315_0) s_627))"
 "(keep-as-needed119.1 #f #f #f ctx314_0 s315_0))))"
 "(let-values(((exp-tst_0)"
 "(let-values(((temp316_0) tst299_0)((expr-ctx317_0) expr-ctx_2))"
 "(expand9.1 #f #f #f temp316_0 expr-ctx317_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_108)(expand-context-observer ctx_90)))"
-"(if obs_108"
-"(let-values()(let-values()(call-expand-observe obs_108 'next)))"
+"(let-values(((obs_109)(expand-context-observer ctx_90)))"
+"(if obs_109"
+"(let-values()(let-values()(call-expand-observe obs_109 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-thn_0)"
@@ -67259,9 +67281,9 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp318_0 tail-ctx319_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_109)(expand-context-observer ctx_90)))"
-"(if obs_109"
-"(let-values()(let-values()(call-expand-observe obs_109 'next)))"
+"(let-values(((obs_110)(expand-context-observer ctx_90)))"
+"(if obs_110"
+"(let-values()(let-values()(call-expand-observe obs_110 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-els_0)"
@@ -67275,73 +67297,73 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_662 ctx_91)"
+"(lambda(s_663 ctx_91)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_110)(expand-context-observer ctx_91)))"
-"(if obs_110"
-"(let-values()(let-values()(call-expand-observe obs_110 'prim-with-continuation-mark)))"
+"(let-values(((obs_111)(expand-context-observer ctx_91)))"
+"(if obs_111"
+"(let-values()(let-values()(call-expand-observe obs_111 'prim-with-continuation-mark)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_14)(syntax-disarm$1 s_662)))"
+"(let-values(((disarmed-s_14)(syntax-disarm$1 s_663)))"
 "(let-values(((ok?_54 with-continuation-mark324_0 key325_0 val326_0 body327_0)"
-"(let-values(((s_663) disarmed-s_14))"
-"(let-values(((orig-s_55) s_663))"
+"(let-values(((s_664) disarmed-s_14))"
+"(let-values(((orig-s_55) s_664))"
 "(let-values(((with-continuation-mark324_1 key325_1 val326_1 body327_1)"
-"(let-values(((s_664)(if(syntax?$1 s_663)(syntax-e$1 s_663) s_663)))"
-"(if(pair? s_664)"
+"(let-values(((s_665)(if(syntax?$1 s_664)(syntax-e$1 s_664) s_664)))"
+"(if(pair? s_665)"
 "(let-values(((with-continuation-mark328_0)"
-"(let-values(((s_665)(car s_664))) s_665))"
+"(let-values(((s_666)(car s_665))) s_666))"
 "((key329_0 val330_0 body331_0)"
-"(let-values(((s_666)(cdr s_664)))"
-"(let-values(((s_667)"
-"(if(syntax?$1 s_666)"
-"(syntax-e$1 s_666)"
-" s_666)))"
-"(if(pair? s_667)"
+"(let-values(((s_667)(cdr s_665)))"
+"(let-values(((s_668)"
+"(if(syntax?$1 s_667)"
+"(syntax-e$1 s_667)"
+" s_667)))"
+"(if(pair? s_668)"
 "(let-values(((key332_0)"
-"(let-values(((s_668)(car s_667)))"
-" s_668))"
+"(let-values(((s_669)(car s_668)))"
+" s_669))"
 "((val333_0 body334_0)"
-"(let-values(((s_669)(cdr s_667)))"
-"(let-values(((s_670)"
-"(if(syntax?$1 s_669)"
-"(syntax-e$1 s_669)"
-" s_669)))"
-"(if(pair? s_670)"
-"(let-values(((val335_0)"
+"(let-values(((s_670)(cdr s_668)))"
 "(let-values(((s_671)"
-"(car"
+"(if(syntax?$1 s_670)"
+"(syntax-e$1 s_670)"
 " s_670)))"
-" s_671))"
-"((body336_0)"
+"(if(pair? s_671)"
+"(let-values(((val335_0)"
 "(let-values(((s_672)"
-"(cdr"
-" s_670)))"
-"(let-values(((s_673)"
-"(if(syntax?$1"
-" s_672)"
-"(syntax-e$1"
-" s_672)"
-" s_672)))"
-"(if(pair? s_673)"
-"(let-values(((body337_0)"
-"(let-values(((s_674)"
 "(car"
-" s_673)))"
-" s_674))"
-"(()"
-"(let-values(((s_675)"
+" s_671)))"
+" s_672))"
+"((body336_0)"
+"(let-values(((s_673)"
 "(cdr"
-" s_673)))"
-"(let-values(((s_676)"
+" s_671)))"
+"(let-values(((s_674)"
 "(if(syntax?$1"
-" s_675)"
+" s_673)"
 "(syntax-e$1"
-" s_675)"
-" s_675)))"
-"(if(null?"
+" s_673)"
+" s_673)))"
+"(if(pair? s_674)"
+"(let-values(((body337_0)"
+"(let-values(((s_675)"
+"(car"
+" s_674)))"
+" s_675))"
+"(()"
+"(let-values(((s_676)"
+"(cdr"
+" s_674)))"
+"(let-values(((s_677)"
+"(if(syntax?$1"
 " s_676)"
+"(syntax-e$1"
+" s_676)"
+" s_676)))"
+"(if(null?"
+" s_677)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67365,16 +67387,16 @@ static const char *startup_source =
 "(values #t with-continuation-mark324_1 key325_1 val326_1 body327_1))))))"
 "(let-values(((expr-ctx_3)(as-expression-context ctx_91)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx338_0) ctx_91)((s339_0) s_662))"
+"(let-values(((ctx338_0) ctx_91)((s339_0) s_663))"
 "(keep-as-needed119.1 #f #f #f ctx338_0 s339_0))))"
 "(let-values(((exp-key_0)"
 "(let-values(((temp340_0) key325_0)((expr-ctx341_0) expr-ctx_3))"
 "(expand9.1 #f #f #f temp340_0 expr-ctx341_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_111)(expand-context-observer ctx_91)))"
-"(if obs_111"
-"(let-values()(let-values()(call-expand-observe obs_111 'next)))"
+"(let-values(((obs_112)(expand-context-observer ctx_91)))"
+"(if obs_112"
+"(let-values()(let-values()(call-expand-observe obs_112 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-val_0)"
@@ -67382,9 +67404,9 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp342_0 expr-ctx343_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_112)(expand-context-observer ctx_91)))"
-"(if obs_112"
-"(let-values()(let-values()(call-expand-observe obs_112 'next)))"
+"(let-values(((obs_113)(expand-context-observer ctx_91)))"
+"(if obs_113"
+"(let-values()(let-values()(call-expand-observe obs_113 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((exp-body_6)"
@@ -67408,32 +67430,32 @@ static const char *startup_source =
 "(let-values(((list-start-index_0) list-start-index14_0))"
 "(let-values(((last-is-tail?_0) last-is-tail?15_0))"
 "(let-values()"
-"(lambda(s_677 ctx_92)"
+"(lambda(s_678 ctx_92)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_113)(expand-context-observer ctx_92)))"
-"(if obs_113"
-"(let-values()(let-values()(call-expand-observe obs_113 log-tag_1)))"
+"(let-values(((obs_114)(expand-context-observer ctx_92)))"
+"(if obs_114"
+"(let-values()(let-values()(call-expand-observe obs_114 log-tag_1)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_15)(syntax-disarm$1 s_677)))"
+"(let-values(((disarmed-s_15)(syntax-disarm$1 s_678)))"
 "(let-values(((ok?_55 begin350_0 e351_0)"
-"(let-values(((s_678) disarmed-s_15))"
-"(let-values(((orig-s_56) s_678))"
+"(let-values(((s_679) disarmed-s_15))"
+"(let-values(((orig-s_56) s_679))"
 "(let-values(((begin350_1 e351_1)"
-"(let-values(((s_679)"
-"(if(syntax?$1 s_678)(syntax-e$1 s_678) s_678)))"
-"(if(pair? s_679)"
+"(let-values(((s_680)"
+"(if(syntax?$1 s_679)(syntax-e$1 s_679) s_679)))"
+"(if(pair? s_680)"
 "(let-values(((begin352_0)"
-"(let-values(((s_680)(car s_679))) s_680))"
+"(let-values(((s_681)(car s_680))) s_681))"
 "((e353_0)"
-"(let-values(((s_681)(cdr s_679)))"
-"(let-values(((s_682)"
-"(if(syntax?$1 s_681)"
-"(syntax-e$1 s_681)"
-" s_681)))"
+"(let-values(((s_682)(cdr s_680)))"
+"(let-values(((s_683)"
+"(if(syntax?$1 s_682)"
+"(syntax-e$1 s_682)"
+" s_682)))"
 "(let-values(((flat-s_45)"
-"(to-syntax-list.1 s_682)))"
+"(to-syntax-list.1 s_683)))"
 "(if(not flat-s_45)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -67455,7 +67477,7 @@ static const char *startup_source =
 "(as-begin-expression-context ctx_92)"
 "(as-expression-context ctx_92))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx354_0) ctx_92)((s355_0) s_677))"
+"(let-values(((ctx354_0) ctx_92)((s355_0) s_678))"
 "(keep-as-needed119.1 #f #f #f ctx354_0 s355_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_123)"
@@ -67465,17 +67487,17 @@ static const char *startup_source =
 "(begin"
 "(if(zero? index_6)"
 "(let-values()"
-"(let-values(((obs_114)"
+"(let-values(((obs_115)"
 "(expand-context-observer ctx_92)))"
-"(if obs_114"
+"(if obs_115"
 "(let-values()"
 "(begin"
 "(if(zero? list-start-index_0)"
 "(void)"
 "(let-values()"
-"(call-expand-observe obs_114 'next)))"
+"(call-expand-observe obs_115 'next)))"
 "(call-expand-observe"
-" obs_114"
+" obs_115"
 " 'enter-list"
 "(datum->syntax$1 #f es_5 rebuild-s_11))))"
 "(void))))"
@@ -67485,13 +67507,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((rest-es_1)(cdr es_5)))"
 "(begin"
-"(let-values(((obs_115)"
+"(let-values(((obs_116)"
 "(expand-context-observer"
 " ctx_92)))"
-"(if obs_115"
+"(if obs_116"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_115 'next)))"
+"(call-expand-observe obs_116 'next)))"
 "(void)))"
 "(cons"
 "(let-values(((temp356_0)(car es_5))"
@@ -67513,12 +67535,12 @@ static const char *startup_source =
 " e351_0"
 " list-start-index_0)))"
 "(begin"
-"(let-values(((obs_116)(expand-context-observer ctx_92)))"
-"(if obs_116"
+"(let-values(((obs_117)(expand-context-observer ctx_92)))"
+"(if obs_117"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_116"
+" obs_117"
 " 'exit-list"
 "(datum->syntax$1 #f(list-tail exp-es_2 list-start-index_0) rebuild-s_11))))"
 "(void)))"
@@ -67535,39 +67557,39 @@ static const char *startup_source =
 "((temp364_0) 0)"
 "((temp365_0) #t))"
 "(make-begin20.1 temp365_0 temp364_0 temp362_0 parsed-begin363_0))))"
-"(lambda(s_683 ctx_93)"
+"(lambda(s_684 ctx_93)"
 "(let-values(((context_25)(expand-context-context ctx_93)))"
-"(if(let-values(((or-part_384)(eq? context_25 'top-level)))"
-"(if or-part_384 or-part_384(eq? context_25 'module)))"
+"(if(let-values(((or-part_382)(eq? context_25 'top-level)))"
+"(if or-part_382 or-part_382(eq? context_25 'module)))"
 "(let-values()"
-"(let-values(((disarmed-s_16)(syntax-disarm$1 s_683)))"
+"(let-values(((disarmed-s_16)(syntax-disarm$1 s_684)))"
 "(let-values(((ok?_56 begin366_0)"
-"(let-values(((s_684) disarmed-s_16))"
-"(if(let-values(((s_685)(if(syntax?$1 s_684)(syntax-e$1 s_684) s_684)))"
-"(if(pair? s_685)"
-"(if(let-values(((s_686)(car s_685))) #t)"
-"(let-values(((s_687)(cdr s_685)))"
-"(let-values(((s_688)(if(syntax?$1 s_687)(syntax-e$1 s_687) s_687)))"
-"(null? s_688)))"
+"(let-values(((s_685) disarmed-s_16))"
+"(if(let-values(((s_686)(if(syntax?$1 s_685)(syntax-e$1 s_685) s_685)))"
+"(if(pair? s_686)"
+"(if(let-values(((s_687)(car s_686))) #t)"
+"(let-values(((s_688)(cdr s_686)))"
+"(let-values(((s_689)(if(syntax?$1 s_688)(syntax-e$1 s_688) s_688)))"
+"(null? s_689)))"
 " #f)"
 " #f))"
 "(let-values()"
 "(let-values(((begin366_1)"
-"(let-values(((s_689)(if(syntax?$1 s_684)(syntax-e$1 s_684) s_684)))"
+"(let-values(((s_690)(if(syntax?$1 s_685)(syntax-e$1 s_685) s_685)))"
 "(let-values(((begin367_0)"
-"(let-values(((s_690)(car s_689))) s_690))"
+"(let-values(((s_691)(car s_690))) s_691))"
 "(()"
-"(let-values(((s_691)(cdr s_689)))"
-"(let-values(((s_692)"
-"(if(syntax?$1 s_691)"
-"(syntax-e$1 s_691)"
-" s_691)))"
+"(let-values(((s_692)(cdr s_690)))"
+"(let-values(((s_693)"
+"(if(syntax?$1 s_692)"
+"(syntax-e$1 s_692)"
+" s_692)))"
 "(values)))))"
 "(values begin367_0)))))"
 "(values #t begin366_1)))"
 "(values #f #f)))))"
-"(if ok?_56 s_683(nonempty-begin_0 s_683 ctx_93)))))"
-"(let-values()(nonempty-begin_0 s_683 ctx_93))))))))"
+"(if ok?_56 s_684(nonempty-begin_0 s_684 ctx_93)))))"
+"(let-values()(nonempty-begin_0 s_684 ctx_93))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
@@ -67594,58 +67616,58 @@ static const char *startup_source =
 "(lambda(s373_0 ctx374_0 implicit-omitted?372_0)"
 "(begin"
 " 'core375"
-"(let-values(((s_693) s373_0))"
+"(let-values(((s_694) s373_0))"
 "(let-values(((ctx_95) ctx374_0))"
 "(let-values(((implicit-omitted?_0) implicit-omitted?372_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_117)(expand-context-observer ctx_95)))"
-"(if obs_117"
+"(let-values(((obs_118)(expand-context-observer ctx_95)))"
+"(if obs_118"
 "(let-values()"
-"(let-values()(call-expand-observe obs_117 'prim-#%top)))"
+"(let-values()(call-expand-observe obs_118 'prim-#%top)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_17)(syntax-disarm$1 s_693)))"
+"(let-values(((disarmed-s_17)(syntax-disarm$1 s_694)))"
 "(let-values(((id_123)"
 "(if implicit-omitted?_0"
-"(let-values() s_693)"
+"(let-values() s_694)"
 "(let-values()"
 "(let-values(((ok?_57 #%top377_0 id378_0)"
-"(let-values(((s_694) disarmed-s_17))"
-"(let-values(((orig-s_57) s_694))"
+"(let-values(((s_695) disarmed-s_17))"
+"(let-values(((orig-s_57) s_695))"
 "(let-values(((#%top377_1 id378_1)"
-"(let-values(((s_695)"
-"(if(syntax?$1 s_694)"
-"(syntax-e$1 s_694)"
-" s_694)))"
-"(if(pair? s_695)"
-"(let-values(((#%top379_0)"
 "(let-values(((s_696)"
-"(car"
+"(if(syntax?$1 s_695)"
+"(syntax-e$1 s_695)"
 " s_695)))"
-" s_696))"
-"((id380_0)"
+"(if(pair? s_696)"
+"(let-values(((#%top379_0)"
 "(let-values(((s_697)"
+"(car"
+" s_696)))"
+" s_697))"
+"((id380_0)"
+"(let-values(((s_698)"
 "(cdr"
-" s_695)))"
-"(if(let-values(((or-part_385)"
+" s_696)))"
+"(if(let-values(((or-part_383)"
 "(if(syntax?$1"
-" s_697)"
+" s_698)"
 "(symbol?"
 "(syntax-e$1"
-" s_697))"
+" s_698))"
 " #f)))"
-"(if or-part_385"
-" or-part_385"
+"(if or-part_383"
+" or-part_383"
 "(symbol?"
-" s_697)))"
-" s_697"
+" s_698)))"
+" s_698"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                          \"not an identifier\""
 " orig-s_57"
-" s_697)))))"
+" s_698)))))"
 "(values #%top379_0 id380_0))"
 "(raise-syntax-error$1"
 " #f"
@@ -67676,7 +67698,7 @@ static const char *startup_source =
 "(if(expand-context-to-parsed? ctx_95)"
 "(parsed-id2.1 id_123 b_93 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_93))"
-"(let-values() s_693)"
+"(let-values() s_694)"
 "(let-values() id_123))))"
 "(if(register-eventual-variable!? id_123 ctx_95)"
 "(let-values()"
@@ -67711,42 +67733,42 @@ static const char *startup_source =
 "(let-values() id_123)"
 "(let-values()"
 "(let-values(((ok?_58 #%top386_0 id387_0)"
-"(let-values(((s_698) disarmed-s_17))"
-"(let-values(((orig-s_58) s_698))"
+"(let-values(((s_699) disarmed-s_17))"
+"(let-values(((orig-s_58) s_699))"
 "(let-values(((#%top386_1 id387_1)"
-"(let-values(((s_699)"
-"(if(syntax?$1"
-" s_698)"
-"(syntax-e$1"
-" s_698)"
-" s_698)))"
-"(if(pair? s_699)"
-"(let-values(((#%top388_0)"
 "(let-values(((s_700)"
-"(car"
-" s_699)))"
-" s_700))"
-"((id389_0)"
-"(let-values(((s_701)"
-"(cdr"
-" s_699)))"
-"(if(let-values(((or-part_386)"
 "(if(syntax?$1"
-" s_701)"
+" s_699)"
+"(syntax-e$1"
+" s_699)"
+" s_699)))"
+"(if(pair? s_700)"
+"(let-values(((#%top388_0)"
+"(let-values(((s_701)"
+"(car"
+" s_700)))"
+" s_701))"
+"((id389_0)"
+"(let-values(((s_702)"
+"(cdr"
+" s_700)))"
+"(if(let-values(((or-part_384)"
+"(if(syntax?$1"
+" s_702)"
 "(symbol?"
 "(syntax-e$1"
-" s_701))"
+" s_702))"
 " #f)))"
-"(if or-part_386"
-" or-part_386"
+"(if or-part_384"
+" or-part_384"
 "(symbol?"
-" s_701)))"
-" s_701"
+" s_702)))"
+" s_702"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                      \"not an identifier\""
 " orig-s_58"
-" s_701)))))"
+" s_702)))))"
 "(values"
 " #%top388_0"
 " id389_0))"
@@ -67755,80 +67777,80 @@ static const char *startup_source =
 "                                                                                                    \"bad syntax\""
 " orig-s_58)))))"
 "(values #t #%top386_1 id387_1))))))"
-"(let-values(((s390_0) s_693)"
+"(let-values(((s390_0) s_694)"
 "((temp391_0)(cons #%top386_0 id_123)))"
 "(rebuild5.1 #t s390_0 temp391_0)))))))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_95)"
 "(parsed-top-id4.1 id_123 b_93 #f)"
-" s_693)))))))))))))))))))))))"
+" s_694)))))))))))))))))))))))"
 "(case-lambda"
-"((s_702 ctx_96)(core375_0 s_702 ctx_96 #f))"
-"((s_703 ctx_97 implicit-omitted?372_1)(core375_0 s_703 ctx_97 implicit-omitted?372_1))))))"
+"((s_703 ctx_96)(core375_0 s_703 ctx_96 #f))"
+"((s_704 ctx_97 implicit-omitted?372_1)(core375_0 s_704 ctx_97 implicit-omitted?372_1))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
-"(lambda(s_704 ctx_98)"
+"(lambda(s_705 ctx_98)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_118)(expand-context-observer ctx_98)))"
-"(if obs_118(let-values()(let-values()(call-expand-observe obs_118 'prim-set!)))(void)))"
+"(let-values(((obs_119)(expand-context-observer ctx_98)))"
+"(if obs_119(let-values()(let-values()(call-expand-observe obs_119 'prim-set!)))(void)))"
 "(values))))"
-"(let-values(((disarmed-s_18)(syntax-disarm$1 s_704)))"
+"(let-values(((disarmed-s_18)(syntax-disarm$1 s_705)))"
 "(let-values(((ok?_59 set!392_0 id393_0 rhs394_0)"
-"(let-values(((s_705) disarmed-s_18))"
-"(let-values(((orig-s_59) s_705))"
+"(let-values(((s_706) disarmed-s_18))"
+"(let-values(((orig-s_59) s_706))"
 "(let-values(((set!392_1 id393_1 rhs394_1)"
-"(let-values(((s_706)(if(syntax?$1 s_705)(syntax-e$1 s_705) s_705)))"
-"(if(pair? s_706)"
-"(let-values(((set!395_0)(let-values(((s_707)(car s_706))) s_707))"
+"(let-values(((s_707)(if(syntax?$1 s_706)(syntax-e$1 s_706) s_706)))"
+"(if(pair? s_707)"
+"(let-values(((set!395_0)(let-values(((s_708)(car s_707))) s_708))"
 "((id396_0 rhs397_0)"
-"(let-values(((s_708)(cdr s_706)))"
-"(let-values(((s_709)"
-"(if(syntax?$1 s_708)"
-"(syntax-e$1 s_708)"
-" s_708)))"
-"(if(pair? s_709)"
+"(let-values(((s_709)(cdr s_707)))"
+"(let-values(((s_710)"
+"(if(syntax?$1 s_709)"
+"(syntax-e$1 s_709)"
+" s_709)))"
+"(if(pair? s_710)"
 "(let-values(((id398_0)"
-"(let-values(((s_710)(car s_709)))"
-"(if(let-values(((or-part_387)"
-"(if(syntax?$1 s_710)"
+"(let-values(((s_711)(car s_710)))"
+"(if(let-values(((or-part_385)"
+"(if(syntax?$1 s_711)"
 "(symbol?"
 "(syntax-e$1"
-" s_710))"
+" s_711))"
 " #f)))"
-"(if or-part_387"
-" or-part_387"
-"(symbol? s_710)))"
-" s_710"
+"(if or-part_385"
+" or-part_385"
+"(symbol? s_711)))"
+" s_711"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                    \"not an identifier\""
 " orig-s_59"
-" s_710))))"
+" s_711))))"
 "((rhs399_0)"
-"(let-values(((s_711)(cdr s_709)))"
-"(let-values(((s_712)"
-"(if(syntax?$1 s_711)"
-"(syntax-e$1 s_711)"
-" s_711)))"
-"(if(pair? s_712)"
-"(let-values(((rhs400_0)"
+"(let-values(((s_712)(cdr s_710)))"
 "(let-values(((s_713)"
-"(car"
+"(if(syntax?$1 s_712)"
+"(syntax-e$1 s_712)"
 " s_712)))"
-" s_713))"
-"(()"
+"(if(pair? s_713)"
+"(let-values(((rhs400_0)"
 "(let-values(((s_714)"
-"(cdr"
-" s_712)))"
+"(car"
+" s_713)))"
+" s_714))"
+"(()"
 "(let-values(((s_715)"
+"(cdr"
+" s_713)))"
+"(let-values(((s_716)"
 "(if(syntax?$1"
-" s_714)"
+" s_715)"
 "(syntax-e$1"
-" s_714)"
-" s_714)))"
-"(if(null? s_715)"
+" s_715)"
+" s_715)))"
+"(if(null? s_716)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -67872,23 +67894,23 @@ static const char *startup_source =
 "(if binding_29"
 "(let-values(((binding405_0) binding_29)"
 "((ctx406_0) ctx_98)"
-"((s407_0) s_704))"
+"((s407_0) s_705))"
 "(lookup62.1 #f #f binding405_0 ctx406_0 s407_0))"
 "(values #f #f #f #f))))"
 "(begin"
-"(let-values(((obs_119)(expand-context-observer ctx_98)))"
-"(if obs_119"
+"(let-values(((obs_120)(expand-context-observer ctx_98)))"
+"(if obs_120"
 "(let-values()"
-"(let-values()(call-expand-observe obs_119 'resolve id_124)))"
+"(let-values()(call-expand-observe obs_120 'resolve id_124)))"
 "(void)))"
-"(if(let-values(((or-part_388)(variable? t_62)))"
-"(if or-part_388"
-" or-part_388"
+"(if(let-values(((or-part_386)(variable? t_62)))"
+"(if or-part_386"
+" or-part_386"
 "(if(not binding_29)"
-"(let-values(((or-part_389)"
+"(let-values(((or-part_387)"
 "(register-eventual-variable!? id_124 ctx_98)))"
-"(if or-part_389"
-" or-part_389"
+"(if or-part_387"
+" or-part_387"
 "(expand-context-allow-unbound? ctx_98)))"
 " #f)))"
 "(let-values()"
@@ -67904,18 +67926,18 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                                    \"cannot mutate module-required identifier\""
-" s_704"
+" s_705"
 " id_124))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_120)"
+"(let-values(((obs_121)"
 "(expand-context-observer ctx_98)))"
-"(if obs_120"
+"(if obs_121"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_120 'next)))"
+"(call-expand-observe obs_121 'next)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -67923,7 +67945,7 @@ static const char *startup_source =
 "(register-variable-referenced-if-local! binding_29)"
 "(values))))"
 "(let-values(((rebuild-s_12)"
-"(let-values(((ctx408_0) ctx_98)((s409_0) s_704))"
+"(let-values(((ctx408_0) ctx_98)((s409_0) s_705))"
 "(keep-as-needed119.1 #f #f #f ctx408_0 s409_0))))"
 "(let-values(((exp-rhs_5)"
 "(let-values(((temp410_0) rhs394_0)"
@@ -67956,7 +67978,7 @@ static const char *startup_source =
 "(raise-unbound-syntax-error"
 " #f"
 "                                                  \"unbound identifier\""
-" s_704"
+" s_705"
 " id_124"
 " null"
 "(syntax-debug-info-string id_124 ctx_98)))"
@@ -67967,7 +67989,7 @@ static const char *startup_source =
 "(let-values(((temp417_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_704"
+" s_705"
 " disarmed-s_18"
 " set!392_0"
 " rhs394_0"
@@ -67982,7 +68004,7 @@ static const char *startup_source =
 "(let-values(((exp-s_13 re-ctx_1)"
 "(let-values(((t419_0) t_62)"
 "((insp420_0) insp_24)"
-"((s421_0) s_704)"
+"((s421_0) s_705)"
 "((orig-id422_0) orig-id_1)"
 "((ctx423_0) ctx_98)"
 "((binding424_0) binding_29)"
@@ -68008,7 +68030,7 @@ static const char *startup_source =
 "(let-values(((temp428_0)"
 "(avoid-current-expand-context"
 "(substitute-set!-rename"
-" s_704"
+" s_705"
 " disarmed-s_18"
 " set!392_0"
 " rhs394_0"
@@ -68031,7 +68053,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                      \"cannot mutate syntax identifier\""
-" s_704"
+" s_705"
 " id_124))))))))))))))"
 " rename-loop_0)"
 " orig-id_1"
@@ -68042,7 +68064,7 @@ static const char *startup_source =
 "(lambda(s24_3 disarmed-s25_0 set!-id26_0 id27_0 rhs-s28_0 from-rename?29_0 ctx30_0 t23_0)"
 "(begin"
 " 'substitute-set!-rename31"
-"(let-values(((s_716) s24_3))"
+"(let-values(((s_717) s24_3))"
 "(let-values(((disarmed-s_19) disarmed-s25_0))"
 "(let-values(((set!-id_0) set!-id26_0))"
 "(let-values(((id_125) id27_0))"
@@ -68051,8 +68073,8 @@ static const char *startup_source =
 "(let-values(((ctx_99) ctx30_0))"
 "(let-values(((t_63) t23_0))"
 "(let-values()"
-"(if(let-values(((or-part_390) t_63))"
-"(if or-part_390 or-part_390 from-rename?_1))"
+"(if(let-values(((or-part_388) t_63))"
+"(if or-part_388 or-part_388 from-rename?_1))"
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_63"
@@ -68064,93 +68086,93 @@ static const char *startup_source =
 "(list set!-id_0 new-id_1 rhs-s_0)"
 " disarmed-s_19"
 " disarmed-s_19)"
-" s_716)))"
-"(let-values() s_716)))))))))))))))"
+" s_717)))"
+"(let-values() s_717)))))))))))))))"
 "(case-lambda"
-"((s_717 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_100)"
-"(begin(substitute-set!-rename31_0 s_717 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_100 #f)))"
-"((s_718 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_101 t23_1)"
-"(substitute-set!-rename31_0 s_718 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_101 t23_1)))))"
+"((s_718 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_100)"
+"(begin(substitute-set!-rename31_0 s_718 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_100 #f)))"
+"((s_719 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_101 t23_1)"
+"(substitute-set!-rename31_0 s_719 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_101 t23_1)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_719 ctx_102)"
+"(lambda(s_720 ctx_102)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_121)(expand-context-observer ctx_102)))"
-"(if obs_121"
-"(let-values()(let-values()(call-expand-observe obs_121 'prim-#%variable-reference)))"
+"(let-values(((obs_122)(expand-context-observer ctx_102)))"
+"(if obs_122"
+"(let-values()(let-values()(call-expand-observe obs_122 'prim-#%variable-reference)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_22)(syntax-disarm$1 s_719)))"
+"(let-values(((disarmed-s_22)(syntax-disarm$1 s_720)))"
 "(let-values(((ok?_60 #%variable-reference430_0 id431_0)"
-"(let-values(((s_720) disarmed-s_22))"
-"(if(let-values(((s_721)(if(syntax?$1 s_720)(syntax-e$1 s_720) s_720)))"
-"(if(pair? s_721)"
-"(if(let-values(((s_722)(car s_721))) #t)"
-"(let-values(((s_723)(cdr s_721)))"
-"(let-values(((s_724)(if(syntax?$1 s_723)(syntax-e$1 s_723) s_723)))"
-"(if(pair? s_724)"
-"(if(let-values(((s_725)(car s_724)))"
-"(let-values(((or-part_391)"
-"(if(syntax?$1 s_725)(symbol?(syntax-e$1 s_725)) #f)))"
-"(if or-part_391 or-part_391(symbol? s_725))))"
-"(let-values(((s_726)(cdr s_724)))"
-"(let-values(((s_727)(if(syntax?$1 s_726)(syntax-e$1 s_726) s_726)))"
-"(null? s_727)))"
+"(let-values(((s_721) disarmed-s_22))"
+"(if(let-values(((s_722)(if(syntax?$1 s_721)(syntax-e$1 s_721) s_721)))"
+"(if(pair? s_722)"
+"(if(let-values(((s_723)(car s_722))) #t)"
+"(let-values(((s_724)(cdr s_722)))"
+"(let-values(((s_725)(if(syntax?$1 s_724)(syntax-e$1 s_724) s_724)))"
+"(if(pair? s_725)"
+"(if(let-values(((s_726)(car s_725)))"
+"(let-values(((or-part_389)"
+"(if(syntax?$1 s_726)(symbol?(syntax-e$1 s_726)) #f)))"
+"(if or-part_389 or-part_389(symbol? s_726))))"
+"(let-values(((s_727)(cdr s_725)))"
+"(let-values(((s_728)(if(syntax?$1 s_727)(syntax-e$1 s_727) s_727)))"
+"(null? s_728)))"
 " #f)"
 " #f)))"
 " #f)"
 " #f))"
 "(let-values()"
 "(let-values(((#%variable-reference430_1 id431_1)"
-"(let-values(((s_728)(if(syntax?$1 s_720)(syntax-e$1 s_720) s_720)))"
+"(let-values(((s_729)(if(syntax?$1 s_721)(syntax-e$1 s_721) s_721)))"
 "(let-values(((#%variable-reference432_0)"
-"(let-values(((s_729)(car s_728))) s_729))"
+"(let-values(((s_730)(car s_729))) s_730))"
 "((id433_0)"
-"(let-values(((s_730)(cdr s_728)))"
-"(let-values(((s_731)"
-"(if(syntax?$1 s_730)"
-"(syntax-e$1 s_730)"
-" s_730)))"
+"(let-values(((s_731)(cdr s_729)))"
+"(let-values(((s_732)"
+"(if(syntax?$1 s_731)"
+"(syntax-e$1 s_731)"
+" s_731)))"
 "(let-values(((id434_0)"
-"(let-values(((s_732)(car s_731))) s_732))"
+"(let-values(((s_733)(car s_732))) s_733))"
 "(()"
-"(let-values(((s_733)(cdr s_731)))"
-"(let-values(((s_734)"
-"(if(syntax?$1 s_733)"
-"(syntax-e$1 s_733)"
-" s_733)))"
+"(let-values(((s_734)(cdr s_732)))"
+"(let-values(((s_735)"
+"(if(syntax?$1 s_734)"
+"(syntax-e$1 s_734)"
+" s_734)))"
 "(values)))))"
 "(values id434_0))))))"
 "(values #%variable-reference432_0 id433_0)))))"
 "(values #t #%variable-reference430_1 id431_1)))"
 "(values #f #f #f)))))"
 "(let-values(((ok?_61 #%variable-reference435_0 #%top436_0 id437_0)"
-"(let-values(((s_735) disarmed-s_22))"
+"(let-values(((s_736) disarmed-s_22))"
 "(if(if(not ok?_60)"
-"(let-values(((s_736)(if(syntax?$1 s_735)(syntax-e$1 s_735) s_735)))"
-"(if(pair? s_736)"
-"(if(let-values(((s_737)(car s_736))) #t)"
-"(let-values(((s_738)(cdr s_736)))"
-"(let-values(((s_739)(if(syntax?$1 s_738)(syntax-e$1 s_738) s_738)))"
-"(if(pair? s_739)"
-"(if(let-values(((s_740)(car s_739)))"
-"(let-values(((s_741)"
-"(if(syntax?$1 s_740)(syntax-e$1 s_740) s_740)))"
-"(if(pair? s_741)"
-"(if(let-values(((s_742)(car s_741))) #t)"
-"(let-values(((s_743)(cdr s_741)))"
-"(let-values(((or-part_392)"
-"(if(syntax?$1 s_743)"
-"(symbol?(syntax-e$1 s_743))"
+"(let-values(((s_737)(if(syntax?$1 s_736)(syntax-e$1 s_736) s_736)))"
+"(if(pair? s_737)"
+"(if(let-values(((s_738)(car s_737))) #t)"
+"(let-values(((s_739)(cdr s_737)))"
+"(let-values(((s_740)(if(syntax?$1 s_739)(syntax-e$1 s_739) s_739)))"
+"(if(pair? s_740)"
+"(if(let-values(((s_741)(car s_740)))"
+"(let-values(((s_742)"
+"(if(syntax?$1 s_741)(syntax-e$1 s_741) s_741)))"
+"(if(pair? s_742)"
+"(if(let-values(((s_743)(car s_742))) #t)"
+"(let-values(((s_744)(cdr s_742)))"
+"(let-values(((or-part_390)"
+"(if(syntax?$1 s_744)"
+"(symbol?(syntax-e$1 s_744))"
 " #f)))"
-"(if or-part_392 or-part_392(symbol? s_743))))"
+"(if or-part_390 or-part_390(symbol? s_744))))"
 " #f)"
 " #f)))"
-"(let-values(((s_744)(cdr s_739)))"
-"(let-values(((s_745)(if(syntax?$1 s_744)(syntax-e$1 s_744) s_744)))"
-"(null? s_745)))"
+"(let-values(((s_745)(cdr s_740)))"
+"(let-values(((s_746)(if(syntax?$1 s_745)(syntax-e$1 s_745) s_745)))"
+"(null? s_746)))"
 " #f)"
 " #f)))"
 " #f)"
@@ -68158,61 +68180,61 @@ static const char *startup_source =
 " #f)"
 "(let-values()"
 "(let-values(((#%variable-reference435_1 #%top436_1 id437_1)"
-"(let-values(((s_746)(if(syntax?$1 s_735)(syntax-e$1 s_735) s_735)))"
+"(let-values(((s_747)(if(syntax?$1 s_736)(syntax-e$1 s_736) s_736)))"
 "(let-values(((#%variable-reference438_0)"
-"(let-values(((s_747)(car s_746))) s_747))"
+"(let-values(((s_748)(car s_747))) s_748))"
 "((#%top439_0 id440_0)"
-"(let-values(((s_748)(cdr s_746)))"
-"(let-values(((s_749)"
-"(if(syntax?$1 s_748)"
-"(syntax-e$1 s_748)"
-" s_748)))"
+"(let-values(((s_749)(cdr s_747)))"
+"(let-values(((s_750)"
+"(if(syntax?$1 s_749)"
+"(syntax-e$1 s_749)"
+" s_749)))"
 "(let-values(((#%top441_0 id442_0)"
-"(let-values(((s_750)(car s_749)))"
-"(let-values(((s_751)"
-"(if(syntax?$1 s_750)"
-"(syntax-e$1 s_750)"
-" s_750)))"
-"(let-values(((#%top443_0)"
+"(let-values(((s_751)(car s_750)))"
 "(let-values(((s_752)"
-"(car"
+"(if(syntax?$1 s_751)"
+"(syntax-e$1 s_751)"
 " s_751)))"
-" s_752))"
-"((id444_0)"
+"(let-values(((#%top443_0)"
 "(let-values(((s_753)"
+"(car"
+" s_752)))"
+" s_753))"
+"((id444_0)"
+"(let-values(((s_754)"
 "(cdr"
-" s_751)))"
-" s_753)))"
+" s_752)))"
+" s_754)))"
 "(values #%top443_0 id444_0)))))"
 "(()"
-"(let-values(((s_754)(cdr s_749)))"
-"(let-values(((s_755)"
-"(if(syntax?$1 s_754)"
-"(syntax-e$1 s_754)"
-" s_754)))"
+"(let-values(((s_755)(cdr s_750)))"
+"(let-values(((s_756)"
+"(if(syntax?$1 s_755)"
+"(syntax-e$1 s_755)"
+" s_755)))"
 "(values)))))"
 "(values #%top441_0 id442_0))))))"
 "(values #%variable-reference438_0 #%top439_0 id440_0)))))"
 "(values #t #%variable-reference435_1 #%top436_1 id437_1)))"
 "(values #f #f #f #f)))))"
 "(let-values(((ok?_62 #%variable-reference445_0)"
-"(let-values(((s_756) disarmed-s_22))"
-"(if(if(not(let-values(((or-part_393) ok?_60))(if or-part_393 or-part_393 ok?_61)))"
+"(let-values(((s_757) disarmed-s_22))"
+"(if(if(not(let-values(((or-part_391) ok?_60))(if or-part_391 or-part_391 ok?_61)))"
 " #t"
 " #f)"
-"(let-values(((orig-s_60) s_756))"
+"(let-values(((orig-s_60) s_757))"
 "(let-values(((#%variable-reference445_1)"
-"(let-values(((s_757)(if(syntax?$1 s_756)(syntax-e$1 s_756) s_756)))"
-"(if(pair? s_757)"
+"(let-values(((s_758)(if(syntax?$1 s_757)(syntax-e$1 s_757) s_757)))"
+"(if(pair? s_758)"
 "(let-values(((#%variable-reference446_0)"
-"(let-values(((s_758)(car s_757))) s_758))"
+"(let-values(((s_759)(car s_758))) s_759))"
 "(()"
-"(let-values(((s_759)(cdr s_757)))"
-"(let-values(((s_760)"
-"(if(syntax?$1 s_759)"
-"(syntax-e$1 s_759)"
-" s_759)))"
-"(if(null? s_760)"
+"(let-values(((s_760)(cdr s_758)))"
+"(let-values(((s_761)"
+"(if(syntax?$1 s_760)"
+"(syntax-e$1 s_760)"
+" s_760)))"
+"(if(null? s_761)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68222,7 +68244,7 @@ static const char *startup_source =
 "                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_60)))))"
 "(values #t #%variable-reference445_1)))"
 "(values #f #f)))))"
-"(if(let-values(((or-part_394) ok?_60))(if or-part_394 or-part_394 ok?_61))"
+"(if(let-values(((or-part_392) ok?_60))(if or-part_392 or-part_392 ok?_61))"
 "(let-values()"
 "(let-values(((var-id_0)(if ok?_60 id431_0 id437_0)))"
 "(let-values(((binding_30)"
@@ -68238,14 +68260,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_395) binding_30))"
-"(if or-part_395 or-part_395(expand-context-allow-unbound? ctx_102)))"
+"(if(let-values(((or-part_393) binding_30))"
+"(if or-part_393 or-part_393(expand-context-allow-unbound? ctx_102)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
 "                                              \"unbound identifier\""
-" s_719"
+" s_720"
 " var-id_0"
 " null"
 "(syntax-debug-info-string var-id_0 ctx_102))))"
@@ -68255,63 +68277,63 @@ static const char *startup_source =
 "(let-values(((binding450_0) binding_30)"
 "((ctx451_0) ctx_102)"
 "((var-id452_0) var-id_0)"
-"((s453_0) s_719)"
+"((s453_0) s_720)"
 "((temp454_0)(expand-context-in-local-expand? ctx_102)))"
 "(lookup62.1 s453_0 temp454_0 binding450_0 ctx451_0 var-id452_0))"
 "(values #f #f #f #f))))"
 "(begin"
 "(if(if t_64(not(variable? t_64)) #f)"
 "(let-values()"
-"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_719))"
+"                                   (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_720))"
 "(void))"
 "(if(expand-context-to-parsed? ctx_102)"
 "(parsed-#%variable-reference11.1"
-"(keep-properties-only~ s_719)"
+"(keep-properties-only~ s_720)"
 "(if ok?_61"
 "(let-values()(parsed-top-id4.1 var-id_0 binding_30 #f))"
 "(let-values()(parsed-id2.1 var-id_0 binding_30 #f))))"
-" s_719))))))))"
+" s_720))))))))"
 "(let-values()"
 "(if(expand-context-to-parsed? ctx_102)"
-"(parsed-#%variable-reference11.1(keep-properties-only~ s_719) #f)"
-" s_719)))))))))))"
+"(parsed-#%variable-reference11.1(keep-properties-only~ s_720) #f)"
+" s_720)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_761 ctx_103)"
+"(lambda(s_762 ctx_103)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_122)(expand-context-observer ctx_103)))"
-"(if obs_122"
-"(let-values()(let-values()(call-expand-observe obs_122 'prim-#%expression)))"
+"(let-values(((obs_123)(expand-context-observer ctx_103)))"
+"(if obs_123"
+"(let-values()(let-values()(call-expand-observe obs_123 'prim-#%expression)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_23)(syntax-disarm$1 s_761)))"
+"(let-values(((disarmed-s_23)(syntax-disarm$1 s_762)))"
 "(let-values(((ok?_63 #%expression455_0 e456_0)"
-"(let-values(((s_762) disarmed-s_23))"
-"(let-values(((orig-s_61) s_762))"
+"(let-values(((s_763) disarmed-s_23))"
+"(let-values(((orig-s_61) s_763))"
 "(let-values(((#%expression455_1 e456_1)"
-"(let-values(((s_763)(if(syntax?$1 s_762)(syntax-e$1 s_762) s_762)))"
-"(if(pair? s_763)"
+"(let-values(((s_764)(if(syntax?$1 s_763)(syntax-e$1 s_763) s_763)))"
+"(if(pair? s_764)"
 "(let-values(((#%expression457_0)"
-"(let-values(((s_764)(car s_763))) s_764))"
+"(let-values(((s_765)(car s_764))) s_765))"
 "((e458_0)"
-"(let-values(((s_765)(cdr s_763)))"
-"(let-values(((s_766)"
-"(if(syntax?$1 s_765)"
-"(syntax-e$1 s_765)"
-" s_765)))"
-"(if(pair? s_766)"
+"(let-values(((s_766)(cdr s_764)))"
+"(let-values(((s_767)"
+"(if(syntax?$1 s_766)"
+"(syntax-e$1 s_766)"
+" s_766)))"
+"(if(pair? s_767)"
 "(let-values(((e459_0)"
-"(let-values(((s_767)(car s_766)))"
-" s_767))"
+"(let-values(((s_768)(car s_767)))"
+" s_768))"
 "(()"
-"(let-values(((s_768)(cdr s_766)))"
-"(let-values(((s_769)"
-"(if(syntax?$1 s_768)"
-"(syntax-e$1 s_768)"
-" s_768)))"
-"(if(null? s_769)"
+"(let-values(((s_769)(cdr s_767)))"
+"(let-values(((s_770)"
+"(if(syntax?$1 s_769)"
+"(syntax-e$1 s_769)"
+" s_769)))"
+"(if(null? s_770)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -68323,7 +68345,7 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_61)))))"
 "(values #t #%expression455_1 e456_1))))))"
 "(let-values(((rebuild-s_13)"
-"(let-values(((ctx460_0) ctx_103)((s461_0) s_761)((temp462_0) #t))"
+"(let-values(((ctx460_0) ctx_103)((s461_0) s_762)((temp462_0) #t))"
 "(keep-as-needed119.1 temp462_0 #f #f ctx460_0 s461_0))))"
 "(let-values(((exp-e_0)"
 "(let-values(((temp463_0) e456_0)"
@@ -68334,24 +68356,24 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp463_0 temp464_0))))"
 "(if(expand-context-to-parsed? ctx_103)"
 " exp-e_0"
-"(if(let-values(((or-part_396)"
+"(if(let-values(((or-part_394)"
 "(if(expand-context-in-local-expand? ctx_103)"
 "(expand-context-keep-#%expression? ctx_103)"
 " #f)))"
-"(if or-part_396 or-part_396(eq? 'top-level(expand-context-context ctx_103))))"
+"(if or-part_394 or-part_394(eq? 'top-level(expand-context-context ctx_103))))"
 "(let-values()"
 "(let-values(((rebuild-s467_0) rebuild-s_13)((temp468_0)(list #%expression455_0 exp-e_0)))"
 "(rebuild5.1 #t rebuild-s467_0 temp468_0)))"
 "(let-values()"
 "(let-values(((result-s_13)(syntax-track-origin$1 exp-e_0 rebuild-s_13)))"
 "(begin"
-"(let-values(((obs_123)(expand-context-observer ctx_103)))"
-"(if obs_123"
-"(let-values()(let-values()(call-expand-observe obs_123 'tag result-s_13)))"
+"(let-values(((obs_124)(expand-context-observer ctx_103)))"
+"(if obs_124"
+"(let-values()(let-values()(call-expand-observe obs_124 'tag result-s_13)))"
 "(void)))"
 " result-s_13)))))))))))))"
-" (void (add-core-form!* 'unquote (lambda (s_770 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_770))))"
-" (void (add-core-form!* 'unquote-splicing (lambda (s_771 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))"
+" (void (add-core-form!* 'unquote (lambda (s_771 ctx_104) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_772 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_772))))"
 "(define-values"
 "(binding-for-transformer?)"
 "(lambda(b_42 id_128 at-phase_12 ns_112)"
@@ -68398,16 +68420,16 @@ static const char *startup_source =
 "((letrec-values(((for-loop_98)"
 "(lambda(track-stxes_1"
 " exp-specs_1"
-" lst_407)"
+" lst_406)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_407)"
+"(if(pair? lst_406)"
 "(let-values(((spec_0)"
 "(unsafe-car"
-" lst_407))"
-"((rest_238)"
+" lst_406))"
+"((rest_239)"
 "(unsafe-cdr"
-" lst_407)))"
+" lst_406)))"
 "(let-values(((track-stxes_2"
 " exp-specs_2)"
 "(let-values(((track-stxes_3)"
@@ -68553,47 +68575,47 @@ static const char *startup_source =
 "(let-values(((for-meta3_1"
 " phase-level4_1"
 " spec5_1)"
-"(let-values(((s_772)"
+"(let-values(((s_773)"
 "(if(syntax?$1"
 " s_168)"
 "(syntax-e$1"
 " s_168)"
 " s_168)))"
 "(if(pair?"
-" s_772)"
+" s_773)"
 "(let-values(((for-meta6_0)"
 "(let-values(((s_488)"
 "(car"
-" s_772)))"
+" s_773)))"
 " s_488))"
 "((phase-level7_0"
 " spec8_0)"
-"(let-values(((s_447)"
+"(let-values(((s_448)"
 "(cdr"
-" s_772)))"
+" s_773)))"
 "(let-values(((s_493)"
 "(if(syntax?$1"
-" s_447)"
+" s_448)"
 "(syntax-e$1"
-" s_447)"
-" s_447)))"
+" s_448)"
+" s_448)))"
 "(if(pair?"
 " s_493)"
 "(let-values(((phase-level9_0)"
-"(let-values(((s_773)"
+"(let-values(((s_774)"
 "(car"
 " s_493)))"
-" s_773))"
+" s_774))"
 "((spec10_0)"
-"(let-values(((s_774)"
+"(let-values(((s_775)"
 "(cdr"
 " s_493)))"
 "(let-values(((s_81)"
 "(if(syntax?$1"
-" s_774)"
+" s_775)"
 "(syntax-e$1"
-" s_774)"
-" s_774)))"
+" s_775)"
+" s_775)))"
 "(let-values(((flat-s_46)"
 "(to-syntax-list.1"
 " s_81)))"
@@ -68678,18 +68700,18 @@ static const char *startup_source =
 "(let-values(((ok?_65"
 " for-syntax13_0"
 " spec14_0)"
-"(let-values(((s_449)"
+"(let-values(((s_450)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_64)"
-" s_449))"
+" s_450))"
 "(let-values(((for-syntax13_1"
 " spec14_1)"
 "(let-values(((s_24)"
 "(if(syntax?$1"
-" s_449)"
+" s_450)"
 "(syntax-e$1"
-" s_449)"
-" s_449)))"
+" s_450)"
+" s_450)))"
 "(if(pair?"
 " s_24)"
 "(let-values(((for-syntax15_0)"
@@ -68701,7 +68723,7 @@ static const char *startup_source =
 "(let-values(((s_157)"
 "(cdr"
 " s_24)))"
-"(let-values(((s_775)"
+"(let-values(((s_776)"
 "(if(syntax?$1"
 " s_157)"
 "(syntax-e$1"
@@ -68709,7 +68731,7 @@ static const char *startup_source =
 " s_157)))"
 "(let-values(((flat-s_47)"
 "(to-syntax-list.1"
-" s_775)))"
+" s_776)))"
 "(if(not"
 " flat-s_47)"
 "(let-values()"
@@ -68781,10 +68803,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_309)"
 "(let-values(((for-label21_0)"
-"(let-values(((s_442)"
+"(let-values(((s_443)"
 "(car"
 " s_309)))"
-" s_442))"
+" s_443))"
 "((spec22_0)"
 "(let-values(((s_27)"
 "(cdr"
@@ -68869,23 +68891,23 @@ static const char *startup_source =
 " s_49))"
 "(let-values(((protect25_1"
 " p-spec26_1)"
-"(let-values(((s_776)"
+"(let-values(((s_777)"
 "(if(syntax?$1"
 " s_49)"
 "(syntax-e$1"
 " s_49)"
 " s_49)))"
 "(if(pair?"
-" s_776)"
+" s_777)"
 "(let-values(((protect27_0)"
 "(let-values(((s_506)"
 "(car"
-" s_776)))"
+" s_777)))"
 " s_506))"
 "((p-spec28_0)"
 "(let-values(((s_507)"
 "(cdr"
-" s_776)))"
+" s_777)))"
 "(let-values(((s_52)"
 "(if(syntax?$1"
 " s_507)"
@@ -68954,24 +68976,24 @@ static const char *startup_source =
 "(let-values(((rename31_1"
 " id:from32_1"
 " id:to33_1)"
-"(let-values(((s_777)"
+"(let-values(((s_778)"
 "(if(syntax?$1"
 " s_315)"
 "(syntax-e$1"
 " s_315)"
 " s_315)))"
 "(if(pair?"
-" s_777)"
+" s_778)"
 "(let-values(((rename34_0)"
 "(let-values(((s_200)"
 "(car"
-" s_777)))"
+" s_778)))"
 " s_200))"
 "((id:from35_0"
 " id:to36_0)"
 "(let-values(((s_59)"
 "(cdr"
-" s_777)))"
+" s_778)))"
 "(let-values(((s_404)"
 "(if(syntax?$1"
 " s_59)"
@@ -69017,15 +69039,15 @@ static const char *startup_source =
 "(let-values(((s_203)"
 "(car"
 " s_61)))"
-"(if(let-values(((or-part_397)"
+"(if(let-values(((or-part_395)"
 "(if(syntax?$1"
 " s_203)"
 "(symbol?"
 "(syntax-e$1"
 " s_203))"
 " #f)))"
-"(if or-part_397"
-" or-part_397"
+"(if or-part_395"
+" or-part_395"
 "(symbol?"
 " s_203)))"
 " s_203"
@@ -69035,15 +69057,15 @@ static const char *startup_source =
 " orig-s_67"
 " s_203))))"
 "(()"
-"(let-values(((s_778)"
+"(let-values(((s_424)"
 "(cdr"
 " s_61)))"
 "(let-values(((s_414)"
 "(if(syntax?$1"
-" s_778)"
+" s_424)"
 "(syntax-e$1"
-" s_778)"
-" s_778)))"
+" s_424)"
+" s_424)))"
 "(if(null?"
 " s_414)"
 "(values)"
@@ -69144,15 +69166,15 @@ static const char *startup_source =
 "(let-values(((s_779)"
 "(car"
 " s_319)))"
-"(if(let-values(((or-part_398)"
+"(if(let-values(((or-part_396)"
 "(if(syntax?$1"
 " s_779)"
 "(symbol?"
 "(syntax-e$1"
 " s_779))"
 " #f)))"
-"(if or-part_398"
-" or-part_398"
+"(if or-part_396"
+" or-part_396"
 "(symbol?"
 " s_779)))"
 " s_779"
@@ -69204,7 +69226,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_53)))"
-"((letrec-values(((for-loop_321)"
+"((letrec-values(((for-loop_317)"
 "(lambda(id:field_1"
 " lst_272)"
 "(begin"
@@ -69214,7 +69236,7 @@ static const char *startup_source =
 "(let-values(((s_782)"
 "(unsafe-car"
 " lst_272))"
-"((rest_239)"
+"((rest_240)"
 "(unsafe-cdr"
 " lst_272)))"
 "(let-values(((id:field_2)"
@@ -69224,15 +69246,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:field49_0)"
 "(let-values()"
-"(if(let-values(((or-part_399)"
+"(if(let-values(((or-part_397)"
 "(if(syntax?$1"
 " s_782)"
 "(symbol?"
 "(syntax-e$1"
 " s_782))"
 " #f)))"
-"(if or-part_399"
-" or-part_399"
+"(if or-part_397"
+" or-part_397"
 "(symbol?"
 " s_782)))"
 " s_782"
@@ -69248,12 +69270,12 @@ static const char *startup_source =
 " id:field_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_321"
+"(for-loop_317"
 " id:field_2"
-" rest_239)"
+" rest_240)"
 " id:field_2)))"
 " id:field_1)))))"
-" for-loop_321)"
+" for-loop_317)"
 " null"
 " lst_53)))))"
 "(reverse$1"
@@ -69341,10 +69363,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_323)"
 "(let-values(((all-from52_0)"
-"(let-values(((s_426)"
+"(let-values(((s_783)"
 "(car"
 " s_323)))"
-" s_426))"
+" s_783))"
 "((mod-path53_0)"
 "(let-values(((s_427)"
 "(cdr"
@@ -69358,10 +69380,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_214)"
 "(let-values(((mod-path54_0)"
-"(let-values(((s_783)"
+"(let-values(((s_428)"
 "(car"
 " s_214)))"
-" s_783))"
+" s_428))"
 "(()"
 "(let-values(((s_215)"
 "(cdr"
@@ -69481,7 +69503,7 @@ static const char *startup_source =
 " orig-s_70))"
 "(let-values()"
 "(let-values(((id_129)"
-"(let-values(((lst_408)"
+"(let-values(((lst_407)"
 " flat-s_51))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -69489,20 +69511,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_408)))"
-"((letrec-values(((for-loop_322)"
+" lst_407)))"
+"((letrec-values(((for-loop_318)"
 "(lambda(id_130"
-" lst_409)"
+" lst_408)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_409)"
+" lst_408)"
 "(let-values(((s_786)"
 "(unsafe-car"
-" lst_409))"
-"((rest_240)"
+" lst_408))"
+"((rest_241)"
 "(unsafe-cdr"
-" lst_409)))"
+" lst_408)))"
 "(let-values(((id_131)"
 "(let-values(((id_132)"
 " id_130))"
@@ -69510,15 +69532,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
-"(if(let-values(((or-part_400)"
+"(if(let-values(((or-part_398)"
 "(if(syntax?$1"
 " s_786)"
 "(symbol?"
 "(syntax-e$1"
 " s_786))"
 " #f)))"
-"(if or-part_400"
-" or-part_400"
+"(if or-part_398"
+" or-part_398"
 "(symbol?"
 " s_786)))"
 " s_786"
@@ -69534,14 +69556,14 @@ static const char *startup_source =
 " id_133)))))"
 "(if(not"
 " #f)"
-"(for-loop_322"
+"(for-loop_318"
 " id_131"
-" rest_240)"
+" rest_241)"
 " id_131)))"
 " id_130)))))"
-" for-loop_322)"
+" for-loop_318)"
 " null"
-" lst_408)))))"
+" lst_407)))))"
 "(reverse$1"
 " id_129)))))))))"
 "(values"
@@ -69607,10 +69629,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_787)"
 "(let-values(((all-defined65_0)"
-"(let-values(((s_437)"
+"(let-values(((s_438)"
 "(car"
 " s_787)))"
-" s_437))"
+" s_438))"
 "(()"
 "(let-values(((s_224)"
 "(cdr"
@@ -69713,17 +69735,17 @@ static const char *startup_source =
 " lst_39)))"
 "((letrec-values(((for-loop_136)"
 "(lambda(id_135"
-" lst_410)"
+" lst_409)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_410)"
+" lst_409)"
 "(let-values(((s_464)"
 "(unsafe-car"
-" lst_410))"
-"((rest_241)"
+" lst_409))"
+"((rest_242)"
 "(unsafe-cdr"
-" lst_410)))"
+" lst_409)))"
 "(let-values(((id_136)"
 "(let-values(((id_137)"
 " id_135))"
@@ -69757,7 +69779,7 @@ static const char *startup_source =
 " #f)"
 "(for-loop_136"
 " id_136"
-" rest_241)"
+" rest_242)"
 " id_136)))"
 " id_135)))))"
 " for-loop_136)"
@@ -69934,10 +69956,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_793)"
 "(let-values(((prefix-all-defined-except79_0)"
-"(let-values(((s_533)"
+"(let-values(((s_534)"
 "(car"
 " s_793)))"
-" s_533))"
+" s_534))"
 "((id:prefix80_0"
 " id81_0)"
 "(let-values(((s_794)"
@@ -69952,26 +69974,26 @@ static const char *startup_source =
 "(if(pair?"
 " s_243)"
 "(let-values(((id:prefix82_0)"
-"(let-values(((s_534)"
+"(let-values(((s_535)"
 "(car"
 " s_243)))"
-"(if(let-values(((or-part_345)"
+"(if(let-values(((or-part_344)"
 "(if(syntax?$1"
-" s_534)"
+" s_535)"
 "(symbol?"
 "(syntax-e$1"
-" s_534))"
+" s_535))"
 " #f)))"
-"(if or-part_345"
-" or-part_345"
+"(if or-part_344"
+" or-part_344"
 "(symbol?"
-" s_534)))"
-" s_534"
+" s_535)))"
+" s_535"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                           \"not an identifier\""
 " orig-s_74"
-" s_534))))"
+" s_535))))"
 "((id83_2)"
 "(let-values(((s_348)"
 "(cdr"
@@ -69994,7 +70016,7 @@ static const char *startup_source =
 " orig-s_74))"
 "(let-values()"
 "(let-values(((id_88)"
-"(let-values(((lst_411)"
+"(let-values(((lst_410)"
 " flat-s_53))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70002,20 +70024,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_411)))"
-"((letrec-values(((for-loop_323)"
+" lst_410)))"
+"((letrec-values(((for-loop_319)"
 "(lambda(id_37"
-" lst_412)"
+" lst_411)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_412)"
+" lst_411)"
 "(let-values(((s_796)"
 "(unsafe-car"
-" lst_412))"
-"((rest_242)"
+" lst_411))"
+"((rest_243)"
 "(unsafe-cdr"
-" lst_412)))"
+" lst_411)))"
 "(let-values(((id_139)"
 "(let-values(((id_140)"
 " id_37))"
@@ -70023,15 +70045,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id84_1)"
 "(let-values()"
-"(if(let-values(((or-part_401)"
+"(if(let-values(((or-part_399)"
 "(if(syntax?$1"
 " s_796)"
 "(symbol?"
 "(syntax-e$1"
 " s_796))"
 " #f)))"
-"(if or-part_401"
-" or-part_401"
+"(if or-part_399"
+" or-part_399"
 "(symbol?"
 " s_796)))"
 " s_796"
@@ -70047,14 +70069,14 @@ static const char *startup_source =
 " id_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_323"
+"(for-loop_319"
 " id_139"
-" rest_242)"
+" rest_243)"
 " id_139)))"
 " id_37)))))"
-" for-loop_323)"
+" for-loop_319)"
 " null"
-" lst_411)))))"
+" lst_410)))))"
 "(reverse$1"
 " id_88)))))))))"
 "(values"
@@ -70148,15 +70170,15 @@ static const char *startup_source =
 "(let-values(((s_373)"
 "(car"
 " s_371)))"
-"(if(let-values(((or-part_402)"
+"(if(let-values(((or-part_400)"
 "(if(syntax?$1"
 " s_373)"
 "(symbol?"
 "(syntax-e$1"
 " s_373))"
 " #f)))"
-"(if or-part_402"
-" or-part_402"
+"(if or-part_400"
+" or-part_400"
 "(symbol?"
 " s_373)))"
 " s_373"
@@ -70166,10 +70188,10 @@ static const char *startup_source =
 " orig-s_75"
 " s_373))))"
 "((datum94_0)"
-"(let-values(((s_545)"
+"(let-values(((s_546)"
 "(cdr"
 " s_371)))"
-" s_545)))"
+" s_546)))"
 "(values"
 " id93_2"
 " datum94_0))"
@@ -70178,15 +70200,15 @@ static const char *startup_source =
 "                                                                                                                                                                                                                                           \"bad syntax\""
 " orig-s_75)))))"
 "(()"
-"(let-values(((s_546)"
+"(let-values(((s_547)"
 "(cdr"
 " s_799)))"
 "(let-values(((s_800)"
 "(if(syntax?$1"
-" s_546)"
+" s_547)"
 "(syntax-e$1"
-" s_546)"
-" s_546)))"
+" s_547)"
+" s_547)))"
 "(if(null?"
 " s_800)"
 "(values)"
@@ -70291,10 +70313,10 @@ static const char *startup_source =
 "(let-values(((temp104_3)"
 " form96_0)"
 "((temp105_5)"
-"(let-values(((v_267)"
+"(let-values(((v_266)"
 " ctx_106))"
 "(let-values(((the-struct_99)"
-" v_267))"
+" v_266))"
 "(if(expand-context/outer?"
 " the-struct_99)"
 "(let-values(((def-ctx-scopes106_0)"
@@ -70302,7 +70324,7 @@ static const char *startup_source =
 "((inner107_0)"
 "(let-values(((the-struct_100)"
 "(root-expand-context/outer-inner"
-" v_267)))"
+" v_266)))"
 "(if(expand-context/inner?"
 " the-struct_100)"
 "(let-values(((stops108_0)"
@@ -70513,7 +70535,7 @@ static const char *startup_source =
 "(for-loop_98"
 " track-stxes_2"
 " exp-specs_2"
-" rest_238)"
+" rest_239)"
 "(values"
 " track-stxes_2"
 " exp-specs_2))))"
@@ -70589,17 +70611,17 @@ static const char *startup_source =
 "(format fmt_2(syntax-e$1 id:struct_0)(syntax-e$1 field-id_0)))))"
 "(datum->syntax$1 id:struct_0 sym_108 id:struct_0))))))"
 "(begin"
-"            (let-values (((lst_413) (list \"~a\" \"make-~a\" \"struct:~a\" \"~a?\")))"
+"            (let-values (((lst_412) (list \"~a\" \"make-~a\" \"struct:~a\" \"~a?\")))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_413)))"
-"((letrec-values(((for-loop_324)"
-"(lambda(lst_414)"
+"(let-values()(check-list lst_412)))"
+"((letrec-values(((for-loop_320)"
+"(lambda(lst_413)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_414)"
-"(let-values(((fmt_3)(unsafe-car lst_414))((rest_243)(unsafe-cdr lst_414)))"
+"(if(pair? lst_413)"
+"(let-values(((fmt_3)(unsafe-car lst_413))((rest_244)(unsafe-cdr lst_413)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70617,22 +70639,22 @@ static const char *startup_source =
 " protected?_17)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_324 rest_243)(values))))"
+"(if(not #f)(for-loop_320 rest_244)(values))))"
 "(values))))))"
-" for-loop_324)"
-" lst_413)))"
+" for-loop_320)"
+" lst_412)))"
 "(void)"
-"(let-values(((lst_415) fields_0))"
+"(let-values(((lst_414) fields_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_415)))"
-"((letrec-values(((for-loop_325)"
-"(lambda(lst_416)"
+"(let-values()(check-list lst_414)))"
+"((letrec-values(((for-loop_321)"
+"(lambda(lst_415)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_416)"
-"(let-values(((field_0)(unsafe-car lst_416))((rest_244)(unsafe-cdr lst_416)))"
+"(if(pair? lst_415)"
+"(let-values(((field_0)(unsafe-car lst_415))((rest_245)(unsafe-cdr lst_415)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70664,10 +70686,10 @@ static const char *startup_source =
 " protected?_17)))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_325 rest_244)(values))))"
+"(if(not #f)(for-loop_321 rest_245)(values))))"
 "(values))))))"
-" for-loop_325)"
-" lst_415)))"
+" for-loop_321)"
+" lst_414)))"
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
@@ -70715,18 +70737,18 @@ static const char *startup_source =
 "                              (if prefix-sym_0 (string->symbol (format \"~a~a\" prefix-sym_0 sym_109)) sym_109)))))"
 "(let-values(((found_0)(make-hasheq)))"
 "(begin"
-"(let-values(((lst_417) requireds_2))"
+"(let-values(((lst_416) requireds_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_417)))"
-"((letrec-values(((for-loop_326)"
-"(lambda(lst_418)"
+"(let-values()(check-list lst_416)))"
+"((letrec-values(((for-loop_322)"
+"(lambda(lst_417)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_418)"
-"(let-values(((i_184)(unsafe-car lst_418))"
-"((rest_245)(unsafe-cdr lst_418)))"
+"(if(pair? lst_417)"
+"(let-values(((i_184)(unsafe-car lst_417))"
+"((rest_246)(unsafe-cdr lst_417)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -70738,7 +70760,7 @@ static const char *startup_source =
 "(let-values(((phase_143)"
 "(required-phase"
 " i_184)))"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_401)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
@@ -70754,9 +70776,9 @@ static const char *startup_source =
 " phase_143)"
 " #f))"
 " #f)))"
-"(if or-part_403"
-" or-part_403"
-"(let-values(((lst_419)"
+"(if or-part_401"
+" or-part_401"
+"(let-values(((lst_418)"
 " except-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70764,20 +70786,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_419)))"
-"((letrec-values(((for-loop_327)"
+" lst_418)))"
+"((letrec-values(((for-loop_323)"
 "(lambda(result_127"
-" lst_420)"
+" lst_419)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_420)"
+" lst_419)"
 "(let-values(((except-id_0)"
 "(unsafe-car"
-" lst_420))"
-"((rest_246)"
+" lst_419))"
+"((rest_247)"
 "(unsafe-cdr"
-" lst_420)))"
+" lst_419)))"
 "(let-values(((result_128)"
 "(let-values()"
 "(let-values(((result_129)"
@@ -70796,20 +70818,20 @@ static const char *startup_source =
 "(values"
 " result_129)))))"
 "(if(if(not"
-"((lambda x_100"
+"((lambda x_99"
 " result_128)"
 " except-id_0))"
 "(not"
 " #f)"
 " #f)"
-"(for-loop_327"
+"(for-loop_323"
 " result_128"
-" rest_246)"
+" rest_247)"
 " result_128)))"
 " result_127)))))"
-" for-loop_327)"
+" for-loop_323)"
 " #f"
-" lst_419)))))"
+" lst_418)))))"
 "(void)"
 "(let-values()"
 "(let-values(((b_95)"
@@ -70865,41 +70887,41 @@ static const char *startup_source =
 " orig-s127_0)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_326 rest_245)(values))))"
+"(if(not #f)(for-loop_322 rest_246)(values))))"
 "(values))))))"
-" for-loop_326)"
-" lst_417)))"
+" for-loop_322)"
+" lst_416)))"
 "(void)"
 "(if(=(hash-count found_0)(length except-ids_1))"
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((lst_421) except-ids_1))"
+"(let-values(((lst_420) except-ids_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_421)))"
-"((letrec-values(((for-loop_328)"
-"(lambda(lst_422)"
+"(let-values()(check-list lst_420)))"
+"((letrec-values(((for-loop_324)"
+"(lambda(lst_421)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_422)"
-"(let-values(((except-id_1)(unsafe-car lst_422))"
-"((rest_247)(unsafe-cdr lst_422)))"
+"(if(pair? lst_421)"
+"(let-values(((except-id_1)(unsafe-car lst_421))"
+"((rest_248)(unsafe-cdr lst_421)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(let-values(((or-part_404)"
+"(if(let-values(((or-part_402)"
 "(hash-ref"
 " found_0"
 " except-id_1"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
-"(let-values(((lst_423)"
+"(if or-part_402"
+" or-part_402"
+"(let-values(((lst_422)"
 " requireds_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -70907,20 +70929,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_423)))"
-"((letrec-values(((for-loop_329)"
+" lst_422)))"
+"((letrec-values(((for-loop_325)"
 "(lambda(result_130"
-" lst_424)"
+" lst_423)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_424)"
+" lst_423)"
 "(let-values(((i_185)"
 "(unsafe-car"
-" lst_424))"
-"((rest_248)"
+" lst_423))"
+"((rest_249)"
 "(unsafe-cdr"
-" lst_424)))"
+" lst_423)))"
 "(let-values(((result_131)"
 "(let-values()"
 "(let-values(((result_132)"
@@ -70940,20 +70962,20 @@ static const char *startup_source =
 "(values"
 " result_132)))))"
 "(if(if(not"
-"((lambda x_101"
+"((lambda x_100"
 " result_131)"
 " i_185))"
 "(not"
 " #f)"
 " #f)"
-"(for-loop_329"
+"(for-loop_325"
 " result_131"
-" rest_248)"
+" rest_249)"
 " result_131)))"
 " result_130)))))"
-" for-loop_329)"
+" for-loop_325)"
 " #f"
-" lst_423)))))"
+" lst_422)))))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -70967,10 +70989,10 @@ static const char *startup_source =
 " except-id_1))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_328 rest_247)(values))))"
+"(if(not #f)(for-loop_324 rest_248)(values))))"
 "(values))))))"
-" for-loop_328)"
-" lst_421)))"
+" for-loop_324)"
+" lst_420)))"
 "(void)))))))))))))"
 "(define-values"
 "(check-cross-phase-persistent-form)"
@@ -70981,12 +71003,12 @@ static const char *startup_source =
 "(begin"
 " 'check-body"
 "(begin"
-"(let-values(((lst_425) bodys_14))"
+"(let-values(((lst_424) bodys_14))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_425)))"
-"((letrec-values(((for-loop_330)"
+"(let-values()(check-list lst_424)))"
+"((letrec-values(((for-loop_326)"
 "(lambda(lst_85)"
 "(begin"
 " 'for-loop"
@@ -71034,10 +71056,10 @@ static const char *startup_source =
 " p_46))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_330 rest_40)(values))))"
+"(if(not #f)(for-loop_326 rest_40)(values))))"
 "(values))))))"
-" for-loop_330)"
-" lst_425)))"
+" for-loop_326)"
+" lst_424)))"
 "(void)))))"
 "((check-expr_0)"
 "(lambda(e_91 num-results_0 enclosing_15)"
@@ -71063,13 +71085,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_78)))"
-"((letrec-values(((for-loop_331)"
+"((letrec-values(((for-loop_327)"
 "(lambda(lst_86)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
 "(let-values(((rand_0)(unsafe-car lst_86))"
-"((rest_249)(unsafe-cdr lst_86)))"
+"((rest_250)(unsafe-cdr lst_86)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71083,10 +71105,10 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_331 rest_249)"
+"(for-loop_327 rest_250)"
 "(values))))"
 "(values))))))"
-" for-loop_331)"
+" for-loop_327)"
 " lst_78)))"
 "(void)"
 "(let-values(((tmp_63)(cross-phase-primitive-name(parsed-app-rator e_91))))"
@@ -71128,12 +71150,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_269)))"
 "((letrec-values(((for-loop_243)"
-"(lambda(lst_426)"
+"(lambda(lst_425)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_426)"
-"(let-values(((clause_5)(unsafe-car lst_426))"
-"((rest_250)(unsafe-cdr lst_426)))"
+"(if(pair? lst_425)"
+"(let-values(((clause_5)(unsafe-car lst_425))"
+"((rest_251)(unsafe-cdr lst_425)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71144,7 +71166,7 @@ static const char *startup_source =
 "(cadr clause_5)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_243 rest_250)(values))))"
+"(if(not #f)(for-loop_243 rest_251)(values))))"
 "(values))))))"
 " for-loop_243)"
 " lst_269)))"
@@ -71194,9 +71216,9 @@ static const char *startup_source =
 "(if(let-values(((or-part_83)(not normal-b_1)))"
 "(if or-part_83"
 " or-part_83"
-"(let-values(((or-part_311)(parsed-top-id? id_4)))"
-"(if or-part_311"
-" or-part_311"
+"(let-values(((or-part_310)(parsed-top-id? id_4)))"
+"(if or-part_310"
+" or-part_310"
 "(if(not(symbol? normal-b_1))"
 "(eq?(module-binding-module normal-b_1) self-mpi_6)"
 " #f)))))"
@@ -71249,8 +71271,8 @@ static const char *startup_source =
 " lst_23)))"
 "(void)"
 "(check-body-no-disallowed-expr_0(parsed-let_-values-body e_92))))"
-"(if(let-values(((or-part_358)(parsed-quote-syntax? e_92)))"
-"(if or-part_358 or-part_358(parsed-#%variable-reference? e_92)))"
+"(if(let-values(((or-part_357)(parsed-quote-syntax? e_92)))"
+"(if or-part_357 or-part_357(parsed-#%variable-reference? e_92)))"
 "(let-values()(disallow e_92))"
 "(let-values()(void)))))))))))))))"
 "((check-body-no-disallowed-expr_0)"
@@ -71263,13 +71285,13 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_81)))"
-"((letrec-values(((for-loop_332)"
+"((letrec-values(((for-loop_328)"
 "(lambda(lst_58)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_58)"
 "(let-values(((e_82)(unsafe-car lst_58))"
-"((rest_195)(unsafe-cdr lst_58)))"
+"((rest_196)(unsafe-cdr lst_58)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -71280,9 +71302,9 @@ static const char *startup_source =
 " e_82))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_332 rest_195)(values))))"
+"(if(not #f)(for-loop_328 rest_196)(values))))"
 "(values))))))"
-" for-loop_332)"
+" for-loop_328)"
 " lst_81)))"
 "(void))))))"
 "(check-body_0 bodys_13)))))"
@@ -71342,8 +71364,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_124)(expand-context-observer ctx_108)))"
-"(if obs_124(let-values()(let-values()(call-expand-observe obs_124 'prim-module)))(void)))"
+"(let-values(((obs_125)(expand-context-observer ctx_108)))"
+"(if obs_125(let-values()(let-values()(call-expand-observe obs_125 'prim-module)))(void)))"
 "             (raise-syntax-error$1 #f \"allowed only at the top level\" s_43))))"
 "(let-values()"
 "(let-values(((s223_1) s_43)((ctx224_0) ctx_108)((temp225_2) #f))"
@@ -71353,16 +71375,16 @@ static const char *startup_source =
 " 'module*"
 "(lambda(s_307 ctx_109)"
 "(begin"
-"(let-values(((obs_125)(expand-context-observer ctx_109)))"
-"(if obs_125(let-values()(let-values()(call-expand-observe obs_125 'prim-module)))(void)))"
+"(let-values(((obs_126)(expand-context-observer ctx_109)))"
+"(if obs_126(let-values()(let-values()(call-expand-observe obs_126 'prim-module)))(void)))"
 "       (raise-syntax-error$1 #f \"illegal use (not in a module top-level)\" s_307)))))"
 "(void"
 "(add-core-form!*"
 " '#%module-begin"
 "(lambda(s_91 ctx_110)"
 "(begin"
-"(let-values(((obs_126)(expand-context-observer ctx_110)))"
-"(if obs_126(let-values()(let-values()(call-expand-observe obs_126 'prim-module-begin)))(void)))"
+"(let-values(((obs_127)(expand-context-observer ctx_110)))"
+"(if obs_127(let-values()(let-values()(call-expand-observe obs_127 'prim-module-begin)))(void)))"
 "(if(eq?(expand-context-context ctx_110) 'module-begin)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not in a module-definition context\" s_91)))"
@@ -71371,11 +71393,11 @@ static const char *startup_source =
 "         (let-values () (raise-syntax-error$1 #f \"not currently transforming a module\" s_91)))"
 "((expand-context-module-begin-k ctx_110)"
 " s_91"
-"(let-values(((v_268) ctx_110))"
-"(let-values(((the-struct_101) v_268))"
+"(let-values(((v_267) ctx_110))"
+"(let-values(((the-struct_101) v_267))"
 "(if(expand-context/outer? the-struct_101)"
 "(let-values(((inner226_0)"
-"(let-values(((the-struct_102)(root-expand-context/outer-inner v_268)))"
+"(let-values(((the-struct_102)(root-expand-context/outer-inner v_267)))"
 "(if(expand-context/inner? the-struct_102)"
 "(let-values(((module-begin-k227_0) #f))"
 "(expand-context/inner2.1"
@@ -71428,8 +71450,8 @@ static const char *startup_source =
 " '#%declare"
 "(lambda(s_804 ctx_111)"
 "(begin"
-"(let-values(((obs_127)(expand-context-observer ctx_111)))"
-"(if obs_127(let-values()(let-values()(call-expand-observe obs_127 'prim-declare)))(void)))"
+"(let-values(((obs_128)(expand-context-observer ctx_111)))"
+"(if obs_128(let-values()(let-values()(call-expand-observe obs_128 'prim-declare)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_804)))))"
 "(define-values"
 "(expand-module18.1)"
@@ -71461,10 +71483,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_128)(expand-context-observer init-ctx_0)))"
-"(if obs_128"
+"(let-values(((obs_129)(expand-context-observer init-ctx_0)))"
+"(if obs_129"
 "(let-values()"
-"(let-values()(call-expand-observe obs_128 'prim-module)))"
+"(let-values()(call-expand-observe obs_129 'prim-module)))"
 "(void)))"
 "(values))))"
 "(let-values(((disarmed-s_24)(syntax-disarm$1 s_805)))"
@@ -71518,23 +71540,23 @@ static const char *startup_source =
 "(let-values(((s_55)"
 "(cdr"
 " s_93)))"
-"(let-values(((s_452)"
+"(let-values(((s_453)"
 "(if(syntax?$1"
 " s_55)"
 "(syntax-e$1"
 " s_55)"
 " s_55)))"
 "(if(pair?"
-" s_452)"
+" s_453)"
 "(let-values(((initial-require239_0)"
 "(let-values(((s_56)"
 "(car"
-" s_452)))"
+" s_453)))"
 " s_56))"
 "((body240_0)"
 "(let-values(((s_33)"
 "(cdr"
-" s_452)))"
+" s_453)))"
 "(let-values(((s_509)"
 "(if(syntax?$1"
 " s_33)"
@@ -71709,12 +71731,12 @@ static const char *startup_source =
 " unsafe-undefined"
 " temp266_0))))"
 "(let-values(((ctx_112)"
-"(let-values(((v_261)"
+"(let-values(((v_260)"
 "(copy-root-expand-context"
 " init-ctx_0"
 " root-ctx_6)))"
 "(let-values(((the-struct_92)"
-" v_261))"
+" v_260))"
 "(if(expand-context/outer?"
 " the-struct_92)"
 "(let-values(((post-expansion267_0)"
@@ -71727,7 +71749,7 @@ static const char *startup_source =
 "((inner268_0)"
 "(let-values(((the-struct_103)"
 "(root-expand-context/outer-inner"
-" v_261)))"
+" v_260)))"
 "(if(expand-context/inner?"
 " the-struct_103)"
 "(let-values(((allow-unbound?269_0)"
@@ -72026,14 +72048,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_129)"
+"(let-values(((obs_130)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_129"
+"(if obs_130"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_129"
+" obs_130"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -72075,10 +72097,10 @@ static const char *startup_source =
 " #t)"
 "(values))))"
 "(let-values(((ctx_23)"
-"(let-values(((v_269)"
+"(let-values(((v_268)"
 " mb-init-ctx_0))"
 "(let-values(((the-struct_104)"
-" v_269))"
+" v_268))"
 "(if(expand-context/outer?"
 " the-struct_104)"
 "(let-values(((post-expansion306_0)"
@@ -72091,7 +72113,7 @@ static const char *startup_source =
 "((inner307_0)"
 "(let-values(((the-struct_18)"
 "(root-expand-context/outer-inner"
-" v_269)))"
+" v_268)))"
 "(if(expand-context/inner?"
 " the-struct_18)"
 "(let-values(((module-begin-k308_0)"
@@ -72244,14 +72266,14 @@ static const char *startup_source =
 " inside-scope_0)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_130)"
+"(let-values(((obs_131)"
 "(expand-context-observer"
 " ctx_23)))"
-"(if obs_130"
+"(if obs_131"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_130"
+" obs_131"
 " 'rename-one"
 " added-s_2)))"
 "(void)))"
@@ -72348,10 +72370,10 @@ static const char *startup_source =
 "(expand-context-to-parsed?"
 " ctx_23)))"
 "(let-values(((partial-body-ctx_0)"
-"(let-values(((v_270)"
+"(let-values(((v_269)"
 " ctx_23))"
 "(let-values(((the-struct_105)"
-" v_270))"
+" v_269))"
 "(if(expand-context/outer?"
 " the-struct_105)"
 "(let-values(((context329_0)"
@@ -72363,7 +72385,7 @@ static const char *startup_source =
 "((inner332_0)"
 "(let-values(((the-struct_106)"
 "(root-expand-context/outer-inner"
-" v_270)))"
+" v_269)))"
 "(if(expand-context/inner?"
 " the-struct_106)"
 "(let-values(((phase333_0)"
@@ -72555,24 +72577,24 @@ static const char *startup_source =
 " bodys350_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_131)"
+"(let-values(((obs_132)"
 "(expand-context-observer"
 " partial-body-ctx_0)))"
-"(if obs_131"
+"(if obs_132"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_131"
+" obs_132"
 " 'next-group)))"
 "(void)))"
 "(values))))"
 "(let-values(((body-ctx_6)"
-"(let-values(((v_271)"
+"(let-values(((v_270)"
 "(accumulate-def-ctx-scopes"
 " partial-body-ctx_0"
 " def-ctx-scopes_8)))"
 "(let-values(((the-struct_107)"
-" v_271))"
+" v_270))"
 "(if(expand-context/outer?"
 " the-struct_107)"
 "(let-values(((def-ctx-scopes366_0)"
@@ -72582,7 +72604,7 @@ static const char *startup_source =
 "((inner368_0)"
 "(let-values(((the-struct_108)"
 "(root-expand-context/outer-inner"
-" v_271)))"
+" v_270)))"
 "(if(expand-context/inner?"
 " the-struct_108)"
 "(let-values(((stops369_0)"
@@ -72785,14 +72807,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_77)"
+"(let-values(((obs_78)"
 "(expand-context-observer"
 " ctx_23)))"
-"(if obs_77"
+"(if obs_78"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_77"
+" obs_78"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -73026,10 +73048,10 @@ static const char *startup_source =
 "(let-values()"
 " mb-result-s_0)))))))))))))))))))))))))))))))))"
 "(let-values(((mb-ctx_0)"
-"(let-values(((v_272)"
+"(let-values(((v_271)"
 " ctx_112))"
 "(let-values(((the-struct_110)"
-" v_272))"
+" v_271))"
 "(if(expand-context/outer?"
 " the-struct_110)"
 "(let-values(((context412_0)"
@@ -73037,7 +73059,7 @@ static const char *startup_source =
 "((inner413_0)"
 "(let-values(((the-struct_111)"
 "(root-expand-context/outer-inner"
-" v_272)))"
+" v_271)))"
 "(if(expand-context/inner?"
 " the-struct_111)"
 "(let-values(((module-begin-k414_0)"
@@ -73175,19 +73197,19 @@ static const char *startup_source =
 "(let-values(((mb428_0)"
 " mb_0)"
 "((temp429_0)"
-"(let-values(((v_273)"
+"(let-values(((v_272)"
 "(accumulate-def-ctx-scopes"
 " mb-ctx_0"
 " mb-def-ctx-scopes_0)))"
 "(let-values(((the-struct_112)"
-" v_273))"
+" v_272))"
 "(if(expand-context/outer?"
 " the-struct_112)"
 "(let-values(((def-ctx-scopes430_0)"
 " #f)"
 "((inner431_0)"
 "(root-expand-context/outer-inner"
-" v_273)))"
+" v_272)))"
 "(expand-context/outer1.1"
 " inner431_0"
 "(root-expand-context/outer-post-expansion"
@@ -73234,11 +73256,11 @@ static const char *startup_source =
 " self_32"
 " self_32)))"
 "(let-values(((result-form_0)"
-"(if(let-values(((or-part_405)"
+"(if(let-values(((or-part_403)"
 "(expand-context-to-parsed?"
 " init-ctx_0)))"
-"(if or-part_405"
-" or-part_405"
+"(if or-part_403"
+" or-part_403"
 " always-produce-compiled?_0))"
 "(parsed-module25.1"
 " rebuild-s_14"
@@ -73274,7 +73296,7 @@ static const char *startup_source =
 "(begin"
 "(imitate-generic-module-path-index!"
 " self_32)"
-"(let-values(((lst_427)"
+"(let-values(((lst_426)"
 "(unbox"
 " mpis-to-reset_0)))"
 "(begin"
@@ -73283,19 +73305,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_427)))"
-"((letrec-values(((for-loop_333)"
-"(lambda(lst_303)"
+" lst_426)))"
+"((letrec-values(((for-loop_329)"
+"(lambda(lst_302)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_303)"
+" lst_302)"
 "(let-values(((mpi_55)"
 "(unsafe-car"
-" lst_303))"
-"((rest_251)"
+" lst_302))"
+"((rest_252)"
 "(unsafe-cdr"
-" lst_303)))"
+" lst_302)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -73308,12 +73330,12 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_333"
-" rest_251)"
+"(for-loop_329"
+" rest_252)"
 "(values))))"
 "(values))))))"
-" for-loop_333)"
-" lst_427)))"
+" for-loop_329)"
+" lst_426)))"
 "(void)"
 "(let-values(((result-s_15)"
 "(let-values(((rebuild-s432_0)"
@@ -73357,14 +73379,14 @@ static const char *startup_source =
 " #t)"
 " result-s_17)))"
 "(begin"
-"(let-values(((obs_132)"
+"(let-values(((obs_133)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_132"
+"(if obs_133"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_132"
+" obs_133"
 " 'rename-one"
 " result-s_18)))"
 "(void)))"
@@ -73399,13 +73421,13 @@ static const char *startup_source =
 "(lambda()"
 "(begin"
 " 'make-mb-ctx"
-"(let-values(((v_274) ctx_114))"
-"(let-values(((the-struct_113) v_274))"
+"(let-values(((v_273) ctx_114))"
+"(let-values(((the-struct_113) v_273))"
 "(if(expand-context/outer? the-struct_113)"
 "(let-values(((context437_0) 'module-begin)"
 "((only-immediate?438_0) #t)"
 "((def-ctx-scopes439_0) def-ctx-scopes_9)"
-"((inner440_0)(root-expand-context/outer-inner v_274)))"
+"((inner440_0)(root-expand-context/outer-inner v_273)))"
 "(expand-context/outer1.1"
 " inner440_0"
 "(root-expand-context/outer-post-expansion the-struct_113)"
@@ -73430,11 +73452,11 @@ static const char *startup_source =
 "(if(= 1(length bodys_18))"
 "(let-values()"
 "(begin"
-"(let-values(((obs_133)(expand-context-observer ctx_114)))"
-"(if obs_133"
+"(let-values(((obs_134)(expand-context-observer ctx_114)))"
+"(if obs_134"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_133 'rename-one(car bodys_18))))"
+"(call-expand-observe obs_134 'rename-one(car bodys_18))))"
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
@@ -73517,21 +73539,21 @@ static const char *startup_source =
 "(datum->syntax$1 disarmed-scopes-s_0(list* mb-id_0 bodys_19) s_193 s_193)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_134)(expand-context-observer mb-ctx_1)))"
-"(if obs_134"
+"(let-values(((obs_135)(expand-context-observer mb-ctx_1)))"
+"(if obs_135"
 "(let-values()"
-"(let-values()(call-expand-observe obs_134 'tag mb_2)))"
+"(let-values()(call-expand-observe obs_135 'tag mb_2)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if log-rename-one?_0"
 "(let-values()"
-"(let-values(((obs_135)(expand-context-observer mb-ctx_1)))"
-"(if obs_135"
+"(let-values(((obs_136)(expand-context-observer mb-ctx_1)))"
+"(if obs_136"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_135 'rename-one mb_2)))"
+"(call-expand-observe obs_136 'rename-one mb_2)))"
 "(void))))"
 "(void))"
 "(values))))"
@@ -73647,14 +73669,14 @@ static const char *startup_source =
 "(if(if tail?_53(not(zero? phase_107)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_92)"
+"(let-values(((obs_93)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_92"
+"(if obs_93"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_92"
+" obs_93"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -73670,14 +73692,14 @@ static const char *startup_source =
 "(expand-context-to-module-lifts"
 " partial-body-ctx_1)))))"
 "(begin"
-"(let-values(((obs_136)"
+"(let-values(((obs_137)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_136"
+"(if obs_137"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_136"
+" obs_137"
 " 'module-lift-end-loop"
 " bodys_22)))"
 "(void)))"
@@ -73694,14 +73716,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_1)(cdr bodys_21)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_137)"
+"(let-values(((obs_138)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_137"
+"(if obs_138"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_137"
+" obs_138"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -73732,14 +73754,14 @@ static const char *startup_source =
 " exp-body_7"
 " rest-bodys_1))"
 "(void))"
-"(let-values(((obs_138)"
+"(let-values(((obs_139)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_138"
+"(if obs_139"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_138"
+" obs_139"
 " 'rename-one"
 " exp-body_7)))"
 "(void)))"
@@ -73824,14 +73846,14 @@ static const char *startup_source =
 " e470_0)"
 " rest-bodys_1)))"
 "(begin"
-"(let-values(((obs_139)"
+"(let-values(((obs_140)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_139"
+"(if obs_140"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_139"
+" obs_140"
 " 'splice"
 " spliced-bodys_0)))"
 "(void)))"
@@ -73844,22 +73866,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_140)"
+"(let-values(((obs_141)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_140"
+"(if obs_141"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_140"
+" obs_141"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_140"
+" obs_141"
 " 'prim-begin-for-syntax)"
 "(call-expand-observe"
-" obs_140"
+" obs_141"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -73875,14 +73897,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_141)"
+"(let-values(((obs_142)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_141"
+"(if obs_142"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_141"
+" obs_142"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -73947,14 +73969,14 @@ static const char *startup_source =
 "(add1"
 " phase_107))))"
 "(begin"
-"(let-values(((obs_142)"
+"(let-values(((obs_143)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_142"
+"(if obs_143"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_142"
+" obs_143"
 " 'next-group)))"
 "(void)))"
 "(namespace-run-available-modules!"
@@ -73971,18 +73993,18 @@ static const char *startup_source =
 "(namespace-visit-available-modules!"
 " m-ns_20"
 " phase_107)"
-"(let-values(((obs_143)"
+"(let-values(((obs_144)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_143"
+"(if obs_144"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_143"
+" obs_144"
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
-"(let-values(((lst_428)"
+"(let-values(((lst_427)"
 " nested-bodys_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -73990,42 +74012,42 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_428)))"
-"((letrec-values(((for-loop_334)"
-"(lambda(fold-var_355"
-" lst_389)"
+" lst_427)))"
+"((letrec-values(((for-loop_330)"
+"(lambda(fold-var_357"
+" lst_388)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_389)"
+" lst_388)"
 "(let-values(((nested-body_0)"
 "(unsafe-car"
-" lst_389))"
-"((rest_252)"
+" lst_388))"
+"((rest_253)"
 "(unsafe-cdr"
-" lst_389)))"
-"(let-values(((fold-var_374)"
-"(let-values(((fold-var_375)"
-" fold-var_355))"
+" lst_388)))"
 "(let-values(((fold-var_376)"
+"(let-values(((fold-var_377)"
+" fold-var_357))"
+"(let-values(((fold-var_378)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(extract-syntax"
 " nested-body_0))"
-" fold-var_375))))"
+" fold-var_377))))"
 "(values"
-" fold-var_376)))))"
+" fold-var_378)))))"
 "(if(not"
 " #f)"
-"(for-loop_334"
-" fold-var_374"
-" rest_252)"
-" fold-var_374)))"
-" fold-var_355)))))"
-" for-loop_334)"
+"(for-loop_330"
+" fold-var_376"
+" rest_253)"
+" fold-var_376)))"
+" fold-var_357)))))"
+" for-loop_330)"
 " null"
-" lst_428))))))"
+" lst_427))))))"
 "(datum->syntax$1"
 " #f"
 "(cons"
@@ -74046,19 +74068,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_144)"
+"(let-values(((obs_145)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_144"
+"(if obs_145"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_144"
+" obs_145"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_144"
+" obs_145"
 " 'prim-define-values))))"
 "(void)))"
 "(values))))"
@@ -74121,7 +74143,7 @@ static const char *startup_source =
 " orig-s_87))"
 "(let-values()"
 "(let-values(((id_146)"
-"(let-values(((lst_429)"
+"(let-values(((lst_428)"
 " flat-s_60))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74129,8 +74151,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_429)))"
-"((letrec-values(((for-loop_335)"
+" lst_428)))"
+"((letrec-values(((for-loop_331)"
 "(lambda(id_147"
 " lst_71)"
 "(begin"
@@ -74140,7 +74162,7 @@ static const char *startup_source =
 "(let-values(((s_829)"
 "(unsafe-car"
 " lst_71))"
-"((rest_253)"
+"((rest_254)"
 "(unsafe-cdr"
 " lst_71)))"
 "(let-values(((id_148)"
@@ -74150,15 +74172,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id496_0)"
 "(let-values()"
-"(if(let-values(((or-part_406)"
+"(if(let-values(((or-part_404)"
 "(if(syntax?$1"
 " s_829)"
 "(symbol?"
 "(syntax-e$1"
 " s_829))"
 " #f)))"
-"(if or-part_406"
-" or-part_406"
+"(if or-part_404"
+" or-part_404"
 "(symbol?"
 " s_829)))"
 " s_829"
@@ -74174,14 +74196,14 @@ static const char *startup_source =
 " id_150)))))"
 "(if(not"
 " #f)"
-"(for-loop_335"
+"(for-loop_331"
 " id_148"
-" rest_253)"
+" rest_254)"
 " id_148)))"
 " id_147)))))"
-" for-loop_335)"
+" for-loop_331)"
 " null"
-" lst_429)))))"
+" lst_428)))))"
 "(reverse$1"
 " id_146))))))))"
 "((rhs484_0)"
@@ -74244,14 +74266,14 @@ static const char *startup_source =
 " define-values477_1"
 " id478_1"
 " rhs479_1))))))"
-"(let-values(((ids_45)"
+"(let-values(((ids_44)"
 "(remove-use-site-scopes"
 " id478_0"
 " partial-body-ctx_1)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ids486_0)"
-" ids_45)"
+" ids_44)"
 "((phase487_0)"
 " phase_107)"
 "((exp-body488_0)"
@@ -74266,7 +74288,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((ids489_0)"
-" ids_45)"
+" ids_44)"
 "((phase490_0)"
 " phase_107)"
 "((requires+provides491_0)"
@@ -74281,7 +74303,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((syms_23)"
 "(let-values(((ids497_0)"
-" ids_45)"
+" ids_44)"
 "((defined-syms498_0)"
 " defined-syms_12)"
 "((self499_0)"
@@ -74308,7 +74330,7 @@ static const char *startup_source =
 " phase500_0"
 " all-scopes-stx501_0))))"
 "(begin"
-"(let-values(((lst_430)"
+"(let-values(((lst_429)"
 " syms_23))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74316,19 +74338,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_430)))"
-"((letrec-values(((for-loop_336)"
-"(lambda(lst_431)"
+" lst_429)))"
+"((letrec-values(((for-loop_332)"
+"(lambda(lst_430)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_431)"
+" lst_430)"
 "(let-values(((sym_110)"
 "(unsafe-car"
-" lst_431))"
-"((rest_254)"
+" lst_430))"
+"((rest_255)"
 "(unsafe-cdr"
-" lst_431)))"
+" lst_430)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -74343,12 +74365,12 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_336"
-" rest_254)"
+"(for-loop_332"
+" rest_255)"
 "(values))))"
 "(values))))))"
-" for-loop_336)"
-" lst_430)))"
+" for-loop_332)"
+" lst_429)))"
 "(void)"
 "(let-values(((requires+provides493_0)"
 " requires+provides_7)"
@@ -74361,20 +74383,20 @@ static const char *startup_source =
 " requires+provides493_0"
 " syms494_0"
 " phase495_0))"
-"(let-values(((obs_145)"
+"(let-values(((obs_146)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_145"
+"(if obs_146"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_145"
+" obs_146"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
 "(list"
 " define-values477_0"
-" ids_45"
+" ids_44"
 " rhs479_0)"
 " exp-body_7))))"
 "(void)))"
@@ -74382,7 +74404,7 @@ static const char *startup_source =
 "(semi-parsed-define-values2.1"
 " exp-body_7"
 " syms_23"
-" ids_45"
+" ids_44"
 " rhs479_0)"
 "(loop_124"
 " tail?_53"
@@ -74393,22 +74415,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_146)"
+"(let-values(((obs_147)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_146"
+"(if obs_147"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_146"
+" obs_147"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_146"
+" obs_147"
 " 'prim-define-syntaxes)"
 "(call-expand-observe"
-" obs_146"
+" obs_147"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -74419,14 +74441,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_147)"
+"(let-values(((obs_148)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_147"
+"(if obs_148"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_147"
+" obs_148"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -74489,7 +74511,7 @@ static const char *startup_source =
 " orig-s_88))"
 "(let-values()"
 "(let-values(((id_151)"
-"(let-values(((lst_432)"
+"(let-values(((lst_431)"
 " flat-s_61))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -74497,20 +74519,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_432)))"
-"((letrec-values(((for-loop_337)"
+" lst_431)))"
+"((letrec-values(((for-loop_333)"
 "(lambda(id_152"
-" lst_433)"
+" lst_432)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_433)"
+" lst_432)"
 "(let-values(((s_842)"
 "(unsafe-car"
-" lst_433))"
-"((rest_255)"
+" lst_432))"
+"((rest_256)"
 "(unsafe-cdr"
-" lst_433)))"
+" lst_432)))"
 "(let-values(((id_153)"
 "(let-values(((id_154)"
 " id_152))"
@@ -74518,15 +74540,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id525_0)"
 "(let-values()"
-"(if(let-values(((or-part_407)"
+"(if(let-values(((or-part_405)"
 "(if(syntax?$1"
 " s_842)"
 "(symbol?"
 "(syntax-e$1"
 " s_842))"
 " #f)))"
-"(if or-part_407"
-" or-part_407"
+"(if or-part_405"
+" or-part_405"
 "(symbol?"
 " s_842)))"
 " s_842"
@@ -74542,14 +74564,14 @@ static const char *startup_source =
 " id_155)))))"
 "(if(not"
 " #f)"
-"(for-loop_337"
+"(for-loop_333"
 " id_153"
-" rest_255)"
+" rest_256)"
 " id_153)))"
 " id_152)))))"
-" for-loop_337)"
+" for-loop_333)"
 " null"
-" lst_432)))))"
+" lst_431)))))"
 "(reverse$1"
 " id_151))))))))"
 "((rhs512_0)"
@@ -74612,14 +74634,14 @@ static const char *startup_source =
 " define-syntaxes505_1"
 " id506_1"
 " rhs507_1))))))"
-"(let-values(((ids_46)"
+"(let-values(((ids_45)"
 "(remove-use-site-scopes"
 " id506_0"
 " partial-body-ctx_1)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ids514_0)"
-" ids_46)"
+" ids_45)"
 "((phase515_0)"
 " phase_107)"
 "((exp-body516_0)"
@@ -74634,7 +74656,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((ids517_0)"
-" ids_46)"
+" ids_45)"
 "((phase518_0)"
 " phase_107)"
 "((requires+provides519_0)"
@@ -74649,7 +74671,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((syms_24)"
 "(let-values(((ids526_0)"
-" ids_46)"
+" ids_45)"
 "((defined-syms527_0)"
 " defined-syms_12)"
 "((self528_0)"
@@ -74701,12 +74723,12 @@ static const char *startup_source =
 "((temp536_0)"
 " rhs507_0)"
 "((ids537_0)"
-" ids_46)"
+" ids_45)"
 "((temp538_0)"
-"(let-values(((v_275)"
+"(let-values(((v_274)"
 " partial-body-ctx_1))"
 "(let-values(((the-struct_114)"
-" v_275))"
+" v_274))"
 "(if(expand-context/outer?"
 " the-struct_114)"
 "(let-values(((need-eventually-defined540_0)"
@@ -74714,7 +74736,7 @@ static const char *startup_source =
 "((inner541_0)"
 "(let-values(((the-struct_115)"
 "(root-expand-context/outer-inner"
-" v_275)))"
+" v_274)))"
 "(if(expand-context/inner?"
 " the-struct_115)"
 "(let-values(((lifts542_0)"
@@ -74820,18 +74842,24 @@ static const char *startup_source =
 " temp538_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_434)"
+"(let-values(((lst_433)"
 " syms_24)"
-"((lst_435)"
+"((lst_434)"
 " vals_10)"
-"((lst_436)"
-" ids_46))"
+"((lst_435)"
+" ids_45))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list"
+" lst_433)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
+"(check-list"
 " lst_434)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -74839,44 +74867,38 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_435)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list"
-" lst_436)))"
-"((letrec-values(((for-loop_338)"
-"(lambda(lst_437"
-" lst_438"
-" lst_439)"
+"((letrec-values(((for-loop_334)"
+"(lambda(lst_436"
+" lst_437"
+" lst_438)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_437)"
+" lst_436)"
 "(if(pair?"
-" lst_438)"
+" lst_437)"
 "(pair?"
-" lst_439)"
+" lst_438)"
 " #f)"
 " #f)"
 "(let-values(((sym_111)"
 "(unsafe-car"
-" lst_437))"
-"((rest_256)"
-"(unsafe-cdr"
-" lst_437))"
-"((val_87)"
-"(unsafe-car"
-" lst_438))"
+" lst_436))"
 "((rest_257)"
 "(unsafe-cdr"
-" lst_438))"
-"((id_156)"
+" lst_436))"
+"((val_87)"
 "(unsafe-car"
-" lst_439))"
+" lst_437))"
 "((rest_258)"
 "(unsafe-cdr"
-" lst_439)))"
+" lst_437))"
+"((id_156)"
+"(unsafe-car"
+" lst_438))"
+"((rest_259)"
+"(unsafe-cdr"
+" lst_438)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -74898,34 +74920,34 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_338"
-" rest_256"
+"(for-loop_334"
 " rest_257"
-" rest_258)"
+" rest_258"
+" rest_259)"
 "(values))))"
 "(values))))))"
-" for-loop_338)"
+" for-loop_334)"
+" lst_433"
 " lst_434"
-" lst_435"
-" lst_436)))"
+" lst_435)))"
 "(values))))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_148)"
+"(let-values(((obs_149)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_148"
+"(if obs_149"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_148"
+" obs_149"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
 "(list"
 " define-syntaxes505_0"
-" ids_46"
+" ids_45"
 " exp-rhs_6)))))"
 "(void)))"
 "(values))))"
@@ -74933,7 +74955,7 @@ static const char *startup_source =
 "(parsed-define-syntaxes20.1"
 "(keep-properties-only"
 " exp-body_7)"
-" ids_46"
+" ids_45"
 " syms_24"
 " parsed-rhs_2)))"
 "(cons"
@@ -74946,7 +74968,7 @@ static const char *startup_source =
 "((temp546_0)"
 "(list"
 " define-syntaxes505_0"
-" ids_46"
+" ids_45"
 " exp-rhs_6)))"
 "(rebuild5.1"
 " #t"
@@ -74962,19 +74984,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_149)"
+"(let-values(((obs_150)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_149"
+"(if obs_150"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_149"
+" obs_150"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_149"
+" obs_150"
 " 'prim-require))))"
 "(void)))"
 "(values))))"
@@ -75072,14 +75094,14 @@ static const char *startup_source =
 " m-ns554_0"
 " phase555_0"
 " requires+provides557_0))"
-"(let-values(((obs_150)"
+"(let-values(((obs_151)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_150"
+"(if obs_151"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_150"
+" obs_151"
 " 'exit-prim"
 " ready-body_0)))"
 "(void)))"
@@ -75145,22 +75167,22 @@ static const char *startup_source =
 " 'module*)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_151)"
+"(let-values(((obs_152)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_151"
+"(if obs_152"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_151"
+" obs_152"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_151"
+" obs_152"
 " 'prim-submodule*)"
 "(call-expand-observe"
-" obs_151"
+" obs_152"
 " 'exit-prim"
 " exp-body_7))))"
 "(void)))"
@@ -75230,7 +75252,7 @@ static const char *startup_source =
 " kw569_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_440)"
+"(let-values(((lst_439)"
 " kw569_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -75238,19 +75260,19 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_440)))"
-"((letrec-values(((for-loop_339)"
-"(lambda(lst_441)"
+" lst_439)))"
+"((letrec-values(((for-loop_335)"
+"(lambda(lst_440)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_441)"
+" lst_440)"
 "(let-values(((kw_1)"
 "(unsafe-car"
-" lst_441))"
-"((rest_259)"
+" lst_440))"
+"((rest_260)"
 "(unsafe-cdr"
-" lst_441)))"
+" lst_440)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75301,12 +75323,12 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_339"
-" rest_259)"
+"(for-loop_335"
+" rest_260)"
 "(values))))"
 "(values))))))"
-" for-loop_339)"
-" lst_440)))"
+" for-loop_335)"
+" lst_439)))"
 "(values))))"
 "(let-values()"
 "(let-values(((parsed-body_1)"
@@ -75353,37 +75375,37 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_35 frame-id_18 inside-scope_2 all-scopes-stx_6 defined-syms_13 requires+provides_8)"
 "(begin"
-"(lambda(ids_47 rhs_23 phase_149)"
+"(lambda(ids_46 rhs_23 phase_149)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
-"(let-values(((lst_442) ids_47))"
+"(let-values(((lst_441) ids_46))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_442)))"
-"((letrec-values(((for-loop_340)"
-"(lambda(fold-var_377 lst_443)"
+"(let-values()(check-list lst_441)))"
+"((letrec-values(((for-loop_336)"
+"(lambda(fold-var_379 lst_442)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_443)"
-"(let-values(((id_157)(unsafe-car lst_443))"
-"((rest_260)(unsafe-cdr lst_443)))"
-"(let-values(((fold-var_378)"
-"(let-values(((fold-var_379) fold-var_377))"
+"(if(pair? lst_442)"
+"(let-values(((id_157)(unsafe-car lst_442))"
+"((rest_261)(unsafe-cdr lst_442)))"
 "(let-values(((fold-var_380)"
+"(let-values(((fold-var_381) fold-var_379))"
+"(let-values(((fold-var_382)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
 " id_157"
 " inside-scope_2))"
-" fold-var_379))))"
-"(values fold-var_380)))))"
-"(if(not #f)(for-loop_340 fold-var_378 rest_260) fold-var_378)))"
-" fold-var_377)))))"
-" for-loop_340)"
+" fold-var_381))))"
+"(values fold-var_382)))))"
+"(if(not #f)(for-loop_336 fold-var_380 rest_261) fold-var_380)))"
+" fold-var_379)))))"
+" for-loop_336)"
 " null"
-" lst_442))))))"
+" lst_441))))))"
 "(let-values(((syms_25)"
 "(let-values(((scoped-ids572_0) scoped-ids_0)"
 "((defined-syms573_0) defined-syms_13)"
@@ -75420,29 +75442,29 @@ static const char *startup_source =
 "(let-values(((pe_3)(root-expand-context-post-expansion ctx_115)))"
 "(if pe_3"
 "(reverse$1"
-"(let-values(((lst_444) bodys_23))"
+"(let-values(((lst_443) bodys_23))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_444)))"
-"((letrec-values(((for-loop_341)"
-"(lambda(fold-var_381 lst_445)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_443)))"
+"((letrec-values(((for-loop_337)"
+"(lambda(fold-var_383 lst_444)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_445)"
-"(let-values(((body_21)(unsafe-car lst_445))((rest_261)(unsafe-cdr lst_445)))"
-"(let-values(((fold-var_382)"
-"(let-values(((fold-var_383) fold-var_381))"
+"(if(pair? lst_444)"
+"(let-values(((body_21)(unsafe-car lst_444))((rest_262)(unsafe-cdr lst_444)))"
 "(let-values(((fold-var_384)"
+"(let-values(((fold-var_385) fold-var_383))"
+"(let-values(((fold-var_386)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(apply-post-expansion pe_3 body_21))"
-" fold-var_383))))"
-"(values fold-var_384)))))"
-"(if(not #f)(for-loop_341 fold-var_382 rest_261) fold-var_382)))"
-" fold-var_381)))))"
-" for-loop_341)"
+" fold-var_385))))"
+"(values fold-var_386)))))"
+"(if(not #f)(for-loop_337 fold-var_384 rest_262) fold-var_384)))"
+" fold-var_383)))))"
+" for-loop_337)"
 " null"
-" lst_444))))"
+" lst_443))))"
 " bodys_23)))))"
 "(define-values"
 "(finish-expanding-body-expressons99.1)"
@@ -75474,12 +75496,12 @@ static const char *startup_source =
 "(if(if tail?_54(not(zero? phase_150)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_152)(expand-context-observer body-ctx_7)))"
-"(if obs_152"
+"(let-values(((obs_153)(expand-context-observer body-ctx_7)))"
+"(if obs_153"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_152"
+" obs_153"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75495,13 +75517,13 @@ static const char *startup_source =
 "(if(null? bodys_25)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_153)"
+"(let-values(((obs_154)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_153"
+"(if obs_154"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_153"
+" obs_154"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75514,42 +75536,42 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_154)"
+"(let-values(((obs_155)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_154"
+"(if obs_155"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_154 'next)))"
+"(call-expand-observe obs_155 'next)))"
 "(void)))"
 "(values))))"
 "(let-values(((body_22)(car bodys_24)))"
 "(let-values(((rest-bodys_2)(cdr bodys_24)))"
 "(let-values(((exp-body_8)"
-"(if(let-values(((or-part_408)"
+"(if(let-values(((or-part_406)"
 "(parsed? body_22)))"
-"(if or-part_408"
-" or-part_408"
-"(let-values(((or-part_409)"
+"(if or-part_406"
+" or-part_406"
+"(let-values(((or-part_407)"
 "(expanded+parsed? body_22)))"
-"(if or-part_409"
-" or-part_409"
+"(if or-part_407"
+" or-part_407"
 "(semi-parsed-begin-for-syntax?"
 " body_22)))))"
 "(let-values() body_22)"
 "(if(semi-parsed-define-values? body_22)"
 "(let-values()"
-"(let-values(((ids_48)"
+"(let-values(((ids_47)"
 "(semi-parsed-define-values-ids"
 " body_22)))"
 "(let-values(((rhs-ctx_2)"
 "(as-named-context"
 "(as-expression-context"
 " body-ctx_7)"
-" ids_48)))"
+" ids_47)))"
 "(let-values(((syms_26)"
 "(semi-parsed-define-values-syms"
 " body_22)))"
-"(let-values(((s_625)"
+"(let-values(((s_626)"
 "(semi-parsed-define-values-s"
 " body_22)))"
 "(let-values(((ok?_87"
@@ -75558,7 +75580,7 @@ static const char *startup_source =
 " _581_0)"
 "(let-values(((s_856)"
 "(syntax-disarm$1"
-" s_625)))"
+" s_626)))"
 "(if(if(not"
 "(expand-context-to-parsed?"
 " rhs-ctx_2))"
@@ -75669,7 +75691,7 @@ static const char *startup_source =
 "(let-values(((rhs-ctx588_0)"
 " rhs-ctx_2)"
 "((s589_0)"
-" s_625)"
+" s_626)"
 "((temp590_0)"
 " #t))"
 "(keep-as-needed119.1"
@@ -75707,7 +75729,7 @@ static const char *startup_source =
 "(let-values(((comp-form_0)"
 "(parsed-define-values19.1"
 " rebuild-s_15"
-" ids_48"
+" ids_47"
 " syms_26"
 "(if(expand-context-to-parsed?"
 " rhs-ctx_2)"
@@ -75732,7 +75754,7 @@ static const char *startup_source =
 "((temp596_0)"
 "(list"
 " define-values579_0"
-" ids_48"
+" ids_47"
 " exp-rhs_7)))"
 "(rebuild5.1"
 " #t"
@@ -75802,14 +75824,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_155)"
+"(let-values(((obs_156)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_155"
+"(if obs_156"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_155"
+" obs_156"
 " 'module-lift-loop"
 "(append"
 " lifted-requires_0"
@@ -75850,14 +75872,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_156)"
+"(let-values(((obs_157)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_156"
+"(if obs_157"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_156"
+" obs_157"
 " 'next)))"
 "(void)))))"
 "(append"
@@ -75880,7 +75902,7 @@ static const char *startup_source =
 "(let-values(((ht_166) need-eventually-defined_3))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_166)))"
-"((letrec-values(((for-loop_342)"
+"((letrec-values(((for-loop_338)"
 "(lambda(i_186)"
 "(begin"
 " 'for-loop"
@@ -75893,24 +75915,24 @@ static const char *startup_source =
 "(begin"
 "(let-values()"
 "(begin"
-"(let-values(((lst_446) l_89))"
+"(let-values(((lst_445) l_89))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_446)))"
-"((letrec-values(((for-loop_343)"
-"(lambda(lst_447)"
+"(let-values()(check-list lst_445)))"
+"((letrec-values(((for-loop_339)"
+"(lambda(lst_446)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_447)"
+" lst_446)"
 "(let-values(((id_158)"
 "(unsafe-car"
-" lst_447))"
-"((rest_262)"
+" lst_446))"
+"((rest_263)"
 "(unsafe-cdr"
-" lst_447)))"
+" lst_446)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75993,18 +76015,18 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_343"
-" rest_262)"
+"(for-loop_339"
+" rest_263)"
 "(values))))"
 "(values))))))"
-" for-loop_343)"
-" lst_446)))"
+" for-loop_339)"
+" lst_445)))"
 "(void)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_342(hash-iterate-next ht_166 i_186))(values))))"
+"(if(not #f)(for-loop_338(hash-iterate-next ht_166 i_186))(values))))"
 "(values))))))"
-" for-loop_342)"
+" for-loop_338)"
 "(hash-iterate-first ht_166))))"
 "(void)))))"
 "(define-values"
@@ -76033,8 +76055,8 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_26)"
 "(let-values() null)"
-"(if(let-values(((or-part_410)(parsed?(car bodys_26))))"
-"(if or-part_410 or-part_410(expanded+parsed?(car bodys_26))))"
+"(if(let-values(((or-part_408)(parsed?(car bodys_26))))"
+"(if or-part_408 or-part_408(expanded+parsed?(car bodys_26))))"
 "(let-values()"
 "(cons(car bodys_26)(loop_126(cdr bodys_26) phase_153)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_26))"
@@ -76063,19 +76085,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_157)"
+"(let-values(((obs_158)"
 "(expand-context-observer"
 " ctx_117)))"
-"(if obs_157"
+"(if obs_158"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_157"
+" obs_158"
 " 'enter-prim"
 "(car bodys_26))"
 "(call-expand-observe"
-" obs_157"
+" obs_158"
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
@@ -76092,23 +76114,23 @@ static const char *startup_source =
 " s_867)))"
 "(if(pair? s_868)"
 "(let-values(((#%provide614_0)"
-"(let-values(((s_665)"
+"(let-values(((s_666)"
 "(car"
 " s_868)))"
-" s_665))"
+" s_666))"
 "((spec615_0)"
-"(let-values(((s_666)"
+"(let-values(((s_667)"
 "(cdr"
 " s_868)))"
-"(let-values(((s_667)"
+"(let-values(((s_668)"
 "(if(syntax?$1"
-" s_666)"
+" s_667)"
 "(syntax-e$1"
-" s_666)"
-" s_666)))"
+" s_667)"
+" s_667)))"
 "(let-values(((flat-s_64)"
 "(to-syntax-list.1"
-" s_667)))"
+" s_668)))"
 "(if(not"
 " flat-s_64)"
 "(let-values()"
@@ -76136,9 +76158,9 @@ static const char *startup_source =
 " requires+provides_10"
 " self_38"
 " phase_153"
-"(let-values(((v_276) ctx_117))"
+"(let-values(((v_275) ctx_117))"
 "(let-values(((the-struct_117)"
-" v_276))"
+" v_275))"
 "(if(expand-context/outer?"
 " the-struct_117)"
 "(let-values(((context616_0)"
@@ -76146,7 +76168,7 @@ static const char *startup_source =
 "((inner617_0)"
 "(let-values(((the-struct_118)"
 "(root-expand-context/outer-inner"
-" v_276)))"
+" v_275)))"
 "(if(expand-context/inner?"
 " the-struct_118)"
 "(let-values(((phase618_0)"
@@ -76263,14 +76285,14 @@ static const char *startup_source =
 " temp622_0"
 " temp623_0)))))"
 "(begin"
-"(let-values(((obs_158)"
+"(let-values(((obs_159)"
 "(expand-context-observer"
 " ctx_117)))"
-"(if obs_158"
+"(if obs_159"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_158"
+" obs_159"
 " 'exit-prim"
 " new-s_10)))"
 "(void)))"
@@ -76330,8 +76352,8 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_411) enclosing-self_3))"
-"(if or-part_411 or-part_411 self_39)))))"
+"(let-values(((or-part_409) enclosing-self_3))"
+"(if or-part_409 or-part_409 self_39)))))"
 "(let-values(((compiled-module_0)"
 "(let-values(((parsed-mod624_0) parsed-mod_0)"
 "((temp625_0)"
@@ -76383,13 +76405,13 @@ static const char *startup_source =
 " compiled-module632_0)))))))))))))))))))))))))"
 "(define-values"
 "(attach-root-expand-context-properties)"
-"(lambda(s_687 root-ctx_8 orig-self_1 new-self_2)"
+"(lambda(s_688 root-ctx_8 orig-self_1 new-self_2)"
 "(begin"
-"(let-values(((s_689)"
-"(syntax-property$1 s_687 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
+"(let-values(((s_690)"
+"(syntax-property$1 s_688 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))"
 "(let-values(((s_869)"
 "(syntax-property$1"
-" s_689"
+" s_690"
 " 'module-body-inside-context"
 "(apply-post-expansion(root-expand-context-post-expansion root-ctx_8) empty-syntax))))"
 " s_869)))))"
@@ -76526,9 +76548,9 @@ static const char *startup_source =
 " temp641_0))"
 " parsed-bfs_0))"
 "(loop_127 rest-bodys_3 phase_155))))))))"
-"(if(let-values(((or-part_412)(parsed? body_23)))"
-"(if or-part_412"
-" or-part_412"
+"(if(let-values(((or-part_410)(parsed? body_23)))"
+"(if or-part_410"
+" or-part_410"
 "(expanded+parsed? body_23)))"
 "(let-values()"
 "(cons body_23(loop_127 rest-bodys_3 phase_155)))"
@@ -76635,7 +76657,7 @@ static const char *startup_source =
 "(let-values(((s_888)"
 "(cdr"
 " s_886)))"
-"(let-values(((s_705)"
+"(let-values(((s_706)"
 "(if(syntax?$1"
 " s_888)"
 "(syntax-e$1"
@@ -76644,13 +76666,13 @@ static const char *startup_source =
 "(let-values(((name648_0)"
 "(let-values(((s_889)"
 "(car"
-" s_705)))"
+" s_706)))"
 " s_889))"
 "((_649_0)"
 "(let-values(((s_890)"
 "(cdr"
-" s_705)))"
-"(let-values(((s_706)"
+" s_706)))"
+"(let-values(((s_707)"
 "(if(syntax?$1"
 " s_890)"
 "(syntax-e$1"
@@ -76659,7 +76681,7 @@ static const char *startup_source =
 "(let-values((()"
 "(let-values(((s_891)"
 "(car"
-" s_706)))"
+" s_707)))"
 "(let-values(((s_892)"
 "(if(syntax?$1"
 " s_891)"
@@ -76668,10 +76690,10 @@ static const char *startup_source =
 " s_891)))"
 "(values))))"
 "((_650_0)"
-"(let-values(((s_707)"
+"(let-values(((s_708)"
 "(cdr"
-" s_706)))"
 " s_707)))"
+" s_708)))"
 "(values"
 " _650_0))))))"
 "(values"
@@ -76825,24 +76847,24 @@ static const char *startup_source =
 "(lambda(in168_0 ids170_0 phase171_0 requires+provides172_0)"
 "(begin"
 " 'check-ids-unbound173"
-"(let-values(((ids_49) ids170_0))"
+"(let-values(((ids_48) ids170_0))"
 "(let-values(((phase_156) phase171_0))"
 "(let-values(((requires+provides_13) requires+provides172_0))"
 "(let-values(((s_893) in168_0))"
 "(let-values()"
 "(begin"
-"(let-values(((lst_448) ids_49))"
+"(let-values(((lst_447) ids_48))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_448)))"
-"((letrec-values(((for-loop_344)"
-"(lambda(lst_449)"
+"(let-values()(check-list lst_447)))"
+"((letrec-values(((for-loop_340)"
+"(lambda(lst_448)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_449)"
-"(let-values(((id_159)(unsafe-car lst_449))"
-"((rest_263)(unsafe-cdr lst_449)))"
+"(if(pair? lst_448)"
+"(let-values(((id_159)(unsafe-car lst_448))"
+"((rest_264)(unsafe-cdr lst_448)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76869,25 +76891,25 @@ static const char *startup_source =
 " phase674_0)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_344 rest_263)(values))))"
+"(if(not #f)(for-loop_340 rest_264)(values))))"
 "(values))))))"
-" for-loop_344)"
-" lst_448)))"
+" for-loop_340)"
+" lst_447)))"
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
 "(lambda(bodys_28 phase_157 m-ns_23 self_41 ctx_120)"
 "(begin"
 "(begin"
-"(let-values(((lst_450) bodys_28))"
+"(let-values(((lst_449) bodys_28))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_450)))"
-"((letrec-values(((for-loop_345)"
-"(lambda(lst_451)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_449)))"
+"((letrec-values(((for-loop_341)"
+"(lambda(lst_450)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_451)"
-"(let-values(((body_24)(unsafe-car lst_451))((rest_264)(unsafe-cdr lst_451)))"
+"(if(pair? lst_450)"
+"(let-values(((body_24)(unsafe-car lst_450))((rest_265)(unsafe-cdr lst_450)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76901,72 +76923,72 @@ static const char *startup_source =
 " body_24)))"
 "(if(parsed-define-values? p_88)"
 "(let-values()"
-"(let-values(((ids_50)"
+"(let-values(((ids_49)"
 "(parsed-define-values-ids"
 " p_88)))"
 "(let-values(((vals_11)"
 "(eval-for-bindings"
 " 'define-values"
-" ids_50"
+" ids_49"
 "(parsed-define-values-rhs"
 " p_88)"
 " phase_157"
 " m-ns_23"
 " ctx_120)))"
 "(begin"
-"(let-values(((lst_452) ids_50)"
-"((lst_453)"
+"(let-values(((lst_451) ids_49)"
+"((lst_452)"
 "(parsed-define-values-syms"
 " p_88))"
-"((lst_454) vals_11))"
+"((lst_453) vals_11))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
+"(check-list lst_451)))"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
+"(let-values()"
 "(check-list lst_452)))"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
 "(let-values()"
 "(check-list lst_453)))"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-list lst_454)))"
-"((letrec-values(((for-loop_346)"
-"(lambda(lst_455"
-" lst_456"
-" lst_457)"
+"((letrec-values(((for-loop_342)"
+"(lambda(lst_454"
+" lst_455"
+" lst_456)"
 "(begin"
 " 'for-loop"
 "(if(if(pair?"
-" lst_455)"
+" lst_454)"
 "(if(pair?"
-" lst_456)"
+" lst_455)"
 "(pair?"
-" lst_457)"
+" lst_456)"
 " #f)"
 " #f)"
 "(let-values(((id_160)"
 "(unsafe-car"
-" lst_455))"
-"((rest_265)"
-"(unsafe-cdr"
-" lst_455))"
-"((sym_112)"
-"(unsafe-car"
-" lst_456))"
+" lst_454))"
 "((rest_266)"
 "(unsafe-cdr"
-" lst_456))"
-"((val_88)"
+" lst_454))"
+"((sym_112)"
 "(unsafe-car"
-" lst_457))"
+" lst_455))"
 "((rest_267)"
 "(unsafe-cdr"
-" lst_457)))"
+" lst_455))"
+"((val_88)"
+"(unsafe-car"
+" lst_456))"
+"((rest_268)"
+"(unsafe-cdr"
+" lst_456)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -76982,30 +77004,30 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_346"
-" rest_265"
+"(for-loop_342"
 " rest_266"
-" rest_267)"
+" rest_267"
+" rest_268)"
 "(values))))"
 "(values))))))"
-" for-loop_346)"
+" for-loop_342)"
+" lst_451"
 " lst_452"
-" lst_453"
-" lst_454)))"
+" lst_453)))"
 "(void)))))"
-"(if(let-values(((or-part_413)"
+"(if(let-values(((or-part_411)"
 "(parsed-define-syntaxes?"
 " p_88)))"
-"(if or-part_413"
-" or-part_413"
+"(if or-part_411"
+" or-part_411"
 "(semi-parsed-begin-for-syntax?"
 " p_88)))"
 "(let-values()(void))"
-"(if(let-values(((or-part_414)"
+"(if(let-values(((or-part_412)"
 "(parsed-#%declare?"
 " p_88)))"
-"(if or-part_414"
-" or-part_414"
+"(if or-part_412"
+" or-part_412"
 "(syntax?$1 p_88)))"
 "(let-values()(void))"
 "(let-values()"
@@ -77037,10 +77059,10 @@ static const char *startup_source =
 " m-ns_23)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_345 rest_264)(values))))"
+"(if(not #f)(for-loop_341 rest_265)(values))))"
 "(values))))))"
-" for-loop_345)"
-" lst_450)))"
+" for-loop_341)"
+" lst_449)))"
 "(void)))))"
 "(define-values"
 "(expand-submodule197.1)"
@@ -77058,7 +77080,7 @@ static const char *startup_source =
 " ctx196_0)"
 "(begin"
 " 'expand-submodule197"
-"(let-values(((s_737) s194_0))"
+"(let-values(((s_738) s194_0))"
 "(let-values(((self_42) self195_0))"
 "(let-values(((ctx_121) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
@@ -77076,25 +77098,25 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_159)(expand-context-observer ctx_121)))"
-"(if obs_159"
+"(let-values(((obs_160)(expand-context-observer ctx_121)))"
+"(if obs_160"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_159 'enter-prim s_737)"
+"(call-expand-observe obs_160 'enter-prim s_738)"
 "(call-expand-observe"
-" obs_159"
+" obs_160"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
 "(let-values(((ok?_91 module679_0 name680_0 _681_0)"
-"(let-values(((s_760) s_737))"
-"(let-values(((orig-s_94) s_760))"
+"(let-values(((s_761) s_738))"
+"(let-values(((orig-s_94) s_761))"
 "(let-values(((module679_1 name680_1 _681_1)"
 "(let-values(((s_894)"
-"(if(syntax?$1 s_760)"
-"(syntax-e$1 s_760)"
-" s_760)))"
+"(if(syntax?$1 s_761)"
+"(syntax-e$1 s_761)"
+" s_761)))"
 "(if(pair? s_894)"
 "(let-values(((module682_0)"
 "(let-values(((s_895)(car s_894)))"
@@ -77136,7 +77158,7 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"submodule already declared with the same name\""
-" s_737"
+" s_738"
 " name_82))"
 "(void))"
 "(values))))"
@@ -77149,25 +77171,25 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_160)(expand-context-observer ctx_121)))"
-"(if obs_160"
+"(let-values(((obs_161)(expand-context-observer ctx_121)))"
+"(if obs_161"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_160 'enter-prim s_737)))"
+"(call-expand-observe obs_161 'enter-prim s_738)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
-"(let-values(((s687_0) s_737)"
+"(let-values(((s687_0) s_738)"
 "((temp688_0)"
-"(let-values(((v_277) ctx_121))"
-"(let-values(((the-struct_120) v_277))"
+"(let-values(((v_276) ctx_121))"
+"(let-values(((the-struct_120) v_276))"
 "(if(expand-context/outer? the-struct_120)"
 "(let-values(((context697_0) 'module)"
 "((post-expansion698_0) #f)"
 "((inner699_0)"
 "(let-values(((the-struct_121)"
 "(root-expand-context/outer-inner"
-" v_277)))"
+" v_276)))"
 "(if(expand-context/inner?"
 " the-struct_121)"
 "(let-values(((stops700_0)"
@@ -77285,13 +77307,13 @@ static const char *startup_source =
 " self689_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_161)"
+"(let-values(((obs_162)"
 "(expand-context-observer ctx_121)))"
-"(if obs_161"
+"(if obs_162"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_161"
+" obs_162"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))"
@@ -77358,13 +77380,13 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_162)"
+"(let-values(((obs_163)"
 "(expand-context-observer ctx_121)))"
-"(if obs_162"
+"(if obs_163"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_162"
+" obs_163"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))))"
@@ -77455,21 +77477,21 @@ static const char *startup_source =
 "(let-values(((modules-being-compiled_9) modules-being-compiled203_0))"
 "(let-values()"
 "(reverse$1"
-"(let-values(((lst_458) bodys_29))"
+"(let-values(((lst_457) bodys_29))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_458)))"
-"((letrec-values(((for-loop_347)"
-"(lambda(fold-var_385 lst_459)"
+"(let-values()(check-list lst_457)))"
+"((letrec-values(((for-loop_343)"
+"(lambda(fold-var_387 lst_458)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_459)"
-"(let-values(((body_25)(unsafe-car lst_459))"
-"((rest_268)(unsafe-cdr lst_459)))"
-"(let-values(((fold-var_386)"
-"(let-values(((fold-var_387) fold-var_385))"
+"(if(pair? lst_458)"
+"(let-values(((body_25)(unsafe-car lst_458))"
+"((rest_269)(unsafe-cdr lst_458)))"
 "(let-values(((fold-var_388)"
+"(let-values(((fold-var_389) fold-var_387))"
+"(let-values(((fold-var_390)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -77510,15 +77532,15 @@ static const char *startup_source =
 " self716_0"
 " ctx717_0)))"
 "(let-values() body_25))))"
-" fold-var_387))))"
-"(values fold-var_388)))))"
+" fold-var_389))))"
+"(values fold-var_390)))))"
 "(if(not #f)"
-"(for-loop_347 fold-var_386 rest_268)"
-" fold-var_386)))"
-" fold-var_385)))))"
-" for-loop_347)"
+"(for-loop_343 fold-var_388 rest_269)"
+" fold-var_388)))"
+" fold-var_387)))))"
+" for-loop_343)"
 " null"
-" lst_458))))))))))))))))"
+" lst_457))))))))))))))))"
 "(define-values"
 "(make-parse-lifted-require220.1)"
 "(lambda(declared-submodule-names215_0 m-ns217_0 self218_0 requires+provides219_0)"
@@ -77611,57 +77633,57 @@ static const char *startup_source =
 "(lambda(lifted-defns_2)"
 "(begin"
 "(reverse$1"
-"(let-values(((lst_460) lifted-defns_2))"
+"(let-values(((lst_459) lifted-defns_2))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_460)))"
-"((letrec-values(((for-loop_348)"
-"(lambda(fold-var_389 lst_461)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_459)))"
+"((letrec-values(((for-loop_344)"
+"(lambda(fold-var_391 lst_460)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_461)"
-"(let-values(((lifted-defn_0)(unsafe-car lst_461))"
-"((rest_269)(unsafe-cdr lst_461)))"
-"(let-values(((fold-var_390)"
-"(let-values(((fold-var_391) fold-var_389))"
+"(if(pair? lst_460)"
+"(let-values(((lifted-defn_0)(unsafe-car lst_460))"
+"((rest_270)(unsafe-cdr lst_460)))"
 "(let-values(((fold-var_392)"
+"(let-values(((fold-var_393) fold-var_391))"
+"(let-values(((fold-var_394)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(defn-extract-syntax lifted-defn_0))"
-" fold-var_391))))"
-"(values fold-var_392)))))"
-"(if(not #f)(for-loop_348 fold-var_390 rest_269) fold-var_390)))"
-" fold-var_389)))))"
-" for-loop_348)"
+" fold-var_393))))"
+"(values fold-var_394)))))"
+"(if(not #f)(for-loop_344 fold-var_392 rest_270) fold-var_392)))"
+" fold-var_391)))))"
+" for-loop_344)"
 " null"
-" lst_460)))))))"
+" lst_459)))))))"
 "(define-values"
 "(log-lifted-defns)"
 "(lambda(partial-body-ctx_2 lifted-defns_3 exp-body_10 rest-bodys_4)"
 "(begin"
-"(let-values(((obs_163)(expand-context-observer partial-body-ctx_2)))"
-"(if obs_163"
+"(let-values(((obs_164)(expand-context-observer partial-body-ctx_2)))"
+"(if obs_164"
 "(let-values()"
 "(let-values(((s-lifted-defns_0)(lifted-defns-extract-syntax lifted-defns_3)))"
 "(let-values((()"
 "(begin"
-"(call-expand-observe obs_163 'rename-list(cons exp-body_10 rest-bodys_4))"
+"(call-expand-observe obs_164 'rename-list(cons exp-body_10 rest-bodys_4))"
 "(values))))"
-"(let-values((()(begin(call-expand-observe obs_163 'module-lift-loop s-lifted-defns_0)(values))))"
+"(let-values((()(begin(call-expand-observe obs_164 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((lst_462) s-lifted-defns_0))"
+"(let-values(((lst_461) s-lifted-defns_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_462)))"
-"((letrec-values(((for-loop_349)"
-"(lambda(lst_463)"
+"(let-values()(check-list lst_461)))"
+"((letrec-values(((for-loop_345)"
+"(lambda(lst_462)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_463)"
-"(let-values(((s-lifted-defn_0)(unsafe-car lst_463))"
-"((rest_270)(unsafe-cdr lst_463)))"
+"(if(pair? lst_462)"
+"(let-values(((s-lifted-defn_0)(unsafe-car lst_462))"
+"((rest_271)(unsafe-cdr lst_462)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -77725,52 +77747,52 @@ static const char *startup_source =
 " _742_1))))))"
 "(begin"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'next)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'visit"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'resolve"
 " define-values741_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'prim-stop)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'exit-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'return"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'rename-one"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'prim-define-values)"
 "(call-expand-observe"
-" obs_163"
+" obs_164"
 " 'exit-prim"
 " s-lifted-defn_0))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_349 rest_270)(values))))"
+"(if(not #f)(for-loop_345 rest_271)(values))))"
 "(values))))))"
-" for-loop_349)"
-" lst_462)))"
+" for-loop_345)"
+" lst_461)))"
 "(values))))"
 "(let-values()"
 "(let-values(((ok?_94 form-id737_0 _738_0)"
@@ -77788,20 +77810,20 @@ static const char *startup_source =
 "                                                          (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))"
 "(values #t form-id737_1 _738_1))))))"
 "(begin"
-"(call-expand-observe obs_163 'next)"
-"(call-expand-observe obs_163 'visit exp-body_10)"
-"(call-expand-observe obs_163 'resolve form-id737_0)"
-"(call-expand-observe obs_163 'enter-prim exp-body_10)"
-"(call-expand-observe obs_163 'prim-stop)"
-"(call-expand-observe obs_163 'exit-prim exp-body_10)"
-"(call-expand-observe obs_163 'return exp-body_10)))))))))"
+"(call-expand-observe obs_164 'next)"
+"(call-expand-observe obs_164 'visit exp-body_10)"
+"(call-expand-observe obs_164 'resolve form-id737_0)"
+"(call-expand-observe obs_164 'enter-prim exp-body_10)"
+"(call-expand-observe obs_164 'prim-stop)"
+"(call-expand-observe obs_164 'exit-prim exp-body_10)"
+"(call-expand-observe obs_164 'return exp-body_10)))))))))"
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
 "(lambda(ctx_123 defn_1)"
 "(begin"
-"(let-values(((obs_164)(expand-context-observer ctx_123)))"
-"(if obs_164"
+"(let-values(((obs_165)(expand-context-observer ctx_123)))"
+"(if obs_165"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
 "(let-values(((ok?_95 define-values745_0 _746_0)"
@@ -77830,47 +77852,47 @@ static const char *startup_source =
 "                                                  (raise-syntax-error$1 #f \"bad syntax\" orig-s_98)))))"
 "(values #t define-values745_1 _746_1))))))"
 "(begin"
-"(call-expand-observe obs_164 'visit s-defn_0)"
-"(call-expand-observe obs_164 'resolve define-values745_0)"
-"(call-expand-observe obs_164 'enter-prim s-defn_0)"
-"(call-expand-observe obs_164 'prim-define-values)))))"
+"(call-expand-observe obs_165 'visit s-defn_0)"
+"(call-expand-observe obs_165 'resolve define-values745_0)"
+"(call-expand-observe obs_165 'enter-prim s-defn_0)"
+"(call-expand-observe obs_165 'prim-define-values)))))"
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
 "(lambda(ctx_124 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_165)(expand-context-observer ctx_124)))"
-"(if obs_165"
+"(let-values(((obs_166)(expand-context-observer ctx_124)))"
+"(if obs_166"
 "(let-values()"
 "(let-values(((s-defn_1)"
 "(datum->syntax$1"
 " #f"
 "(list 'define-values(semi-parsed-define-values-ids defn_2) exp-rhs_8)"
 "(semi-parsed-define-values-s defn_2))))"
-"(begin(call-expand-observe obs_165 'exit-prim s-defn_1)(call-expand-observe obs_165 'return s-defn_1))))"
+"(begin(call-expand-observe obs_166 'exit-prim s-defn_1)(call-expand-observe obs_166 'return s-defn_1))))"
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
-"(lambda(ids_51 s_72 ctx_125)"
+"(lambda(ids_50 s_72 ctx_125)"
 "(begin"
 "(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_125)))"
 "(let-values(((tl-ids_2)"
 "(reverse$1"
-"(let-values(((lst_84) ids_51))"
+"(let-values(((lst_84) ids_50))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_84)))"
 "((letrec-values(((for-loop_107)"
-"(lambda(fold-var_393 lst_85)"
+"(lambda(fold-var_395 lst_85)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_85)"
 "(let-values(((id_51)(unsafe-car lst_85))"
 "((rest_40)(unsafe-cdr lst_85)))"
 "(let-values(((fold-var_61)"
-"(let-values(((fold-var_62) fold-var_393))"
-"(let-values(((fold-var_394)"
+"(let-values(((fold-var_62) fold-var_395))"
+"(let-values(((fold-var_396)"
 "(let-values()"
 "(cons"
 "(let-values()"
@@ -77878,9 +77900,9 @@ static const char *startup_source =
 " id_51"
 " ctx_125))"
 " fold-var_62))))"
-"(values fold-var_394)))))"
+"(values fold-var_396)))))"
 "(if(not #f)(for-loop_107 fold-var_61 rest_40) fold-var_61)))"
-" fold-var_393)))))"
+" fold-var_395)))))"
 " for-loop_107)"
 " null"
 " lst_84))))))"
@@ -77891,20 +77913,20 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((tmp-bind-ids_0)"
 "(reverse$1"
-"(let-values(((lst_464) tl-ids_2))"
+"(let-values(((lst_463) tl-ids_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_464)))"
+"(let-values()(check-list lst_463)))"
 "((letrec-values(((for-loop_83)"
 "(lambda(fold-var_221 lst_86)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_86)"
 "(let-values(((id_161)(unsafe-car lst_86))"
-"((rest_249)(unsafe-cdr lst_86)))"
+"((rest_250)(unsafe-cdr lst_86)))"
 "(let-values(((fold-var_26)"
-"(let-values(((fold-var_395) fold-var_221))"
+"(let-values(((fold-var_397) fold-var_221))"
 "(let-values(((fold-var_224)"
 "(let-values()"
 "(cons"
@@ -77912,15 +77934,15 @@ static const char *startup_source =
 "(add-scope"
 " id_161"
 " top-level-bind-scope_6))"
-" fold-var_395))))"
+" fold-var_397))))"
 "(values fold-var_224)))))"
 "(if(not #f)"
-"(for-loop_83 fold-var_26 rest_249)"
+"(for-loop_83 fold-var_26 rest_250)"
 " fold-var_26)))"
 " fold-var_221)))))"
 " for-loop_83)"
 " null"
-" lst_464))))))"
+" lst_463))))))"
 "(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_125)))))))))"
 "(void"
 "(add-core-form!*"
@@ -77928,9 +77950,9 @@ static const char *startup_source =
 "(lambda(s_0 ctx_7)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_166)(expand-context-observer ctx_7)))"
-"(if obs_166"
-"(let-values()(let-values()(call-expand-observe obs_166 'prim-define-values)))"
+"(let-values(((obs_167)(expand-context-observer ctx_7)))"
+"(if obs_167"
+"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-values)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -78073,14 +78095,14 @@ static const char *startup_source =
 "(values define-values4_0 id5_0 rhs6_0))"
 "                                               (raise-syntax-error$1 #f \"bad syntax\" orig-s_99)))))"
 "(values #t define-values1_1 id2_2 rhs3_1))))))"
-"(let-values(((ids_52 syms_27)(as-expand-time-top-level-bindings id2_1 s_0 ctx_7)))"
+"(let-values(((ids_51 syms_27)(as-expand-time-top-level-bindings id2_1 s_0 ctx_7)))"
 "(let-values(((exp-rhs_9)"
 "(let-values(((temp11_7) rhs3_0)"
-"((temp12_9)(as-named-context(as-expression-context ctx_7) ids_52)))"
+"((temp12_9)(as-named-context(as-expression-context ctx_7) ids_51)))"
 "(expand9.1 #f #f #f temp11_7 temp12_9))))"
 "(if(expand-context-to-parsed? ctx_7)"
-"(parsed-define-values19.1 s_0 ids_52 syms_27 exp-rhs_9)"
-"(let-values(((s13_0) s_0)((temp14_6)(list define-values1_0 ids_52 exp-rhs_9)))"
+"(parsed-define-values19.1 s_0 ids_51 syms_27 exp-rhs_9)"
+"(let-values(((s13_0) s_0)((temp14_6)(list define-values1_0 ids_51 exp-rhs_9)))"
 "(rebuild5.1 #t s13_0 temp14_6))))))))))))"
 "(void"
 "(add-core-form!*"
@@ -78088,15 +78110,15 @@ static const char *startup_source =
 "(lambda(s_186 ctx_126)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_126)))"
-"(if obs_167"
-"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-syntaxes)))"
+"(let-values(((obs_168)(expand-context-observer ctx_126)))"
+"(if obs_168"
+"(let-values()(let-values()(call-expand-observe obs_168 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_168)(expand-context-observer ctx_126)))"
-"(if obs_168(let-values()(let-values()(call-expand-observe obs_168 'prepare-env)))(void)))"
+"(let-values(((obs_169)(expand-context-observer ctx_126)))"
+"(if obs_169(let-values()(let-values()(call-expand-observe obs_169 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -78137,7 +78159,7 @@ static const char *startup_source =
 " orig-s_100))"
 "(let-values()"
 "(let-values(((id_165)"
-"(let-values(((lst_465)"
+"(let-values(((lst_464)"
 " flat-s_69))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -78145,20 +78167,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_465)))"
+" lst_464)))"
 "((letrec-values(((for-loop_2)"
 "(lambda(id_166"
-" lst_466)"
+" lst_465)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_466)"
+" lst_465)"
 "(let-values(((s_925)"
 "(unsafe-car"
-" lst_466))"
-"((rest_271)"
+" lst_465))"
+"((rest_272)"
 "(unsafe-cdr"
-" lst_466)))"
+" lst_465)))"
 "(let-values(((id_167)"
 "(let-values(((id_168)"
 " id_166))"
@@ -78192,12 +78214,12 @@ static const char *startup_source =
 " #f)"
 "(for-loop_2"
 " id_167"
-" rest_271)"
+" rest_272)"
 " id_167)))"
 " id_166)))))"
 " for-loop_2)"
 " null"
-" lst_465)))))"
+" lst_464)))))"
 "(reverse$1 id_165))))))))"
 "((rhs22_0)"
 "(let-values(((s_926)(cdr s_306)))"
@@ -78207,10 +78229,10 @@ static const char *startup_source =
 " s_926)))"
 "(if(pair? s_175)"
 "(let-values(((rhs23_2)"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 "(car"
 " s_175)))"
-" s_450))"
+" s_451))"
 "(()"
 "(let-values(((s_46)"
 "(cdr"
@@ -78241,13 +78263,13 @@ static const char *startup_source =
 "(values define-syntaxes18_0 id19_1 rhs20_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_100)))))"
 "(values #t define-syntaxes15_1 id16_2 rhs17_1))))))"
-"(let-values(((ids_53 syms_28)(as-expand-time-top-level-bindings id16_1 s_186 ctx_126)))"
+"(let-values(((ids_52 syms_28)(as-expand-time-top-level-bindings id16_1 s_186 ctx_126)))"
 "(let-values(((exp-rhs_10)"
-"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_53)))"
+"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_52)))"
 "(expand-transformer92.1 #f #f 'expression #t #f unsafe-undefined temp25_8 temp26_6))))"
 "(if(expand-context-to-parsed? ctx_126)"
-"(parsed-define-syntaxes20.1 s_186 ids_53 syms_28 exp-rhs_10)"
-"(let-values(((s27_3) s_186)((temp28_4)(list define-syntaxes15_0 ids_53 exp-rhs_10)))"
+"(parsed-define-syntaxes20.1 s_186 ids_52 syms_28 exp-rhs_10)"
+"(let-values(((s27_3) s_186)((temp28_4)(list define-syntaxes15_0 ids_52 exp-rhs_10)))"
 "(rebuild5.1 #t s27_3 temp28_4)))))))))))))"
 "(void"
 "(add-core-form!*"
@@ -78268,11 +78290,11 @@ static const char *startup_source =
 "(let-values(((begin-for-syntax31_0)(let-values(((s_51)(car s_48))) s_51))"
 "((form32_0)"
 "(let-values(((s_501)(cdr s_48)))"
-"(let-values(((s_776)"
+"(let-values(((s_777)"
 "(if(syntax?$1 s_501)"
 "(syntax-e$1 s_501)"
 " s_501)))"
-"(let-values(((flat-s_70)(to-syntax-list.1 s_776)))"
+"(let-values(((flat-s_70)(to-syntax-list.1 s_777)))"
 "(if(not flat-s_70)"
 "(let-values()"
 "                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_101))"
@@ -78282,16 +78304,16 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_112)))"
-"(if obs_169"
-"(let-values()(let-values()(call-expand-observe obs_169 'prim-begin-for-syntax)))"
+"(let-values(((obs_170)(expand-context-observer ctx_112)))"
+"(if obs_170"
+"(let-values()(let-values()(call-expand-observe obs_170 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_170)(expand-context-observer ctx_112)))"
-"(if obs_170"
-"(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))"
+"(let-values(((obs_171)(expand-context-observer ctx_112)))"
+"(if obs_171"
+"(let-values()(let-values()(call-expand-observe obs_171 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values(((trans-ctx_1)"
@@ -78367,13 +78389,13 @@ static const char *startup_source =
 " 'loop"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)"
+"(let-values(((obs_172)"
 "(expand-context-observer ctx_112)))"
-"(if obs_171"
+"(if obs_172"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_171"
+" obs_172"
 " 'enter-list"
 "(datum->syntax$1 #f form30_0 s_309))))"
 "(void)))"
@@ -78389,14 +78411,14 @@ static const char *startup_source =
 "(reverse$1"
 " accum_1)))"
 "(begin"
-"(let-values(((obs_172)"
+"(let-values(((obs_173)"
 "(expand-context-observer"
 " ctx_112)))"
-"(if obs_172"
+"(if obs_173"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_172"
+" obs_173"
 " 'exit-list"
 "(datum->syntax$1"
 " #f"
@@ -78407,14 +78429,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_173)"
+"(let-values(((obs_174)"
 "(expand-context-observer"
 " ctx_112)))"
-"(if obs_173"
+"(if obs_174"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_173"
+" obs_174"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -78444,14 +78466,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_174)"
+"(let-values(((obs_175)"
 "(expand-context-observer"
 " ctx_112)))"
-"(if obs_174"
+"(if obs_175"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_174"
+" obs_175"
 " 'module-lift-loop"
 " lifts_15)))"
 "(void)))"
@@ -78488,8 +78510,8 @@ static const char *startup_source =
 "(lambda(s_927 ctx_127)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_175)(expand-context-observer ctx_127)))"
-"(if obs_175(let-values()(let-values()(call-expand-observe obs_175 'prim-require)))(void)))"
+"(let-values(((obs_176)(expand-context-observer ctx_127)))"
+"(if obs_176(let-values()(let-values()(call-expand-observe obs_176 'prim-require)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -78532,27 +78554,27 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_32)))"
 "((letrec-values(((for-loop_25)"
-"(lambda(fold-var_396 lst_33)"
+"(lambda(fold-var_398 lst_33)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_33)"
 "(let-values(((req_20)(unsafe-car lst_33))"
 "((rest_13)(unsafe-cdr lst_33)))"
-"(let-values(((fold-var_397)"
-"(let-values(((fold-var_398) fold-var_396))"
-"(let-values(((fold-var_294)"
+"(let-values(((fold-var_399)"
+"(let-values(((fold-var_400) fold-var_398))"
+"(let-values(((fold-var_296)"
 "(let-values()"
 "(cons"
 "(let-values()"
 "(add-scope"
 " req_20"
 " sc_41))"
-" fold-var_398))))"
-"(values fold-var_294)))))"
+" fold-var_400))))"
+"(values fold-var_296)))))"
 "(if(not #f)"
-"(for-loop_25 fold-var_397 rest_13)"
-" fold-var_397)))"
-" fold-var_396)))))"
+"(for-loop_25 fold-var_399 rest_13)"
+" fold-var_399)))"
+" fold-var_398)))))"
 " for-loop_25)"
 " null"
 " lst_32)))))"
@@ -78585,8 +78607,8 @@ static const char *startup_source =
 " '#%provide"
 "(lambda(s_780 ctx_128)"
 "(begin"
-"(let-values(((obs_176)(expand-context-observer ctx_128)))"
-"(if obs_176(let-values()(let-values()(call-expand-observe obs_176 'prim-provide)))(void)))"
+"(let-values(((obs_177)(expand-context-observer ctx_128)))"
+"(if obs_177(let-values()(let-values()(call-expand-observe obs_177 'prim-provide)))(void)))"
 "       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_780)))))"
 "(define-values(ns)(make-namespace))"
 "(void"
@@ -78653,7 +78675,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash-keys ht_127)))"
-"((letrec-values(((for-loop_332)"
+"((letrec-values(((for-loop_328)"
 "(lambda(table_223 i_182)"
 "(begin"
 " 'for-loop"
@@ -78671,10 +78693,10 @@ static const char *startup_source =
 "(hash-set table_112 key_94 val_90)))))"
 "(values table_113)))))"
 "(if(not #f)"
-"(for-loop_332 table_119(hash-iterate-next ht_127 i_182))"
+"(for-loop_328 table_119(hash-iterate-next ht_127 i_182))"
 " table_119)))"
 " table_223)))))"
-" for-loop_332)"
+" for-loop_328)"
 " '#hash()"
 "(hash-iterate-first ht_127))))))"
 "(declare-kernel-module!8.1 eval27_0 temp28_5 temp29_7 ns26_1))"
@@ -78738,5 +78760,5 @@ static const char *startup_source =
 "(declare-reexporting-module!50.1 ns35_1 temp36_5 temp33_5 temp34_8))"
 "(1/current-namespace ns)"
 "(1/dynamic-require ''#%kernel 0)))"
-"(define-values(datum->kernel-syntax)(lambda(s_773)(begin(1/datum->syntax core-stx s_773)))))"
+"(define-values(datum->kernel-syntax)(lambda(s_774)(begin(1/datum->syntax core-stx s_774)))))"
 ;