diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt
index fa89724f6a..e4ca2a288c 100644
--- a/pkgs/base/info.rkt
+++ b/pkgs/base/info.rkt
@@ -12,7 +12,7 @@
 
 (define collection 'multi)
 
-(define version "7.0.0.1")
+(define version "7.0.0.2")
 
 (define deps `("racket-lib"
                ["racket" #:version ,version]))
diff --git a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
index 2a2590eb9b..7744bacecb 100644
--- a/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
+++ b/pkgs/racket-doc/scribblings/reference/stx-trans.scrbl
@@ -232,11 +232,12 @@ identifier, the @racket[exn:fail:contract] exception is raised.
 
 @defproc[(local-expand [stx any/c]
                        [context-v (or/c 'expression 'top-level 'module 'module-begin list?)]
-                       [stop-ids (or/c (listof identifier?) empty #f)]
+                       [stop-ids (or/c (listof identifier?) (cons/c 'only (listof identifier?)) #f)]
                        [intdef-ctx (or/c internal-definition-context?
                                          (listof internal-definition-context?)
                                          #f)
-                                   '()])
+                                   '()]
+                       [#:extend-stop-ids? extend-stop-ids? any/c #t])
          syntax?]{
 
 Expands @racket[stx] in the lexical context of the expression
@@ -259,12 +260,13 @@ The @racket[stop-ids] argument controls how far @racket[local-expand] expands @r
        @racket[stop-ids] were an empty list, except that expansion does not recur to @tech{submodules}
        defined with @racket[module*] (which are left unexpanded in the result).}
 
- @item{If @racket[stop-ids] is any other list, then @racket[begin], @racket[quote], @racket[set!],
-       @racket[#%plain-lambda], @racket[case-lambda], @racket[let-values], @racket[letrec-values],
-       @racket[if], @racket[begin0], @racket[with-continuation-mark], @racket[letrec-syntaxes+values],
-       @racket[#%plain-app], @racket[#%expression], @racket[#%top], and @racket[#%variable-reference]
-       are implicitly added to @racket[stop-ids]. Expansion stops when the expander encounters any of
-       the forms in @racket[stop-ids], and the result is the partially-expanded form.
+ @item{If @racket[stop-ids] is any other list, then expansion proceeds recursively until the expander
+       encounters any of the forms in @racket[stop-ids], and the result is the partially-expanded
+       form. If @racket[extend-stop-ids?] is not @racket[#f], @racket[begin], @racket[quote],
+       @racket[set!], @racket[#%plain-lambda], @racket[case-lambda], @racket[let-values],
+       @racket[letrec-values], @racket[if], @racket[begin0], @racket[with-continuation-mark],
+       @racket[letrec-syntaxes+values], @racket[#%plain-app], @racket[#%expression], @racket[#%top],
+       and @racket[#%variable-reference] are implicitly added to @racket[stop-ids].
 
        When the expander would normally implicitly introduce a @racketid[#%app], @racketid[#%datum],
        or @racketid[#%top] identifier as described in @secref["expand-steps"], it checks to see if an
@@ -273,9 +275,13 @@ The @racket[stop-ids] argument controls how far @racket[local-expand] expands @r
        the bare application, literal data expression, or unbound identifier rather than one wrapped in
        the respective explicit form.
 
-       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].
+       Note that forcing recursive expansion with an identifier in @racket[stop-ids] does not
+       necessarily guarantee uses of that identifier will not be expanded, since other transformers
+       may force @tech{partial expansion} by invoking @racket[local-expand] with a different value for
+       @racket[stop-ids]. For example, the @racket[#%plain-module-begin] transformer partially expands
+       its sub-forms regardless of identifiers’ presence in @racket[stop-ids]. As a special case,
+       @racket[#%plain-module-begin] refrains from expanding @racket[module*] sub-forms if
+       @racket[module*] is in @racket[stop-ids].
 
        Expansion does not replace the scopes in a local-variable
        reference to match the binding identifier.}
@@ -358,7 +364,8 @@ expansion history to external tools.
                                    an explicit wrapper.}
          #:changed "6.0.90.27" @elem{Loosened the contract on the @racket[intdef-ctx] argument to
                                      allow an empty list, which is treated the same way as
-                                     @racket[#f].}]}
+                                     @racket[#f].}
+         #:changed "7.0.0.1" @elem{Added the @racket[#:extend-stop-ids?] argument.}]}
 
 
 @defproc[(syntax-local-expand-expression [stx any/c] [opaque-only? #f])
diff --git a/pkgs/racket-test-core/tests/racket/expobs-regression.rktd b/pkgs/racket-test-core/tests/racket/expobs-regression.rktd
index 2b5712144d..57dc6e58fe 100644
--- a/pkgs/racket-test-core/tests/racket/expobs-regression.rktd
+++ b/pkgs/racket-test-core/tests/racket/expobs-regression.rktd
@@ -1,684 +1,65 @@
-#hash((__x
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (enter-check . #s(stx-boundary (s0 s1)))
-        (exit-check . #s(stx-boundary (s0 s1)))
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1 . s2))))
-        (return . #s(stx-boundary (s0 (s1 . s2))))))
-      ((#%stratified-body
-        (define (first z) z)
-        (define (ok x) (second x))
-        (define (second y) 8)
-        (ok (first 5))
-        (define more 'oops))
+#hash(((let ()
+         (define-syntax (lift stx)
+           (syntax-local-lift-require 'racket/list #'foldl))
+         (lift))
        .
        ((start-top . #f)
         (visit
          .
-         #s(stx-boundary
-            (s0
-             (s1
-              (s2 (s3 s4) s4)
-              (s2 (s5 s6) (s7 s6))
-              (s2 (s7 s8) 8)
-              (s5 (s3 5))
-              (s2 s9 (s10 s11))))))
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
         (enter-check
          .
-         #s(stx-boundary
-            (s0
-             (s1
-              (s2 (s3 s4) s4)
-              (s2 (s5 s6) (s7 s6))
-              (s2 (s7 s8) 8)
-              (s5 (s3 5))
-              (s2 s9 (s10 s11))))))
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
         (exit-check
          .
-         #s(stx-boundary
-            (s0
-             (s1
-              (s2 (s3 s4) s4)
-              (s2 (s5 s6) (s7 s6))
-              (s2 (s7 s8) 8)
-              (s5 (s3 5))
-              (s2 s9 (s10 s11))))))
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
         (visit
          .
-         #s(stx-boundary
-            (s0
-             (s1
-              (s2 (s3 s4) s4)
-              (s2 (s5 s6) (s7 s6))
-              (s2 (s7 s8) 8)
-              (s5 (s3 5))
-              (s2 s9 (s10 s11))))))
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
-         #s(stx-boundary
-            (s0
-             (s1
-              (s2 (s3 s4) s4)
-              (s2 (s5 s6) (s7 s6))
-              (s2 (s7 s8) 8)
-              (s5 (s3 5))
-              (s2 s9 (s10 s11))))))
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
         (prim-#%expression . #f)
         (visit
          .
-         #s(stx-boundary
-            (s0
-             (s1 (s2 s3) s3)
-             (s1 (s4 s5) (s6 s5))
-             (s1 (s6 s7) 8)
-             (s4 (s2 5))
-             (s1 s8 (s9 s10)))))
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2)))
+         .
+         #s(stx-boundary (s9 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (visit
+         .
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
-         #s(stx-boundary
-            (s0
-             (s1 (s2 s3) s3)
-             (s1 (s4 s5) (s6 s5))
-             (s1 (s6 s7) 8)
-             (s4 (s2 5))
-             (s1 s8 (s9 s10)))))
-        (prim-#%stratified . #f)
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (prim-let-values . #f)
+        (let-renames
+         ()
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
+        (next-group . #f)
         (enter-block
          .
-         #s(stx-boundary
-            ((s0 (s1 s2) s2)
-             (s0 (s3 s4) (s5 s4))
-             (s0 (s5 s6) 8)
-             (s3 (s1 5))
-             (s0 s7 (s8 s9)))))
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
         (block-renames
-         #s(stx-boundary
-            ((s0 (s1 s2) s2)
-             (s0 (s3 s4) (s5 s4))
-             (s0 (s5 s6) 8)
-             (s3 (s1 5))
-             (s0 s7 (s8 s9))))
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1)))
          .
-         #s(stx-boundary
-            ((s0 (s1 s2) s2)
-             (s0 (s3 s4) (s5 s4))
-             (s0 (s5 s6) 8)
-             (s3 (s1 5))
-             (s0 s7 (s8 s9)))))
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
-        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s0 (s1 s3) s3)))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3))))
-         .
-         #s(stx-boundary (s0 (s1 s3) (s4 s3))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3))))
-         .
-         #s(stx-boundary (s5 s1 (s2 (s3) (s4 s3)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 s2)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) 8)))
-        (visit . #s(stx-boundary (s0 (s1 s2) 8)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) 8)))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) 8)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) 8)))
-         .
-         #s(stx-boundary (s0 (s1 s3) 8)))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) 8)))
-         .
-         #s(stx-boundary (s4 s1 (s2 (s3) 8))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) 8))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 5))))
-        (exit-check . #s(stx-boundary (s0 (s1 5))))
-        (block->letrec
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
-             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
-             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
-             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) (s1 (s2) s2)))
-          #s(stx-boundary ((s3) (s1 (s4) (s5 s4))))
-          #s(stx-boundary ((s5) (s1 (s6) 8))))
-         .
-         #s(stx-boundary ((s7 (s3 (s0 5)) (s8 s9 (s10 s11))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
-        (return . #s(stx-boundary (s0 (s1) s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 s1))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s1))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 s0))))
-        (enter-block . #s(stx-boundary ((s0 s1))))
-        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 s1)))
-        (exit-check . #s(stx-boundary (s0 s1)))
-        (block->list . #s(stx-boundary ((s0 s1))))
-        (enter-list . #s(stx-boundary ((s0 s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 s2)))
-        (enter-macro . #s(stx-boundary (s0 s1 s2)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 s2))
-         .
-         #s(stx-boundary (s0 s1 s2)))
-        (exit-macro . #s(stx-boundary (s0 s1 s2)))
-        (visit . #s(stx-boundary (s0 s1 s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 s1)))
-        (exit-prim . #s(stx-boundary (s0 s1 s2)))
-        (return . #s(stx-boundary (s0 s1 s2)))
-        (exit-list . #s(stx-boundary ((s0 s1 s2))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
-        (return . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) 8)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) 8)))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (8)))
-        (enter-block . #s(stx-boundary (8)))
-        (block-renames #s(stx-boundary (8)) . #s(stx-boundary (8)))
-        (next . #f)
-        (enter-check . #s(stx-boundary 8))
-        (exit-check . #s(stx-boundary 8))
-        (block->list . #s(stx-boundary (8)))
-        (enter-list . #s(stx-boundary (8)))
-        (next . #f)
-        (visit . #s(stx-boundary 8))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 8)))
-        (enter-prim . #s(stx-boundary (s0 . 8)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary ((s0 8))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (return . #s(stx-boundary (s0 (s1) (s2 8))))
-        (next-group . #f)
-        (enter-list . #s(stx-boundary ((s0 (s1 (s2 5)) (s3 s4 (s5 s6))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2 5)) (s3 s4 (s5 s6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 5)) (s3 s4 (s5 s6)))))
-        (prim-#%stratified . #f)
-        (enter-block . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5))))
-         .
-         #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 5))))
-        (exit-check . #s(stx-boundary (s0 (s1 5))))
-        (block->list . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
-        (enter-list . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 5))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 5))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 5))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 5))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 5)))
-         .
-         #s(stx-boundary (s0 s1 (s2 5))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 5))))
-        (visit . #s(stx-boundary (s0 s1 (s2 5))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 5))))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 5))))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 5)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 5)))
-        (enter-macro . #s(stx-boundary (s0 s1 5)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
-        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
-        (exit-macro . #s(stx-boundary (s0 s1 5)))
-        (visit . #s(stx-boundary (s0 s1 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 5)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 5)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary 5))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 5)))
-        (enter-prim . #s(stx-boundary (s0 . 5)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (exit-list . #s(stx-boundary (s0 (s1 5))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
-        (return . #s(stx-boundary (s0 s1 (s2 5))))
-        (exit-list . #s(stx-boundary (s0 (s1 s2 (s3 5)))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s3 5)))))
-        (return . #s(stx-boundary (s0 s1 (s0 s2 (s3 5)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))))
-      ((quote-syntax (stx-quoted))
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2)))))
-        (enter-check . #s(stx-boundary (s0 (s1 (s2)))))
-        (exit-check . #s(stx-boundary (s0 (s1 (s2)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2)))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 (s1))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1))))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1))))
-        (return . #s(stx-boundary (s0 (s1))))
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2)))))
-        (return . #s(stx-boundary (s0 (s1 (s2)))))))
-      ((module m racket/base
-         (define-syntax (ok stx)
-           (syntax-local-lift-require 'racket/list #'foldl))
-         (ok))
-       .
-       ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
-        (exit-check
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
-        (visit
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9)))
-         .
-         #s(stx-boundary (s15 (s8 (s9 s10) (s11 (s3 s12) (s13 s14))) (s9))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
-             (s9))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11))))
-         .
-         #s(stx-boundary
-            (s17
-             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
-             (s10 (s11 s12) (s13 (s5 s14) (s15 s16)))
-             (s11))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (prim-module-begin . #f)
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
-             (s1 s2 (s11)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
-         .
-         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (splice
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
-         #s(stx-boundary (s7 s8 (s9 (s10 s11) (s12 (s2 s13) (s14 s15)))))
-         #s(stx-boundary (s7 s8 (s10))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-submodule . #f)
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (prim-module-begin . #f)
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (rename-one . #s(stx-boundary (s0 s1)))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-require . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 #f)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (rename-one . #s(stx-boundary (s0 #f)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 #f)))
-        (enter-prim . #s(stx-boundary (s0 s1 #f)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 #f)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary #f))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . #f)))
-        (enter-prim . #s(stx-boundary (s0 . #f)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (exit-list . #s(stx-boundary (s0 (s1 #f))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 #f))))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
-        (enter-local . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (local-pre . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (start . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
         (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
@@ -690,65 +71,14 @@
         (exit-macro
          .
          #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
         (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (local-post
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (exit-local
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9))))))
-         .
-         #s(stx-boundary (s10 s11 (s12 (s2 s4) (s5 (s6 s7) (s8 s9))))))
-        (exit-macro
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (visit
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (prim-stop . #f)
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (return
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
-        (splice
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8)))))
-         #s(stx-boundary (s9 s10 (s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (enter-prim
+        (exit-check
          .
          #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
         (prim-define-syntaxes . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 s7))))))
         (prepare-env . #f)
-        (phase-up . #f)
+        (enter-bind . #f)
         (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
@@ -779,202 +109,530 @@
         (next . #f)
         (visit . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
         (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))))
-      ((module m racket/base (define (proc x) x) (provide proc))
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
-        (enter-check . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
-        (exit-check . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
-        (visit . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
-        (enter-check . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (tag . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
         (macro-post-x
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9)))
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5)))
          .
-         #s(stx-boundary (s12 (s8 (s9 s10) s10) (s11 s9))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
         (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11))))
-         .
-         #s(stx-boundary
-            (s14
-             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
-             (s10 (s11 s12) s12)
-             (s13 s11))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (prim-module-begin . #f)
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) s12))
-             (s1 s2 (s13 s11)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
-         .
-         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (splice
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
-         #s(stx-boundary (s7 s8 (s9 (s10 s11) s11)))
-         #s(stx-boundary (s7 s8 (s12 s10))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-submodule . #f)
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (prim-module-begin . #f)
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (rename-one . #s(stx-boundary (s0 s1)))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-require . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 #f)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (rename-one . #s(stx-boundary (s0 #f)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 #f)))
-        (enter-prim . #s(stx-boundary (s0 s1 #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
         (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 #f)))
+        (enter-list . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
         (next . #f)
         (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
         (variable #s(stx-boundary s0) . #s(stx-boundary s0))
         (return . #s(stx-boundary s0))
         (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1)))
+        (macro-pre-x . #s(stx-boundary (s0 s1)))
+        (local-value . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (local-value-result . #f)
+        (local-value . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (local-value-result . #f)
+        (macro-post-x #s(stx-boundary (s0 s1)) . #s(stx-boundary (s2 s1)))
+        (exit-macro . #s(stx-boundary (s0 s1)))
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-quote-syntax . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (exit-list . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (exit-list . #s(stx-boundary ((s0 s1 (s2 s3) (s4 s5)))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s5) (s6 s7)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s5) (s6 s7)))))
+        (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0)))
+        (visit . #s(stx-boundary (s0)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0)))
+        (macro-pre-x . #s(stx-boundary (s0)))
+        (lift-require
+         #s(stx-boundary (s0 s1))
+         #s(stx-boundary s2)
+         .
+         #s(stx-boundary s2))
+        (macro-post-x #s(stx-boundary s0) . #s(stx-boundary (s1)))
+        (exit-macro . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->letrec
+         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
+        (visit
+         .
+         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
+        (prim-letrec-syntaxes+values . #f)
+        (letrec-syntaxes-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 s7))))))
+         ()
+         .
+         #s(stx-boundary (s7)))
+        (prepare-env . #f)
+        (next-group . #f)
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (tag . #s(stx-boundary (s0 () s1)))
+        (exit-prim . #s(stx-boundary (s0 () s1)))
+        (return . #s(stx-boundary (s0 () s1)))
+        (exit-prim . #s(stx-boundary (s0 () (s0 () s1))))
+        (return . #s(stx-boundary (s0 () (s0 () s1))))
+        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (return . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (lift-loop . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
+        (prim-begin . #f)
+        (enter-list . #s(stx-boundary ((s0 s1) (s2 (s3 () (s3 () s4))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-require . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 () (s0 () s1))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 () (s0 () s1))))
+        (prim-let-values . #f)
+        (let-renames () . #s(stx-boundary ((s0 () s1))))
+        (next-group . #f)
+        (enter-block . #s(stx-boundary ((s0 () s1))))
+        (block-renames
+         #s(stx-boundary ((s0 () s1)))
+         .
+         #s(stx-boundary ((s0 () s1))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 () s1)))
+        (exit-check . #s(stx-boundary (s0 () s1)))
+        (block->list . #s(stx-boundary ((s0 () s1))))
+        (enter-list . #s(stx-boundary ((s0 () s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 () s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 () s1)))
+        (prim-let-values . #f)
+        (let-renames () . #s(stx-boundary (s0)))
+        (next-group . #f)
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (exit-prim . #s(stx-boundary (s0 () s1)))
+        (return . #s(stx-boundary (s0 () s1)))
+        (exit-list . #s(stx-boundary ((s0 () s1))))
+        (exit-prim . #s(stx-boundary (s0 () (s0 () s1))))
+        (return . #s(stx-boundary (s0 () (s0 () s1))))
+        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (return . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
+        (exit-list . #s(stx-boundary ((s0 s1) (s2 (s3 () (s3 () s4))))))
+        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
+        (return . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))))
+      ('quoted
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2))))
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1 s2))))
+        (return . #s(stx-boundary (s0 (s1 s2))))))
+      ((let ()
+         (define-syntax (ok stx)
+           (local-expand (cadr (syntax-e stx)) 'expression #f))
+         (ok 9))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+        (enter-check
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+        (prim-#%expression . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9)))
+         .
+         #s(stx-boundary
+            (s9 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+        (prim-let-values . #f)
+        (let-renames
+         ()
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+        (next-group . #f)
+        (enter-block
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9)))
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+        (next . #f)
+        (enter-check
+         .
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f))))
+         .
+         #s(stx-boundary (s9 (s1 s3) (s4 (s5 (s6 s3)) (s7 s8) #f))))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+        (exit-check
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+        (prim-define-syntaxes . #f)
+        (rename-one
+         .
+         #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 (s5 s2)) (s6 s7) #f)))))
+        (prepare-env . #f)
+        (enter-bind . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f)))
+         .
+         #s(stx-boundary (s7 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (prim-lambda . #f)
+        (lambda-renames
+         #s(stx-boundary (s0))
+         .
+         #s(stx-boundary ((s1 (s2 (s3 s0)) (s4 s5) #f))))
+        (enter-block . #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f)))
+         .
+         #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8))))
+         .
+         #s(stx-boundary (s15 (s2 (s3 s4)) (s6 s7) #f)))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8))))
+         .
+         #s(stx-boundary
+            (s15
+             ((s1 (s2 (s3 s4))) (s5 (s6 s7)) (s8 #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (block->list
+         .
+         #s(stx-boundary
+            ((s0
+              (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+              (s9
+               (s10 (s11 s12))
+               (s13 #t s1 s5 s8 (s6 ()))
+               (s14 s12 s1 s5 s8))))))
+        (enter-list
+         .
+         #s(stx-boundary
+            ((s0
+              (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+              (s9
+               (s10 (s11 s12))
+               (s13 #t s1 s5 s8 (s6 ()))
+               (s14 s12 s1 s5 s8))))))
+        (next . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3 s4))) ((s5) (s6 s7)) ((s8) #f))
+             (s9
+              (s10 (s11 s12))
+              (s13 #t s1 s5 s8 (s6 ()))
+              (s14 s12 s1 s5 s8)))))
+        (prim-let-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 (s2 s3))))
+          #s(stx-boundary ((s4) (s5 s6)))
+          #s(stx-boundary ((s7) #f)))
+         .
+         #s(stx-boundary
+            ((s8
+              (s9 (s10 s11))
+              (s12 #t s0 s4 s7 (s5 ()))
+              (s13 s11 s0 s4 s7)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 (s2 s3))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 s3)))
+         .
+         #s(stx-boundary (s0 s1 (s2 s3))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1 s2))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 s2)))
+        (enter-macro . #s(stx-boundary (s0 s1 s2)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 s2))
+         .
+         #s(stx-boundary (s0 s1 s2)))
+        (exit-macro . #s(stx-boundary (s0 s1 s2)))
+        (visit . #s(stx-boundary (s0 s1 s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2)))
+        (return . #s(stx-boundary (s0 s1 s2)))
+        (exit-list . #s(stx-boundary (s0 (s1 s2 s3))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 s3))))
+        (return . #s(stx-boundary (s0 s1 (s0 s2 s3))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (next . #f)
         (visit . #s(stx-boundary #f))
         (resolve . #s(stx-boundary s0))
         (tag . #s(stx-boundary (s0 . #f)))
@@ -982,31 +640,550 @@
         (prim-#%datum . #f)
         (exit-prim . #s(stx-boundary (s0 #f)))
         (return . #s(stx-boundary (s0 #f)))
-        (exit-list . #s(stx-boundary (s0 (s1 #f))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 #f))))
-        (module-lift-end-loop)
         (next-group . #f)
+        (enter-block
+         .
+         #s(stx-boundary
+            ((s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7)))))
+        (block-renames
+         #s(stx-boundary
+            ((s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7))))
+         .
+         #s(stx-boundary
+            ((s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7)))))
         (next . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (rename-one
+        (enter-check
          .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
+         #s(stx-boundary
+            (s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7))))
+        (exit-check
          .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
+         #s(stx-boundary
+            (s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7))))
+        (block->list
          .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+         #s(stx-boundary
+            ((s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7)))))
+        (enter-list
+         .
+         #s(stx-boundary
+            ((s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7)))))
         (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7))))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
-        (enter-local . #s(stx-boundary (s0 (s1 s2) s2)))
-        (local-pre . #s(stx-boundary (s0 (s1 s2) s2)))
-        (start . #f)
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 (s2 s3)) (s4 #t s5 s6 s7 (s8 ())) (s9 s3 s5 s6 s7))))
+        (prim-if . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 (s2 s3))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1 s2))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-#%variable-reference . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (exit-list . #s(stx-boundary (s0 (s1 s2))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #t s1 s2 s3 (s4 ()))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 #t s2 s3 s4 (s5 ()))))
+        (enter-prim . #s(stx-boundary (s0 s1 #t s2 s3 s4 (s5 ()))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 #t s1 s2 s3 (s4 ()))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary #t))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . #t)))
+        (enter-prim . #s(stx-boundary (s0 . #t)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 #t)))
+        (return . #s(stx-boundary (s0 #t)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 ())))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 ())))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 ())))
+        (return . #s(stx-boundary (s0 ())))
+        (exit-list . #s(stx-boundary (s0 (s1 #t) s2 s3 s4 (s1 ()))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 #t) s3 s4 s5 (s2 ()))))
+        (return . #s(stx-boundary (s0 s1 (s2 #t) s3 s4 s5 (s2 ()))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 s2 s3 s4)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 s3 s4)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1 s2 s3)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1 s2 s3)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2 s3 s4)))
+        (return . #s(stx-boundary (s0 s1 s2 s3 s4)))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4))
+             (s1 s5 (s6 #t) s7 s8 s9 (s6 ()))
+             (s1 s4 s7 s8 s9))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4))
+             (s1 s5 (s6 #t) s7 s8 s9 (s6 ()))
+             (s1 s4 s7 s8 s9))))
+        (exit-list
+         .
+         #s(stx-boundary
+            ((s0
+              (s1 s2 (s3 s4))
+              (s1 s5 (s6 #t) s7 s8 s9 (s6 ()))
+              (s1 s4 s7 s8 s9)))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 s3 (s2 s4 s5))) ((s6) (s7 s8)) ((s9) (s7 #f)))
+             (s10
+              (s2 s11 (s12 s13))
+              (s2 s14 (s7 #t) s1 s6 s9 (s7 ()))
+              (s2 s13 s1 s6 s9)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 s3 (s2 s4 s5))) ((s6) (s7 s8)) ((s9) (s7 #f)))
+             (s10
+              (s2 s11 (s12 s13))
+              (s2 s14 (s7 #t) s1 s6 s9 (s7 ()))
+              (s2 s13 s1 s6 s9)))))
+        (exit-list
+         .
+         #s(stx-boundary
+            ((s0
+              (((s1) (s2 s3 (s2 s4 s5))) ((s6) (s7 s8)) ((s9) (s7 #f)))
+              (s10
+               (s2 s11 (s12 s13))
+               (s2 s14 (s7 #t) s1 s6 s9 (s7 ()))
+               (s2 s13 s1 s6 s9))))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1)
+             (s2
+              (((s3) (s4 s5 (s4 s6 s1))) ((s7) (s8 s9)) ((s10) (s8 #f)))
+              (s11
+               (s4 s12 (s13 s14))
+               (s4 s15 (s8 #t) s3 s7 s10 (s8 ()))
+               (s4 s14 s3 s7 s10))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1)
+             (s2
+              (((s3) (s4 s5 (s4 s6 s1))) ((s7) (s8 s9)) ((s10) (s8 #f)))
+              (s11
+               (s4 s12 (s13 s14))
+               (s4 s15 (s8 #t) s3 s7 s10 (s8 ()))
+               (s4 s14 s3 s7 s10))))))
+        (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 9)))
+        (visit . #s(stx-boundary (s0 9)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 9)))
+        (macro-pre-x . #s(stx-boundary (s0 9)))
+        (enter-local . #s(stx-boundary 9))
+        (local-pre . #s(stx-boundary 9))
+        (enter-check . #s(stx-boundary 9))
+        (exit-check . #s(stx-boundary 9))
+        (local-post . #s(stx-boundary 9))
+        (exit-local . #s(stx-boundary 9))
+        (macro-post-x #s(stx-boundary 9) . #s(stx-boundary (s0 9)))
+        (exit-macro . #s(stx-boundary 9))
+        (return . #s(stx-boundary 9))
+        (exit-check . #s(stx-boundary 9))
+        (block->letrec
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
+        (prim-letrec-syntaxes+values . #f)
+        (letrec-syntaxes-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 (s5 s2)) (s6 s7) #f)))))
+         ()
+         .
+         #s(stx-boundary (9)))
+        (prepare-env . #f)
+        (next-group . #f)
+        (enter-list . #s(stx-boundary (9)))
+        (next . #f)
+        (visit . #s(stx-boundary 9))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 9)))
+        (enter-prim . #s(stx-boundary (s0 . 9)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 9)))
+        (return . #s(stx-boundary (s0 9)))
+        (exit-list . #s(stx-boundary ((s0 9))))
+        (tag . #s(stx-boundary (s0 () (s1 9))))
+        (exit-prim . #s(stx-boundary (s0 () (s1 9))))
+        (return . #s(stx-boundary (s0 () (s1 9))))
+        (exit-prim . #s(stx-boundary (s0 () (s0 () (s1 9)))))
+        (return . #s(stx-boundary (s0 () (s0 () (s1 9)))))
+        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))
+        (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))))
+      ((let ()
+         (define-syntax (ok stx) (quote-syntax 8))
+         (define-syntax (second stx) (quote-syntax (ok 6)))
+         (define (ident x) x)
+         (define (second-ident y) y)
+         (ident (second-ident (second))))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 8))
+              (s2 (s6 s4) (s5 (s3 6)))
+              (s7 (s8 s9) s9)
+              (s7 (s10 s11) s11)
+              (s8 (s10 (s6)))))))
+        (enter-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 8))
+              (s2 (s6 s4) (s5 (s3 6)))
+              (s7 (s8 s9) s9)
+              (s7 (s10 s11) s11)
+              (s8 (s10 (s6)))))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 8))
+              (s2 (s6 s4) (s5 (s3 6)))
+              (s7 (s8 s9) s9)
+              (s7 (s10 s11) s11)
+              (s8 (s10 (s6)))))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 8))
+              (s2 (s6 s4) (s5 (s3 6)))
+              (s7 (s8 s9) s9)
+              (s7 (s10 s11) s11)
+              (s8 (s10 (s6)))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 8))
+              (s2 (s6 s4) (s5 (s3 6)))
+              (s7 (s8 s9) s9)
+              (s7 (s10 s11) s11)
+              (s8 (s10 (s6)))))))
+        (prim-#%expression . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5)))))
+         .
+         #s(stx-boundary
+            (s11
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s1 (s2 s3) (s4 8))
+             (s1 (s5 s3) (s4 (s2 6)))
+             (s6 (s7 s8) s8)
+             (s6 (s9 s10) s10)
+             (s7 (s9 (s5))))))
+        (prim-let-values . #f)
+        (let-renames
+         ()
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8))
+             (s0 (s4 s2) (s3 (s1 6)))
+             (s5 (s6 s7) s7)
+             (s5 (s8 s9) s9)
+             (s6 (s8 (s4))))))
+        (next-group . #f)
+        (enter-block
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8))
+             (s0 (s4 s2) (s3 (s1 6)))
+             (s5 (s6 s7) s7)
+             (s5 (s8 s9) s9)
+             (s6 (s8 (s4))))))
+        (block-renames
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8))
+             (s0 (s4 s2) (s3 (s1 6)))
+             (s5 (s6 s7) s7)
+             (s5 (s8 s9) s9)
+             (s6 (s8 (s4)))))
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8))
+             (s0 (s4 s2) (s3 (s1 6)))
+             (s5 (s6 s7) s7)
+             (s5 (s8 s9) s9)
+             (s6 (s8 (s4))))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
+         .
+         #s(stx-boundary (s5 (s1 s3) (s4 8))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (prim-define-syntaxes . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
+        (prepare-env . #f)
+        (enter-bind . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 8))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 8)))
+         .
+         #s(stx-boundary (s3 (s1) (s2 8))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 8))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
+        (enter-block . #s(stx-boundary ((s0 8))))
+        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 8)))
+        (exit-check . #s(stx-boundary (s0 8)))
+        (block->list . #s(stx-boundary ((s0 8))))
+        (enter-list . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 8)))
+        (prim-quote-syntax . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary ((s0 8))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (return . #s(stx-boundary (s0 (s1) (s2 8))))
+        (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6)))))
+         .
+         #s(stx-boundary (s6 (s1 s3) (s4 (s5 6)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (prim-define-syntaxes . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 6))))))
+        (prepare-env . #f)
+        (enter-bind . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3 6))))
+         .
+         #s(stx-boundary (s4 (s1) (s2 (s3 6)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 (s2 6)))))
+        (enter-block . #s(stx-boundary ((s0 (s1 6)))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 6))))
+         .
+         #s(stx-boundary ((s0 (s1 6)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 6))))
+        (exit-check . #s(stx-boundary (s0 (s1 6))))
+        (block->list . #s(stx-boundary ((s0 (s1 6)))))
+        (enter-list . #s(stx-boundary ((s0 (s1 6)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 6))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 6))))
+        (prim-quote-syntax . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 6))))
+        (return . #s(stx-boundary (s0 (s1 6))))
+        (exit-list . #s(stx-boundary ((s0 (s1 6)))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
         (visit . #s(stx-boundary (s0 (s1 s2) s2)))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
@@ -1016,6 +1193,7 @@
          .
          #s(stx-boundary (s0 (s1 s3) s3)))
         (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
         (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
@@ -1025,94 +1203,76 @@
          .
          #s(stx-boundary (s4 s1 (s2 (s3) s3))))
         (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
         (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (local-post . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (exit-local . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4))))
-         .
-         #s(stx-boundary (s5 s6 (s7 (s2 s4) s4))))
-        (exit-macro . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
+        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
-        (return . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
-        (splice
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
+         .
+         #s(stx-boundary (s0 (s1 s3) s3)))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-post-x
          #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
-         #s(stx-boundary (s4 s5 (s6 s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+         .
+         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
         (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (rename-one . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
         (prim-define-values . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
         (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
-        (enter-local . #s(stx-boundary (s0 s1)))
-        (local-pre . #s(stx-boundary (s0 s1)))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1)))
-        (macro-pre-x . #s(stx-boundary (s0 s1)))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2 s3))))
+        (enter-check . #s(stx-boundary (s0 (s1 (s2)))))
+        (exit-check . #s(stx-boundary (s0 (s1 (s2)))))
+        (block->letrec
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
+             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
+             (s6 (s9 (s5))))))
+        (visit
          .
-         #s(stx-boundary (s4 s3)))
-        (exit-macro . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
+             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
+             (s6 (s9 (s5))))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (local-post . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (exit-local . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2 (s3 s4)))))
+        (enter-prim
          .
-         #s(stx-boundary (s5 s6 (s7 s4))))
-        (exit-macro . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (return . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
-        (splice #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (module-lift-end-loop)
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
+             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
+             (s6 (s9 (s5))))))
+        (prim-letrec-syntaxes+values . #f)
+        (letrec-syntaxes-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
+          #s(stx-boundary ((s4) (s1 (s2) (s3 (s0 6))))))
+         (#s(stx-boundary ((s5) (s6 (s7) s7)))
+          #s(stx-boundary ((s8) (s6 (s9) s9))))
+         .
+         #s(stx-boundary ((s5 (s8 (s4))))))
+        (prepare-env . #f)
         (next-group . #f)
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 (s2) s2)))
+          #s(stx-boundary ((s3) (s1 (s4) s4))))
+         .
+         #s(stx-boundary ((s0 (s3 (s5))))))
         (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-define-values . #f)
         (visit . #s(stx-boundary (s0 (s1) s1)))
         (resolve . #s(stx-boundary s0))
         (enter-prim . #s(stx-boundary (s0 (s1) s1)))
@@ -1133,391 +1293,152 @@
         (exit-list . #s(stx-boundary (s0)))
         (exit-prim . #s(stx-boundary (s0 (s1) s1)))
         (return . #s(stx-boundary (s0 (s1) s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
         (next . #f)
-        (module-lift-end-loop)
-        (next-group . #f)
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (prim-provide . #f)
-        (visit . #s(stx-boundary (s0 s1)))
+        (visit . #s(stx-boundary (s0 (s1) s1)))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1)))
-        (macro-pre-x . #s(stx-boundary (s0 s1)))
-        (macro-post-x #s(stx-boundary (s0 s1)) . #s(stx-boundary (s2 s1)))
-        (exit-macro . #s(stx-boundary (s0 s1)))
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
-             (s9 (s10) (s11 (s12) s12))
-             (s13 s10))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
-             (s9 (s10) (s11 (s12) s12))
-             (s13 s10))))
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s11 (s12) (s13 (s14) s14))
-              (s15 s12)))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s11 (s12) (s13 (s14) s14))
-              (s15 s12)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s11 (s12) (s13 (s14) s14))
-              (s15 s12)))))))
-      ((module m racket/base 'done)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 s1 s2 (s3 s4))))
-        (enter-check . #s(stx-boundary (s0 s1 s2 (s3 s4))))
-        (exit-check . #s(stx-boundary (s0 s1 s2 (s3 s4))))
-        (visit . #s(stx-boundary (s0 s1 s2 (s3 s4))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2 (s3 s4))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (rename-one . #s(stx-boundary (s0 s1)))
-        (enter-check . #s(stx-boundary (s0 s1)))
-        (exit-check . #s(stx-boundary (s0 s1)))
-        (tag . #s(stx-boundary (s0 (s1 s2))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2))))
-        (visit . #s(stx-boundary (s0 (s1 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8)))
-         .
-         #s(stx-boundary (s9 (s3 s8))))
-        (exit-macro
-         .
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
-        (return
-         .
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
-        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10))))
-         .
-         #s(stx-boundary (s11 (s3 s4 (s5 s6) (s7 s8) (s9 #f)) (s5 s10))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (prim-module-begin . #f)
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
-         .
-         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (splice
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
-         #s(stx-boundary (s7 s8 (s2 s9))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-submodule . #f)
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (prim-module-begin . #f)
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (rename-one . #s(stx-boundary (s0 s1)))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-require . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 #f)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (rename-one . #s(stx-boundary (s0 #f)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 #f)))
-        (enter-prim . #s(stx-boundary (s0 s1 #f)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 #f)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary #f))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . #f)))
-        (enter-prim . #s(stx-boundary (s0 . #f)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (exit-list . #s(stx-boundary (s0 (s1 #f))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 #f))))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
-        (enter-local . #s(stx-boundary (s0 s1)))
-        (local-pre . #s(stx-boundary (s0 s1)))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (local-post . #s(stx-boundary (s0 s1)))
-        (exit-local . #s(stx-boundary (s0 s1)))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2 s3))))
-         .
-         #s(stx-boundary (s4 s1 (s2 s3))))
-        (exit-macro . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (splice #s(stx-boundary (s0 (s1 s2))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5))
-         .
-         #s(stx-boundary (s6 (s3 s4))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (visit . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (return . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 () (s2 s3)) s4)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 () (s1 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 () (s1 s2))))
+        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
         (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary ()) . #s(stx-boundary ((s0 s1))))
-        (enter-block . #s(stx-boundary ((s0 s1))))
-        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 s1)))
-        (exit-check . #s(stx-boundary (s0 s1)))
-        (block->list . #s(stx-boundary ((s0 s1))))
-        (enter-list . #s(stx-boundary ((s0 s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (exit-list . #s(stx-boundary ((s0 s1))))
-        (exit-prim . #s(stx-boundary (s0 () (s1 s2))))
-        (return . #s(stx-boundary (s0 () (s1 s2))))
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
         (next . #f)
         (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
         (variable #s(stx-boundary s0) . #s(stx-boundary s0))
         (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 (s1 () (s2 s3)) s4)))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (return . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
-        (module-lift-end-loop)
+        (exit-list . #s(stx-boundary (s0)))
+        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
+        (return . #s(stx-boundary (s0 (s1) s1)))
         (next-group . #f)
+        (enter-list . #s(stx-boundary ((s0 (s1 (s2))))))
         (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2)))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3))))
+         .
+         #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 (s3)))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1 (s2)))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 (s2))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2)))
+         .
+         #s(stx-boundary (s0 s1 (s2))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2))))
+        (visit . #s(stx-boundary (s0 s1 (s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0)))
+        (macro-pre-x . #s(stx-boundary (s0)))
+        (macro-post-x #s(stx-boundary (s0 6)) . #s(stx-boundary (s1)))
+        (exit-macro . #s(stx-boundary (s0 6)))
+        (visit . #s(stx-boundary (s0 6)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 6)))
+        (macro-pre-x . #s(stx-boundary (s0 6)))
+        (macro-post-x #s(stx-boundary 8) . #s(stx-boundary (s0 6)))
+        (exit-macro . #s(stx-boundary 8))
+        (visit . #s(stx-boundary 8))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 8)))
+        (enter-prim . #s(stx-boundary (s0 . 8)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary (s0 (s1 8))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 8))))
+        (return . #s(stx-boundary (s0 s1 (s2 8))))
+        (exit-list . #s(stx-boundary (s0 (s1 s2 (s3 8)))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s3 8)))))
+        (return . #s(stx-boundary (s0 s1 (s0 s2 (s3 8)))))
+        (exit-list . #s(stx-boundary ((s0 s1 (s0 s2 (s3 8))))))
+        (tag
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) s3)))
+             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
         (exit-prim
          .
          #s(stx-boundary
             (s0
-             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
-             (s7 s9 (s10 () (s3 s11)) s12))))
+             (((s1) (s2 (s3) s3)))
+             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
         (return
          .
          #s(stx-boundary
             (s0
-             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
-             (s7 s9 (s10 () (s3 s11)) s12))))
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s9 s11 (s12 () (s5 s13)) s14)))))
+             (((s1) (s2 (s3) s3)))
+             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
         (exit-prim
          .
          #s(stx-boundary
             (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s9 s11 (s12 () (s5 s13)) s14)))))
+             ()
+             (s0
+              (((s1) (s2 (s3) s3)))
+              (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8))))))))
         (return
          .
          #s(stx-boundary
             (s0
-             s1
-             s2
-             (s3
-              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
-              (s9 s11 (s12 () (s5 s13)) s14)))))))
+             ()
+             (s0
+              (((s1) (s2 (s3) s3)))
+              (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8))))))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s1
+               (((s2) (s3 (s4) s4)))
+               (s1 (((s5) (s3 (s6) s6))) (s7 s2 (s7 s5 (s8 8)))))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s1
+               (((s2) (s3 (s4) s4)))
+               (s1 (((s5) (s3 (s6) s6))) (s7 s2 (s7 s5 (s8 8)))))))))))
       ((let () (define-syntax (ok stx) (quote-syntax 8)) (ok 5))
        .
        ((start-top . #f)
@@ -1639,68 +1560,6 @@
         (return . #s(stx-boundary (s0 () (s0 () (s1 8)))))
         (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))
         (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))))
-      ((with-continuation-mark __x __y __z)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2 s3 s4))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2 s3 s4))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2 s3 s4))))
-        (visit . #s(stx-boundary (s0 (s1 s2 s3 s4))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 s3 s4))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 s1 s2 s3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2 s3)))
-        (prim-with-continuation-mark . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1 . s2) (s1 . s3) (s1 . s4))))
-        (return . #s(stx-boundary (s0 (s1 . s2) (s1 . s3) (s1 . s4))))
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 . s3) (s2 . s4) (s2 . s5)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 . s3) (s2 . s4) (s2 . s5)))))))
-      ((#%top . __x)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 . s2))))
-        (enter-check . #s(stx-boundary (s0 (s1 . s2))))
-        (exit-check . #s(stx-boundary (s0 (s1 . s2))))
-        (visit . #s(stx-boundary (s0 (s1 . s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 . s2))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 . s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1 . s2))))
-        (return . #s(stx-boundary (s0 (s1 . s2))))))
       ((let () (define-syntax-rule (ok x) x) (ok 5))
        .
        ((start-top . #f)
@@ -5644,6 +5503,288 @@
               (s2
                (((s3) (s4 (s5) (s6 s7 s5))) ((s7) (s4 (s8) (s9 8))))
                (s6 s3 (s9 5)))))))))
+      ((case-lambda ((x) x) ((x y) (+ x y)))
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+        (enter-check
+         .
+         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+        (exit-check
+         .
+         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+        (visit . #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s1 s2)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s1 s2)))))
+        (prim-case-lambda . #f)
+        (next . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (lambda-renames
+         #s(stx-boundary (s0 s1))
+         .
+         #s(stx-boundary ((s2 s0 s1))))
+        (enter-block . #s(stx-boundary ((s0 s1 s2))))
+        (block-renames
+         #s(stx-boundary ((s0 s1 s2)))
+         .
+         #s(stx-boundary ((s0 s1 s2))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 s1 s2)))
+        (exit-check . #s(stx-boundary (s0 s1 s2)))
+        (block->list . #s(stx-boundary ((s0 s1 s2))))
+        (enter-list . #s(stx-boundary ((s0 s1 s2))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 s2)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 s2 s3)))
+        (enter-macro . #s(stx-boundary (s0 s1 s2 s3)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 s2 s3)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 s2 s3))
+         .
+         #s(stx-boundary (s0 s1 s2 s3)))
+        (exit-macro . #s(stx-boundary (s0 s1 s2 s3)))
+        (visit . #s(stx-boundary (s0 s1 s2 s3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 s3)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1 s2)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1 s2)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2 s3)))
+        (return . #s(stx-boundary (s0 s1 s2 s3)))
+        (exit-list . #s(stx-boundary ((s0 s1 s2 s3))))
+        (exit-prim . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s4 s1 s2)))))
+        (return . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s4 s1 s2)))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s5 s2 s3))))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s5 s2 s3))))))))
+      ((let () (define (ok x) '8) (ok 5))
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (enter-check
+         .
+         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (exit-check . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (visit . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (macro-pre-x . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (macro-post-x
+         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5)))
+         .
+         #s(stx-boundary (s5 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (exit-macro . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (visit . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (prim-let-values . #f)
+        (let-renames () . #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
+        (next-group . #f)
+        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5)))
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) (s4 8))))
+         .
+         #s(stx-boundary (s0 (s1 s3) (s4 8))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
+         .
+         #s(stx-boundary (s5 s1 (s2 (s3) (s4 8)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 5)))
+        (exit-check . #s(stx-boundary (s0 5)))
+        (block->letrec #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
+        (visit . #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
+         .
+         #s(stx-boundary ((s0 5))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
+        (enter-block . #s(stx-boundary ((s0 8))))
+        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 8)))
+        (exit-check . #s(stx-boundary (s0 8)))
+        (block->list . #s(stx-boundary ((s0 8))))
+        (enter-list . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 8)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary ((s0 8))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (return . #s(stx-boundary (s0 (s1) (s2 8))))
+        (next-group . #f)
+        (enter-list . #s(stx-boundary ((s0 5))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 5)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 5)))
+        (enter-macro . #s(stx-boundary (s0 s1 5)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
+        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
+        (exit-macro . #s(stx-boundary (s0 s1 5)))
+        (visit . #s(stx-boundary (s0 s1 5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 5)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 5)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary 5))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 5)))
+        (enter-prim . #s(stx-boundary (s0 . 5)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (exit-list . #s(stx-boundary (s0 (s1 5))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
+        (return . #s(stx-boundary (s0 s1 (s2 5))))
+        (exit-list . #s(stx-boundary ((s0 s1 (s2 5)))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5)))))
+        (return
+         .
+         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5)))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0 () (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 () (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5))))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s1 (((s2) (s3 (s4) (s5 8)))) (s6 s2 (s5 5)))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s1 (((s2) (s3 (s4) (s5 8)))) (s6 s2 (s5 5)))))))))
+      ((if 1 2 3)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 1 2 3))))
+        (enter-check . #s(stx-boundary (s0 (s1 1 2 3))))
+        (exit-check . #s(stx-boundary (s0 (s1 1 2 3))))
+        (visit . #s(stx-boundary (s0 (s1 1 2 3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 1 2 3))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 1 2 3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 1 2 3)))
+        (prim-if . #f)
+        (visit . #s(stx-boundary 1))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 1)))
+        (enter-prim . #s(stx-boundary (s0 . 1)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 1)))
+        (return . #s(stx-boundary (s0 1)))
+        (next . #f)
+        (visit . #s(stx-boundary 2))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 2)))
+        (enter-prim . #s(stx-boundary (s0 . 2)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 2)))
+        (return . #s(stx-boundary (s0 2)))
+        (next . #f)
+        (visit . #s(stx-boundary 3))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 3)))
+        (enter-prim . #s(stx-boundary (s0 . 3)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 3)))
+        (return . #s(stx-boundary (s0 3)))
+        (exit-prim . #s(stx-boundary (s0 (s1 1) (s1 2) (s1 3))))
+        (return . #s(stx-boundary (s0 (s1 1) (s1 2) (s1 3))))
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 1) (s2 2) (s2 3)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 1) (s2 2) (s2 3)))))))
       ((module m racket/base (require racket/list) foldl)
        .
        ((start-top . #f)
@@ -6034,7 +6175,7 @@
               (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
               (s7 s11)
               (s9 s12 (s13 () s14) s15)))))))
-      ('quoted
+      ((#%variable-reference __z)
        .
        ((start-top . #f)
         (visit . #s(stx-boundary (s0 (s1 s2))))
@@ -6047,754 +6188,65 @@
         (visit . #s(stx-boundary (s0 s1)))
         (resolve . #s(stx-boundary s0))
         (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-quote . #f)
+        (prim-#%variable-reference . #f)
         (exit-prim . #s(stx-boundary (s0 s1)))
         (return . #s(stx-boundary (s0 s1)))
         (exit-prim . #s(stx-boundary (s0 (s1 s2))))
         (return . #s(stx-boundary (s0 (s1 s2))))))
-      ((let ()
-         (define-syntax (lift stx)
-           (syntax-local-lift-require 'racket/list #'foldl))
-         (lift))
+      ((#%plain-app 1 2)
        .
        ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
-        (exit-check
-         .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
-        (visit
-         .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
+        (visit . #s(stx-boundary (s0 (s1 1 2))))
+        (enter-check . #s(stx-boundary (s0 (s1 1 2))))
+        (exit-check . #s(stx-boundary (s0 (s1 1 2))))
+        (visit . #s(stx-boundary (s0 (s1 1 2))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 (s6 s7) (s8 s9))) (s3)))))
+        (enter-prim . #s(stx-boundary (s0 (s1 1 2))))
         (prim-#%expression . #f)
-        (visit
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (visit . #s(stx-boundary (s0 1 2)))
         (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2)))
-         .
-         #s(stx-boundary (s9 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (exit-macro
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (visit
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
-        (prim-let-values . #f)
-        (let-renames
-         ()
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
-        (next-group . #f)
-        (enter-block
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1)))
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 s5) (s6 s7))) (s1))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8)))))
-         .
-         #s(stx-boundary (s9 (s1 s3) (s4 (s5 s6) (s7 s8)))))
-        (exit-macro
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (exit-check
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
-        (prim-define-syntaxes . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 s7))))))
-        (prepare-env . #f)
-        (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6))))
-         .
-         #s(stx-boundary (s7 (s1) (s2 (s3 s4) (s5 s6)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
-        (prim-lambda . #f)
-        (lambda-renames
-         #s(stx-boundary (s0))
-         .
-         #s(stx-boundary ((s1 (s2 s3) (s4 s5)))))
-        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 s4))))
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
-        (block->list . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
-        (enter-list . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5)))
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
+        (enter-prim . #s(stx-boundary (s0 1 2)))
         (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
+        (enter-list . #s(stx-boundary (1 2)))
         (next . #f)
-        (visit . #s(stx-boundary s0))
+        (visit . #s(stx-boundary 1))
         (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1)))
-        (macro-pre-x . #s(stx-boundary (s0 s1)))
-        (local-value . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (local-value-result . #f)
-        (local-value . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (local-value-result . #f)
-        (macro-post-x #s(stx-boundary (s0 s1)) . #s(stx-boundary (s2 s1)))
-        (exit-macro . #s(stx-boundary (s0 s1)))
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (exit-list . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5))))
-        (exit-list . #s(stx-boundary ((s0 s1 (s2 s3) (s4 s5)))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s5) (s6 s7)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s5) (s6 s7)))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0)))
-        (visit . #s(stx-boundary (s0)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0)))
-        (macro-pre-x . #s(stx-boundary (s0)))
-        (lift-require
-         #s(stx-boundary (s0 s1))
-         #s(stx-boundary s2)
-         .
-         #s(stx-boundary s2))
-        (macro-post-x #s(stx-boundary s0) . #s(stx-boundary (s1)))
-        (exit-macro . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->letrec
-         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
-        (visit
-         .
-         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))) () s8)))
-        (prim-letrec-syntaxes+values . #f)
-        (letrec-syntaxes-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 s7))))))
-         ()
-         .
-         #s(stx-boundary (s7)))
-        (prepare-env . #f)
-        (next-group . #f)
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (tag . #s(stx-boundary (s0 () s1)))
-        (exit-prim . #s(stx-boundary (s0 () s1)))
-        (return . #s(stx-boundary (s0 () s1)))
-        (exit-prim . #s(stx-boundary (s0 () (s0 () s1))))
-        (return . #s(stx-boundary (s0 () (s0 () s1))))
-        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (return . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (lift-loop . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
-        (prim-begin . #f)
-        (enter-list . #s(stx-boundary ((s0 s1) (s2 (s3 () (s3 () s4))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-require . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 () (s0 () s1))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 () (s0 () s1))))
-        (prim-let-values . #f)
-        (let-renames () . #s(stx-boundary ((s0 () s1))))
-        (next-group . #f)
-        (enter-block . #s(stx-boundary ((s0 () s1))))
-        (block-renames
-         #s(stx-boundary ((s0 () s1)))
-         .
-         #s(stx-boundary ((s0 () s1))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 () s1)))
-        (exit-check . #s(stx-boundary (s0 () s1)))
-        (block->list . #s(stx-boundary ((s0 () s1))))
-        (enter-list . #s(stx-boundary ((s0 () s1))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 () s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 () s1)))
-        (prim-let-values . #f)
-        (let-renames () . #s(stx-boundary (s0)))
-        (next-group . #f)
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim . #s(stx-boundary (s0 () s1)))
-        (return . #s(stx-boundary (s0 () s1)))
-        (exit-list . #s(stx-boundary ((s0 () s1))))
-        (exit-prim . #s(stx-boundary (s0 () (s0 () s1))))
-        (return . #s(stx-boundary (s0 () (s0 () s1))))
-        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (return . #s(stx-boundary (s0 (s1 () (s1 () s2)))))
-        (exit-list . #s(stx-boundary ((s0 s1) (s2 (s3 () (s3 () s4))))))
-        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))
-        (return . #s(stx-boundary (s0 (s1 s2) (s3 (s4 () (s4 () s5))))))))
-      ((module m '#%kernel 5)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) 5)))
-        (enter-check . #s(stx-boundary (s0 s1 (s2 s3) 5)))
-        (exit-check . #s(stx-boundary (s0 s1 (s2 s3) 5)))
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) 5)))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (rename-one . #s(stx-boundary 5))
-        (enter-check . #s(stx-boundary 5))
-        (exit-check . #s(stx-boundary 5))
-        (tag . #s(stx-boundary (s0 5)))
-        (enter-check . #s(stx-boundary (s0 5)))
-        (exit-check . #s(stx-boundary (s0 5)))
-        (visit . #s(stx-boundary (s0 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 5)))
-        (prim-module-begin . #f)
-        (rename-one . #s(stx-boundary (s0 5)))
-        (next . #f)
-        (visit . #s(stx-boundary 5))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 5)))
-        (enter-prim . #s(stx-boundary (s0 . 5)))
+        (tag . #s(stx-boundary (s0 . 1)))
+        (enter-prim . #s(stx-boundary (s0 . 1)))
         (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (rename-one . #s(stx-boundary (s0 5)))
-        (module-lift-end-loop)
-        (next-group . #f)
+        (exit-prim . #s(stx-boundary (s0 1)))
+        (return . #s(stx-boundary (s0 1)))
         (next . #f)
-        (visit . #s(stx-boundary (s0 5)))
+        (visit . #s(stx-boundary 2))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 5)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 5))))
-        (return . #s(stx-boundary (s0 (s1 5))))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))))
-      ((let-values (((x) __y) ((y z) __w)) __x)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
-        (enter-check . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
-        (exit-check . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
-        (visit . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 (((s1) s2) ((s3 s4) s5)) s6)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (((s1) s2) ((s3 s4) s5)) s6)))
-        (prim-let-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) s1)) #s(stx-boundary ((s2 s3) s4)))
-         .
-         #s(stx-boundary (s5)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (next-group . #f)
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (exit-list . #s(stx-boundary ((s0 . s1))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 . s3)) ((s4 s5) (s2 . s6))) (s2 . s7))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 . s3)) ((s4 s5) (s2 . s6))) (s2 . s7))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0 (s1 (((s2) (s3 . s4)) ((s5 s6) (s3 . s7))) (s3 . s8)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1 (((s2) (s3 . s4)) ((s5 s6) (s3 . s7))) (s3 . s8)))))))
-      ((module m racket/base
-         (define-syntax (ok stx) (quote-syntax 8))
-         (ok)
-         (list (ok) (ok)))
-       .
-       ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
-        (exit-check
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
-        (visit
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9))))
-         .
-         #s(stx-boundary (s13 (s8 (s9 s10) (s11 8)) (s9) (s12 (s9) (s9)))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9)))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
-             (s8 (s9 s10) (s11 8))
-             (s9)
-             (s12 (s9) (s9)))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11)))))
-         .
-         #s(stx-boundary
-            (s15
-             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
-             (s10 (s11 s12) (s13 8))
-             (s11)
-             (s14 (s11) (s11)))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (prim-module-begin . #f)
-        (rename-one
-         .
-         #s(stx-boundary
-            (s0
-             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
-             (s1 s2 (s10 (s11 s12) (s13 8)))
-             (s1 s2 (s11))
-             (s1 s2 (s14 (s11) (s11))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
-        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
-         .
-         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
-        (splice
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
-         #s(stx-boundary (s7 s8 (s9 (s10 s11) (s12 8))))
-         #s(stx-boundary (s7 s8 (s10)))
-         #s(stx-boundary (s7 s8 (s13 (s10) (s10)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-submodule . #f)
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
-        (prim-module . #f)
-        (prepare-env . #f)
-        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (prim-module-begin . #f)
-        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (rename-one . #s(stx-boundary (s0 s1)))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-require . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 #f)))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (rename-one . #s(stx-boundary (s0 #f)))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 #f)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 #f)))
-        (enter-prim . #s(stx-boundary (s0 s1 #f)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 #f)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary #f))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . #f)))
-        (enter-prim . #s(stx-boundary (s0 . #f)))
+        (tag . #s(stx-boundary (s0 . 2)))
+        (enter-prim . #s(stx-boundary (s0 . 2)))
         (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (exit-list . #s(stx-boundary (s0 (s1 #f))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
-        (return . #s(stx-boundary (s0 s1 (s2 #f))))
-        (module-lift-end-loop)
-        (next-group . #f)
-        (next . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
-        (rename-one
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
+        (exit-prim . #s(stx-boundary (s0 2)))
+        (return . #s(stx-boundary (s0 2)))
+        (exit-list . #s(stx-boundary ((s0 1) (s0 2))))
+        (exit-prim . #s(stx-boundary (s0 (s1 1) (s1 2))))
+        (return . #s(stx-boundary (s0 (s1 1) (s1 2))))
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 1) (s2 2)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 1) (s2 2)))))))
+      ((#%top . __x)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 . s2))))
+        (enter-check . #s(stx-boundary (s0 (s1 . s2))))
+        (exit-check . #s(stx-boundary (s0 (s1 . s2))))
+        (visit . #s(stx-boundary (s0 (s1 . s2))))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
-        (enter-local . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (local-pre . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (start . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (enter-prim . #s(stx-boundary (s0 (s1 . s2))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 . s1)))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
-         .
-         #s(stx-boundary (s5 (s1 s3) (s4 8))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (local-post . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (exit-local . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8)))))
-         .
-         #s(stx-boundary (s6 s7 (s8 (s2 s4) (s5 8)))))
-        (exit-macro . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (return . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (rename-one . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
-        (splice
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
-         #s(stx-boundary (s5 s6 (s1)))
-         #s(stx-boundary (s5 s6 (s7 (s1) (s1)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-stop . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (rename-one . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-define-syntaxes . #f)
-        (prepare-env . #f)
-        (phase-up . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 8))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 8)))
-         .
-         #s(stx-boundary (s3 (s1) (s2 8))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 8))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
-        (enter-block . #s(stx-boundary ((s0 8))))
-        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 8)))
-        (exit-check . #s(stx-boundary (s0 8)))
-        (block->list . #s(stx-boundary ((s0 8))))
-        (enter-list . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 8)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1 . s2))))
+        (return . #s(stx-boundary (s0 (s1 . s2))))))
       ((let ()
          (define-syntax (ok stx) (quote-syntax 8))
          (define (ident x) x)
@@ -7003,33 +6455,469 @@
         (return
          .
          #s(stx-boundary (s0 (s1 () (s1 (((s2) (s3 (s4) s4))) (s5 9))))))))
-      ((set! __x 99)
+      ((module m '#%kernel 5)
        .
        ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2 99))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2 99))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2 99))))
-        (visit . #s(stx-boundary (s0 (s1 s2 99))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) 5)))
+        (enter-check . #s(stx-boundary (s0 s1 (s2 s3) 5)))
+        (exit-check . #s(stx-boundary (s0 s1 (s2 s3) 5)))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) 5)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2 99))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 s1 99)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 99)))
-        (prim-set! . #f)
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) 5)))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (rename-one . #s(stx-boundary 5))
+        (enter-check . #s(stx-boundary 5))
+        (exit-check . #s(stx-boundary 5))
+        (tag . #s(stx-boundary (s0 5)))
+        (enter-check . #s(stx-boundary (s0 5)))
+        (exit-check . #s(stx-boundary (s0 5)))
+        (visit . #s(stx-boundary (s0 5)))
         (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 5)))
+        (prim-module-begin . #f)
+        (rename-one . #s(stx-boundary (s0 5)))
         (next . #f)
-        (visit . #s(stx-boundary 99))
+        (visit . #s(stx-boundary 5))
         (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 99)))
-        (enter-prim . #s(stx-boundary (s0 . 99)))
+        (tag . #s(stx-boundary (s0 . 5)))
+        (enter-prim . #s(stx-boundary (s0 . 5)))
         (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 99)))
-        (return . #s(stx-boundary (s0 99)))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 99))))
-        (return . #s(stx-boundary (s0 s1 (s2 99))))
-        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 99)))))
-        (return . #s(stx-boundary (s0 (s1 s2 (s3 99)))))))
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (rename-one . #s(stx-boundary (s0 5)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 5)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 5))))
+        (return . #s(stx-boundary (s0 (s1 5))))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 (s2 5)))))))
+      ((module m racket/base
+         (define-syntax (ok stx)
+           (syntax-local-lift-require 'racket/list #'foldl))
+         (ok))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
+        (enter-check
+         .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
+        (exit-check
+         .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
+        (visit
+         .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 (s7 s8) (s9 s10))) (s4))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (enter-check
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 (s5 s6) (s7 s8))) (s2))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9)))
+         .
+         #s(stx-boundary (s15 (s8 (s9 s10) (s11 (s3 s12) (s13 s14))) (s9))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 (s3 s12) (s13 s14)))
+             (s9))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11))))
+         .
+         #s(stx-boundary
+            (s17
+             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
+             (s10 (s11 s12) (s13 (s5 s14) (s15 s16)))
+             (s11))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (prim-module-begin . #f)
+        (rename-one
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 (s5 s14) (s15 s16))))
+             (s1 s2 (s11)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
+         .
+         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (splice
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
+         #s(stx-boundary (s7 s8 (s9 (s10 s11) (s12 (s2 s13) (s14 s15)))))
+         #s(stx-boundary (s7 s8 (s10))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-submodule . #f)
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (prim-module-begin . #f)
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (rename-one . #s(stx-boundary (s0 s1)))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-require . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 #f)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (rename-one . #s(stx-boundary (s0 #f)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 #f)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 #f)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary #f))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . #f)))
+        (enter-prim . #s(stx-boundary (s0 . #f)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (exit-list . #s(stx-boundary (s0 (s1 #f))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 #f))))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 (s6 s7) (s8 s9))))))
+        (enter-local . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
+        (local-pre . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 s7)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8)))))
+         .
+         #s(stx-boundary (s9 (s1 s3) (s4 (s5 s6) (s7 s8)))))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (local-post
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (exit-local
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9))))))
+         .
+         #s(stx-boundary (s10 s11 (s12 (s2 s4) (s5 (s6 s7) (s8 s9))))))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (visit
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (prim-stop . #f)
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 (s6 s7) (s8 s9)))))))
+        (splice
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8)))))
+         #s(stx-boundary (s9 s10 (s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 s8))))))
+        (prim-define-syntaxes . #f)
+        (prepare-env . #f)
+        (phase-up . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6))))
+         .
+         #s(stx-boundary (s7 (s1) (s2 (s3 s4) (s5 s6)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 s6)))))
+        (prim-lambda . #f)
+        (lambda-renames
+         #s(stx-boundary (s0))
+         .
+         #s(stx-boundary ((s1 (s2 s3) (s4 s5)))))
+        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 s2) (s3 s4))))
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
+        (block->list . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
+        (enter-list . #s(stx-boundary ((s0 (s1 s2) (s3 s4)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s4))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))))
+      ((with-continuation-mark __x __y __z)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2 s3 s4))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2 s3 s4))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2 s3 s4))))
+        (visit . #s(stx-boundary (s0 (s1 s2 s3 s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 s3 s4))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 s1 s2 s3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 s3)))
+        (prim-with-continuation-mark . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1 . s2) (s1 . s3) (s1 . s4))))
+        (return . #s(stx-boundary (s0 (s1 . s2) (s1 . s3) (s1 . s4))))
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 . s3) (s2 . s4) (s2 . s5)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 . s3) (s2 . s4) (s2 . s5)))))))
       ((let ()
          (define-syntax (lift stx) (syntax-local-lift-expression #'(+ 1 2)))
          (lift))
@@ -7345,76 +7233,192 @@
          .
          #s(stx-boundary
             (s0 (s1 (s2) (s3 s4 (s5 1) (s5 2))) (s6 (s7 () (s7 () s2))))))))
-      ((let () (define (ok x) '8) (ok 5))
+      ((begin 1 __x (+ 3 4))
        .
        ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (visit . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
+        (enter-check . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
+        (exit-check . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
+        (visit . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 1 s1 (s2 3 4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 1 s1 (s2 3 4))))
+        (prim-begin . #f)
+        (enter-list . #s(stx-boundary (1 s0 (s1 3 4))))
+        (next . #f)
+        (visit . #s(stx-boundary 1))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 1)))
+        (enter-prim . #s(stx-boundary (s0 . 1)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 1)))
+        (return . #s(stx-boundary (s0 1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 3 4)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 3 4)))
+        (enter-macro . #s(stx-boundary (s0 s1 3 4)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 3 4)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 3 4))
+         .
+         #s(stx-boundary (s0 s1 3 4)))
+        (exit-macro . #s(stx-boundary (s0 s1 3 4)))
+        (visit . #s(stx-boundary (s0 s1 3 4)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 3 4)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 3 4)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary 3))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 3)))
+        (enter-prim . #s(stx-boundary (s0 . 3)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 3)))
+        (return . #s(stx-boundary (s0 3)))
+        (next . #f)
+        (visit . #s(stx-boundary 4))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 4)))
+        (enter-prim . #s(stx-boundary (s0 . 4)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 4)))
+        (return . #s(stx-boundary (s0 4)))
+        (exit-list . #s(stx-boundary (s0 (s1 3) (s1 4))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 3) (s2 4))))
+        (return . #s(stx-boundary (s0 s1 (s2 3) (s2 4))))
+        (exit-list . #s(stx-boundary ((s0 1) (s1 . s2) (s3 s4 (s0 3) (s0 4)))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (s1 1) (s2 . s3) (s4 s5 (s1 3) (s1 4)))))
+        (return . #s(stx-boundary (s0 (s1 1) (s2 . s3) (s4 s5 (s1 3) (s1 4)))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (s1 (s2 1) (s3 . s4) (s5 s6 (s2 3) (s2 4))))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1 (s2 1) (s3 . s4) (s5 s6 (s2 3) (s2 4))))))))
+      ((let ()
+         (define-syntax (ok stx) (quote-syntax 8))
+         (define-syntax (second stx) (quote-syntax (ok 6)))
+         (second 5))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
         (enter-check
          .
-         #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
-        (exit-check . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
-        (visit . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 () (s2 (s3 s4) (s5 8)) (s3 5)))))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
         (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
-        (macro-pre-x . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
         (macro-post-x
-         #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5)))
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5)))
          .
-         #s(stx-boundary (s5 () (s1 (s2 s3) (s4 8)) (s2 5))))
-        (exit-macro . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
-        (visit . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
+         #s(stx-boundary
+            (s6 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 () (s1 (s2 s3) (s4 8)) (s2 5))))
-        (prim-let-values . #f)
-        (let-renames () . #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
-        (next-group . #f)
-        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5)))
+        (enter-prim
          .
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s1 5))))
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
+        (prim-let-values . #f)
+        (let-renames
+         ()
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
+        (next-group . #f)
+        (enter-block
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5)))
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
         (next . #f)
         (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
         (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
         (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) (s4 8))))
-         .
-         #s(stx-boundary (s0 (s1 s3) (s4 8))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
         (macro-post-x
          #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
          .
-         #s(stx-boundary (s5 s1 (s2 (s3) (s4 8)))))
+         #s(stx-boundary (s5 (s1 s3) (s4 8))))
         (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
         (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
         (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-define-values . #f)
+        (prim-define-syntaxes . #f)
         (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 5)))
-        (exit-check . #s(stx-boundary (s0 5)))
-        (block->letrec #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
-        (visit . #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
+        (prepare-env . #f)
+        (enter-bind . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s1 5))))
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 8))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 8)))
          .
-         #s(stx-boundary ((s0 5))))
-        (next . #f)
+         #s(stx-boundary (s3 (s1) (s2 8))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 8))))
         (visit . #s(stx-boundary (s0 (s1) (s2 8))))
         (resolve . #s(stx-boundary s0))
         (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
@@ -7431,344 +7435,346 @@
         (visit . #s(stx-boundary (s0 8)))
         (resolve . #s(stx-boundary s0))
         (enter-prim . #s(stx-boundary (s0 8)))
-        (prim-quote . #f)
+        (prim-quote-syntax . #f)
         (exit-prim . #s(stx-boundary (s0 8)))
         (return . #s(stx-boundary (s0 8)))
         (exit-list . #s(stx-boundary ((s0 8))))
         (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
         (return . #s(stx-boundary (s0 (s1) (s2 8))))
-        (next-group . #f)
-        (enter-list . #s(stx-boundary ((s0 5))))
         (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6)))))
+         .
+         #s(stx-boundary (s6 (s1 s3) (s4 (s5 6)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
+        (prim-define-syntaxes . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 6))))))
+        (prepare-env . #f)
+        (enter-bind . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3 6))))
+         .
+         #s(stx-boundary (s4 (s1) (s2 (s3 6)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 (s2 6)))))
+        (enter-block . #s(stx-boundary ((s0 (s1 6)))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 6))))
+         .
+         #s(stx-boundary ((s0 (s1 6)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 6))))
+        (exit-check . #s(stx-boundary (s0 (s1 6))))
+        (block->list . #s(stx-boundary ((s0 (s1 6)))))
+        (enter-list . #s(stx-boundary ((s0 (s1 6)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 6))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 6))))
+        (prim-quote-syntax . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 6))))
+        (return . #s(stx-boundary (s0 (s1 6))))
+        (exit-list . #s(stx-boundary ((s0 (s1 6)))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
+        (next . #f)
+        (exit-bind . #f)
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 5)))
         (visit . #s(stx-boundary (s0 5)))
         (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 5)))
+        (macro-pre-x . #s(stx-boundary (s0 5)))
+        (macro-post-x #s(stx-boundary (s0 6)) . #s(stx-boundary (s1 5)))
+        (exit-macro . #s(stx-boundary (s0 6)))
+        (return . #s(stx-boundary (s0 6)))
+        (visit . #s(stx-boundary (s0 6)))
         (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 5)))
-        (enter-macro . #s(stx-boundary (s0 s1 5)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
-        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
-        (exit-macro . #s(stx-boundary (s0 s1 5)))
-        (visit . #s(stx-boundary (s0 s1 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 5)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 5)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary 5))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 5)))
-        (enter-prim . #s(stx-boundary (s0 . 5)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (exit-list . #s(stx-boundary (s0 (s1 5))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
-        (return . #s(stx-boundary (s0 s1 (s2 5))))
-        (exit-list . #s(stx-boundary ((s0 s1 (s2 5)))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5)))))
-        (return
-         .
-         #s(stx-boundary (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5)))))
-        (exit-prim
+        (enter-macro . #s(stx-boundary (s0 6)))
+        (macro-pre-x . #s(stx-boundary (s0 6)))
+        (macro-post-x #s(stx-boundary 8) . #s(stx-boundary (s0 6)))
+        (exit-macro . #s(stx-boundary 8))
+        (return . #s(stx-boundary 8))
+        (exit-check . #s(stx-boundary 8))
+        (block->letrec
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
+        (visit
          .
          #s(stx-boundary
-            (s0 () (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 () (s0 (((s1) (s2 (s3) (s4 8)))) (s5 s1 (s4 5))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s1 (((s2) (s3 (s4) (s5 8)))) (s6 s2 (s5 5)))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s1 (((s2) (s3 (s4) (s5 8)))) (s6 s2 (s5 5)))))))))
-      ((begin0 '3 '5)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (enter-check . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (exit-check . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (visit . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 (s1 3) (s1 5))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 3) (s1 5))))
-        (prim-begin0 . #f)
-        (next . #f)
-        (visit . #s(stx-boundary (s0 3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 3)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 3)))
-        (return . #s(stx-boundary (s0 3)))
-        (next . #f)
-        (enter-list . #s(stx-boundary ((s0 5))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 5)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (exit-list . #s(stx-boundary ((s0 5))))
-        (exit-prim . #s(stx-boundary (s0 (s1 3) (s1 5))))
-        (return . #s(stx-boundary (s0 (s1 3) (s1 5))))
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))))
-      ((case-lambda ((x) x) ((x y) (+ x y)))
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
-        (enter-check
-         .
-         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
-        (exit-check
-         .
-         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
-        (visit . #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
-         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s2 s3))))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s1 s2)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s1 s2)))))
-        (prim-case-lambda . #f)
-        (next . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (lambda-renames
-         #s(stx-boundary (s0 s1))
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
+        (prim-letrec-syntaxes+values . #f)
+        (letrec-syntaxes-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
+          #s(stx-boundary ((s4) (s1 (s2) (s3 (s0 6))))))
+         ()
          .
-         #s(stx-boundary ((s2 s0 s1))))
-        (enter-block . #s(stx-boundary ((s0 s1 s2))))
-        (block-renames
-         #s(stx-boundary ((s0 s1 s2)))
-         .
-         #s(stx-boundary ((s0 s1 s2))))
+         #s(stx-boundary (8)))
+        (prepare-env . #f)
+        (next-group . #f)
+        (enter-list . #s(stx-boundary (8)))
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 s1 s2)))
-        (exit-check . #s(stx-boundary (s0 s1 s2)))
-        (block->list . #s(stx-boundary ((s0 s1 s2))))
-        (enter-list . #s(stx-boundary ((s0 s1 s2))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 s2)))
+        (visit . #s(stx-boundary 8))
         (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 s2 s3)))
-        (enter-macro . #s(stx-boundary (s0 s1 s2 s3)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 s2 s3)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 s2 s3))
-         .
-         #s(stx-boundary (s0 s1 s2 s3)))
-        (exit-macro . #s(stx-boundary (s0 s1 s2 s3)))
-        (visit . #s(stx-boundary (s0 s1 s2 s3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2 s3)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 s1 s2)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 s1 s2)))
-        (exit-prim . #s(stx-boundary (s0 s1 s2 s3)))
-        (return . #s(stx-boundary (s0 s1 s2 s3)))
-        (exit-list . #s(stx-boundary ((s0 s1 s2 s3))))
-        (exit-prim . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s4 s1 s2)))))
-        (return . #s(stx-boundary (s0 ((s1) s1) ((s1 s2) (s3 s4 s1 s2)))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s5 s2 s3))))))
-        (return
-         .
-         #s(stx-boundary (s0 (s1 ((s2) s2) ((s2 s3) (s4 s5 s2 s3))))))))
+        (tag . #s(stx-boundary (s0 . 8)))
+        (enter-prim . #s(stx-boundary (s0 . 8)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary ((s0 8))))
+        (tag . #s(stx-boundary (s0 () (s1 8))))
+        (exit-prim . #s(stx-boundary (s0 () (s1 8))))
+        (return . #s(stx-boundary (s0 () (s1 8))))
+        (exit-prim . #s(stx-boundary (s0 () (s0 () (s1 8)))))
+        (return . #s(stx-boundary (s0 () (s0 () (s1 8)))))
+        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))
+        (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))))
       ((let ()
          (define-syntax (ok stx)
-           (local-expand (cadr (syntax-e stx)) 'expression #f))
-         (ok 9))
+           (define-values
+            (exp opaque)
+            (syntax-local-expand-expression (cadr (syntax-e stx))))
+           opaque)
+         (#%expression (ok 9)))
        .
        ((start-top . #f)
         (visit
          .
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
+              (s0 (s3 9))))))
         (enter-check
          .
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
+              (s0 (s3 9))))))
         (exit-check
          .
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
+              (s0 (s3 9))))))
         (visit
          .
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
+              (s0 (s3 9))))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 (s6 (s7 s4)) (s8 s9) #f)) (s3 9)))))
+            (s0
+             (s1
+              ()
+              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
+              (s0 (s3 9))))))
         (prim-#%expression . #f)
         (visit
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (resolve . #s(stx-boundary s0))
         (enter-macro
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (macro-pre-x
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (macro-post-x
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9)))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9))))
          .
          #s(stx-boundary
-            (s9 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s11
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (exit-macro
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (visit
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 (s5 (s6 s3)) (s7 s8) #f)) (s2 9))))
+            (s0
+             ()
+             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
+             (s10 (s2 9)))))
         (prim-let-values . #f)
         (let-renames
          ()
          .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
         (next-group . #f)
         (enter-block
          .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
         (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9)))
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9))))
          .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f)) (s1 9))))
+         #s(stx-boundary
+            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
         (next . #f)
         (enter-check
          .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
+        (visit
+         .
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
         (resolve . #s(stx-boundary s0))
         (enter-macro
          .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
         (macro-pre-x
          .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s2)) (s6 s7) #f))))
+         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
         (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f))))
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
          .
-         #s(stx-boundary (s9 (s1 s3) (s4 (s5 (s6 s3)) (s7 s8) #f))))
+         #s(stx-boundary (s10 (s1 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
         (exit-macro
          .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+         #s(stx-boundary
+            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
         (return
          .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+         #s(stx-boundary
+            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
         (exit-check
          .
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))))
+         #s(stx-boundary
+            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
         (prim-define-syntaxes . #f)
         (rename-one
          .
-         #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 (s5 s2)) (s6 s7) #f)))))
+         #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5))))
         (prepare-env . #f)
         (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
         (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f)))
+        (enter-macro
          .
-         #s(stx-boundary (s7 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4))
+         .
+         #s(stx-boundary (s8 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 (s4 s1)) (s5 s6) #f))))
+        (enter-prim
+         .
+         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
         (prim-lambda . #f)
         (lambda-renames
          #s(stx-boundary (s0))
          .
-         #s(stx-boundary ((s1 (s2 (s3 s0)) (s4 s5) #f))))
-        (enter-block . #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
+         #s(stx-boundary ((s1 (s2 s3) (s4 (s5 (s6 s0)))) s3)))
+        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2)))
         (block-renames
-         #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f)))
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2))
          .
-         #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
+         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2)))
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
-        (exit-check . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
-        (block->list . #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
-        (enter-list . #s(stx-boundary ((s0 (s1 (s2 s3)) (s4 s5) #f))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s6))))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s6))))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0 s1) (s2 (s3 (s4 s5))))))
         (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->letrec #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
+        (visit . #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0 s1) (s2 (s3 (s4 s5))))))
+         .
+         #s(stx-boundary (s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
         (resolve . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
+        (tag . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
         (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f))
+         #s(stx-boundary (s0 s1 (s2 (s3 s4))))
          .
-         #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
+         #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 (s3 s4)) (s5 s6) #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
         (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 (s2 s3)) (s4 s5) #f)))
+        (enter-list . #s(stx-boundary (s0 (s1 (s2 s3)))))
         (next . #f)
         (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
@@ -7829,75 +7835,78 @@
         (exit-list . #s(stx-boundary (s0 (s1 s2 s3))))
         (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 s3))))
         (return . #s(stx-boundary (s0 s1 (s0 s2 s3))))
+        (exit-list . #s(stx-boundary (s0 (s1 s2 (s1 s3 s4)))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)))))
+        (return . #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)))))
+        (next-group . #f)
+        (enter-list . #s(stx-boundary (s0)))
         (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
+        (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary #f))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . #f)))
-        (enter-prim . #s(stx-boundary (s0 . #f)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 #f)))
-        (return . #s(stx-boundary (s0 #f)))
-        (exit-list . #s(stx-boundary (s0 (s1 s2 (s1 s3 s4)) (s5 s6) (s5 #f))))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
         (exit-prim
          .
-         #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)) (s5 s6) (s5 #f))))
-        (return . #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)) (s5 s6) (s5 #f))))
-        (exit-list
-         .
-         #s(stx-boundary ((s0 s1 (s0 s2 (s0 s3 s4)) (s5 s6) (s5 #f)))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1) (s2 s3 (s2 s4 (s2 s5 s1)) (s6 s7) (s6 #f)))))
+         #s(stx-boundary (s0 (((s1 s2) (s3 s4 (s3 s5 (s3 s6 s7))))) s2)))
         (return
          .
-         #s(stx-boundary (s0 (s1) (s2 s3 (s2 s4 (s2 s5 s1)) (s6 s7) (s6 #f)))))
+         #s(stx-boundary (s0 (((s1 s2) (s3 s4 (s3 s5 (s3 s6 s7))))) s2)))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0 (s1) (s2 (((s3 s4) (s5 s6 (s5 s7 (s5 s8 s1))))) s4))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (s1) (s2 (((s3 s4) (s5 s6 (s5 s7 (s5 s8 s1))))) s4))))
         (next . #f)
         (exit-bind . #f)
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 9)))
+        (enter-check . #s(stx-boundary (s0 (s1 9))))
+        (exit-check . #s(stx-boundary (s0 (s1 9))))
+        (block->letrec
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
+             ()
+             (s10 (s1 9)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
+             ()
+             (s10 (s1 9)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
+             ()
+             (s10 (s1 9)))))
+        (prim-letrec-syntaxes+values . #f)
+        (letrec-syntaxes-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5))))
+         ()
+         .
+         #s(stx-boundary ((s9 (s0 9)))))
+        (prepare-env . #f)
+        (next-group . #f)
+        (enter-list . #s(stx-boundary ((s0 (s1 9)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 9))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 9))))
+        (prim-#%expression . #f)
         (visit . #s(stx-boundary (s0 9)))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 9)))
         (macro-pre-x . #s(stx-boundary (s0 9)))
         (enter-local . #s(stx-boundary 9))
         (local-pre . #s(stx-boundary 9))
-        (enter-check . #s(stx-boundary 9))
-        (exit-check . #s(stx-boundary 9))
-        (local-post . #s(stx-boundary 9))
-        (exit-local . #s(stx-boundary 9))
-        (macro-post-x #s(stx-boundary 9) . #s(stx-boundary (s0 9)))
-        (exit-macro . #s(stx-boundary 9))
-        (return . #s(stx-boundary 9))
-        (exit-check . #s(stx-boundary 9))
-        (block->letrec
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 (s5 (s6 s3)) (s7 s8) #f)))) () 9)))
-        (prim-letrec-syntaxes+values . #f)
-        (letrec-syntaxes-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 (s5 s2)) (s6 s7) #f)))))
-         ()
-         .
-         #s(stx-boundary (9)))
-        (prepare-env . #f)
-        (next-group . #f)
-        (enter-list . #s(stx-boundary (9)))
-        (next . #f)
+        (start . #f)
         (visit . #s(stx-boundary 9))
         (resolve . #s(stx-boundary s0))
         (tag . #s(stx-boundary (s0 . 9)))
@@ -7905,6 +7914,16 @@
         (prim-#%datum . #f)
         (exit-prim . #s(stx-boundary (s0 9)))
         (return . #s(stx-boundary (s0 9)))
+        (local-post . #s(stx-boundary (s0 9)))
+        (opaque-expr . #s(stx-boundary #:opaque))
+        (exit-local . #s(stx-boundary (s0 9)))
+        (macro-post-x #s(stx-boundary #:opaque) . #s(stx-boundary (s0 9)))
+        (exit-macro . #s(stx-boundary #:opaque))
+        (visit . #s(stx-boundary #:opaque))
+        (opaque-expr . #s(stx-boundary (s0 9)))
+        (tag . #s(stx-boundary (s0 9)))
+        (exit-prim . #s(stx-boundary (s0 9)))
+        (return . #s(stx-boundary (s0 9)))
         (exit-list . #s(stx-boundary ((s0 9))))
         (tag . #s(stx-boundary (s0 () (s1 9))))
         (exit-prim . #s(stx-boundary (s0 () (s1 9))))
@@ -7913,6 +7932,1581 @@
         (return . #s(stx-boundary (s0 () (s0 () (s1 9)))))
         (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))
         (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))))
+      ((lambda (x) (define y (+ x x)) y)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
+        (enter-check . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
+        (exit-check . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
+        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3))
+         .
+         #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (visit . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
+        (prim-lambda . #f)
+        (lambda-renames
+         #s(stx-boundary (s0))
+         .
+         #s(stx-boundary ((s1 s2 (s3 s0 s0)) s2)))
+        (enter-block . #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1)))
+        (block-renames
+         #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1))
+         .
+         #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1)))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 s3 s3)))
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3 s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 s3 s3)))
+         .
+         #s(stx-boundary (s4 s1 (s2 s3 s3))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 s2 s2))))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->letrec #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
+        (visit . #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 s2 s2))))
+         .
+         #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 s1)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 s2 s2)))
+        (enter-macro . #s(stx-boundary (s0 s1 s2 s2)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 s2 s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 s2 s2))
+         .
+         #s(stx-boundary (s0 s1 s2 s2)))
+        (exit-macro . #s(stx-boundary (s0 s1 s2 s2)))
+        (visit . #s(stx-boundary (s0 s1 s2 s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 s2)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1 s1)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2 s2)))
+        (return . #s(stx-boundary (s0 s1 s2 s2)))
+        (next-group . #f)
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (exit-prim . #s(stx-boundary (s0 (((s1) (s2 s3 s4 s4))) s1)))
+        (return . #s(stx-boundary (s0 (((s1) (s2 s3 s4 s4))) s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (((s3) (s4 s5 s1 s1))) s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (((s3) (s4 s5 s1 s1))) s3))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (((s4) (s5 s6 s2 s2))) s4)))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1 (s2) (s3 (((s4) (s5 s6 s2 s2))) s4)))))))
+      ((module m racket/base (define (proc x) x) (provide proc))
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
+        (enter-check . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
+        (exit-check . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
+        (visit . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) s5) (s6 s4))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (enter-check . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 (s2 s3) s3) (s4 s2))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9)))
+         .
+         #s(stx-boundary (s12 (s8 (s9 s10) s10) (s11 s9))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s8 (s9 s10) s10) (s11 s9))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11))))
+         .
+         #s(stx-boundary
+            (s14
+             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
+             (s10 (s11 s12) s12)
+             (s13 s11))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (prim-module-begin . #f)
+        (rename-one
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) s12))
+             (s1 s2 (s13 s11)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
+         .
+         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (splice
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
+         #s(stx-boundary (s7 s8 (s9 (s10 s11) s11)))
+         #s(stx-boundary (s7 s8 (s12 s10))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-submodule . #f)
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (prim-module-begin . #f)
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (rename-one . #s(stx-boundary (s0 s1)))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-require . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 #f)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (rename-one . #s(stx-boundary (s0 #f)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 #f)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 #f)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary #f))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . #f)))
+        (enter-prim . #s(stx-boundary (s0 . #f)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (exit-list . #s(stx-boundary (s0 (s1 #f))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 #f))))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4) s4))))
+        (enter-local . #s(stx-boundary (s0 (s1 s2) s2)))
+        (local-pre . #s(stx-boundary (s0 (s1 s2) s2)))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
+         .
+         #s(stx-boundary (s0 (s1 s3) s3)))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
+         .
+         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (local-post . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (exit-local . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4))))
+         .
+         #s(stx-boundary (s5 s6 (s7 (s2 s4) s4))))
+        (exit-macro . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (return . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) s4)))))
+        (splice
+         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
+         #s(stx-boundary (s4 s5 (s6 s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (rename-one . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-define-values . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
+        (enter-local . #s(stx-boundary (s0 s1)))
+        (local-pre . #s(stx-boundary (s0 s1)))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1)))
+        (macro-pre-x . #s(stx-boundary (s0 s1)))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2 s3))))
+         .
+         #s(stx-boundary (s4 s3)))
+        (exit-macro . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (local-post . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (exit-local . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2 (s3 s4)))))
+         .
+         #s(stx-boundary (s5 s6 (s7 s4))))
+        (exit-macro . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (return . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2 (s3 s4))))))
+        (splice #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-define-values . #f)
+        (visit . #s(stx-boundary (s0 (s1) s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
+        (return . #s(stx-boundary (s0 (s1) s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (next . #f)
+        (module-lift-end-loop)
+        (next-group . #f)
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (prim-provide . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1)))
+        (macro-pre-x . #s(stx-boundary (s0 s1)))
+        (macro-post-x #s(stx-boundary (s0 s1)) . #s(stx-boundary (s2 s1)))
+        (exit-macro . #s(stx-boundary (s0 s1)))
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
+             (s9 (s10) (s11 (s12) s12))
+             (s13 s10))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
+             (s9 (s10) (s11 (s12) s12))
+             (s13 s10))))
+        (rename-one
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s11 (s12) (s13 (s14) s14))
+              (s15 s12)))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s11 (s12) (s13 (s14) s14))
+              (s15 s12)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s11 (s12) (s13 (s14) s14))
+              (s15 s12)))))))
+      ((quote-syntax (stx-quoted))
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2)))))
+        (enter-check . #s(stx-boundary (s0 (s1 (s2)))))
+        (exit-check . #s(stx-boundary (s0 (s1 (s2)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2)))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 (s1))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1))))
+        (prim-quote-syntax . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1))))
+        (return . #s(stx-boundary (s0 (s1))))
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2)))))
+        (return . #s(stx-boundary (s0 (s1 (s2)))))))
+      ((let () (define (ok x) '8) (define (second y) (ok y)) (second 5))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+        (enter-check
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+        (prim-#%expression . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (macro-pre-x
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5)))
+         .
+         #s(stx-boundary
+            (s7 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+        (prim-let-values . #f)
+        (let-renames
+         ()
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
+        (next-group . #f)
+        (enter-block
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5)))
+         .
+         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) (s4 8))))
+         .
+         #s(stx-boundary (s0 (s1 s3) (s4 8))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
+         .
+         #s(stx-boundary (s5 s1 (s2 (s3) (s4 8)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3))))
+         .
+         #s(stx-boundary (s0 (s1 s3) (s4 s3))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3))))
+         .
+         #s(stx-boundary (s5 s1 (s2 (s3) (s4 s3)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 s2)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 5)))
+        (exit-check . #s(stx-boundary (s0 5)))
+        (block->letrec
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
+          #s(stx-boundary ((s4) (s1 (s5) (s0 s5)))))
+         .
+         #s(stx-boundary ((s4 5))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
+        (enter-block . #s(stx-boundary ((s0 8))))
+        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 8)))
+        (exit-check . #s(stx-boundary (s0 8)))
+        (block->list . #s(stx-boundary ((s0 8))))
+        (enter-list . #s(stx-boundary ((s0 8))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 8)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary ((s0 8))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (return . #s(stx-boundary (s0 (s1) (s2 8))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 s1))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s1))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 s0))))
+        (enter-block . #s(stx-boundary ((s0 s1))))
+        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 s1)))
+        (exit-check . #s(stx-boundary (s0 s1)))
+        (block->list . #s(stx-boundary ((s0 s1))))
+        (enter-list . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 s2)))
+        (enter-macro . #s(stx-boundary (s0 s1 s2)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 s2))
+         .
+         #s(stx-boundary (s0 s1 s2)))
+        (exit-macro . #s(stx-boundary (s0 s1 s2)))
+        (visit . #s(stx-boundary (s0 s1 s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2)))
+        (return . #s(stx-boundary (s0 s1 s2)))
+        (exit-list . #s(stx-boundary ((s0 s1 s2))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
+        (return . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
+        (next-group . #f)
+        (enter-list . #s(stx-boundary ((s0 5))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 5)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 5)))
+        (enter-macro . #s(stx-boundary (s0 s1 5)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
+        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
+        (exit-macro . #s(stx-boundary (s0 s1 5)))
+        (visit . #s(stx-boundary (s0 s1 5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 5)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 5)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary 5))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 5)))
+        (enter-prim . #s(stx-boundary (s0 . 5)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (exit-list . #s(stx-boundary (s0 (s1 5))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
+        (return . #s(stx-boundary (s0 s1 (s2 5))))
+        (exit-list . #s(stx-boundary ((s0 s1 (s2 5)))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 8))))
+             (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) (s4 8))))
+             (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5))))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s0
+              (((s1) (s2 (s3) (s4 8))))
+              (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5)))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             ()
+             (s0
+              (((s1) (s2 (s3) (s4 8))))
+              (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5)))))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s1
+               (((s2) (s3 (s4) (s5 8))))
+               (s1 (((s6) (s3 (s7) (s8 s2 s7)))) (s8 s6 (s5 5))))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              ()
+              (s1
+               (((s2) (s3 (s4) (s5 8))))
+               (s1 (((s6) (s3 (s7) (s8 s2 s7)))) (s8 s6 (s5 5))))))))))
+      ((begin0 '3 '5)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (enter-check . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (exit-check . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 (s1 3) (s1 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 3) (s1 5))))
+        (prim-begin0 . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 3)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 3)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 3)))
+        (return . #s(stx-boundary (s0 3)))
+        (next . #f)
+        (enter-list . #s(stx-boundary ((s0 5))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 5)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (exit-list . #s(stx-boundary ((s0 5))))
+        (exit-prim . #s(stx-boundary (s0 (s1 3) (s1 5))))
+        (return . #s(stx-boundary (s0 (s1 3) (s1 5))))
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 3) (s2 5)))))))
+      ((module m racket/base 'done)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 s1 s2 (s3 s4))))
+        (enter-check . #s(stx-boundary (s0 s1 s2 (s3 s4))))
+        (exit-check . #s(stx-boundary (s0 s1 s2 (s3 s4))))
+        (visit . #s(stx-boundary (s0 s1 s2 (s3 s4))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2 (s3 s4))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (rename-one . #s(stx-boundary (s0 s1)))
+        (enter-check . #s(stx-boundary (s0 s1)))
+        (exit-check . #s(stx-boundary (s0 s1)))
+        (tag . #s(stx-boundary (s0 (s1 s2))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2))))
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8)))
+         .
+         #s(stx-boundary (s9 (s3 s8))))
+        (exit-macro
+         .
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
+        (return
+         .
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
+        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)) (s3 s8))))
+        (macro-post-x
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10))))
+         .
+         #s(stx-boundary (s11 (s3 s4 (s5 s6) (s7 s8) (s9 #f)) (s5 s10))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (prim-module-begin . #f)
+        (rename-one
+         .
+         #s(stx-boundary
+            (s0 (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f))) (s1 s2 (s5 s10)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
+         .
+         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (splice
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
+         #s(stx-boundary (s7 s8 (s2 s9))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-submodule . #f)
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (prim-module-begin . #f)
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (rename-one . #s(stx-boundary (s0 s1)))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-require . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 #f)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (rename-one . #s(stx-boundary (s0 #f)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 #f)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 #f)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary #f))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . #f)))
+        (enter-prim . #s(stx-boundary (s0 . #f)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (exit-list . #s(stx-boundary (s0 (s1 #f))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 #f))))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
+        (enter-local . #s(stx-boundary (s0 s1)))
+        (local-pre . #s(stx-boundary (s0 s1)))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (local-post . #s(stx-boundary (s0 s1)))
+        (exit-local . #s(stx-boundary (s0 s1)))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2 s3))))
+         .
+         #s(stx-boundary (s4 s1 (s2 s3))))
+        (exit-macro . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (return . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2 s3)))))
+        (splice #s(stx-boundary (s0 (s1 s2))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5))
+         .
+         #s(stx-boundary (s6 (s3 s4))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (visit . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (return . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1 () (s2 s3)) s4)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 () (s1 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 () (s1 s2))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary ()) . #s(stx-boundary ((s0 s1))))
+        (enter-block . #s(stx-boundary ((s0 s1))))
+        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 s1)))
+        (exit-check . #s(stx-boundary (s0 s1)))
+        (block->list . #s(stx-boundary ((s0 s1))))
+        (enter-list . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-quote . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (exit-list . #s(stx-boundary ((s0 s1))))
+        (exit-prim . #s(stx-boundary (s0 () (s1 s2))))
+        (return . #s(stx-boundary (s0 () (s1 s2))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 (s1 () (s2 s3)) s4)))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (return . #s(stx-boundary (s0 s1 (s2 () (s3 s4)) s5)))
+        (module-lift-end-loop)
+        (next-group . #f)
+        (next . #f)
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
+             (s7 s9 (s10 () (s3 s11)) s12))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s0 (s5 s6) (s7 s8 (s3 #f))))
+             (s7 s9 (s10 () (s3 s11)) s12))))
+        (rename-one
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s9 s11 (s12 () (s5 s13)) s14)))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s9 s11 (s12 () (s5 s13)) s14)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             s1
+             s2
+             (s3
+              (s0 s4 (s5 s6) (s3 (s7 s8) (s9 s10 (s5 #f))))
+              (s9 s11 (s12 () (s5 s13)) s14)))))))
+      ((#%stratified-body
+        (define (first z) z)
+        (define (ok x) (second x))
+        (define (second y) 8)
+        (ok (first 5))
+        (define more 'oops))
+       .
+       ((start-top . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              (s2 (s3 s4) s4)
+              (s2 (s5 s6) (s7 s6))
+              (s2 (s7 s8) 8)
+              (s5 (s3 5))
+              (s2 s9 (s10 s11))))))
+        (enter-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              (s2 (s3 s4) s4)
+              (s2 (s5 s6) (s7 s6))
+              (s2 (s7 s8) 8)
+              (s5 (s3 5))
+              (s2 s9 (s10 s11))))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              (s2 (s3 s4) s4)
+              (s2 (s5 s6) (s7 s6))
+              (s2 (s7 s8) 8)
+              (s5 (s3 5))
+              (s2 s9 (s10 s11))))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              (s2 (s3 s4) s4)
+              (s2 (s5 s6) (s7 s6))
+              (s2 (s7 s8) 8)
+              (s5 (s3 5))
+              (s2 s9 (s10 s11))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1
+              (s2 (s3 s4) s4)
+              (s2 (s5 s6) (s7 s6))
+              (s2 (s7 s8) 8)
+              (s5 (s3 5))
+              (s2 s9 (s10 s11))))))
+        (prim-#%expression . #f)
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (s1 (s2 s3) s3)
+             (s1 (s4 s5) (s6 s5))
+             (s1 (s6 s7) 8)
+             (s4 (s2 5))
+             (s1 s8 (s9 s10)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (s1 (s2 s3) s3)
+             (s1 (s4 s5) (s6 s5))
+             (s1 (s6 s7) 8)
+             (s4 (s2 5))
+             (s1 s8 (s9 s10)))))
+        (prim-#%stratified . #f)
+        (enter-block
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) s2)
+             (s0 (s3 s4) (s5 s4))
+             (s0 (s5 s6) 8)
+             (s3 (s1 5))
+             (s0 s7 (s8 s9)))))
+        (block-renames
+         #s(stx-boundary
+            ((s0 (s1 s2) s2)
+             (s0 (s3 s4) (s5 s4))
+             (s0 (s5 s6) 8)
+             (s3 (s1 5))
+             (s0 s7 (s8 s9))))
+         .
+         #s(stx-boundary
+            ((s0 (s1 s2) s2)
+             (s0 (s3 s4) (s5 s4))
+             (s0 (s5 s6) 8)
+             (s3 (s1 5))
+             (s0 s7 (s8 s9)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
+        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
+         .
+         #s(stx-boundary (s0 (s1 s3) s3)))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
+         .
+         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3))))
+         .
+         #s(stx-boundary (s0 (s1 s3) (s4 s3))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3))))
+         .
+         #s(stx-boundary (s5 s1 (s2 (s3) (s4 s3)))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 s2)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 s2) 8)))
+        (visit . #s(stx-boundary (s0 (s1 s2) 8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 (s1 s2) 8)))
+        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) 8)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 (s3) 8)))
+         .
+         #s(stx-boundary (s0 (s1 s3) 8)))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
+        (return . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) 8))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1) (s2 (s3) 8)))
+         .
+         #s(stx-boundary (s4 s1 (s2 (s3) 8))))
+        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
+        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) 8))))
+        (prim-define-values . #f)
+        (rename-one . #s(stx-boundary ((s0) (s1 (s2) 8))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 5))))
+        (exit-check . #s(stx-boundary (s0 (s1 5))))
+        (block->letrec
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
+             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
+        (visit
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
+             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim
+         .
+         #s(stx-boundary
+            (s0
+             (((s1) (s2 (s3) s3)) ((s4) (s2 (s5) (s6 s5))) ((s6) (s2 (s7) 8)))
+             (s8 (s4 (s1 5)) (s9 s10 (s11 s12))))))
+        (prim-letrec-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) (s1 (s2) s2)))
+          #s(stx-boundary ((s3) (s1 (s4) (s5 s4))))
+          #s(stx-boundary ((s5) (s1 (s6) 8))))
+         .
+         #s(stx-boundary ((s7 (s3 (s0 5)) (s8 s9 (s10 s11))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) s1)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0)))
+        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
+        (return . #s(stx-boundary (s0 (s1) s1)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 s1))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s1))))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 s0))))
+        (enter-block . #s(stx-boundary ((s0 s1))))
+        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 s1)))
+        (exit-check . #s(stx-boundary (s0 s1)))
+        (block->list . #s(stx-boundary ((s0 s1))))
+        (enter-list . #s(stx-boundary ((s0 s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 s2)))
+        (enter-macro . #s(stx-boundary (s0 s1 s2)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 s2))
+         .
+         #s(stx-boundary (s0 s1 s2)))
+        (exit-macro . #s(stx-boundary (s0 s1 s2)))
+        (visit . #s(stx-boundary (s0 s1 s2)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 s2)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (exit-list . #s(stx-boundary (s0 s1)))
+        (exit-prim . #s(stx-boundary (s0 s1 s2)))
+        (return . #s(stx-boundary (s0 s1 s2)))
+        (exit-list . #s(stx-boundary ((s0 s1 s2))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
+        (return . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) 8)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) 8)))
+        (prim-lambda . #f)
+        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (8)))
+        (enter-block . #s(stx-boundary (8)))
+        (block-renames #s(stx-boundary (8)) . #s(stx-boundary (8)))
+        (next . #f)
+        (enter-check . #s(stx-boundary 8))
+        (exit-check . #s(stx-boundary 8))
+        (block->list . #s(stx-boundary (8)))
+        (enter-list . #s(stx-boundary (8)))
+        (next . #f)
+        (visit . #s(stx-boundary 8))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 8)))
+        (enter-prim . #s(stx-boundary (s0 . 8)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 8)))
+        (return . #s(stx-boundary (s0 8)))
+        (exit-list . #s(stx-boundary ((s0 8))))
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
+        (return . #s(stx-boundary (s0 (s1) (s2 8))))
+        (next-group . #f)
+        (enter-list . #s(stx-boundary ((s0 (s1 (s2 5)) (s3 s4 (s5 s6))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 (s2 5)) (s3 s4 (s5 s6)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2 5)) (s3 s4 (s5 s6)))))
+        (prim-#%stratified . #f)
+        (enter-block . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
+        (block-renames
+         #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5))))
+         .
+         #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
+        (next . #f)
+        (enter-check . #s(stx-boundary (s0 (s1 5))))
+        (exit-check . #s(stx-boundary (s0 (s1 5))))
+        (block->list . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
+        (enter-list . #s(stx-boundary ((s0 (s1 5)) (s2 s3 (s4 s5)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1 5))))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 (s2 5))))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 5))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 5))))
+        (macro-post-x
+         #s(stx-boundary (s0 s1 (s2 5)))
+         .
+         #s(stx-boundary (s0 s1 (s2 5))))
+        (exit-macro . #s(stx-boundary (s0 s1 (s2 5))))
+        (visit . #s(stx-boundary (s0 s1 (s2 5))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 5))))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 (s1 5))))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 5)))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 s1 5)))
+        (enter-macro . #s(stx-boundary (s0 s1 5)))
+        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
+        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
+        (exit-macro . #s(stx-boundary (s0 s1 5)))
+        (visit . #s(stx-boundary (s0 s1 5)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 5)))
+        (prim-#%app . #f)
+        (enter-list . #s(stx-boundary (s0 5)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
+        (return . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary 5))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 5)))
+        (enter-prim . #s(stx-boundary (s0 . 5)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 5)))
+        (return . #s(stx-boundary (s0 5)))
+        (exit-list . #s(stx-boundary (s0 (s1 5))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
+        (return . #s(stx-boundary (s0 s1 (s2 5))))
+        (exit-list . #s(stx-boundary (s0 (s1 s2 (s3 5)))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s3 5)))))
+        (return . #s(stx-boundary (s0 s1 (s0 s2 (s3 5)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))))
       ((let ()
          (define (first z) z)
          (define (ok x) (second x))
@@ -8484,405 +10078,6 @@
                  (() (s10 (s8 s11 (s12 #:opaque)) (s8 s13)))
                  ((s9) (s3 (s14) (s12 8))))
                 (s8 s6 (s8 s2 (s12 5)))))))))))
-      ((#%variable-reference __z)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2))))
-        (enter-check . #s(stx-boundary (s0 (s1 s2))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2))))
-        (visit . #s(stx-boundary (s0 (s1 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 s2))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1)))
-        (prim-#%variable-reference . #f)
-        (exit-prim . #s(stx-boundary (s0 s1)))
-        (return . #s(stx-boundary (s0 s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1 s2))))
-        (return . #s(stx-boundary (s0 (s1 s2))))))
-      ((let ()
-         (define-syntax (ok stx)
-           (define-values
-            (exp opaque)
-            (syntax-local-expand-expression (cadr (syntax-e stx))))
-           opaque)
-         (#%expression (ok 9)))
-       .
-       ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
-              (s0 (s3 9))))))
-        (enter-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
-              (s0 (s3 9))))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
-              (s0 (s3 9))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
-              (s0 (s3 9))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 (s6 s7) (s8 (s9 (s10 s4)))) s7)
-              (s0 (s3 9))))))
-        (prim-#%expression . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9))))
-         .
-         #s(stx-boundary
-            (s11
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)
-             (s10 (s2 9)))))
-        (prim-let-values . #f)
-        (let-renames
-         ()
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
-        (next-group . #f)
-        (enter-block
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
-        (block-renames
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9))))
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5) (s9 (s1 9)))))
-        (next . #f)
-        (enter-check
-         .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
-        (visit
-         .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 (s1 s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5)))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
-         .
-         #s(stx-boundary (s10 (s1 s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0 (s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6))))
-        (prim-define-syntaxes . #f)
-        (rename-one
-         .
-         #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5))))
-        (prepare-env . #f)
-        (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (macro-pre-x
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4))
-         .
-         #s(stx-boundary (s8 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (exit-macro
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary (s0 (s1) (s2 (s3 s4) (s5 (s6 (s7 s1)))) s4)))
-        (prim-lambda . #f)
-        (lambda-renames
-         #s(stx-boundary (s0))
-         .
-         #s(stx-boundary ((s1 (s2 s3) (s4 (s5 (s6 s0)))) s3)))
-        (enter-block . #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2)))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2))
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 (s4 (s5 s6)))) s2)))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s6))))))
-        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 (s5 s6))))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0 s1) (s2 (s3 (s4 s5))))))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->letrec #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
-        (visit . #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (((s1 s2) (s3 (s4 (s5 s6))))) s2)))
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0 s1) (s2 (s3 (s4 s5))))))
-         .
-         #s(stx-boundary (s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3 s4))))
-         .
-         #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 (s3 s4)))))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 (s2 s3)))))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 s2))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 s3))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 s3)))
-         .
-         #s(stx-boundary (s0 s1 (s2 s3))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3))))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 s2))))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 s2)))
-        (enter-macro . #s(stx-boundary (s0 s1 s2)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 s2))
-         .
-         #s(stx-boundary (s0 s1 s2)))
-        (exit-macro . #s(stx-boundary (s0 s1 s2)))
-        (visit . #s(stx-boundary (s0 s1 s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 s1)))
-        (exit-prim . #s(stx-boundary (s0 s1 s2)))
-        (return . #s(stx-boundary (s0 s1 s2)))
-        (exit-list . #s(stx-boundary (s0 (s1 s2 s3))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 s3))))
-        (return . #s(stx-boundary (s0 s1 (s0 s2 s3))))
-        (exit-list . #s(stx-boundary (s0 (s1 s2 (s1 s3 s4)))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)))))
-        (return . #s(stx-boundary (s0 s1 (s0 s2 (s0 s3 s4)))))
-        (next-group . #f)
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (((s1 s2) (s3 s4 (s3 s5 (s3 s6 s7))))) s2)))
-        (return
-         .
-         #s(stx-boundary (s0 (((s1 s2) (s3 s4 (s3 s5 (s3 s6 s7))))) s2)))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0 (s1) (s2 (((s3 s4) (s5 s6 (s5 s7 (s5 s8 s1))))) s4))))
-        (return
-         .
-         #s(stx-boundary
-            (s0 (s1) (s2 (((s3 s4) (s5 s6 (s5 s7 (s5 s8 s1))))) s4))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 9))))
-        (exit-check . #s(stx-boundary (s0 (s1 9))))
-        (block->letrec
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
-             ()
-             (s10 (s1 9)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
-             ()
-             (s10 (s1 9)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 (s5 s6) (s7 (s8 (s9 s3)))) s6)))
-             ()
-             (s10 (s1 9)))))
-        (prim-letrec-syntaxes+values . #f)
-        (letrec-syntaxes-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 (s4 s5) (s6 (s7 (s8 s2)))) s5))))
-         ()
-         .
-         #s(stx-boundary ((s9 (s0 9)))))
-        (prepare-env . #f)
-        (next-group . #f)
-        (enter-list . #s(stx-boundary ((s0 (s1 9)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 9))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 9))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 9)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 9)))
-        (macro-pre-x . #s(stx-boundary (s0 9)))
-        (enter-local . #s(stx-boundary 9))
-        (local-pre . #s(stx-boundary 9))
-        (start . #f)
-        (visit . #s(stx-boundary 9))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 9)))
-        (enter-prim . #s(stx-boundary (s0 . 9)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 9)))
-        (return . #s(stx-boundary (s0 9)))
-        (local-post . #s(stx-boundary (s0 9)))
-        (opaque-expr . #s(stx-boundary #:opaque))
-        (exit-local . #s(stx-boundary (s0 9)))
-        (macro-post-x #s(stx-boundary #:opaque) . #s(stx-boundary (s0 9)))
-        (exit-macro . #s(stx-boundary #:opaque))
-        (visit . #s(stx-boundary #:opaque))
-        (opaque-expr . #s(stx-boundary (s0 9)))
-        (tag . #s(stx-boundary (s0 9)))
-        (exit-prim . #s(stx-boundary (s0 9)))
-        (return . #s(stx-boundary (s0 9)))
-        (exit-list . #s(stx-boundary ((s0 9))))
-        (tag . #s(stx-boundary (s0 () (s1 9))))
-        (exit-prim . #s(stx-boundary (s0 () (s1 9))))
-        (return . #s(stx-boundary (s0 () (s1 9))))
-        (exit-prim . #s(stx-boundary (s0 () (s0 () (s1 9)))))
-        (return . #s(stx-boundary (s0 () (s0 () (s1 9)))))
-        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))
-        (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 9))))))))
       ((letrec-values (((x) __y) ((y z) __w)) __x)
        .
        ((start-top . #f)
@@ -8953,253 +10148,6 @@
          .
          #s(stx-boundary
             (s0 (s1 (((s2) (s3 . s4)) ((s5 s6) (s3 . s7))) (s3 . s8)))))))
-      ((lambda (x) (define y (+ x x)) y)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
-        (enter-check . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
-        (exit-check . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
-        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 s4 (s5 s2 s2)) s4))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3))
-         .
-         #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (visit . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s3 (s4 s1 s1)) s3)))
-        (prim-lambda . #f)
-        (lambda-renames
-         #s(stx-boundary (s0))
-         .
-         #s(stx-boundary ((s1 s2 (s3 s0 s0)) s2)))
-        (enter-block . #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1)))
-        (block-renames
-         #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1))
-         .
-         #s(stx-boundary ((s0 s1 (s2 s3 s3)) s1)))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 s3 s3)))
-         .
-         #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (return . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 s3 s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 s3 s3)))
-         .
-         #s(stx-boundary (s4 s1 (s2 s3 s3))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 s3 s3))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 s2 s2))))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->letrec #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
-        (visit . #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (((s1) (s2 s3 s3))) s1)))
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) (s1 s2 s2))))
-         .
-         #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 s1 s1)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 s2 s2)))
-        (enter-macro . #s(stx-boundary (s0 s1 s2 s2)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 s2 s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 s2 s2))
-         .
-         #s(stx-boundary (s0 s1 s2 s2)))
-        (exit-macro . #s(stx-boundary (s0 s1 s2 s2)))
-        (visit . #s(stx-boundary (s0 s1 s2 s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2 s2)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 s1 s1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 s1 s1)))
-        (exit-prim . #s(stx-boundary (s0 s1 s2 s2)))
-        (return . #s(stx-boundary (s0 s1 s2 s2)))
-        (next-group . #f)
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim . #s(stx-boundary (s0 (((s1) (s2 s3 s4 s4))) s1)))
-        (return . #s(stx-boundary (s0 (((s1) (s2 s3 s4 s4))) s1)))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (((s3) (s4 s5 s1 s1))) s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (((s3) (s4 s5 s1 s1))) s3))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (((s4) (s5 s6 s2 s2))) s4)))))
-        (return
-         .
-         #s(stx-boundary (s0 (s1 (s2) (s3 (((s4) (s5 s6 s2 s2))) s4)))))))
-      ((if 1 2 3)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 1 2 3))))
-        (enter-check . #s(stx-boundary (s0 (s1 1 2 3))))
-        (exit-check . #s(stx-boundary (s0 (s1 1 2 3))))
-        (visit . #s(stx-boundary (s0 (s1 1 2 3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 1 2 3))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 1 2 3)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 1 2 3)))
-        (prim-if . #f)
-        (visit . #s(stx-boundary 1))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 1)))
-        (enter-prim . #s(stx-boundary (s0 . 1)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 1)))
-        (return . #s(stx-boundary (s0 1)))
-        (next . #f)
-        (visit . #s(stx-boundary 2))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 2)))
-        (enter-prim . #s(stx-boundary (s0 . 2)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 2)))
-        (return . #s(stx-boundary (s0 2)))
-        (next . #f)
-        (visit . #s(stx-boundary 3))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 3)))
-        (enter-prim . #s(stx-boundary (s0 . 3)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 3)))
-        (return . #s(stx-boundary (s0 3)))
-        (exit-prim . #s(stx-boundary (s0 (s1 1) (s1 2) (s1 3))))
-        (return . #s(stx-boundary (s0 (s1 1) (s1 2) (s1 3))))
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 1) (s2 2) (s2 3)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 1) (s2 2) (s2 3)))))))
-      ((begin 1 __x (+ 3 4))
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
-        (enter-check . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
-        (exit-check . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
-        (visit . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 1 s2 (s3 3 4)))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 1 s1 (s2 3 4))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 1 s1 (s2 3 4))))
-        (prim-begin . #f)
-        (enter-list . #s(stx-boundary (1 s0 (s1 3 4))))
-        (next . #f)
-        (visit . #s(stx-boundary 1))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 1)))
-        (enter-prim . #s(stx-boundary (s0 . 1)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 1)))
-        (return . #s(stx-boundary (s0 1)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . s1)))
-        (enter-prim . #s(stx-boundary (s0 . s1)))
-        (prim-#%top . #f)
-        (exit-prim . #s(stx-boundary (s0 . s1)))
-        (return . #s(stx-boundary (s0 . s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 3 4)))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 3 4)))
-        (enter-macro . #s(stx-boundary (s0 s1 3 4)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 3 4)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 3 4))
-         .
-         #s(stx-boundary (s0 s1 3 4)))
-        (exit-macro . #s(stx-boundary (s0 s1 3 4)))
-        (visit . #s(stx-boundary (s0 s1 3 4)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 3 4)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 3 4)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary 3))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 3)))
-        (enter-prim . #s(stx-boundary (s0 . 3)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 3)))
-        (return . #s(stx-boundary (s0 3)))
-        (next . #f)
-        (visit . #s(stx-boundary 4))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 4)))
-        (enter-prim . #s(stx-boundary (s0 . 4)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 4)))
-        (return . #s(stx-boundary (s0 4)))
-        (exit-list . #s(stx-boundary (s0 (s1 3) (s1 4))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 3) (s2 4))))
-        (return . #s(stx-boundary (s0 s1 (s2 3) (s2 4))))
-        (exit-list . #s(stx-boundary ((s0 1) (s1 . s2) (s3 s4 (s0 3) (s0 4)))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1 1) (s2 . s3) (s4 s5 (s1 3) (s1 4)))))
-        (return . #s(stx-boundary (s0 (s1 1) (s2 . s3) (s4 s5 (s1 3) (s1 4)))))
-        (exit-prim
-         .
-         #s(stx-boundary (s0 (s1 (s2 1) (s3 . s4) (s5 s6 (s2 3) (s2 4))))))
-        (return
-         .
-         #s(stx-boundary (s0 (s1 (s2 1) (s3 . s4) (s5 s6 (s2 3) (s2 4))))))))
       ((#%stratified-body
         (define (first z) z)
         (define (ok x) (second x))
@@ -9602,409 +10550,384 @@
                ((s5) (s3 (s6) (s7 s8 s6)))
                ((s8) (s3 (s9) (s10 8))))
               (s7 s5 (s7 s2 (s10 5)))))))))
-      ((let () (define (ok x) '8) (define (second y) (ok y)) (second 5))
+      ((set! __x 99)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 s2 99))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2 99))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2 99))))
+        (visit . #s(stx-boundary (s0 (s1 s2 99))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 99))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 s1 99)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 s1 99)))
+        (prim-set! . #f)
+        (resolve . #s(stx-boundary s0))
+        (next . #f)
+        (visit . #s(stx-boundary 99))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . 99)))
+        (enter-prim . #s(stx-boundary (s0 . 99)))
+        (prim-#%datum . #f)
+        (exit-prim . #s(stx-boundary (s0 99)))
+        (return . #s(stx-boundary (s0 99)))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 99))))
+        (return . #s(stx-boundary (s0 s1 (s2 99))))
+        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 99)))))
+        (return . #s(stx-boundary (s0 (s1 s2 (s3 99)))))))
+      ((let-values (((x) __y) ((y z) __w)) __x)
+       .
+       ((start-top . #f)
+        (visit . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
+        (enter-check . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
+        (exit-check . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
+        (visit . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (((s2) s3) ((s4 s5) s6)) s7))))
+        (prim-#%expression . #f)
+        (visit . #s(stx-boundary (s0 (((s1) s2) ((s3 s4) s5)) s6)))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (((s1) s2) ((s3 s4) s5)) s6)))
+        (prim-let-values . #f)
+        (let-renames
+         (#s(stx-boundary ((s0) s1)) #s(stx-boundary ((s2 s3) s4)))
+         .
+         #s(stx-boundary (s5)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (next-group . #f)
+        (enter-block . #s(stx-boundary (s0)))
+        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
+        (next . #f)
+        (enter-check . #s(stx-boundary s0))
+        (exit-check . #s(stx-boundary s0))
+        (block->list . #s(stx-boundary (s0)))
+        (enter-list . #s(stx-boundary (s0)))
+        (next . #f)
+        (visit . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (resolve . #s(stx-boundary s0))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (exit-list . #s(stx-boundary ((s0 . s1))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 . s3)) ((s4 s5) (s2 . s6))) (s2 . s7))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (((s1) (s2 . s3)) ((s4 s5) (s2 . s6))) (s2 . s7))))
+        (exit-prim
+         .
+         #s(stx-boundary
+            (s0 (s1 (((s2) (s3 . s4)) ((s5 s6) (s3 . s7))) (s3 . s8)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0 (s1 (((s2) (s3 . s4)) ((s5 s6) (s3 . s7))) (s3 . s8)))))))
+      ((module m racket/base
+         (define-syntax (ok stx) (quote-syntax 8))
+         (ok)
+         (list (ok) (ok)))
        .
        ((start-top . #f)
         (visit
          .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
         (enter-check
          .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
         (exit-check
          .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
         (visit
          .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
+         #s(stx-boundary (s0 s1 s2 (s3 (s4 s5) (s6 8)) (s4) (s7 (s4) (s4)))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (enter-check
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (visit . #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (macro-pre-x
+         .
+         #s(stx-boundary (s0 (s1 (s2 s3) (s4 8)) (s2) (s5 (s2) (s2)))))
+        (macro-post-x
          #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s7) (s3 s7)) (s6 5)))))
-        (prim-#%expression . #f)
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9))))
+         .
+         #s(stx-boundary (s13 (s8 (s9 s10) (s11 8)) (s9) (s12 (s9) (s9)))))
+        (exit-macro
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9)))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9)))))
         (visit
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9)))))
         (resolve . #s(stx-boundary s0))
         (enter-macro
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9)))))
         (macro-pre-x
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4) (s5 s6) (s7 #f))
+             (s8 (s9 s10) (s11 8))
+             (s9)
+             (s12 (s9) (s9)))))
         (macro-post-x
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5)))
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11)))))
          .
          #s(stx-boundary
-            (s7 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s15
+             (s3 s4 (s5 s6) (s7 s8) (s9 #f))
+             (s10 (s11 s12) (s13 8))
+             (s11)
+             (s14 (s11) (s11)))))
         (exit-macro
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
+        (return
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
+        (exit-check
+         .
+         #s(stx-boundary
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
         (visit
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
         (resolve . #s(stx-boundary s0))
         (enter-prim
          .
          #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s6) (s2 s6)) (s5 5))))
-        (prim-let-values . #f)
-        (let-renames
-         ()
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
-        (next-group . #f)
-        (enter-block
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5)))
-         .
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s5) (s1 s5)) (s4 5))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) (s4 8))))
-         .
-         #s(stx-boundary (s0 (s1 s3) (s4 8))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 8)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
-         .
-         #s(stx-boundary (s5 s1 (s2 (s3) (s4 8)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3))))
-         .
-         #s(stx-boundary (s0 (s1 s3) (s4 s3))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) (s4 s3)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3))))
-         .
-         #s(stx-boundary (s5 s1 (s2 (s3) (s4 s3)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 s3)))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 s2)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 5)))
-        (exit-check . #s(stx-boundary (s0 5)))
-        (block->letrec
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
-        (visit
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
+        (prim-module-begin . #f)
+        (rename-one
          .
          #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
+            (s0
+             (s1 s2 (s3 s4 (s5 s6) (s7 s8) (s9 #f)))
+             (s1 s2 (s10 (s11 s12) (s13 8)))
+             (s1 s2 (s11))
+             (s1 s2 (s14 (s11) (s11))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim
+        (enter-macro
          .
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s6) (s1 s6)))) (s5 5))))
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
-          #s(stx-boundary ((s4) (s1 (s5) (s0 s5)))))
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (macro-pre-x
          .
-         #s(stx-boundary ((s4 5))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
+         #s(stx-boundary (s0 s1 (s2 s3 (s4 s5) (s6 s7) (s8 #f)))))
+        (enter-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-pre . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (start . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
-        (enter-block . #s(stx-boundary ((s0 8))))
-        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 8)))
-        (exit-check . #s(stx-boundary (s0 8)))
-        (block->list . #s(stx-boundary ((s0 8))))
-        (enter-list . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 8)))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (local-post . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (exit-local . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f))))
+         .
+         #s(stx-boundary (s8 s9 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (exit-macro . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (visit . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 8)))
-        (prim-quote . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary ((s0 8))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (return . #s(stx-boundary (s0 (s1) (s2 8))))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2 (s3 s4) (s5 s6) (s7 #f)))))
+        (splice
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f)))
+         #s(stx-boundary (s7 s8 (s9 (s10 s11) (s12 8))))
+         #s(stx-boundary (s7 s8 (s10)))
+         #s(stx-boundary (s7 s8 (s13 (s10) (s10)))))
         (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 s1))))
+        (visit . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 s1))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 s0))))
-        (enter-block . #s(stx-boundary ((s0 s1))))
-        (block-renames #s(stx-boundary ((s0 s1))) . #s(stx-boundary ((s0 s1))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 s1)))
-        (exit-check . #s(stx-boundary (s0 s1)))
-        (block->list . #s(stx-boundary ((s0 s1))))
-        (enter-list . #s(stx-boundary ((s0 s1))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (rename-one . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-submodule . #f)
+        (enter-prim . #s(stx-boundary (s0 s1 (s2 s3) (s4 s5) (s6 #f))))
+        (prim-module . #f)
+        (prepare-env . #f)
+        (tag . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (exit-check . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (visit . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
+        (prim-module-begin . #f)
+        (rename-one . #s(stx-boundary (s0 (s1 s2) (s3 #f))))
         (next . #f)
         (visit . #s(stx-boundary (s0 s1)))
         (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 s2)))
-        (enter-macro . #s(stx-boundary (s0 s1 s2)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 s2))
-         .
-         #s(stx-boundary (s0 s1 s2)))
-        (exit-macro . #s(stx-boundary (s0 s1 s2)))
-        (visit . #s(stx-boundary (s0 s1 s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 s2)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 s1)))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
+        (return . #s(stx-boundary (s0 s1)))
+        (rename-one . #s(stx-boundary (s0 s1)))
+        (enter-prim . #s(stx-boundary (s0 s1)))
+        (prim-require . #f)
+        (exit-prim . #s(stx-boundary (s0 s1)))
         (next . #f)
-        (visit . #s(stx-boundary s0))
+        (visit . #s(stx-boundary (s0 #f)))
         (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0 s1)))
-        (exit-prim . #s(stx-boundary (s0 s1 s2)))
-        (return . #s(stx-boundary (s0 s1 s2)))
-        (exit-list . #s(stx-boundary ((s0 s1 s2))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
-        (return . #s(stx-boundary (s0 (s1) (s2 s3 s1))))
+        (enter-prim . #s(stx-boundary (s0 #f)))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (rename-one . #s(stx-boundary (s0 #f)))
+        (module-lift-end-loop)
         (next-group . #f)
-        (enter-list . #s(stx-boundary ((s0 5))))
         (next . #f)
-        (visit . #s(stx-boundary (s0 5)))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 #f)))
         (resolve . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 5)))
-        (enter-macro . #s(stx-boundary (s0 s1 5)))
-        (macro-pre-x . #s(stx-boundary (s0 s1 5)))
-        (macro-post-x #s(stx-boundary (s0 s1 5)) . #s(stx-boundary (s0 s1 5)))
-        (exit-macro . #s(stx-boundary (s0 s1 5)))
-        (visit . #s(stx-boundary (s0 s1 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 5)))
+        (tag . #s(stx-boundary (s0 s1 #f)))
+        (enter-prim . #s(stx-boundary (s0 s1 #f)))
         (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 5)))
+        (enter-list . #s(stx-boundary (s0 #f)))
         (next . #f)
         (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
         (variable #s(stx-boundary s0) . #s(stx-boundary s0))
         (return . #s(stx-boundary s0))
         (next . #f)
-        (visit . #s(stx-boundary 5))
+        (visit . #s(stx-boundary #f))
         (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 5)))
-        (enter-prim . #s(stx-boundary (s0 . 5)))
+        (tag . #s(stx-boundary (s0 . #f)))
+        (enter-prim . #s(stx-boundary (s0 . #f)))
         (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 5)))
-        (return . #s(stx-boundary (s0 5)))
-        (exit-list . #s(stx-boundary (s0 (s1 5))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 5))))
-        (return . #s(stx-boundary (s0 s1 (s2 5))))
-        (exit-list . #s(stx-boundary ((s0 s1 (s2 5)))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 8))))
-             (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 8))))
-             (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s0
-              (((s1) (s2 (s3) (s4 8))))
-              (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5)))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s0
-              (((s1) (s2 (s3) (s4 8))))
-              (s0 (((s5) (s2 (s6) (s7 s1 s6)))) (s7 s5 (s4 5)))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s1
-               (((s2) (s3 (s4) (s5 8))))
-               (s1 (((s6) (s3 (s7) (s8 s2 s7)))) (s8 s6 (s5 5))))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s1
-               (((s2) (s3 (s4) (s5 8))))
-               (s1 (((s6) (s3 (s7) (s8 s2 s7)))) (s8 s6 (s5 5))))))))))
-      ((#%plain-app 1 2)
-       .
-       ((start-top . #f)
-        (visit . #s(stx-boundary (s0 (s1 1 2))))
-        (enter-check . #s(stx-boundary (s0 (s1 1 2))))
-        (exit-check . #s(stx-boundary (s0 (s1 1 2))))
-        (visit . #s(stx-boundary (s0 (s1 1 2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 1 2))))
-        (prim-#%expression . #f)
-        (visit . #s(stx-boundary (s0 1 2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 1 2)))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (1 2)))
-        (next . #f)
-        (visit . #s(stx-boundary 1))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 1)))
-        (enter-prim . #s(stx-boundary (s0 . 1)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 1)))
-        (return . #s(stx-boundary (s0 1)))
-        (next . #f)
-        (visit . #s(stx-boundary 2))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 2)))
-        (enter-prim . #s(stx-boundary (s0 . 2)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 2)))
-        (return . #s(stx-boundary (s0 2)))
-        (exit-list . #s(stx-boundary ((s0 1) (s0 2))))
-        (exit-prim . #s(stx-boundary (s0 (s1 1) (s1 2))))
-        (return . #s(stx-boundary (s0 (s1 1) (s1 2))))
-        (exit-prim . #s(stx-boundary (s0 (s1 (s2 1) (s2 2)))))
-        (return . #s(stx-boundary (s0 (s1 (s2 1) (s2 2)))))))
-      ((let ()
-         (define-syntax (ok stx) (quote-syntax 8))
-         (define-syntax (second stx) (quote-syntax (ok 6)))
-         (second 5))
-       .
-       ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
-        (enter-check
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0 (s1 () (s2 (s3 s4) (s5 8)) (s2 (s6 s4) (s5 (s3 6))) (s6 5)))))
-        (prim-#%expression . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5)))
-         .
-         #s(stx-boundary
-            (s6 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0 () (s1 (s2 s3) (s4 8)) (s1 (s5 s3) (s4 (s2 6))) (s5 5))))
-        (prim-let-values . #f)
-        (let-renames
-         ()
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
+        (exit-prim . #s(stx-boundary (s0 #f)))
+        (return . #s(stx-boundary (s0 #f)))
+        (exit-list . #s(stx-boundary (s0 (s1 #f))))
+        (exit-prim . #s(stx-boundary (s0 s1 (s2 #f))))
+        (return . #s(stx-boundary (s0 s1 (s2 #f))))
+        (module-lift-end-loop)
         (next-group . #f)
-        (enter-block
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5)))
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8)) (s0 (s4 s2) (s3 (s1 6))) (s4 5))))
         (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (exit-prim . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (return . #s(stx-boundary (s0 (s1 s2) (s3 s4 (s5 #f)))))
+        (rename-one
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (exit-prim
+         .
+         #s(stx-boundary (s0 s1 (s2 s3) (s4 (s5 s6) (s7 s8 (s2 #f))))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
+        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3 s4) (s5 8)))))
+        (enter-local . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (local-pre . #s(stx-boundary (s0 (s1 s2) (s3 8))))
+        (start . #f)
         (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
@@ -10014,12 +10937,42 @@
          .
          #s(stx-boundary (s5 (s1 s3) (s4 8))))
         (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
         (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (local-post . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (exit-local . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (macro-post-x
+         #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8)))))
+         .
+         #s(stx-boundary (s6 s7 (s8 (s2 s4) (s5 8)))))
+        (exit-macro . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (visit . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (return . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (rename-one . #s(stx-boundary (s0 (s1 (s2) (s3 (s4) (s5 8))))))
+        (splice
+         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
+         #s(stx-boundary (s5 s6 (s1)))
+         #s(stx-boundary (s5 s6 (s7 (s1) (s1)))))
+        (next . #f)
+        (visit . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (resolve . #s(stx-boundary s0))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (prim-stop . #f)
+        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (rename-one . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
+        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
         (prim-define-syntaxes . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
         (prepare-env . #f)
-        (enter-bind . #f)
+        (phase-up . #f)
         (visit . #s(stx-boundary (s0 (s1) (s2 8))))
         (resolve . #s(stx-boundary s0))
         (enter-macro . #s(stx-boundary (s0 (s1) (s2 8))))
@@ -10044,658 +10997,24 @@
         (next . #f)
         (visit . #s(stx-boundary (s0 8)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 8)))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary ((s0 8))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (return . #s(stx-boundary (s0 (s1) (s2 8))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6)))))
-         .
-         #s(stx-boundary (s6 (s1 s3) (s4 (s5 6)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (prim-define-syntaxes . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 6))))))
-        (prepare-env . #f)
-        (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3 6))))
-         .
-         #s(stx-boundary (s4 (s1) (s2 (s3 6)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 (s2 6)))))
-        (enter-block . #s(stx-boundary ((s0 (s1 6)))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 6))))
-         .
-         #s(stx-boundary ((s0 (s1 6)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 6))))
-        (exit-check . #s(stx-boundary (s0 (s1 6))))
-        (block->list . #s(stx-boundary ((s0 (s1 6)))))
-        (enter-list . #s(stx-boundary ((s0 (s1 6)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 6))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 6))))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 6))))
-        (return . #s(stx-boundary (s0 (s1 6))))
-        (exit-list . #s(stx-boundary ((s0 (s1 6)))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 5)))
-        (visit . #s(stx-boundary (s0 5)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 5)))
-        (macro-pre-x . #s(stx-boundary (s0 5)))
-        (macro-post-x #s(stx-boundary (s0 6)) . #s(stx-boundary (s1 5)))
-        (exit-macro . #s(stx-boundary (s0 6)))
-        (return . #s(stx-boundary (s0 6)))
-        (visit . #s(stx-boundary (s0 6)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 6)))
-        (macro-pre-x . #s(stx-boundary (s0 6)))
-        (macro-post-x #s(stx-boundary 8) . #s(stx-boundary (s0 6)))
-        (exit-macro . #s(stx-boundary 8))
-        (return . #s(stx-boundary 8))
-        (exit-check . #s(stx-boundary 8))
-        (block->letrec
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
-        (visit
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0 (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6))))) () 8)))
-        (prim-letrec-syntaxes+values . #f)
-        (letrec-syntaxes-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
-          #s(stx-boundary ((s4) (s1 (s2) (s3 (s0 6))))))
-         ()
-         .
-         #s(stx-boundary (8)))
-        (prepare-env . #f)
-        (next-group . #f)
-        (enter-list . #s(stx-boundary (8)))
-        (next . #f)
-        (visit . #s(stx-boundary 8))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 8)))
-        (enter-prim . #s(stx-boundary (s0 . 8)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary ((s0 8))))
-        (tag . #s(stx-boundary (s0 () (s1 8))))
-        (exit-prim . #s(stx-boundary (s0 () (s1 8))))
-        (return . #s(stx-boundary (s0 () (s1 8))))
-        (exit-prim . #s(stx-boundary (s0 () (s0 () (s1 8)))))
-        (return . #s(stx-boundary (s0 () (s0 () (s1 8)))))
-        (exit-prim . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))
-        (return . #s(stx-boundary (s0 (s1 () (s1 () (s2 8))))))))
-      ((let ()
-         (define-syntax (ok stx) (quote-syntax 8))
-         (define-syntax (second stx) (quote-syntax (ok 6)))
-         (define (ident x) x)
-         (define (second-ident y) y)
-         (ident (second-ident (second))))
+        (resolve . #s(stx-boundary s0))))
+      (__x
        .
        ((start-top . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 8))
-              (s2 (s6 s4) (s5 (s3 6)))
-              (s7 (s8 s9) s9)
-              (s7 (s10 s11) s11)
-              (s8 (s10 (s6)))))))
-        (enter-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 8))
-              (s2 (s6 s4) (s5 (s3 6)))
-              (s7 (s8 s9) s9)
-              (s7 (s10 s11) s11)
-              (s8 (s10 (s6)))))))
-        (exit-check
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 8))
-              (s2 (s6 s4) (s5 (s3 6)))
-              (s7 (s8 s9) s9)
-              (s7 (s10 s11) s11)
-              (s8 (s10 (s6)))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 8))
-              (s2 (s6 s4) (s5 (s3 6)))
-              (s7 (s8 s9) s9)
-              (s7 (s10 s11) s11)
-              (s8 (s10 (s6)))))))
+        (visit . #s(stx-boundary (s0 s1)))
+        (enter-check . #s(stx-boundary (s0 s1)))
+        (exit-check . #s(stx-boundary (s0 s1)))
+        (visit . #s(stx-boundary (s0 s1)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s2 (s3 s4) (s5 8))
-              (s2 (s6 s4) (s5 (s3 6)))
-              (s7 (s8 s9) s9)
-              (s7 (s10 s11) s11)
-              (s8 (s10 (s6)))))))
+        (enter-prim . #s(stx-boundary (s0 s1)))
         (prim-#%expression . #f)
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (macro-pre-x
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (macro-post-x
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5)))))
-         .
-         #s(stx-boundary
-            (s11
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (exit-macro
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s1 (s2 s3) (s4 8))
-             (s1 (s5 s3) (s4 (s2 6)))
-             (s6 (s7 s8) s8)
-             (s6 (s9 s10) s10)
-             (s7 (s9 (s5))))))
-        (prim-let-values . #f)
-        (let-renames
-         ()
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8))
-             (s0 (s4 s2) (s3 (s1 6)))
-             (s5 (s6 s7) s7)
-             (s5 (s8 s9) s9)
-             (s6 (s8 (s4))))))
-        (next-group . #f)
-        (enter-block
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8))
-             (s0 (s4 s2) (s3 (s1 6)))
-             (s5 (s6 s7) s7)
-             (s5 (s8 s9) s9)
-             (s6 (s8 (s4))))))
-        (block-renames
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8))
-             (s0 (s4 s2) (s3 (s1 6)))
-             (s5 (s6 s7) s7)
-             (s5 (s8 s9) s9)
-             (s6 (s8 (s4)))))
-         .
-         #s(stx-boundary
-            ((s0 (s1 s2) (s3 8))
-             (s0 (s4 s2) (s3 (s1 6)))
-             (s5 (s6 s7) s7)
-             (s5 (s8 s9) s9)
-             (s6 (s8 (s4))))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8))))
-         .
-         #s(stx-boundary (s5 (s1 s3) (s4 8))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 8)))))
-        (prim-define-syntaxes . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 8)))))
-        (prepare-env . #f)
-        (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 8))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 8))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 8)))
-         .
-         #s(stx-boundary (s3 (s1) (s2 8))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 8))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 8))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 8))))
-        (enter-block . #s(stx-boundary ((s0 8))))
-        (block-renames #s(stx-boundary ((s0 8))) . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 8)))
-        (exit-check . #s(stx-boundary (s0 8)))
-        (block->list . #s(stx-boundary ((s0 8))))
-        (enter-list . #s(stx-boundary ((s0 8))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 8)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 8)))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary ((s0 8))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 8))))
-        (return . #s(stx-boundary (s0 (s1) (s2 8))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (visit . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) (s3 (s4 6)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6)))))
-         .
-         #s(stx-boundary (s6 (s1 s3) (s4 (s5 6)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) (s4 (s5 6))))))
-        (prim-define-syntaxes . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) (s3 (s4 6))))))
-        (prepare-env . #f)
-        (enter-bind . #f)
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (macro-pre-x . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3 6))))
-         .
-         #s(stx-boundary (s4 (s1) (s2 (s3 6)))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (visit . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary ((s1 (s2 6)))))
-        (enter-block . #s(stx-boundary ((s0 (s1 6)))))
-        (block-renames
-         #s(stx-boundary ((s0 (s1 6))))
-         .
-         #s(stx-boundary ((s0 (s1 6)))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 6))))
-        (exit-check . #s(stx-boundary (s0 (s1 6))))
-        (block->list . #s(stx-boundary ((s0 (s1 6)))))
-        (enter-list . #s(stx-boundary ((s0 (s1 6)))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 6))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1 6))))
-        (prim-quote-syntax . #f)
-        (exit-prim . #s(stx-boundary (s0 (s1 6))))
-        (return . #s(stx-boundary (s0 (s1 6))))
-        (exit-list . #s(stx-boundary ((s0 (s1 6)))))
-        (exit-prim . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3 6)))))
-        (next . #f)
-        (exit-bind . #f)
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
-        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s0 (s1 s3) s3)))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 s2) s2)))
-        (visit . #s(stx-boundary (s0 (s1 s2) s2)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-pre-x . #s(stx-boundary (s0 (s1 s2) s2)))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s0 (s1 s3) s3)))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3) s3))))
-        (macro-post-x
-         #s(stx-boundary (s0 (s1) (s2 (s3) s3)))
-         .
-         #s(stx-boundary (s4 s1 (s2 (s3) s3))))
-        (exit-macro . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (return . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (exit-check . #s(stx-boundary (s0 (s1) (s2 (s3) s3))))
-        (prim-define-values . #f)
-        (rename-one . #s(stx-boundary ((s0) (s1 (s2) s2))))
-        (next . #f)
-        (enter-check . #s(stx-boundary (s0 (s1 (s2)))))
-        (exit-check . #s(stx-boundary (s0 (s1 (s2)))))
-        (block->letrec
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
-             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
-             (s6 (s9 (s5))))))
-        (visit
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
-             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
-             (s6 (s9 (s5))))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) (s4 8))) ((s5) (s2 (s3) (s4 (s1 6)))))
-             (((s6) (s7 (s8) s8)) ((s9) (s7 (s10) s10)))
-             (s6 (s9 (s5))))))
-        (prim-letrec-syntaxes+values . #f)
-        (letrec-syntaxes-renames
-         (#s(stx-boundary ((s0) (s1 (s2) (s3 8))))
-          #s(stx-boundary ((s4) (s1 (s2) (s3 (s0 6))))))
-         (#s(stx-boundary ((s5) (s6 (s7) s7)))
-          #s(stx-boundary ((s8) (s6 (s9) s9))))
-         .
-         #s(stx-boundary ((s5 (s8 (s4))))))
-        (prepare-env . #f)
-        (next-group . #f)
-        (prim-letrec-values . #f)
-        (let-renames
-         (#s(stx-boundary ((s0) (s1 (s2) s2)))
-          #s(stx-boundary ((s3) (s1 (s4) s4))))
-         .
-         #s(stx-boundary ((s0 (s3 (s5))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) s1)))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
         (visit . #s(stx-boundary s0))
         (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
-        (return . #s(stx-boundary (s0 (s1) s1)))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1) s1)))
         (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 (s1) s1)))
-        (prim-lambda . #f)
-        (lambda-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (enter-block . #s(stx-boundary (s0)))
-        (block-renames #s(stx-boundary (s0)) . #s(stx-boundary (s0)))
-        (next . #f)
-        (enter-check . #s(stx-boundary s0))
-        (exit-check . #s(stx-boundary s0))
-        (block->list . #s(stx-boundary (s0)))
-        (enter-list . #s(stx-boundary (s0)))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (exit-list . #s(stx-boundary (s0)))
-        (exit-prim . #s(stx-boundary (s0 (s1) s1)))
-        (return . #s(stx-boundary (s0 (s1) s1)))
-        (next-group . #f)
-        (enter-list . #s(stx-boundary ((s0 (s1 (s2))))))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1 (s2)))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2 (s3))))
-         .
-         #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (visit . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2 (s3)))))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1 (s2)))))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0 (s1))))
-        (resolve . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 s1 (s2))))
-        (enter-macro . #s(stx-boundary (s0 s1 (s2))))
-        (macro-pre-x . #s(stx-boundary (s0 s1 (s2))))
-        (macro-post-x
-         #s(stx-boundary (s0 s1 (s2)))
-         .
-         #s(stx-boundary (s0 s1 (s2))))
-        (exit-macro . #s(stx-boundary (s0 s1 (s2))))
-        (visit . #s(stx-boundary (s0 s1 (s2))))
-        (resolve . #s(stx-boundary s0))
-        (enter-prim . #s(stx-boundary (s0 s1 (s2))))
-        (prim-#%app . #f)
-        (enter-list . #s(stx-boundary (s0 (s1))))
-        (next . #f)
-        (visit . #s(stx-boundary s0))
-        (resolve . #s(stx-boundary s0))
-        (variable #s(stx-boundary s0) . #s(stx-boundary s0))
-        (return . #s(stx-boundary s0))
-        (next . #f)
-        (visit . #s(stx-boundary (s0)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0)))
-        (macro-pre-x . #s(stx-boundary (s0)))
-        (macro-post-x #s(stx-boundary (s0 6)) . #s(stx-boundary (s1)))
-        (exit-macro . #s(stx-boundary (s0 6)))
-        (visit . #s(stx-boundary (s0 6)))
-        (resolve . #s(stx-boundary s0))
-        (enter-macro . #s(stx-boundary (s0 6)))
-        (macro-pre-x . #s(stx-boundary (s0 6)))
-        (macro-post-x #s(stx-boundary 8) . #s(stx-boundary (s0 6)))
-        (exit-macro . #s(stx-boundary 8))
-        (visit . #s(stx-boundary 8))
-        (resolve . #s(stx-boundary s0))
-        (tag . #s(stx-boundary (s0 . 8)))
-        (enter-prim . #s(stx-boundary (s0 . 8)))
-        (prim-#%datum . #f)
-        (exit-prim . #s(stx-boundary (s0 8)))
-        (return . #s(stx-boundary (s0 8)))
-        (exit-list . #s(stx-boundary (s0 (s1 8))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s2 8))))
-        (return . #s(stx-boundary (s0 s1 (s2 8))))
-        (exit-list . #s(stx-boundary (s0 (s1 s2 (s3 8)))))
-        (exit-prim . #s(stx-boundary (s0 s1 (s0 s2 (s3 8)))))
-        (return . #s(stx-boundary (s0 s1 (s0 s2 (s3 8)))))
-        (exit-list . #s(stx-boundary ((s0 s1 (s0 s2 (s3 8))))))
-        (tag
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)))
-             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)))
-             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (((s1) (s2 (s3) s3)))
-             (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8)))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s0
-              (((s1) (s2 (s3) s3)))
-              (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8))))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             ()
-             (s0
-              (((s1) (s2 (s3) s3)))
-              (s0 (((s4) (s2 (s5) s5))) (s6 s1 (s6 s4 (s7 8))))))))
-        (exit-prim
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s1
-               (((s2) (s3 (s4) s4)))
-               (s1 (((s5) (s3 (s6) s6))) (s7 s2 (s7 s5 (s8 8)))))))))
-        (return
-         .
-         #s(stx-boundary
-            (s0
-             (s1
-              ()
-              (s1
-               (((s2) (s3 (s4) s4)))
-               (s1 (((s5) (s3 (s6) s6))) (s7 s2 (s7 s5 (s8 8))))))))))))
+        (tag . #s(stx-boundary (s0 . s1)))
+        (enter-prim . #s(stx-boundary (s0 . s1)))
+        (prim-#%top . #f)
+        (exit-prim . #s(stx-boundary (s0 . s1)))
+        (return . #s(stx-boundary (s0 . s1)))
+        (exit-prim . #s(stx-boundary (s0 (s1 . s2))))
+        (return . #s(stx-boundary (s0 (s1 . s2)))))))
diff --git a/pkgs/racket-test-core/tests/racket/macro.rktl b/pkgs/racket-test-core/tests/racket/macro.rktl
index 15f01b4bea..8a0ef4c61f 100644
--- a/pkgs/racket-test-core/tests/racket/macro.rktl
+++ b/pkgs/racket-test-core/tests/racket/macro.rktl
@@ -482,7 +482,8 @@
 (module m1-for-local-expand racket/base
   (require (for-syntax racket/base))
   (provide (rename-out [mb #%module-begin])
-           (except-out (all-from-out racket/base) #%module-begin))
+           (except-out (all-from-out racket/base) #%module-begin)
+           (for-syntax (all-from-out racket/base)))
   (define-syntax (mb stx)
     (syntax-case stx ()
       [(_ 10) #'(#%plain-module-begin 10)]
@@ -491,17 +492,20 @@
        (let ([e (local-expand #'(#%plain-module-begin form ...)
                               'module-begin
                               (list #'module*))])
-         (syntax-case e (module module* quote #%plain-app)
+         (syntax-case e (module module* quote #%plain-app begin-for-syntax)
            [(mod-beg
              (#%plain-app + (quote 1) (quote 2))
              (module* q #f 10)
-             (module* z #f 11))
+             (module* z #f 11)
+             (begin-for-syntax (module* r #f 12)))
             'ok]
            [else (error 'test "bad local-expand result: ~s" (syntax->datum e))])
          e)])))
 (module m2-for-local-expand 'm1-for-local-expand
   (+ 1 2)
-  (module* q #f 10) (module* z #f 11))
+  (module* q #f 10)
+  (module* z #f 11)
+  (begin-for-syntax (module* r #f 12)))
 
 
 (module uses-internal-definition-context-around-id racket/base
diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl
index f7ba1a4d1a..e82692bdce 100644
--- a/pkgs/racket-test-core/tests/racket/module.rktl
+++ b/pkgs/racket-test-core/tests/racket/module.rktl
@@ -2690,6 +2690,37 @@ case of module-leve bindings; it doesn't cover local bindings.
 
 (test '(new orig) dynamic-require ''mixes-top-level-namespaces 'result)
 
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; `local-expand` with `#:extend-stop-ids? #f` expands through core forms
+
+(err/rt-test
+ (eval
+  '(module local-expand-with-only-stop-list racket/base
+     (require (for-syntax racket/base))
+     (define-syntax (stop stx)
+       (syntax-case stx ()
+         [(_ form) #'form]))
+     (define-syntax (m stx)
+       (syntax-case stx ()
+         [(_ form)
+          (local-expand #'form 'expression (list #'stop) #:extend-stop-ids? #f)]))
+     (m (let-syntax ([plus (make-rename-transformer #'+)])
+          (stop (plus 1 2))))))
+ exn:fail?)
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Make sure #%module-begin respects the stop list when module* is present
+
+(module module-begin-stop-list racket/base
+  (require (for-syntax racket/base))
+  (define-syntax (stop stx)
+    (raise-syntax-error #f "don't expand me!" stx))
+  (begin-for-syntax
+    (local-expand #'(#%plain-module-begin (#%expression (stop)))
+                  'module-begin
+                  (list #'module* #'stop)
+                  #:extend-stop-ids? #f)))
+
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (report-errs)
diff --git a/racket/collects/racket/private/base.rkt b/racket/collects/racket/private/base.rkt
index ceda1dc20e..ae1842be83 100644
--- a/racket/collects/racket/private/base.rkt
+++ b/racket/collects/racket/private/base.rkt
@@ -12,6 +12,7 @@
              "cert.rkt"
              "submodule.rkt"
              "generic-interfaces.rkt"
+             "kw-syntax-local.rkt" ; shadows local-expand and variants
              (for-syntax "stxcase-scheme.rkt"))
 
   (#%provide (all-from-except "pre-base.rkt"
@@ -38,6 +39,7 @@
              (all-from "cert.rkt")
              (all-from "submodule.rkt")
              (all-from "generic-interfaces.rkt")
+             (all-from "kw-syntax-local.rkt")
              (for-syntax syntax-rules syntax-id-rules ... _)
              (rename -open-input-file open-input-file)
              (rename -open-output-file open-output-file)
diff --git a/racket/collects/racket/private/kw-syntax-local.rkt b/racket/collects/racket/private/kw-syntax-local.rkt
new file mode 100644
index 0000000000..e15d3d9584
--- /dev/null
+++ b/racket/collects/racket/private/kw-syntax-local.rkt
@@ -0,0 +1,24 @@
+(module kw-syntax-local "pre-base.rkt"
+  (require (prefix-in k: '#%kernel))
+
+  (provide local-expand
+           local-expand/capture-lifts
+           local-transformer-expand
+           local-transformer-expand/capture-lifts)
+
+  (define (local-expand s context stop-ids [intdefs '()]
+                        #:extend-stop-ids? [extend-stop-ids? #t])
+    (k:local-expand s context stop-ids intdefs extend-stop-ids?))
+
+  (define (local-expand/capture-lifts s context stop-ids [intdefs '()] [lift-key (gensym 'lift)]
+                                      #:extend-stop-ids? [extend-stop-ids? #t])
+    (k:local-expand/capture-lifts s context stop-ids intdefs lift-key extend-stop-ids?))
+
+  (define (local-transformer-expand s context stop-ids [intdefs '()]
+                                    #:extend-stop-ids? [extend-stop-ids? #t])
+    (k:local-transformer-expand s context stop-ids intdefs extend-stop-ids?))
+
+  (define (local-transformer-expand/capture-lifts
+           s context stop-ids [intdefs '()] [lift-key (gensym 'lift)]
+           #:extend-stop-ids? [extend-stop-ids? #t])
+    (k:local-transformer-expand/capture-lifts s context stop-ids intdefs lift-key extend-stop-ids?)))
diff --git a/racket/src/expander/expand/definition-context.rkt b/racket/src/expander/expand/definition-context.rkt
index 45d716aca6..34bbcf765b 100644
--- a/racket/src/expander/expand/definition-context.rkt
+++ b/racket/src/expander/expand/definition-context.rkt
@@ -222,6 +222,7 @@
                                    #:phase [phase (expand-context-phase ctx)]
                                    #:intdefs intdefs
                                    #:stop-ids [stop-ids #f]
+                                   #:extend-stops? [extend-stops? #t]
                                    #:to-parsed-ok? [to-parsed-ok? #f]
                                    #:track-to-be-defined? [track-to-be-defined? #f]
                                    #:keep-#%expression? [keep-#%expression? #t])
@@ -229,7 +230,11 @@
                               (expand-context-context ctx))
                          (and (list? context)
                               (list? (expand-context-context ctx)))))
-  (define all-stop-ids (and stop-ids (stop-ids->all-stop-ids stop-ids phase)))
+  (define all-stop-ids (if stop-ids
+                           (if extend-stops?
+                               (stop-ids->all-stop-ids stop-ids phase)
+                               stop-ids)
+                           null))
   (define def-ctx-scopes (if (expand-context-def-ctx-scopes ctx)
                              (unbox (expand-context-def-ctx-scopes ctx))
                              null))
@@ -275,7 +280,7 @@
                 [just-once? #f]
                 [in-local-expand? #t]
                 [keep-#%expression? keep-#%expression?]
-                [stops (free-id-set phase (or all-stop-ids null))]
+                [stops (free-id-set phase all-stop-ids)]
                 [current-introduction-scopes null]
                 [need-eventually-defined (let ([ht (expand-context-need-eventually-defined ctx)])
                                            (cond
diff --git a/racket/src/expander/expand/expr.rkt b/racket/src/expander/expand/expr.rkt
index f364dcd369..9581632d71 100644
--- a/racket/src/expander/expand/expr.rkt
+++ b/racket/src/expander/expand/expr.rkt
@@ -671,7 +671,9 @@
            (rebuild
             rebuild-s
             (list (m 'set!)
-                  (substitute-variable id t #:no-stops? (free-id-set-empty-or-just-module*? (expand-context-stops ctx)))
+                  (substitute-variable id t #:no-stops? (free-id-set-empty-or-just-module*?
+                                                         (expand-context-stops ctx)
+                                                         (expand-context-phase ctx)))
                   exp-rhs)))]
       [(not binding)
        (raise-unbound-syntax-error #f "unbound identifier" s id null
diff --git a/racket/src/expander/expand/free-id-set.rkt b/racket/src/expander/expand/free-id-set.rkt
index 3f5df0faba..461da4e8c0 100644
--- a/racket/src/expander/expand/free-id-set.rkt
+++ b/racket/src/expander/expand/free-id-set.rkt
@@ -1,7 +1,9 @@
 #lang racket/base
 (require "../common/list-ish.rkt"
+         "../syntax/binding.rkt"
          "../syntax/syntax.rkt"
-         "../syntax/binding.rkt")
+         "../syntax/scope.rkt"
+         "../namespace/core.rkt")
 
 (provide free-id-set
          empty-free-id-set
@@ -29,8 +31,10 @@
                                           null))])
         (free-identifier=? id given-id phase phase))))
 
-(define (free-id-set-empty-or-just-module*? fs)
+(define (free-id-set-empty-or-just-module*? fs phase)
   (define c (hash-count fs))
-  ;; If any identifier other than `module*` is present, then many
-  ;; identifiers are present
-  (c . <= . 1))
+  (or (zero? c)
+      (and (= 1 c)
+           (let* ([p-core-stx (syntax-shift-phase-level core-stx phase)]
+                  [mod-star-stx (datum->syntax p-core-stx 'module*)])
+             (free-identifier=? (car (hash-values fs)) mod-star-stx phase phase)))))
diff --git a/racket/src/expander/expand/local-expand.rkt b/racket/src/expander/expand/local-expand.rkt
index e1621e5f26..136f6a49fd 100644
--- a/racket/src/expander/expand/local-expand.rkt
+++ b/racket/src/expander/expand/local-expand.rkt
@@ -22,22 +22,26 @@
          local-transformer-expand/capture-lifts
          syntax-local-expand-expression)
 
-(define (local-expand s context stop-ids [intdefs '()])
-  (do-local-expand 'local-expand s context stop-ids intdefs))
+(define (local-expand s context stop-ids [intdefs '()] [extend-stops? #t])
+  (do-local-expand 'local-expand s context stop-ids intdefs
+                   #:extend-stops? extend-stops?))
 
-(define (local-expand/capture-lifts s context stop-ids [intdefs '()] [lift-key (generate-lift-key)])
+(define (local-expand/capture-lifts s context stop-ids [intdefs '()] [lift-key (generate-lift-key)] [extend-stops? #t])
   (do-local-expand 'local-expand s context stop-ids intdefs
                    #:capture-lifts? #t
+                   #:extend-stops? extend-stops?
                    #:lift-key lift-key))
 
-(define (local-transformer-expand s context stop-ids [intdefs '()])
+(define (local-transformer-expand s context stop-ids [intdefs '()] [extend-stops? #t])
   (do-local-expand 'local-expand s context stop-ids intdefs
-                   #:as-transformer? #t))
+                   #:as-transformer? #t
+                   #:extend-stops? extend-stops?))
 
-(define (local-transformer-expand/capture-lifts s context stop-ids [intdefs '()] [lift-key (generate-lift-key)])
+(define (local-transformer-expand/capture-lifts s context stop-ids [intdefs '()] [lift-key (generate-lift-key)] [extend-stops? #t])
   (do-local-expand 'local-expand s context stop-ids intdefs
                    #:as-transformer? #t
                    #:capture-lifts? #t
+                   #:extend-stops? extend-stops?
                    #:lift-key lift-key))
 
 (define (syntax-local-expand-expression s [opaque-only? #f])
@@ -67,6 +71,7 @@
 (define (do-local-expand who s-or-s-exp context stop-ids [intdefs '()]
                          #:capture-lifts? [capture-lifts? #f]
                          #:as-transformer? [as-transformer? #f]
+                         #:extend-stops? [extend-stops? #t]
                          #:to-parsed-ok? [to-parsed-ok? #f]
                          #:keep-#%expression? [keep-#%expression? #t]
                          #:lift-key [lift-key (and (or capture-lifts?
@@ -103,6 +108,7 @@
                                                 #:phase phase
                                                 #:intdefs intdefs
                                                 #:stop-ids stop-ids
+                                                #:extend-stops? extend-stops?
                                                 #:to-parsed-ok? to-parsed-ok?
                                                 #:keep-#%expression? (or keep-#%expression?
                                                                          (and (expand-context-in-local-expand? ctx)
diff --git a/racket/src/expander/expand/main.rkt b/racket/src/expander/expand/main.rkt
index e2a51d198e..ffee8ef5de 100644
--- a/racket/src/expander/expand/main.rkt
+++ b/racket/src/expander/expand/main.rkt
@@ -339,7 +339,9 @@
     ;; A reference to a variable expands to itself
     (register-variable-referenced-if-local! binding)
     ;; If the variable is locally bound, replace the use's scopes with the binding's scopes
-    (define result-s (substitute-variable id t #:no-stops? (free-id-set-empty-or-just-module*? (expand-context-stops ctx))))
+    (define result-s (substitute-variable id t #:no-stops? (free-id-set-empty-or-just-module*?
+                                                            (expand-context-stops ctx)
+                                                            (expand-context-phase ctx))))
     (cond
       [(and (expand-context-to-parsed? ctx)
             (free-id-set-empty? (expand-context-stops ctx)))
@@ -406,7 +408,8 @@
   (log-expand ctx 'macro-pre-x cleaned-s)
   (define confine-def-ctx-scopes?
     (not (or (expand-context-only-immediate? ctx)
-             (not (free-id-set-empty-or-just-module*? (expand-context-stops ctx))))))
+             (not (free-id-set-empty-or-just-module*? (expand-context-stops ctx)
+                                                      (expand-context-phase ctx))))))
   (define accum-ctx
     (if (and confine-def-ctx-scopes?
              (expand-context-def-ctx-scopes ctx)
diff --git a/racket/src/expander/expand/module.rkt b/racket/src/expander/expand/module.rkt
index bfba3a292c..503b4080fb 100644
--- a/racket/src/expander/expand/module.rkt
+++ b/racket/src/expander/expand/module.rkt
@@ -300,7 +300,7 @@
      
      ;; Passes 1 and 2 are nested via `begin-for-syntax`:
      (define expression-expanded-bodys
-       (let pass-1-and-2-loop ([bodys bodys] [phase phase])
+       (let pass-1-and-2-loop ([bodys bodys] [phase phase] [keep-stops? (stop-at-module*? ctx)])
 
          ;; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          ;; Pass 1: partially expand to discover all bindings and install all 
@@ -309,7 +309,6 @@
          ;; Need to accumulate definition contexts created during
          ;; partial expansion:
          (define def-ctx-scopes (box null))
-         (define to-parsed? (expand-context-to-parsed? ctx))
          
          (define partial-body-ctx (struct*-copy expand-context ctx
                                                 [context 'module]
@@ -360,7 +359,9 @@
          (log-expand partial-body-ctx 'next-group)
          
          (define body-ctx (struct*-copy expand-context (accumulate-def-ctx-scopes partial-body-ctx def-ctx-scopes)
-                                        [stops empty-free-id-set]
+                                        [stops (if keep-stops?
+                                                   (expand-context-stops ctx)
+                                                   empty-free-id-set)]
                                         [def-ctx-scopes #f]
                                         [post-expansion #:parent root-expand-context #f]
                                         [to-module-lifts (make-to-module-lift-context phase
@@ -760,7 +761,7 @@
           (prepare-next-phase-namespace partial-body-ctx)
           (log-expand partial-body-ctx 'phase-up)
           (define-match m disarmed-exp-body '(begin-for-syntax e ...))
-          (define nested-bodys (pass-1-and-2-loop (m 'e) (add1 phase)))
+          (define nested-bodys (pass-1-and-2-loop (m 'e) (add1 phase) #f))
           (log-expand partial-body-ctx 'next-group)
           (namespace-run-available-modules! m-ns (add1 phase)) ; to support running `begin-for-syntax`
           (eval-nested-bodys nested-bodys (add1 phase) ct-m-ns self partial-body-ctx)
diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h
index 2bcf8e0759..ce42dbad41 100644
--- a/racket/src/racket/src/schvers.h
+++ b/racket/src/racket/src/schvers.h
@@ -13,12 +13,12 @@
    consistently.)
 */
 
-#define MZSCHEME_VERSION "7.0.0.1"
+#define MZSCHEME_VERSION "7.0.0.2"
 
 #define MZSCHEME_VERSION_X 7
 #define MZSCHEME_VERSION_Y 0
 #define MZSCHEME_VERSION_Z 0
-#define MZSCHEME_VERSION_W 1
+#define MZSCHEME_VERSION_W 2
 
 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
 #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 12ab49c9c7..3ca73c9fd3 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -2377,6 +2377,13 @@ static const char *startup_source =
 " loop_8)"
 "(hash-iterate-first h_0)))))"
 "(define-values"
+"(hash-values)"
+"(lambda(table_0)"
+"(begin"
+"(begin"
+"        (if (hash? table_0) (void) (let-values () (raise-argument-error 'hash-values \"hash?\" table_0)))"
+"(hash-map table_0(lambda(k_0 v_27) v_27))))))"
+"(define-values"
 "(sort7.1)"
 "(lambda(cache-keys?2_0 key1_0 lst5_0 less?6_0)"
 "(begin"
@@ -2756,10 +2763,10 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_21"
-"(let-values(((k_0)(unsafe-immutable-hash-iterate-key ht_16 i_21)))"
+"(let-values(((k_1)(unsafe-immutable-hash-iterate-key ht_16 i_21)))"
 "(let-values(((s1_4)"
 "(let-values(((s1_5) s1_3))"
-"(let-values(((s1_6)(let-values()(hash-remove s1_5 k_0))))"
+"(let-values(((s1_6)(let-values()(hash-remove s1_5 k_1))))"
 "(values s1_6)))))"
 "(if(not #f)"
 "(for-loop_2 s1_4(unsafe-immutable-hash-iterate-next ht_16 i_21))"
@@ -2784,10 +2791,10 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_22"
-"(let-values(((k_1)(unsafe-immutable-hash-iterate-key ht_17 i_22)))"
+"(let-values(((k_2)(unsafe-immutable-hash-iterate-key ht_17 i_22)))"
 "(let-values(((s1_9)"
 "(let-values(((s1_10) s1_8))"
-"(let-values(((s1_11)(let-values()(hash-set s1_10 k_1 #t))))"
+"(let-values(((s1_11)(let-values()(hash-set s1_10 k_2 #t))))"
 "(values s1_11)))))"
 "(if(not #f)"
 "(for-loop_3 s1_9(unsafe-immutable-hash-iterate-next ht_17 i_22))"
@@ -2812,14 +2819,14 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_23"
-"(let-values(((k_2)(unsafe-immutable-hash-iterate-key ht_18 i_23)))"
+"(let-values(((k_3)(unsafe-immutable-hash-iterate-key ht_18 i_23)))"
 "(let-values(((s_27)"
 "(let-values(((s_28) s_26))"
 "(let-values(((s_29)"
 "(let-values()"
-"(if(hash-ref s1_12 k_2 #f)"
+"(if(hash-ref s1_12 k_3 #f)"
 " s_28"
-"(hash-remove s_28 k_2)))))"
+"(hash-remove s_28 k_3)))))"
 "(values s_29)))))"
 "(if(not #f)"
 "(for-loop_4 s_27(unsafe-immutable-hash-iterate-next ht_18 i_23))"
@@ -2842,14 +2849,14 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_24"
-"(let-values(((v_27)(unsafe-immutable-hash-iterate-key ht_19 i_24)))"
+"(let-values(((v_28)(unsafe-immutable-hash-iterate-key ht_19 i_24)))"
 "(let-values(((y_7 n_15)"
 "(let-values(((y_8) y_6)((n_16) n_14))"
 "(let-values(((y_9 n_17)"
 "(let-values()"
-"(if(pred_0 v_27)"
-"(values(set-add y_8 v_27) n_16)"
-"(values y_8(set-add n_16 v_27))))))"
+"(if(pred_0 v_28)"
+"(values(set-add y_8 v_28) n_16)"
+"(values y_8(set-add n_16 v_28))))))"
 "(values y_9 n_17)))))"
 "(if(not #f)"
 "(for-loop_5 y_7 n_15(unsafe-immutable-hash-iterate-next ht_19 i_24))"
@@ -2874,12 +2881,12 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_25"
-"(let-values(((k_3)(unsafe-immutable-hash-iterate-key ht_20 i_25)))"
+"(let-values(((k_4)(unsafe-immutable-hash-iterate-key ht_20 i_25)))"
 "(let-values(((fold-var_1)"
 "(let-values(((fold-var_2) fold-var_0))"
 "(let-values(((fold-var_3)"
 "(let-values()"
-"(cons(let-values() k_3) fold-var_2))))"
+"(cons(let-values() k_4) fold-var_2))))"
 "(values fold-var_3)))))"
 "(if(not #f)"
 "(for-loop_6 fold-var_1(unsafe-immutable-hash-iterate-next ht_20 i_25))"
@@ -2896,22 +2903,22 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_11)))"
 "((letrec-values(((for-loop_7)"
-"(lambda(table_0 lst_12)"
+"(lambda(table_1 lst_12)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_12)"
-"(let-values(((k_4)(unsafe-car lst_12))((rest_2)(unsafe-cdr lst_12)))"
-"(let-values(((table_1)"
-"(let-values(((table_2) table_0))"
-"(let-values(((table_3)"
+"(let-values(((k_5)(unsafe-car lst_12))((rest_2)(unsafe-cdr lst_12)))"
+"(let-values(((table_2)"
+"(let-values(((table_3) table_1))"
+"(let-values(((table_4)"
 "(let-values()"
 "(let-values(((key_7 val_0)"
 "(let-values()"
-"(values(let-values() k_4) #t))))"
-"(hash-set table_2 key_7 val_0)))))"
-"(values table_3)))))"
-"(if(not #f)(for-loop_7 table_1 rest_2) table_1)))"
-" table_0)))))"
+"(values(let-values() k_5) #t))))"
+"(hash-set table_3 key_7 val_0)))))"
+"(values table_4)))))"
+"(if(not #f)(for-loop_7 table_2 rest_2) table_2)))"
+" table_1)))))"
 " for-loop_7)"
 " '#hash()"
 " lst_11))))))"
@@ -2923,22 +2930,22 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_13)))"
 "((letrec-values(((for-loop_8)"
-"(lambda(table_4 lst_14)"
+"(lambda(table_5 lst_14)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_14)"
-"(let-values(((k_5)(unsafe-car lst_14))((rest_3)(unsafe-cdr lst_14)))"
-"(let-values(((table_5)"
-"(let-values(((table_6) table_4))"
-"(let-values(((table_7)"
+"(let-values(((k_6)(unsafe-car lst_14))((rest_3)(unsafe-cdr lst_14)))"
+"(let-values(((table_6)"
+"(let-values(((table_7) table_5))"
+"(let-values(((table_8)"
 "(let-values()"
 "(let-values(((key_8 val_1)"
 "(let-values()"
-"(values(let-values() k_5) #t))))"
-"(hash-set table_6 key_8 val_1)))))"
-"(values table_7)))))"
-"(if(not #f)(for-loop_8 table_5 rest_3) table_5)))"
-" table_4)))))"
+"(values(let-values() k_6) #t))))"
+"(hash-set table_7 key_8 val_1)))))"
+"(values table_8)))))"
+"(if(not #f)(for-loop_8 table_6 rest_3) table_6)))"
+" table_5)))))"
 " for-loop_8)"
 " '#hasheq()"
 " lst_13))))))"
@@ -3075,51 +3082,51 @@ static const char *startup_source =
 "(make-struct-type-property 'binding-reach-scopes))"
 "(define-values"
 "(1/module-path?)"
-"(lambda(v_28)"
-"(begin"
-" 'module-path?"
-"(let-values(((or-part_0)(if(pair? v_28)(if(eq?(car v_28) 'submod)(submodule-module-path? v_28) #f) #f)))"
-"(if or-part_0 or-part_0(root-module-path? v_28))))))"
-"(define-values"
-"(root-module-path?)"
 "(lambda(v_29)"
 "(begin"
-"(let-values(((or-part_11)(path? v_29)))"
+" 'module-path?"
+"(let-values(((or-part_0)(if(pair? v_29)(if(eq?(car v_29) 'submod)(submodule-module-path? v_29) #f) #f)))"
+"(if or-part_0 or-part_0(root-module-path? v_29))))))"
+"(define-values"
+"(root-module-path?)"
+"(lambda(v_30)"
+"(begin"
+"(let-values(((or-part_11)(path? v_30)))"
 "(if or-part_11"
 " or-part_11"
-"(let-values(((or-part_2)(if(string? v_29)(string-module-path? v_29) #f)))"
+"(let-values(((or-part_2)(if(string? v_30)(string-module-path? v_30) #f)))"
 "(if or-part_2"
 " or-part_2"
-"(let-values(((or-part_26)(if(symbol? v_29)(symbol-module-path? v_29) #f)))"
+"(let-values(((or-part_26)(if(symbol? v_30)(symbol-module-path? v_30) #f)))"
 "(if or-part_26"
 " or-part_26"
-"(if(pair? v_29)"
-"(let-values(((tmp_4)(car v_29)))"
+"(if(pair? v_30)"
+"(let-values(((tmp_4)(car v_30)))"
 "(if(equal? tmp_4 'quote)"
-"(let-values()(if(pair?(cdr v_29))(if(symbol?(cadr v_29))(null?(cddr v_29)) #f) #f))"
+"(let-values()(if(pair?(cdr v_30))(if(symbol?(cadr v_30))(null?(cddr v_30)) #f) #f))"
 "(if(equal? tmp_4 'lib)"
-"(let-values()(lib-module-path? v_29))"
+"(let-values()(lib-module-path? v_30))"
 "(if(equal? tmp_4 'file)"
 "(let-values()"
-"(if(pair?(cdr v_29))"
-"(if(string?(cadr v_29))(if(path-string?(cadr v_29))(null?(cddr v_29)) #f) #f)"
+"(if(pair?(cdr v_30))"
+"(if(string?(cadr v_30))(if(path-string?(cadr v_30))(null?(cddr v_30)) #f) #f)"
 " #f))"
 "(if(equal? tmp_4 'planet)"
-"(let-values()(planet-module-path? v_29))"
+"(let-values()(planet-module-path? v_30))"
 "(let-values() #f))))))"
 " #f))))))))))"
 "(define-values"
 "(submodule-module-path?)"
-"(lambda(v_30)"
+"(lambda(v_31)"
 "(begin"
-"(if(pair?(cdr v_30))"
-"(if(list? v_30)"
-"          (if (let-values (((or-part_27) (equal? (cadr v_30) \"..\")))"
+"(if(pair?(cdr v_31))"
+"(if(list? v_31)"
+"          (if (let-values (((or-part_27) (equal? (cadr v_31) \"..\")))"
 "(if or-part_27"
 " or-part_27"
-"                  (let-values (((or-part_10) (equal? (cadr v_30) \".\")))"
-"(if or-part_10 or-part_10(root-module-path?(cadr v_30))))))"
-"(let-values(((lst_15)(cddr v_30)))"
+"                  (let-values (((or-part_10) (equal? (cadr v_31) \".\")))"
+"(if or-part_10 or-part_10(root-module-path?(cadr v_31))))))"
+"(let-values(((lst_15)(cddr v_31)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_15)))"
 "((letrec-values(((for-loop_9)"
@@ -3151,51 +3158,51 @@ static const char *startup_source =
 " #f))))"
 "(define-values"
 "(string-module-path?)"
-"(lambda(v_31)"
+"(lambda(v_32)"
 "(begin"
-"(let-values(((v13_0) v_31)((temp14_0) #t)((temp15_0) #t)((temp16_0) #t))"
+"(let-values(((v13_0) v_32)((temp14_0) #t)((temp15_0) #t)((temp16_0) #t))"
 "(module-path-string?10.1 temp14_0 temp16_0 #f temp15_0 v13_0)))))"
 "(define-values"
 "(symbol-module-path?)"
-"(lambda(v_32)"
-"(begin(let-values(((temp17_0)(symbol->string v_32)))(module-path-string?10.1 #f #f #f #f temp17_0)))))"
+"(lambda(v_33)"
+"(begin(let-values(((temp17_0)(symbol->string v_33)))(module-path-string?10.1 #f #f #f #f temp17_0)))))"
 "(define-values"
 "(lib-module-path?)"
-"(lambda(v_33)"
+"(lambda(v_34)"
 "(begin"
-"(if(list? v_33)"
-"(if(pair?(cdr v_33))"
+"(if(list? v_34)"
+"(if(pair?(cdr v_34))"
 "((letrec-values(((loop_56)"
-"(lambda(v_34 first?_0)"
+"(lambda(v_35 first?_0)"
 "(begin"
 " 'loop"
-"(let-values(((or-part_29)(null? v_34)))"
+"(let-values(((or-part_29)(null? v_35)))"
 "(if or-part_29"
 " or-part_29"
-"(if(string?(car v_34))"
-"(if(let-values(((temp18_0)(car v_34))"
+"(if(string?(car v_35))"
+"(if(let-values(((temp18_0)(car v_35))"
 "((first?19_0) first?_0)"
 "((first?20_0) first?_0))"
 "(module-path-string?10.1 #f first?20_0 #f first?19_0 temp18_0))"
-"(loop_56(cdr v_34) #f)"
+"(loop_56(cdr v_35) #f)"
 " #f)"
 " #f)))))))"
 " loop_56)"
-"(cdr v_33)"
+"(cdr v_34)"
 " #t)"
 " #f)"
 " #f))))"
 "(define-values"
 "(planet-module-path?)"
-"(lambda(v_35)"
+"(lambda(v_36)"
 "(begin"
-"(if(list? v_35)"
-"(let-values(((tmp_5)(length v_35)))"
+"(if(list? v_36)"
+"(let-values(((tmp_5)(length v_36)))"
 "(if(equal? tmp_5 1)"
 "(let-values() #f)"
 "(if(equal? tmp_5 2)"
 "(let-values()"
-"(let-values(((e_8)(cadr v_35)))"
+"(let-values(((e_8)(cadr v_36)))"
 "(if(string? e_8)"
 "(let-values()"
 "(let-values(((e21_0) e_8)((temp22_0) #t)((temp23_0) #t))"
@@ -3206,9 +3213,9 @@ static const char *startup_source =
 "(module-path-string?10.1 #f #f temp25_0 #f temp24_0)))"
 "(let-values() #f)))))"
 "(let-values()"
-"(let-values(((file_0)(cadr v_35)))"
-"(let-values(((pkg_0)(caddr v_35)))"
-"(let-values(((subs_0)(cdddr v_35)))"
+"(let-values(((file_0)(cadr v_36)))"
+"(let-values(((pkg_0)(caddr v_36)))"
+"(let-values(((subs_0)(cdddr v_36)))"
 "(if file_0"
 "(if(let-values(((file26_0) file_0)((temp27_0) #t)((temp28_0) #t))"
 "(module-path-string?10.1 #f temp28_0 #f temp27_0 file26_0))"
@@ -3269,21 +3276,21 @@ static const char *startup_source =
 " #f)"
 " #f))))))))"
 " #f))))"
-"(define-values(planet-version-number?)(lambda(v_36)(begin(exact-nonnegative-integer? v_36))))"
+"(define-values(planet-version-number?)(lambda(v_37)(begin(exact-nonnegative-integer? v_37))))"
 "(define-values"
 "(planet-version-minor-spec?)"
-"(lambda(v_37)"
+"(lambda(v_38)"
 "(begin"
-"(let-values(((or-part_33)(planet-version-number? v_37)))"
+"(let-values(((or-part_33)(planet-version-number? v_38)))"
 "(if or-part_33"
 " or-part_33"
-"(if(pair? v_37)"
-"(if(list? v_37)"
-"(if(= 2(length v_37))"
-"(let-values(((tmp_6)(car v_37)))"
+"(if(pair? v_38)"
+"(if(list? v_38)"
+"(if(= 2(length v_38))"
+"(let-values(((tmp_6)(car v_38)))"
 "(if(if(equal? tmp_6 '=) #t(if(equal? tmp_6 '+) #t(equal? tmp_6 '-)))"
-"(let-values()(planet-version-number?(cadr v_37)))"
-"(let-values()(if(planet-version-number?(car v_37))(planet-version-number?(cadr v_37)) #f))))"
+"(let-values()(planet-version-number?(cadr v_38)))"
+"(let-values()(if(planet-version-number?(car v_38))(planet-version-number?(cadr v_38)) #f))))"
 " #f)"
 " #f)"
 " #f))))))"
@@ -3292,18 +3299,18 @@ static const char *startup_source =
 "(lambda(dots-dir-ok?2_0 file-end-ok?4_0 for-planet?1_0 just-file-ok?3_0 v9_0)"
 "(begin"
 " 'module-path-string?10"
-"(let-values(((v_38) v9_0))"
+"(let-values(((v_39) v9_0))"
 "(let-values(((for-planet?_0) for-planet?1_0))"
 "(let-values(((dots-dir-ok?_0) dots-dir-ok?2_0))"
 "(let-values(((just-file-ok?_0) just-file-ok?3_0))"
 "(let-values(((file-end-ok?_0) file-end-ok?4_0))"
 "(let-values()"
-"(let-values(((len_3)(string-length v_38)))"
+"(let-values(((len_3)(string-length v_39)))"
 "(if(positive? len_3)"
-"(if(not(char=? '#\\/(string-ref v_38 0)))"
-"(if(not(char=? '#\\/(string-ref v_38(sub1 len_3))))"
+"(if(not(char=? '#\\/(string-ref v_39 0)))"
+"(if(not(char=? '#\\/(string-ref v_39(sub1 len_3))))"
 "(let-values(((start-package-version-pos_0 end-package-version-pos_0)"
-"(if for-planet?_0(check-planet-part v_38 len_3)(values 0 0))))"
+"(if for-planet?_0(check-planet-part v_39 len_3)(values 0 0))))"
 "(if start-package-version-pos_0"
 "((letrec-values(((loop_57)"
 "(lambda(i_28 prev-was-slash?_0 saw-slash?_0 saw-dot?_0)"
@@ -3311,7 +3318,7 @@ static const char *startup_source =
 " 'loop"
 "(if(not(negative? i_28))"
 "(let-values()"
-"(let-values(((c_6)(string-ref v_38 i_28)))"
+"(let-values(((c_6)(string-ref v_39 i_28)))"
 "(if(char=? c_6 '#\\/)"
 "(let-values()"
 "(if(not prev-was-slash?_0)"
@@ -3321,9 +3328,9 @@ static const char *startup_source =
 "(let-values()"
 "(if(if(<(add1 i_28) len_3)"
 "(if(not"
-"(char=?(string-ref v_38(add1 i_28)) '#\\/))"
+"(char=?(string-ref v_39(add1 i_28)) '#\\/))"
 "(not"
-"(char=?(string-ref v_38(add1 i_28)) '#\\.))"
+"(char=?(string-ref v_39(add1 i_28)) '#\\.))"
 " #f)"
 " #f)"
 "(if(not saw-slash?_0)"
@@ -3335,7 +3342,7 @@ static const char *startup_source =
 " or-part_34"
 "(if(char=? c_6 '#\\%)"
 "(if(<(+ i_28 2) len_3)"
-"(hex-sequence? v_38(add1 i_28))"
+"(hex-sequence? v_39(add1 i_28))"
 " #f)"
 " #f)))"
 "(let-values()"
@@ -3361,7 +3368,7 @@ static const char *startup_source =
 "(if(= i_29 len_3)"
 "(let-values() #t)"
 "(if(char=?"
-"(string-ref v_38 i_29)"
+"(string-ref v_39 i_29)"
 " '#\\.)"
 "(let-values()"
 "(if(not"
@@ -3374,13 +3381,13 @@ static const char *startup_source =
 " or-part_36"
 "(char=?"
 "(string-ref"
-" v_38"
+" v_39"
 "(add1 i_29))"
 " '#\\/))))"
 "(if(not"
 "(if(char=?"
 "(string-ref"
-" v_38"
+" v_39"
 "(add1 i_29))"
 " '#\\.)"
 "(let-values(((or-part_37)"
@@ -3393,7 +3400,7 @@ static const char *startup_source =
 " or-part_37"
 "(char=?"
 "(string-ref"
-" v_38"
+" v_39"
 "(+ i_29 2))"
 " '#\\/)))"
 " #f))"
@@ -3405,7 +3412,7 @@ static const char *startup_source =
 "(if(char=?"
 " '#\\."
 "(string-ref"
-" v_38"
+" v_39"
 " i_30))"
 "(loop_58"
 "(add1"
@@ -3431,13 +3438,13 @@ static const char *startup_source =
 " #f)))))))))))"
 "(define-values"
 "(planet-user/pkg-string?)"
-"(lambda(v_39)"
+"(lambda(v_40)"
 "(begin"
-"(if(string? v_39)"
-"(let-values(((len_4)(string-length v_39)))"
+"(if(string? v_40)"
+"(let-values(((len_4)(string-length v_40)))"
 "(if(positive? len_4)"
 "(let-values(((vec_11 len_5)"
-"(let-values(((vec_12) v_39))"
+"(let-values(((vec_12) v_40))"
 "(begin(check-string vec_12)(values vec_12(unsafe-string-length vec_12)))))"
 "((start_6) 0))"
 "(begin"
@@ -3466,7 +3473,7 @@ static const char *startup_source =
 " or-part_39"
 "(if(char=? '#\\% c_7)"
 "(if(< i_31(- len_4 2))"
-"(hex-sequence? v_39(add1 i_31))"
+"(hex-sequence? v_40(add1 i_31))"
 " #f)"
 " #f)))))))))"
 "(values result_9)))))"
@@ -3527,7 +3534,7 @@ static const char *startup_source =
 "(let-values()(-(char->integer c_11)(char->integer '#\\0))))))))"
 "(define-values"
 "(check-planet-part)"
-"(lambda(v_40 len_6)"
+"(lambda(v_41 len_6)"
 "(begin"
 "(let-values(((start-package-version-pos_1 end-package-version-pos_1 colon1-pos_0 colon2-pos_0)"
 "((letrec-values(((loop_59)"
@@ -3547,7 +3554,7 @@ static const char *startup_source =
 " colon1-pos_1"
 " colon2-pos_1))"
 "(let-values()"
-"(let-values(((tmp_7)(string-ref v_40 j_2)))"
+"(let-values(((tmp_7)(string-ref v_41 j_2)))"
 "(if(equal? tmp_7 '#\\/)"
 "(let-values()"
 "(loop_59"
@@ -3604,24 +3611,24 @@ static const char *startup_source =
 "(let-values(((colon1-end_0)"
 "(let-values(((or-part_50) colon2-pos_0))"
 "(if or-part_50 or-part_50 end-package-version-pos_1))))"
-"(if(if(integer-sequence? v_40(add1 colon1-pos_0) colon1-end_0)"
+"(if(if(integer-sequence? v_41(add1 colon1-pos_0) colon1-end_0)"
 "(let-values(((or-part_51)(not colon2-pos_0)))"
 "(if or-part_51"
 " or-part_51"
-"(let-values(((tmp_8)(string-ref v_40(add1 colon2-pos_0))))"
+"(let-values(((tmp_8)(string-ref v_41(add1 colon2-pos_0))))"
 "(if(equal? tmp_8 '#\\=)"
-"(let-values()(integer-sequence? v_40(+ 2 colon2-pos_0) end-package-version-pos_1))"
+"(let-values()(integer-sequence? v_41(+ 2 colon2-pos_0) end-package-version-pos_1))"
 "(if(if(equal? tmp_8 '#\\>) #t(equal? tmp_8 '#\\<))"
 "(let-values()"
 "(if(if(<(+ 2 colon2-pos_0) end-package-version-pos_1)"
-"(char=? '#\\=(string-ref v_40(+ colon2-pos_0 2)))"
+"(char=? '#\\=(string-ref v_41(+ colon2-pos_0 2)))"
 " #f)"
 "(let-values()"
-"(integer-sequence? v_40(+ 3 colon2-pos_0) end-package-version-pos_1))"
+"(integer-sequence? v_41(+ 3 colon2-pos_0) end-package-version-pos_1))"
 "(let-values()"
-"(integer-sequence? v_40(+ 2 colon2-pos_0) end-package-version-pos_1))))"
+"(integer-sequence? v_41(+ 2 colon2-pos_0) end-package-version-pos_1))))"
 "(let-values()"
-"(integer-range-sequence? v_40(add1 colon2-pos_0) end-package-version-pos_1)))))))"
+"(integer-range-sequence? v_41(add1 colon2-pos_0) end-package-version-pos_1)))))))"
 " #f)"
 "(let-values()(values colon1-pos_0 end-package-version-pos_1))"
 "(let-values()(values #f #f)))))"
@@ -3770,11 +3777,11 @@ static const char *startup_source =
 "(define-values(make-weak-intern-table)(lambda()(begin(weak-intern-table1.1(box(table2.1(hasheqv) 0 128))))))"
 "(define-values"
 "(weak-intern!)"
-"(lambda(tt_0 v_41)"
+"(lambda(tt_0 v_42)"
 "(begin"
 "(let-values(((b_8)(weak-intern-table-box tt_0)))"
 "(let-values(((t_11)(unbox b_8)))"
-"(let-values(((code_0)(equal-hash-code v_41)))"
+"(let-values(((code_0)(equal-hash-code v_42)))"
 "(let-values(((vals_0)(hash-ref(table-ht t_11) code_0 null)))"
 "(let-values(((or-part_31)"
 "(let-values(((lst_19) vals_0))"
@@ -3797,7 +3804,7 @@ static const char *startup_source =
 "(let-values(((bv_0)"
 "(weak-box-value"
 " b_9)))"
-"(if(equal? bv_0 v_41)"
+"(if(equal? bv_0 v_42)"
 " bv_0"
 " #f))))))"
 "(values result_21)))))"
@@ -3814,11 +3821,11 @@ static const char *startup_source =
 "(let-values(((ht_21)(table-ht pruned-t_0)))"
 "(let-values(((new-t_0)"
 "(table2.1"
-"(hash-set ht_21 code_0(cons(make-weak-box v_41)(hash-ref ht_21 code_0 null)))"
+"(hash-set ht_21 code_0(cons(make-weak-box v_42)(hash-ref ht_21 code_0 null)))"
 "(add1(table-count pruned-t_0))"
 "(table-prune-at pruned-t_0))))"
-"(let-values(((or-part_33)(if(box-cas! b_8 t_11 new-t_0) v_41 #f)))"
-"(if or-part_33 or-part_33(weak-intern! tt_0 v_41)))))))))))))))"
+"(let-values(((or-part_33)(if(box-cas! b_8 t_11 new-t_0) v_42 #f)))"
+"(if or-part_33 or-part_33(weak-intern! tt_0 v_42)))))))))))))))"
 "(define-values"
 "(prune-table)"
 "(lambda(t_12)"
@@ -3830,12 +3837,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_22)))"
 "((letrec-values(((for-loop_16)"
-"(lambda(table_8 i_36)"
+"(lambda(table_9 i_36)"
 "(begin"
 " 'for-loop"
 "(if i_36"
-"(let-values(((k_6 vals_1)(hash-iterate-key+value ht_22 i_36)))"
-"(let-values(((table_9)"
+"(let-values(((k_7 vals_1)(hash-iterate-key+value ht_22 i_36)))"
+"(let-values(((table_10)"
 "(let-values(((new-vals_0)"
 "(reverse$1"
 "(let-values(((lst_21) vals_1))"
@@ -3887,39 +3894,39 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_18)"
-"(lambda(table_10)"
+"(lambda(table_11)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_11)"
 "(let-values(((table_12)"
-" table_10))"
+"(let-values(((table_13)"
+" table_11))"
 "(if(pair?"
 " new-vals_0)"
-"(let-values(((table_13)"
-" table_12))"
 "(let-values(((table_14)"
+" table_13))"
+"(let-values(((table_15)"
 "(let-values()"
 "(let-values(((key_9"
 " val_2)"
 "(let-values()"
 "(values"
-" k_6"
+" k_7"
 " new-vals_0))))"
 "(hash-set"
-" table_13"
+" table_14"
 " key_9"
 " val_2)))))"
 "(values"
-" table_14)))"
-" table_12))))"
-" table_11))))))"
+" table_15)))"
+" table_13))))"
+" table_12))))))"
 " for-loop_18)"
-" table_8)))))"
+" table_9)))))"
 "(if(not #f)"
-"(for-loop_16 table_9(hash-iterate-next ht_22 i_36))"
-" table_9)))"
-" table_8)))))"
+"(for-loop_16 table_10(hash-iterate-next ht_22 i_36))"
+" table_10)))"
+" table_9)))))"
 " for-loop_16)"
 " '#hash()"
 "(hash-iterate-first ht_22))))))"
@@ -3934,7 +3941,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_37"
-"(let-values(((k_7 vals_2)(hash-iterate-key+value ht_23 i_37)))"
+"(let-values(((k_8 vals_2)(hash-iterate-key+value ht_23 i_37)))"
 "(let-values(((result_23)"
 "(let-values(((result_24) result_22))"
 "(let-values(((result_25)"
@@ -4151,37 +4158,37 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "((letrec-values(((loop_61)"
-"(lambda(v_42)"
+"(lambda(v_43)"
 "(begin"
 " 'loop"
-"(if(if(pair? v_42)"
+"(if(if(pair? v_43)"
 "(if(eq?"
 " 'quote"
 "(car"
-" v_42))"
+" v_43))"
 "(null?"
 "(cddr"
-" v_42))"
+" v_43))"
 " #f)"
 " #f)"
 "(let-values()"
 "(format-symbol"
-"(cadr v_42)))"
+"(cadr v_43)))"
 "(if(if(pair?"
-" v_42)"
+" v_43)"
 "(eq?"
 " 'submod"
-"(car v_42))"
+"(car v_43))"
 " #f)"
 "(let-values()"
 "(format-submod"
 "(loop_61"
-"(cadr v_42))"
-"(cddr v_42)))"
+"(cadr v_43))"
+"(cddr v_43)))"
 "(let-values()"
 "(format"
 "                                                                                                           \"~.s\""
-" v_42))))))))"
+" v_43))))))))"
 " loop_61)"
 "(module-path-index-path r_13))"
 "(loop_60(module-path-index-base r_13))))"
@@ -4521,15 +4528,15 @@ static const char *startup_source =
 "(begin(set-module-path-index-shift-cache! mpi_9 cache_1) cache_1)))))))"
 "(define-values"
 "(shift-cache-ref)"
-"(lambda(cache_2 v_43)"
+"(lambda(cache_2 v_44)"
 "(begin"
-"(if cache_2(let-values(((b_13)(weak-box-value cache_2)))(if b_13(hash-ref(unbox b_13) v_43 #f) #f)) #f))))"
+"(if cache_2(let-values(((b_13)(weak-box-value cache_2)))(if b_13(hash-ref(unbox b_13) v_44 #f) #f)) #f))))"
 "(define-values"
 "(shift-cache-set!)"
-"(lambda(cache_3 v_44 r_18)"
+"(lambda(cache_3 v_45 r_18)"
 "(begin"
 "(let-values(((b_14)(weak-box-value cache_3)))"
-"(if b_14(let-values()(set-box! b_14(hash-set(unbox b_14) v_44 r_18)))(void))))))"
+"(if b_14(let-values()(set-box! b_14(hash-set(unbox b_14) v_45 r_18)))(void))))))"
 "(define-values(top-level-module-path-index)(make-self-module-path-index(1/make-resolved-module-path 'top-level)))"
 "(define-values(top-level-module-path-index?)(lambda(mpi_10)(begin(eq? top-level-module-path-index mpi_10))))"
 "(define-values(non-self-module-path-index?)(lambda(mpi_11)(begin(if(module-path-index-path mpi_11) #t #f))))"
@@ -4666,16 +4673,16 @@ static const char *startup_source =
 "(1/current-module-name-resolver)"
 "(make-parameter"
 " core-module-name-resolver"
-"(lambda(v_45)"
+"(lambda(v_46)"
 "(begin"
-"(if(if(procedure? v_45)(if(procedure-arity-includes? v_45 2)(procedure-arity-includes? v_45 4) #f) #f)"
+"(if(if(procedure? v_46)(if(procedure-arity-includes? v_46 2)(procedure-arity-includes? v_46 4) #f) #f)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'current-module-name-resolver"
 "            \"(and/c (procedure-arity-includes/c 2) (procedure-arity-includes/c 4))\""
-" v_45)))"
-" v_45))))"
+" v_46)))"
+" v_46))))"
 "(define-values"
 "(1/current-module-declare-name)"
 "(make-parameter"
@@ -4716,69 +4723,69 @@ static const char *startup_source =
 "(force/composable)"
 "(lambda(root_1)"
 "(begin"
-"(let-values(((v_46)(unsafe-struct-ref root_1 0)))"
-"(if(procedure? v_46)"
+"(let-values(((v_47)(unsafe-struct-ref root_1 0)))"
+"(if(procedure? v_47)"
 "(let-values()"
 "(begin"
-"(unsafe-struct-set! root_1 0(make-running(object-name v_46)))"
+"(unsafe-struct-set! root_1 0(make-running(object-name v_47)))"
 "(call-with-exception-handler"
 "(lambda(e_5)(begin(unsafe-struct-set! root_1 0(make-reraise e_5)) e_5))"
 "(lambda()"
 "((letrec-values(((loop_63)"
-"(lambda(v_47)"
+"(lambda(v_48)"
 "(begin"
 " 'loop"
-"(if(composable-promise? v_47)"
+"(if(composable-promise? v_48)"
 "(let-values()"
-"(let-values(((v*_0)(unsafe-struct-ref v_47 0)))"
+"(let-values(((v*_0)(unsafe-struct-ref v_48 0)))"
 "(begin"
-"(unsafe-struct-set! v_47 0 root_1)"
+"(unsafe-struct-set! v_48 0 root_1)"
 "(if(procedure? v*_0)"
 "(let-values()(loop_63(v*_0)))"
 "(if(pair? v*_0)"
 "(let-values()"
 "(begin(unsafe-struct-set! root_1 0 v*_0)(unsafe-car v*_0)))"
 "(let-values()(loop_63 v*_0)))))))"
-"(if(promise? v_47)"
-"(let-values()(begin(unsafe-struct-set! root_1 0 v_47)(force v_47)))"
-"(let-values()(begin(unsafe-struct-set! root_1 0(list v_47)) v_47))))))))"
+"(if(promise? v_48)"
+"(let-values()(begin(unsafe-struct-set! root_1 0 v_48)(force v_48)))"
+"(let-values()(begin(unsafe-struct-set! root_1 0(list v_48)) v_48))))))))"
 " loop_63)"
-"(v_46))))))"
-"(if(pair? v_46)"
-"(let-values()(if(null?(unsafe-cdr v_46))(unsafe-car v_46)(apply values v_46)))"
-"(if(composable-promise? v_46)"
-"(let-values()(force/composable v_46))"
-"(if(null? v_46)"
+"(v_47))))))"
+"(if(pair? v_47)"
+"(let-values()(if(null?(unsafe-cdr v_47))(unsafe-car v_47)(apply values v_47)))"
+"(if(composable-promise? v_47)"
+"(let-values()(force/composable v_47))"
+"(if(null? v_47)"
 "(let-values()(values))"
-"(if(promise? v_46)"
-"(let-values()(force v_46))"
-"                  (let-values () (error 'force \"composable promise with invalid contents: ~e\" v_46)))))))))))"
+"(if(promise? v_47)"
+"(let-values()(force v_47))"
+"                  (let-values () (error 'force \"composable promise with invalid contents: ~e\" v_47)))))))))))"
 "(define-values"
 "(reify-result)"
-"(lambda(v_48)"
+"(lambda(v_49)"
 "(begin"
-"(if(pair? v_48)"
-"(let-values()(if(null?(unsafe-cdr v_48))(unsafe-car v_48)(apply values v_48)))"
-"(if(null? v_48)"
+"(if(pair? v_49)"
+"(let-values()(if(null?(unsafe-cdr v_49))(unsafe-car v_49)(apply values v_49)))"
+"(if(null? v_49)"
 "(let-values()(values))"
-"(if(reraise? v_48)"
-"(let-values()(v_48))"
-"            (let-values () (error 'force \"promise with invalid contents: ~e\" v_48))))))))"
+"(if(reraise? v_49)"
+"(let-values()(v_49))"
+"            (let-values () (error 'force \"promise with invalid contents: ~e\" v_49))))))))"
 "(define-values"
 "(force/generic)"
 "(lambda(promise_0)"
 "(begin"
 "(reify-result"
-"(let-values(((v_49)(unsafe-struct-ref promise_0 0)))"
-"(if(procedure? v_49)"
+"(let-values(((v_50)(unsafe-struct-ref promise_0 0)))"
+"(if(procedure? v_50)"
 "(begin"
-"(unsafe-struct-set! promise_0 0(make-running(object-name v_49)))"
+"(unsafe-struct-set! promise_0 0(make-running(object-name v_50)))"
 "(call-with-exception-handler"
 "(lambda(e_10)(begin(unsafe-struct-set! promise_0 0(make-reraise e_10)) e_10))"
 "(lambda()"
-"(let-values(((vs_0)(call-with-values v_49 list)))"
+"(let-values(((vs_0)(call-with-values v_50 list)))"
 "(begin(unsafe-struct-set! promise_0 0 vs_0) vs_0)))))"
-" v_49))))))"
+" v_50))))))"
 "(define-values"
 "(force)"
 "(lambda(promise_1)(begin(if(promise? promise_1)((promise-forcer promise_1) promise_1) promise_1))))"
@@ -4787,42 +4794,42 @@ static const char *startup_source =
 "(lambda(promise_2 port_2 write?_0)"
 "(begin"
 "((letrec-values(((loop_64)"
-"(lambda(v_50)"
+"(lambda(v_51)"
 "(begin"
 " 'loop"
-"(if(reraise? v_50)"
+"(if(reraise? v_51)"
 "(let-values()"
-"(let-values(((r_20)(reraise-val v_50)))"
+"(let-values(((r_20)(reraise-val v_51)))"
 "(if(exn? r_20)"
 "(fprintf"
 " port_2"
 "                                     (if write?_0 \"#<promise!exn!~s>\" \"#<promise!exn!~a>\")"
 "(exn-message r_20))"
 "                                    (fprintf port_2 (if write?_0 \"#<promise!raise!~s>\" \"#<promise!raise!~a>\") r_20))))"
-"(if(running? v_50)"
+"(if(running? v_51)"
 "(let-values()"
-"(let-values(((r_21)(running-name v_50)))"
+"(let-values(((r_21)(running-name v_51)))"
 "(if r_21"
 "                                      (fprintf port_2 \"#<promise:!running!~a>\" r_21)"
 "                                      (fprintf port_2 \"#<promise:!running>\"))))"
-"(if(procedure? v_50)"
+"(if(procedure? v_51)"
 "(let-values()"
-"(let-values(((c1_18)(object-name v_50)))"
+"(let-values(((c1_18)(object-name v_51)))"
 "(if c1_18"
 "                                        ((lambda (n_19) (fprintf port_2 \"#<promise:~a>\" n_19)) c1_18)"
 "                                        (let-values () (display \"#<promise>\" port_2)))))"
-"(if(promise? v_50)"
-"(let-values()(loop_64(unsafe-struct-ref v_50 0)))"
-"(if(null? v_50)"
+"(if(promise? v_51)"
+"(let-values()(loop_64(unsafe-struct-ref v_51 0)))"
+"(if(null? v_51)"
 "                                      (let-values () (fprintf port_2 \"#<promise!(values)>\"))"
-"(if(null?(cdr v_50))"
+"(if(null?(cdr v_51))"
 "(let-values()"
-"                                          (fprintf port_2 (if write?_0 \"#<promise!~s>\" \"#<promise!~a>\") (car v_50)))"
+"                                          (fprintf port_2 (if write?_0 \"#<promise!~s>\" \"#<promise!~a>\") (car v_51)))"
 "(let-values()"
 "(begin"
 "                                            (display \"#<promise!(values\" port_2)"
 "                                            (let-values (((fmt_0) (if write?_0 \" ~s\" \" ~a\")))"
-"(for-each(lambda(x_22)(fprintf port_2 fmt_0 x_22)) v_50))"
+"(for-each(lambda(x_22)(fprintf port_2 fmt_0 x_22)) v_51))"
 "                                            (display \")>\" port_2)))))))))))))"
 " loop_64)"
 "(unsafe-struct-ref promise_2 0)))))"
@@ -4831,12 +4838,12 @@ static const char *startup_source =
 "(let-values(((prop_0 pred?_0 get_0)"
 "(make-struct-type-property"
 " 'forcer"
-"(lambda(v_51 info_0)"
+"(lambda(v_52 info_0)"
 "(begin"
-"(if(if(procedure? v_51)(procedure-arity-includes? v_51 1) #f)"
+"(if(if(procedure? v_52)(procedure-arity-includes? v_52 1) #f)"
 "(void)"
-"                       (let-values () (raise-argument-error 'prop:force \"(any/c . -> . any)\" v_51)))"
-" v_51))"
+"                       (let-values () (raise-argument-error 'prop:force \"(any/c . -> . any)\" v_52)))"
+" v_52))"
 " null"
 " #t)))"
 "(values prop_0 get_0)))"
@@ -5031,34 +5038,34 @@ static const char *startup_source =
 "(cons"
 " prop:evt"
 "(lambda(p_11)"
-"(let-values(((v_52)(unsafe-struct-ref p_11 0)))"
-"(wrap-evt(if(syncinfo? v_52)(syncinfo-done-evt v_52) always-evt) void))))"
+"(let-values(((v_53)(unsafe-struct-ref p_11 0)))"
+"(wrap-evt(if(syncinfo? v_53)(syncinfo-done-evt v_53) always-evt) void))))"
 "(cons"
 " prop:force"
 "(lambda(p_12)"
-"(let-values(((v_53)(unsafe-struct-ref p_12 0)))"
+"(let-values(((v_54)(unsafe-struct-ref p_12 0)))"
 "(reify-result"
-"(if(not(syncinfo? v_53))"
-"(let-values() v_53)"
-"(if(running-thread?(syncinfo-thunk v_53))"
+"(if(not(syncinfo? v_54))"
+"(let-values() v_54)"
+"(if(running-thread?(syncinfo-thunk v_54))"
 "(let-values()"
-"(let-values(((r_22)(syncinfo-thunk v_53)))"
+"(let-values(((r_22)(syncinfo-thunk v_54)))"
 "(if(eq?(running-thread-thread r_22)(current-thread))"
 "(r_22)"
-"(begin(sync(syncinfo-done-evt v_53))(unsafe-struct-ref p_12 0)))))"
+"(begin(sync(syncinfo-done-evt v_54))(unsafe-struct-ref p_12 0)))))"
 "(let-values()"
 "(begin"
 "(call-with-semaphore"
-"(syncinfo-access-sema v_53)"
-"(lambda(p_13 v_54)"
-"(let-values(((thunk_4)(syncinfo-thunk v_54)))"
-"(let-values(((done_0)(syncinfo-done-sema v_54)))"
+"(syncinfo-access-sema v_54)"
+"(lambda(p_13 v_55)"
+"(let-values(((thunk_4)(syncinfo-thunk v_55)))"
+"(let-values(((done_0)(syncinfo-done-sema v_55)))"
 "(if(running-thread? thunk_4)"
 "(void)"
 "(let-values()"
 "(begin"
 "(set-syncinfo-thunk!"
-" v_54"
+" v_55"
 "(make-running-thread(object-name thunk_4)(current-thread)))"
 "(call-with-exception-handler"
 "(lambda(e_11)"
@@ -5072,14 +5079,14 @@ static const char *startup_source =
 "(semaphore-post done_0))))))))))"
 " #f"
 " p_12"
-" v_53)"
+" v_54)"
 "(unsafe-struct-ref p_12 0)))))))))"
 "(cons"
 " prop:custom-write"
 "(lambda(p_14 port_4 write?_2)"
-"(let-values(((v_55)(unsafe-struct-ref p_14 0)))"
+"(let-values(((v_56)(unsafe-struct-ref p_14 0)))"
 "(promise-printer"
-"(if(syncinfo? v_55)(make-promise(syncinfo-thunk v_55)) p_14)"
+"(if(syncinfo? v_56)(make-promise(syncinfo-thunk v_56)) p_14)"
 " port_4"
 " write?_2)))))"
 "(current-inspector)"
@@ -5103,25 +5110,25 @@ static const char *startup_source =
 "(cons"
 " prop:evt"
 "(lambda(p_15)"
-"(let-values(((v_56)(unsafe-struct-ref p_15 0)))"
-"(wrap-evt(if(running? v_56)(running-thread-thread v_56) always-evt) void))))"
+"(let-values(((v_57)(unsafe-struct-ref p_15 0)))"
+"(wrap-evt(if(running? v_57)(running-thread-thread v_57) always-evt) void))))"
 "(cons"
 " prop:force"
 "(lambda(p_16)"
-"(let-values(((v_57)(unsafe-struct-ref p_16 0)))"
-"(reify-result"
-"(if(running-thread? v_57)"
-"(let-values(((t_13)(running-thread-thread v_57)))"
-"(let-values((()(begin(thread-wait t_13)(values))))"
 "(let-values(((v_58)(unsafe-struct-ref p_16 0)))"
+"(reify-result"
 "(if(running-thread? v_58)"
+"(let-values(((t_13)(running-thread-thread v_58)))"
+"(let-values((()(begin(thread-wait t_13)(values))))"
+"(let-values(((v_59)(unsafe-struct-ref p_16 0)))"
+"(if(running-thread? v_59)"
 "(error"
 " 'force"
 "                                       \"promise's thread terminated ~a\\n  promise: ~e\""
 "                                       \"without result or exception\""
 " p_16)"
-" v_58))))"
-" v_57))))))"
+" v_59))))"
+" v_58))))))"
 "(current-inspector)"
 " #f"
 " '()"
@@ -5143,16 +5150,16 @@ static const char *startup_source =
 "(cons"
 " prop:force"
 "(lambda(p_17)"
-"(let-values(((v_59)(unsafe-struct-ref p_17 0)))"
+"(let-values(((v_60)(unsafe-struct-ref p_17 0)))"
 "(reify-result"
-"(if(procedure? v_59)"
+"(if(procedure? v_60)"
 "(let-values(((controller_0)"
-"(if(running-thread? v_59)(running-thread-thread v_59)(v_59))))"
+"(if(running-thread? v_60)(running-thread-thread v_60)(v_60))))"
 "(begin"
 "(thread-send controller_0 'force!)"
 "(thread-wait controller_0)"
 "(unsafe-struct-ref p_17 0)))"
-" v_59))))))"
+" v_60))))))"
 "(current-inspector)"
 " #f"
 " '()"
@@ -5161,7 +5168,7 @@ static const char *startup_source =
 "(values struct:_13 make-_13 ?_13)))"
 "(define-values"
 "(phase?)"
-"(lambda(v_28)(begin(let-values(((or-part_0)(not v_28)))(if or-part_0 or-part_0(exact-integer? v_28))))))"
+"(lambda(v_29)(begin(let-values(((or-part_0)(not v_29)))(if or-part_0 or-part_0(exact-integer? v_29))))))"
 "(define-values(phase+)(lambda(a_2 b_15)(begin(if a_2(if b_15(+ a_2 b_15) #f) #f))))"
 "(define-values(phase-)(lambda(a_29 b_16)(begin(if a_29(if b_16(- a_29 b_16) #f) #f))))"
 "(define-values"
@@ -5282,8 +5289,8 @@ static const char *startup_source =
 "(let-values(((or-part_63)(hash-ref tail-table_0(car mpi-shifts_0) #f)))"
 "(if or-part_63"
 " or-part_63"
-"(let-values(((v_60)(cons(car mpi-shifts_0) tail_0)))"
-"(begin(hash-set! tail-table_0(car mpi-shifts_0) v_60) v_60)))))))))))"
+"(let-values(((v_61)(cons(car mpi-shifts_0) tail_0)))"
+"(begin(hash-set! tail-table_0(car mpi-shifts_0) v_61) v_61)))))))))))"
 "(define-values"
 "(intern-context-triple)"
 "(lambda(scs_1 sms_1 mpi-shifts_1 state_5)"
@@ -5308,8 +5315,8 @@ static const char *startup_source =
 "(intern-properties)"
 "(lambda(all-props_0 get-preserved-props_0 state_6)"
 "(begin"
-"(let-values(((v_49)(hash-ref(serialize-state-props state_6) all-props_0 'no)))"
-"(if(eq? v_49 'no)"
+"(let-values(((v_50)(hash-ref(serialize-state-props state_6) all-props_0 'no)))"
+"(if(eq? v_50 'no)"
 "(let-values()"
 "(let-values(((preserved-props_0)(get-preserved-props_0)))"
 "(let-values(((p_18)"
@@ -5327,11 +5334,11 @@ static const char *startup_source =
 " preserved-props_0)"
 " preserved-props_0)))))))"
 "(begin(hash-set!(serialize-state-props state_6) all-props_0 p_18) p_18))))"
-"(let-values() v_49))))))"
+"(let-values() v_50))))))"
 "(define-values"
 "(push-syntax-context!)"
-"(lambda(state_7 v_53)"
-"(begin(let-values(((b_18)(serialize-state-syntax-context state_7)))(set-box! b_18(cons v_53(unbox b_18)))))))"
+"(lambda(state_7 v_54)"
+"(begin(let-values(((b_18)(serialize-state-syntax-context state_7)))(set-box! b_18(cons v_54(unbox b_18)))))))"
 "(define-values"
 "(get-syntax-context)"
 "(lambda(state_8)"
@@ -5344,19 +5351,19 @@ static const char *startup_source =
 "(begin(let-values(((b_20)(serialize-state-syntax-context state_9)))(set-box! b_20(cdr(unbox b_20)))))))"
 "(define-values"
 "(immutable-prefab-struct-key)"
-"(lambda(v_28)"
-"(begin(let-values(((k_8)(prefab-struct-key v_28)))(if k_8(if(all-fields-immutable? k_8) k_8 #f) #f)))))"
+"(lambda(v_29)"
+"(begin(let-values(((k_9)(prefab-struct-key v_29)))(if k_9(if(all-fields-immutable? k_9) k_9 #f) #f)))))"
 "(define-values"
 "(all-fields-immutable?)"
-"(lambda(k_9)"
+"(lambda(k_10)"
 "(begin"
-"(let-values(((or-part_11)(symbol? k_9)))"
+"(let-values(((or-part_11)(symbol? k_10)))"
 "(if or-part_11"
 " or-part_11"
-"(let-values(((or-part_2)(null? k_9)))"
+"(let-values(((or-part_2)(null? k_10)))"
 "(if or-part_2"
 " or-part_2"
-"(let-values(((rk_0)(cdr k_9)))"
+"(let-values(((rk_0)(cdr k_10)))"
 "(let-values(((rk_1)(if(if(pair? rk_0)(exact-integer?(car rk_0)) #f)(cdr rk_0) rk_0)))"
 "(let-values(((rk_2)"
 "(if(if(pair? rk_1)(pair?(car rk_1)) #f)"
@@ -5365,7 +5372,7 @@ static const char *startup_source =
 "(if(if(pair? rk_2)(vector?(car rk_2)) #f)"
 "(if(zero?(vector-length(car rk_2)))(all-fields-immutable?(cdr rk_2)) #f)"
 "(all-fields-immutable? rk_2))))))))))))"
-" (define-values (not-an-fX.1) (lambda (who_7 v_61) (begin 'not-an-fX (raise-argument-error who_7 \"fixnum?\" v_61))))"
+" (define-values (not-an-fX.1) (lambda (who_7 v_62) (begin 'not-an-fX (raise-argument-error who_7 \"fixnum?\" v_62))))"
 "(define-values"
 "(datum-map-slow)"
 "(lambda(tail?_0 s_40 f_21 seen_0)"
@@ -5406,7 +5413,7 @@ static const char *startup_source =
 " 'for/vector"
 "                                                   \"exact-nonnegative-integer?\""
 " len_7)))"
-"(let-values(((v_62)(make-vector len_7 0)))"
+"(let-values(((v_63)(make-vector len_7 0)))"
 "(begin"
 "(if(zero? len_7)"
 "(void)"
@@ -5436,7 +5443,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_62"
+" v_63"
 " i_42"
 "(let-values()"
 "(loop_65"
@@ -5463,7 +5470,7 @@ static const char *startup_source =
 " for-loop_21)"
 " 0"
 " 0)))))"
-" v_62)))))))"
+" v_63)))))))"
 "(if(box? s_7)"
 "(let-values()(f_21 #f(box-immutable(loop_65 #f(unbox s_7) seen_1))))"
 "(let-values(((c1_20)(immutable-prefab-struct-key s_7)))"
@@ -5532,40 +5539,40 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_26)))"
 "((letrec-values(((for-loop_27)"
-"(lambda(table_15 i_44)"
+"(lambda(table_16 i_44)"
 "(begin"
 " 'for-loop"
 "(if i_44"
-"(let-values(((k_10 v_63)"
+"(let-values(((k_11 v_64)"
 "(hash-iterate-key+value"
 " ht_26"
 " i_44)))"
-"(let-values(((table_16)"
 "(let-values(((table_17)"
-" table_15))"
 "(let-values(((table_18)"
+" table_16))"
+"(let-values(((table_19)"
 "(let-values()"
 "(let-values(((key_13"
 " val_4)"
 "(let-values()"
 "(values"
-" k_10"
+" k_11"
 "(loop_65"
 " #f"
-" v_63"
+" v_64"
 " seen_1)))))"
 "(hash-set"
-" table_17"
+" table_18"
 " key_13"
 " val_4)))))"
 "(values"
-" table_18)))))"
+" table_19)))))"
 "(if(not #f)"
 "(for-loop_27"
-" table_16"
+" table_17"
 "(hash-iterate-next ht_26 i_44))"
-" table_16)))"
-" table_15)))))"
+" table_17)))"
+" table_16)))))"
 " for-loop_27)"
 " '#hasheq()"
 "(hash-iterate-first ht_26))))))"
@@ -5579,42 +5586,42 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_27)))"
 "((letrec-values(((for-loop_28)"
-"(lambda(table_19 i_45)"
+"(lambda(table_20 i_45)"
 "(begin"
 " 'for-loop"
 "(if i_45"
-"(let-values(((k_11 v_64)"
+"(let-values(((k_12 v_65)"
 "(hash-iterate-key+value"
 " ht_27"
 " i_45)))"
-"(let-values(((table_10)"
 "(let-values(((table_11)"
-" table_19))"
 "(let-values(((table_12)"
+" table_20))"
+"(let-values(((table_13)"
 "(let-values()"
 "(let-values(((key_14"
 " val_5)"
 "(let-values()"
 "(values"
-" k_11"
+" k_12"
 "(loop_65"
 " #f"
-" v_64"
+" v_65"
 " seen_1)))))"
 "(hash-set"
-" table_11"
+" table_12"
 " key_14"
 " val_5)))))"
 "(values"
-" table_12)))))"
+" table_13)))))"
 "(if(not #f)"
 "(for-loop_28"
-" table_10"
+" table_11"
 "(hash-iterate-next"
 " ht_27"
 " i_45))"
-" table_10)))"
-" table_19)))))"
+" table_11)))"
+" table_20)))))"
 " for-loop_28)"
 " '#hasheqv()"
 "(hash-iterate-first ht_27))))))"
@@ -5627,42 +5634,42 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_25)))"
 "((letrec-values(((for-loop_29)"
-"(lambda(table_20 i_46)"
+"(lambda(table_21 i_46)"
 "(begin"
 " 'for-loop"
 "(if i_46"
-"(let-values(((k_12 v_65)"
+"(let-values(((k_13 v_66)"
 "(hash-iterate-key+value"
 " ht_25"
 " i_46)))"
-"(let-values(((table_21)"
 "(let-values(((table_22)"
-" table_20))"
 "(let-values(((table_23)"
+" table_21))"
+"(let-values(((table_24)"
 "(let-values()"
 "(let-values(((key_15"
 " val_6)"
 "(let-values()"
 "(values"
-" k_12"
+" k_13"
 "(loop_65"
 " #f"
-" v_65"
+" v_66"
 " seen_1)))))"
 "(hash-set"
-" table_22"
+" table_23"
 " key_15"
 " val_6)))))"
 "(values"
-" table_23)))))"
+" table_24)))))"
 "(if(not #f)"
 "(for-loop_29"
-" table_21"
+" table_22"
 "(hash-iterate-next"
 " ht_25"
 " i_46))"
-" table_21)))"
-" table_20)))))"
+" table_22)))"
+" table_21)))))"
 " for-loop_29)"
 " '#hash()"
 "(hash-iterate-first ht_25)))))))))"
@@ -5711,66 +5718,66 @@ static const char *startup_source =
 "(values struct:_0 make-_0 ?_0(make-struct-field-accessor -ref_0 0 'content))))"
 "(define-values"
 "(plain-property-value)"
-"(lambda(v_66)(begin(if(preserved-property-value? v_66)(preserved-property-value-content v_66) v_66))))"
+"(lambda(v_67)(begin(if(preserved-property-value? v_67)(preserved-property-value-content v_67) v_67))))"
 "(define-values"
 "(check-value-to-preserve)"
-"(lambda(v_67 syntax?_0)"
+"(lambda(v_68 syntax?_0)"
 "(begin"
 "(let-values(((check-preserve_0)"
-"(lambda(tail?_2 v_68)"
+"(lambda(tail?_2 v_69)"
 "(begin"
 " 'check-preserve"
 "(begin"
-"(if(let-values(((or-part_72)(null? v_68)))"
+"(if(let-values(((or-part_72)(null? v_69)))"
 "(if or-part_72"
 " or-part_72"
-"(let-values(((or-part_73)(boolean? v_68)))"
+"(let-values(((or-part_73)(boolean? v_69)))"
 "(if or-part_73"
 " or-part_73"
-"(let-values(((or-part_74)(symbol? v_68)))"
+"(let-values(((or-part_74)(symbol? v_69)))"
 "(if or-part_74"
 " or-part_74"
-"(let-values(((or-part_75)(number? v_68)))"
+"(let-values(((or-part_75)(number? v_69)))"
 "(if or-part_75"
 " or-part_75"
-"(let-values(((or-part_76)(char? v_68)))"
+"(let-values(((or-part_76)(char? v_69)))"
 "(if or-part_76"
 " or-part_76"
-"(let-values(((or-part_77)(string? v_68)))"
+"(let-values(((or-part_77)(string? v_69)))"
 "(if or-part_77"
 " or-part_77"
-"(let-values(((or-part_29)(bytes? v_68)))"
+"(let-values(((or-part_29)(bytes? v_69)))"
 "(if or-part_29"
 " or-part_29"
-"(let-values(((or-part_78)(regexp? v_68)))"
+"(let-values(((or-part_78)(regexp? v_69)))"
 "(if or-part_78"
 " or-part_78"
-"(let-values(((or-part_79)(syntax?_0 v_68)))"
+"(let-values(((or-part_79)(syntax?_0 v_69)))"
 "(if or-part_79"
 " or-part_79"
-"(let-values(((or-part_80)(pair? v_68)))"
+"(let-values(((or-part_80)(pair? v_69)))"
 "(if or-part_80"
 " or-part_80"
-"(let-values(((or-part_81)(vector? v_68)))"
+"(let-values(((or-part_81)(vector? v_69)))"
 "(if or-part_81"
 " or-part_81"
-"(let-values(((or-part_82)(box? v_68)))"
+"(let-values(((or-part_82)(box? v_69)))"
 "(if or-part_82"
 " or-part_82"
-"(let-values(((or-part_83)(hash? v_68)))"
+"(let-values(((or-part_83)(hash? v_69)))"
 "(if or-part_83"
 " or-part_83"
 "(immutable-prefab-struct-key"
-" v_68)))))))))))))))))))))))))))"
+" v_69)))))))))))))))))))))))))))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " 'write"
 "                               \"disallowed value in preserved syntax property\""
 "                               \"value\""
-" v_68)))"
-" v_68)))))"
-"(let-values(((s_41) v_67)((f_22) check-preserve_0)((gf_0) check-preserve_0)((seen_2) disallow-cycles$1))"
+" v_69)))"
+" v_69)))))"
+"(let-values(((s_41) v_68)((f_22) check-preserve_0)((gf_0) check-preserve_0)((seen_2) disallow-cycles$1))"
 "((letrec-values(((loop_66)"
 "(lambda(tail?_3 s_42 prev-depth_0)"
 "(begin"
@@ -5815,16 +5822,16 @@ static const char *startup_source =
 "(disallow-cycles$1)"
 "(hash"
 " 'cycle-fail"
-"   (lambda (v_69) (raise-arguments-error 'write \"disallowed cycle in preserved syntax property\" \"at\" v_69))))"
+"   (lambda (v_70) (raise-arguments-error 'write \"disallowed cycle in preserved syntax property\" \"at\" v_70))))"
 "(define-values"
 "(tamper?)"
-"(lambda(v_28)"
+"(lambda(v_29)"
 "(begin"
-"(let-values(((or-part_0)(not v_28)))"
-"(if or-part_0 or-part_0(let-values(((or-part_1)(symbol? v_28)))(if or-part_1 or-part_1(set? v_28))))))))"
-"(define-values(tamper-tainted?)(lambda(v_70)(begin(symbol? v_70))))"
-"(define-values(tamper-armed?)(lambda(v_71)(begin(set? v_71))))"
-"(define-values(tamper-clean?)(lambda(v_72)(begin(not v_72))))"
+"(let-values(((or-part_0)(not v_29)))"
+"(if or-part_0 or-part_0(let-values(((or-part_1)(symbol? v_29)))(if or-part_1 or-part_1(set? v_29))))))))"
+"(define-values(tamper-tainted?)(lambda(v_71)(begin(symbol? v_71))))"
+"(define-values(tamper-armed?)(lambda(v_72)(begin(set? v_72))))"
+"(define-values(tamper-clean?)(lambda(v_27)(begin(not v_27))))"
 "(define-values"
 "(tamper-tainted-for-content)"
 "(lambda(v_73)(begin(if(datum-has-elements? v_73) 'tainted/need-propagate 'tainted))))"
@@ -5877,7 +5884,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_47"
-"(let-values(((k_13 v_74)"
+"(let-values(((k_14 v_74)"
 "(unsafe-immutable-hash-iterate-key+value"
 " ht_17"
 " i_47)))"
@@ -5922,44 +5929,44 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_28)))"
 "((letrec-values(((for-loop_30)"
-"(lambda(table_24 i_48)"
+"(lambda(table_25 i_48)"
 "(begin"
 " 'for-loop"
 "(if i_48"
-"(let-values(((k_14 v_75)"
+"(let-values(((k_15 v_75)"
 "(hash-iterate-key+value"
 " ht_28"
 " i_48)))"
-"(let-values(((table_25)"
 "(let-values(((table_26)"
-" table_24))"
+"(let-values(((table_27)"
+" table_25))"
 "(if(preserved-property-value?"
 " v_75)"
-"(let-values(((table_27)"
-" table_26))"
 "(let-values(((table_28)"
+" table_27))"
+"(let-values(((table_29)"
 "(let-values()"
 "(let-values(((key_16"
 " val_7)"
 "(let-values()"
 "(values"
-" k_14"
+" k_15"
 "(check-value-to-preserve"
 "(plain-property-value"
 " v_75)"
 " syntax?$1)))))"
 "(hash-set"
-" table_27"
+" table_28"
 " key_16"
 " val_7)))))"
-"(values table_28)))"
-" table_26))))"
+"(values table_29)))"
+" table_27))))"
 "(if(not #f)"
 "(for-loop_30"
-" table_25"
+" table_26"
 "(hash-iterate-next ht_28 i_48))"
-" table_25)))"
-" table_24)))))"
+" table_26)))"
+" table_25)))))"
 " for-loop_30)"
 " '#hasheq()"
 "(hash-iterate-first ht_28)))))"
@@ -6378,27 +6385,27 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash ht_29)))"
 "((letrec-values(((for-loop_31)"
-"(lambda(table_29 i_49)"
+"(lambda(table_30 i_49)"
 "(begin"
 " 'for-loop"
 "(if i_49"
-"(let-values(((k_15 v_79)(unsafe-immutable-hash-iterate-key+value ht_29 i_49)))"
-"(let-values(((table_30)"
-"(let-values(((table_31) table_29))"
-"(let-values(((table_32)"
+"(let-values(((k_16 v_79)(unsafe-immutable-hash-iterate-key+value ht_29 i_49)))"
+"(let-values(((table_31)"
+"(let-values(((table_32) table_30))"
+"(let-values(((table_33)"
 "(let-values()"
 "(let-values(((key_17 val_8)"
 "(let-values()"
 "(values"
-" k_15"
+" k_16"
 "(preserved-property-value1.1"
 " v_79)))))"
-"(hash-set table_31 key_17 val_8)))))"
-"(values table_32)))))"
+"(hash-set table_32 key_17 val_8)))))"
+"(values table_33)))))"
 "(if(not #f)"
-"(for-loop_31 table_30(unsafe-immutable-hash-iterate-next ht_29 i_49))"
-" table_30)))"
-" table_29)))))"
+"(for-loop_31 table_31(unsafe-immutable-hash-iterate-next ht_29 i_49))"
+" table_31)))"
+" table_30)))))"
 " for-loop_31)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_29))))"
@@ -7105,26 +7112,26 @@ static const char *startup_source =
 " '(#f . #f)))))"
 "(define-values"
 "(binding-table-symbols)"
-"(lambda(table_33 scs_2 s_71 extra-shifts_1)"
+"(lambda(table_34 scs_2 s_71 extra-shifts_1)"
 "(begin"
 "(let-values(((ht_33 bulk-bindings_1)"
-"(if(hash? table_33)"
-"(values table_33 null)"
+"(if(hash? table_34)"
+"(values table_34 null)"
 "(values"
-"(table-with-bulk-bindings-syms table_33)"
-"(table-with-bulk-bindings-bulk-bindings table_33)))))"
+"(table-with-bulk-bindings-syms table_34)"
+"(table-with-bulk-bindings-bulk-bindings table_34)))))"
 "(set-union"
 "(let-values(((ht_34) ht_33))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_34)))"
 "((letrec-values(((for-loop_34)"
-"(lambda(table_34 i_52)"
+"(lambda(table_35 i_52)"
 "(begin"
 " 'for-loop"
 "(if i_52"
 "(let-values(((sym_8 at-sym_0)(hash-iterate-key+value ht_34 i_52)))"
-"(let-values(((table_35)"
-"(let-values(((table_36) table_34))"
+"(let-values(((table_36)"
+"(let-values(((table_37) table_35))"
 "(if(let-values(((ht_35) at-sym_0))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -7166,19 +7173,19 @@ static const char *startup_source =
 " for-loop_35)"
 " #f"
 "(hash-iterate-first ht_35))))"
-"(let-values(((table_37) table_36))"
-"(let-values(((table_38)"
+"(let-values(((table_38) table_37))"
+"(let-values(((table_39)"
 "(let-values()"
 "(let-values(((key_18 val_9)"
 "(let-values()"
 "(values"
 "(let-values() sym_8)"
 " #t))))"
-"(hash-set table_37 key_18 val_9)))))"
-"(values table_38)))"
-" table_36))))"
-"(if(not #f)(for-loop_34 table_35(hash-iterate-next ht_34 i_52)) table_35)))"
-" table_34)))))"
+"(hash-set table_38 key_18 val_9)))))"
+"(values table_39)))"
+" table_37))))"
+"(if(not #f)(for-loop_34 table_36(hash-iterate-next ht_34 i_52)) table_36)))"
+" table_35)))))"
 " for-loop_34)"
 " '#hasheq()"
 "(hash-iterate-first ht_34))))"
@@ -7186,13 +7193,13 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_34)))"
 "((letrec-values(((for-loop_36)"
-"(lambda(table_39 lst_35)"
+"(lambda(table_40 lst_35)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_35)"
 "(let-values(((bba_1)(unsafe-car lst_35))((rest_14)(unsafe-cdr lst_35)))"
-"(let-values(((table_40)"
-"(let-values(((table_41) table_39))"
+"(let-values(((table_41)"
+"(let-values(((table_42) table_40))"
 "(if(subset?(bulk-binding-at-scopes bba_1) scs_2)"
 "(let-values(((ht_36)"
 "(bulk-binding-symbols"
@@ -7205,7 +7212,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash-keys ht_36)))"
 "((letrec-values(((for-loop_37)"
-"(lambda(table_42 i_5)"
+"(lambda(table_43 i_5)"
 "(begin"
 " 'for-loop"
 "(if i_5"
@@ -7213,10 +7220,10 @@ static const char *startup_source =
 "(hash-iterate-key"
 " ht_36"
 " i_5)))"
-"(let-values(((table_43)"
 "(let-values(((table_44)"
-" table_42))"
 "(let-values(((table_45)"
+" table_43))"
+"(let-values(((table_46)"
 "(let-values()"
 "(let-values(((key_19"
 " val_10)"
@@ -7226,25 +7233,25 @@ static const char *startup_source =
 " sym_9)"
 " #t))))"
 "(hash-set"
-" table_44"
+" table_45"
 " key_19"
 " val_10)))))"
 "(values"
-" table_45)))))"
+" table_46)))))"
 "(if(not #f)"
 "(for-loop_37"
-" table_43"
+" table_44"
 "(hash-iterate-next"
 " ht_36"
 " i_5))"
-" table_43)))"
-" table_42)))))"
+" table_44)))"
+" table_43)))))"
 " for-loop_37)"
-" table_41"
+" table_42"
 "(hash-iterate-first ht_36))))"
-" table_41))))"
-"(if(not #f)(for-loop_36 table_40 rest_14) table_40)))"
-" table_39)))))"
+" table_42))))"
+"(if(not #f)(for-loop_36 table_41 rest_14) table_41)))"
+" table_40)))))"
 " for-loop_36)"
 " '#hasheq()"
 " lst_34))))))))"
@@ -7263,7 +7270,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash ht_37)))"
 "((letrec-values(((for-loop_38)"
-"(lambda(table_46 i_54)"
+"(lambda(table_47 i_54)"
 "(begin"
 " 'for-loop"
 "(if i_54"
@@ -7271,7 +7278,7 @@ static const char *startup_source =
 "(unsafe-immutable-hash-iterate-key+value"
 " ht_37"
 " i_54)))"
-"(let-values(((table_47)"
+"(let-values(((table_48)"
 "(let-values(((new-bindings-for-sym_0)"
 "(let-values(((ht_38)"
 " bindings-for-sym_0))"
@@ -7283,7 +7290,7 @@ static const char *startup_source =
 "(check-in-immutable-hash"
 " ht_38)))"
 "((letrec-values(((for-loop_39)"
-"(lambda(table_48"
+"(lambda(table_49"
 " i_55)"
 "(begin"
 " 'for-loop"
@@ -7293,15 +7300,15 @@ static const char *startup_source =
 "(unsafe-immutable-hash-iterate-key+value"
 " ht_38"
 " i_55)))"
-"(let-values(((table_49)"
 "(let-values(((table_50)"
-" table_48))"
+"(let-values(((table_51)"
+" table_49))"
 "(if(subset?"
 " scopes_5"
 " reachable-scopes_1)"
-"(let-values(((table_51)"
-" table_50))"
 "(let-values(((table_52)"
+" table_51))"
+"(let-values(((table_53)"
 "(let-values()"
 "(let-values(((key_20"
 " val_11)"
@@ -7312,21 +7319,21 @@ static const char *startup_source =
 " state_15)"
 " binding_1))))"
 "(hash-set"
-" table_51"
+" table_52"
 " key_20"
 " val_11)))))"
 "(values"
-" table_52)))"
-" table_50))))"
+" table_53)))"
+" table_51))))"
 "(if(not"
 " #f)"
 "(for-loop_39"
-" table_49"
+" table_50"
 "(unsafe-immutable-hash-iterate-next"
 " ht_38"
 " i_55))"
-" table_49)))"
-" table_48)))))"
+" table_50)))"
+" table_49)))))"
 " for-loop_39)"
 " '#hash()"
 "(unsafe-immutable-hash-iterate-first"
@@ -7334,19 +7341,19 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_40)"
-"(lambda(table_53)"
+"(lambda(table_54)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_54)"
 "(let-values(((table_55)"
-" table_53))"
+"(let-values(((table_56)"
+" table_54))"
 "(if(positive?"
 "(hash-count"
 " new-bindings-for-sym_0))"
-"(let-values(((table_56)"
-" table_55))"
 "(let-values(((table_57)"
+" table_56))"
+"(let-values(((table_58)"
 "(let-values()"
 "(let-values(((key_21"
 " val_12)"
@@ -7355,21 +7362,21 @@ static const char *startup_source =
 " sym_10"
 " new-bindings-for-sym_0))))"
 "(hash-set"
-" table_56"
+" table_57"
 " key_21"
 " val_12)))))"
 "(values"
-" table_57)))"
-" table_55))))"
-" table_54))))))"
+" table_58)))"
+" table_56))))"
+" table_55))))))"
 " for-loop_40)"
-" table_46)))))"
+" table_47)))))"
 "(if(not #f)"
 "(for-loop_38"
-" table_47"
+" table_48"
 "(unsafe-immutable-hash-iterate-next ht_37 i_54))"
-" table_47)))"
-" table_46)))))"
+" table_48)))"
+" table_47)))))"
 " for-loop_38)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_37))))))"
@@ -7549,14 +7556,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_41)))"
 "((letrec-values(((for-loop_45)"
-"(lambda(table_58 i_58)"
+"(lambda(table_59 i_58)"
 "(begin"
 " 'for-loop"
 "(if i_58"
 "(let-values(((sc_0)"
 "(unsafe-immutable-hash-iterate-key ht_41 i_58)))"
-"(let-values(((table_59)"
-"(let-values(((table_60) table_58))"
+"(let-values(((table_60)"
+"(let-values(((table_61) table_59))"
 "(if(let-values(((or-part_95)"
 "(set-member?"
 " reachable-scopes_2"
@@ -7564,9 +7571,9 @@ static const char *startup_source =
 "(if or-part_95"
 " or-part_95"
 "(implicitly-reachable? sc_0)))"
-" table_60"
-"(let-values(((table_61) table_60))"
-"(let-values(((table_62)"
+" table_61"
+"(let-values(((table_62) table_61))"
+"(let-values(((table_63)"
 "(let-values()"
 "(let-values(((key_22"
 " val_13)"
@@ -7576,16 +7583,16 @@ static const char *startup_source =
 " sc_0)"
 " #t))))"
 "(hash-set"
-" table_61"
+" table_62"
 " key_22"
 " val_13)))))"
-"(values table_62)))))))"
+"(values table_63)))))))"
 "(if(not #f)"
 "(for-loop_45"
-" table_59"
+" table_60"
 "(unsafe-immutable-hash-iterate-next ht_41 i_58))"
-" table_59)))"
-" table_58)))))"
+" table_60)))"
+" table_59)))))"
 " for-loop_45)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_41))))))"
@@ -7687,7 +7694,7 @@ static const char *startup_source =
 "(void)"
 "                            (let-values () (raise-argument-error 'syntax-property \"syntax?\" s_72)))"
 "(values))))"
-"(let-values(((v_70)(hash-ref(syntax-props s_72) key_23 #f)))(plain-property-value v_70)))))"
+"(let-values(((v_71)(hash-ref(syntax-props s_72) key_23 #f)))(plain-property-value v_71)))))"
 "((s_73 key_24 val_14)"
 "(let-values((()"
 "(begin"
@@ -7784,16 +7791,16 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_61"
-"(let-values(((k_16 v_32)"
+"(let-values(((k_17 v_33)"
 "(unsafe-immutable-hash-iterate-key+value ht_44 i_61)))"
 "(let-values(((fold-var_27)"
 "(let-values(((fold-var_28) fold-var_26))"
-"(if(if(symbol? k_16)(symbol-interned? k_16) #f)"
+"(if(if(symbol? k_17)(symbol-interned? k_17) #f)"
 "(let-values(((fold-var_29) fold-var_28))"
 "(let-values(((fold-var_30)"
 "(let-values()"
 "(cons"
-"(let-values() k_16)"
+"(let-values() k_17)"
 " fold-var_29))))"
 "(values fold-var_30)))"
 " fold-var_28))))"
@@ -7865,10 +7872,10 @@ static const char *startup_source =
 "(let-values(((s_77) s_74)"
 "((f_28) f_27)"
 "((gf_3)"
-"(lambda(tail?_17 v_32)"
+"(lambda(tail?_17 v_33)"
 "(begin"
 " 'gf"
-"(if(syntax?$1 v_32)(let-values()(s->_1 v_32))(let-values()(f_27 tail?_17 v_32))))))"
+"(if(syntax?$1 v_33)(let-values()(s->_1 v_33))(let-values()(f_27 tail?_17 v_33))))))"
 "((seen_8) seen_7))"
 "((letrec-values(((loop_70)"
 "(lambda(tail?_18 s_78 prev-depth_3)"
@@ -7988,29 +7995,29 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_46)))"
 "((letrec-values(((for-loop_50)"
-"(lambda(table_63 i_63)"
+"(lambda(table_64 i_63)"
 "(begin"
 " 'for-loop"
 "(if i_63"
 "(let-values(((already-insp_1)(unsafe-immutable-hash-iterate-key ht_46 i_63)))"
-"(let-values(((table_64)"
-"(let-values(((table_65) table_63))"
+"(let-values(((table_65)"
+"(let-values(((table_66) table_64))"
 "(if(inspector-superior-or-same? insp_1 already-insp_1)"
-" table_65"
-"(let-values(((table_66) table_65))"
-"(let-values(((table_67)"
+" table_66"
+"(let-values(((table_67) table_66))"
+"(let-values(((table_68)"
 "(let-values()"
 "(let-values(((key_28 val_16)"
 "(let-values()"
 "(values"
 "(let-values() already-insp_1)"
 " #t))))"
-"(hash-set table_66 key_28 val_16)))))"
-"(values table_67)))))))"
+"(hash-set table_67 key_28 val_16)))))"
+"(values table_68)))))))"
 "(if(not #f)"
-"(for-loop_50 table_64(unsafe-immutable-hash-iterate-next ht_46 i_63))"
-" table_64)))"
-" table_63)))))"
+"(for-loop_50 table_65(unsafe-immutable-hash-iterate-next ht_46 i_63))"
+" table_65)))"
+" table_64)))))"
 " for-loop_50)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_46)))))))"
@@ -10010,7 +10017,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_54)))"
 "((letrec-values(((for-loop_63)"
-"(lambda(table_68 i_73)"
+"(lambda(table_69 i_73)"
 "(begin"
 " 'for-loop"
 "(if i_73"
@@ -10018,7 +10025,7 @@ static const char *startup_source =
 "(unsafe-immutable-hash-iterate-key"
 " ht_54"
 " i_73)))"
-"(let-values(((table_69)"
+"(let-values(((table_70)"
 "(let-values(((new-sms_0)"
 "(shift-multi-scope"
 " sms_9"
@@ -10026,17 +10033,17 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_64)"
-"(lambda(table_70)"
+"(lambda(table_71)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_71)"
 "(let-values(((table_72)"
-" table_70))"
-"(if new-sms_0"
 "(let-values(((table_73)"
-" table_72))"
+" table_71))"
+"(if new-sms_0"
 "(let-values(((table_74)"
+" table_73))"
+"(let-values(((table_75)"
 "(let-values()"
 "(let-values(((key_30"
 " val_18)"
@@ -10046,23 +10053,23 @@ static const char *startup_source =
 " new-sms_0)"
 " #t))))"
 "(hash-set"
-" table_73"
+" table_74"
 " key_30"
 " val_18)))))"
 "(values"
-" table_74)))"
-" table_72))))"
-" table_71))))))"
+" table_75)))"
+" table_73))))"
+" table_72))))))"
 " for-loop_64)"
-" table_68)))))"
+" table_69)))))"
 "(if(not #f)"
 "(for-loop_63"
-" table_69"
+" table_70"
 "(unsafe-immutable-hash-iterate-next"
 " ht_54"
 " i_73))"
-" table_69)))"
-" table_68)))))"
+" table_70)))"
+" table_69)))))"
 " for-loop_63)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_54)))))))))"
@@ -10174,15 +10181,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_55)))"
 "((letrec-values(((for-loop_65)"
-"(lambda(table_75 i_74)"
+"(lambda(table_76 i_74)"
 "(begin"
 " 'for-loop"
 "(if i_74"
 "(let-values(((sc_23)"
 "(unsafe-immutable-hash-iterate-key ht_55 i_74)))"
-"(let-values(((table_76)"
-"(let-values(((table_77) table_75))"
-"(let-values(((table_78)"
+"(let-values(((table_77)"
+"(let-values(((table_78) table_76))"
+"(let-values(((table_79)"
 "(let-values()"
 "(let-values(((key_31 val_19)"
 "(let-values()"
@@ -10192,16 +10199,16 @@ static const char *startup_source =
 " sc_23))"
 " #t))))"
 "(hash-set"
-" table_77"
+" table_78"
 " key_31"
 " val_19)))))"
-"(values table_78)))))"
+"(values table_79)))))"
 "(if(not #f)"
 "(for-loop_65"
-" table_76"
+" table_77"
 "(unsafe-immutable-hash-iterate-next ht_55 i_74))"
-" table_76)))"
-" table_75)))))"
+" table_77)))"
+" table_76)))))"
 " for-loop_65)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_55))))"
@@ -10216,15 +10223,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_56)))"
 "((letrec-values(((for-loop_66)"
-"(lambda(table_79 i_75)"
+"(lambda(table_80 i_75)"
 "(begin"
 " 'for-loop"
 "(if i_75"
 "(let-values(((sc_24)"
 "(unsafe-immutable-hash-iterate-key ht_56 i_75)))"
-"(let-values(((table_80)"
-"(let-values(((table_81) table_79))"
-"(let-values(((table_82)"
+"(let-values(((table_81)"
+"(let-values(((table_82) table_80))"
+"(let-values(((table_83)"
 "(let-values()"
 "(let-values(((key_32 val_20)"
 "(let-values()"
@@ -10234,16 +10241,16 @@ static const char *startup_source =
 " sc_24))"
 " #t))))"
 "(hash-set"
-" table_81"
+" table_82"
 " key_32"
 " val_20)))))"
-"(values table_82)))))"
+"(values table_83)))))"
 "(if(not #f)"
 "(for-loop_66"
-" table_80"
+" table_81"
 "(unsafe-immutable-hash-iterate-next ht_56 i_75))"
-" table_80)))"
-" table_79)))))"
+" table_81)))"
+" table_80)))))"
 " for-loop_66)"
 " '#hasheq()"
 "(unsafe-immutable-hash-iterate-first ht_56))))"
@@ -10586,25 +10593,25 @@ static const char *startup_source =
 " best-binding_2)"
 "(let-values(((ht_61"
 " bulk-bindings_2)"
-"(let-values(((table_83)"
+"(let-values(((table_84)"
 "(scope-binding-table"
 " sc_27)))"
 "(if(hash?"
-" table_83)"
+" table_84)"
 "(values"
 "(hash-ref"
-" table_83"
+" table_84"
 " sym_17"
 " '#hash())"
 " null)"
 "(values"
 "(hash-ref"
 "(table-with-bulk-bindings-syms"
-" table_83)"
+" table_84)"
 " sym_17"
 " '#hash())"
 "(table-with-bulk-bindings-bulk-bindings"
-" table_83)))))"
+" table_84)))))"
 "((s_155)"
 " s_154)"
 "((extra-shifts_3)"
@@ -10931,14 +10938,14 @@ static const char *startup_source =
 "(1/prop:rename-transformer 1/rename-transformer? rename-transformer-value)"
 "(make-struct-type-property"
 " 'rename-transformer"
-"(lambda(v_28 info_1)"
+"(lambda(v_29 info_1)"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_11)(exact-nonnegative-integer? v_28)))"
+"(if(let-values(((or-part_11)(exact-nonnegative-integer? v_29)))"
 "(if or-part_11"
 " or-part_11"
-"(let-values(((or-part_2)(identifier? v_28)))"
-"(if or-part_2 or-part_2(if(procedure? v_28)(procedure-arity-includes? v_28 1) #f)))))"
+"(let-values(((or-part_2)(identifier? v_29)))"
+"(if or-part_2 or-part_2(if(procedure? v_29)(procedure-arity-includes? v_29 1) #f)))))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -10947,44 +10954,44 @@ static const char *startup_source =
 "                           \"(or/c exact-nonnegative-integer?\\n\""
 "                           \"      identifier?\\n\""
 "                           \"      (procedure-arity-includes? proc 1))\")"
-" v_28)))"
+" v_29)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(exact-nonnegative-integer? v_28)"
+"(if(exact-nonnegative-integer? v_29)"
 "(let-values()"
 "(begin"
-"(if(<= v_28(list-ref info_1 1))"
+"(if(<= v_29(list-ref info_1 1))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " 'guard-for-prop:rename-transformer"
 "                                  \"field index >= initialized-field count for structure type\""
 "                                  \"field index\""
-" v_28"
+" v_29"
 "                                  \"initialized-field count\""
 "(list-ref info_1 1))))"
-"(if(member v_28(list-ref info_1 5))"
+"(if(member v_29(list-ref info_1 5))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " 'guard-for-prop:rename-transformer"
 "                                  \"field index not declared immutable\""
 "                                  \"field index\""
-" v_28)))))"
+" v_29)))))"
 "(void))"
 "(values))))"
 "(let-values(((ref_0)(list-ref info_1 3)))"
-"(if(identifier? v_28)"
-"(let-values()(lambda(t_36) v_28))"
-"(if(integer? v_28)"
+"(if(identifier? v_29)"
+"(let-values()(lambda(t_36) v_29))"
+"(if(integer? v_29)"
 "(let-values()"
 "(lambda(t_37)"
-"(let-values(((val_21)(ref_0 t_37 v_28)))"
+"(let-values(((val_21)(ref_0 t_37 v_29)))"
 "(if(identifier? val_21) val_21(datum->syntax$1 #f '?)))))"
 "(let-values()"
 "(lambda(t_15)"
-"(let-values(((id_0)(call-with-continuation-prompt(lambda()(v_28 t_15)))))"
+"(let-values(((id_0)(call-with-continuation-prompt(lambda()(v_29 t_15)))))"
 "(begin"
 "(if(identifier? id_0)"
 "(void)"
@@ -11795,10 +11802,10 @@ static const char *startup_source =
 "                                                     \"namespace mismatch: no bulk-binding registry available:\""
 " mod-name_1)))"
 "(values))))"
-"(let-values(((table_84)"
+"(let-values(((table_85)"
 "(bulk-binding-registry-table"
 "(bulk-binding-bulk-binding-registry b_57))))"
-"(let-values(((bulk-provide_0)(hash-ref table_84 mod-name_1 #f)))"
+"(let-values(((bulk-provide_0)(hash-ref table_85 mod-name_1 #f)))"
 "(let-values((()"
 "(begin"
 "(if bulk-provide_0"
@@ -11884,19 +11891,19 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_62)))"
 "((letrec-values(((for-loop_77)"
-"(lambda(table_85 i_82)"
+"(lambda(table_86 i_82)"
 "(begin"
 " 'for-loop"
 "(if i_82"
 "(let-values(((sym_20 val_23)(hash-iterate-key+value ht_62 i_82)))"
-"(let-values(((table_86)"
-"(let-values(((table_87) table_85))"
+"(let-values(((table_87)"
+"(let-values(((table_88) table_86))"
 "(if(hash-ref excepts_2 sym_20 #f)"
-" table_87"
-"(let-values(((table_88) table_87))"
-"(if(symbol-interned? sym_20)"
+" table_88"
 "(let-values(((table_89) table_88))"
-"(let-values(((table_90)"
+"(if(symbol-interned? sym_20)"
+"(let-values(((table_90) table_89))"
+"(let-values(((table_91)"
 "(let-values()"
 "(let-values(((key_36 val_24)"
 "(let-values()"
@@ -11909,11 +11916,11 @@ static const char *startup_source =
 " sym_20))"
 " sym_20)"
 " val_23))))"
-"(hash-set table_89 key_36 val_24)))))"
-"(values table_90)))"
-" table_88))))))"
-"(if(not #f)(for-loop_77 table_86(hash-iterate-next ht_62 i_82)) table_86)))"
-" table_85)))))"
+"(hash-set table_90 key_36 val_24)))))"
+"(values table_91)))"
+" table_89))))))"
+"(if(not #f)(for-loop_77 table_87(hash-iterate-next ht_62 i_82)) table_87)))"
+" table_86)))))"
 " for-loop_77)"
 " '#hash()"
 "(hash-iterate-first ht_62)))))))"
@@ -12060,25 +12067,25 @@ static const char *startup_source =
 "(define-values"
 "(root-expand-context-use-site-scopes)"
 "(lambda(v_92)(begin(root-expand-context/outer-use-site-scopes v_92))))"
-"(define-values(root-expand-context-frame-id)(lambda(v_47)(begin(root-expand-context/outer-frame-id v_47))))"
+"(define-values(root-expand-context-frame-id)(lambda(v_48)(begin(root-expand-context/outer-frame-id v_48))))"
 "(define-values"
 "(root-expand-context-self-mpi)"
-"(lambda(v_65)(begin(root-expand-context/inner-self-mpi(root-expand-context/outer-inner v_65)))))"
+"(lambda(v_66)(begin(root-expand-context/inner-self-mpi(root-expand-context/outer-inner v_66)))))"
 "(define-values"
 "(root-expand-context-module-scopes)"
-"(lambda(v_48)(begin(root-expand-context/inner-module-scopes(root-expand-context/outer-inner v_48)))))"
+"(lambda(v_49)(begin(root-expand-context/inner-module-scopes(root-expand-context/outer-inner v_49)))))"
 "(define-values"
 "(root-expand-context-top-level-bind-scope)"
 "(lambda(v_93)(begin(root-expand-context/inner-top-level-bind-scope(root-expand-context/outer-inner v_93)))))"
 "(define-values"
 "(root-expand-context-all-scopes-stx)"
-"(lambda(v_49)(begin(root-expand-context/inner-all-scopes-stx(root-expand-context/outer-inner v_49)))))"
+"(lambda(v_50)(begin(root-expand-context/inner-all-scopes-stx(root-expand-context/outer-inner v_50)))))"
 "(define-values"
 "(root-expand-context-defined-syms)"
 "(lambda(v_94)(begin(root-expand-context/inner-defined-syms(root-expand-context/outer-inner v_94)))))"
 "(define-values"
 "(root-expand-context-counter)"
-"(lambda(v_42)(begin(root-expand-context/inner-counter(root-expand-context/outer-inner v_42)))))"
+"(lambda(v_43)(begin(root-expand-context/inner-counter(root-expand-context/outer-inner v_43)))))"
 "(define-values"
 "(root-expand-context-lift-key)"
 "(lambda(v_95)(begin(root-expand-context/inner-lift-key(root-expand-context/outer-inner v_95)))))"
@@ -12150,22 +12157,22 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_63)))"
 "((letrec-values(((for-loop_78)"
-"(lambda(table_91 i_83)"
+"(lambda(table_92 i_83)"
 "(begin"
 " 'for-loop"
 "(if i_83"
 "(let-values(((phase_24 ht_64)(hash-iterate-key+value ht_63 i_83)))"
-"(let-values(((table_92)"
-"(let-values(((table_93) table_91))"
-"(let-values(((table_94)"
+"(let-values(((table_93)"
+"(let-values(((table_94) table_92))"
+"(let-values(((table_95)"
 "(let-values()"
 "(let-values(((key_37 val_25)"
 "(let-values()"
 "(values phase_24 ht_64))))"
-"(hash-set table_93 key_37 val_25)))))"
-"(values table_94)))))"
-"(if(not #f)(for-loop_78 table_92(hash-iterate-next ht_63 i_83)) table_92)))"
-" table_91)))))"
+"(hash-set table_94 key_37 val_25)))))"
+"(values table_95)))))"
+"(if(not #f)(for-loop_78 table_93(hash-iterate-next ht_63 i_83)) table_93)))"
+" table_92)))))"
 " for-loop_78)"
 " '#hasheqv()"
 "(hash-iterate-first ht_63))))"
@@ -12302,14 +12309,14 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_67)))"
 "((letrec-values(((for-loop_81)"
-"(lambda(table_95 i_86)"
+"(lambda(table_96 i_86)"
 "(begin"
 " 'for-loop"
 "(if i_86"
 "(let-values(((phase_26 ht-s_1)(hash-iterate-key+value ht_67 i_86)))"
-"(let-values(((table_96)"
-"(let-values(((table_97) table_95))"
-"(let-values(((table_98)"
+"(let-values(((table_97)"
+"(let-values(((table_98) table_96))"
+"(let-values(((table_99)"
 "(let-values()"
 "(let-values(((key_38 val_26)"
 "(let-values()"
@@ -12326,7 +12333,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash ht_68)))"
 "((letrec-values(((for-loop_82)"
-"(lambda(table_99"
+"(lambda(table_100"
 " i_87)"
 "(begin"
 " 'for-loop"
@@ -12336,10 +12343,10 @@ static const char *startup_source =
 "(hash-iterate-key+value"
 " ht_68"
 " i_87)))"
-"(let-values(((table_100)"
 "(let-values(((table_101)"
-" table_99))"
 "(let-values(((table_102)"
+" table_100))"
+"(let-values(((table_103)"
 "(let-values()"
 "(let-values(((key_39"
 " val_27)"
@@ -12348,28 +12355,28 @@ static const char *startup_source =
 " sym_22"
 " id_9))))"
 "(hash-set"
-" table_101"
+" table_102"
 " key_39"
 " val_27)))))"
 "(values"
-" table_102)))))"
+" table_103)))))"
 "(if(not"
 " #f)"
 "(for-loop_82"
-" table_100"
+" table_101"
 "(hash-iterate-next"
 " ht_68"
 " i_87))"
-" table_100)))"
-" table_99)))))"
+" table_101)))"
+" table_100)))))"
 " for-loop_82)"
 " '#hash()"
 "(hash-iterate-first"
 " ht_68)))))))))"
-"(hash-set table_97 key_38 val_26)))))"
-"(values table_98)))))"
-"(if(not #f)(for-loop_81 table_96(hash-iterate-next ht_67 i_86)) table_96)))"
-" table_95)))))"
+"(hash-set table_98 key_38 val_26)))))"
+"(values table_99)))))"
+"(if(not #f)(for-loop_81 table_97(hash-iterate-next ht_67 i_86)) table_97)))"
+" table_96)))))"
 " for-loop_81)"
 " '#hasheqv()"
 "(hash-iterate-first ht_67))))))))"
@@ -12440,22 +12447,22 @@ static const char *startup_source =
 "(lambda()"
 "(begin"
 " 'loop"
-"(let-values(((v_33)(unbox lock-box_0)))"
-"(if(let-values(((or-part_75)(not v_33)))"
-"(if or-part_75 or-part_75(sync/timeout 0(car v_33)(cdr v_33))))"
+"(let-values(((v_34)(unbox lock-box_0)))"
+"(if(let-values(((or-part_75)(not v_34)))"
+"(if or-part_75 or-part_75(sync/timeout 0(car v_34)(cdr v_34))))"
 "(let-values()"
 "(let-values(((sema_0)(make-semaphore)))"
 "(let-values(((lock_0)(cons(semaphore-peek-evt sema_0)(current-thread))))"
 "((dynamic-wind"
 " void"
 "(lambda()"
-"(if(box-cas! lock-box_0 v_33 lock_0)"
+"(if(box-cas! lock-box_0 v_34 lock_0)"
 "(let-values()(begin(proc_2) void))"
 "(let-values()(lambda()(loop_70)))))"
 "(lambda()(semaphore-post sema_0)))))))"
-"(if(eq?(current-thread)(cdr v_33))"
+"(if(eq?(current-thread)(cdr v_34))"
 "(let-values()(proc_2))"
-"(let-values()(begin(sync(car v_33)(cdr v_33))(loop_70))))))))))"
+"(let-values()(begin(sync(car v_34)(cdr v_34))(loop_70))))))))))"
 " loop_70))))))"
 "(define-values"
 "(struct:namespace"
@@ -12787,8 +12794,8 @@ static const char *startup_source =
 "(if(eq? id1_0 unsafe-undefined)"
 "(if(identifier? old-stx_0)"
 " old-stx_0"
-"(let-values(((v_30)(syntax-e/no-taint old-stx_0)))"
-"(if(pair? v_30)(car v_30) #f)))"
+"(let-values(((v_31)(syntax-e/no-taint old-stx_0)))"
+"(if(pair? v_31)(car v_31) #f)))"
 " id1_0)))"
 "(let-values()"
 "(let-values(((old-props_0)(syntax-props old-stx_0)))"
@@ -12864,7 +12871,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_88"
-"(let-values(((k_17 v_2)"
+"(let-values(((k_18 v_2)"
 "(unsafe-immutable-hash-iterate-key+value"
 " ht_69"
 " i_88)))"
@@ -12876,11 +12883,11 @@ static const char *startup_source =
 "(let-values(((new-v_0)"
 "(hash-ref"
 " new-props_3"
-" k_17"
+" k_18"
 " missing$1)))"
 "(hash-set"
 " new-props_3"
-" k_17"
+" k_18"
 "(if(eq?"
 " new-v_0"
 " missing$1)"
@@ -12913,7 +12920,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_0"
-"(let-values(((k_18 v_89)"
+"(let-values(((k_19 v_89)"
 "(unsafe-immutable-hash-iterate-key+value"
 " ht_70"
 " i_0)))"
@@ -12925,11 +12932,11 @@ static const char *startup_source =
 "(let-values(((old-v_0)"
 "(hash-ref"
 " old-props_3"
-" k_18"
+" k_19"
 " missing$1)))"
 "(hash-set"
 " old-props_3"
-" k_18"
+" k_19"
 "(if(eq?"
 " old-v_0"
 " missing$1)"
@@ -14611,15 +14618,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_71)))"
 "((letrec-values(((for-loop_94)"
-"(lambda(table_103 i_89)"
+"(lambda(table_104 i_89)"
 "(begin"
 " 'for-loop"
 "(if i_89"
 "(let-values(((phase_32 at-phase_6)"
 "(hash-iterate-key+value ht_71 i_89)))"
-"(let-values(((table_104)"
-"(let-values(((table_105) table_103))"
-"(let-values(((table_106)"
+"(let-values(((table_105)"
+"(let-values(((table_106) table_104))"
+"(let-values(((table_107)"
 "(let-values()"
 "(let-values(((key_40 val_33)"
 "(let-values()"
@@ -14635,7 +14642,7 @@ static const char *startup_source =
 "(check-in-hash"
 " ht_72)))"
 "((letrec-values(((for-loop_95)"
-"(lambda(table_107"
+"(lambda(table_108"
 " i_90)"
 "(begin"
 " 'for-loop"
@@ -14645,10 +14652,10 @@ static const char *startup_source =
 "(hash-iterate-key+value"
 " ht_72"
 " i_90)))"
-"(let-values(((table_108)"
 "(let-values(((table_109)"
-" table_107))"
 "(let-values(((table_110)"
+" table_108))"
+"(let-values(((table_111)"
 "(let-values()"
 "(let-values(((key_41"
 " val_34)"
@@ -14662,33 +14669,33 @@ static const char *startup_source =
 " 'protected"
 " 'provided)))))"
 "(hash-set"
-" table_109"
+" table_110"
 " key_41"
 " val_34)))))"
 "(values"
-" table_110)))))"
+" table_111)))))"
 "(if(not"
 " #f)"
 "(for-loop_95"
-" table_108"
+" table_109"
 "(hash-iterate-next"
 " ht_72"
 " i_90))"
-" table_108)))"
-" table_107)))))"
+" table_109)))"
+" table_108)))))"
 " for-loop_95)"
 " '#hash()"
 "(hash-iterate-first"
 " ht_72))))))))"
 "(hash-set"
-" table_105"
+" table_106"
 " key_40"
 " val_33)))))"
-"(values table_106)))))"
+"(values table_107)))))"
 "(if(not #f)"
-"(for-loop_94 table_104(hash-iterate-next ht_71 i_89))"
-" table_104)))"
-" table_103)))))"
+"(for-loop_94 table_105(hash-iterate-next ht_71 i_89))"
+" table_105)))"
+" table_104)))))"
 " for-loop_94)"
 " '#hasheqv()"
 "(hash-iterate-first ht_71))))))"
@@ -14862,15 +14869,15 @@ static const char *startup_source =
 "(1/prop:set!-transformer 1/set!-transformer? set!-transformer-value)"
 "(make-struct-type-property"
 " 'set!-transformer"
-"(lambda(v_28 info_1)"
+"(lambda(v_29 info_1)"
 "(let-values((()"
 "(begin"
 "(if(let-values(((or-part_11)"
-"(if(procedure? v_28)"
-"(let-values(((or-part_2)(procedure-arity-includes? v_28 1)))"
-"(if or-part_2 or-part_2(procedure-arity-includes? v_28 2)))"
+"(if(procedure? v_29)"
+"(let-values(((or-part_2)(procedure-arity-includes? v_29 1)))"
+"(if or-part_2 or-part_2(procedure-arity-includes? v_29 2)))"
 " #f)))"
-"(if or-part_11 or-part_11(exact-nonnegative-integer? v_28)))"
+"(if or-part_11 or-part_11(exact-nonnegative-integer? v_29)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
@@ -14879,42 +14886,42 @@ static const char *startup_source =
 "                           \"(or/c (procedure-arity-includes? proc 1)\\n\""
 "                           \"      (procedure-arity-includes? proc 2)\\n\""
 "                           \"      exact-nonnegative-integer?)\")"
-" v_28)))"
+" v_29)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(exact-nonnegative-integer? v_28)"
+"(if(exact-nonnegative-integer? v_29)"
 "(let-values()"
 "(begin"
-"(if(<= v_28(list-ref info_1 1))"
+"(if(<= v_29(list-ref info_1 1))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " 'guard-for-prop:set!-transformer"
 "                                  \"field index >= initialized-field count for structure type\""
 "                                  \"field index\""
-" v_28"
+" v_29"
 "                                  \"initialized-field count\""
 "(list-ref info_1 1))))"
-"(if(member v_28(list-ref info_1 5))"
+"(if(member v_29(list-ref info_1 5))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " 'guard-for-prop:set!-transformer"
 "                                  \"field index not declared immutable\""
 "                                  \"field index\""
-" v_28)))))"
+" v_29)))))"
 "(void))"
 "(values))))"
 "(let-values(((ref_0)(list-ref info_1 3)))"
-"(if(integer? v_28)"
+"(if(integer? v_29)"
 "(let-values()"
 "(lambda(t_36)"
-"(let-values(((p_32)(ref_0 t_36 v_28)))"
+"(let-values(((p_32)(ref_0 t_36 v_29)))"
 "(if(if(procedure? p_32)(procedure-arity-includes? p_32 1) #f)"
 " p_32"
 "                     (lambda (s_3) (error \"bad syntax:\" s_3))))))"
-"(let-values()(lambda(t_15) v_28)))))))))"
+"(let-values()(lambda(t_15) v_29)))))))))"
 "(define-values"
 "(1/make-set!-transformer)"
 "(let-values()"
@@ -15209,56 +15216,394 @@ static const char *startup_source =
 "(void)))))"
 "(define-values(cons-ish)(lambda(a_40 b_61)(begin(if(null? b_61) a_40(cons a_40 b_61)))))"
 "(define-values"
-"(free-id-set)"
-"(lambda(phase_39 ids_0)"
+"(to-syntax-list.1)"
+"(lambda(s_169)"
 "(begin"
-"(let-values(((lst_75) ids_0))"
+" 'to-syntax-list"
+"(if(list? s_169)"
+"(let-values() s_169)"
+"(if(pair? s_169)"
+"(let-values()(let-values(((r_28)(to-syntax-list.1(cdr s_169))))(if r_28(cons(car s_169) r_28) #f)))"
+"(if(syntax?$1 s_169)(let-values()(to-syntax-list.1(syntax-e$1 s_169)))(let-values() #f)))))))"
+"(define-values(core-scope)(new-multi-scope))"
+"(define-values(core-stx)(add-scope empty-syntax core-scope))"
+"(define-values(core-module-name)(1/make-resolved-module-path '#%core))"
+"(define-values(core-mpi)(1/module-path-index-join ''#%core #f))"
+"(define-values(id-cache-0)(make-hasheq))"
+"(define-values(id-cache-1)(make-hasheq))"
+"(define-values"
+"(core-id)"
+"(lambda(sym_12 phase_34)"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_75)))"
+"(if(eqv? phase_34 0)"
+"(let-values()"
+"(let-values(((or-part_6)(hash-ref id-cache-0 sym_12 #f)))"
+"(if or-part_6"
+" or-part_6"
+"(let-values(((s_170)(datum->syntax$1 core-stx sym_12)))"
+"(begin(hash-set! id-cache-0 sym_12 s_170) s_170)))))"
+"(if(eq? phase_34 1)"
+"(let-values()"
+"(let-values(((or-part_28)(hash-ref id-cache-1 sym_12 #f)))"
+"(if or-part_28"
+" or-part_28"
+"(let-values(((s_10)(datum->syntax$1(syntax-shift-phase-level$1 core-stx 1) sym_12)))"
+"(begin(hash-set! id-cache-1 sym_12 s_10) s_10)))))"
+"(let-values()(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_34) sym_12)))))))"
+"(define-values(core-forms) '#hasheq())"
+"(define-values(core-primitives) '#hasheq())"
+"(define-values"
+"(add-core-form!*)"
+"(lambda(sym_24 proc_4)"
+"(begin(begin(add-core-binding! sym_24)(set! core-forms(hash-set core-forms sym_24 proc_4))))))"
+"(define-values"
+"(add-core-primitive!)"
+"(lambda(sym_25 val_35)"
+"(begin(begin(add-core-binding! sym_25)(set! core-primitives(hash-set core-primitives sym_25 val_35))))))"
+"(define-values"
+"(add-core-binding!)"
+"(lambda(sym_26)"
+"(begin"
+"(let-values(((temp1_0)(datum->syntax$1 core-stx sym_26))"
+"((temp2_1)"
+"(let-values(((core-mpi4_0) core-mpi)((temp5_2) 0)((sym6_0) sym_26))"
+"(make-module-binding22.1"
+" #f"
+" null"
+" #f"
+" #f"
+" unsafe-undefined"
+" unsafe-undefined"
+" 0"
+" unsafe-undefined"
+" unsafe-undefined"
+" core-mpi4_0"
+" temp5_2"
+" sym6_0)))"
+"((temp3_1) 0))"
+"(add-binding!17.1 #f #f temp1_0 temp2_1 temp3_1)))))"
+"(define-values"
+"(declare-core-module!)"
+"(lambda(ns_45)"
+"(begin"
+"(let-values(((ns7_0) ns_45)"
+"((temp8_0)"
+"(let-values(((temp10_0) #t)"
+"((temp11_0) #t)"
+"((temp12_0) #t)"
+"((core-mpi13_0) core-mpi)"
+"((temp14_1)"
+"(hasheqv"
+" 0"
+"(let-values(((lst_75)(list core-primitives core-forms))((lst_76) '(#f #t)))"
+"(begin"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_75)))"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-list lst_76)))"
 "((letrec-values(((for-loop_97)"
-"(lambda(ht_73 lst_76)"
+"(lambda(table_112 lst_77 lst_78)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_76)"
-"(let-values(((id_10)(unsafe-car lst_76))((rest_35)(unsafe-cdr lst_76)))"
-"(let-values(((ht_74)"
-"(let-values(((ht_75) ht_73))"
-"(let-values(((ht_76)"
+"(if(if(pair? lst_77)(pair? lst_78) #f)"
+"(let-values(((syms_12)(unsafe-car lst_77))"
+"((rest_35)(unsafe-cdr lst_77))"
+"((syntax?_2)(unsafe-car lst_78))"
+"((rest_36)(unsafe-cdr lst_78)))"
+"(let-values(((table_113)"
+"(let-values(((table_114) table_112))"
+"(let-values(((ht_73) syms_12))"
+"(begin"
+"(if(variable-reference-from-unsafe?"
+"(#%variable-reference))"
+"(void)"
 "(let-values()"
-"(let-values(((sym_24)"
-"(identifier-binding-symbol$1"
-" id_10"
-" phase_39)))"
+"(check-in-hash-keys ht_73)))"
+"((letrec-values(((for-loop_98)"
+"(lambda(table_115"
+" i_42)"
+"(begin"
+" 'for-loop"
+"(if i_42"
+"(let-values(((sym_27)"
+"(hash-iterate-key"
+" ht_73"
+" i_42)))"
+"(let-values(((table_116)"
+"(let-values(((table_117)"
+" table_115))"
+"(let-values(((table_118)"
+"(let-values()"
+"(let-values(((key_44"
+" val_36)"
+"(let-values()"
+"(let-values(((b_62)"
+"(let-values(((core-mpi17_0)"
+" core-mpi)"
+"((temp18_3)"
+" 0)"
+"((sym19_0)"
+" sym_27))"
+"(make-module-binding22.1"
+" #f"
+" null"
+" #f"
+" #f"
+" unsafe-undefined"
+" unsafe-undefined"
+" 0"
+" unsafe-undefined"
+" unsafe-undefined"
+" core-mpi17_0"
+" temp18_3"
+" sym19_0))))"
+"(values"
+" sym_27"
+"(if syntax?_2"
+"(provided1.1"
+" b_62"
+" #f"
+" #t)"
+" b_62))))))"
 "(hash-set"
-" ht_75"
-" sym_24"
-"(cons-ish"
-" id_10"
-"(hash-ref ht_75 sym_24 null)))))))"
-"(values ht_76)))))"
-"(if(not #f)(for-loop_97 ht_74 rest_35) ht_74)))"
-" ht_73)))))"
+" table_117"
+" key_44"
+" val_36)))))"
+"(values"
+" table_118)))))"
+"(if(not"
+" #f)"
+"(for-loop_98"
+" table_116"
+"(hash-iterate-next"
+" ht_73"
+" i_42))"
+" table_116)))"
+" table_115)))))"
+" for-loop_98)"
+" table_114"
+"(hash-iterate-first ht_73)))))))"
+"(if(not #f)"
+"(for-loop_97 table_113 rest_35 rest_36)"
+" table_113)))"
+" table_112)))))"
 " for-loop_97)"
 " '#hasheq()"
-" lst_75))))))"
+" lst_75"
+" lst_76)))))"
+"((temp15_1)"
+"(lambda(phase-level_14 ns_46 insp_7)"
+"(if(zero? phase-level_14)"
+"(let-values(((ns_47)"
+"(let-values(((ns20_0) ns_46)"
+"((core-module-name21_0) core-module-name)"
+"((temp22_1) 0))"
+"(namespace->module-namespace82.1"
+" #f"
+" #f"
+" unsafe-undefined"
+" ns20_0"
+" core-module-name21_0"
+" temp22_1))))"
+"(if ns_47"
+"(module-linklet-info2.1(namespace->instance ns_47 0) #f core-mpi #f #f #f)"
+" #f))"
+" #f)))"
+"((temp16_1)"
+"(lambda(data-box_1"
+" ns_48"
+" phase_39"
+" phase-level_15"
+" self_5"
+" bulk-binding-registry_4"
+" insp_8)"
+"(let-values(((tmp_14) phase-level_15))"
+"(if(equal? tmp_14 0)"
+"(let-values()"
+"(begin"
+"(let-values(((ht_74) core-primitives))"
+"(begin"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-in-hash ht_74)))"
+"((letrec-values(((for-loop_99)"
+"(lambda(i_28)"
+"(begin"
+" 'for-loop"
+"(if i_28"
+"(let-values(((sym_28 val_37)"
+"(hash-iterate-key+value"
+" ht_74"
+" i_28)))"
+"(let-values((()"
+"(let-values()"
+"(let-values((()"
+"(let-values()"
+"(begin"
+"(let-values()"
+"(namespace-set-consistent!"
+" ns_48"
+" 0"
+" sym_28"
+" val_37))"
+"(values)))))"
+"(values)))))"
+"(if(not #f)"
+"(for-loop_99"
+"(hash-iterate-next ht_74 i_28))"
+"(values))))"
+"(values))))))"
+" for-loop_99)"
+"(hash-iterate-first ht_74))))"
+"(void)"
+"(let-values(((ht_75) core-forms))"
+"(begin"
+"(if(variable-reference-from-unsafe?(#%variable-reference))"
+"(void)"
+"(let-values()(check-in-hash ht_75)))"
+"((letrec-values(((for-loop_100)"
+"(lambda(i_91)"
+"(begin"
+" 'for-loop"
+"(if i_91"
+"(let-values(((sym_29 proc_5)"
+"(hash-iterate-key+value"
+" ht_75"
+" i_91)))"
+"(let-values((()"
+"(let-values()"
+"(let-values((()"
+"(let-values()"
+"(begin"
+"(let-values()"
+"(namespace-set-transformer!"
+" ns_48"
+" 0"
+" sym_29"
+"(if(procedure-arity-includes?"
+" proc_5"
+" 2)"
+"(core-form9.1"
+" proc_5"
+" sym_29)"
+" proc_5)))"
+"(values)))))"
+"(values)))))"
+"(if(not #f)"
+"(for-loop_100"
+"(hash-iterate-next ht_75 i_91))"
+"(values))))"
+"(values))))))"
+" for-loop_100)"
+"(hash-iterate-first ht_75))))"
+"(void)))"
+"(let-values()(void)))))))"
+"(make-module39.1"
+" temp10_0"
+" unsafe-undefined"
+" unsafe-undefined"
+" temp16_1"
+" #f"
+" 0"
+" 0"
+" temp11_0"
+" temp15_1"
+" temp12_0"
+" unsafe-undefined"
+" #f"
+" temp14_1"
+" null"
+" core-mpi13_0"
+" #f"
+" null"
+" #f)))"
+"((core-module-name9_0) core-module-name))"
+"(declare-module!58.1 #t ns7_0 temp8_0 core-module-name9_0)))))"
+"(define-values"
+"(core-form-sym)"
+"(lambda(s_19 phase_40)"
+"(begin"
+"(let-values(((ok?_0 id23_0 _24_0)"
+"(let-values(((s_171) s_19))"
+"(if(let-values(((s_85)(if(syntax?$1 s_171)(syntax-e$1 s_171) s_171)))"
+"(if(pair? s_85)"
+"(if(let-values(((s_172)(car s_85)))"
+"(let-values(((or-part_160)(if(syntax?$1 s_172)(symbol?(syntax-e$1 s_172)) #f)))"
+"(if or-part_160 or-part_160(symbol? s_172))))"
+"(let-values(((s_173)(cdr s_85))) #t)"
+" #f)"
+" #f))"
+"(let-values()"
+"(let-values(((id23_1 _24_1)"
+"(let-values(((s_174)(if(syntax?$1 s_171)(syntax-e$1 s_171) s_171)))"
+"(let-values(((id25_0)(let-values(((s_175)(car s_174))) s_175))"
+"((_26_0)(let-values(((s_176)(cdr s_174))) s_176)))"
+"(values id25_0 _26_0)))))"
+"(values #t id23_1 _24_1)))"
+"(values #f #f #f)))))"
+"(if ok?_0"
+"(let-values(((b_63)"
+"(let-values(((temp27_1) id23_0)((phase28_0) phase_40))"
+"(resolve+shift28.1 #f #f null unsafe-undefined #f temp27_1 phase28_0))))"
+"(if(module-binding? b_63)"
+"(if(eq? core-module-name(1/module-path-index-resolve(module-binding-module b_63)))"
+"(module-binding-sym b_63)"
+" #f)"
+" #f))"
+" #f)))))"
+"(define-values"
+"(free-id-set)"
+"(lambda(phase_41 ids_0)"
+"(begin"
+"(let-values(((lst_79) ids_0))"
+"(begin"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_79)))"
+"((letrec-values(((for-loop_101)"
+"(lambda(ht_76 lst_80)"
+"(begin"
+" 'for-loop"
+"(if(pair? lst_80)"
+"(let-values(((id_10)(unsafe-car lst_80))((rest_37)(unsafe-cdr lst_80)))"
+"(let-values(((ht_77)"
+"(let-values(((ht_78) ht_76))"
+"(let-values(((ht_79)"
+"(let-values()"
+"(let-values(((sym_30)"
+"(identifier-binding-symbol$1"
+" id_10"
+" phase_41)))"
+"(hash-set"
+" ht_78"
+" sym_30"
+"(cons-ish"
+" id_10"
+"(hash-ref ht_78 sym_30 null)))))))"
+"(values ht_79)))))"
+"(if(not #f)(for-loop_101 ht_77 rest_37) ht_77)))"
+" ht_76)))))"
+" for-loop_101)"
+" '#hasheq()"
+" lst_79))))))"
 "(define-values(empty-free-id-set)(free-id-set 0 null))"
 "(define-values(free-id-set-empty?)(lambda(fs_0)(begin(eq? fs_0 empty-free-id-set))))"
 "(define-values"
 "(free-id-set-member?)"
-"(lambda(fs_1 phase_40 given-id_0)"
+"(lambda(fs_1 phase_42 given-id_0)"
 "(begin"
 "(if(free-id-set-empty? fs_1)"
 " #f"
-"(let-values(((lst_77)(hash-ref fs_1(identifier-binding-symbol$1 given-id_0 phase_40) null)))"
+"(let-values(((lst_81)(hash-ref fs_1(identifier-binding-symbol$1 given-id_0 phase_42) null)))"
 "(begin"
 "(void)"
-"((letrec-values(((for-loop_98)"
-"(lambda(result_3 lst_78)"
+"((letrec-values(((for-loop_102)"
+"(lambda(result_3 lst_82)"
 "(begin"
 " 'for-loop"
-"(if(not(null? lst_78))"
-"(let-values(((id_2)(if(pair? lst_78)(car lst_78) lst_78))"
-"((rest_36)(if(pair? lst_78)(cdr lst_78) null)))"
+"(if(not(null? lst_82))"
+"(let-values(((id_2)(if(pair? lst_82)(car lst_82) lst_82))"
+"((rest_38)(if(pair? lst_82)(cdr lst_82) null)))"
 "(let-values(((result_62)"
 "(let-values()"
 "(let-values(((result_63)"
@@ -15267,19 +15612,29 @@ static const char *startup_source =
 "(free-identifier=?$1"
 " id_2"
 " given-id_0"
-" phase_40"
-" phase_40)))))"
+" phase_42"
+" phase_42)))))"
 "(values result_63)))))"
 "(if(if(not((lambda x_42 result_62) id_2))(not #f) #f)"
-"(for-loop_98 result_62 rest_36)"
+"(for-loop_102 result_62 rest_38)"
 " result_62)))"
 " result_3)))))"
-" for-loop_98)"
+" for-loop_102)"
 " #f"
-" lst_77)))))))"
+" lst_81)))))))"
 "(define-values"
 "(free-id-set-empty-or-just-module*?)"
-"(lambda(fs_2)(begin(let-values(((c_17)(hash-count fs_2)))(<= c_17 1)))))"
+"(lambda(fs_2 phase_43)"
+"(begin"
+"(let-values(((c_17)(hash-count fs_2)))"
+"(let-values(((or-part_74)(zero? c_17)))"
+"(if or-part_74"
+" or-part_74"
+"(if(= 1 c_17)"
+"(let-values(((p-core-stx_0)(syntax-shift-phase-level$1 core-stx phase_43)))"
+"(let-values(((mod-star-stx_0)(datum->syntax$1 p-core-stx_0 'module*)))"
+"(free-identifier=?$1(car(hash-values fs_2)) mod-star-stx_0 phase_43 phase_43)))"
+" #f)))))))"
 "(define-values"
 "(struct:expand-context/outer"
 " expand-context/outer1.1"
@@ -15400,7 +15755,7 @@ static const char *startup_source =
 " lift-key_1"
 " to-parsed?_0"
 " context_0"
-" phase_41"
+" phase_44"
 " namespace_0"
 " env_2"
 " scopes_18"
@@ -15439,7 +15794,7 @@ static const char *startup_source =
 " counter_2"
 " lift-key_1"
 " to-parsed?_0"
-" phase_41"
+" phase_44"
 " namespace_0"
 " just-once?_0"
 " module-begin-k_0"
@@ -15552,12 +15907,12 @@ static const char *startup_source =
 "(lambda(for-serializable?4_0 observer5_0 to-parsed?3_0 ns9_0)"
 "(begin"
 " 'make-expand-context10"
-"(let-values(((ns_45) ns9_0))"
+"(let-values(((ns_49) ns9_0))"
 "(let-values(((to-parsed?_1) to-parsed?3_0))"
 "(let-values(((for-serializable?_1) for-serializable?4_0))"
 "(let-values(((observer_1) observer5_0))"
 "(let-values()"
-"(let-values(((root-ctx_1)(namespace-get-root-expand-ctx ns_45)))"
+"(let-values(((root-ctx_1)(namespace-get-root-expand-ctx ns_49)))"
 "(expand-context/make"
 "(root-expand-context-self-mpi root-ctx_1)"
 "(root-expand-context-module-scopes root-ctx_1)"
@@ -15571,8 +15926,8 @@ static const char *startup_source =
 "(root-expand-context-lift-key root-ctx_1)"
 " to-parsed?_1"
 " 'top-level"
-"(namespace-phase ns_45)"
-" ns_45"
+"(namespace-phase ns_49)"
+" ns_49"
 " empty-env"
 " null"
 " #f"
@@ -15675,9 +16030,9 @@ static const char *startup_source =
 "(let-values(((who_10) who15_0))"
 "(let-values(((fail-ok?_0) fail-ok?13_0))"
 "(let-values()"
-"(let-values(((or-part_160)(force(current-expand-context))))"
-"(if or-part_160"
-" or-part_160"
+"(let-values(((or-part_161)(force(current-expand-context))))"
+"(if or-part_161"
+" or-part_161"
 "                (if fail-ok?_0 #f (raise-arguments-error who_10 \"not currently expanding\"))))))))))"
 "(define-values"
 "(current-expand-observe)"
@@ -15685,8 +16040,8 @@ static const char *startup_source =
 " #f"
 "(lambda(v_131)"
 "(begin"
-"(if(let-values(((or-part_161)(not v_131)))"
-"(if or-part_161 or-part_161(if(procedure? v_131)(procedure-arity-includes? v_131 2) #f)))"
+"(if(let-values(((or-part_162)(not v_131)))"
+"(if or-part_162 or-part_162(if(procedure? v_131)(procedure-arity-includes? v_131 2) #f)))"
 "(void)"
 "(let-values()"
 "           (raise-argument-error 'current-expand-observe \"(or/c (procedure-arity-includes/c 2) #f)\" v_131)))"
@@ -15870,344 +16225,6 @@ static const char *startup_source =
 "(expand-context/outer-name the-struct_45)))"
 "            (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_45)))))))"
 "(define-values"
-"(to-syntax-list.1)"
-"(lambda(s_169)"
-"(begin"
-" 'to-syntax-list"
-"(if(list? s_169)"
-"(let-values() s_169)"
-"(if(pair? s_169)"
-"(let-values()(let-values(((r_28)(to-syntax-list.1(cdr s_169))))(if r_28(cons(car s_169) r_28) #f)))"
-"(if(syntax?$1 s_169)(let-values()(to-syntax-list.1(syntax-e$1 s_169)))(let-values() #f)))))))"
-"(define-values(core-scope)(new-multi-scope))"
-"(define-values(core-stx)(add-scope empty-syntax core-scope))"
-"(define-values(core-module-name)(1/make-resolved-module-path '#%core))"
-"(define-values(core-mpi)(1/module-path-index-join ''#%core #f))"
-"(define-values(id-cache-0)(make-hasheq))"
-"(define-values(id-cache-1)(make-hasheq))"
-"(define-values"
-"(core-id)"
-"(lambda(sym_12 phase_34)"
-"(begin"
-"(if(eqv? phase_34 0)"
-"(let-values()"
-"(let-values(((or-part_6)(hash-ref id-cache-0 sym_12 #f)))"
-"(if or-part_6"
-" or-part_6"
-"(let-values(((s_170)(datum->syntax$1 core-stx sym_12)))"
-"(begin(hash-set! id-cache-0 sym_12 s_170) s_170)))))"
-"(if(eq? phase_34 1)"
-"(let-values()"
-"(let-values(((or-part_28)(hash-ref id-cache-1 sym_12 #f)))"
-"(if or-part_28"
-" or-part_28"
-"(let-values(((s_10)(datum->syntax$1(syntax-shift-phase-level$1 core-stx 1) sym_12)))"
-"(begin(hash-set! id-cache-1 sym_12 s_10) s_10)))))"
-"(let-values()(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_34) sym_12)))))))"
-"(define-values(core-forms) '#hasheq())"
-"(define-values(core-primitives) '#hasheq())"
-"(define-values"
-"(add-core-form!*)"
-"(lambda(sym_25 proc_4)"
-"(begin(begin(add-core-binding! sym_25)(set! core-forms(hash-set core-forms sym_25 proc_4))))))"
-"(define-values"
-"(add-core-primitive!)"
-"(lambda(sym_26 val_35)"
-"(begin(begin(add-core-binding! sym_26)(set! core-primitives(hash-set core-primitives sym_26 val_35))))))"
-"(define-values"
-"(add-core-binding!)"
-"(lambda(sym_27)"
-"(begin"
-"(let-values(((temp1_0)(datum->syntax$1 core-stx sym_27))"
-"((temp2_1)"
-"(let-values(((core-mpi4_0) core-mpi)((temp5_2) 0)((sym6_0) sym_27))"
-"(make-module-binding22.1"
-" #f"
-" null"
-" #f"
-" #f"
-" unsafe-undefined"
-" unsafe-undefined"
-" 0"
-" unsafe-undefined"
-" unsafe-undefined"
-" core-mpi4_0"
-" temp5_2"
-" sym6_0)))"
-"((temp3_1) 0))"
-"(add-binding!17.1 #f #f temp1_0 temp2_1 temp3_1)))))"
-"(define-values"
-"(declare-core-module!)"
-"(lambda(ns_46)"
-"(begin"
-"(let-values(((ns7_0) ns_46)"
-"((temp8_0)"
-"(let-values(((temp10_0) #t)"
-"((temp11_0) #t)"
-"((temp12_0) #t)"
-"((core-mpi13_0) core-mpi)"
-"((temp14_1)"
-"(hasheqv"
-" 0"
-"(let-values(((lst_79)(list core-primitives core-forms))((lst_80) '(#f #t)))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_79)))"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-list lst_80)))"
-"((letrec-values(((for-loop_99)"
-"(lambda(table_111 lst_81 lst_82)"
-"(begin"
-" 'for-loop"
-"(if(if(pair? lst_81)(pair? lst_82) #f)"
-"(let-values(((syms_12)(unsafe-car lst_81))"
-"((rest_37)(unsafe-cdr lst_81))"
-"((syntax?_2)(unsafe-car lst_82))"
-"((rest_38)(unsafe-cdr lst_82)))"
-"(let-values(((table_112)"
-"(let-values(((table_113) table_111))"
-"(let-values(((ht_77) syms_12))"
-"(begin"
-"(if(variable-reference-from-unsafe?"
-"(#%variable-reference))"
-"(void)"
-"(let-values()"
-"(check-in-hash-keys ht_77)))"
-"((letrec-values(((for-loop_100)"
-"(lambda(table_114"
-" i_42)"
-"(begin"
-" 'for-loop"
-"(if i_42"
-"(let-values(((sym_28)"
-"(hash-iterate-key"
-" ht_77"
-" i_42)))"
-"(let-values(((table_115)"
-"(let-values(((table_116)"
-" table_114))"
-"(let-values(((table_117)"
-"(let-values()"
-"(let-values(((key_44"
-" val_36)"
-"(let-values()"
-"(let-values(((b_62)"
-"(let-values(((core-mpi17_0)"
-" core-mpi)"
-"((temp18_3)"
-" 0)"
-"((sym19_0)"
-" sym_28))"
-"(make-module-binding22.1"
-" #f"
-" null"
-" #f"
-" #f"
-" unsafe-undefined"
-" unsafe-undefined"
-" 0"
-" unsafe-undefined"
-" unsafe-undefined"
-" core-mpi17_0"
-" temp18_3"
-" sym19_0))))"
-"(values"
-" sym_28"
-"(if syntax?_2"
-"(provided1.1"
-" b_62"
-" #f"
-" #t)"
-" b_62))))))"
-"(hash-set"
-" table_116"
-" key_44"
-" val_36)))))"
-"(values"
-" table_117)))))"
-"(if(not"
-" #f)"
-"(for-loop_100"
-" table_115"
-"(hash-iterate-next"
-" ht_77"
-" i_42))"
-" table_115)))"
-" table_114)))))"
-" for-loop_100)"
-" table_113"
-"(hash-iterate-first ht_77)))))))"
-"(if(not #f)"
-"(for-loop_99 table_112 rest_37 rest_38)"
-" table_112)))"
-" table_111)))))"
-" for-loop_99)"
-" '#hasheq()"
-" lst_79"
-" lst_80)))))"
-"((temp15_1)"
-"(lambda(phase-level_14 ns_47 insp_7)"
-"(if(zero? phase-level_14)"
-"(let-values(((ns_48)"
-"(let-values(((ns20_0) ns_47)"
-"((core-module-name21_0) core-module-name)"
-"((temp22_1) 0))"
-"(namespace->module-namespace82.1"
-" #f"
-" #f"
-" unsafe-undefined"
-" ns20_0"
-" core-module-name21_0"
-" temp22_1))))"
-"(if ns_48"
-"(module-linklet-info2.1(namespace->instance ns_48 0) #f core-mpi #f #f #f)"
-" #f))"
-" #f)))"
-"((temp16_1)"
-"(lambda(data-box_1"
-" ns_49"
-" phase_42"
-" phase-level_15"
-" self_5"
-" bulk-binding-registry_4"
-" insp_8)"
-"(let-values(((tmp_14) phase-level_15))"
-"(if(equal? tmp_14 0)"
-"(let-values()"
-"(begin"
-"(let-values(((ht_78) core-primitives))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-in-hash ht_78)))"
-"((letrec-values(((for-loop_101)"
-"(lambda(i_28)"
-"(begin"
-" 'for-loop"
-"(if i_28"
-"(let-values(((sym_29 val_37)"
-"(hash-iterate-key+value"
-" ht_78"
-" i_28)))"
-"(let-values((()"
-"(let-values()"
-"(let-values((()"
-"(let-values()"
-"(begin"
-"(let-values()"
-"(namespace-set-consistent!"
-" ns_49"
-" 0"
-" sym_29"
-" val_37))"
-"(values)))))"
-"(values)))))"
-"(if(not #f)"
-"(for-loop_101"
-"(hash-iterate-next ht_78 i_28))"
-"(values))))"
-"(values))))))"
-" for-loop_101)"
-"(hash-iterate-first ht_78))))"
-"(void)"
-"(let-values(((ht_79) core-forms))"
-"(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))"
-"(void)"
-"(let-values()(check-in-hash ht_79)))"
-"((letrec-values(((for-loop_102)"
-"(lambda(i_91)"
-"(begin"
-" 'for-loop"
-"(if i_91"
-"(let-values(((sym_30 proc_5)"
-"(hash-iterate-key+value"
-" ht_79"
-" i_91)))"
-"(let-values((()"
-"(let-values()"
-"(let-values((()"
-"(let-values()"
-"(begin"
-"(let-values()"
-"(namespace-set-transformer!"
-" ns_49"
-" 0"
-" sym_30"
-"(if(procedure-arity-includes?"
-" proc_5"
-" 2)"
-"(core-form9.1"
-" proc_5"
-" sym_30)"
-" proc_5)))"
-"(values)))))"
-"(values)))))"
-"(if(not #f)"
-"(for-loop_102"
-"(hash-iterate-next ht_79 i_91))"
-"(values))))"
-"(values))))))"
-" for-loop_102)"
-"(hash-iterate-first ht_79))))"
-"(void)))"
-"(let-values()(void)))))))"
-"(make-module39.1"
-" temp10_0"
-" unsafe-undefined"
-" unsafe-undefined"
-" temp16_1"
-" #f"
-" 0"
-" 0"
-" temp11_0"
-" temp15_1"
-" temp12_0"
-" unsafe-undefined"
-" #f"
-" temp14_1"
-" null"
-" core-mpi13_0"
-" #f"
-" null"
-" #f)))"
-"((core-module-name9_0) core-module-name))"
-"(declare-module!58.1 #t ns7_0 temp8_0 core-module-name9_0)))))"
-"(define-values"
-"(core-form-sym)"
-"(lambda(s_19 phase_43)"
-"(begin"
-"(let-values(((ok?_0 id23_0 _24_0)"
-"(let-values(((s_171) s_19))"
-"(if(let-values(((s_85)(if(syntax?$1 s_171)(syntax-e$1 s_171) s_171)))"
-"(if(pair? s_85)"
-"(if(let-values(((s_172)(car s_85)))"
-"(let-values(((or-part_162)(if(syntax?$1 s_172)(symbol?(syntax-e$1 s_172)) #f)))"
-"(if or-part_162 or-part_162(symbol? s_172))))"
-"(let-values(((s_173)(cdr s_85))) #t)"
-" #f)"
-" #f))"
-"(let-values()"
-"(let-values(((id23_1 _24_1)"
-"(let-values(((s_174)(if(syntax?$1 s_171)(syntax-e$1 s_171) s_171)))"
-"(let-values(((id25_0)(let-values(((s_175)(car s_174))) s_175))"
-"((_26_0)(let-values(((s_176)(cdr s_174))) s_176)))"
-"(values id25_0 _26_0)))))"
-"(values #t id23_1 _24_1)))"
-"(values #f #f #f)))))"
-"(if ok?_0"
-"(let-values(((b_63)"
-"(let-values(((temp27_1) id23_0)((phase28_0) phase_43))"
-"(resolve+shift28.1 #f #f null unsafe-undefined #f temp27_1 phase28_0))))"
-"(if(module-binding? b_63)"
-"(if(eq? core-module-name(1/module-path-index-resolve(module-binding-module b_63)))"
-"(module-binding-sym b_63)"
-" #f)"
-" #f))"
-" #f)))))"
-"(define-values"
 "(taint-dispatch)"
 "(lambda(s_0 proc_6 phase_33)"
 "(begin"
@@ -16238,12 +16255,12 @@ static const char *startup_source =
 "(let-values(((s_179) s_177)"
 "((f_2) f_1)"
 "((gf_8)"
-"(lambda(tail?_41 v_31)"
+"(lambda(tail?_41 v_32)"
 "(begin"
 " 'gf"
-"(if(syntax?$1 v_31)"
-"(let-values()(s->_3 v_31))"
-"(let-values()(f_1 tail?_41 v_31))))))"
+"(if(syntax?$1 v_32)"
+"(let-values()(s->_3 v_32))"
+"(let-values()(f_1 tail?_41 v_32))))))"
 "((seen_20) seen_19))"
 "((letrec-values(((loop_82)"
 "(lambda(tail?_42 s_4 prev-depth_8)"
@@ -16353,12 +16370,12 @@ static const char *startup_source =
 "(let-values(((s_42) s_5)"
 "((f_39) f_38)"
 "((gf_9)"
-"(lambda(tail?_45 v_41)"
+"(lambda(tail?_45 v_42)"
 "(begin"
 " 'gf"
-"(if(syntax?$1 v_41)"
-"(let-values()(s->_4 v_41))"
-"(let-values()(f_38 tail?_45 v_41))))))"
+"(if(syntax?$1 v_42)"
+"(let-values()(s->_4 v_42))"
+"(let-values()(f_38 tail?_45 v_42))))))"
 "((seen_21) seen_0))"
 "((letrec-values(((loop_83)"
 "(lambda(tail?_46 s_183 prev-depth_9)"
@@ -16471,16 +16488,16 @@ static const char *startup_source =
 "(define-values(current-module-code-inspector)(make-parameter #f))"
 "(define-values"
 "(syntax-debug-info$1)"
-"(lambda(s_0 phase_44 all-bindings?_0)"
+"(lambda(s_0 phase_45 all-bindings?_0)"
 "(begin"
 " 'syntax-debug-info"
 "(let-values(((hts_0)"
 "(reverse$1"
-"(let-values(((lst_76)(fallback->list(syntax-shifted-multi-scopes s_0))))"
+"(let-values(((lst_80)(fallback->list(syntax-shifted-multi-scopes s_0))))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_76)))"
+"(let-values()(check-list lst_80)))"
 "((letrec-values(((for-loop_103)"
 "(lambda(fold-var_59 lst_83)"
 "(begin"
@@ -16505,7 +16522,7 @@ static const char *startup_source =
 "(scope-set-at-fallback"
 " s_0"
 " smss_26"
-" phase_44)))"
+" phase_45)))"
 "(let-values(((context_1)"
 "(scope-set->context"
 " s-scs_0)))"
@@ -16571,25 +16588,25 @@ static const char *startup_source =
 " covered-scope-sets_1)"
 "(let-values(((ht_81"
 " bulk-bindings_3)"
-"(let-values(((table_118)"
+"(let-values(((table_119)"
 "(scope-binding-table"
 " sc_28)))"
 "(if(hash?"
-" table_118)"
+" table_119)"
 "(values"
 "(hash-ref"
-" table_118"
+" table_119"
 " sym_18"
 " '#hash())"
 " null)"
 "(values"
 "(hash-ref"
 "(table-with-bulk-bindings-syms"
-" table_118)"
+" table_119)"
 " sym_18"
 " '#hash())"
 "(table-with-bulk-bindings-bulk-bindings"
-" table_118)))))"
+" table_119)))))"
 "((s_188)"
 " s_0)"
 "((extra-shifts_5)"
@@ -16773,14 +16790,14 @@ static const char *startup_source =
 " i_43)))"
 "(let-values(((fold-var_64)"
 "(let-values(((sym-ht_1)"
-"(let-values(((table_63)"
+"(let-values(((table_64)"
 "(scope-binding-table"
 " sc_29)))"
 "(if(hash?"
-" table_63)"
-" table_63"
+" table_64)"
+" table_64"
 "(table-with-bulk-bindings-syms"
-" table_63)))))"
+" table_64)))))"
 "(begin"
 " #t"
 "((letrec-values(((for-loop_105)"
@@ -16912,8 +16929,8 @@ static const char *startup_source =
 " fold-var_59)))))"
 " for-loop_103)"
 " null"
-" lst_76))))))"
-"(let-values(((ht_73)(car hts_0)))(if(null?(cdr hts_0)) ht_73(hash-set ht_73 'fallbacks(cdr hts_0))))))))"
+" lst_80))))))"
+"(let-values(((ht_76)(car hts_0)))(if(null?(cdr hts_0)) ht_76(hash-set ht_76 'fallbacks(cdr hts_0))))))))"
 "(define-values"
 "(scope-set->context)"
 "(lambda(scs_17)"
@@ -17391,7 +17408,7 @@ static const char *startup_source =
 "(raise-syntax-implicit-error)"
 "(lambda(s_0 sym_31 trigger-id_0 ctx_8)"
 "(begin"
-"(let-values(((phase_45)(expand-context-phase ctx_8)))"
+"(let-values(((phase_46)(expand-context-phase ctx_8)))"
 "(let-values(((what_1)"
 "(let-values(((tmp_16) sym_31))"
 "(if(equal? tmp_16 '#%app)"
@@ -17407,7 +17424,7 @@ static const char *startup_source =
 "(let-values(((unbound?_0)"
 "(if trigger-id_0"
 "(not"
-"(let-values(((trigger-id1_0) trigger-id_0)((phase2_1) phase_45))"
+"(let-values(((trigger-id1_0) trigger-id_0)((phase2_1) phase_46))"
 "(resolve40.1 #f #f null #f trigger-id1_0 phase2_1)))"
 " #f)))"
 "(let-values(((unbound-form_0)"
@@ -17419,12 +17436,12 @@ static const char *startup_source =
 "                  \"unbound identifier;\\n also, no ~a syntax transformer is bound~a\""
 "                  (string-append what_1 \" is not allowed;\\n no ~a syntax transformer is bound~a\"))"
 " sym_31"
-"(let-values(((tmp_17) phase_45))"
+"(let-values(((tmp_17) phase_46))"
 "(if(equal? tmp_17 0)"
 "                    (let-values () \"\")"
 "(if(equal? tmp_17 1)"
 "                      (let-values () \" in the transformer phase\")"
-"                      (let-values () (format \" at phase ~a\" phase_45))))))"
+"                      (let-values () (format \" at phase ~a\" phase_46))))))"
 "(if unbound?_0(let-values(((or-part_13) unbound-form_0))(if or-part_13 or-part_13 trigger-id_0)) #f)"
 "(if unbound?_0(if unbound-form_0 trigger-id_0 #f) s_0)"
 " null"
@@ -17436,9 +17453,9 @@ static const char *startup_source =
 "(begin"
 " 'check-no-duplicate-ids7"
 "(let-values(((ids_2) ids4_0))"
-"(let-values(((phase_46) phase5_0))"
+"(let-values(((phase_47) phase5_0))"
 "(let-values(((s_3) s6_0))"
-"(let-values(((ht_74)(if(eq? ht3_0 unsafe-undefined)(make-check-no-duplicate-table) ht3_0)))"
+"(let-values(((ht_77)(if(eq? ht3_0 unsafe-undefined)(make-check-no-duplicate-table) ht3_0)))"
 "              (let-values (((what_2) (if (eq? what1_0 unsafe-undefined) \"binding name\" what1_0)))"
 "(let-values()"
 "((letrec-values(((loop_6)"
@@ -17455,13 +17472,13 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_102)))"
 "((letrec-values(((for-loop_116)"
-"(lambda(lst_77)"
+"(lambda(lst_81)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_77)"
-"(let-values(((id_21)(unsafe-car lst_77))"
+"(if(pair? lst_81)"
+"(let-values(((id_21)(unsafe-car lst_81))"
 "((rest_49)"
-"(unsafe-cdr lst_77)))"
+"(unsafe-cdr lst_81)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -17471,7 +17488,7 @@ static const char *startup_source =
 "(if(bound-identifier=?$1"
 " id_21"
 " v_138"
-" phase_46)"
+" phase_47)"
 "(let-values()"
 "(raise-syntax-error$1"
 " #f"
@@ -17496,7 +17513,7 @@ static const char *startup_source =
 "(let-values() ht_84)))))))"
 " loop_6)"
 " ids_2"
-" ht_74))))))))))"
+" ht_77))))))))))"
 "(define-values"
 "(remove-use-site-scopes)"
 "(lambda(s_0 ctx_7)"
@@ -17575,7 +17592,7 @@ static const char *startup_source =
 "(begin"
 " 'make-compile-context14"
 "(let-values(((namespace_1)(if(eq? namespace2_0 unsafe-undefined)(1/current-namespace) namespace2_0)))"
-"(let-values(((phase_47)(if(eq? phase3_1 unsafe-undefined)(namespace-phase namespace_1) phase3_1)))"
+"(let-values(((phase_48)(if(eq? phase3_1 unsafe-undefined)(namespace-phase namespace_1) phase3_1)))"
 "(let-values(((self_6)(if(eq? self4_1 unsafe-undefined)(namespace-self-mpi namespace_1) self4_1)))"
 "(let-values(((module-self_0) module-self5_0))"
 "(let-values(((full-module-name_0) full-module-name6_0))"
@@ -17590,7 +17607,7 @@ static const char *startup_source =
 "(void))"
 "(compile-context1.1"
 " namespace_1"
-" phase_47"
+" phase_48"
 " self_6"
 " module-self_0"
 " full-module-name_0"
@@ -17790,12 +17807,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_104)))"
 "((letrec-values(((for-loop_118)"
-"(lambda(fold-var_10 lst_80)"
+"(lambda(fold-var_10 lst_76)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_80)"
-"(let-values(((i_94)(unsafe-car lst_80))"
-"((rest_51)(unsafe-cdr lst_80)))"
+"(if(pair? lst_76)"
+"(let-values(((i_94)(unsafe-car lst_76))"
+"((rest_51)(unsafe-cdr lst_76)))"
 "(let-values(((fold-var_94)"
 "(let-values(((fold-var_95) fold-var_10))"
 "(let-values(((fold-var_96)"
@@ -17821,29 +17838,29 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_85)))"
 "((letrec-values(((for-loop_119)"
-"(lambda(table_119 i_95)"
+"(lambda(table_120 i_95)"
 "(begin"
 " 'for-loop"
 "(if i_95"
-"(let-values(((k_19 v_69)(hash-iterate-key+value ht_85 i_95)))"
-"(let-values(((table_120)"
-"(let-values(((table_114) table_119))"
+"(let-values(((k_20 v_70)(hash-iterate-key+value ht_85 i_95)))"
 "(let-values(((table_121)"
+"(let-values(((table_115) table_120))"
+"(let-values(((table_122)"
 "(let-values()"
 "(let-values(((key_45 val_38)"
 "(let-values()"
 "(values"
-" v_69"
-" k_19))))"
+" v_70"
+" k_20))))"
 "(hash-set"
-" table_114"
+" table_115"
 " key_45"
 " val_38)))))"
-"(values table_121)))))"
+"(values table_122)))))"
 "(if(not #f)"
-"(for-loop_119 table_120(hash-iterate-next ht_85 i_95))"
-" table_120)))"
-" table_119)))))"
+"(for-loop_119 table_121(hash-iterate-next ht_85 i_95))"
+" table_121)))"
+" table_120)))))"
 " for-loop_119)"
 " '#hasheqv()"
 "(hash-iterate-first ht_85))))))"
@@ -17912,31 +17929,31 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_86)))"
 "((letrec-values(((for-loop_120)"
-"(lambda(table_122 i_93)"
+"(lambda(table_123 i_93)"
 "(begin"
 " 'for-loop"
 "(if i_93"
-"(let-values(((k_20 v_38)"
+"(let-values(((k_21 v_39)"
 "(hash-iterate-key+value ht_86 i_93)))"
-"(let-values(((table_15)"
-"(let-values(((table_123) table_122))"
-"(let-values(((table_9)"
+"(let-values(((table_16)"
+"(let-values(((table_124) table_123))"
+"(let-values(((table_10)"
 "(let-values()"
 "(let-values(((key_46"
 " val_39)"
 "(let-values()"
 "(values"
-" v_38"
-" k_20))))"
+" v_39"
+" k_21))))"
 "(hash-set"
-" table_123"
+" table_124"
 " key_46"
 " val_39)))))"
-"(values table_9)))))"
+"(values table_10)))))"
 "(if(not #f)"
-"(for-loop_120 table_15(hash-iterate-next ht_86 i_93))"
-" table_15)))"
-" table_122)))))"
+"(for-loop_120 table_16(hash-iterate-next ht_86 i_93))"
+" table_16)))"
+" table_123)))))"
 " for-loop_120)"
 " '#hasheqv()"
 "(hash-iterate-first ht_86))))))"
@@ -18549,7 +18566,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_108)"
-"(let-values(((k_21)"
+"(let-values(((k_22)"
 "(unsafe-car"
 " lst_108))"
 "((rest_54)"
@@ -18563,11 +18580,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(loop_11"
-" k_21)"
+" k_22)"
 "(loop_11"
 "(hash-ref"
 " v_104"
-" k_21))))"
+" k_22))))"
 "(values)))))"
 "(values)))))"
 "(if(not"
@@ -18602,7 +18619,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_110)"
-"(let-values(((k_22)"
+"(let-values(((k_23)"
 "(unsafe-car"
 " lst_110))"
 "((rest_55)"
@@ -18616,11 +18633,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(add-frontier!_0"
-" k_22)"
+" k_23)"
 "(add-frontier!_0"
 "(hash-ref"
 " v_104"
-" k_22))))"
+" k_23))))"
 "(values)))))"
 "(values)))))"
 "(if(not"
@@ -18858,7 +18875,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-naturals start_20)))"
 "((letrec-values(((for-loop_132)"
-"(lambda(table_124 lst_114 pos_25)"
+"(lambda(table_125 lst_114 pos_25)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_114) #t #f)"
@@ -18867,10 +18884,10 @@ static const char *startup_source =
 "((rest_57)"
 "(unsafe-cdr lst_114))"
 "((pos_26) pos_25))"
-"(let-values(((table_125)"
-"(let-values(((table_35)"
-" table_124))"
+"(let-values(((table_126)"
 "(let-values(((table_36)"
+" table_125))"
+"(let-values(((table_37)"
 "(let-values()"
 "(let-values(((key_47"
 " val_40)"
@@ -18879,17 +18896,17 @@ static const char *startup_source =
 " step_3"
 " pos_26))))"
 "(hash-set"
-" table_35"
+" table_36"
 " key_47"
 " val_40)))))"
-"(values table_36)))))"
+"(values table_37)))))"
 "(if(not #f)"
 "(for-loop_132"
-" table_125"
+" table_126"
 " rest_57"
 "(+ pos_25 1))"
-" table_125)))"
-" table_124)))))"
+" table_126)))"
+" table_125)))))"
 " for-loop_132)"
 " '#hasheqv()"
 " lst_113"
@@ -19326,7 +19343,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_118)"
-"(let-values(((k_23)"
+"(let-values(((k_24)"
 "(unsafe-car"
 " lst_118))"
 "((rest_59)"
@@ -19342,7 +19359,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(ser-push!_16"
-" k_23)"
+" k_24)"
 "(values))))"
 "(let-values(((v-pos_1)"
 "(next-push-position_0)))"
@@ -19353,7 +19370,7 @@ static const char *startup_source =
 "(ser-push!_16"
 "(hash-ref"
 " v_149"
-" k_23))))"
+" k_24))))"
 "(if all-quoted?_13"
 "(if(quoted?_0"
 " k-pos_0)"
@@ -19391,7 +19408,7 @@ static const char *startup_source =
 "(prefab-struct-key"
 " v_149)))"
 "(if c3_0"
-"((lambda(k_24)"
+"((lambda(k_25)"
 "(let-values(((vec_44)"
 "(struct->vector"
 " v_149)))"
@@ -19407,7 +19424,7 @@ static const char *startup_source =
 "(begin"
 "(ser-push!_16"
 " 'exact"
-" k_24)"
+" k_25)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -19641,7 +19658,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_120)"
-"(let-values(((k_25)"
+"(let-values(((k_26)"
 "(unsafe-car"
 " lst_120))"
 "((rest_60)"
@@ -19655,11 +19672,11 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(ser-push!_16"
-" k_25)"
+" k_26)"
 "(ser-push!_16"
 "(hash-ref"
 " v_80"
-" k_25))))"
+" k_26))))"
 "(values)))))"
 "(values)))))"
 "(if(not"
@@ -19684,40 +19701,40 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_90)))"
 "((letrec-values(((for-loop_138)"
-"(lambda(table_126 i_113)"
+"(lambda(table_127 i_113)"
 "(begin"
 " 'for-loop"
 "(if i_113"
-"(let-values(((k_26"
+"(let-values(((k_27"
 " v_152)"
 "(hash-iterate-key+value"
 " ht_90"
 " i_113)))"
-"(let-values(((table_59)"
 "(let-values(((table_60)"
-" table_126))"
-"(let-values(((table_127)"
+"(let-values(((table_61)"
+" table_127))"
+"(let-values(((table_128)"
 "(let-values()"
 "(let-values(((key_48"
 " val_42)"
 "(let-values()"
 "(values"
 " v_152"
-" k_26))))"
+" k_27))))"
 "(hash-set"
-" table_60"
+" table_61"
 " key_48"
 " val_42)))))"
 "(values"
-" table_127)))))"
+" table_128)))))"
 "(if(not #f)"
 "(for-loop_138"
-" table_59"
+" table_60"
 "(hash-iterate-next"
 " ht_90"
 " i_113))"
-" table_59)))"
-" table_126)))))"
+" table_60)))"
+" table_127)))))"
 " for-loop_138)"
 " '#hasheqv()"
 "(hash-iterate-first ht_90))))))"
@@ -19775,7 +19792,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash-keys ht_91)))"
 "((letrec-values(((for-loop_140)"
-"(lambda(table_128 i_60)"
+"(lambda(table_129 i_60)"
 "(begin"
 " 'for-loop"
 "(if i_60"
@@ -19783,10 +19800,10 @@ static const char *startup_source =
 "(hash-iterate-key"
 " ht_91"
 " i_60)))"
-"(let-values(((table_129)"
 "(let-values(((table_130)"
-" table_128))"
 "(let-values(((table_131)"
+" table_129))"
+"(let-values(((table_132)"
 "(let-values()"
 "(let-values(((key_49"
 " val_43)"
@@ -19799,19 +19816,19 @@ static const char *startup_source =
 " obj_1))"
 " obj_1))))"
 "(hash-set"
-" table_130"
+" table_131"
 " key_49"
 " val_43)))))"
 "(values"
-" table_131)))))"
+" table_132)))))"
 "(if(not #f)"
 "(for-loop_140"
-" table_129"
+" table_130"
 "(hash-iterate-next"
 " ht_91"
 " i_60))"
-" table_129)))"
-" table_128)))))"
+" table_130)))"
+" table_129)))))"
 " for-loop_140)"
 " '#hasheqv()"
 "(hash-iterate-first ht_91))))))"
@@ -20434,7 +20451,7 @@ static const char *startup_source =
 "((pos_60) pos_57))"
 "(let-values(((ht_96 pos_61)"
 "(let-values()"
-"(let-values(((k_27"
+"(let-values(((k_28"
 " next-pos_24)"
 "(decode"
 " vec_50"
@@ -20455,7 +20472,7 @@ static const char *startup_source =
 "(values"
 "(hash-set"
 " ht_95"
-" k_27"
+" k_28"
 " v_157)"
 " next-pos_25))))))"
 "(values ht_96 pos_61)))))"
@@ -20496,7 +20513,7 @@ static const char *startup_source =
 "(let-values(((s_195) s_193)((pos_65) pos_62))"
 "(let-values(((s_196 pos_66)"
 "(let-values()"
-"(let-values(((k_28 next-pos_26)"
+"(let-values(((k_29 next-pos_26)"
 "(decode"
 " vec_50"
 " pos_65"
@@ -20505,7 +20522,7 @@ static const char *startup_source =
 " bulk-binding-registry_7"
 " shared_2)))"
 "(values"
-"(set-add s_195 k_28)"
+"(set-add s_195 k_29)"
 " next-pos_26)))))"
 "(values s_196 pos_66)))))"
 "(if(not #f)"
@@ -20519,7 +20536,7 @@ static const char *startup_source =
 "(if(unsafe-fx< index_0 16)"
 "(let-values()"
 "(let-values(((key_50 next-pos_27)"
-"(let-values(((k_29 next-pos_28)"
+"(let-values(((k_30 next-pos_28)"
 "(decode"
 " vec_50"
 "(add1 pos_51)"
@@ -20527,7 +20544,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(values k_29 next-pos_28))))"
+"(values k_30 next-pos_28))))"
 "(let-values(((len_23)(vector*-ref vec_50 next-pos_27)))"
 "(let-values(((r_30 done-pos_1)"
 "(let-values(((start_30) 0)((end_22) len_23)((inc_16) 1))"
@@ -20607,7 +20624,7 @@ static const char *startup_source =
 " shared_2)))"
 "(values(deserialize-multi-scope name_38 scopes_21) next-pos_33))))"
 "(let-values()"
-"(let-values(((phase_48 next-pos_34)"
+"(let-values(((phase_49 next-pos_34)"
 "(decode"
 " vec_50"
 "(add1 pos_51)"
@@ -20623,7 +20640,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(values(deserialize-shifted-multi-scope phase_48 multi-scope_2) next-pos_35))))))))"
+"(values(deserialize-shifted-multi-scope phase_49 multi-scope_2) next-pos_35))))))))"
 "(if(unsafe-fx< index_0 24)"
 "(if(unsafe-fx< index_0 22)"
 "(let-values()"
@@ -20660,7 +20677,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(let-values(((phase_49 next-pos_41)"
+"(let-values(((phase_50 next-pos_41)"
 "(decode"
 " vec_50"
 " next-pos_40"
@@ -20668,7 +20685,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(values(deserialize-representative-scope kind_7 phase_49) next-pos_41))))))"
+"(values(deserialize-representative-scope kind_7 phase_50) next-pos_41))))))"
 "(if(unsafe-fx< index_0 26)"
 "(if(unsafe-fx< index_0 25)"
 "(let-values()"
@@ -20688,7 +20705,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(let-values(((phase_50 next-pos_44)"
+"(let-values(((phase_51 next-pos_44)"
 "(decode"
 " vec_50"
 " next-pos_43"
@@ -20756,7 +20773,7 @@ static const char *startup_source =
 "(deserialize-full-module-binding"
 " module_4"
 " sym_32"
-" phase_50"
+" phase_51"
 " nominal-module_4"
 " nominal-phase_3"
 " nominal-sym_3"
@@ -20782,7 +20799,7 @@ static const char *startup_source =
 " inspector_8"
 " bulk-binding-registry_7"
 " shared_2)))"
-"(let-values(((phase_51 next-pos_54)"
+"(let-values(((phase_52 next-pos_54)"
 "(decode"
 " vec_50"
 " next-pos_53"
@@ -20799,7 +20816,7 @@ static const char *startup_source =
 " bulk-binding-registry_7"
 " shared_2)))"
 "(values"
-"(deserialize-simple-module-binding module_5 sym_33 phase_51 nominal-module_5)"
+"(deserialize-simple-module-binding module_5 sym_33 phase_52 nominal-module_5)"
 " next-pos_55)))))))"
 "(if(unsafe-fx< index_0 27)"
 "(let-values()"
@@ -21136,7 +21153,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_125"
-"(let-values(((k_30 v_162)"
+"(let-values(((k_31 v_162)"
 "(hash-iterate-key+value"
 " ht_97"
 " i_125)))"
@@ -21148,7 +21165,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(loop_86"
-" k_30)"
+" k_31)"
 "(loop_86"
 " v_162)))"
 "(values)))))"
@@ -21840,9 +21857,9 @@ static const char *startup_source =
 "(module-path->mpi5.1 temp10_2 mod-path8_1 temp9_0)))))"
 "(define-values"
 "(syntax-mapped-names)"
-"(lambda(s_0 phase_44)"
+"(lambda(s_0 phase_45)"
 "(begin"
-"(let-values(((s-scs_1)(syntax-scope-set s_0 phase_44)))"
+"(let-values(((s-scs_1)(syntax-scope-set s_0 phase_45)))"
 "(let-values(((ht_98) s-scs_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
@@ -22061,14 +22078,14 @@ static const char *startup_source =
 " 'add-defined-or-required-id!19"
 "(let-values(((r+p_3) r+p15_0))"
 "(let-values(((id_24) id16_0))"
-"(let-values(((phase_52) phase17_0))"
+"(let-values(((phase_53) phase17_0))"
 "(let-values(((binding_11) binding18_0))"
 "(let-values(((can-be-shadowed?_0) can-be-shadowed?11_0))"
 "(let-values(((as-transformer?_0) as-transformer?12_0))"
 "(let-values()"
 "(begin"
 "(if(equal?"
-" phase_52"
+" phase_53"
 "(phase+"
 "(module-binding-nominal-phase binding_11)"
 "(module-binding-nominal-require-phase binding_11)))"
@@ -22076,7 +22093,7 @@ static const char *startup_source =
 "                        (let-values () (error \"internal error: binding phase does not match nominal info\")))"
 "(let-values(((r+p124_0) r+p_3)"
 "((id125_0) id_24)"
-"((phase126_0) phase_52)"
+"((phase126_0) phase_53)"
 "((temp127_0)(module-binding-nominal-module binding_11))"
 "((temp128_0)(module-binding-nominal-require-phase binding_11))"
 "((can-be-shadowed?129_0) can-be-shadowed?_0)"
@@ -22102,7 +22119,7 @@ static const char *startup_source =
 " 'add-defined-or-required-id-at-nominal!33"
 "(let-values(((r+p_4) r+p30_0))"
 "(let-values(((id_25) id31_0))"
-"(let-values(((phase_53) phase32_0))"
+"(let-values(((phase_54) phase32_0))"
 "(let-values(((nominal-module_6) nominal-module22_0))"
 "(let-values(((nominal-require-phase_4) nominal-require-phase23_0))"
 "(let-values(((can-be-shadowed?_1) can-be-shadowed?24_0))"
@@ -22119,7 +22136,7 @@ static const char *startup_source =
 " sym-to-reqds_0"
 " sym_34"
 "(cons-ish"
-"(required2.1 id_25 phase_53 can-be-shadowed?_1 as-transformer?_1)"
+"(required2.1 id_25 phase_54 can-be-shadowed?_1 as-transformer?_1)"
 "(hash-ref sym-to-reqds_0 sym_34 null)))))))))))))))))"
 "(define-values"
 "(add-bulk-required-ids!59.1)"
@@ -22156,11 +22173,11 @@ static const char *startup_source =
 "(let-values(((accum-update-nominals_0) accum-update-nominals42_0))"
 "(let-values(((who_11) who43_0))"
 "(let-values()"
-"(let-values(((phase_54)(phase+ provide-phase-level_3 phase-shift_6)))"
+"(let-values(((phase_55)(phase+ provide-phase-level_3 phase-shift_6)))"
 "(let-values(((shortcut-table_0)"
 "(if check-and-remove?_0"
 "(if(>(hash-count provides_4) 64)"
-"(syntax-mapped-names s_114 phase_54)"
+"(syntax-mapped-names s_114 phase_55)"
 " #f)"
 " #f)))"
 "(let-values(((mpi_13)(intern-mpi r+p_5 nominal-module_7)))"
@@ -22258,7 +22275,7 @@ static const char *startup_source =
 " sym_35"
 " s_114))"
 "((phase135_0)"
-" phase_54)"
+" phase_55)"
 "((orig-s136_0)"
 " orig-s_0)"
 "((temp137_0)"
@@ -22333,7 +22350,7 @@ static const char *startup_source =
 "(hash-iterate-first ht_99))))))))))))))))))))))))))))))"
 "(define-values"
 "(bulk-required->required)"
-"(lambda(br_1 nominal-module_8 phase_55 sym_36)"
+"(lambda(br_1 nominal-module_8 phase_56 sym_36)"
 "(begin"
 "(let-values(((prefix-len_1)(bulk-required-prefix-len br_1)))"
 "(let-values(((out-sym_1)"
@@ -22343,13 +22360,13 @@ static const char *startup_source =
 "(let-values(((binding/p_3)(hash-ref(bulk-required-provides br_1) out-sym_1)))"
 "(required2.1"
 "(datum->syntax$1(bulk-required-s br_1) sym_36)"
-"(phase+ phase_55(bulk-required-provide-phase-level br_1))"
+"(phase+ phase_56(bulk-required-provide-phase-level br_1))"
 "(bulk-required-can-be-shadowed? br_1)"
 "(provided-as-transformer? binding/p_3))))))))"
 "(define-values"
 "(normalize-required)"
-"(lambda(r_35 mod-name_9 phase_56 sym_37)"
-"(begin(if(bulk-required? r_35)(bulk-required->required r_35 mod-name_9 phase_56 sym_37) r_35))))"
+"(lambda(r_35 mod-name_9 phase_57 sym_37)"
+"(begin(if(bulk-required? r_35)(bulk-required->required r_35 mod-name_9 phase_57 sym_37) r_35))))"
 "(define-values"
 "(add-enclosing-module-defined-and-required!67.1)"
 "(lambda(enclosing-requires+provides62_0 r+p64_0 enclosing-mod65_0 phase-shift66_0)"
@@ -22393,7 +22410,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_129"
-"(let-values(((phase_57"
+"(let-values(((phase_58"
 " at-phase_8)"
 "(hash-iterate-key+value"
 " ht_101"
@@ -22452,7 +22469,7 @@ static const char *startup_source =
 "(normalize-required"
 " reqd/maybe-bulk_0"
 " mod-name_10"
-" phase_57"
+" phase_58"
 " sym_38)))"
 "(let-values(((r+p147_0)"
 " r+p_6)"
@@ -22544,11 +22561,11 @@ static const char *startup_source =
 " 'remove-required-id!75"
 "(let-values(((r+p_7) r+p72_0))"
 "(let-values(((id_26) id73_0))"
-"(let-values(((phase_58) phase74_0))"
+"(let-values(((phase_59) phase74_0))"
 "(let-values(((binding_12) unless-matches70_0))"
 "(let-values()"
 "(let-values(((b_69)"
-"(let-values(((id157_0) id_26)((phase158_0) phase_58)((temp159_0) #t))"
+"(let-values(((id157_0) id_26)((phase158_0) phase_59)((temp159_0) #t))"
 "(resolve+shift28.1 #f temp159_0 null unsafe-undefined #f id157_0 phase158_0))))"
 "(if b_69"
 "(let-values()"
@@ -22574,7 +22591,7 @@ static const char *startup_source =
 "(remove-non-matching-requireds"
 " l_53"
 " id_26"
-" phase_58"
+" phase_59"
 " mpi_31"
 " nominal-phase_4"
 " sym_39)))))))))"
@@ -22583,7 +22600,7 @@ static const char *startup_source =
 "(void)))))))))))"
 "(define-values"
 "(remove-non-matching-requireds)"
-"(lambda(reqds_1 id_27 phase_59 mpi_32 nominal-phase_5 sym_40)"
+"(lambda(reqds_1 id_27 phase_60 mpi_32 nominal-phase_5 sym_40)"
 "(begin"
 "(reverse$1"
 "(let-values(((lst_124) reqds_1))"
@@ -22614,14 +22631,14 @@ static const char *startup_source =
 "(let-values(((fold-var_113)"
 " fold-var_111))"
 "(if(if(eqv?"
-" phase_59"
+" phase_60"
 "(required-phase"
 " r_37))"
 "(free-identifier=?$1"
 "(required-id r_37)"
 " id_27"
-" phase_59"
-" phase_59)"
+" phase_60"
+" phase_60)"
 " #f)"
 " fold-var_113"
 "(let-values(((fold-var_114)"
@@ -22660,7 +22677,7 @@ static const char *startup_source =
 "(let-values(((allow-defined?_0) allow-defined?79_0))"
 "(let-values(((r+p_8) r+p92_0))"
 "(let-values(((id_28) id93_0))"
-"(let-values(((phase_60) phase94_0))"
+"(let-values(((phase_61) phase94_0))"
 "(let-values(((orig-s_1) in80_0))"
 "(let-values(((ok-binding/delayed_0) unless-matches81_0))"
 "(let-values(((remove-shadowed!?_0) remove-shadowed!?82_0))"
@@ -22668,7 +22685,7 @@ static const char *startup_source =
 "(let-values(((who_12) who84_0))"
 "(let-values()"
 "(let-values(((b_70)"
-"(let-values(((id160_0) id_28)((phase161_0) phase_60)((temp162_0) #t))"
+"(let-values(((id160_0) id_28)((phase161_0) phase_61)((temp162_0) #t))"
 "(resolve+shift28.1"
 " #f"
 " temp162_0"
@@ -22691,7 +22708,7 @@ static const char *startup_source =
 "(hash-ref"
 "(hash-ref"
 "(requires+provides-phase-to-defined-syms r+p_8)"
-" phase_60"
+" phase_61"
 " '#hasheq())"
 "(module-binding-sym b_70)"
 " #f))"
@@ -22719,14 +22736,14 @@ static const char *startup_source =
 "(string-append"
 "                                                                      \"identifier already \""
 "                                                                      (if defined?_1 \"defined\" \"required\")"
-"(if(zero-phase? phase_60)"
+"(if(zero-phase? phase_61)"
 "                                                                        (let-values () \"\")"
-"(if(label-phase? phase_60)"
+"(if(label-phase? phase_61)"
 "                                                                          (let-values () \" for label\")"
-"(if(= 1 phase_60)"
+"(if(= 1 phase_61)"
 "                                                                            (let-values () \" for syntax\")"
 "(let-values()"
-"                                                                              (format \" for phase ~a\" phase_60))))))"
+"                                                                              (format \" for phase ~a\" phase_61))))))"
 " orig-s_1"
 " id_28)))))"
 "(if(if(not at-mod_4)(not define-shadowing-require?_0) #f)"
@@ -22764,7 +22781,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " unsafe-undefined"
 " ok-binding167_0)))"
-"((phase166_1) phase_60))"
+"((phase166_1) phase_61))"
 "(add-binding!17.1"
 " #f"
 " temp163_1"
@@ -22898,7 +22915,7 @@ static const char *startup_source =
 "(remove-non-matching-requireds"
 " reqds_2"
 " id_28"
-" phase_60"
+" phase_61"
 " mpi_33"
 " nominal-phase_6"
 "(syntax-e$1 id_28))))"
@@ -22911,11 +22928,11 @@ static const char *startup_source =
 " 'add-defined-syms!103"
 "(let-values(((r+p_9) r+p100_0))"
 "(let-values(((syms_18) syms101_0))"
-"(let-values(((phase_61) phase102_0))"
+"(let-values(((phase_62) phase102_0))"
 "(let-values(((as-transformer?_2) as-transformer?98_0))"
 "(let-values()"
 "(let-values(((phase-to-defined-syms_0)(requires+provides-phase-to-defined-syms r+p_9)))"
-"(let-values(((defined-syms_2)(hash-ref phase-to-defined-syms_0 phase_61 '#hasheq())))"
+"(let-values(((defined-syms_2)(hash-ref phase-to-defined-syms_0 phase_62 '#hasheq())))"
 "(let-values(((new-defined-syms_0)"
 "(let-values(((lst_128) syms_18))"
 "(begin"
@@ -22948,23 +22965,23 @@ static const char *startup_source =
 " for-loop_164)"
 " defined-syms_2"
 " lst_128)))))"
-"(hash-set! phase-to-defined-syms_0 phase_61 new-defined-syms_0))))))))))))"
+"(hash-set! phase-to-defined-syms_0 phase_62 new-defined-syms_0))))))))))))"
 "(define-values"
 "(defined-sym-kind)"
-"(lambda(r+p_10 sym_42 phase_62)"
+"(lambda(r+p_10 sym_42 phase_63)"
 "(begin"
 "(let-values(((phase-to-defined-syms_1)(requires+provides-phase-to-defined-syms r+p_10)))"
-"(let-values(((defined-syms_7)(hash-ref phase-to-defined-syms_1 phase_62 '#hasheq())))"
+"(let-values(((defined-syms_7)(hash-ref phase-to-defined-syms_1 phase_63 '#hasheq())))"
 "(hash-ref defined-syms_7 sym_42 #f))))))"
 "(define-values"
 "(extract-module-requires)"
-"(lambda(r+p_11 mod-name_11 phase_63)"
+"(lambda(r+p_11 mod-name_11 phase_64)"
 "(begin"
 "(let-values(((mpi_34)(intern-mpi r+p_11 mod-name_11)))"
 "(let-values(((at-mod_5)(hash-ref(requires+provides-requires r+p_11) mpi_34 #f)))"
 "(if at-mod_5"
 "(reverse$1"
-"(let-values(((ht_103)(hash-ref at-mod_5 phase_63 '#hasheq())))"
+"(let-values(((ht_103)(hash-ref at-mod_5 phase_64 '#hasheq())))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
@@ -23002,7 +23019,7 @@ static const char *startup_source =
 "(normalize-required"
 " reqd_1"
 " mpi_34"
-" phase_63"
+" phase_64"
 " sym_43))"
 " fold-var_120))))"
 "(values"
@@ -23032,7 +23049,7 @@ static const char *startup_source =
 "(if or-part_176 or-part_176 null)))))"
 "(define-values"
 "(extract-all-module-requires)"
-"(lambda(r+p_13 mod-name_12 phase_64)"
+"(lambda(r+p_13 mod-name_12 phase_65)"
 "(begin"
 "(let-values(((self_9)(requires+provides-self r+p_13)))"
 "(let-values(((requires_2)(requires+provides-requires r+p_13)))"
@@ -23070,12 +23087,12 @@ static const char *startup_source =
 "(let-values(((fold-var_50)"
 "(let-values(((lst_63)"
 "(if(eq?"
-" phase_64"
+" phase_65"
 " 'all)"
 "(hash-keys"
 " phase-to-requireds_0)"
 "(list"
-" phase_64))))"
+" phase_65))))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -23090,7 +23107,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_133)"
-"(let-values(((phase_65)"
+"(let-values(((phase_66)"
 "(unsafe-car"
 " lst_133))"
 "((rest_68)"
@@ -23100,7 +23117,7 @@ static const char *startup_source =
 "(let-values(((ht_104)"
 "(hash-ref"
 " phase-to-requireds_0"
-" phase_65"
+" phase_66"
 "(lambda()"
 "(esc_0"
 " #f)))))"
@@ -23157,7 +23174,7 @@ static const char *startup_source =
 "(normalize-required"
 " reqd_2"
 " mod-name_13"
-" phase_65"
+" phase_66"
 " sym_44))"
 " fold-var_130))))"
 "(values"
@@ -23218,7 +23235,7 @@ static const char *startup_source =
 " 'add-provide!117"
 "(let-values(((r+p_14) r+p110_0))"
 "(let-values(((sym_45) sym111_0))"
-"(let-values(((phase_66) phase112_0))"
+"(let-values(((phase_67) phase112_0))"
 "(let-values(((binding_13) binding113_0))"
 "(let-values(((immed-binding_0) immed-binding114_0))"
 "(let-values(((id_29) id115_0))"
@@ -23235,7 +23252,7 @@ static const char *startup_source =
 "(void))"
 "(hash-update!"
 "(requires+provides-provides r+p_14)"
-" phase_66"
+" phase_67"
 "(lambda(at-phase_9)"
 "(let-values(((b/p_0)(hash-ref at-phase_9 sym_45 #f)))"
 "(let-values(((b_71)(provided-as-binding b/p_0)))"
@@ -23298,7 +23315,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_137)"
-"(let-values(((phase_67)(unsafe-car lst_137))"
+"(let-values(((phase_68)(unsafe-car lst_137))"
 "((rest_70)(unsafe-cdr lst_137)))"
 "(let-values(((fold-var_133)"
 "(let-values(((fold-var_134) fold-var_132))"
@@ -23307,13 +23324,13 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_67"
+" phase_68"
 "(reverse$1"
 "(let-values(((lst_138)"
 "(reverse$1"
 "(hash-ref"
 " phase-to-mpis-in-order_0"
-" phase_67))))"
+" phase_68))))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -23390,19 +23407,19 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_105)))"
 "((letrec-values(((for-loop_93)"
-"(lambda(table_132 i_132)"
+"(lambda(table_133 i_132)"
 "(begin"
 " 'for-loop"
 "(if i_132"
-"(let-values(((phase_68 at-phase_10)(hash-iterate-key+value ht_105 i_132)))"
-"(let-values(((table_133)"
-"(let-values(((table_134) table_132))"
-"(let-values(((table_135)"
+"(let-values(((phase_69 at-phase_10)(hash-iterate-key+value ht_105 i_132)))"
+"(let-values(((table_134)"
+"(let-values(((table_135) table_133))"
+"(let-values(((table_136)"
 "(let-values()"
 "(let-values(((key_53 val_45)"
 "(let-values()"
 "(values"
-" phase_68"
+" phase_69"
 "(let-values(((ht_71) at-phase_10))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -23411,7 +23428,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash ht_71)))"
 "((letrec-values(((for-loop_94)"
-"(lambda(table_103"
+"(lambda(table_104"
 " i_89)"
 "(begin"
 " 'for-loop"
@@ -23421,10 +23438,10 @@ static const char *startup_source =
 "(hash-iterate-key+value"
 " ht_71"
 " i_89)))"
-"(let-values(((table_104)"
 "(let-values(((table_105)"
-" table_103))"
 "(let-values(((table_106)"
+" table_104))"
+"(let-values(((table_107)"
 "(let-values()"
 "(let-values(((key_40"
 " val_33)"
@@ -23460,28 +23477,28 @@ static const char *startup_source =
 " loop_87)"
 " binding_14)))))))"
 "(hash-set"
-" table_105"
+" table_106"
 " key_40"
 " val_33)))))"
 "(values"
-" table_106)))))"
+" table_107)))))"
 "(if(not"
 " #f)"
 "(for-loop_94"
-" table_104"
+" table_105"
 "(hash-iterate-next"
 " ht_71"
 " i_89))"
-" table_104)))"
-" table_103)))))"
+" table_105)))"
+" table_104)))))"
 " for-loop_94)"
 " '#hasheq()"
 "(hash-iterate-first"
 " ht_71))))))))"
-"(hash-set table_134 key_53 val_45)))))"
-"(values table_135)))))"
-"(if(not #f)(for-loop_93 table_133(hash-iterate-next ht_105 i_132)) table_133)))"
-" table_132)))))"
+"(hash-set table_135 key_53 val_45)))))"
+"(values table_136)))))"
+"(if(not #f)(for-loop_93 table_134(hash-iterate-next ht_105 i_132)) table_134)))"
+" table_133)))))"
 " for-loop_93)"
 " '#hasheqv()"
 "(hash-iterate-first ht_105)))))))"
@@ -25190,24 +25207,24 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_148)))"
 "((letrec-values(((for-loop_177)"
-"(lambda(table_136 lst_149)"
+"(lambda(table_137 lst_149)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_149)"
 "(let-values(((id_45)(unsafe-car lst_149))((rest_76)(unsafe-cdr lst_149)))"
-"(let-values(((table_137)"
-"(let-values(((table_138) table_136))"
-"(let-values(((table_139)"
+"(let-values(((table_138)"
+"(let-values(((table_139) table_137))"
+"(let-values(((table_140)"
 "(let-values()"
 "(let-values(((key_54 val_46)"
 "(let-values()"
 "(values"
 "(let-values()(syntax-e$1 id_45))"
 " #t))))"
-"(hash-set table_138 key_54 val_46)))))"
-"(values table_139)))))"
-"(if(not #f)(for-loop_177 table_137 rest_76) table_137)))"
-" table_136)))))"
+"(hash-set table_139 key_54 val_46)))))"
+"(values table_140)))))"
+"(if(not #f)(for-loop_177 table_138 rest_76) table_138)))"
+" table_137)))))"
 " for-loop_177)"
 " '#hash()"
 " lst_148))))))"
@@ -25929,7 +25946,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(let-values(((phase_69)"
+"(let-values(((phase_70)"
 "(phase+"
 " phase-shift_11"
 " provide-phase-level_5)))"
@@ -26021,7 +26038,7 @@ static const char *startup_source =
 "((b300_0)"
 " b_72)"
 "((phase301_0)"
-" phase_69))"
+" phase_70))"
 "(add-binding!17.1"
 " #f"
 " #f"
@@ -26079,7 +26096,7 @@ static const char *startup_source =
 " phase-shift_11"
 " bulk-binding-registry_10))"
 "((phase304_0)"
-" phase_69)"
+" phase_70)"
 "((orig-s305_0)"
 " orig-s_15)"
 "((temp306_0)"
@@ -26459,10 +26476,10 @@ static const char *startup_source =
 " 'constant"
 " top-level-bind!-id"
 "(lambda(id_20 mpi_38 orig-phase_0 phase-shift_13 ns_51 sym_51 trans?_0 trans-val_0)"
-"(let-values(((phase_70)(phase+ orig-phase_0 phase-shift_13)))"
+"(let-values(((phase_71)(phase+ orig-phase_0 phase-shift_13)))"
 "(let-values(((b_73)"
 "(let-values(((mpi4_1) mpi_38)"
-"((phase5_1) phase_70)"
+"((phase5_1) phase_71)"
 "((sym6_1) sym_51)"
 "((temp7_0)(root-expand-context-frame-id(namespace-get-root-expand-ctx ns_51))))"
 "(make-module-binding22.1"
@@ -26479,11 +26496,11 @@ static const char *startup_source =
 " phase5_1"
 " sym6_1))))"
 "(begin"
-"(let-values(((id1_3) id_20)((b2_4) b_73)((phase3_2) phase_70))"
+"(let-values(((id1_3) id_20)((b2_4) b_73)((phase3_2) phase_71))"
 "(add-binding!17.1 #f #f id1_3 b2_4 phase3_2))"
 "(if trans?_0"
-"(let-values()(if trans-val_0(let-values()(maybe-install-free=id! trans-val_0 id_20 phase_70))(void)))"
-"(let-values()(namespace-unset-transformer! ns_51 phase_70 sym_51)))))))"
+"(let-values()(if trans-val_0(let-values()(maybe-install-free=id! trans-val_0 id_20 phase_71))(void)))"
+"(let-values()(namespace-unset-transformer! ns_51 phase_71 sym_51)))))))"
 " top-level-require!-id"
 "(lambda(stx_13 ns_52)"
 "(let-values(((reqs_2)(cdr(syntax->list$1 stx_13))))"
@@ -26591,9 +26608,9 @@ static const char *startup_source =
 " new-scs-other_0))))))"
 "(define-values"
 "(extract-namespace-scopes/values)"
-"(lambda(ns_46)"
+"(lambda(ns_45)"
 "(begin"
-"(let-values(((root-ctx_3)(namespace-get-root-expand-ctx ns_46)))"
+"(let-values(((root-ctx_3)(namespace-get-root-expand-ctx ns_45)))"
 "(let-values(((post-expansion-sc_0)(post-expansion-scope(root-expand-context-post-expansion root-ctx_3))))"
 "(values"
 "(seteq post-expansion-sc_0)"
@@ -26904,12 +26921,12 @@ static const char *startup_source =
 " 'register-required-variable-use!19"
 "(let-values(((header_2) header14_0))"
 "(let-values(((mpi_39) mpi15_0))"
-"(let-values(((phase_71) phase16_1))"
+"(let-values(((phase_72) phase16_1))"
 "(let-values(((sym_54) sym17_0))"
 "(let-values(((extra-inspector_4) extra-inspector18_0))"
 "(let-values(((defined?_2) defined?12_0))"
 "(let-values()"
-"(let-values(((key_55)(variable-use3.1(module-use1.1 mpi_39 phase_71) sym_54)))"
+"(let-values(((key_55)(variable-use3.1(module-use1.1 mpi_39 phase_72) sym_54)))"
 "(let-values(((variable-uses_0)(header-require-var-to-import-sym header_2)))"
 "(let-values(((prev-var-sym_0)(hash-ref variable-uses_0 key_55 #f)))"
 "(let-values(((var-sym_0)"
@@ -27116,7 +27133,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list lst_160)))"
 "((letrec-values(((for-loop_187)"
-"(lambda(table_140"
+"(lambda(table_141"
 " lst_112)"
 "(begin"
 " 'for-loop"
@@ -27128,9 +27145,9 @@ static const char *startup_source =
 "((rest_56)"
 "(unsafe-cdr"
 " lst_112)))"
-"(let-values(((table_141)"
 "(let-values(((table_142)"
-" table_140))"
+"(let-values(((table_143)"
+" table_141))"
 "(if(equal?"
 " mu_4"
 "(variable-use-module-use"
@@ -27143,11 +27160,11 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_188)"
-"(lambda(table_31)"
+"(lambda(table_32)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_32)"
+"(let-values(((table_33)"
 "(let-values(((extra-inspectors_1)"
 "(hash-ref"
 "(header-import-sym-to-extra-inspectors"
@@ -27157,21 +27174,21 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_189)"
-"(lambda(table_143)"
+"(lambda(table_144)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_33)"
-"(let-values(((table_144)"
-" table_143))"
+"(let-values(((table_34)"
+"(let-values(((table_145)"
+" table_144))"
 "(if(let-values(((or-part_208)"
 " extra-inspectors_1))"
 "(if or-part_208"
 " or-part_208"
 " cross-linklet-inlining?_0))"
-"(let-values(((table_145)"
-" table_144))"
 "(let-values(((table_146)"
+" table_145))"
+"(let-values(((table_147)"
 "(let-values()"
 "(let-values(((key_56"
 " val_48)"
@@ -27180,26 +27197,26 @@ static const char *startup_source =
 " var-sym_3"
 " extra-inspectors_1))))"
 "(hash-set"
-" table_145"
+" table_146"
 " key_56"
 " val_48)))))"
 "(values"
-" table_146)))"
-" table_144))))"
-" table_33))))))"
+" table_147)))"
+" table_145))))"
+" table_34))))))"
 " for-loop_189)"
-" table_31)))))"
-" table_32))))))"
+" table_32)))))"
+" table_33))))))"
 " for-loop_188)"
-" table_142)))"
-" table_142))))"
+" table_143)))"
+" table_143))))"
 "(if(not"
 " #f)"
 "(for-loop_187"
-" table_141"
+" table_142"
 " rest_56)"
-" table_141)))"
-" table_140)))))"
+" table_142)))"
+" table_141)))))"
 " for-loop_187)"
 " '#hash()"
 " lst_160)))))"
@@ -27398,8 +27415,8 @@ static const char *startup_source =
 "(define-values"
 "(correlated-property)"
 "(case-lambda"
-"((e_31 k_31)(begin(syntax-property$2 e_31 k_31)))"
-"((e_32 k_32 v_163)(syntax-property$2 e_32 k_32 v_163))))"
+"((e_31 k_32)(begin(syntax-property$2 e_31 k_32)))"
+"((e_32 k_33 v_163)(syntax-property$2 e_32 k_33 v_163))))"
 "(define-values"
 "(to-syntax-list.1$1)"
 "(lambda(s_109)"
@@ -27597,14 +27614,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_23)))"
 "((letrec-values(((for-loop_192)"
-"(lambda(fold-var_159 lst_79)"
+"(lambda(fold-var_159 lst_75)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_79)"
+"(if(pair? lst_75)"
 "(let-values(((e_33)"
-"(unsafe-car lst_79))"
+"(unsafe-car lst_75))"
 "((rest_85)"
-"(unsafe-cdr lst_79)))"
+"(unsafe-cdr lst_75)))"
 "(let-values(((fold-var_160)"
 "(let-values(((fold-var_94)"
 " fold-var_159))"
@@ -27780,14 +27797,14 @@ static const char *startup_source =
 "(let-values() v_164))))))"
 "(let-values(((name_44)"
 "(let-values(((or-part_210)"
-"(let-values(((v_54)"
+"(let-values(((v_55)"
 "(simplify-name_0(syntax-property$1 orig-s_21 'inferred-name))))"
-"(if(let-values(((or-part_211)(symbol? v_54)))"
+"(if(let-values(((or-part_211)(symbol? v_55)))"
 "(if or-part_211"
 " or-part_211"
-"(let-values(((or-part_212)(syntax?$1 v_54)))"
-"(if or-part_212 or-part_212(void? v_54)))))"
-" v_54"
+"(let-values(((or-part_212)(syntax?$1 v_55)))"
+"(if or-part_212 or-part_212(void? v_55)))))"
+" v_55"
 " #f))))"
 "(if or-part_210 or-part_210 inferred-name_0))))"
 "(let-values(((named-s_0)"
@@ -28050,7 +28067,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-immutable-hash-keys ht_112)))"
-"((letrec-values(((for-loop_97)"
+"((letrec-values(((for-loop_101)"
 "(lambda(result_77 i_136)"
 "(begin"
 " 'for-loop"
@@ -28066,10 +28083,10 @@ static const char *startup_source =
 " guard-insp_0)))))"
 "(values result_79)))))"
 "(if(if(not((lambda x_56(not result_78)) extra-insp_0))(not #f) #f)"
-"(for-loop_97 result_78(unsafe-immutable-hash-iterate-next ht_112 i_136))"
+"(for-loop_101 result_78(unsafe-immutable-hash-iterate-next ht_112 i_136))"
 " result_78)))"
 " result_77)))))"
-" for-loop_97)"
+" for-loop_101)"
 " #t"
 "(unsafe-immutable-hash-iterate-first ht_112)))))"
 "(if(procedure? extra-inspectors_2)"
@@ -28143,7 +28160,7 @@ static const char *startup_source =
 "(let-values(((mu_5)(unsafe-car lst_91))"
 "((rest_91)(unsafe-cdr lst_91))"
 "((extra-inspectorss_1)(unsafe-car lst_174))"
-"((rest_37)(unsafe-cdr lst_174)))"
+"((rest_35)(unsafe-cdr lst_174)))"
 "(let-values(((fold-var_170)"
 "(let-values(((fold-var_171) fold-var_11))"
 "(let-values(((fold-var_172)"
@@ -28157,7 +28174,7 @@ static const char *startup_source =
 " #f))"
 " fold-var_171))))"
 "(values fold-var_172)))))"
-"(if(not #f)(for-loop_110 fold-var_170 rest_91 rest_37) fold-var_170)))"
+"(if(not #f)(for-loop_110 fold-var_170 rest_91 rest_35) fold-var_170)))"
 " fold-var_11)))))"
 " for-loop_110)"
 " null"
@@ -28340,7 +28357,7 @@ static const char *startup_source =
 "(lambda(mu*_3 insp_9)(begin(set-module-use*-self-inspector! mu*_3 insp_9))))"
 "(define-values"
 "(module-use+extra-inspectors)"
-"(lambda(mpi_41 phase_72 imports_1 inspector_13 extra-inspector_5 extra-inspectorss_7)"
+"(lambda(mpi_41 phase_73 imports_1 inspector_13 extra-inspector_5 extra-inspectorss_7)"
 "(begin"
 "(let-values(((now-inspector_0)(current-code-inspector)))"
 "(let-values(((add-insp?_0)(if inspector_13(inspector-superior? inspector_13 now-inspector_0) #f)))"
@@ -28355,15 +28372,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_182)))"
 "((letrec-values(((for-loop_199)"
-"(lambda(table_147 lst_183)"
+"(lambda(table_148 lst_183)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_183)"
 "(let-values(((import_1)(unsafe-car lst_183))"
 "((rest_98)(unsafe-cdr lst_183)))"
-"(let-values(((table_148)"
-"(let-values(((table_149) table_147))"
-"(let-values(((table_150)"
+"(let-values(((table_149)"
+"(let-values(((table_150) table_148))"
+"(let-values(((table_151)"
 "(let-values()"
 "(let-values(((key_57"
 " val_50)"
@@ -28398,12 +28415,12 @@ static const char *startup_source =
 " extra-inspectors_3"
 " guard-insp_2)))))))))))"
 "(hash-set"
-" table_149"
+" table_150"
 " key_57"
 " val_50)))))"
-"(values table_150)))))"
-"(if(not #f)(for-loop_199 table_148 rest_98) table_148)))"
-" table_147)))))"
+"(values table_151)))))"
+"(if(not #f)(for-loop_199 table_149 rest_98) table_149)))"
+" table_148)))))"
 " for-loop_199)"
 " '#hash()"
 " lst_182))))"
@@ -28442,7 +28459,7 @@ static const char *startup_source =
 " for-loop_200)"
 "(let-values(((or-part_38) extra-inspectorss_7))(if or-part_38 or-part_38(seteq)))"
 " lst_184)))))))"
-"(module-use*1.1 mpi_41 phase_72 new-extra-inspectorss_0 #f))))))))"
+"(module-use*1.1 mpi_41 phase_73 new-extra-inspectorss_0 #f))))))))"
 "(define-values"
 "(module-use-merge-extra-inspectorss!)"
 "(lambda(existing-mu*_0 mu*_4)"
@@ -28554,28 +28571,28 @@ static const char *startup_source =
 "(let-values(((serializable?_0) serializable?13_0))"
 "(let-values(((cross-linklet-inlining?_1) cross-linklet-inlining?14_0))"
 "(let-values()"
-"(let-values(((phase_73)(compile-context-phase cctx_11)))"
+"(let-values(((phase_74)(compile-context-phase cctx_11)))"
 "(let-values(((self_17)(compile-context-self cctx_11)))"
 "(let-values(((syntax-literals_1)(make-syntax-literals)))"
 "(let-values(((phase-to-body_0)(make-hasheqv)))"
 "(let-values(((add-body!_0)"
-"(lambda(phase_74 body_1)"
+"(lambda(phase_75 body_1)"
 "(begin"
 " 'add-body!"
 "(hash-update!"
 " phase-to-body_0"
-" phase_74"
+" phase_75"
 "(lambda(l_21)(cons body_1 l_21))"
 " null)))))"
 "(let-values(((phase-to-header_0)(make-hasheqv)))"
 "(let-values(((find-or-create-header!_0)"
-"(lambda(phase_75)"
+"(lambda(phase_76)"
 "(begin"
 " 'find-or-create-header!"
 "(let-values(((or-part_220)"
 "(hash-ref"
 " phase-to-header_0"
-" phase_75"
+" phase_76"
 " #f)))"
 "(if or-part_220"
 " or-part_220"
@@ -28586,7 +28603,7 @@ static const char *startup_source =
 "(begin"
 "(hash-set!"
 " phase-to-header_0"
-" phase_75"
+" phase_76"
 " header_7)"
 " header_7))))))))"
 "(let-values((()"
@@ -28602,7 +28619,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(pair? lst_26)"
-"(let-values(((phase_76)"
+"(let-values(((phase_77)"
 "(unsafe-car"
 " lst_26))"
 "((rest_100)"
@@ -28616,9 +28633,9 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(find-or-create-header!_0"
-" phase_76)"
+" phase_77)"
 "(add-body!_0"
-" phase_76"
+" phase_77"
 " '(void))))"
 "(values)))))"
 "(values)))))"
@@ -28757,8 +28774,8 @@ static const char *startup_source =
 "(void))))))"
 " loop!_0)"
 " bodys_2"
-" phase_73"
-"(find-or-create-header!_0 phase_73)))"
+" phase_74"
+"(find-or-create-header!_0 phase_74)))"
 "(void))"
 "(values))))"
 "(let-values(((as-required?_0)"
@@ -28774,7 +28791,7 @@ static const char *startup_source =
 "(begin"
 "((letrec-values(((loop!_1)"
 "(lambda(bodys_4"
-" phase_77"
+" phase_78"
 " header_10)"
 "(begin"
 " 'loop!"
@@ -28916,7 +28933,7 @@ static const char *startup_source =
 "(compile-context-self"
 " cctx_11))"
 "((phase37_0)"
-" phase_77)"
+" phase_78)"
 "((binding-sym38_0)"
 " binding-sym_1)"
 "((temp39_1)"
@@ -28952,7 +28969,7 @@ static const char *startup_source =
 "(if(compile-context?"
 " the-struct_48)"
 "(let-values(((phase41_0)"
-" phase_77)"
+" phase_78)"
 "((header42_0)"
 " header_10))"
 "(compile-context1.1"
@@ -28985,11 +29002,11 @@ static const char *startup_source =
 " rhs_1"
 "(length"
 " def-syms_0)"
-" phase_77"
+" phase_78"
 "(as-required?_0"
 " header_10))"
 "(add-body!_0"
-" phase_77"
+" phase_78"
 "(propagate-inline-property"
 "(correlate*"
 "(parsed-s"
@@ -29011,7 +29028,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(add-body!_0"
-" phase_77"
+" phase_78"
 "(list*"
 " 'if"
 " #f"
@@ -29066,7 +29083,7 @@ static const char *startup_source =
 " lst_194)))))"
 " '((void))))"
 "(add-body!_0"
-" phase_77"
+" phase_78"
 "(compile-top-level-bind"
 " ids_5"
 " binding-syms_0"
@@ -29075,7 +29092,7 @@ static const char *startup_source =
 "(if(compile-context?"
 " the-struct_49)"
 "(let-values(((phase43_0)"
-" phase_77)"
+" phase_78)"
 "((header44_0)"
 " header_10))"
 "(compile-context1.1"
@@ -29108,7 +29125,7 @@ static const char *startup_source =
 "(let-values(((next-header_0)"
 "(find-or-create-header!_0"
 "(add1"
-" phase_77))))"
+" phase_78))))"
 "(let-values(((gen-syms_0)"
 "(reverse$1"
 "(let-values(((lst_195)"
@@ -29172,7 +29189,7 @@ static const char *startup_source =
 " the-struct_50)"
 "(let-values(((phase45_0)"
 "(add1"
-" phase_77))"
+" phase_78))"
 "((header46_0)"
 " next-header_0))"
 "(compile-context1.1"
@@ -29203,7 +29220,7 @@ static const char *startup_source =
 "(length"
 " gen-syms_0)"
 "(add1"
-" phase_77)"
+" phase_78)"
 "(as-required?_0"
 " header_10))"
 "(values))))"
@@ -29283,7 +29300,7 @@ static const char *startup_source =
 "(let-values()"
 "(add-body!_0"
 "(add1"
-" phase_77)"
+" phase_78)"
 "(list"
 " 'let-values"
 "(list"
@@ -29298,7 +29315,7 @@ static const char *startup_source =
 "(let-values()"
 "(add-body!_0"
 "(add1"
-" phase_77)"
+" phase_78)"
 "(generate-top-level-define-syntaxes"
 " gen-syms_0"
 " rhs_2"
@@ -29311,7 +29328,7 @@ static const char *startup_source =
 "(if(compile-context?"
 " the-struct_51)"
 "(let-values(((phase47_0)"
-" phase_77)"
+" phase_78)"
 "((header48_0)"
 " header_10))"
 "(compile-context1.1"
@@ -29341,10 +29358,10 @@ static const char *startup_source =
 "(parsed-begin-for-syntax-body"
 " body_0)"
 "(add1"
-" phase_77)"
+" phase_78)"
 "(find-or-create-header!_0"
 "(add1"
-" phase_77))))"
+" phase_78))))"
 "(if(let-values(((or-part_221)"
 "(parsed-#%declare?"
 " body_0)))"
@@ -29366,7 +29383,7 @@ static const char *startup_source =
 "(if(compile-context?"
 " the-struct_52)"
 "(let-values(((phase49_0)"
-" phase_77)"
+" phase_78)"
 "((header50_0)"
 " header_10))"
 "(compile-context1.1"
@@ -29392,11 +29409,11 @@ static const char *startup_source =
 "(compiled-expression-callback_0"
 " e_34"
 " #f"
-" phase_77"
+" phase_78"
 "(as-required?_0"
 " header_10))"
 "(add-body!_0"
-" phase_77"
+" phase_78"
 " e_34)))"
 "(void))))"
 "(let-values()"
@@ -29408,7 +29425,7 @@ static const char *startup_source =
 "(if(compile-context?"
 " the-struct_53)"
 "(let-values(((phase51_0)"
-" phase_77)"
+" phase_78)"
 "((header52_0)"
 " header_10))"
 "(compile-context1.1"
@@ -29436,11 +29453,11 @@ static const char *startup_source =
 "(compiled-expression-callback_0"
 " e_35"
 " #f"
-" phase_77"
+" phase_78"
 "(as-required?_0"
 " header_10))"
 "(add-body!_0"
-" phase_77"
+" phase_78"
 " e_35)))))))))"
 "(values)))))"
 "(values)))))"
@@ -29459,8 +29476,8 @@ static const char *startup_source =
 "(void))))))"
 " loop!_1)"
 " bodys_2"
-" phase_73"
-"(find-or-create-header!_0 phase_73))"
+" phase_74"
+"(find-or-create-header!_0 phase_74))"
 "(values))))"
 "(let-values(((encoded-root-expand-pos_0)"
 "(if encoded-root-expand-ctx-box_0"
@@ -29490,13 +29507,13 @@ static const char *startup_source =
 "(let-values(((min-phase_0)"
 "(if(pair? phases-in-order_2)"
 "(car phases-in-order_2)"
-" phase_73)))"
+" phase_74)))"
 "(let-values(((max-phase_0)"
 "(if(pair? phases-in-order_2)"
 "(car"
 "(reverse$1"
 " phases-in-order_2))"
-" phase_73)))"
+" phase_74)))"
 "(let-values(((phase-to-link-info_0)"
 "(let-values(((lst_201)"
 " phases-in-order_2))"
@@ -29507,22 +29524,22 @@ static const char *startup_source =
 "(let-values()"
 "(check-list lst_201)))"
 "((letrec-values(((for-loop_208)"
-"(lambda(table_151"
+"(lambda(table_152"
 " lst_202)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_202)"
-"(let-values(((phase_78)"
+"(let-values(((phase_79)"
 "(unsafe-car"
 " lst_202))"
 "((rest_109)"
 "(unsafe-cdr"
 " lst_202)))"
-"(let-values(((table_152)"
 "(let-values(((table_153)"
-" table_151))"
 "(let-values(((table_154)"
+" table_152))"
+"(let-values(((table_155)"
 "(let-values()"
 "(let-values(((key_58"
 " val_51)"
@@ -29530,7 +29547,7 @@ static const char *startup_source =
 "(let-values(((header_11)"
 "(hash-ref"
 " phase-to-header_0"
-" phase_78"
+" phase_79"
 " #f)))"
 "(let-values(((link-module-uses_0"
 " imports_2"
@@ -29538,29 +29555,29 @@ static const char *startup_source =
 " def-decls_0)"
 "(generate-links+imports"
 " header_11"
-" phase_78"
+" phase_79"
 " cctx_11"
 " cross-linklet-inlining?_1)))"
 "(values"
-" phase_78"
+" phase_79"
 "(link-info1.1"
 " link-module-uses_0"
 " imports_2"
 " extra-inspectorsss_1"
 " def-decls_0)))))))"
 "(hash-set"
-" table_153"
+" table_154"
 " key_58"
 " val_51)))))"
 "(values"
-" table_154)))))"
+" table_155)))))"
 "(if(not"
 " #f)"
 "(for-loop_208"
-" table_152"
+" table_153"
 " rest_109)"
-" table_152)))"
-" table_151)))))"
+" table_153)))"
+" table_152)))))"
 " for-loop_208)"
 " '#hash()"
 " lst_201)))))"
@@ -29575,22 +29592,22 @@ static const char *startup_source =
 "(check-list"
 " lst_108)))"
 "((letrec-values(((for-loop_209)"
-"(lambda(table_155"
+"(lambda(table_156"
 " lst_109)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_109)"
-"(let-values(((phase_79)"
+"(let-values(((phase_80)"
 "(unsafe-car"
 " lst_109))"
 "((rest_110)"
 "(unsafe-cdr"
 " lst_109)))"
-"(let-values(((table_156)"
 "(let-values(((table_157)"
-" table_155))"
 "(let-values(((table_158)"
+" table_156))"
+"(let-values(((table_159)"
 "(let-values()"
 "(let-values(((key_59"
 " val_52)"
@@ -29598,16 +29615,16 @@ static const char *startup_source =
 "(let-values(((bodys_5)"
 "(hash-ref"
 " phase-to-body_0"
-" phase_79)))"
+" phase_80)))"
 "(let-values(((li_0)"
 "(hash-ref"
 " phase-to-link-info_0"
-" phase_79)))"
+" phase_80)))"
 "(let-values(((binding-sym-to-define-sym_0)"
 "(header-binding-sym-to-define-sym"
 "(hash-ref"
 " phase-to-header_0"
-" phase_79))))"
+" phase_80))))"
 "(let-values(((module-use*s_0)"
 "(module-uses-add-extra-inspectorsss"
 "(link-info-link-module-uses"
@@ -29651,7 +29668,7 @@ static const char *startup_source =
 "(header-binding-syms-in-order"
 "(hash-ref"
 " phase-to-header_0"
-" phase_79))))"
+" phase_80))))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
@@ -29719,7 +29736,7 @@ static const char *startup_source =
 " get-module-linklet-info_0"
 " module-use*s_0)))))"
 "(values"
-" phase_79"
+" phase_80"
 "(cons"
 " linklet_1"
 "(list-tail"
@@ -29728,18 +29745,18 @@ static const char *startup_source =
 "(length"
 " body-imports_0))))))))))))"
 "(hash-set"
-" table_157"
+" table_158"
 " key_59"
 " val_52)))))"
 "(values"
-" table_158)))))"
+" table_159)))))"
 "(if(not"
 " #f)"
 "(for-loop_209"
-" table_156"
+" table_157"
 " rest_110)"
-" table_156)))"
-" table_155)))))"
+" table_157)))"
+" table_156)))))"
 " for-loop_209)"
 " '#hasheq()"
 " lst_108)))))"
@@ -29754,43 +29771,43 @@ static const char *startup_source =
 "(check-in-hash"
 " ht_114)))"
 "((letrec-values(((for-loop_211)"
-"(lambda(table_32"
+"(lambda(table_33"
 " i_138)"
 "(begin"
 " 'for-loop"
 "(if i_138"
-"(let-values(((phase_80"
+"(let-values(((phase_81"
 " l+mu*s_0)"
 "(hash-iterate-key+value"
 " ht_114"
 " i_138)))"
-"(let-values(((table_33)"
-"(let-values(((table_144)"
-" table_32))"
-"(let-values(((table_159)"
+"(let-values(((table_34)"
+"(let-values(((table_145)"
+" table_33))"
+"(let-values(((table_160)"
 "(let-values()"
 "(let-values(((key_60"
 " val_53)"
 "(let-values()"
 "(values"
-" phase_80"
+" phase_81"
 "(car"
 " l+mu*s_0)))))"
 "(hash-set"
-" table_144"
+" table_145"
 " key_60"
 " val_53)))))"
 "(values"
-" table_159)))))"
+" table_160)))))"
 "(if(not"
 " #f)"
 "(for-loop_211"
-" table_33"
+" table_34"
 "(hash-iterate-next"
 " ht_114"
 " i_138))"
-" table_33)))"
-" table_32)))))"
+" table_34)))"
+" table_33)))))"
 " for-loop_211)"
 " '#hasheq()"
 "(hash-iterate-first"
@@ -29806,44 +29823,44 @@ static const char *startup_source =
 "(check-in-hash"
 " ht_115)))"
 "((letrec-values(((for-loop_212)"
-"(lambda(table_160"
+"(lambda(table_161"
 " i_139)"
 "(begin"
 " 'for-loop"
 "(if i_139"
-"(let-values(((phase_81"
+"(let-values(((phase_82"
 " l+mu*s_1)"
 "(hash-iterate-key+value"
 " ht_115"
 " i_139)))"
-"(let-values(((table_125)"
-"(let-values(((table_35)"
-" table_160))"
+"(let-values(((table_126)"
 "(let-values(((table_36)"
+" table_161))"
+"(let-values(((table_37)"
 "(let-values()"
 "(let-values(((key_47"
 " val_40)"
 "(let-values()"
 "(values"
-" phase_81"
+" phase_82"
 "(module-uses-strip-extra-inspectorsss"
 "(cdr"
 " l+mu*s_1))))))"
 "(hash-set"
-" table_35"
+" table_36"
 " key_47"
 " val_40)))))"
 "(values"
-" table_36)))))"
+" table_37)))))"
 "(if(not"
 " #f)"
 "(for-loop_212"
-" table_125"
+" table_126"
 "(hash-iterate-next"
 " ht_115"
 " i_139))"
-" table_125)))"
-" table_160)))))"
+" table_126)))"
+" table_161)))))"
 " for-loop_212)"
 " '#hasheq()"
 "(hash-iterate-first"
@@ -29863,17 +29880,17 @@ static const char *startup_source =
 "(check-in-hash"
 " ht_116)))"
 "((letrec-values(((for-loop_213)"
-"(lambda(table_161"
+"(lambda(table_162"
 " i_140)"
 "(begin"
 " 'for-loop"
 "(if i_140"
-"(let-values(((phase_82"
+"(let-values(((phase_83"
 " l+mu*s_2)"
 "(hash-iterate-key+value"
 " ht_116"
 " i_140)))"
-"(let-values(((table_162)"
+"(let-values(((table_163)"
 "(let-values(((extra-inspectorsss_2)"
 "(module-uses-extract-extra-inspectorsss"
 "(cdr"
@@ -29886,43 +29903,43 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_214)"
-"(lambda(table_163)"
+"(lambda(table_164)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_164)"
 "(let-values(((table_165)"
-" table_163))"
-"(if extra-inspectorsss_2"
 "(let-values(((table_166)"
-" table_165))"
-"(let-values(((table_39)"
+" table_164))"
+"(if extra-inspectorsss_2"
+"(let-values(((table_167)"
+" table_166))"
+"(let-values(((table_40)"
 "(let-values()"
 "(let-values(((key_61"
 " val_54)"
 "(let-values()"
 "(values"
-" phase_82"
+" phase_83"
 " extra-inspectorsss_2))))"
 "(hash-set"
-" table_166"
+" table_167"
 " key_61"
 " val_54)))))"
 "(values"
-" table_39)))"
-" table_165))))"
-" table_164))))))"
+" table_40)))"
+" table_166))))"
+" table_165))))))"
 " for-loop_214)"
-" table_161)))))"
+" table_162)))))"
 "(if(not"
 " #f)"
 "(for-loop_213"
-" table_162"
+" table_163"
 "(hash-iterate-next"
 " ht_116"
 " i_140))"
-" table_162)))"
-" table_161)))))"
+" table_163)))"
+" table_162)))))"
 " for-loop_213)"
 " '#hash()"
 "(hash-iterate-first"
@@ -29940,7 +29957,7 @@ static const char *startup_source =
 "(compile-top-level-bind)"
 "(lambda(ids_7 binding-syms_2 cctx_12 trans-exprs_0)"
 "(begin"
-"(let-values(((phase_83)(compile-context-phase cctx_12)))"
+"(let-values(((phase_84)(compile-context-phase cctx_12)))"
 "(let-values(((self_18)(compile-context-self cctx_12)))"
 "(let-values(((header_12)(compile-context-header cctx_12)))"
 "(let-values(((mpis_16)(header-module-path-indexes header_12)))"
@@ -30024,7 +30041,7 @@ static const char *startup_source =
 " top-level-bind!-id"
 " id-stx_0"
 " self-expr_0"
-" phase_83"
+" phase_84"
 " phase-shift-id"
 " ns-id"
 "(list 'quote binding-sym_5)"
@@ -30261,7 +30278,7 @@ static const char *startup_source =
 "(values vec_60(unsafe-vector-length vec_60))))))"
 "(begin"
 " #f"
-"((letrec-values(((for-loop_98)"
+"((letrec-values(((for-loop_102)"
 "(lambda(vec_61 i_142 pos_94)"
 "(begin"
 " 'for-loop"
@@ -30296,13 +30313,13 @@ static const char *startup_source =
 " 1)))))))"
 "(values vec_64 i_144)))))"
 "(if(not #f)"
-"(for-loop_98"
+"(for-loop_102"
 " vec_62"
 " i_143"
 "(unsafe-fx+ 1 pos_94))"
 "(values vec_62 i_143))))"
 "(values vec_61 i_142))))))"
-" for-loop_98)"
+" for-loop_102)"
 "(make-vector 16)"
 " 0"
 " 0)))))"
@@ -30397,18 +30414,18 @@ static const char *startup_source =
 "(begin"
 " 'loop"
 "(reverse$1"
-"(let-values(((lst_80) cims_2))"
+"(let-values(((lst_76) cims_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_80)))"
-"((letrec-values(((for-loop_99)"
-"(lambda(fold-var_160 lst_81)"
+"(let-values()(check-list lst_76)))"
+"((letrec-values(((for-loop_97)"
+"(lambda(fold-var_160 lst_77)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_81)"
-"(let-values(((cim_4)(unsafe-car lst_81))"
-"((rest_121)(unsafe-cdr lst_81)))"
+"(if(pair? lst_77)"
+"(let-values(((cim_4)(unsafe-car lst_77))"
+"((rest_121)(unsafe-cdr lst_77)))"
 "(let-values(((fold-var_216)"
 "(let-values(((fold-var_170) fold-var_160))"
 "(let-values(((fold-var_171)"
@@ -30426,12 +30443,12 @@ static const char *startup_source =
 " fold-var_170))))"
 "(values fold-var_171)))))"
 "(if(not #f)"
-"(for-loop_99 fold-var_216 rest_121)"
+"(for-loop_97 fold-var_216 rest_121)"
 " fold-var_216)))"
 " fold-var_160)))))"
-" for-loop_99)"
+" for-loop_97)"
 " null"
-" lst_80))))))))"
+" lst_76))))))))"
 " loop_92)"
 " cims_1))))"
 "(define-values"
@@ -30458,16 +30475,16 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-naturals start_35)))"
 "((letrec-values(((for-loop_218)"
-"(lambda(table_167 lst_222 pos_96)"
+"(lambda(table_168 lst_222 pos_96)"
 "(begin"
 " 'for-loop"
 "(if(if(pair? lst_222) #t #f)"
 "(let-values(((cim_5)(unsafe-car lst_222))"
 "((rest_49)(unsafe-cdr lst_222))"
 "((i_142) pos_96))"
-"(let-values(((table_168)"
-"(let-values(((table_169) table_167))"
-"(let-values(((table_170)"
+"(let-values(((table_169)"
+"(let-values(((table_170) table_168))"
+"(let-values(((table_171)"
 "(let-values()"
 "(let-values(((key_62"
 " val_35)"
@@ -30481,19 +30498,19 @@ static const char *startup_source =
 " compiled-in-memory-linklet-directory)"
 " cim_5)))))"
 "(hash-set"
-" table_169"
+" table_170"
 " key_62"
 " val_35)))))"
-"(values table_170)))))"
+"(values table_171)))))"
 "(if(not #f)"
-"(for-loop_218 table_168 rest_49(+ pos_96 1))"
-" table_168)))"
-" table_167)))))"
+"(for-loop_218 table_169 rest_49(+ pos_96 1))"
+" table_169)))"
+" table_168)))))"
 " for-loop_218)"
 " '#hasheq()"
 " lst_221"
 " start_35)))))"
-"(let-values(((ht_76)"
+"(let-values(((ht_79)"
 "(if merge-serialization?_0"
 "(hash-set"
 " sequence-ht_0"
@@ -30505,10 +30522,10 @@ static const char *startup_source =
 "(hasheq 0(build-shared-data-linklet cims_3 ns_58))))))"
 " sequence-ht_0)))"
 "(if to-source?_1"
-"(let-values() ht_76)"
+"(let-values() ht_79)"
 "(let-values()"
 "(compiled-in-memory1.1"
-"(1/hash->linklet-directory ht_76)"
+"(1/hash->linklet-directory ht_79)"
 " #f"
 " #f"
 " #f"
@@ -30737,25 +30754,25 @@ static const char *startup_source =
 "(if(unsafe-fx< index_1 2)"
 "(if(unsafe-fx< index_1 1)"
 "(let-values()"
-"(let-values(((v_32)(correlated-e e_39)))"
-"(if(let-values(((or-part_73)(string? v_32)))"
+"(let-values(((v_33)(correlated-e e_39)))"
+"(if(let-values(((or-part_73)(string? v_33)))"
 "(if or-part_73"
 " or-part_73"
 "(let-values(((or-part_74)"
-"(number? v_32)))"
+"(number? v_33)))"
 "(if or-part_74"
 " or-part_74"
 "(let-values(((or-part_75)"
-"(boolean? v_32)))"
+"(boolean? v_33)))"
 "(if or-part_75"
 " or-part_75"
-"(char? v_32)))))))"
+"(char? v_33)))))))"
 "(let-values() 1)"
 "(let-values(((c1_26)"
-"(if(pair? v_32)"
+"(if(pair? v_33)"
 "(let-values(((rator_0)"
 "(correlated-e"
-"(car v_32))))"
+"(car v_33))))"
 "(let-values(((or-part_29)"
 "(hash-ref"
 " locals_2"
@@ -30935,7 +30952,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_225)))"
-"((letrec-values(((for-loop_101)"
+"((letrec-values(((for-loop_99)"
 "(lambda(result_83"
 " lst_179"
 " lst_10)"
@@ -30990,13 +31007,13 @@ static const char *startup_source =
 " #f)"
 " #f)"
 " #f)"
-"(for-loop_101"
+"(for-loop_99"
 " result_84"
 " rest_1"
 " rest_123)"
 " result_84)))"
 " result_83)))))"
-" for-loop_101)"
+" for-loop_99)"
 " #t"
 " lst_97"
 " lst_225)))"
@@ -31008,30 +31025,30 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_167)"
 "(self-quoting-in-linklet?"
-" v_32)))"
+" v_33)))"
 "(if or-part_167"
 " or-part_167"
-"(if(symbol? v_32)"
+"(if(symbol? v_33)"
 "(let-values(((or-part_65)"
 "(hash-ref"
 " locals_2"
-" v_32"
+" v_33"
 " #f)))"
 "(if or-part_65"
 " or-part_65"
 "(let-values(((or-part_227)"
 "(lookup-defn"
 " defns_1"
-" v_32)))"
+" v_33)))"
 "(if or-part_227"
 " or-part_227"
 "(let-values(((or-part_66)"
 "(built-in-symbol?"
-" v_32)))"
+" v_33)))"
 "(if or-part_66"
 " or-part_66"
 "(ready-variable?_0"
-" v_32)))))))"
+" v_33)))))))"
 " #f)))"
 " 1"
 " #f)))))))"
@@ -32899,15 +32916,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_248)))"
 "((letrec-values(((for-loop_229)"
-"(lambda(table_171 lst_249)"
+"(lambda(table_172 lst_249)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_249)"
 "(let-values(((prop+val_2)(unsafe-car lst_249))"
 "((rest_136)(unsafe-cdr lst_249)))"
-"(let-values(((table_172)"
-"(let-values(((table_173) table_171))"
-"(let-values(((table_174)"
+"(let-values(((table_173)"
+"(let-values(((table_174) table_172))"
+"(let-values(((table_175)"
 "(let-values()"
 "(let-values(((key_64 val_55)"
 "(let-values()"
@@ -32920,12 +32937,12 @@ static const char *startup_source =
 " 1)))"
 " #t))))"
 "(hash-set"
-" table_173"
+" table_174"
 " key_64"
 " val_55)))))"
-"(values table_174)))))"
-"(if(not #f)(for-loop_229 table_172 rest_136) table_172)))"
-" table_171)))))"
+"(values table_175)))))"
+"(if(not #f)(for-loop_229 table_173 rest_136) table_173)))"
+" table_172)))))"
 " for-loop_229)"
 " '#hash()"
 " lst_248)))))"
@@ -33123,15 +33140,15 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_256)))"
 "((letrec-values(((for-loop_232)"
-"(lambda(table_175 lst_136)"
+"(lambda(table_176 lst_136)"
 "(begin"
 " 'for-loop"
 "(if(pair? lst_136)"
 "(let-values(((prop+val_5)(unsafe-car lst_136))"
 "((rest_140)(unsafe-cdr lst_136)))"
-"(let-values(((table_176)"
-"(let-values(((table_177) table_175))"
-"(let-values(((table_178)"
+"(let-values(((table_177)"
+"(let-values(((table_178) table_176))"
+"(let-values(((table_179)"
 "(let-values()"
 "(let-values(((key_65 val_56)"
 "(let-values()"
@@ -33144,12 +33161,12 @@ static const char *startup_source =
 " 1)))"
 " #t))))"
 "(hash-set"
-" table_177"
+" table_178"
 " key_65"
 " val_56)))))"
-"(values table_178)))))"
-"(if(not #f)(for-loop_232 table_176 rest_140) table_176)))"
-" table_175)))))"
+"(values table_179)))))"
+"(if(not #f)(for-loop_232 table_177 rest_140) table_177)))"
+" table_176)))))"
 " for-loop_232)"
 " '#hash()"
 " lst_256)))))"
@@ -33384,7 +33401,7 @@ static const char *startup_source =
 "(let-values(((to-source?_2) to-source?3_0))"
 "(let-values()"
 "(let-values()"
-"(let-values(((phase_84)(compile-context-phase cctx_14)))"
+"(let-values(((phase_85)(compile-context-phase cctx_14)))"
 "(let-values(((mpis_18)(make-module-path-index-table)))"
 "(let-values(((purely-functional?_0) #t))"
 "(let-values(((body-linklets_1"
@@ -33456,7 +33473,7 @@ static const char *startup_source =
 "(lambda(ht_117)"
 "(begin"
 " 'add-metadata"
-"(let-values(((ht_118)(hash-set ht_117 'original-phase phase_84)))"
+"(let-values(((ht_118)(hash-set ht_117 'original-phase phase_85)))"
 "(let-values(((ht_119)(hash-set ht_118 'max-phase max-phase_1)))"
 " ht_119))))))"
 "(let-values(((bundle_0)"
@@ -33469,7 +33486,7 @@ static const char *startup_source =
 "(generate-eager-syntax-literals!"
 " syntax-literals_3"
 " mpis_18"
-" phase_84"
+" phase_85"
 "(compile-context-self cctx_14)"
 "(compile-context-namespace cctx_14)))))"
 "(let-values(((link-linklet_0)"
@@ -33502,7 +33519,7 @@ static const char *startup_source =
 "(list"
 " 'define-values"
 "(list deserialized-syntax-vector-id)"
-"(list* 'make-vector(add1 phase_84) '(#f)))"
+"(list* 'make-vector(add1 phase_85) '(#f)))"
 "(list"
 " 'define-values"
 " '(phase-to-link-modules)"
@@ -33534,7 +33551,7 @@ static const char *startup_source =
 "(compile-top-level-require)"
 "(lambda(p_47 cctx_16)"
 "(begin"
-"(let-values(((phase_85)(compile-context-phase cctx_16)))"
+"(let-values(((phase_86)(compile-context-phase cctx_16)))"
 "(if(parsed-require? p_47)"
 "(let-values()"
 "(let-values(((form-stx_0)(compile-quote-syntax(syntax-disarm$1(parsed-s p_47)) cctx_16)))"
@@ -33557,7 +33574,7 @@ static const char *startup_source =
 "(let-values(((ids_15) ids11_0))"
 "(let-values(((defined-syms_8) defined-syms12_0))"
 "(let-values(((self_19) self13_0))"
-"(let-values(((phase_86) phase14_0))"
+"(let-values(((phase_87) phase14_0))"
 "(let-values(((all-scopes-stx_3) all-scopes-stx15_0))"
 "(let-values(((frame-id_7) frame-id1_0))"
 "(let-values(((top-level-bind-scope_3) top-level-bind-scope2_0))"
@@ -33566,11 +33583,11 @@ static const char *startup_source =
 "(let-values(((as-transformer?_5) as-transformer?5_0))"
 "(let-values()"
 "(let-values(((defined-syms-at-phase_0)"
-"(let-values(((or-part_82)(hash-ref defined-syms_8 phase_86 #f)))"
+"(let-values(((or-part_82)(hash-ref defined-syms_8 phase_87 #f)))"
 "(if or-part_82"
 " or-part_82"
 "(let-values(((ht_120)(make-hasheq)))"
-"(begin(hash-set! defined-syms_8 phase_86 ht_120) ht_120))))))"
+"(begin(hash-set! defined-syms_8 phase_87 ht_120) ht_120))))))"
 "(reverse$1"
 "(let-values(((lst_261) ids_15))"
 "(begin"
@@ -33601,13 +33618,13 @@ static const char *startup_source =
 " sym_62"
 " #f)"
 " id_54"
-" phase_86"
+" phase_87"
 " top-level-bind-scope_3))"
 "(if(no-extra-scopes?"
 " id_54"
 " all-scopes-stx_3"
 " top-level-bind-scope_3"
-" phase_86)"
+" phase_87)"
 "(symbol-interned?"
 " sym_62)"
 " #f)"
@@ -33629,7 +33646,7 @@ static const char *startup_source =
 " s_183"
 " #f)"
 " id_54"
-" phase_86"
+" phase_87"
 " top-level-bind-scope_3)"
 "(loop_83"
 "(add1"
@@ -33648,7 +33665,7 @@ static const char *startup_source =
 "(let-values(((self23_0)"
 " self_19)"
 "((phase24_0)"
-" phase_86)"
+" phase_87)"
 "((defined-sym25_0)"
 " defined-sym_0)"
 "((frame-id26_0)"
@@ -33676,7 +33693,7 @@ static const char *startup_source =
 "((id29_0)"
 " id_54)"
 "((phase30_0)"
-" phase_86)"
+" phase_87)"
 "((b31_0)"
 " b_75))"
 "(remove-required-id!75.1"
@@ -33690,7 +33707,7 @@ static const char *startup_source =
 "((b20_0)"
 " b_75)"
 "((phase21_1)"
-" phase_86)"
+" phase_87)"
 "((orig-s22_0)"
 " orig-s_28))"
 "(add-binding!17.1"
@@ -33706,7 +33723,7 @@ static const char *startup_source =
 "((id33_0)"
 " id_54)"
 "((phase34_0)"
-" phase_86)"
+" phase_87)"
 "((b35_0)"
 " b_75)"
 "((as-transformer?36_0)"
@@ -33731,21 +33748,21 @@ static const char *startup_source =
 " lst_261)))))))))))))))))))"
 "(define-values"
 "(no-extra-scopes?)"
-"(lambda(id_55 all-scopes-stx_4 top-level-bind-scope_4 phase_72)"
+"(lambda(id_55 all-scopes-stx_4 top-level-bind-scope_4 phase_73)"
 "(begin"
 "(let-values(((m-id_0)(datum->syntax$1 all-scopes-stx_4(syntax-e$1 id_55))))"
-"(let-values(((or-part_210)(bound-identifier=?$1 id_55 m-id_0 phase_72)))"
+"(let-values(((or-part_210)(bound-identifier=?$1 id_55 m-id_0 phase_73)))"
 "(if or-part_210"
 " or-part_210"
 "(if top-level-bind-scope_4"
-"(bound-identifier=?$1 id_55(add-scope m-id_0 top-level-bind-scope_4) phase_72)"
+"(bound-identifier=?$1 id_55(add-scope m-id_0 top-level-bind-scope_4) phase_73)"
 " #f)))))))"
 "(define-values"
 "(defined-as-other?)"
-"(lambda(prev-id_0 id_56 phase_87 top-level-bind-scope_5)"
+"(lambda(prev-id_0 id_56 phase_88 top-level-bind-scope_5)"
 "(begin"
 "(if prev-id_0"
-"(if(not(bound-identifier=?$1 prev-id_0 id_56 phase_87))"
+"(if(not(bound-identifier=?$1 prev-id_0 id_56 phase_88))"
 "(let-values(((or-part_258)(not top-level-bind-scope_5)))"
 "(if or-part_258"
 " or-part_258"
@@ -33753,7 +33770,7 @@ static const char *startup_source =
 "(bound-identifier=?$1"
 "(remove-scope prev-id_0 top-level-bind-scope_5)"
 "(remove-scope id_56 top-level-bind-scope_5)"
-" phase_87))))"
+" phase_88))))"
 " #f)"
 " #f))))"
 "(define-values"
@@ -33780,14 +33797,14 @@ static const char *startup_source =
 " temp41_0)))))"
 "(define-values"
 "(add-defined-sym!)"
-"(lambda(defined-syms_9 phase_77 sym_63 id_57)"
+"(lambda(defined-syms_9 phase_78 sym_63 id_57)"
 "(begin"
 "(let-values(((defined-syms-at-phase_1)"
-"(let-values(((or-part_219)(hash-ref defined-syms_9 phase_77 #f)))"
+"(let-values(((or-part_219)(hash-ref defined-syms_9 phase_78 #f)))"
 "(if or-part_219"
 " or-part_219"
 "(let-values(((ht_121)(make-hasheq)))"
-"(begin(hash-set! defined-syms_9 phase_77 ht_121) ht_121))))))"
+"(begin(hash-set! defined-syms_9 phase_78 ht_121) ht_121))))))"
 "(hash-set! defined-syms-at-phase_1 sym_63 id_57)))))"
 "(define-values"
 "(make-create-root-expand-context-from-module)"
@@ -33833,17 +33850,17 @@ static const char *startup_source =
 "(check-list"
 " lst_262)))"
 "((letrec-values(((for-loop_236)"
-"(lambda(lst_78)"
+"(lambda(lst_82)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_78)"
+" lst_82)"
 "(let-values(((req_4)"
 "(unsafe-car"
-" lst_78))"
-"((rest_36)"
+" lst_82))"
+"((rest_38)"
 "(unsafe-cdr"
-" lst_78)))"
+" lst_82)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -33898,7 +33915,7 @@ static const char *startup_source =
 "(if(not"
 " #f)"
 "(for-loop_236"
-" rest_36)"
+" rest_38)"
 "(values))))"
 "(values))))))"
 " for-loop_236)"
@@ -33924,7 +33941,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_145"
-"(let-values(((phase_88 linklet_3)"
+"(let-values(((phase_89 linklet_3)"
 "(hash-iterate-key+value ht_122 i_145)))"
 "(let-values((()"
 "(let-values()"
@@ -33971,7 +33988,7 @@ static const char *startup_source =
 "(let-values(((self13_1)"
 " self_20)"
 "((phase14_1)"
-" phase_88)"
+" phase_89)"
 "((sym15_0)"
 " sym_64))"
 "(make-module-binding22.1"
@@ -33988,7 +34005,7 @@ static const char *startup_source =
 " phase14_1"
 " sym15_0)))"
 "((phase12_0)"
-" phase_88))"
+" phase_89))"
 "(add-binding!17.1"
 " #f"
 " #f"
@@ -33997,7 +34014,7 @@ static const char *startup_source =
 " phase12_0))"
 "(add-defined-sym!"
 " defined-syms_10"
-" phase_88"
+" phase_89"
 " sym_64"
 " id_58))))"
 "(values)))))"
@@ -34250,7 +34267,7 @@ static const char *startup_source =
 "(void)))))))))))))"
 "(define-values"
 "(check-single-require-access)"
-"(lambda(mi_17 phase_89 sym_65 insp_11)"
+"(lambda(mi_17 phase_90 sym_65 insp_11)"
 "(begin"
 "(let-values(((m_16)(module-instance-module mi_17)))"
 "(if(module-no-protected? m_16)"
@@ -34259,7 +34276,7 @@ static const char *startup_source =
 "(let-values(((access_3)"
 "(let-values(((or-part_261)(module-access m_16)))"
 "(if or-part_261 or-part_261(module-compute-access! m_16)))))"
-"(let-values(((a_48)(hash-ref(hash-ref access_3 phase_89 '#hasheq()) sym_65 'unexported)))"
+"(let-values(((a_48)(hash-ref(hash-ref access_3 phase_90 '#hasheq()) sym_65 'unexported)))"
 "(if(let-values(((or-part_34)(eq? a_48 'unexported)))"
 "(if or-part_34 or-part_34(eq? a_48 'protected)))"
 "(let-values()"
@@ -34329,13 +34346,13 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-range start_37 end_26 inc_20)))"
 "((letrec-values(((for-loop_237)"
-"(lambda(table_179 pos_99)"
+"(lambda(table_180 pos_99)"
 "(begin"
 " 'for-loop"
 "(if(< pos_99 end_26)"
 "(let-values(((phase-level_17)"
 " pos_99))"
-"(let-values(((table_180)"
+"(let-values(((table_181)"
 "(let-values(((v_188)"
 "(hash-ref"
 " h_1"
@@ -34344,17 +34361,17 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_110)"
-"(lambda(table_181)"
+"(lambda(table_182)"
 "(begin"
 " 'for-loop"
 "(let-values()"
-"(let-values(((table_182)"
-"(let-values(((table_111)"
-" table_181))"
-"(if v_188"
 "(let-values(((table_183)"
-" table_111))"
+"(let-values(((table_112)"
+" table_182))"
+"(if v_188"
 "(let-values(((table_184)"
+" table_112))"
+"(let-values(((table_185)"
 "(let-values()"
 "(let-values(((key_68"
 " val_57)"
@@ -34364,21 +34381,21 @@ static const char *startup_source =
 "(1/eval-linklet"
 " v_188)))))"
 "(hash-set"
-" table_183"
+" table_184"
 " key_68"
 " val_57)))))"
 "(values"
-" table_184)))"
-" table_111))))"
-" table_182))))))"
+" table_185)))"
+" table_112))))"
+" table_183))))))"
 " for-loop_110)"
-" table_179)))))"
+" table_180)))))"
 "(if(not #f)"
 "(for-loop_237"
-" table_180"
+" table_181"
 "(+ pos_99 inc_20))"
-" table_180)))"
-" table_179)))))"
+" table_181)))"
+" table_180)))))"
 " for-loop_237)"
 " '#hash()"
 " start_37)))))"
@@ -35082,27 +35099,27 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_123)))"
 "((letrec-values(((for-loop_240)"
-"(lambda(table_185 i_146)"
+"(lambda(table_186 i_146)"
 "(begin"
 " 'for-loop"
 "(if i_146"
-"(let-values(((phase_90 linklet_5)(hash-iterate-key+value ht_123 i_146)))"
-"(let-values(((table_186)"
-"(let-values(((table_187) table_185))"
-"(let-values(((table_140)"
+"(let-values(((phase_91 linklet_5)(hash-iterate-key+value ht_123 i_146)))"
+"(let-values(((table_187)"
+"(let-values(((table_188) table_186))"
+"(let-values(((table_141)"
 "(let-values()"
 "(let-values(((key_69 val_60)"
 "(let-values()"
 "(values"
-" phase_90"
+" phase_91"
 "(1/linklet-export-variables"
 " linklet_5)))))"
-"(hash-set table_187 key_69 val_60)))))"
-"(values table_140)))))"
+"(hash-set table_188 key_69 val_60)))))"
+"(values table_141)))))"
 "(if(not #f)"
-"(for-loop_240 table_186(hash-iterate-next ht_123 i_146))"
-" table_186)))"
-" table_185)))))"
+"(for-loop_240 table_187(hash-iterate-next ht_123 i_146))"
+" table_187)))"
+" table_186)))))"
 " for-loop_240)"
 " '#hash()"
 "(hash-iterate-first ht_123)))))))"
@@ -35126,7 +35143,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_147"
-"(let-values(((phase_91 at-phase_11)"
+"(let-values(((phase_92 at-phase_11)"
 "(hash-iterate-key+value ht_124 i_147)))"
 "(let-values(((fold-var_60)"
 "(let-values(((l_65)"
@@ -35210,7 +35227,7 @@ static const char *startup_source =
 "(if(if(eqv?"
 "(module-binding-nominal-phase"
 " b_76)"
-" phase_91)"
+" phase_92)"
 "(eq?"
 "(module-binding-nominal-sym"
 " b_76)"
@@ -35279,7 +35296,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_91"
+" phase_92"
 "(let-values(((l4_0)"
 " l_65)"
 "((symbol<?5_0)"
@@ -35327,14 +35344,14 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_95"
-"(let-values(((phase_92 vars_0)(hash-iterate-key+value ht_85 i_95)))"
+"(let-values(((phase_93 vars_0)(hash-iterate-key+value ht_85 i_95)))"
 "(let-values(((fold-var_173)"
 "(let-values(((fold-var_226) fold-var_171))"
 "(let-values(((l_66)"
 "(let-values(((syms_19)"
 "(hash-ref"
 " provides_10"
-" phase_92"
+" phase_93"
 " '#hasheq())))"
 "(reverse$1"
 "(let-values(((lst_18) vars_0))"
@@ -35405,7 +35422,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_92"
+" phase_93"
 "(let-values(((l10_0)"
 " l_66)"
 "((symbol<?11_0)"
@@ -35509,14 +35526,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_126)))"
 "((letrec-values(((for-loop_243)"
-"(lambda(table_188 i_92)"
+"(lambda(table_189 i_92)"
 "(begin"
 " 'for-loop"
 "(if i_92"
 "(let-values(((key_70 val_61)(hash-iterate-key+value ht_126 i_92)))"
-"(let-values(((table_189)"
-"(let-values(((table_190) table_188))"
-"(let-values(((table_191)"
+"(let-values(((table_190)"
+"(let-values(((table_191) table_189))"
+"(let-values(((table_192)"
 "(let-values()"
 "(let-values(((key_71 val_62)"
 "(let-values()"
@@ -35530,14 +35547,14 @@ static const char *startup_source =
 " val_61"
 " key_70))))))"
 "(hash-set"
-" table_190"
+" table_191"
 " key_71"
 " val_62)))))"
-"(values table_191)))))"
+"(values table_192)))))"
 "(if(not #f)"
-"(for-loop_243 table_189(hash-iterate-next ht_126 i_92))"
-" table_189)))"
-" table_188)))))"
+"(for-loop_243 table_190(hash-iterate-next ht_126 i_92))"
+" table_190)))"
+" table_189)))))"
 " for-loop_243)"
 " '#hasheq()"
 "(hash-iterate-first ht_126))))))"
@@ -35564,12 +35581,12 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-list lst_91)))"
 "((letrec-values(((for-loop_49)"
-"(lambda(ht_127 lst_82)"
+"(lambda(ht_127 lst_78)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_82)"
-"(let-values(((submod_1)(unsafe-car lst_82))"
-"((rest_37)(unsafe-cdr lst_82)))"
+"(if(pair? lst_78)"
+"(let-values(((submod_1)(unsafe-car lst_78))"
+"((rest_35)(unsafe-cdr lst_78)))"
 "(let-values(((ht_117)"
 "(let-values(((ht_118) ht_127))"
 "(let-values(((ht_119)"
@@ -35591,7 +35608,7 @@ static const char *startup_source =
 "(compiled->linklet-directory-or-bundle"
 " submod_1))))))))"
 "(values ht_119)))))"
-"(if(not #f)(for-loop_49 ht_117 rest_37) ht_117)))"
+"(if(not #f)(for-loop_49 ht_117 rest_35) ht_117)))"
 " ht_127)))))"
 " for-loop_49)"
 " '#hasheq()"
@@ -35871,14 +35888,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-range start_38 end_27 inc_21)))"
 "((letrec-values(((for-loop_197)"
-"(lambda(table_64 pos_101)"
+"(lambda(table_65 pos_101)"
 "(begin"
 " 'for-loop"
 "(if(< pos_101 end_27)"
 "(let-values(((phase-level_20) pos_101))"
-"(let-values(((table_67)"
-"(let-values(((table_192) table_64))"
-"(let-values(((table_193)"
+"(let-values(((table_68)"
+"(let-values(((table_193) table_65))"
+"(let-values(((table_194)"
 "(let-values()"
 "(let-values(((key_72 val_63)"
 "(let-values()"
@@ -35894,12 +35911,12 @@ static const char *startup_source =
 " linklet_0)"
 " null))))))"
 "(hash-set"
-" table_192"
+" table_193"
 " key_72"
 " val_63)))))"
-"(values table_193)))))"
-"(if(not #f)(for-loop_197 table_67(+ pos_101 inc_21)) table_67)))"
-" table_64)))))"
+"(values table_194)))))"
+"(if(not #f)(for-loop_197 table_68(+ pos_101 inc_21)) table_68)))"
+" table_65)))))"
 " for-loop_197)"
 " '#hash()"
 " start_38)))))))))))))"
@@ -36153,11 +36170,11 @@ static const char *startup_source =
 "(let-values(((check-side-effects!_0)"
 "(lambda(e_73"
 " expected-results_3"
-" phase_93"
+" phase_94"
 " required-reference?_1)"
 "(begin"
 " 'check-side-effects!"
-"(if(hash-ref side-effects_0 phase_93 #f)"
+"(if(hash-ref side-effects_0 phase_94 #f)"
 "(void)"
 "(let-values()"
 "(if(let-values(((e52_2) e_73)"
@@ -36174,7 +36191,7 @@ static const char *startup_source =
 "(let-values()"
 "(hash-set!"
 " side-effects_0"
-" phase_93"
+" phase_94"
 " #t))"
 "(void))))))))"
 "(let-values((()"
@@ -36345,7 +36362,7 @@ static const char *startup_source =
 " #f)))"
 "(let-values() #f))))"
 "((temp66_1)"
-"(lambda(mod-name_17 phase_94)"
+"(lambda(mod-name_17 phase_95)"
 "(let-values(((ht_128)"
 "(if modules-being-compiled_1"
 "(hash-ref"
@@ -36356,7 +36373,7 @@ static const char *startup_source =
 "(if ht_128"
 "(hash-ref"
 " ht_128"
-" phase_94"
+" phase_95"
 " #f)"
 " #f))))"
 "((to-source?67_0) to-source?_3)"
@@ -36395,31 +36412,31 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash ht_129)))"
 "((letrec-values(((for-loop_23)"
-"(lambda(table_100"
+"(lambda(table_101"
 " i_149)"
 "(begin"
 " 'for-loop"
 "(if i_149"
-"(let-values(((phase_95"
+"(let-values(((phase_96"
 " linklet_6)"
 "(hash-iterate-key+value"
 " ht_129"
 " i_149)))"
-"(let-values(((table_194)"
 "(let-values(((table_195)"
-" table_100))"
 "(let-values(((table_196)"
+" table_101))"
+"(let-values(((table_197)"
 "(let-values()"
 "(let-values(((key_73"
 " val_64)"
 "(let-values()"
 "(values"
-" phase_95"
+" phase_96"
 "(module-linklet-info2.1"
 " linklet_6"
 "(hash-ref"
 " phase-to-link-module-uses_4"
-" phase_95"
+" phase_96"
 " #f)"
 " self_25"
 " #f"
@@ -36427,24 +36444,24 @@ static const char *startup_source =
 "(if phase-to-link-extra-inspectorsss_2"
 "(hash-ref"
 " phase-to-link-extra-inspectorsss_2"
-" phase_95"
+" phase_96"
 " #f)"
 " #f))))))"
 "(hash-set"
-" table_195"
+" table_196"
 " key_73"
 " val_64)))))"
 "(values"
-" table_196)))))"
+" table_197)))))"
 "(if(not"
 " #f)"
 "(for-loop_23"
-" table_194"
+" table_195"
 "(hash-iterate-next"
 " ht_129"
 " i_149))"
-" table_194)))"
-" table_100)))))"
+" table_195)))"
+" table_101)))))"
 " for-loop_23)"
 " '#hasheq()"
 "(hash-iterate-first ht_129))))))"
@@ -36886,35 +36903,35 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash ht_133)))"
 "((letrec-values(((for-loop_246)"
-"(lambda(table_197"
+"(lambda(table_198"
 " i_150)"
 "(begin"
 " 'for-loop"
 "(if i_150"
-"(let-values(((phase_96"
+"(let-values(((phase_97"
 " linklet_8)"
 "(hash-iterate-key+value"
 " ht_133"
 " i_150)))"
-"(let-values(((table_198)"
 "(let-values(((table_199)"
-" table_197))"
-"(if(number?"
-" phase_96)"
 "(let-values(((table_200)"
-" table_199))"
+" table_198))"
+"(if(number?"
+" phase_97)"
 "(let-values(((table_201)"
+" table_200))"
+"(let-values(((table_202)"
 "(let-values()"
 "(let-values(((key_74"
 " val_65)"
 "(let-values()"
 "(values"
-" phase_96"
+" phase_97"
 "(module-linklet-info2.1"
 " linklet_8"
 "(hash-ref"
 " phase-to-link-module-uses_5"
-" phase_96"
+" phase_97"
 " #f)"
 "(compiled-in-memory-original-self"
 " cim_10)"
@@ -36924,25 +36941,25 @@ static const char *startup_source =
 "(if phase-to-extra-inspectorsss_0"
 "(hash-ref"
 " phase-to-extra-inspectorsss_0"
-" phase_96"
+" phase_97"
 " #f)"
 " #f))))))"
 "(hash-set"
-" table_200"
+" table_201"
 " key_74"
 " val_65)))))"
 "(values"
-" table_201)))"
-" table_199))))"
+" table_202)))"
+" table_200))))"
 "(if(not"
 " #f)"
 "(for-loop_246"
-" table_198"
+" table_199"
 "(hash-iterate-next"
 " ht_133"
 " i_150))"
-" table_198)))"
-" table_197)))))"
+" table_199)))"
+" table_198)))))"
 " for-loop_246)"
 " '#hasheq()"
 "(hash-iterate-first"
@@ -36981,13 +36998,13 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_134)))"
 "((letrec-values(((for-loop_247)"
-"(lambda(table_202 i_151)"
+"(lambda(table_0 i_151)"
 "(begin"
 " 'for-loop"
 "(if i_151"
-"(let-values(((k_33 v_73)(hash-iterate-key+value ht_134 i_151)))"
+"(let-values(((k_34 v_73)(hash-iterate-key+value ht_134 i_151)))"
 "(let-values(((table_203)"
-"(let-values(((table_204) table_202))"
+"(let-values(((table_204) table_0))"
 "(let-values(((table_205)"
 "(let-values()"
 "(let-values(((key_75 val_66)"
@@ -36995,17 +37012,17 @@ static const char *startup_source =
 "(if(1/linklet? v_73)"
 "(let-values()"
 "(values"
-" k_33"
+" k_34"
 "(1/recompile-linklet"
 " v_73)))"
 "(let-values()"
-"(values k_33 v_73))))))"
+"(values k_34 v_73))))))"
 "(hash-set table_204 key_75 val_66)))))"
 "(values table_205)))))"
 "(if(not #f)"
 "(for-loop_247 table_203(hash-iterate-next ht_134 i_151))"
 " table_203)))"
-" table_202)))))"
+" table_0)))))"
 " for-loop_247)"
 " '#hasheq()"
 "(hash-iterate-first ht_134))))))"
@@ -37018,14 +37035,14 @@ static const char *startup_source =
 "(void)"
 "(let-values()(check-in-hash ht_84)))"
 "((letrec-values(((for-loop_218)"
-"(lambda(table_167 i_152)"
+"(lambda(table_168 i_152)"
 "(begin"
 " 'for-loop"
 "(if i_152"
-"(let-values(((k_34 v_1)(hash-iterate-key+value ht_84 i_152)))"
+"(let-values(((k_35 v_1)(hash-iterate-key+value ht_84 i_152)))"
 "(let-values(((table_206)"
-"(let-values(((table_207) table_167))"
-"(let-values(((table_168)"
+"(let-values(((table_207) table_168))"
+"(let-values(((table_169)"
 "(let-values()"
 "(let-values(((key_76 val_67)"
 "(let-values()"
@@ -37033,17 +37050,17 @@ static const char *startup_source =
 " v_1)"
 "(let-values()"
 "(values"
-" k_34"
+" k_35"
 "(1/compiled-expression-recompile"
 " v_1)))"
 "(let-values()"
-"(values k_34 v_1))))))"
+"(values k_35 v_1))))))"
 "(hash-set table_207 key_76 val_67)))))"
-"(values table_168)))))"
+"(values table_169)))))"
 "(if(not #f)"
 "(for-loop_218 table_206(hash-iterate-next ht_84 i_152))"
 " table_206)))"
-" table_167)))))"
+" table_168)))))"
 " for-loop_218)"
 " '#hasheq()"
 "(hash-iterate-first ht_84))))))"
@@ -37176,7 +37193,7 @@ static const char *startup_source =
 "((syntax-literals-tree_1)"
 "(unsafe-car"
 " lst_90))"
-"((rest_37)"
+"((rest_35)"
 "(unsafe-cdr"
 " lst_90)))"
 "(let-values(((fold-var_170)"
@@ -37200,7 +37217,7 @@ static const char *startup_source =
 " rest_143"
 " rest_51"
 " rest_91"
-" rest_37)"
+" rest_35)"
 " fold-var_170)))"
 " fold-var_158)))))"
 " for-loop_237)"
@@ -37228,7 +37245,7 @@ static const char *startup_source =
 " 'for/vector"
 "                                                                   \"exact-nonnegative-integer?\""
 " len_29)))"
-"(let-values(((v_69)(make-vector len_29 0)))"
+"(let-values(((v_70)(make-vector len_29 0)))"
 "(begin"
 "(if(zero? len_29)"
 "(void)"
@@ -37262,7 +37279,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_69"
+" v_70"
 " i_63"
 "(let-values()"
 "(vector-ref"
@@ -37291,7 +37308,7 @@ static const char *startup_source =
 " for-loop_111)"
 " 0"
 " 0)))))"
-" v_69))))"
+" v_70))))"
 "(let-values(((len_31)(cdr syntax-literals-spec_0)))"
 "(begin"
 "(if(exact-nonnegative-integer? len_31)"
@@ -37301,7 +37318,7 @@ static const char *startup_source =
 " 'for/vector"
 "                                                                   \"exact-nonnegative-integer?\""
 " len_31)))"
-"(let-values(((v_36)(make-vector len_31 0)))"
+"(let-values(((v_37)(make-vector len_31 0)))"
 "(begin"
 "(if(zero? len_31)"
 "(void)"
@@ -37330,7 +37347,7 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(unsafe-vector*-set!"
-" v_36"
+" v_37"
 " i_36"
 "(let-values()"
 "(if syntax-literals_5"
@@ -37364,7 +37381,7 @@ static const char *startup_source =
 " for-loop_248)"
 " 0"
 " start_15)))))"
-" v_36))))"
+" v_37))))"
 "(map-construct-compiled-in-memory_0 pres_0 1)"
 "(map-construct-compiled-in-memory_0 posts_0 2)"
 " namespace-scopes_0"
@@ -37546,7 +37563,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if(> pos_101 end_27)"
-"(let-values(((phase_97) pos_101))"
+"(let-values(((phase_98) pos_101))"
 "(let-values(((prev-thunk_1)"
 "(let-values(((prev-thunk_2)"
 " prev-thunk_0))"
@@ -37560,7 +37577,7 @@ static const char *startup_source =
 "(let-values(((module-uses_1)"
 "(hash-ref"
 " phase-to-link-modules_1"
-" phase_97"
+" phase_98"
 " null)))"
 "(let-values(((import-module-instances_2"
 " import-instances_1)"
@@ -37608,7 +37625,7 @@ static const char *startup_source =
 "((temp30_3)"
 "(phase-"
 "(phase+"
-" phase_97"
+" phase_98"
 " phase-shift_18)"
 "(module-use-phase"
 " mu_9))))"
@@ -37653,7 +37670,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " ns_72"
 "(phase+"
-" phase_97"
+" phase_98"
 " phase-shift_18))))"
 "(let-values(((inst_5)"
 "(if single-expression?_1"
@@ -37678,7 +37695,7 @@ static const char *startup_source =
 " ns_72"
 "(phase+"
 "(sub1"
-" phase_97)"
+" phase_98)"
 " phase-shift_18)"
 " name_60"
 " val_68))))"
@@ -37692,7 +37709,7 @@ static const char *startup_source =
 "(let-values(((linklet_9)"
 "(hash-ref"
 " h_11"
-" phase_97"
+" phase_98"
 " #f)))"
 "(if linklet_9"
 "(let-values()"
@@ -37713,7 +37730,7 @@ static const char *startup_source =
 "((temp43_2)"
 "(hash-ref"
 " phase-to-link-extra-inspectorsss_3"
-" phase_97"
+" phase_98"
 " #f)))"
 "(check-require-access9.1"
 " temp38_2"
@@ -37739,14 +37756,14 @@ static const char *startup_source =
 " ns_72"
 "(phase-"
 "(phase+"
-" phase_97"
+" phase_98"
 " phase-shift_18)"
 "(namespace-0-phase"
 " ns_72)))"
 "(not"
 " tail?_49))))))"
 "(if(zero-phase?"
-" phase_97)"
+" phase_98)"
 "(let-values()"
 " instantiate_0)"
 "(if single-expression?_1"
@@ -37770,7 +37787,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " phase-ns_0"
 "(sub1"
-" phase_97))))"
+" phase_98))))"
 "(lambda(tail?_51)"
 "(begin"
 " 'prev-thunk"
@@ -37932,15 +37949,15 @@ static const char *startup_source =
 "(apply"
 "(direct-eval(parsed-app-rator p_48) ns_67 self-mpi_4)"
 "(reverse$1"
-"(let-values(((lst_77)(parsed-app-rands p_48)))"
+"(let-values(((lst_81)(parsed-app-rands p_48)))"
 "(begin"
-"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_77)))"
-"((letrec-values(((for-loop_98)"
-"(lambda(fold-var_232 lst_78)"
+"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_81)))"
+"((letrec-values(((for-loop_102)"
+"(lambda(fold-var_232 lst_82)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_78)"
-"(let-values(((r_8)(unsafe-car lst_78))((rest_36)(unsafe-cdr lst_78)))"
+"(if(pair? lst_82)"
+"(let-values(((r_8)(unsafe-car lst_82))((rest_38)(unsafe-cdr lst_82)))"
 "(let-values(((fold-var_223)"
 "(let-values(((fold-var_69) fold-var_232))"
 "(let-values(((fold-var_26)"
@@ -37950,11 +37967,11 @@ static const char *startup_source =
 "(direct-eval r_8 ns_67 self-mpi_4))"
 " fold-var_69))))"
 "(values fold-var_26)))))"
-"(if(not #f)(for-loop_98 fold-var_223 rest_36) fold-var_223)))"
+"(if(not #f)(for-loop_102 fold-var_223 rest_38) fold-var_223)))"
 " fold-var_232)))))"
-" for-loop_98)"
+" for-loop_102)"
 " null"
-" lst_77))))))"
+" lst_81))))))"
 "(if(parsed-id? p_48)"
 "(let-values()(get-id-value p_48 ns_67 self-mpi_4))"
 "(if(parsed-quote? p_48)"
@@ -38096,16 +38113,16 @@ static const char *startup_source =
 "(let-values()(lift-context1.1 convert_0(box null) module*-ok?_0)))))))"
 "(define-values"
 "(add-lifted!)"
-"(lambda(lifts_1 ids_16 rhs_12 phase_98)"
+"(lambda(lifts_1 ids_16 rhs_12 phase_99)"
 "(begin"
-"(let-values(((lifted-ids_0 lifted_0)((lift-context-convert lifts_1) ids_16 rhs_12 phase_98)))"
+"(let-values(((lifted-ids_0 lifted_0)((lift-context-convert lifts_1) ids_16 rhs_12 phase_99)))"
 "(begin(box-cons!(lift-context-lifts lifts_1) lifted_0) lifted-ids_0)))))"
 "(define-values(get-and-clear-lifts!)(lambda(lifts_2)(begin(box-clear!(lift-context-lifts lifts_2)))))"
 "(define-values"
 "(make-local-lift)"
 "(lambda(lift-env_1 counter_3)"
 "(begin"
-"(lambda(ids_17 rhs_13 phase_99)"
+"(lambda(ids_17 rhs_13 phase_100)"
 "(let-values(((keys_2)"
 "(reverse$1"
 "(let-values(((lst_277) ids_17))"
@@ -38130,7 +38147,7 @@ static const char *startup_source =
 "(let-values(((id32_0)"
 " id_59)"
 "((phase33_0)"
-" phase_99)"
+" phase_100)"
 "((counter34_0)"
 " counter_3))"
 "(add-local-binding!37.1"
@@ -38200,7 +38217,7 @@ static const char *startup_source =
 "(values tl-ids_1(lifted-bind2.1 tl-ids_1 syms_20 rhs_14)))))))))"
 "(define-values"
 "(wrap-lifts-as-let)"
-"(lambda(lifts_3 body_4 phase_100)"
+"(lambda(lifts_3 body_4 phase_101)"
 "(begin"
 "(datum->syntax$1"
 " #f"
@@ -38224,7 +38241,7 @@ static const char *startup_source =
 "                                                                           (error \"non-bindings in `lift-context`\")))"
 "(list"
 "(datum->syntax$1"
-"(syntax-shift-phase-level$1 core-stx phase_100)"
+"(syntax-shift-phase-level$1 core-stx phase_101)"
 " 'let-values)"
 "(list"
 "(list"
@@ -38244,14 +38261,14 @@ static const char *startup_source =
 " 'wrap-lifts-as-begin16"
 "(let-values(((lifts_4) lifts13_0))"
 "(let-values(((body_8) body14_0))"
-"(let-values(((phase_101) phase15_0))"
+"(let-values(((phase_102) phase15_0))"
 "(let-values(((adjust-form_0)(if(eq? adjust-form9_0 unsafe-undefined) values adjust-form9_0)))"
 "(let-values(((adjust-body_0)(if(eq? adjust-body10_0 unsafe-undefined) values adjust-body10_0)))"
 "(let-values()"
 "(datum->syntax$1"
 " #f"
 "(cons"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_101) 'begin)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_102) 'begin)"
 "(append"
 "(reverse$1"
 "(let-values(((lst_280) lifts_4))"
@@ -38281,7 +38298,7 @@ static const char *startup_source =
 "(datum->syntax$1"
 "(syntax-shift-phase-level$1"
 " core-stx"
-" phase_101)"
+" phase_102)"
 " 'define-values)"
 "(lifted-bind-ids lift_1)"
 "(lifted-bind-rhs"
@@ -38363,7 +38380,7 @@ static const char *startup_source =
 "(lambda(module-lifts_1)(begin(box-clear!(module-lift-context-lifts module-lifts_1)))))"
 "(define-values"
 "(add-lifted-module!)"
-"(lambda(module-lifts_2 s_409 phase_102)"
+"(lambda(module-lifts_2 s_409 phase_103)"
 "(begin"
 "(begin"
 "(if(let-values(((or-part_171)"
@@ -38375,7 +38392,7 @@ static const char *startup_source =
 "(if(lift-context? module-lifts_2)(lift-context-module*-ok? module-lifts_2) #f)))"
 "(void)"
 "(let-values()"
-"(let-values(((tmp_30)(core-form-sym s_409 phase_102)))"
+"(let-values(((tmp_30)(core-form-sym s_409 phase_103)))"
 "(if(equal? tmp_30 'module)"
 "(let-values()(void))"
 "(if(equal? tmp_30 'module*)"
@@ -38429,10 +38446,10 @@ static const char *startup_source =
 "(lambda(require-lifts_1)(begin(box-clear!(require-lift-context-requires require-lifts_1)))))"
 "(define-values"
 "(add-lifted-require!)"
-"(lambda(require-lifts_2 s_410 phase_103)"
+"(lambda(require-lifts_2 s_410 phase_104)"
 "(begin"
 "(begin"
-"((require-lift-context-do-require require-lifts_2) s_410 phase_103)"
+"((require-lift-context-do-require require-lifts_2) s_410 phase_104)"
 "(box-cons!(require-lift-context-requires require-lifts_2) s_410)))))"
 "(define-values"
 "(struct:to-module-lift-context"
@@ -38470,10 +38487,10 @@ static const char *startup_source =
 "(lambda(end-as-expressions?23_0 shared-module-ends22_0 phase26_2)"
 "(begin"
 " 'make-to-module-lift-context27"
-"(let-values(((phase_82) phase26_2))"
+"(let-values(((phase_83) phase26_2))"
 "(let-values(((ends_0) shared-module-ends22_0))"
 "(let-values(((end-as-expressions?_0) end-as-expressions?23_0))"
-"(let-values()(to-module-lift-context21.1 phase_82(box null) end-as-expressions?_0 ends_0))))))))"
+"(let-values()(to-module-lift-context21.1 phase_83(box null) end-as-expressions?_0 ends_0))))))))"
 "(define-values(make-shared-module-ends)(lambda()(begin(box null))))"
 "(define-values"
 "(get-and-clear-end-lifts!)"
@@ -38483,7 +38500,7 @@ static const char *startup_source =
 "(lambda(to-module-lifts_2)(begin(box-clear!(to-module-lift-context-provides to-module-lifts_2)))))"
 "(define-values"
 "(add-lifted-to-module-provide!)"
-"(lambda(to-module-lifts_3 s_218 phase_96)"
+"(lambda(to-module-lifts_3 s_218 phase_97)"
 "(begin(box-cons!(to-module-lift-context-provides to-module-lifts_3) s_218))))"
 "(define-values"
 "(add-lifted-to-module-end!)"
@@ -38536,20 +38553,20 @@ static const char *startup_source =
 "(1/prop:expansion-contexts expansion-contexts? expansion-contexts-ref)"
 "(make-struct-type-property"
 " 'expansion-contexts"
-"(lambda(v_28 info_1)"
+"(lambda(v_29 info_1)"
 "(begin"
-"(if(if(list? v_28)"
-"(let-values(((lst_75) v_28))"
+"(if(if(list? v_29)"
+"(let-values(((lst_79) v_29))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_75)))"
-"((letrec-values(((for-loop_97)"
-"(lambda(result_77 lst_76)"
+"(let-values()(check-list lst_79)))"
+"((letrec-values(((for-loop_101)"
+"(lambda(result_77 lst_80)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_76)"
-"(let-values(((s_2)(unsafe-car lst_76))((rest_35)(unsafe-cdr lst_76)))"
+"(if(pair? lst_80)"
+"(let-values(((s_2)(unsafe-car lst_80))((rest_37)(unsafe-cdr lst_80)))"
 "(let-values(((result_64)"
 "(let-values()"
 "(let-values(((result_115)"
@@ -38564,20 +38581,20 @@ static const char *startup_source =
 " definition-context))))))"
 "(values result_115)))))"
 "(if(if(not((lambda x_75(not result_64)) s_2))(not #f) #f)"
-"(for-loop_97 result_64 rest_35)"
+"(for-loop_101 result_64 rest_37)"
 " result_64)))"
 " result_77)))))"
-" for-loop_97)"
+" for-loop_101)"
 " #t"
-" lst_75)))"
+" lst_79)))"
 " #f)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " 'guard-for-prop:expansion-contexts"
 "            \"(listof (or/c 'expression 'top-level 'module 'module-begin 'definition-context))\""
-" v_28)))"
-" v_28))))"
+" v_29)))"
+" v_29))))"
 "(define-values"
 "(not-in-this-expand-context?)"
 "(lambda(t_46 ctx_12)"
@@ -38702,11 +38719,11 @@ static const char *startup_source =
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_23)))"
 "((letrec-values(((for-loop_192)"
-"(lambda(ab_3 lst_79)"
+"(lambda(ab_3 lst_75)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_79)"
-"(let-values(((key_78)(unsafe-car lst_79))((rest_85)(unsafe-cdr lst_79)))"
+"(if(pair? lst_75)"
+"(let-values(((key_78)(unsafe-car lst_75))((rest_85)(unsafe-cdr lst_75)))"
 "(let-values(((ab_4)"
 "(let-values(((ab_5) ab_3))"
 "(let-values(((ab_6)(let-values()(set-add ab_5 key_78))))"
@@ -39703,7 +39720,9 @@ static const char *startup_source =
 "(let-values(((id199_0) id_66)"
 "((t200_0) t_55)"
 "((temp201_0)"
-"(free-id-set-empty-or-just-module*?(expand-context-stops ctx_24))))"
+"(free-id-set-empty-or-just-module*?"
+"(expand-context-stops ctx_24)"
+"(expand-context-phase ctx_24))))"
 "(substitute-variable6.1 temp201_0 id199_0 t200_0))))"
 "(if(if(expand-context-to-parsed? ctx_24)(free-id-set-empty?(expand-context-stops ctx_24)) #f)"
 "(let-values()"
@@ -39805,7 +39824,10 @@ static const char *startup_source =
 "(let-values(((or-part_270)(expand-context-only-immediate? ctx_26)))"
 "(if or-part_270"
 " or-part_270"
-"(not(free-id-set-empty-or-just-module*?(expand-context-stops ctx_26))))))))"
+"(not"
+"(free-id-set-empty-or-just-module*?"
+"(expand-context-stops ctx_26)"
+"(expand-context-phase ctx_26))))))))"
 "(let-values(((accum-ctx_0)"
 "(if(if confine-def-ctx-scopes?_0"
 "(if(expand-context-def-ctx-scopes ctx_26)"
@@ -39987,7 +40009,7 @@ static const char *startup_source =
 "(let-values(((always-wrap?_0) always-wrap?68_0))"
 "(let-values()"
 "(let-values(((context_6)(expand-context-context ctx_31)))"
-"(let-values(((phase_104)(expand-context-phase ctx_31)))"
+"(let-values(((phase_105)(expand-context-phase ctx_31)))"
 "(let-values(((local?_0)(not begin-form?_0)))"
 "((letrec-values(((loop_95)"
 "(lambda(s_418 always-wrap?_1 ctx_32)"
@@ -40159,7 +40181,7 @@ static const char *startup_source =
 "(let-values(((lifts225_0) lifts_6)"
 "((exp-s226_0) exp-s_2)"
 "((phase227_0)"
-" phase_104))"
+" phase_105))"
 "(wrap-lifts-as-begin16.1"
 " unsafe-undefined"
 " unsafe-undefined"
@@ -40169,7 +40191,7 @@ static const char *startup_source =
 "(wrap-lifts-as-let"
 " lifts_6"
 " exp-s_2"
-" phase_104)))))"
+" phase_105)))))"
 "(let-values() exp-s_2))))"
 "(if(let-values(((or-part_274)(not expand-lifts?_0)))"
 "(if or-part_274"
@@ -40238,10 +40260,10 @@ static const char *startup_source =
 "(let-values(((context_8) context97_0))"
 "(let-values(((keep-stops?_1) keep-stops?95_0))"
 "(let-values()"
-"(let-values(((phase_105)(add1(expand-context-phase ctx_34))))"
-"(let-values(((ns_74)(namespace->namespace-at-phase(expand-context-namespace ctx_34) phase_105)))"
+"(let-values(((phase_106)(add1(expand-context-phase ctx_34))))"
+"(let-values(((ns_74)(namespace->namespace-at-phase(expand-context-namespace ctx_34) phase_106)))"
 "(begin"
-"(namespace-visit-available-modules! ns_74 phase_105)"
+"(namespace-visit-available-modules! ns_74 phase_106)"
 "(let-values(((v_192) ctx_34))"
 "(let-values(((the-struct_61) v_192))"
 "(if(expand-context/outer? the-struct_61)"
@@ -40255,7 +40277,7 @@ static const char *startup_source =
 "((inner243_0)"
 "(let-values(((the-struct_62)(root-expand-context/outer-inner v_192)))"
 "(if(expand-context/inner? the-struct_62)"
-"(let-values(((phase244_0) phase_105)"
+"(let-values(((phase244_0) phase_106)"
 "((namespace245_0) ns_74)"
 "((stops246_0)"
 "(if keep-stops?_1"
@@ -40331,7 +40353,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " rhs247_0"
 " temp248_0))))"
-"(let-values(((phase_106)(add1(expand-context-phase ctx_35))))"
+"(let-values(((phase_107)(add1(expand-context-phase ctx_35))))"
 "(let-values(((parsed-rhs_0)"
 "(if(expand-context-to-parsed? ctx_35)"
 " exp-rhs_0"
@@ -40353,8 +40375,8 @@ static const char *startup_source =
 " who_16"
 " ids_19"
 " parsed-rhs_0"
-" phase_106"
-"(namespace->namespace-at-phase(expand-context-namespace ctx_35) phase_106)"
+" phase_107"
+"(namespace->namespace-at-phase(expand-context-namespace ctx_35) phase_107)"
 " ctx_35)))))))))))))))"
 "(define-values"
 "(eval-for-syntaxes-binding)"
@@ -40366,14 +40388,14 @@ static const char *startup_source =
 " vals_3))))"
 "(define-values"
 "(eval-for-bindings)"
-"(lambda(who_18 ids_21 p_49 phase_107 ns_75 ctx_37)"
+"(lambda(who_18 ids_21 p_49 phase_108 ns_75 ctx_37)"
 "(begin"
 "(let-values(((compiled_0)"
 "(if(can-direct-eval? p_49 ns_75(root-expand-context-self-mpi ctx_37))"
 " #f"
 "(compile-single"
 " p_49"
-"(let-values(((ns256_0) ns_75)((phase257_0) phase_107))"
+"(let-values(((ns256_0) ns_75)((phase257_0) phase_108))"
 "(make-compile-context14.1 #f unsafe-undefined #f ns256_0 phase257_0 unsafe-undefined))))))"
 "(let-values(((vals_4)"
 "(call-with-values"
@@ -40586,14 +40608,14 @@ static const char *startup_source =
 "(let-values()(1/rename-transformer-target t_58))))))"
 "(define-values"
 "(maybe-install-free=id-in-context!)"
-"(lambda(val_69 id_69 phase_108 ctx_42)"
+"(lambda(val_69 id_69 phase_109 ctx_42)"
 "(begin"
 "(if(1/rename-transformer? val_69)"
 "(let-values()"
 "(with-continuation-mark"
 " parameterization-key"
 "(extend-parameterization(continuation-mark-set-first #f parameterization-key) current-expand-context ctx_42)"
-"(let-values()(maybe-install-free=id! val_69 id_69 phase_108))))"
+"(let-values()(maybe-install-free=id! val_69 id_69 phase_109))))"
 "(void)))))"
 "(define-values"
 "(transfer-srcloc)"
@@ -40617,14 +40639,14 @@ static const char *startup_source =
 " new-s_1)))))"
 "(define-values"
 "(stop-ids->all-stop-ids)"
-"(lambda(stop-ids_0 phase_44)"
+"(lambda(stop-ids_0 phase_45)"
 "(begin"
 "(if(null? stop-ids_0)"
 "(let-values() stop-ids_0)"
 "(let-values()"
-"(let-values(((p-core-stx_0)(syntax-shift-phase-level$1 core-stx phase_44)))"
+"(let-values(((p-core-stx_1)(syntax-shift-phase-level$1 core-stx phase_45)))"
 "(if(if(= 1(length stop-ids_0))"
-"(free-identifier=?$1(car stop-ids_0)(datum->syntax$1 p-core-stx_0 'module*) phase_44 phase_44)"
+"(free-identifier=?$1(car stop-ids_0)(datum->syntax$1 p-core-stx_1 'module*) phase_45 phase_45)"
 " #f)"
 "(let-values() stop-ids_0)"
 "(let-values()"
@@ -40650,7 +40672,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(datum->syntax$1"
-" p-core-stx_0"
+" p-core-stx_1"
 " sym_71))"
 " fold-var_93))))"
 "(values fold-var_60)))))"
@@ -40678,9 +40700,9 @@ static const char *startup_source =
 " #%variable-reference))"
 "(define-values"
 "(module-expand-stop-ids)"
-"(lambda(phase_109)"
+"(lambda(phase_110)"
 "(begin"
-"(let-values(((p-core-stx_1)(syntax-shift-phase-level$1 core-stx phase_109)))"
+"(let-values(((p-core-stx_2)(syntax-shift-phase-level$1 core-stx phase_110)))"
 "(reverse$1"
 "(let-values(((lst_102) module-stop-syms))"
 "(begin"
@@ -40697,7 +40719,7 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(datum->syntax$1 p-core-stx_1 sym_18))"
+"(datum->syntax$1 p-core-stx_2 sym_18))"
 " fold-var_222))))"
 "(values fold-var_223)))))"
 "(if(not #f)(for-loop_116 fold-var_221 rest_161) fold-var_221)))"
@@ -40780,8 +40802,8 @@ static const char *startup_source =
 " parent-ctx_0)))"
 "(values))))"
 "(let-values(((ctx_43)"
-"(let-values(((temp47_0) 'syntax-local-make-definition-context))"
-"(get-current-expand-context16.1 #f temp47_0))))"
+"(let-values(((temp49_1) 'syntax-local-make-definition-context))"
+"(get-current-expand-context16.1 #f temp49_1))))"
 "(let-values(((frame-id_8)"
 "(let-values(((or-part_65)(root-expand-context-frame-id ctx_43)))"
 "(if or-part_65"
@@ -40861,8 +40883,8 @@ static const char *startup_source =
 " extra-intdefs_0)))"
 "(values))))"
 "(let-values(((ctx_44)"
-"(let-values(((temp48_1) 'local-expand))"
-"(get-current-expand-context16.1 #f temp48_1))))"
+"(let-values(((temp50_1) 'local-expand))"
+"(get-current-expand-context16.1 #f temp50_1))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_29)(expand-context-observer ctx_44)))"
@@ -40909,25 +40931,25 @@ static const char *startup_source =
 " id_70"
 " ctx_44)"
 " ctx_44)))"
-"(let-values(((temp49_1)"
-"(let-values(((pre-id51_0)"
+"(let-values(((temp51_1)"
+"(let-values(((pre-id53_0)"
 " pre-id_0)"
-"((intdef52_0)"
+"((intdef54_0)"
 " intdef_0)"
-"((temp53_2)"
+"((temp55_1)"
 " #t))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
-" temp53_2"
-" pre-id51_0"
-" intdef52_0)))"
-"((extra-intdefs50_0)"
+" temp55_1"
+" pre-id53_0"
+" intdef54_0)))"
+"((extra-intdefs52_0)"
 " extra-intdefs_0))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
-" temp49_1"
-" extra-intdefs50_0))))"
+" temp51_1"
+" extra-intdefs52_0))))"
 " fold-var_241))))"
 "(values"
 " fold-var_242)))))"
@@ -40979,22 +41001,22 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(let-values(((intdef-id54_0)"
+"(let-values(((intdef-id56_0)"
 " intdef-id_0)"
-"((phase55_0)"
+"((phase57_0)"
 " phase_7)"
-"((temp56_2)"
+"((temp58_1)"
 "(root-expand-context-counter"
 " ctx_44))"
-"((temp57_0)"
+"((temp59_3)"
 "(internal-definition-context-frame-id"
 " intdef_0)))"
 "(add-local-binding!37.1"
-" temp57_0"
+" temp59_3"
 " #f"
-" intdef-id54_0"
-" phase55_0"
-" temp56_2)))"
+" intdef-id56_0"
+" phase57_0"
+" temp58_1)))"
 " fold-var_179))))"
 "(values"
 " fold-var_244)))))"
@@ -41012,14 +41034,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((input-s_0)"
 "(flip-introduction-scopes"
-"(let-values(((s58_0) s_423)"
-"((all-intdefs59_0)"
+"(let-values(((s60_0) s_423)"
+"((all-intdefs61_0)"
 " all-intdefs_0))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
-" s58_0"
-" all-intdefs59_0))"
+" s60_0"
+" all-intdefs61_0))"
 " ctx_44)))"
 "(let-values(((tmp-env_0)"
 "(let-values(((lst_288) syms_20)"
@@ -41101,20 +41123,20 @@ static const char *startup_source =
 " 'syntax-local-bind-syntaxes"
 " input-s_0"
 " ids_25"
-"(let-values(((temp60_2)"
+"(let-values(((temp62_2)"
 "(let-values(((v_77)"
 " ctx_44))"
 "(let-values(((the-struct_65)"
 " v_77))"
 "(if(expand-context/outer?"
 " the-struct_65)"
-"(let-values(((env63_0)"
+"(let-values(((env65_0)"
 " tmp-env_0)"
-"((inner64_0)"
+"((inner66_0)"
 "(root-expand-context/outer-inner"
 " v_77)))"
 "(expand-context/outer1.1"
-" inner64_0"
+" inner66_0"
 "(root-expand-context/outer-post-expansion"
 " the-struct_65)"
 "(root-expand-context/outer-use-site-scopes"
@@ -41123,7 +41145,7 @@ static const char *startup_source =
 " the-struct_65)"
 "(expand-context/outer-context"
 " the-struct_65)"
-" env63_0"
+" env65_0"
 "(expand-context/outer-scopes"
 " the-struct_65)"
 "(expand-context/outer-def-ctx-scopes"
@@ -41146,19 +41168,20 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                                                                \"expand-context/outer?\""
 " the-struct_65)))))"
-"((temp61_1)"
+"((temp63_2)"
 " 'expression)"
-"((all-intdefs62_0)"
+"((all-intdefs64_0)"
 " all-intdefs_0))"
-"(make-local-expand-context42.1"
-" temp61_1"
-" all-intdefs62_0"
+"(make-local-expand-context44.1"
+" temp63_2"
+" #t"
+" all-intdefs64_0"
 " #t"
 " unsafe-undefined"
 " #f"
 " #f"
 " #f"
-" temp60_2)))))"
+" temp62_2)))))"
 "(begin"
 "(let-values(((obs_32)"
 "(expand-context-observer"
@@ -41370,10 +41393,10 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                  (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)"
+"(let-values(((s67_0) s_37)"
+"((intdef68_0) intdef_4)"
+"((temp69_0) #t)"
+"((temp70_0)"
 "(let-values(((tmp_32) mode_13))"
 "(if(equal? tmp_32 'add)"
 "(let-values() add-scope)"
@@ -41386,7 +41409,7 @@ static const char *startup_source =
 " 'internal-definition-context-introduce"
 "                                                       \"(or/c 'add 'remove 'flip)\""
 " mode_13))))))))"
-"(add-intdef-scopes24.1 temp68_1 temp67_1 s65_0 intdef66_0)))))))))))"
+"(add-intdef-scopes24.1 temp70_0 temp69_0 s67_0 intdef68_0)))))))))))"
 "(case-lambda"
 "((intdef_5 s_207)"
 "(begin 'internal-definition-context-introduce(internal-definition-context-introduce16_0 intdef_5 s_207 'flip)))"
@@ -41583,25 +41606,27 @@ static const char *startup_source =
 " s_426"
 " x_80)))))))))))"
 "(define-values"
-"(make-local-expand-context42.1)"
+"(make-local-expand-context44.1)"
 "(lambda(context27_0"
+" extend-stops?31_0"
 " intdefs29_0"
-" keep-#%expression?33_0"
+" keep-#%expression?34_0"
 " phase28_1"
 " stop-ids30_0"
-" to-parsed-ok?31_0"
-" track-to-be-defined?32_0"
-" ctx41_0)"
+" to-parsed-ok?32_0"
+" track-to-be-defined?33_0"
+" ctx43_0)"
 "(begin"
-" 'make-local-expand-context42"
-"(let-values(((ctx_45) ctx41_0))"
+" 'make-local-expand-context44"
+"(let-values(((ctx_45) ctx43_0))"
 "(let-values(((context_9) context27_0))"
-"(let-values(((phase_110)(if(eq? phase28_1 unsafe-undefined)(expand-context-phase ctx_45) phase28_1)))"
+"(let-values(((phase_111)(if(eq? phase28_1 unsafe-undefined)(expand-context-phase ctx_45) phase28_1)))"
 "(let-values(((intdefs_2) intdefs29_0))"
 "(let-values(((stop-ids_1) stop-ids30_0))"
-"(let-values(((to-parsed-ok?_0) to-parsed-ok?31_0))"
-"(let-values(((track-to-be-defined?_0) track-to-be-defined?32_0))"
-"(let-values(((keep-#%expression?_1) keep-#%expression?33_0))"
+"(let-values(((extend-stops?_0) extend-stops?31_0))"
+"(let-values(((to-parsed-ok?_0) to-parsed-ok?32_0))"
+"(let-values(((track-to-be-defined?_0) track-to-be-defined?33_0))"
+"(let-values(((keep-#%expression?_1) keep-#%expression?34_0))"
 "(let-values()"
 "(let-values(((same-kind?_0)"
 "(let-values(((or-part_281)(eq? context_9(expand-context-context ctx_45))))"
@@ -41609,7 +41634,11 @@ static const char *startup_source =
 " 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)))"
+"(if stop-ids_1"
+"(if extend-stops?_0"
+"(stop-ids->all-stop-ids stop-ids_1 phase_111)"
+" stop-ids_1)"
+" null)))"
 "(let-values(((def-ctx-scopes_5)"
 "(if(expand-context-def-ctx-scopes ctx_45)"
 "(unbox(expand-context-def-ctx-scopes ctx_45))"
@@ -41617,20 +41646,21 @@ static const char *startup_source =
 "(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)"
+"(let-values(((context71_0) context_9)"
+"((env72_0)"
+"(add-intdef-bindings(expand-context-env ctx_45) intdefs_2))"
+"((use-site-scopes73_0)"
 "(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)"
+"(let-values(((or-part_283)(eq? context_9 'module-begin)))"
+"(if or-part_283 or-part_283(list? context_9)))))"
+"(let-values(((or-part_284)"
 "(root-expand-context-use-site-scopes ctx_45)))"
-"(if or-part_283 or-part_283(box null)))"
+"(if or-part_284 or-part_284(box null)))"
 " #f))"
-"((frame-id72_0)"
-"(let-values(((x_5)"
+"((frame-id74_0)"
+"(let-values(((x_81)"
 "(let-values(((a_55) intdefs_2))"
 "(if(list? a_55)"
 "(let-values()(reverse$1 a_55))"
@@ -41639,7 +41669,7 @@ static const char *startup_source =
 "(let-values()(list a_55)))))))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_258)"
+"((letrec-values(((for-loop_59)"
 "(lambda(frame-id_9 a_56)"
 "(begin"
 " 'for-loop"
@@ -41664,28 +41694,28 @@ static const char *startup_source =
 "(let-values()"
 " 'all)"
 "(let-values()"
-"(let-values(((or-part_284)"
+"(let-values(((or-part_285)"
 " frame-id_11))"
-"(if or-part_284"
-" or-part_284"
+"(if or-part_285"
+" or-part_285"
 " i-frame-id_0))))))))"
 "(values"
 " frame-id_12)))))"
 "(if(not #f)"
-"(for-loop_258"
+"(for-loop_59"
 " frame-id_10"
 "(cdr a_56))"
 " frame-id_10)))"
 " frame-id_9)))))"
-" for-loop_258)"
+" for-loop_59)"
 "(root-expand-context-frame-id ctx_45)"
-" x_5))))"
-"((post-expansion73_0)"
+" x_81))))"
+"((post-expansion75_0)"
 "(let-values(((pe_2)"
 "(if same-kind?_0"
-"(if(let-values(((or-part_285)(pair? context_9)))"
-"(if or-part_285"
-" or-part_285"
+"(if(let-values(((or-part_286)(pair? context_9)))"
+"(if or-part_286"
+" or-part_286"
 "(memq"
 " context_9"
 " '(module module-begin top-level))))"
@@ -41694,59 +41724,59 @@ static const char *startup_source =
 " #f)))"
 "(if(if intdefs_2(not(null? intdefs_2)) #f)"
 "(let-values()"
-"(lambda(s_225)"
+"(lambda(s_429)"
 "(begin"
-" 'post-expansion73"
-"(let-values(((temp79_0)(apply-post-expansion pe_2 s_225))"
-"((intdefs80_0) intdefs_2))"
+" 'post-expansion75"
+"(let-values(((temp81_0)"
+"(apply-post-expansion pe_2 s_429))"
+"((intdefs82_0) intdefs_2))"
 "(add-intdef-scopes24.1"
 " unsafe-undefined"
 " #f"
-" temp79_0"
-" intdefs80_0)))))"
+" temp81_0"
+" intdefs82_0)))))"
 "(let-values() pe_2))))"
-"((scopes74_0)(append def-ctx-scopes_5(expand-context-scopes ctx_45)))"
-"((only-immediate?75_0)(not stop-ids_1))"
-"((current-introduction-scopes76_0) null)"
-"((need-eventually-defined77_0)"
+"((scopes76_0)"
+"(append def-ctx-scopes_5(expand-context-scopes ctx_45)))"
+"((only-immediate?77_0)(not stop-ids_1))"
+"((current-introduction-scopes78_0) null)"
+"((need-eventually-defined79_0)"
 "(let-values(((ht_135)"
 "(expand-context-need-eventually-defined ctx_45)))"
 "(if track-to-be-defined?_0"
 "(let-values() ht_135)"
 "(if ht_135(let-values()(make-hasheqv))(let-values() #f)))))"
-"((inner78_0)"
+"((inner80_0)"
 "(let-values(((the-struct_67)"
 "(root-expand-context/outer-inner v_194)))"
 "(if(expand-context/inner? the-struct_67)"
-"(let-values(((to-parsed?81_0)"
+"(let-values(((to-parsed?83_0)"
 "(if to-parsed-ok?_0"
 "(expand-context-to-parsed? ctx_45)"
 " #f))"
-"((just-once?82_0) #f)"
-"((in-local-expand?83_0) #t)"
-"((keep-#%expression?84_0) keep-#%expression?_1)"
-"((stops85_0)"
-"(free-id-set"
-" phase_110"
-"(let-values(((or-part_286) all-stop-ids_0))"
-"(if or-part_286 or-part_286 null)))))"
+"((just-once?84_0) #f)"
+"((in-local-expand?85_0) #t)"
+"((keep-#%expression?86_0) keep-#%expression?_1)"
+"((stops87_0)"
+"(free-id-set phase_111 all-stop-ids_0)))"
 "(expand-context/inner2.1"
 "(root-expand-context/inner-self-mpi the-struct_67)"
 "(root-expand-context/inner-module-scopes the-struct_67)"
-"(root-expand-context/inner-top-level-bind-scope the-struct_67)"
+"(root-expand-context/inner-top-level-bind-scope"
+" the-struct_67)"
 "(root-expand-context/inner-all-scopes-stx the-struct_67)"
 "(root-expand-context/inner-defined-syms the-struct_67)"
 "(root-expand-context/inner-counter the-struct_67)"
 "(root-expand-context/inner-lift-key the-struct_67)"
-" to-parsed?81_0"
+" to-parsed?83_0"
 "(expand-context/inner-phase the-struct_67)"
 "(expand-context/inner-namespace the-struct_67)"
-" just-once?82_0"
+" just-once?84_0"
 "(expand-context/inner-module-begin-k the-struct_67)"
 "(expand-context/inner-allow-unbound? the-struct_67)"
-" in-local-expand?83_0"
-" keep-#%expression?84_0"
-" stops85_0"
+" in-local-expand?85_0"
+" keep-#%expression?86_0"
+" stops87_0"
 "(expand-context/inner-declared-submodule-names the-struct_67)"
 "(expand-context/inner-lifts the-struct_67)"
 "(expand-context/inner-lift-envs the-struct_67)"
@@ -41760,61 +41790,61 @@ static const char *startup_source =
 " the-struct_67)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                       \"expand-context/inner?\""
+"                                                         \"expand-context/inner?\""
 " the-struct_67)))))"
 "(expand-context/outer1.1"
-" inner78_0"
-" post-expansion73_0"
-" use-site-scopes71_0"
-" frame-id72_0"
-" context69_0"
-" env70_0"
-" scopes74_0"
+" inner80_0"
+" post-expansion75_0"
+" use-site-scopes73_0"
+" frame-id74_0"
+" context71_0"
+" env72_0"
+" scopes76_0"
 "(expand-context/outer-def-ctx-scopes the-struct_66)"
 "(expand-context/outer-binding-layer the-struct_66)"
 "(expand-context/outer-reference-records the-struct_66)"
-" only-immediate?75_0"
-" need-eventually-defined77_0"
-" current-introduction-scopes76_0"
+" only-immediate?77_0"
+" need-eventually-defined79_0"
+" current-introduction-scopes78_0"
 "(expand-context/outer-current-use-scopes the-struct_66)"
 "(expand-context/outer-name the-struct_66)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                     \"expand-context/outer?\""
-" the-struct_66)))))))))))))))))))"
+"                                       \"expand-context/outer?\""
+" the-struct_66))))))))))))))))))))"
 "(define-values"
 "(flip-introduction-scopes)"
-"(lambda(s_429 ctx_46)(begin(flip-scopes s_429(expand-context-current-introduction-scopes ctx_46)))))"
+"(lambda(s_430 ctx_46)(begin(flip-scopes s_430(expand-context-current-introduction-scopes ctx_46)))))"
 "(define-values"
 "(flip-introduction-and-use-scopes)"
-"(lambda(s_229 ctx_47)"
-"(begin(flip-scopes(flip-introduction-scopes s_229 ctx_47)(expand-context-current-use-scopes ctx_47)))))"
+"(lambda(s_231 ctx_47)"
+"(begin(flip-scopes(flip-introduction-scopes s_231 ctx_47)(expand-context-current-use-scopes ctx_47)))))"
 "(define-values"
 "(1/syntax-transforming?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming?"
-"(if(let-values(((temp55_1) #t))(get-current-expand-context16.1 temp55_1 'unexpected)) #t #f))))"
+"(if(let-values(((temp55_2) #t))(get-current-expand-context16.1 temp55_2 'unexpected)) #t #f))))"
 "(define-values"
 "(1/syntax-transforming-with-lifts?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming-with-lifts?"
-"(let-values(((ctx_48)(let-values(((temp56_3) #t))(get-current-expand-context16.1 temp56_3 'unexpected))))"
+"(let-values(((ctx_48)(let-values(((temp56_2) #t))(get-current-expand-context16.1 temp56_2 'unexpected))))"
 "(if ctx_48(if(expand-context-lifts ctx_48) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-transforming-module-expression?)"
 "(lambda()"
 "(begin"
 " 'syntax-transforming-module-expression?"
-"(let-values(((ctx_49)(let-values(((temp57_1) #t))(get-current-expand-context16.1 temp57_1 'unexpected))))"
+"(let-values(((ctx_49)(let-values(((temp57_0) #t))(get-current-expand-context16.1 temp57_0 'unexpected))))"
 "(if ctx_49(if(expand-context-to-module-lifts ctx_49) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-local-transforming-module-provides?)"
 "(lambda()"
 "(begin"
 " 'syntax-local-transforming-module-provides?"
-"(let-values(((ctx_50)(let-values(((temp58_1) #t))(get-current-expand-context16.1 temp58_1 'unexpected))))"
+"(let-values(((ctx_50)(let-values(((temp58_2) #t))(get-current-expand-context16.1 temp58_2 'unexpected))))"
 "(if ctx_50(if(expand-context-requires+provides ctx_50) #t #f) #f)))))"
 "(define-values"
 "(1/syntax-local-context)"
@@ -41822,25 +41852,25 @@ static const char *startup_source =
 "(begin"
 " 'syntax-local-context"
 "(let-values(((ctx_51)"
-"(let-values(((temp59_3) 'syntax-local-context))(get-current-expand-context16.1 #f temp59_3))))"
+"(let-values(((temp59_4) 'syntax-local-context))(get-current-expand-context16.1 #f temp59_4))))"
 "(expand-context-context ctx_51)))))"
 "(define-values"
 "(1/syntax-local-introduce)"
-"(lambda(s_430)"
+"(lambda(s_431)"
 "(begin"
 " 'syntax-local-introduce"
 "(let-values()"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_430)"
+"(if(syntax?$1 s_431)"
 "(void)"
-"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_430)))"
+"                            (let-values () (raise-argument-error 'syntax-local-introduce \"syntax?\" s_431)))"
 "(values))))"
 "(let-values(((ctx_9)"
-"(let-values(((temp61_2) 'syntax-local-introduce))"
-"(get-current-expand-context16.1 #f temp61_2))))"
-"(flip-introduction-and-use-scopes s_430 ctx_9))))))))"
+"(let-values(((temp61_1) 'syntax-local-introduce))"
+"(get-current-expand-context16.1 #f temp61_1))))"
+"(flip-introduction-and-use-scopes s_431 ctx_9))))))))"
 "(define-values"
 "(1/syntax-local-identifier-as-binding)"
 "(lambda(id_76)"
@@ -41856,8 +41886,8 @@ static const char *startup_source =
 "                              (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))))"
+"(let-values(((temp63_3) 'syntax-local-identifier-as-binding))"
+"(get-current-expand-context16.1 #f temp63_3))))"
 "(remove-use-site-scopes id_76 ctx_52))))))))"
 "(define-values"
 "(1/syntax-local-phase-level)"
@@ -41908,20 +41938,20 @@ static const char *startup_source =
 "(lambda(s69_0 mode68_0)"
 "(begin"
 " 'core70"
-"(let-values(((s_431) s69_0))"
+"(let-values(((s_432) s69_0))"
 "(let-values(((mode_14) mode68_0))"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_431)"
+"(if(syntax?$1 s_432)"
 "(void)"
-"                                  (let-values () (raise-argument-error 'syntax-introducer \"syntax?\" s_431)))"
+"                                  (let-values () (raise-argument-error 'syntax-introducer \"syntax?\" s_432)))"
 "(let-values(((tmp_33) mode_14))"
 "(if(equal? tmp_33 'add)"
-"(let-values()(add-scope s_431 sc_34))"
+"(let-values()(add-scope s_432 sc_34))"
 "(if(equal? tmp_33 'remove)"
-"(let-values()(remove-scope s_431 sc_34))"
+"(let-values()(remove-scope s_432 sc_34))"
 "(if(equal? tmp_33 'flip)"
-"(let-values()(flip-scope s_431 sc_34))"
+"(let-values()(flip-scope s_432 sc_34))"
 "(let-values()"
 "(raise-argument-error"
 " 'syntax-introducer"
@@ -42065,13 +42095,13 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if((lambda(x_81)"
-"(let-values(((or-part_210)(not x_81)))"
+"(if((lambda(x_82)"
+"(let-values(((or-part_210)(not x_82)))"
 "(if or-part_210"
 " or-part_210"
 "((lambda(p_50)"
 "(if(procedure? p_50)(procedure-arity-includes? p_50 0) #f))"
-" x_81))))"
+" x_82))))"
 " failure-thunk_0)"
 "(void)"
 "(let-values()"
@@ -42128,7 +42158,7 @@ static const char *startup_source =
 "(let-values()(call-expand-observe obs_34 'local-value id_78)))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_72)(expand-context-phase ctx_11)))"
+"(let-values(((phase_73)(expand-context-phase ctx_11)))"
 "((letrec-values(((loop_98)"
 "(lambda(id_62)"
 "(begin"
@@ -42136,7 +42166,7 @@ static const char *startup_source =
 "(let-values(((b_83)"
 "(if immediate?_1"
 "(let-values(((id84_0) id_62)"
-"((phase85_0) phase_72)"
+"((phase85_0) phase_73)"
 "((temp86_0) #t))"
 "(resolve+shift28.1"
 " #f"
@@ -42148,7 +42178,7 @@ static const char *startup_source =
 " phase85_0))"
 "(resolve+shift/extra-inspector"
 " id_62"
-" phase_72"
+" phase_73"
 "(expand-context-namespace ctx_11)))))"
 "(begin"
 "(let-values(((obs_35)(expand-context-observer ctx_11)))"
@@ -42174,7 +42204,7 @@ static const char *startup_source =
 "(failure-thunk_0)"
 "                                                                  (error who_19 \"unbound identifier: ~v\" id_62))))"
 "(let-values()"
-"(let-values(((v_39 primitive?_7 insp_17 protected?_8)"
+"(let-values(((v_40 primitive?_7 insp_17 protected?_8)"
 "(let-values(((b87_0) b_83)"
 "((ctx88_0) ctx_11)"
 "((id89_0) id_62)"
@@ -42185,8 +42215,8 @@ static const char *startup_source =
 " b87_0"
 " ctx88_0"
 " id89_0))))"
-"(if(let-values(((or-part_101)(variable? v_39)))"
-"(if or-part_101 or-part_101(core-form? v_39)))"
+"(if(let-values(((or-part_101)(variable? v_40)))"
+"(if or-part_101 or-part_101(core-form? v_40)))"
 "(let-values()"
 "(begin"
 "(let-values(((obs_37)"
@@ -42212,7 +42242,7 @@ static const char *startup_source =
 "(if obs_38"
 "(let-values()"
 "(if(not"
-"(if(1/rename-transformer? v_39)"
+"(if(1/rename-transformer? v_40)"
 "(not immediate?_1)"
 " #f))"
 "(let-values()"
@@ -42222,17 +42252,17 @@ static const char *startup_source =
 " #t))"
 "(void)))"
 "(void)))"
-"(if(1/rename-transformer? v_39)"
+"(if(1/rename-transformer? v_40)"
 "(let-values()"
 "(if immediate?_1"
 "(values"
-" v_39"
-"(1/rename-transformer-target v_39))"
+" v_40"
+"(1/rename-transformer-target v_40))"
 "(loop_98"
-"(1/rename-transformer-target v_39))))"
+"(1/rename-transformer-target v_40))))"
 "(if immediate?_1"
-"(let-values()(values v_39 #f))"
-"(let-values() v_39)))))))))))))))"
+"(let-values()(values v_40 #f))"
+"(let-values() v_40)))))))))))))))"
 " loop_98)"
 "(flip-introduction-scopes id_78 ctx_11))))))))))))))))))"
 "(define-values"
@@ -42400,9 +42430,9 @@ static const char *startup_source =
 "(let-values(((ctx_57)"
 "(let-values(((who107_0) 'syntax-local-lift-module))"
 "(get-current-expand-context16.1 #f who107_0))))"
-"(let-values(((phase_102)(expand-context-phase ctx_57)))"
+"(let-values(((phase_103)(expand-context-phase ctx_57)))"
 "(begin"
-"(let-values(((tmp_30)(core-form-sym s_64 phase_102)))"
+"(let-values(((tmp_30)(core-form-sym s_64 phase_103)))"
 "(if(if(equal? tmp_30 'module) #t(equal? tmp_30 'module*))"
 "(let-values()"
 "(let-values(((lifts_9)(expand-context-module-lifts ctx_57)))"
@@ -42415,7 +42445,7 @@ static const char *startup_source =
 "                                 \"not currently transforming within a module declaration or top level\""
 "                                 \"form to lift\""
 " s_64)))"
-"(add-lifted-module! lifts_9(flip-introduction-scopes s_64 ctx_57) phase_102))))"
+"(add-lifted-module! lifts_9(flip-introduction-scopes s_64 ctx_57) phase_103))))"
 "(let-values()"
 "                        (raise-arguments-error 'syntax-local-lift-module \"not a module form\" \"given form\" s_64))))"
 "(let-values(((obs_40)(expand-context-observer ctx_57)))"
@@ -42438,7 +42468,7 @@ static const char *startup_source =
 "(begin"
 " 'do-local-lift-to-module48"
 "(let-values(((who_21) who46_0))"
-"(let-values(((s_432) s47_0))"
+"(let-values(((s_433) s47_0))"
 "(let-values(((no-target-msg_0) no-target-msg28_0))"
 "(let-values(((intro?_0) intro?29_0))"
 "(let-values(((more-checks_0)(if(eq? more-checks30_0 unsafe-undefined) void more-checks30_0)))"
@@ -42447,11 +42477,11 @@ static const char *startup_source =
 "(let-values(((get-wrt-phase_0) get-wrt-phase33_0))"
 "(let-values(((pre-wrap_0)"
 "(if(eq? pre-wrap34_0 unsafe-undefined)"
-"(lambda(s_433 phase_111 lift-ctx_1)(begin 'pre-wrap s_433))"
+"(lambda(s_434 phase_112 lift-ctx_1)(begin 'pre-wrap s_434))"
 " pre-wrap34_0)))"
 "(let-values(((shift-wrap_0)"
 "(if(eq? shift-wrap35_0 unsafe-undefined)"
-"(lambda(s_210 phase_112 lift-ctx_2)(begin 'shift-wrap s_210))"
+"(lambda(s_210 phase_113 lift-ctx_2)(begin 'shift-wrap s_210))"
 " shift-wrap35_0)))"
 "(let-values(((post-wrap_0)"
 "(if(eq? post-wrap36_0 unsafe-undefined)"
@@ -42460,9 +42490,9 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(if(syntax?$1 s_432)"
+"(if(syntax?$1 s_433)"
 "(void)"
-"                                                (let-values () (raise-argument-error who_21 \"syntax?\" s_432)))"
+"                                                (let-values () (raise-argument-error who_21 \"syntax?\" s_433)))"
 "(values))))"
 "(let-values((()(begin(more-checks_0)(values))))"
 "(let-values(((ctx_58)"
@@ -42478,15 +42508,15 @@ static const char *startup_source =
 " who_21"
 " no-target-msg_0"
 "                                                           \"form to lift\""
-" s_432)))"
+" s_433)))"
 "(values))))"
-"(let-values(((phase_90)(expand-context-phase ctx_58)))"
+"(let-values(((phase_91)(expand-context-phase ctx_58)))"
 "(let-values(((wrt-phase_1)(get-wrt-phase_0 lift-ctx_4)))"
 "(let-values(((added-s_0)"
-"(if intro?_0(flip-introduction-scopes s_432 ctx_58) s_432)))"
-"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_90 lift-ctx_4)))"
+"(if intro?_0(flip-introduction-scopes s_433 ctx_58) s_433)))"
+"(let-values(((pre-s_0)(pre-wrap_0 added-s_0 phase_91 lift-ctx_4)))"
 "(let-values(((shift-s_0)"
-"(let-values(((start_40) phase_90)"
+"(let-values(((start_40) phase_91)"
 "((end_30) wrt-phase_1)"
 "((inc_24) -1))"
 "(begin"
@@ -42496,30 +42526,30 @@ static const char *startup_source =
 "(let-values()"
 "(check-range start_40 end_30 inc_24)))"
 "((letrec-values(((for-loop_131)"
-"(lambda(s_434 pos_107)"
+"(lambda(s_435 pos_107)"
 "(begin"
 " 'for-loop"
 "(if(> pos_107 end_30)"
-"(let-values(((phase_113)"
+"(let-values(((phase_114)"
 " pos_107))"
 "(let-values(((s_321)"
-"(let-values(((s_435)"
-" s_434))"
 "(let-values(((s_436)"
+" s_435))"
+"(let-values(((s_437)"
 "(let-values()"
 "(shift-wrap_0"
-" s_435"
+" s_436"
 "(sub1"
-" phase_113)"
+" phase_114)"
 " lift-ctx_4))))"
 "(values"
-" s_436)))))"
+" s_437)))))"
 "(if(not #f)"
 "(for-loop_131"
 " s_321"
 "(+ pos_107 inc_24))"
 " s_321)))"
-" s_434)))))"
+" s_435)))))"
 " for-loop_131)"
 " pre-s_0"
 " start_40)))))"
@@ -42551,11 +42581,11 @@ static const char *startup_source =
 "((require-lift-context-wrt-phase116_0) require-lift-context-wrt-phase)"
 "((add-lifted-require!117_0) add-lifted-require!)"
 "((temp118_0)"
-"(lambda(s_110 phase_114 require-lift-ctx_0)"
+"(lambda(s_110 phase_115 require-lift-ctx_0)"
 "(require-spec-shift-for-syntax s_110)))"
 "((temp119_0)"
-"(lambda(s_437 phase_115 require-lift-ctx_1)"
-"(wrap-form '#%require(add-scope s_437 sc_35) phase_115))))"
+"(lambda(s_438 phase_116 require-lift-ctx_1)"
+"(wrap-form '#%require(add-scope s_438 sc_35) phase_116))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-require!117_0"
 " expand-context-require-lifts115_0"
@@ -42597,10 +42627,10 @@ 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_438 phase_116 to-module-lift-ctx_0)(wrap-form 'for-syntax s_438 #f)))"
+"(lambda(s_439 phase_117 to-module-lift-ctx_0)(wrap-form 'for-syntax s_439 #f)))"
 "((temp128_2)"
-"(lambda(s_116 phase_117 to-module-lift-ctx_1)"
-"(wrap-form '#%provide s_116 phase_117))))"
+"(lambda(s_116 phase_118 to-module-lift-ctx_1)"
+"(wrap-form '#%provide s_116 phase_118))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-to-module-provide!126_0"
 " expand-context-to-module-lifts124_0"
@@ -42633,13 +42663,13 @@ static const char *startup_source =
 "((temp134_1)(lambda(lift-ctx_5) 0))"
 "((add-lifted-to-module-end!135_0) add-lifted-to-module-end!)"
 "((temp136_0)"
-"(lambda(orig-s_32 phase_118 to-module-lift-ctx_2)"
+"(lambda(orig-s_32 phase_119 to-module-lift-ctx_2)"
 "(if(to-module-lift-context-end-as-expressions? to-module-lift-ctx_2)"
-"(wrap-form '#%expression orig-s_32 phase_118)"
+"(wrap-form '#%expression orig-s_32 phase_119)"
 " orig-s_32)))"
 "((temp137_1)"
-"(lambda(s_439 phase_119 to-module-lift-ctx_3)"
-"(wrap-form 'begin-for-syntax s_439 phase_119))))"
+"(lambda(s_440 phase_120 to-module-lift-ctx_3)"
+"(wrap-form 'begin-for-syntax s_440 phase_120))))"
 "(do-local-lift-to-module48.1"
 " add-lifted-to-module-end!135_0"
 " expand-context-to-module-lifts133_0"
@@ -42658,11 +42688,11 @@ static const char *startup_source =
 "(void)))))))))"
 "(define-values"
 "(wrap-form)"
-"(lambda(sym_74 s_124 phase_120)"
+"(lambda(sym_74 s_124 phase_121)"
 "(begin"
 "(datum->syntax$1"
 " #f"
-"(list(datum->syntax$1(if phase_120(syntax-shift-phase-level$1 core-stx phase_120) #f) sym_74) s_124)))))"
+"(list(datum->syntax$1(if phase_121(syntax-shift-phase-level$1 core-stx phase_121) #f) sym_74) s_124)))))"
 "(define-values"
 "(1/syntax-local-module-defined-identifiers)"
 "(lambda()"
@@ -42738,12 +42768,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_259)"
+"((letrec-values(((for-loop_258)"
 "(lambda(fold-var_257 i_161)"
 "(begin"
 " 'for-loop"
 "(if i_161"
-"(let-values(((phase_121 ids_28)"
+"(let-values(((phase_122 ids_28)"
 "(hash-iterate-key+value ht_136 i_161)))"
 "(let-values(((fold-var_207)"
 "(let-values(((fold-var_258) fold-var_257))"
@@ -42751,16 +42781,16 @@ static const char *startup_source =
 "(let-values()"
 "(cons"
 "(let-values()"
-"(cons phase_121 ids_28))"
+"(cons phase_122 ids_28))"
 " fold-var_258))))"
 "(values fold-var_259)))))"
 "(if(not #f)"
-"(for-loop_259"
+"(for-loop_258"
 " fold-var_207"
 "(hash-iterate-next ht_136 i_161))"
 " fold-var_207)))"
 " fold-var_257)))))"
-" for-loop_259)"
+" for-loop_258)"
 " null"
 "(hash-iterate-first ht_136)))))"
 " #f)))))))))))))"
@@ -42837,12 +42867,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_141)))"
-"((letrec-values(((for-loop_260)"
+"((letrec-values(((for-loop_259)"
 "(lambda(fold-var_260 i_162)"
 "(begin"
 " 'for-loop"
 "(if i_162"
-"(let-values(((phase_122 syms_21)"
+"(let-values(((phase_123 syms_21)"
 "(hash-iterate-key+value ht_141 i_162)))"
 "(let-values(((fold-var_261)"
 "(let-values(((fold-var_262) fold-var_260))"
@@ -42851,7 +42881,7 @@ static const char *startup_source =
 "(cons"
 "(let-values()"
 "(cons"
-" phase_122"
+" phase_123"
 "(reverse$1"
 "(let-values(((ht_142)"
 " syms_21))"
@@ -42862,7 +42892,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash-keys"
 " ht_142)))"
-"((letrec-values(((for-loop_261)"
+"((letrec-values(((for-loop_260)"
 "(lambda(fold-var_264"
 " i_12)"
 "(begin"
@@ -42885,24 +42915,24 @@ static const char *startup_source =
 " fold-var_267)))))"
 "(if(not"
 " #f)"
-"(for-loop_261"
+"(for-loop_260"
 " fold-var_265"
 "(hash-iterate-next"
 " ht_142"
 " i_12))"
 " fold-var_265)))"
 " fold-var_264)))))"
-" for-loop_261)"
+" for-loop_260)"
 " null"
 "(hash-iterate-first"
 " ht_142)))))))"
 " fold-var_262))))"
 "(values fold-var_263)))))"
 "(if(not #f)"
-"(for-loop_260 fold-var_261(hash-iterate-next ht_141 i_162))"
+"(for-loop_259 fold-var_261(hash-iterate-next ht_141 i_162))"
 " fold-var_261)))"
 " fold-var_260)))))"
-" for-loop_260)"
+" for-loop_259)"
 " null"
 "(hash-iterate-first ht_141))))))))))))))))"
 "(define-values"
@@ -42922,7 +42952,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_262)"
+"((letrec-values(((for-loop_261)"
 "(lambda(fold-var_268 i_163)"
 "(begin"
 " 'for-loop"
@@ -42940,10 +42970,10 @@ static const char *startup_source =
 "(values fold-var_272)))"
 " fold-var_270))))"
 "(if(not #f)"
-"(for-loop_262 fold-var_269(hash-iterate-next ht_143 i_163))"
+"(for-loop_261 fold-var_269(hash-iterate-next ht_143 i_163))"
 " fold-var_269)))"
 " fold-var_268)))))"
-" for-loop_262)"
+" for-loop_261)"
 " null"
 "(hash-iterate-first ht_143))))))))))))"
 "(define-values"
@@ -42992,10 +43022,10 @@ static const char *startup_source =
 "(define-values(1/syntax-span)(syntax-source-accessor 'syntax-span srcloc-span))"
 "(define-values"
 "(encoded-srcloc?)"
-"(lambda(v_71)"
+"(lambda(v_72)"
 "(begin"
-"(let-values(((or-part_26)(if(list? v_71)(if(=(length v_71) 5)(srcloc-vector?(list->vector v_71)) #f) #f)))"
-"(if or-part_26 or-part_26(if(vector? v_71)(if(=(vector-length v_71) 5)(srcloc-vector? v_71) #f) #f))))))"
+"(let-values(((or-part_26)(if(list? v_72)(if(=(length v_72) 5)(srcloc-vector?(list->vector v_72)) #f) #f)))"
+"(if or-part_26 or-part_26(if(vector? v_72)(if(=(vector-length v_72) 5)(srcloc-vector? v_72) #f) #f))))))"
 "(define-values"
 "(srcloc-vector?)"
 "(lambda(v_73)"
@@ -43082,7 +43112,7 @@ static const char *startup_source =
 "(begin"
 " 'datum->syntax6"
 "(let-values(((stx-c_4) stx-c4_1))"
-"(let-values(((s_440) s5_2))"
+"(let-values(((s_441) s5_2))"
 "(let-values(((stx-l_2) stx-l1_0))"
 "(let-values(((stx-p_1) stx-p2_0))"
 "(let-values()"
@@ -43120,22 +43150,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_440(to-srcloc-stx stx-l_2) stx-p_1))))))))))))))"
+"(datum->syntax$1 stx-c_4 s_441(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_441 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_441 stx-l_4 stx-p2_1 #f))"
+"((stx-c_7 s_442 stx-l_4 stx-p2_1)(datum->syntax6_1 stx-c_7 s_442 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_442)"
+"(lambda(s_443)"
 "(begin"
 " 'syntax->list"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_442) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_442)))"
-"(syntax->list$1 s_442)))))))"
+"            (if (syntax?$1 s_443) (void) (let-values () (raise-argument-error 'syntax->list \"syntax?\" s_443)))"
+"(syntax->list$1 s_443)))))))"
 "(define-values"
 "(1/syntax-original?)"
 "(lambda(s_167)"
@@ -43154,7 +43184,7 @@ static const char *startup_source =
 " 'bound-identifier=?11"
 "(let-values(((a_57) a9_0))"
 "(let-values(((b_65) b10_0))"
-"(let-values(((phase_123)"
+"(let-values(((phase_124)"
 "(if(eq? phase8_0 unsafe-undefined)(1/syntax-local-phase-level) phase8_0)))"
 "(let-values()"
 "(let-values()"
@@ -43166,10 +43196,10 @@ static const char *startup_source =
 "(if(identifier? b_65)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'bound-identifier=? \"identifier?\" b_65)))"
-"(if(phase? phase_123)"
+"(if(phase? phase_124)"
 "(void)"
-"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_123)))"
-"(bound-identifier=?$1 a_57 b_65 phase_123))))))))))))"
+"(let-values()(raise-argument-error 'bound-identifier=? phase?-string phase_124)))"
+"(bound-identifier=?$1 a_57 b_65 phase_124))))))))))))"
 "(case-lambda"
 "((a_58 b_84)(begin 'bound-identifier=?(bound-identifier=?11_0 a_58 b_84 unsafe-undefined)))"
 "((a_59 b_85 phase8_1)(bound-identifier=?11_0 a_59 b_85 phase8_1)))))"
@@ -43224,8 +43254,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-transformer-identifier=? \"identifier?\" b_89)))"
 "(values))))"
-"(let-values(((phase_124)(add1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_64 b_89 phase_124 phase_124)))))))))"
+"(let-values(((phase_125)(add1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_64 b_89 phase_125 phase_125)))))))))"
 "(define-values"
 "(1/free-template-identifier=?)"
 "(lambda(a_65 b_90)"
@@ -43245,8 +43275,8 @@ static const char *startup_source =
 "(void)"
 "                              (let-values () (raise-argument-error 'free-template-identifier=? \"identifier?\" b_90)))"
 "(values))))"
-"(let-values(((phase_125)(sub1(1/syntax-local-phase-level))))"
-"(free-identifier=?$1 a_65 b_90 phase_125 phase_125)))))))))"
+"(let-values(((phase_126)(sub1(1/syntax-local-phase-level))))"
+"(free-identifier=?$1 a_65 b_90 phase_126 phase_126)))))))))"
 "(define-values"
 "(1/free-label-identifier=?)"
 "(lambda(a_66 b_91)"
@@ -43269,7 +43299,7 @@ static const char *startup_source =
 "(begin"
 " 'identifier-binding22"
 "(let-values(((id_90) id21_0))"
-"(let-values(((phase_126)"
+"(let-values(((phase_127)"
 "(if(eq? phase19_0 unsafe-undefined)(1/syntax-local-phase-level) phase19_0)))"
 "(let-values(((top-level-symbol?_1) top-level-symbol?20_0))"
 "(let-values()"
@@ -43279,13 +43309,13 @@ static const char *startup_source =
 "(if(identifier? id_90)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'identifier-binding \"identifier?\" id_90)))"
-"(if(phase? phase_126)"
+"(if(phase? phase_127)"
 "(void)"
-"(let-values()(raise-argument-error 'identifier-binding phase?-string phase_126)))"
-"(identifier-binding$1 id_90 phase_126 top-level-symbol?_1))))))))))))"
+"(let-values()(raise-argument-error 'identifier-binding phase?-string phase_127)))"
+"(identifier-binding$1 id_90 phase_127 top-level-symbol?_1))))))))))))"
 "(case-lambda"
 "((id_91)(begin 'identifier-binding(identifier-binding22_0 id_91 unsafe-undefined #f)))"
-"((id_15 phase_85 top-level-symbol?20_1)(identifier-binding22_0 id_15 phase_85 top-level-symbol?20_1))"
+"((id_15 phase_86 top-level-symbol?20_1)(identifier-binding22_0 id_15 phase_86 top-level-symbol?20_1))"
 "((id_92 phase19_1)(identifier-binding22_0 id_92 phase19_1 #f)))))"
 "(define-values"
 "(1/identifier-transformer-binding)"
@@ -43294,7 +43324,7 @@ static const char *startup_source =
 "(begin"
 " 'identifier-transformer-binding26"
 "(let-values(((id_93) id25_3))"
-"(let-values(((phase_127)"
+"(let-values(((phase_128)"
 "(if(eq? phase24_1 unsafe-undefined)(1/syntax-local-phase-level) phase24_1)))"
 "(let-values()"
 "(let-values()"
@@ -43304,7 +43334,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                    (raise-argument-error 'identifier-transformer-binding \"identifier?\" id_93)))"
-"(identifier-binding$1 id_93(if phase_127(add1 phase_127) #f))))))))))))"
+"(identifier-binding$1 id_93(if phase_128(add1 phase_128) #f))))))))))))"
 "(case-lambda"
 "((id_94)(begin 'identifier-transformer-binding(identifier-transformer-binding26_0 id_94 unsafe-undefined)))"
 "((id_59 phase24_2)(identifier-transformer-binding26_0 id_59 phase24_2)))))"
@@ -43339,7 +43369,7 @@ static const char *startup_source =
 "(begin"
 " 'identifier-binding-symbol30"
 "(let-values(((id_96) id29_1))"
-"(let-values(((phase_72)"
+"(let-values(((phase_73)"
 "(if(eq? phase28_2 unsafe-undefined)(1/syntax-local-phase-level) phase28_2)))"
 "(let-values()"
 "(let-values()"
@@ -43348,11 +43378,11 @@ static const char *startup_source =
 "(if(identifier? id_96)"
 "(void)"
 "                                  (let-values () (raise-argument-error 'identifier-binding-symbol \"identifier?\" id_96)))"
-"(if(phase? phase_72)"
+"(if(phase? phase_73)"
 "(void)"
 "(let-values()"
-"(raise-argument-error 'identifier-binding-symbol phase?-string phase_72)))"
-"(identifier-binding-symbol$1 id_96 phase_72)))))))))))"
+"(raise-argument-error 'identifier-binding-symbol phase?-string phase_73)))"
+"(identifier-binding-symbol$1 id_96 phase_73)))))))))))"
 "(case-lambda"
 "((id_97)(begin 'identifier-binding-symbol(identifier-binding-symbol30_0 id_97 unsafe-undefined)))"
 "((id_98 phase28_3)(identifier-binding-symbol30_0 id_98 phase28_3)))))"
@@ -43390,7 +43420,7 @@ static const char *startup_source =
 "(begin"
 " 'syntax-debug-info39"
 "(let-values(((s_412) s38_1))"
-"(let-values(((phase_77)"
+"(let-values(((phase_78)"
 "(if(eq? phase36_0 unsafe-undefined)(1/syntax-local-phase-level) phase36_0)))"
 "(let-values(((all-bindings?_1) all-bindings?37_0))"
 "(let-values()"
@@ -43400,29 +43430,29 @@ static const char *startup_source =
 "(if(syntax?$1 s_412)"
 "(void)"
 "                                    (let-values () (raise-argument-error 'syntax-debug-info \"syntax?\" s_412)))"
-"(if(phase? phase_77)"
+"(if(phase? phase_78)"
 "(void)"
-"(let-values()(raise-argument-error 'syntax-debug-info phase?-string phase_77)))"
-"(syntax-debug-info$1 s_412 phase_77 all-bindings?_1))))))))))))"
+"(let-values()(raise-argument-error 'syntax-debug-info phase?-string phase_78)))"
+"(syntax-debug-info$1 s_412 phase_78 all-bindings?_1))))))))))))"
 "(case-lambda"
 "((s_86)(begin 'syntax-debug-info(syntax-debug-info39_0 s_86 unsafe-undefined #f)))"
-"((s_443 phase_128 all-bindings?37_1)(syntax-debug-info39_0 s_443 phase_128 all-bindings?37_1))"
+"((s_444 phase_129 all-bindings?37_1)(syntax-debug-info39_0 s_444 phase_129 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_444 phase_129)"
+"(lambda(s_445 phase_130)"
 "(begin"
 " 'syntax-shift-phase-level"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(if(syntax?$1 s_444)"
+"(if(syntax?$1 s_445)"
 "(void)"
-"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_444)))"
-"(if(phase? phase_129)"
+"              (let-values () (raise-argument-error 'syntax-shift-phase-level \"syntax?\" s_445)))"
+"(if(phase? phase_130)"
 "(void)"
-"(let-values()(raise-argument-error 'syntax-shift-phase-level phase?-string phase_129)))"
-"(syntax-shift-phase-level$1 s_444 phase_129)))))))"
+"(let-values()(raise-argument-error 'syntax-shift-phase-level phase?-string phase_130)))"
+"(syntax-shift-phase-level$1 s_445 phase_130)))))))"
 "(define-values"
 "(1/syntax-track-origin)"
 "(lambda(new-stx_8 old-stx_4 id_101)"
@@ -43448,18 +43478,18 @@ static const char *startup_source =
 "(void)"
 "                                (let-values () (raise-argument-error 'syntax-track-origin \"identifier?\" id_101)))"
 "(values))))"
-"(let-values(((s_445)(syntax-track-origin$1 new-stx_8 old-stx_4 id_101)))"
+"(let-values(((s_446)(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))))"
+"(let-values(((temp60_2) #t))(get-current-expand-context16.1 temp60_2 'unexpected))))"
 "(begin"
 "(if ctx_67"
 "(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_445)))"
+"(let-values()(let-values()(call-expand-observe obs_44 'track-origin new-stx_8 s_446)))"
 "(void))))"
 "(void))"
-" s_445)))))))))))"
+" s_446)))))))))))"
 "(define-values"
 "(1/namespace-attach-module)"
 "(let-values(((namespace-attach-module4_0)"
@@ -43554,17 +43584,17 @@ static const char *startup_source =
 "(void)"
 "                                        (let-values () (raise-argument-error who_22 \"namespace?\" dest-namespace_2)))"
 "(values))))"
-"(let-values(((phase_130)(namespace-phase src-namespace_6)))"
+"(let-values(((phase_131)(namespace-phase src-namespace_6)))"
 "(let-values((()"
 "(begin"
-"(if(eqv? phase_130(namespace-phase dest-namespace_2))"
+"(if(eqv? phase_131(namespace-phase dest-namespace_2))"
 "(void)"
 "(let-values()"
 "(raise-arguments-error"
 " who_22"
 "                                               \"source and destination namespace phases do not match\""
 "                                               \"source phase\""
-" phase_130"
+" phase_131"
 "                                               \"destination phase\""
 "(namespace-phase dest-namespace_2))))"
 "(values))))"
@@ -43574,7 +43604,7 @@ static const char *startup_source =
 "(begin"
 "((letrec-values(((loop_99)"
 "(lambda(mpi_45"
-" phase_131"
+" phase_132"
 " attach-instances?_1"
 " attach-phase_0)"
 "(begin"
@@ -43593,7 +43623,7 @@ static const char *startup_source =
 " mpi_45)))))"
 "(let-values(((attach-this-instance?_0)"
 "(if attach-instances?_1"
-"(eqv? phase_131 attach-phase_0)"
+"(eqv? phase_132 attach-phase_0)"
 " #f)))"
 "(let-values(((m-ns_12)"
 "(hash-ref"
@@ -43601,7 +43631,7 @@ static const char *startup_source =
 " todo_0"
 " mod-name_19"
 " '#hasheqv())"
-" phase_131"
+" phase_132"
 " missing_0)))"
 "(if(let-values(((or-part_164)"
 "(eq? missing_0 m-ns_12)))"
@@ -43627,9 +43657,9 @@ static const char *startup_source =
 "(if(if(module-cross-phase-persistent?"
 " m_20)"
 "(if(not"
-"(label-phase? phase_131))"
+"(label-phase? phase_132))"
 "(not"
-"(zero-phase? phase_131))"
+"(zero-phase? phase_132))"
 " #f)"
 " #f)"
 "(let-values()"
@@ -43674,7 +43704,7 @@ static const char *startup_source =
 "((mod-name31_0)"
 " mod-name_19)"
 "((phase32_1)"
-" phase_131))"
+" phase_132))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43700,7 +43730,7 @@ static const char *startup_source =
 "((mod-name34_0)"
 " mod-name_19)"
 "((phase35_1)"
-" phase_131))"
+" phase_132))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43736,14 +43766,14 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(if(if(label-phase?"
-" phase_131)"
+" phase_132)"
 "(not"
 "(let-values(((src-namespace36_0)"
 " src-namespace_6)"
 "((mod-name37_0)"
 " mod-name_19)"
 "((phase38_0)"
-" phase_131))"
+" phase_132))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -43767,7 +43797,7 @@ static const char *startup_source =
 "((mpi40_0)"
 " mpi_45)"
 "((phase41_1)"
-" phase_131))"
+" phase_132))"
 "(namespace-module-instantiate!96.1"
 " #t"
 " unsafe-undefined"
@@ -43789,7 +43819,7 @@ static const char *startup_source =
 "(lambda(ht_144)"
 "(hash-set"
 " ht_144"
-" phase_131"
+" phase_132"
 " m-ns_13))"
 " '#hasheqv())"
 "(if already?_0"
@@ -43806,7 +43836,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_298)))"
-"((letrec-values(((for-loop_263)"
+"((letrec-values(((for-loop_262)"
 "(lambda(lst_299)"
 "(begin"
 " 'for-loop"
@@ -43829,7 +43859,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_225)))"
-"((letrec-values(((for-loop_101)"
+"((letrec-values(((for-loop_99)"
 "(lambda(lst_178)"
 "(begin"
 " 'for-loop"
@@ -43854,7 +43884,7 @@ static const char *startup_source =
 " m_20)"
 " mpi_45)"
 "(phase+"
-" phase_131"
+" phase_132"
 "(car"
 " phase+reqs_1))"
 " attach-instances?_1"
@@ -43863,19 +43893,19 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_101"
+"(for-loop_99"
 " rest_172)"
 "(values))))"
 "(values))))))"
-" for-loop_101)"
+" for-loop_99)"
 " lst_225)))))"
 "(if(not"
 " #f)"
-"(for-loop_263"
+"(for-loop_262"
 " rest_171)"
 "(values))))"
 "(values))))))"
-" for-loop_263)"
+" for-loop_262)"
 " lst_298)))"
 "(void)"
 "(let-values(((lst_276)"
@@ -43888,7 +43918,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_276)))"
-"((letrec-values(((for-loop_102)"
+"((letrec-values(((for-loop_100)"
 "(lambda(lst_164)"
 "(begin"
 " 'for-loop"
@@ -43920,11 +43950,11 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_102"
+"(for-loop_100"
 " rest_95)"
 "(values))))"
 "(values))))))"
-" for-loop_102)"
+" for-loop_100)"
 " lst_276)))"
 "(void)"
 "(if(module-supermodule-name"
@@ -43946,9 +43976,9 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_16)"
 " mod-path_16)"
 " #f)"
-" phase_130"
+" phase_131"
 " attach-instances?_0"
-" phase_130)"
+" phase_131)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -43957,7 +43987,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_264)"
+"((letrec-values(((for-loop_263)"
 "(lambda(i_164)"
 "(begin"
 " 'for-loop"
@@ -43981,7 +44011,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_46"
-"(let-values(((phase_132"
+"(let-values(((phase_133"
 " m-ns_15)"
 "(hash-iterate-key+value"
 " ht_146"
@@ -44026,14 +44056,14 @@ static const char *startup_source =
 "(namespace-record-module-instance-attached!"
 " src-namespace_6"
 " mod-name_20"
-" phase_132)"
+" phase_133)"
 "(let-values(((or-part_25)"
 "(let-values(((dest-namespace45_0)"
 " dest-namespace_2)"
 "((mod-name46_0)"
 " mod-name_20)"
 "((phase47_2)"
-" phase_132))"
+" phase_133))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -44046,7 +44076,7 @@ static const char *startup_source =
 "(namespace-install-module-namespace!"
 " dest-namespace_2"
 " mod-name_20"
-" phase_132"
+" phase_133"
 " m_21"
 " m-ns_15)))))"
 "(void)))))"
@@ -44064,11 +44094,11 @@ static const char *startup_source =
 "(hash-iterate-first"
 " ht_146))))))"
 "(if(not #f)"
-"(for-loop_264"
+"(for-loop_263"
 "(hash-iterate-next ht_145 i_164))"
 "(values))))"
 "(values))))))"
-" for-loop_264)"
+" for-loop_263)"
 "(hash-iterate-first ht_145))))"
 "(values))))"
 "(let-values()"
@@ -44086,7 +44116,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_265)"
+"((letrec-values(((for-loop_264)"
 "(lambda(i_21)"
 "(begin"
 " 'for-loop"
@@ -44105,11 +44135,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_265"
+"(for-loop_264"
 "(hash-iterate-next ht_147 i_21))"
 "(values))))"
 "(values))))))"
-" for-loop_265)"
+" for-loop_264)"
 "(hash-iterate-first ht_147))))"
 "(void))))))))))))))))))))))))"
 "(define-values"
@@ -44118,8 +44148,8 @@ static const char *startup_source =
 "(begin"
 " 'make-empty-namespace"
 "(let-values(((current-ns_0)(1/current-namespace)))"
-"(let-values(((phase_44)(namespace-phase current-ns_0)))"
-"(let-values(((ns_59)(namespace->namespace-at-phase(make-namespace) phase_44)))"
+"(let-values(((phase_45)(namespace-phase current-ns_0)))"
+"(let-values(((ns_59)(namespace->namespace-at-phase(make-namespace) phase_45)))"
 "(begin"
 "(1/namespace-attach-module current-ns_0 ''#%kernel ns_59)"
 "(namespace-primitive-module-visit! ns_59 '#%kernel)"
@@ -44204,12 +44234,12 @@ static const char *startup_source =
 " null"
 "(unsafe-immutable-hash-iterate-first ht_148)))))))"
 "(let-values(((add-ns-scopes_0)"
-"(lambda(s_430)"
+"(lambda(s_431)"
 "(begin"
 " 'add-ns-scopes"
 "(let-values(((temp64_3)"
 "(add-scopes"
-"(push-scope s_430 post-scope_1)"
+"(push-scope s_431 post-scope_1)"
 " other-namespace-scopes_0))"
 "((temp65_1)"
 "(root-expand-context-all-scopes-stx root-ctx_5))"
@@ -44220,9 +44250,9 @@ static const char *startup_source =
 "(if or-part_74"
 " or-part_74"
 "(current-code-inspector))))"
-"((temp67_2) #t))"
+"((temp67_1) #t))"
 "(syntax-transfer-shifts36.1"
-" temp67_2"
+" temp67_1"
 " temp64_3"
 " temp65_1"
 " temp66_2))))))"
@@ -44247,7 +44277,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_446 ns1_2)(namespace-syntax-introduce3_0 s_446 ns1_2)))))"
+"((s_447 ns1_2)(namespace-syntax-introduce3_0 s_447 ns1_2)))))"
 "(define-values"
 "(namespace-datum-introduce)"
 "(lambda(s_181)(begin(1/namespace-syntax-introduce(1/datum->syntax #f s_181)))))"
@@ -44324,7 +44354,7 @@ static const char *startup_source =
 "(if(let-values(((or-part_164)(1/module-path-index? req_6)))"
 "(if or-part_164 or-part_164(1/module-path? req_6)))"
 "(let-values()"
-"(let-values(((temp70_0)"
+"(let-values(((temp70_1)"
 "(if(1/module-path-index? req_6)"
 " req_6"
 "(1/module-path-index-join req_6 #f)))"
@@ -44355,7 +44385,7 @@ static const char *startup_source =
 " skip-variable-phase-level81_0"
 " visit?76_0"
 " who82_0"
-" temp70_0"
+" temp70_1"
 " temp71_0"
 " temp72_0"
 " ctx-stx73_0"
@@ -44762,39 +44792,39 @@ static const char *startup_source =
 "(lambda(s3_1 ns1_4 compile2_0)"
 "(begin"
 " 'eval4"
-"(let-values(((s_447) s3_1))"
+"(let-values(((s_448) 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_447)))"
+"(if(let-values(((or-part_28)(compiled-in-memory? s_448)))"
 "(if or-part_28"
 " or-part_28"
-"(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))))"
+"(let-values(((or-part_294)(1/linklet-directory? s_448)))"
+"(if or-part_294 or-part_294(1/linklet-bundle? s_448)))))"
+"(let-values()(eval-compiled s_448 ns_87))"
+"(if(if(syntax?$1 s_448)"
+"(let-values(((or-part_297)(compiled-in-memory?(1/syntax-e s_448))))"
 "(if or-part_297"
 " or-part_297"
-"(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))))))"
+"(let-values(((or-part_298)(1/linklet-directory?(1/syntax-e s_448))))"
+"(if or-part_298 or-part_298(1/linklet-bundle?(1/syntax-e s_448))))))"
 " #f)"
-"(let-values()(eval-compiled(1/syntax->datum s_447) ns_87))"
+"(let-values()(eval-compiled(1/syntax->datum s_448) ns_87))"
 "(let-values()"
-"(let-values(((s66_0) s_447)"
+"(let-values(((s66_0) s_448)"
 "((ns67_1) ns_87)"
-"((temp68_2)"
+"((temp68_1)"
 "(lambda(s_180 ns_88 tail?_52)"
 "(eval-compiled(compile_1 s_180 ns_88) ns_88 tail?_52)))"
-"((temp69_0) #f))"
-"(per-top-level54.1 #f #f temp69_0 #t #f temp68_2 #f s66_0 ns67_1)))))))))))))"
+"((temp69_1) #f))"
+"(per-top-level54.1 #f #f temp69_1 #t #f temp68_1 #f s66_0 ns67_1)))))))))))))"
 "(case-lambda"
-"((s_446)(begin 'eval(eval4_0 s_446 unsafe-undefined unsafe-undefined)))"
+"((s_447)(begin 'eval(eval4_0 s_447 unsafe-undefined unsafe-undefined)))"
 "((s_76 ns_89 compile2_1)(eval4_0 s_76 ns_89 compile2_1))"
-"((s_442 ns1_5)(eval4_0 s_442 ns1_5 unsafe-undefined)))))"
+"((s_443 ns1_5)(eval4_0 s_443 ns1_5 unsafe-undefined)))))"
 "(define-values"
 "(eval-compiled)"
 "(let-values(((eval-compiled9_0)"
@@ -44835,11 +44865,11 @@ static const char *startup_source =
 "(let-values(((s72_0) s_184)"
 "((ns73_0) ns_93)"
 "((temp74_0)"
-"(lambda(s_448 ns_47 as-tail?_4)"
+"(lambda(s_449 ns_46 as-tail?_4)"
 "(list"
 "(compile-single$1"
-" s_448"
-" ns_47"
+" s_449"
+" ns_46"
 " expand_0"
 " serializable?_4"
 " to-source?_4))))"
@@ -44868,8 +44898,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_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_450 ns_94 serializable?_5 expand_1 to-source?14_1)"
+"(compile16_0 s_450 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)))))"
@@ -44883,7 +44913,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_450)(begin(compile-to-linklets20_0 s_450 unsafe-undefined)))"
+"((s_451)(begin(compile-to-linklets20_0 s_451 unsafe-undefined)))"
 "((s_22 ns18_2)(compile-to-linklets20_0 s_22 ns18_2)))))"
 "(define-values"
 "(struct:lifted-parsed-begin"
@@ -44914,10 +44944,10 @@ static const char *startup_source =
 "(make-struct-field-accessor -ref_80 1 'last))))"
 "(define-values"
 "(compile-single$1)"
-"(lambda(s_451 ns_97 expand_2 serializable?_7 to-source?_5)"
+"(lambda(s_452 ns_97 expand_2 serializable?_7 to-source?_5)"
 "(begin"
 " 'compile-single"
-"(let-values(((exp-s_4)(expand_2 s_451 ns_97 #f #t serializable?_7)))"
+"(let-values(((exp-s_4)(expand_2 s_452 ns_97 #f #t serializable?_7)))"
 "((letrec-values(((loop_100)"
 "(lambda(exp-s_5)"
 "(begin"
@@ -45008,7 +45038,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_452) s27_1))"
+"(let-values(((s_453) 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))"
@@ -45024,7 +45054,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s94_1) s_452)"
+"(let-values(((s94_1) s_453)"
 "((ns95_0) ns_98)"
 "((temp96_2)"
 "(lambda(s_314 ns_99 as-tail?_5)"
@@ -45048,12 +45078,12 @@ static const char *startup_source =
 " s94_1"
 " ns95_0))))))))))))))))"
 "(case-lambda"
-"((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_454)(begin 'expand(expand28_0 s_454 unsafe-undefined #f #f #f)))"
+"((s_455 ns_9 observable?_1 to-parsed?_3 serializable?26_1)"
+"(expand28_0 s_455 ns_9 observable?_1 to-parsed?_3 serializable?26_1))"
+"((s_456 ns_100 observable?_2 to-parsed?25_1)(expand28_0 s_456 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_456 ns23_1)(expand28_0 s_456 ns23_1 #f #f #f)))))"
+"((s_457 ns23_1)(expand28_0 s_457 ns23_1 #f #f #f)))))"
 "(define-values"
 "(expand-single)"
 "(lambda(s_58 ns_102 observer_3 to-parsed?_4 serializable?_9)"
@@ -45157,11 +45187,11 @@ static const char *startup_source =
 "((s_319 ns30_1)(expand-once32_0 s_319 ns30_1)))))"
 "(define-values"
 "(expand-single-once)"
-"(lambda(s_457 ns_83)"
+"(lambda(s_458 ns_83)"
 "(begin"
 "(let-values(((require-lifts_4 lifts_11 exp-s_6)"
 "(expand-capturing-lifts"
-" s_457"
+" s_458"
 "(let-values(((v_128)(let-values(((ns121_0) ns_83))(make-expand-context10.1 #f #f #f ns121_0))))"
 "(let-values(((the-struct_69) v_128))"
 "(if(expand-context/outer? the-struct_69)"
@@ -45230,7 +45260,7 @@ static const char *startup_source =
 "(lambda(s35_0 ns34_0)"
 "(begin"
 " 'expand-to-top-form36"
-"(let-values(((s_458) s35_0))"
+"(let-values(((s_459) s35_0))"
 "(let-values(((ns_105)(if(eq? ns34_0 unsafe-undefined)(1/current-namespace) ns34_0)))"
 "(let-values()"
 "(let-values(((observer_4)(current-expand-observe)))"
@@ -45243,7 +45273,7 @@ static const char *startup_source =
 " current-expand-observe"
 " #f)"
 "(let-values()"
-"(let-values(((s127_0) s_458)"
+"(let-values(((s127_0) s_459)"
 "((ns128_0) ns_105)"
 "((temp129_1) #f)"
 "((temp130_0) #f)"
@@ -45259,8 +45289,8 @@ static const char *startup_source =
 " s127_0"
 " ns128_0)))))))))))))"
 "(case-lambda"
-"((s_459)(begin 'expand-to-top-form(expand-to-top-form36_0 s_459 unsafe-undefined)))"
-"((s_460 ns34_1)(expand-to-top-form36_0 s_460 ns34_1)))))"
+"((s_460)(begin 'expand-to-top-form(expand-to-top-form36_0 s_460 unsafe-undefined)))"
+"((s_461 ns34_1)(expand-to-top-form36_0 s_461 ns34_1)))))"
 "(define-values"
 "(per-top-level54.1)"
 "(lambda(combine39_0"
@@ -45288,9 +45318,9 @@ static const char *startup_source =
 "(let-values(((ctx_69)"
 "(let-values(((ns132_0) ns_106)((observer133_0) observer_5))"
 "(make-expand-context10.1 #f observer133_0 #f ns132_0))))"
-"(let-values(((phase_133)(namespace-phase ns_106)))"
+"(let-values(((phase_134)(namespace-phase ns_106)))"
 "((letrec-values(((loop_101)"
-"(lambda(s_461 phase_134 ns_107 as-tail?_7)"
+"(lambda(s_462 phase_135 ns_107 as-tail?_7)"
 "(begin"
 " 'loop"
 "(let-values(((tl-ctx_0)"
@@ -45304,7 +45334,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_72)"
 "(let-values(((phase135_1)"
-" phase_134)"
+" phase_135)"
 "((namespace136_0)"
 " ns_107)"
 "((just-once?137_0)"
@@ -45395,7 +45425,7 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                           \"expand-context/outer?\""
 " the-struct_71))))))"
-"(let-values(((wb-s_0)(if just-once?_1 s_461 #f)))"
+"(let-values(((wb-s_0)(if just-once?_1 s_462 #f)))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_47)"
@@ -45407,12 +45437,12 @@ static const char *startup_source =
 "(call-expand-observe"
 " obs_47"
 " 'visit"
-" s_461)))"
+" s_462)))"
 "(void)))"
 "(values))))"
 "(let-values(((require-lifts_5 lifts_12 exp-s_7)"
 "(expand-capturing-lifts"
-" s_461"
+" s_462"
 "(let-values(((v_198) tl-ctx_0))"
 "(let-values(((the-struct_73) v_198))"
 "(if(expand-context/outer? the-struct_73)"
@@ -45425,7 +45455,7 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_74)"
 "(let-values(((phase141_0)"
-" phase_134)"
+" phase_135)"
 "((namespace142_0)"
 " ns_107))"
 "(expand-context/inner2.1"
@@ -45528,7 +45558,7 @@ static const char *startup_source =
 " require-lifts_5"
 " lifts_12))"
 "((exp-s144_0) exp-s_7)"
-"((phase145_0) phase_134))"
+"((phase145_0) phase_135))"
 "(wrap-lifts-as-begin16.1"
 " unsafe-undefined"
 " unsafe-undefined"
@@ -45551,7 +45581,7 @@ static const char *startup_source =
 " new-s_3"
 "(loop_101"
 " new-s_3"
-" phase_134"
+" phase_135"
 " ns_107"
 " as-tail?_7)))))"
 "(if(not single_0)"
@@ -45575,7 +45605,7 @@ static const char *startup_source =
 "(let-values(((tmp_35)"
 "(core-form-sym"
 " disarmed-exp-s_0"
-" phase_134)))"
+" phase_135)))"
 "(if(equal? tmp_35 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -45592,18 +45622,18 @@ static const char *startup_source =
 "(void)))"
 "(values))))"
 "(let-values(((ok?_29 begin146_0 e147_0)"
-"(let-values(((s_462)"
+"(let-values(((s_463)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_33)"
-" s_462))"
+" s_463))"
 "(let-values(((begin146_1"
 " e147_1)"
 "(let-values(((s_162)"
 "(if(syntax?$1"
-" s_462)"
+" s_463)"
 "(syntax-e$1"
-" s_462)"
-" s_462)))"
+" s_463)"
+" s_463)))"
 "(if(pair?"
 " s_162)"
 "(let-values(((begin148_0)"
@@ -45612,15 +45642,15 @@ static const char *startup_source =
 " s_162)))"
 " s_115))"
 "((e149_0)"
-"(let-values(((s_438)"
+"(let-values(((s_439)"
 "(cdr"
 " s_162)))"
 "(let-values(((s_224)"
 "(if(syntax?$1"
-" s_438)"
+" s_439)"
 "(syntax-e$1"
-" s_438)"
-" s_438)))"
+" s_439)"
+" s_439)))"
 "(let-values(((flat-s_21)"
 "(to-syntax-list.1"
 " s_224)))"
@@ -45662,7 +45692,7 @@ static const char *startup_source =
 "(let-values()"
 "(loop_101"
 "(car es_2)"
-" phase_134"
+" phase_135"
 " ns_107"
 " as-tail?_7))"
 "(let-values()"
@@ -45684,14 +45714,14 @@ static const char *startup_source =
 "(loop_101"
 "(car"
 " es_2)"
-" phase_134"
+" phase_135"
 " ns_107"
 " #f)"
 "(begin"
 "(loop_101"
 "(car"
 " es_2)"
-" phase_134"
+" phase_135"
 " ns_107"
 " #f)"
 "(void)))))"
@@ -45745,38 +45775,38 @@ static const char *startup_source =
 "(let-values(((ok?_30"
 " begin-for-syntax150_0"
 " e151_0)"
-"(let-values(((s_463)"
+"(let-values(((s_464)"
 " disarmed-exp-s_0))"
 "(let-values(((orig-s_34)"
-" s_463))"
+" s_464))"
 "(let-values(((begin-for-syntax150_1"
 " e151_1)"
 "(let-values(((s_127)"
 "(if(syntax?$1"
-" s_463)"
+" s_464)"
 "(syntax-e$1"
-" s_463)"
-" s_463)))"
+" s_464)"
+" s_464)))"
 "(if(pair?"
 " s_127)"
 "(let-values(((begin-for-syntax152_0)"
-"(let-values(((s_464)"
+"(let-values(((s_465)"
 "(car"
 " s_127)))"
-" s_464))"
+" s_465))"
 "((e153_0)"
-"(let-values(((s_465)"
+"(let-values(((s_466)"
 "(cdr"
 " s_127)))"
-"(let-values(((s_466)"
+"(let-values(((s_467)"
 "(if(syntax?$1"
-" s_465)"
+" s_466)"
 "(syntax-e$1"
-" s_465)"
-" s_465)))"
+" s_466)"
+" s_466)))"
 "(let-values(((flat-s_22)"
 "(to-syntax-list.1"
-" s_466)))"
+" s_467)))"
 "(if(not"
 " flat-s_22)"
 "(let-values()"
@@ -45798,7 +45828,7 @@ static const char *startup_source =
 " begin-for-syntax150_1"
 " e151_1))))))"
 "(let-values(((next-phase_0)"
-"(add1 phase_134)))"
+"(add1 phase_135)))"
 "(let-values(((next-ns_0)"
 "(namespace->namespace-at-phase"
 " ns_107"
@@ -45840,14 +45870,14 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_208)))"
-"((letrec-values(((for-loop_266)"
+"((letrec-values(((for-loop_265)"
 "(lambda(fold-var_274"
 " lst_301)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_301)"
-"(let-values(((s_467)"
+"(let-values(((s_468)"
 "(unsafe-car"
 " lst_301))"
 "((rest_113)"
@@ -45872,7 +45902,7 @@ static const char *startup_source =
 " 'next)))"
 "(void)))"
 "(loop_101"
-" s_467"
+" s_468"
 " next-phase_0"
 " next-ns_0"
 " #f)))"
@@ -45881,12 +45911,12 @@ static const char *startup_source =
 " fold-var_205)))))"
 "(if(not"
 " #f)"
-"(for-loop_266"
+"(for-loop_265"
 " fold-var_257"
 " rest_113)"
 " fold-var_257)))"
 " fold-var_274)))))"
-" for-loop_266)"
+" for-loop_265)"
 " null"
 " lst_208))))))"
 "(if wrap_2"
@@ -45923,7 +45953,7 @@ static const char *startup_source =
 " as-tail?_7))))))))))))))))))"
 " loop_101)"
 " s_216"
-" phase_133"
+" phase_134"
 " ns_106"
 " #t)))))))))))))))))"
 "(define-values"
@@ -45932,8 +45962,8 @@ static const char *startup_source =
 "(begin(if(syntax?$1 s_340) s_340(1/namespace-syntax-introduce(1/datum->syntax #f s_340) ns_108)))))"
 "(define-values"
 "(re-pair)"
-"(lambda(form-id_0 s_468 r_44)"
-"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_468)(cons form-id_0 r_44) s_468 s_468) s_468))))"
+"(lambda(form-id_0 s_469 r_44)"
+"(begin(syntax-rearm$1(1/datum->syntax(syntax-disarm$1 s_469)(cons form-id_0 r_44) s_469 s_469) s_469))))"
 "(define-values"
 "(expand-capturing-lifts)"
 "(lambda(s_343 ctx_70)"
@@ -46037,31 +46067,31 @@ static const char *startup_source =
 "(make-parse-top-lifted-require)"
 "(lambda(ns_110)"
 "(begin"
-"(lambda(s_347 phase_135)"
+"(lambda(s_347 phase_136)"
 "(let-values(((ok?_31 #%require161_0 req162_0)"
-"(let-values(((s_469)(syntax-disarm$1 s_347)))"
-"(let-values(((orig-s_35) s_469))"
+"(let-values(((s_470)(syntax-disarm$1 s_347)))"
+"(let-values(((orig-s_35) s_470))"
 "(let-values(((#%require161_1 req162_1)"
-"(let-values(((s_470)(if(syntax?$1 s_469)(syntax-e$1 s_469) s_469)))"
-"(if(pair? s_470)"
-"(let-values(((#%require163_0)(let-values(((s_471)(car s_470))) s_471))"
+"(let-values(((s_471)(if(syntax?$1 s_470)(syntax-e$1 s_470) s_470)))"
+"(if(pair? s_471)"
+"(let-values(((#%require163_0)(let-values(((s_472)(car s_471))) s_472))"
 "((req164_0)"
-"(let-values(((s_472)(cdr s_470)))"
-"(let-values(((s_473)"
-"(if(syntax?$1 s_472)"
-"(syntax-e$1 s_472)"
-" s_472)))"
-"(if(pair? s_473)"
+"(let-values(((s_473)(cdr s_471)))"
+"(let-values(((s_474)"
+"(if(syntax?$1 s_473)"
+"(syntax-e$1 s_473)"
+" s_473)))"
+"(if(pair? s_474)"
 "(let-values(((req165_0)"
-"(let-values(((s_474)(car s_473)))"
-" s_474))"
+"(let-values(((s_475)(car s_474)))"
+" s_475))"
 "(()"
-"(let-values(((s_475)(cdr s_473)))"
-"(let-values(((s_476)"
-"(if(syntax?$1 s_475)"
-"(syntax-e$1 s_475)"
-" s_475)))"
-"(if(null? s_476)"
+"(let-values(((s_476)(cdr s_474)))"
+"(let-values(((s_477)"
+"(if(syntax?$1 s_476)"
+"(syntax-e$1 s_476)"
+" s_476)))"
+"(if(null? s_477)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -46075,8 +46105,8 @@ static const char *startup_source =
 "(let-values(((temp166_0)(list req162_0))"
 "((s167_0) s_347)"
 "((ns168_0) ns_110)"
-"((phase169_1) phase_135)"
-"((phase170_0) phase_135)"
+"((phase169_1) phase_136)"
+"((phase170_0) phase_136)"
 "((temp171_1)(let-values(((temp173_0) #f))(make-requires+provides8.1 #f temp173_0)))"
 "((temp172_0) 'require))"
 "(parse-and-perform-requires!30.1"
@@ -46114,7 +46144,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_302)))"
-"((letrec-values(((for-loop_267)"
+"((letrec-values(((for-loop_266)"
 "(lambda(fold-var_276 lst_303)"
 "(begin"
 " 'for-loop"
@@ -46130,9 +46160,9 @@ static const char *startup_source =
 "(parsed-require23.1 req_19))"
 " fold-var_278))))"
 "(values fold-var_279)))))"
-"(if(not #f)(for-loop_267 fold-var_277 rest_173) fold-var_277)))"
+"(if(not #f)(for-loop_266 fold-var_277 rest_173) fold-var_277)))"
 " fold-var_276)))))"
-" for-loop_267)"
+" for-loop_266)"
 " null"
 " lst_302))))"
 "(reverse$1"
@@ -46141,7 +46171,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_304)))"
-"((letrec-values(((for-loop_268)"
+"((letrec-values(((for-loop_267)"
 "(lambda(fold-var_280 lst_305)"
 "(begin"
 " 'for-loop"
@@ -46191,9 +46221,9 @@ static const char *startup_source =
 " dv_0)))))"
 " fold-var_282))))"
 "(values fold-var_283)))))"
-"(if(not #f)(for-loop_268 fold-var_281 rest_174) fold-var_281)))"
+"(if(not #f)(for-loop_267 fold-var_281 rest_174) fold-var_281)))"
 " fold-var_280)))))"
-" for-loop_268)"
+" for-loop_267)"
 " null"
 " lst_304)))))"
 " exp-s_9))))))))))"
@@ -46224,19 +46254,19 @@ static const char *startup_source =
 "(if obs_57"
 "(let-values()"
 "(let-values(((ok?_32 begin178_0 e179_0)"
-"(let-values(((s_477) new-s_7))"
-"(let-values(((orig-s_36) s_477))"
+"(let-values(((s_478) new-s_7))"
+"(let-values(((orig-s_36) s_478))"
 "(let-values(((begin178_1 e179_1)"
-"(let-values(((s_478)(if(syntax?$1 s_477)(syntax-e$1 s_477) s_477)))"
-"(if(pair? s_478)"
-"(let-values(((begin180_0)(let-values(((s_479)(car s_478))) s_479))"
+"(let-values(((s_479)(if(syntax?$1 s_478)(syntax-e$1 s_478) s_478)))"
+"(if(pair? s_479)"
+"(let-values(((begin180_0)(let-values(((s_480)(car s_479))) s_480))"
 "((e181_0)"
-"(let-values(((s_480)(cdr s_478)))"
-"(let-values(((s_481)"
-"(if(syntax?$1 s_480)"
-"(syntax-e$1 s_480)"
-" s_480)))"
-"(let-values(((flat-s_23)(to-syntax-list.1 s_481)))"
+"(let-values(((s_481)(cdr s_479)))"
+"(let-values(((s_482)"
+"(if(syntax?$1 s_481)"
+"(syntax-e$1 s_481)"
+" s_481)))"
+"(let-values(((flat-s_23)(to-syntax-list.1 s_482)))"
 "(if(not flat-s_23)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -46265,16 +46295,16 @@ static const char *startup_source =
 "(let-values(((s_392) new-s_8))"
 "(let-values(((orig-s_37) s_392))"
 "(let-values(((begin182_1 e183_1)"
-"(let-values(((s_482)(if(syntax?$1 s_392)(syntax-e$1 s_392) s_392)))"
-"(if(pair? s_482)"
-"(let-values(((begin184_0)(let-values(((s_138)(car s_482))) s_138))"
+"(let-values(((s_483)(if(syntax?$1 s_392)(syntax-e$1 s_392) s_392)))"
+"(if(pair? s_483)"
+"(let-values(((begin184_0)(let-values(((s_138)(car s_483))) s_138))"
 "((e185_0)"
-"(let-values(((s_139)(cdr s_482)))"
-"(let-values(((s_483)"
+"(let-values(((s_139)(cdr s_483)))"
+"(let-values(((s_484)"
 "(if(syntax?$1 s_139)"
 "(syntax-e$1 s_139)"
 " s_139)))"
-"(let-values(((flat-s_24)(to-syntax-list.1 s_483)))"
+"(let-values(((flat-s_24)(to-syntax-list.1 s_484)))"
 "(if(not flat-s_24)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -46384,12 +46414,12 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_149)))"
-"((letrec-values(((for-loop_269)"
+"((letrec-values(((for-loop_268)"
 "(lambda(result_116 i_166)"
 "(begin"
 " 'for-loop"
 "(if i_166"
-"(let-values(((k_35 v_3)"
+"(let-values(((k_36 v_3)"
 "(hash-iterate-key+value ht_149 i_166)))"
 "(let-values(((result_117)"
 "(let-values()"
@@ -46398,13 +46428,13 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_77)"
 "(not"
-" k_35)))"
+" k_36)))"
 "(if or-part_77"
 " or-part_77"
 "(if(symbol?"
-" k_35)"
+" k_36)"
 "(1/module-path?"
-" k_35)"
+" k_36)"
 " #f)))"
 "(if(list? v_3)"
 "(andmap2"
@@ -46413,15 +46443,15 @@ static const char *startup_source =
 " #f)"
 " #f)))))"
 "(values result_118)))))"
-"(if(if(not((lambda x_82(not result_117)) k_35 v_3))"
+"(if(if(not((lambda x_83(not result_117)) k_36 v_3))"
 "(not #f)"
 " #f)"
-"(for-loop_269"
+"(for-loop_268"
 " result_117"
 "(hash-iterate-next ht_149 i_166))"
 " result_117)))"
 " result_116)))))"
-" for-loop_269)"
+" for-loop_268)"
 " #t"
 "(hash-iterate-first ht_149))))"
 " #f))))))"
@@ -46452,31 +46482,31 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_150)))"
-"((letrec-values(((for-loop_270)"
+"((letrec-values(((for-loop_269)"
 "(lambda(table_208 i_167)"
 "(begin"
 " 'for-loop"
 "(if i_167"
-"(let-values(((k_36 v_200)(hash-iterate-key+value ht_150 i_167)))"
+"(let-values(((k_37 v_200)(hash-iterate-key+value ht_150 i_167)))"
 "(let-values(((table_209)"
-"(let-values(((table_180) table_208))"
+"(let-values(((table_181) table_208))"
 "(let-values(((table_210)"
 "(let-values()"
 "(let-values(((key_82 val_77)"
 "(let-values()"
 "(values"
-" k_36"
+" k_37"
 "(to-path v_200)))))"
 "(hash-set"
-" table_180"
+" table_181"
 " key_82"
 " val_77)))))"
 "(values table_210)))))"
 "(if(not #f)"
-"(for-loop_270 table_209(hash-iterate-next ht_150 i_167))"
+"(for-loop_269 table_209(hash-iterate-next ht_150 i_167))"
 " table_209)))"
 " table_208)))))"
-" for-loop_270)"
+" for-loop_269)"
 " '#hash()"
 "(hash-iterate-first ht_150)))))))))"
 " l_8)))))))"
@@ -46521,9 +46551,9 @@ static const char *startup_source =
 " 'modify-seconds"
 "(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))))"
+"(if((lambda(v_70)"
+"(let-values(((or-part_32)(eq? v_70 'modify-seconds)))"
+"(if or-part_32 or-part_32(eq? v_70 'exists))))"
 " v_201)"
 "(void)"
 "             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_201)))"
@@ -46570,26 +46600,26 @@ static const char *startup_source =
 "(define-values(compile$1)(lambda(s_177)(begin 'compile((1/current-compile)(intro s_177) #f))))"
 "(define-values"
 "(1/compile-syntax)"
-"(lambda(s_484)"
+"(lambda(s_485)"
 "(begin"
 " 'compile-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (if (syntax?$1 s_484) (void) (let-values () (raise-argument-error 'compile-syntax \"syntax?\" s_484)))"
-"((1/current-compile) s_484 #f)))))))"
+"            (if (syntax?$1 s_485) (void) (let-values () (raise-argument-error 'compile-syntax \"syntax?\" s_485)))"
+"((1/current-compile) s_485 #f)))))))"
 "(define-values(1/expand)(lambda(s_9)(begin 'expand(expand$1(intro s_9)(1/current-namespace) #t))))"
 "(define-values"
 "(1/expand-syntax)"
-"(lambda(s_440)"
+"(lambda(s_441)"
 "(begin"
 " 'expand-syntax"
 "(let-values()"
 "(let-values()"
 "(begin"
-"            (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)))))"
+"            (if (syntax?$1 s_441) (void) (let-values () (raise-argument-error 'expand-syntax \"syntax?\" s_441)))"
+"(expand$1 s_441(1/current-namespace) #t)))))))"
+"(define-values(1/expand-once)(lambda(s_448)(begin 'expand-once(expand-once$1(intro s_448)))))"
 "(define-values"
 "(1/expand-syntax-once)"
 "(lambda(s_178)"
@@ -46688,13 +46718,13 @@ static const char *startup_source =
 "(resolved-module-path->module-path mod-path_5)"
 " #f))))))"
 "(let-values(((mod-name_22)(1/module-path-index-resolve mpi_46 #t)))"
-"(let-values(((phase_109)(namespace-phase ns_114)))"
+"(let-values(((phase_110)(namespace-phase ns_114)))"
 "(if(not sym_71)"
 "(let-values()"
 "(let-values(((ns17_0) ns_114)"
 "((mpi18_0) mpi_46)"
-"((phase19_2) phase_109)"
-"((phase20_1) phase_109)"
+"((phase19_2) phase_110)"
+"((phase20_1) phase_110)"
 "((temp21_1) #f))"
 "(namespace-module-instantiate!96.1"
 " temp21_1"
@@ -46708,8 +46738,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns22_0) ns_114)"
 "((mpi23_0) mpi_46)"
-"((phase24_3) phase_109)"
-"((phase25_0) phase_109))"
+"((phase24_3) phase_110)"
+"((phase25_0) phase_110))"
 "(namespace-module-instantiate!96.1"
 " #t"
 " phase25_0"
@@ -46722,8 +46752,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((ns26_0) ns_114)"
 "((mpi27_0) mpi_46)"
-"((phase28_4) phase_109)"
-"((phase29_0) phase_109))"
+"((phase28_4) phase_110)"
+"((phase29_0) phase_110))"
 "(namespace-module-visit!104.1"
 " phase29_0"
 " ns26_0"
@@ -46767,8 +46797,8 @@ static const char *startup_source =
 "(begin"
 "(let-values(((ns30_2) ns_114)"
 "((mpi31_0) mpi_46)"
-"((phase32_2) phase_109)"
-"((phase33_1) phase_109)"
+"((phase32_2) phase_110)"
+"((phase33_1) phase_110)"
 "((temp34_4) #f))"
 "(namespace-module-instantiate!96.1"
 " temp34_4"
@@ -46791,7 +46821,7 @@ static const char *startup_source =
 " ex-mod-name_0)"
 "((temp37_1)"
 "(phase-"
-" phase_109"
+" phase_110"
 " ex-phase_0))"
 "((temp38_3) #t))"
 "(namespace->module-namespace82.1"
@@ -46885,9 +46915,9 @@ static const char *startup_source =
 "((mpi40_1)"
 " mpi_46)"
 "((phase41_2)"
-" phase_109)"
+" phase_110)"
 "((phase42_0)"
-" phase_109))"
+" phase_110))"
 "(namespace-module-visit!104.1"
 " phase42_0"
 " ns39_0"
@@ -47419,11 +47449,11 @@ static const char *startup_source =
 "(lambda(sub_1)"
 "(if(directory-exists?(build-path dir_1 sub_1))"
 "(let-values()"
-"(let-values(((k_37)(string->symbol(path->string sub_1))))"
+"(let-values(((k_38)(string->symbol(path->string sub_1))))"
 "(hash-set!"
 " ht_151"
-" k_37"
-"(cons dir_1(hash-ref ht_151 k_37 null)))))"
+" k_38"
+"(cons dir_1(hash-ref ht_151 k_38 null)))))"
 "(void)))"
 "(directory-list dir_1)))"
 "(if(eq?(car p_67) 'root)"
@@ -47434,19 +47464,19 @@ static const char *startup_source =
 "(let-values()(hash-set! ht_151 #f null)))"
 "(hash-for-each"
 " ht_151"
-"(lambda(k_38 v_204)"
-"(hash-set! ht_151 k_38(cons dir_1 v_204))))))"
+"(lambda(k_39 v_204)"
+"(hash-set! ht_151 k_39(cons dir_1 v_204))))))"
 "(let-values()"
-"(let-values(((s_485)(string->symbol(car p_67))))"
+"(let-values(((s_486)(string->symbol(car p_67))))"
 "(hash-set!"
 " ht_151"
-" s_485"
-"(cons(box dir_1)(hash-ref ht_151 s_485 null)))))))))"
+" s_486"
+"(cons(box dir_1)(hash-ref ht_151 s_486 null)))))))))"
 "(void)))"
 " v_203)"
 "(hash-for-each"
 " ht_151"
-"(lambda(k_39 v_205)(hash-set! ht_151 k_39(reverse$1 v_205))))"
+"(lambda(k_40 v_205)(hash-set! ht_151 k_40(reverse$1 v_205))))"
 "(hash-set! links-cache links-path_0(cons ts_1 ht_151))"
 " ht_151))))))))))))))))))))))"
 "(define-values"
@@ -47716,8 +47746,8 @@ static const char *startup_source =
 " #f"
 "(lambda(v_207)"
 "(begin"
-"(if((lambda(x_83)"
-"(let-values(((or-part_11)(not x_83)))(if or-part_11 or-part_11(prop:readtable? x_83))))"
+"(if((lambda(x_84)"
+"(let-values(((or-part_11)(not x_84)))(if or-part_11 or-part_11(prop:readtable? x_84))))"
 " v_207)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_207)))"
@@ -47847,7 +47877,7 @@ static const char *startup_source =
 " pos_108"
 " indentations_0"
 " keep-comment?_0))))"
-"(define-values(read-config-wrap)(lambda(v_27)(begin(read-config/outer-wrap v_27))))"
+"(define-values(read-config-wrap)(lambda(v_28)(begin(read-config/outer-wrap v_28))))"
 "(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))))"
@@ -47883,7 +47913,7 @@ static const char *startup_source =
 "(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)))))"
+"(lambda(v_41)(begin(read-config/inner-parameter-cache(read-config/outer-inner v_41)))))"
 "(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"
@@ -48038,15 +48068,15 @@ 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_282) given-end-pos_0))"
-"(if or-part_282"
-" or-part_282"
+"(let-values(((or-part_306) given-end-pos_0))"
+"(if or-part_306"
+" or-part_306"
 "(let-values(((end-line_0 end-col_0 end-pos_1)(port-next-location in_1)))"
 " end-pos_1)))))"
 "(srcloc"
-"(let-values(((or-part_306)(read-config-source config_1)))"
-"(if or-part_306"
-" or-part_306"
+"(let-values(((or-part_284)(read-config-source config_1)))"
+"(if or-part_284"
+" or-part_284"
 "                     (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)"
@@ -48190,16 +48220,16 @@ static const char *startup_source =
 "(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_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-curly-brace-with-tag)(make-parameter #f(lambda(v_67)(if v_67 #t #f))))"
+"(define-values(1/read-cdot)(make-parameter #f(lambda(v_32)(if v_32 #t #f))))"
+"(define-values(1/read-accept-graph)(make-parameter #t(lambda(v_68)(if v_68 #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_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-dot)(make-parameter #t(lambda(v_69)(if v_69 #t #f))))"
+"(define-values(1/read-accept-infix-dot)(make-parameter #t(lambda(v_33)(if v_33 #t #f))))"
 "(define-values(1/read-accept-quasiquote)(make-parameter #t(lambda(v_3)(if v_3 #t #f))))"
-"(define-values(1/read-accept-reader)(make-parameter #f(lambda(v_33)(if v_33 #t #f))))"
+"(define-values(1/read-accept-reader)(make-parameter #f(lambda(v_34)(if v_34 #t #f))))"
 "(define-values(1/read-accept-lang)(make-parameter #t(lambda(v_4)(if v_4 #t #f))))"
 "(define-values(unknown)(gensym 'unknown))"
 "(define-values"
@@ -48207,14 +48237,14 @@ static const char *startup_source =
 "(lambda(param_0 config_8)"
 "(begin"
 "(let-values(((cache_4)(read-config-parameter-cache config_8)))"
-"(let-values(((v_70)"
+"(let-values(((v_71)"
 "(hash-ref(read-config-parameter-override config_8) param_0(hash-ref cache_4 param_0 unknown))))"
-"(if(eq? v_70 unknown)"
-"(let-values()(let-values(((v_71)(param_0)))(begin(hash-set! cache_4 param_0 v_71) v_71)))"
-"(let-values() v_70)))))))"
+"(if(eq? v_71 unknown)"
+"(let-values()(let-values(((v_72)(param_0)))(begin(hash-set! cache_4 param_0 v_72) v_72)))"
+"(let-values() v_71)))))))"
 "(define-values"
 "(override-parameter)"
-"(lambda(param_1 config_9 v_30)"
+"(lambda(param_1 config_9 v_31)"
 "(begin"
 "(let-values(((v_232) config_9))"
 "(let-values(((the-struct_86) v_232))"
@@ -48223,7 +48253,7 @@ static const char *startup_source =
 "(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)))"
+"(hash-set(read-config-parameter-override config_9) param_1 v_31)))"
 "(read-config/inner2.1"
 "(read-config/inner-readtable the-struct_87)"
 "(read-config/inner-next-readtable the-struct_87)"
@@ -48635,26 +48665,26 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_154)))"
-"((letrec-values(((for-loop_271)"
+"((letrec-values(((for-loop_270)"
 "(lambda(fold-var_85 i_168)"
 "(begin"
 " 'for-loop"
 "(if i_168"
-"(let-values(((k_40 v_94)(hash-iterate-key+value ht_154 i_168)))"
+"(let-values(((k_41 v_94)(hash-iterate-key+value ht_154 i_168)))"
 "(let-values(((fold-var_284)"
 "(let-values(((fold-var_88) fold-var_85))"
 "(if(eqv? v_94 c_64)"
 "(let-values(((fold-var_238) fold-var_88))"
 "(let-values(((fold-var_13)"
 "(let-values()"
-"(cons(let-values() k_40) fold-var_238))))"
+"(cons(let-values() k_41) fold-var_238))))"
 "(values fold-var_13)))"
 " fold-var_88))))"
 "(if(not #f)"
-"(for-loop_271 fold-var_284(hash-iterate-next ht_154 i_168))"
+"(for-loop_270 fold-var_284(hash-iterate-next ht_154 i_168))"
 " fold-var_284)))"
 " fold-var_85)))))"
-" for-loop_271)"
+" for-loop_270)"
 " null"
 "(hash-iterate-first ht_154))))))))))"
 "(define-values"
@@ -48754,8 +48784,8 @@ static const char *startup_source =
 "((config34_0) config_18)"
 "                                     ((temp35_2) \"~a\")"
 "((temp36_3)"
-"(let-values(((s_486)(exn-message exn_3)))"
-"                                        (regexp-replace \"^[a-z-]*: \" s_486 \"\")))"
+"(let-values(((s_487)(exn-message exn_3)))"
+"                                        (regexp-replace \"^[a-z-]*: \" s_487 \"\")))"
 "((temp37_2)(exn-continuation-marks exn_3)))"
 "(reader-error12.1"
 " temp37_2"
@@ -48846,13 +48876,13 @@ static const char *startup_source =
 "(eqv?"
 " '#\\|"
 "(let-values(((in_11) in_5)((skip-count_0) 0)((source_6) source_3))"
-"(let-values(((c_67)"
+"(let-values(((c_17)"
 "(peek-char-or-special"
 " in_11"
 " skip-count_0"
 " 'special"
 " source_6)))"
-"(if(eq? c_67 'special)(special1.1 'special) c_67))))"
+"(if(eq? c_17 'special)(special1.1 'special) c_17))))"
 " #f)"
 "(let-values()"
 "(begin"
@@ -48866,26 +48896,26 @@ static const char *startup_source =
 "(let-values(((in_12) in_5)"
 "((skip-count_1) 0)"
 "((source_7) source_3))"
-"(let-values(((c_68)"
+"(let-values(((c_67)"
 "(peek-char-or-special"
 " in_12"
 " skip-count_1"
 " 'special"
 " source_7)))"
-"(if(eq? c_68 'special)(special1.1 'special) c_68))))"
+"(if(eq? c_67 'special)(special1.1 'special) c_67))))"
 "(let-values(((c3_2)"
 "(let-values(((in_13) in_5)"
 "((skip-count_2) 1)"
 "((source_8) source_3))"
-"(let-values(((c_69)"
+"(let-values(((c_68)"
 "(peek-char-or-special"
 " in_13"
 " skip-count_2"
 " 'special"
 " source_8)))"
-"(if(eq? c_69 'special)"
+"(if(eq? c_68 'special)"
 "(special1.1 'special)"
-" c_69)))))"
+" c_68)))))"
 "(let-values(((or-part_310)(eqv? '#\\space c3_2)))"
 "(if or-part_310 or-part_310(eqv? '#\\/ c3_2))))"
 " #f)"
@@ -48902,13 +48932,13 @@ static const char *startup_source =
 "(let-values(((in_14) in_5)"
 "((skip-count_3) 0)"
 "((source_9) source_3))"
-"(let-values(((c_70)"
+"(let-values(((c_69)"
 "(peek-char-or-special"
 " in_14"
 " skip-count_3"
 " 'special"
 " source_9)))"
-"(if(eq? c_70 'special)(special1.1 'special) c_70))))"
+"(if(eq? c_69 'special)(special1.1 'special) c_69))))"
 " #f)"
 "(let-values()"
 "(let-values((()(begin(consume-char in_5 '#\\;)(values))))"
@@ -48951,14 +48981,14 @@ static const char *startup_source =
 "(lambda(prev-c_0 depth_10)"
 "(begin"
 " 'loop"
-"(let-values(((c_71)"
+"(let-values(((c_70)"
 "(let-values(((in_16) in_15)((source_11) source_10))"
 "(read-char-or-special in_16 special1.1 source_11))))"
-"(if(eof-object? c_71)"
+"(if(eof-object? c_70)"
 "(let-values()"
 "(let-values(((in6_0) in_15)"
 "((temp7_3)(reading-at config_19 line_5 col_4 pos_112))"
-"((c8_0) c_71)"
+"((c8_0) c_70)"
 "                                                     ((temp9_4) \"end of file in `#|` comment\"))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -48969,16 +48999,16 @@ static const char *startup_source =
 " temp7_3"
 " temp9_4"
 "(list))))"
-"(if(not(char? c_71))"
+"(if(not(char? c_70))"
 "(let-values()(loop_106 #f depth_10))"
-"(if(if(char=? '#\\| c_71)(eqv? prev-c_0 '#\\#) #f)"
+"(if(if(char=? '#\\| c_70)(eqv? prev-c_0 '#\\#) #f)"
 "(let-values()(loop_106 #f(add1 depth_10)))"
-"(if(if(char=? '#\\# c_71)(eqv? prev-c_0 '#\\|) #f)"
+"(if(if(char=? '#\\# c_70)(eqv? prev-c_0 '#\\|) #f)"
 "(let-values()"
 "(if(positive? depth_10)"
 "(let-values()(loop_106 #f(sub1 depth_10)))"
 "(void)))"
-"(let-values()(loop_106 c_71 depth_10)))))))))))"
+"(let-values()(loop_106 c_70 depth_10)))))))))))"
 " loop_106)"
 " #f"
 " 0)))))))"
@@ -49116,13 +49146,13 @@ static const char *startup_source =
 "(let-values(((p_63)(opener-name '#\\( config_21)))"
 "(let-values(((s_10)"
 "(if(check-parameter 1/read-square-bracket-as-paren config_21)(opener-name '#\\[ config_21) #f)))"
-"(let-values(((c_72)"
+"(let-values(((c_71)"
 "(if(check-parameter 1/read-curly-brace-as-paren config_21)(opener-name '#\\{ config_21) #f)))"
-"(if(if s_10 c_72 #f)"
-"              (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))"
+"(if(if s_10 c_71 #f)"
+"              (let-values () (format \"~a, ~a, or ~a\" p_63 s_10 c_71))"
+"(if(let-values(((or-part_298) s_10))(if or-part_298 or-part_298 c_71))"
 "(let-values()"
-"                  (format \"~a or ~a\" p_63 (let-values (((or-part_309) s_10)) (if or-part_309 or-part_309 c_72))))"
+"                  (format \"~a or ~a\" p_63 (let-values (((or-part_309) s_10)) (if or-part_309 or-part_309 c_71))))"
 "(let-values() p_63)))))))))"
 "(define-values"
 "(struct:accum-string"
@@ -49292,16 +49322,16 @@ static const char *startup_source =
 "          (let-values () \"\"))))))"
 "(define-values"
 "(indentation-unexpected-closer-message)"
-"(lambda(ec_2 c_73 config_33)"
+"(lambda(ec_2 c_72 config_33)"
 "(begin"
 "(let-values(((indts_1)(read-config-indentations config_33)))"
 "(if(null? indts_1)"
-"          (let-values () (format \"unexpected `~a`\" c_73))"
+"          (let-values () (format \"unexpected `~a`\" c_72))"
 "(let-values()"
 "(let-values(((indt_2)(car indts_1)))"
 "(string-append"
 "(if(char=? ec_2(indentation-closer indt_2))"
-"                 (let-values () (format \"unexpected `~a`\" c_73))"
+"                 (let-values () (format \"unexpected `~a`\" c_72))"
 "(let-values()"
 "(let-values(((missing_2)"
 "(let-values(((or-part_301)"
@@ -49330,7 +49360,7 @@ static const char *startup_source =
 " #f)))))"
 "(values result_120)))))"
 "(if(if(not"
-"((lambda x_84 result_82)"
+"((lambda x_85 result_82)"
 " indt_3))"
 "(not #f)"
 " #f)"
@@ -49349,7 +49379,7 @@ static const char *startup_source =
 "(if(indentation-multiline? indt_2)"
 "                          (let-values () (format \"~a on line ~a\" opener-str_0 (indentation-start-line indt_2)))"
 "                          (let-values () (format \"preceding ~a\" opener-str_0)))"
-" c_73)))))"
+" c_72)))))"
 "(indentation-possible-cause config_33)))))))))"
 "(define-values"
 "(read-unwrapped-sequence17.1)"
@@ -49450,7 +49480,7 @@ static const char *startup_source =
 " first-read-one_1)"
 "(begin"
 " 'loop"
-"(let-values(((c_74)"
+"(let-values(((c_73)"
 "(read-char/skip-whitespace-and-comments"
 " init-c_5"
 " whitespace-read-one_0"
@@ -49458,7 +49488,7 @@ static const char *startup_source =
 " seq-config_0)))"
 "(let-values(((ec_3)"
 "(effective-char"
-" c_74"
+" c_73"
 " seq-config_0)))"
 "(if(eqv? ec_3 closer_1)"
 "(let-values()"
@@ -49478,18 +49508,18 @@ static const char *startup_source =
 "((source_13)"
 "(read-config-source"
 " config_34)))"
-"(let-values(((c_75)"
+"(let-values(((c_74)"
 "(peek-char-or-special"
 " in_21"
 " skip-count_4"
 " 'special"
 " source_13)))"
 "(if(eq?"
-" c_75"
+" c_74"
 " 'special)"
 "(special1.1"
 " 'special)"
-" c_75)))"
+" c_74)))"
 " seq-config_0)"
 " #f)"
 " #f)"
@@ -49500,7 +49530,7 @@ static const char *startup_source =
 " dot-pos_0)"
 "(port-next-location*"
 " in_20"
-" c_74)))"
+" c_73)))"
 "(let-values((()"
 "(begin"
 "(track-indentation!"
@@ -49687,7 +49717,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((v_137)"
 "(read-one/not-eof_0"
-" c_74"
+" c_73"
 " first-read-one_1"
 " config/keep-comment_0)))"
 "(if(1/special-comment? v_137)"
@@ -49737,7 +49767,7 @@ static const char *startup_source =
 "(let-values()(if(check-parameter 1/read-curly-brace-with-tag config_36) '#%braces #f))"
 "(let-values() #f))))))"
 "(if tag_0(cons(wrap tag_0 in_23 config_36 #f) seq_1) seq_1)))))"
-" (define-values (not-an-fX.1$1) (lambda (who_7 v_61) (begin 'not-an-fX (raise-argument-error who_7 \"flonum?\" v_61))))"
+" (define-values (not-an-fX.1$1) (lambda (who_7 v_62) (begin 'not-an-fX (raise-argument-error who_7 \"flonum?\" v_62))))"
 "(define-values"
 "(read-digits12.1)"
 "(lambda(base1_0 init3_0 max-count2_0 zero-digits-result4_0 in10_1 config11_0 accum-str9_0)"
@@ -49751,18 +49781,18 @@ static const char *startup_source =
 "(let-values(((init-v_0) init3_0))"
 "(let-values(((zero-digits-result_0) zero-digits-result4_0))"
 "(let-values()"
-"(let-values(((c_68)"
+"(let-values(((c_67)"
 "(let-values(((in_24) in_6)"
 "((skip-count_6) 0)"
 "((source_15)(read-config-source config_16)))"
 "(let-values(((c_45)"
 "(peek-char-or-special in_24 skip-count_6 'special source_15)))"
 "(if(eq? c_45 'special)(special1.1 'special) c_45)))))"
-"(if(digit?$1 c_68 base_15)"
+"(if(digit?$1 c_67 base_15)"
 "(let-values()"
 "(begin"
-"(consume-char in_6 c_68)"
-"(if accum-str_0(let-values()(accum-string-add! accum-str_0 c_68))(void))"
+"(consume-char in_6 c_67)"
+"(if accum-str_0(let-values()(accum-string-add! accum-str_0 c_67))(void))"
 "((letrec-values(((loop_110)"
 "(lambda(v_200 max-count_1)"
 "(begin"
@@ -49770,7 +49800,7 @@ static const char *startup_source =
 "(if(zero? max-count_1)"
 "(let-values() v_200)"
 "(let-values()"
-"(let-values(((c_76)"
+"(let-values(((c_75)"
 "(let-values(((in_25) in_6)"
 "((skip-count_7) 0)"
 "((source_16)"
@@ -49784,23 +49814,23 @@ static const char *startup_source =
 "(if(eq? c_53 'special)"
 "(special1.1 'special)"
 " c_53)))))"
-"(if(digit?$1 c_76 base_15)"
+"(if(digit?$1 c_75 base_15)"
 "(let-values()"
 "(begin"
-"(consume-char in_6 c_76)"
+"(consume-char in_6 c_75)"
 "(if accum-str_0"
-"(let-values()(accum-string-add! accum-str_0 c_76))"
+"(let-values()(accum-string-add! accum-str_0 c_75))"
 "(void))"
 "(loop_110"
-"(+(digit->number c_76)(* v_200 base_15))"
+"(+(digit->number c_75)(* v_200 base_15))"
 "(sub1 max-count_1))))"
 "(let-values() v_200)))))))))"
 " loop_110)"
-"(+(digit->number c_68)(* init-v_0 base_15))"
+"(+(digit->number c_67)(* init-v_0 base_15))"
 "(sub1 max-count_0))))"
 "(if zero-digits-result_0"
 "(let-values() zero-digits-result_0)"
-"(let-values() c_68)))))))))))))))"
+"(let-values() c_67)))))))))))))))"
 "(define-values"
 "(digit?$1)"
 "(lambda(c_42 base_21)"
@@ -49815,22 +49845,22 @@ static const char *startup_source =
 "(define-values(octal-digit?)(lambda(c_43)(begin(if(char>=? c_43 '#\\0)(char<=? c_43 '#\\7) #f))))"
 "(define-values"
 "(hex-digit?)"
-"(lambda(c_77)"
+"(lambda(c_76)"
 "(begin"
-"(let-values(((or-part_266)(if(char>=? c_77 '#\\0)(char<=? c_77 '#\\9) #f)))"
+"(let-values(((or-part_266)(if(char>=? c_76 '#\\0)(char<=? c_76 '#\\9) #f)))"
 "(if or-part_266"
 " or-part_266"
-"(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))))))))"
+"(let-values(((or-part_312)(if(char>=? c_76 '#\\A)(char<=? c_76 '#\\F) #f)))"
+"(if or-part_312 or-part_312(if(char>=? c_76 '#\\a)(char<=? c_76 '#\\f) #f))))))))"
 "(define-values"
 "(digit->number)"
-"(lambda(c_78)"
+"(lambda(c_77)"
 "(begin"
-"(if(if(char>=? c_78 '#\\0)(char<=? c_78 '#\\9) #f)"
-"(let-values()(-(char->integer c_78)(char->integer '#\\0)))"
-"(if(if(char>=? c_78 '#\\A)(char<=? c_78 '#\\F) #f)"
-"(let-values()(-(char->integer c_78)(-(char->integer '#\\A) 10)))"
-"(let-values()(-(char->integer c_78)(-(char->integer '#\\a) 10))))))))"
+"(if(if(char>=? c_77 '#\\0)(char<=? c_77 '#\\9) #f)"
+"(let-values()(-(char->integer c_77)(char->integer '#\\0)))"
+"(if(if(char>=? c_77 '#\\A)(char<=? c_77 '#\\F) #f)"
+"(let-values()(-(char->integer c_77)(-(char->integer '#\\A) 10)))"
+"(let-values()(-(char->integer c_77)(-(char->integer '#\\a) 10))))))))"
 "(define-values(string->number$1) string->number)"
 "(define-values"
 "(1/string->number)"
@@ -49877,26 +49907,26 @@ static const char *startup_source =
 "                                         \"(or/c 'decimal-as-inexact decimal-as-exact)\""
 " decimal-mode_0)))"
 "(let-values(((s66_1) s_87)"
-"((temp67_3) 0)"
-"((temp68_3)(string-length s_87))"
+"((temp67_2) 0)"
+"((temp68_2)(string-length s_87))"
 "((radix69_0) radix_0)"
-"((temp70_1) #f)"
+"((temp70_2) #f)"
 "((decimal-mode71_0) decimal-mode_0)"
 "((convert-mode72_0) convert-mode_0))"
 "(do-string->number17.1"
 " #f"
-" temp70_1"
+" temp70_2"
 " s66_1"
-" temp67_3"
-" temp68_3"
+" temp67_2"
+" temp68_2"
 " radix69_0"
 " decimal-mode71_0"
 " convert-mode72_0))))))))))))))"
 "(case-lambda"
 "((s_308)(begin 'string->number(string->number5_0 s_308 10 'number-or-false unsafe-undefined)))"
-"((s_487 radix_1 convert-mode_1 decimal-mode3_1)(string->number5_0 s_487 radix_1 convert-mode_1 decimal-mode3_1))"
+"((s_488 radix_1 convert-mode_1 decimal-mode3_1)(string->number5_0 s_488 radix_1 convert-mode_1 decimal-mode3_1))"
 "((s_186 radix_2 convert-mode2_1)(string->number5_0 s_186 radix_2 convert-mode2_1 unsafe-undefined))"
-"((s_488 radix1_1)(string->number5_0 s_488 radix1_1 'number-or-false unsafe-undefined)))))"
+"((s_489 radix1_1)(string->number5_0 s_489 radix1_1 'number-or-false unsafe-undefined)))))"
 "(define-values"
 "(do-string->number17.1)"
 "(lambda(in-complex8_0 radix-set?7_0 s11_1 start12_0 end13_0 radix14_0 exactness15_0 convert-mode16_0)"
@@ -50030,7 +50060,7 @@ static const char *startup_source =
 "(char=? i_169 '#\\E)))"
 " 'exact"
 " 'inexact))"
-"((temp79_1)"
+"((temp79_0)"
 "(if(eq? convert-mode_2 'read)"
 " 'must-read"
 " convert-mode_2)))"
@@ -50042,7 +50072,7 @@ static const char *startup_source =
 " end75_0"
 " radix76_0"
 " temp78_2"
-" temp79_1)))))"
+" temp79_0)))))"
 "(let-values()"
 "(if(let-values(((or-part_212) radix-set?_0))"
 "(if or-part_212 or-part_212 in-complex_0))"
@@ -50070,7 +50100,7 @@ static const char *startup_source =
 "(let-values() 10)"
 "(let-values() 16)))))))"
 "(let-values(((s80_0) s_17)"
-"((temp81_0)(add1 next_4))"
+"((temp81_1)(add1 next_4))"
 "((end82_0) end_33)"
 "((radix83_0) radix_4)"
 "((temp84_1) #t)"
@@ -50083,7 +50113,7 @@ static const char *startup_source =
 " #f"
 " temp84_1"
 " s80_0"
-" temp81_0"
+" temp81_1"
 " end82_0"
 " radix83_0"
 " exactness85_0"
@@ -50118,7 +50148,7 @@ static const char *startup_source =
 " #f)"
 " #f)))"
 "(if c2_3"
-"((lambda(v_39)"
+"((lambda(v_40)"
 "(let-values(((s87_0) s_17)"
 "((temp88_1)(+ start_43 6))"
 "((temp89_2)(sub1 end_33))"
@@ -50126,7 +50156,7 @@ static const char *startup_source =
 "((exactness91_0) exactness_0)"
 "((convert-mode92_0) convert-mode_2)"
 "((temp93_1) 'i)"
-"((v94_0) v_39)"
+"((v94_0) v_40)"
 "((temp95_0)"
 "(lambda(v_238 v2_0)"
 "(begin 'temp95(make-rectangular v_238 v2_0)))))"
@@ -50406,8 +50436,8 @@ static const char *startup_source =
 " exactness_1"
 " convert-mode_3))))))))"
 "(let-values()"
-"(let-values(((c_79)(string-ref s_425 i_170)))"
-"(if(digit? c_79 radix_5)"
+"(let-values(((c_78)(string-ref s_425 i_170)))"
+"(if(digit? c_78 radix_5)"
 "(let-values()"
 "(loop_111"
 "(add1 i_170)"
@@ -50420,7 +50450,7 @@ static const char *startup_source =
 " slash-pos_0"
 " exp-pos_0"
 " must-i?_0))"
-"(if(char=? c_79 '#\\#)"
+"(if(char=? c_78 '#\\#)"
 "(let-values()"
 "(loop_111"
 "(add1 i_170)"
@@ -50433,7 +50463,7 @@ static const char *startup_source =
 " slash-pos_0"
 " exp-pos_0"
 " must-i?_0))"
-"(if(char-sign? c_79)"
+"(if(char-sign? c_78)"
 "(let-values()"
 "(if(if sign-pos_0 must-i?_0 #f)"
 "(let-values()"
@@ -50460,7 +50490,7 @@ static const char *startup_source =
 " or-part_314"
 "(> i_170(add1 @-pos_0))))"
 " #f)))))"
-"(if(char=? c_79 '#\\.)"
+"(if(char=? c_78 '#\\.)"
 "(let-values()"
 "(if(let-values(((or-part_315)"
 "(if exp-pos_0"
@@ -50510,7 +50540,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " must-i?_0)))))"
-"(if(char=? c_79 '#\\/)"
+"(if(char=? c_78 '#\\/)"
 "(let-values()"
 "(if(if dot-pos_1"
 "(let-values(((or-part_318)(not sign-pos_0)))"
@@ -50561,60 +50591,60 @@ static const char *startup_source =
 " i_170"
 " #f"
 " must-i?_0)))))"
-"(if(let-values(((or-part_321)(char=? c_79 '#\\e)))"
+"(if(let-values(((or-part_321)(char=? c_78 '#\\e)))"
 "(if or-part_321"
 " or-part_321"
-"(let-values(((or-part_322)(char=? c_79 '#\\E)))"
+"(let-values(((or-part_322)(char=? c_78 '#\\E)))"
 "(if or-part_322"
 " or-part_322"
 "(let-values(((or-part_323)"
-"(char=? c_79 '#\\f)))"
+"(char=? c_78 '#\\f)))"
 "(if or-part_323"
 " or-part_323"
 "(let-values(((or-part_324)"
-"(char=? c_79 '#\\F)))"
+"(char=? c_78 '#\\F)))"
 "(if or-part_324"
 " or-part_324"
 "(let-values(((or-part_325)"
-"(char=? c_79 '#\\d)))"
+"(char=? c_78 '#\\d)))"
 "(if or-part_325"
 " or-part_325"
 "(let-values(((or-part_181)"
-"(char=? c_79 '#\\D)))"
+"(char=? c_78 '#\\D)))"
 "(if or-part_181"
 " or-part_181"
 "(let-values(((or-part_326)"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\s)))"
 "(if or-part_326"
 " or-part_326"
 "(let-values(((or-part_327)"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\S)))"
 "(if or-part_327"
 " or-part_327"
 "(let-values(((or-part_209)"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\l)))"
 "(if or-part_209"
 " or-part_209"
 "(let-values(((or-part_328)"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\L)))"
 "(if or-part_328"
 " or-part_328"
 "(let-values(((or-part_173)"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\t)))"
 "(if or-part_173"
 " or-part_173"
 "(char=?"
-" c_79"
+" c_78"
 " '#\\T)))))))))))))))))))))))"
 "(let-values()"
 "(if exp-pos_0"
@@ -50623,7 +50653,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                           \"misplaced `~a` in `~.a`\""
-" c_79"
+" c_78"
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
 "(if(if(<(add1 i_170) end_34)"
@@ -50655,7 +50685,7 @@ static const char *startup_source =
 "(let-values(((or-part_330) exp-pos_0))"
 "(if or-part_330 or-part_330 i_170))"
 " must-i?_0)))))"
-"(if(char=? c_79 '#\\@)"
+"(if(char=? c_78 '#\\@)"
 "(let-values()"
 "(if(eq? in-complex_1 'i)"
 "(let-values()"
@@ -50665,9 +50695,9 @@ static const char *startup_source =
 "                                                                             \"cannot mix `@` and `i` in `~.a`\""
 "(substring s_425 start_44 end_34)))"
 "(let-values() #f)))"
-"(if(let-values(((or-part_160) @-pos_0))"
-"(if or-part_160"
-" or-part_160"
+"(if(let-values(((or-part_161) @-pos_0))"
+"(if or-part_161"
+" or-part_161"
 "(eq? in-complex_1 '@)))"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
@@ -50705,10 +50735,10 @@ static const char *startup_source =
 " #f"
 " must-i?_0)))))))"
 "(if(if(let-values(((or-part_331)"
-"(char=? c_79 '#\\i)))"
+"(char=? c_78 '#\\i)))"
 "(if or-part_331"
 " or-part_331"
-"(char=? c_79 '#\\I)))"
+"(char=? c_78 '#\\I)))"
 " sign-pos_0"
 " #f)"
 "(let-values()"
@@ -50748,7 +50778,7 @@ static const char *startup_source =
 " #f"
 " #f)))))"
 "(let-values()"
-"(if(char=? c_79 '#\\nul)"
+"(if(char=? c_78 '#\\nul)"
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
@@ -50757,7 +50787,7 @@ static const char *startup_source =
 "(let-values()"
 "(if(eq? convert-mode_3 'must-read)"
 "(let-values()"
-"                                                                              (format \"bad digit `~a`\" c_79))"
+"                                                                              (format \"bad digit `~a`\" c_78))"
 "(let-values() #f))))))))))))))))))))"
 " loop_111)"
 " start_44"
@@ -51093,7 +51123,7 @@ static const char *startup_source =
 " convert-mode_5))))))))))))"
 "(define-values"
 "(string->decimal-number)"
-"(lambda(s_489 start_46 end_36 dot-pos_3 radix_8 exactness_4 convert-mode_6)"
+"(lambda(s_490 start_46 end_36 dot-pos_3 radix_8 exactness_4 convert-mode_6)"
 "(begin"
 "(let-values(((get-exact?_0)"
 "(let-values(((or-part_187)(eq? exactness_4 'exact)))"
@@ -51109,23 +51139,23 @@ static const char *startup_source =
 "(let-values()"
 "(if(eq? convert-mode_6 'must-read)"
 "(let-values()"
-"                                            (format \"misplaced `#` in `~.a`\" (substring s_489 start_46 end_36)))"
+"                                            (format \"misplaced `#` in `~.a`\" (substring s_490 start_46 end_36)))"
 "(let-values() #f)))"
 "(let-values()"
 "(let-values(((n_34)(string->number$1 new-str_0 radix_8)))"
 "(if(not n_34)"
-"(let-values()(fail-bad-number convert-mode_6 s_489 start_46 end_36))"
+"(let-values()(fail-bad-number convert-mode_6 s_490 start_46 end_36))"
 "(if(not get-exact?_0)"
 "(let-values()"
-"(if(if(eqv? n_34 0)(char=?(string-ref s_489 start_46) '#\\-) #f)"
+"(if(if(eqv? n_34 0)(char=?(string-ref s_490 start_46) '#\\-) #f)"
 " -0.0"
 "(exact->inexact n_34)))"
 "(if(if dot-pos_3 get-exact?_0 #f)"
 "(let-values()(/ n_34(expt 10(- end_36 dot-pos_3 1))))"
 "(let-values() n_34))))))))"
 "(let-values()"
-"(let-values(((c_80)(string-ref s_489 i_171)))"
-"(if(char=? c_80 '#\\.)"
+"(let-values(((c_79)(string-ref s_490 i_171)))"
+"(if(char=? c_79 '#\\.)"
 "(let-values()"
 "(if get-exact?_0"
 "(let-values()"
@@ -51135,21 +51165,21 @@ static const char *startup_source =
 "(if(= hashes-pos_0(add1 i_171)) i_171 hashes-pos_0)))"
 "(let-values()"
 "(begin"
-"(string-set! new-str_0 j_3 c_80)"
+"(string-set! new-str_0 j_3 c_79)"
 "(loop_112"
 "(sub1 i_171)"
 "(sub1 j_3)"
 "(if(= hashes-pos_0(add1 i_171)) i_171 hashes-pos_0))))))"
-"(if(let-values(((or-part_346)(char=? c_80 '#\\-)))"
-"(if or-part_346 or-part_346(char=? c_80 '#\\+)))"
+"(if(let-values(((or-part_346)(char=? c_79 '#\\-)))"
+"(if or-part_346 or-part_346(char=? c_79 '#\\+)))"
 "(let-values()"
 "(begin"
-"(string-set! new-str_0 j_3 c_80)"
+"(string-set! new-str_0 j_3 c_79)"
 "(loop_112"
 "(sub1 i_171)"
 "(sub1 j_3)"
 "(if(= hashes-pos_0(add1 i_171)) i_171 hashes-pos_0))))"
-"(if(char=? c_80 '#\\#)"
+"(if(char=? c_79 '#\\#)"
 "(let-values()"
 "(if(= hashes-pos_0(add1 i_171))"
 "(let-values()"
@@ -51161,11 +51191,11 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                       \"misplaced `#` in `~.a`\""
-"(substring s_489 start_46 end_36)))"
+"(substring s_490 start_46 end_36)))"
 "(let-values() #f)))))"
 "(let-values()"
 "(begin"
-"(string-set! new-str_0 j_3 c_80)"
+"(string-set! new-str_0 j_3 c_79)"
 "(loop_112(sub1 i_171)(sub1 j_3) hashes-pos_0)))))))))))))"
 " loop_112)"
 "(sub1 end_36)"
@@ -51173,48 +51203,48 @@ static const char *startup_source =
 " end_36))))))"
 "(define-values"
 "(string->exact-integer-number)"
-"(lambda(s_490 start_47 end_37 radix_9 convert-mode_7)"
+"(lambda(s_491 start_47 end_37 radix_9 convert-mode_7)"
 "(begin"
-"(if(hashes? s_490 start_47 end_37)"
+"(if(hashes? s_491 start_47 end_37)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_490 start_47 end_37)))"
+"            (let-values () (format \"misplaced `#` in `~.a`\" (substring s_491 start_47 end_37)))"
 "(let-values() #f)))"
 "(let-values()"
-"(let-values(((n_35)(string->number$1(maybe-substring s_490 start_47 end_37) radix_9)))"
+"(let-values(((n_35)(string->number$1(maybe-substring s_491 start_47 end_37) radix_9)))"
 "(if(not n_35)"
 "(let-values()"
 "(if(eq? convert-mode_7 'must-read)"
-"                  (let-values () (format \"bad exponent `~.a`\" (substring s_490 start_47 end_37)))"
+"                  (let-values () (format \"bad exponent `~.a`\" (substring s_491 start_47 end_37)))"
 "(let-values() #f)))"
 "(let-values() n_35))))))))"
 "(define-values"
 "(read-special-number)"
-"(lambda(s_472 start_48 end_38 convert-mode_8)"
+"(lambda(s_473 start_48 end_38 convert-mode_8)"
 "(begin"
 "(if(=(- end_38 start_48) 6)"
-"(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) '#\\-)))"
+"(if(let-values(((or-part_347)(char=?(string-ref s_473 start_48) '#\\+)))"
+"(if or-part_347 or-part_347(char=?(string-ref s_473 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))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 1))) '#\\i)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 2))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 3))) '#\\f)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 4))) '#\\.)"
 "(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)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\0)"
+"(if(char=?(string-ref s_473 start_48) '#\\+) +inf.0 -inf.0)"
 " #f)))"
 "(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)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\f)"
+"(if(char=?(string-ref s_473 start_48) '#\\+) +inf.f -inf.f)"
 " #f)))"
 "(if or-part_350"
 " or-part_350"
-"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_473(+ 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)"
+"(if(char=?(string-ref s_473 start_48) '#\\+) '+inf.t '-inf.t)"
 " #f)"
 " #f)))))"
 " #f)"
@@ -51223,19 +51253,19 @@ static const char *startup_source =
 " #f)))"
 "(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))) '#\\.)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 1))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 2))) '#\\a)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 3))) '#\\n)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 4))) '#\\.)"
 "(let-values(((or-part_351)"
-"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\0) +nan.0 #f)))"
+"(if(char=?(char-downcase(string-ref s_473(+ 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(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\f) +nan.f #f)))"
 "(if or-part_352"
 " or-part_352"
-"(if(char=?(char-downcase(string-ref s_472(+ start_48 5))) '#\\t)"
+"(if(char=?(char-downcase(string-ref s_473(+ start_48 5))) '#\\t)"
 "(if(not(eq? convert-mode_8 'number-or-false)) '+nan.t #f)"
 " #f)))))"
 " #f)"
@@ -51265,7 +51295,7 @@ static const char *startup_source =
 " combine61_0)"
 "(begin"
 " 'read-for-special-compound62"
-"(let-values(((s_491) s54_0))"
+"(let-values(((s_492) s54_0))"
 "(let-values(((start_49) start55_0))"
 "(let-values(((end_39) end56_0))"
 "(let-values(((radix_10) radix57_0))"
@@ -51288,7 +51318,7 @@ static const char *startup_source =
 "(let-values()(fail-extflonum convert-mode_10 v_240))"
 "(let-values()"
 "(let-values(((v2_7)"
-"(let-values(((s173_0) s_491)"
+"(let-values(((s173_0) s_492)"
 "((start174_0) start_49)"
 "((end175_0) end_39)"
 "((radix176_0) radix_10)"
@@ -51320,30 +51350,30 @@ static const char *startup_source =
 "(normalise-inputs"
 " 'in-string"
 "                     \"string\""
-"(lambda(x_85)(string? x_85))"
-"(lambda(x_86)(unsafe-string-length x_86))"
+"(lambda(x_86)(string? x_86))"
+"(lambda(x_87)(unsafe-string-length x_87))"
 " s_263"
 " start_50"
 " end_40"
 " 1)))"
 "(begin"
 " #t"
-"((letrec-values(((for-loop_272)"
+"((letrec-values(((for-loop_271)"
 "(lambda(result_121 idx_5)"
 "(begin"
 " 'for-loop"
 "(if(unsafe-fx< idx_5 stop*_6)"
-"(let-values(((c_81)(string-ref v*_6 idx_5)))"
+"(let-values(((c_80)(string-ref v*_6 idx_5)))"
 "(let-values(((result_122)"
 "(let-values()"
 "(let-values(((result_123)"
-"(let-values()(let-values()(char=? c_81 '#\\#)))))"
+"(let-values()(let-values()(char=? c_80 '#\\#)))))"
 "(values result_123)))))"
-"(if(if(not((lambda x_87 result_122) c_81))(not #f) #f)"
-"(for-loop_272 result_122(unsafe-fx+ idx_5 1))"
+"(if(if(not((lambda x_88 result_122) c_80))(not #f) #f)"
+"(for-loop_271 result_122(unsafe-fx+ idx_5 1))"
 " result_122)))"
 " result_121)))))"
-" for-loop_272)"
+" for-loop_271)"
 " #f"
 " start*_5))))))"
 "(define-values"
@@ -51356,8 +51386,8 @@ static const char *startup_source =
 "(normalise-inputs"
 " 'in-string"
 "                         \"string\""
-"(lambda(x_88)(string? x_88))"
-"(lambda(x_89)(unsafe-string-length x_89))"
+"(lambda(x_89)(string? x_89))"
+"(lambda(x_90)(unsafe-string-length x_90))"
 " s_271"
 " start_51"
 " end_41"
@@ -51368,26 +51398,26 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_52)))"
-"((letrec-values(((for-loop_273)"
+"((letrec-values(((for-loop_272)"
 "(lambda(idx_6 pos_115)"
 "(begin"
 " 'for-loop"
 "(if(if(unsafe-fx< idx_6 stop*_7) #t #f)"
-"(let-values(((c_82)(string-ref v*_7 idx_6))((i_121) pos_115))"
+"(let-values(((c_81)(string-ref v*_7 idx_6))((i_121) pos_115))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(char=? c_82 '#\\#)"
+"(if(char=? c_81 '#\\#)"
 "(string-set! new-s_9 i_121 '#\\0)"
-"(string-set! new-s_9 i_121 c_82)))"
+"(string-set! new-s_9 i_121 c_81)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_273(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
+"(if(not #f)(for-loop_272(unsafe-fx+ idx_6 1)(+ pos_115 1))(values))))"
 "(values))))))"
-" for-loop_273)"
+" for-loop_272)"
 " start*_6"
 " start_52)))"
 "(void)"
@@ -51403,13 +51433,13 @@ static const char *startup_source =
 "(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_354)(char=? c_83 '#\\-)))(if or-part_354 or-part_354(char=? c_83 '#\\+))))))"
+"(lambda(c_82)"
+"(begin(let-values(((or-part_354)(char=? c_82 '#\\-)))(if or-part_354 or-part_354(char=? c_82 '#\\+))))))"
 "(define-values"
 "(digit?)"
-"(lambda(c_84 radix_11)"
+"(lambda(c_83 radix_11)"
 "(begin"
-"(let-values(((v_241)(char->integer c_84)))"
+"(let-values(((v_241)(char->integer c_83)))"
 "(let-values(((or-part_355)"
 "(if(>= v_241(char->integer '#\\0))(<(- v_241(char->integer '#\\0)) radix_11) #f)))"
 "(if or-part_355"
@@ -51510,7 +51540,7 @@ static const char *startup_source =
 " foldcase-from_0)"
 "(begin"
 " 'loop"
-"(let-values(((c_85)"
+"(let-values(((c_84)"
 "(let-values(((or-part_82)"
 " init-c_7))"
 "(if or-part_82"
@@ -51536,20 +51566,20 @@ static const char *startup_source =
 "(let-values(((ec_4)"
 "(let-values(((rt_11)"
 " rt_10)"
-"((c_70)"
-" c_85))"
+"((c_69)"
+" c_84))"
 "(if(let-values(((or-part_357)"
 "(not"
 " rt_11)))"
 "(if or-part_357"
 " or-part_357"
 "(not"
-"(char? c_70))))"
-"(let-values() c_70)"
+"(char? c_69))))"
+"(let-values() c_69)"
 "(let-values()"
 "(*readtable-effective-char"
 " rt_11"
-" c_70))))))"
+" c_69))))))"
 "(if(if pipe-quote-c_0"
 "(not(char? ec_4))"
 " #f)"
@@ -51561,14 +51591,14 @@ static const char *startup_source =
 "(consume-char/special"
 " in_26"
 " config_37"
-" c_85)))"
+" c_84)))"
 "(unexpected-quoted_0"
-" c_85"
+" c_84"
 " pipe-quote-c_0)))"
 "(if(if(not pipe-quote-c_0)"
 "(readtable-char-delimiter?"
 " rt_10"
-" c_85"
+" c_84"
 " config_37)"
 " #f)"
 "(let-values()"
@@ -51580,7 +51610,7 @@ static const char *startup_source =
 " string-foldcase"
 " foldcase-from_0))))"
 "(if(if pipe-quote-c_0"
-"(char=? c_85 pipe-quote-c_0)"
+"(char=? c_84 pipe-quote-c_0)"
 " #f)"
 "(let-values()"
 "(begin"
@@ -51589,7 +51619,7 @@ static const char *startup_source =
 "(let-values()"
 "(consume-char"
 " in_26"
-" c_85)))"
+" c_84)))"
 "(loop_102"
 " #f"
 " #f"
@@ -51607,7 +51637,7 @@ static const char *startup_source =
 "(let-values()"
 "(consume-char"
 " in_26"
-" c_85)))"
+" c_84)))"
 "(set! quoted-ever?_0 #t)"
 "(if case-sens?_0"
 "(void)"
@@ -51618,7 +51648,7 @@ static const char *startup_source =
 " foldcase-from_0)))"
 "(loop_102"
 " #f"
-" c_85"
+" c_84"
 "(accum-string-count"
 " accum-str_1))))"
 "(if(if(char=? ec_4 '#\\\\)"
@@ -51632,7 +51662,7 @@ static const char *startup_source =
 "(let-values()"
 "(consume-char"
 " in_26"
-" c_85)))"
+" c_84)))"
 "(values))))"
 "(let-values(((next-c_0)"
 "(let-values(((in_28)"
@@ -51649,7 +51679,7 @@ static const char *startup_source =
 "(let-values()"
 "(unexpected-quoted_0"
 " next-c_0"
-" c_85)))"
+" c_84)))"
 "(if(let-values(((or-part_54)"
 " pipe-quote-c_0))"
 "(if or-part_54"
@@ -51678,10 +51708,10 @@ static const char *startup_source =
 "(let-values()"
 "(consume-char"
 " in_26"
-" c_85)))"
+" c_84)))"
 "(accum-string-add!"
 " accum-str_1"
-" c_85)"
+" c_84)"
 "(loop_102"
 " #f"
 " pipe-quote-c_0"
@@ -51813,16 +51843,16 @@ static const char *startup_source =
 "(begin"
 "(let-values(((c_14)(read-char/skip-whitespace-and-comments init-c_8 read-one_4 in_20 config_38)))"
 "(let-values(((line_9 col_8 pos_94)(port-next-location* in_20 c_14)))"
-"          (let-values (((v_31) (read-number-literal c_14 in_20 config_38 \"#i\")))"
-"(if(flonum? v_31)"
-"(let-values() v_31)"
-"(if(eof-object? v_31)"
-"(let-values() v_31)"
+"          (let-values (((v_32) (read-number-literal c_14 in_20 config_38 \"#i\")))"
+"(if(flonum? v_32)"
+"(let-values() v_32)"
+"(if(eof-object? v_32)"
+"(let-values() v_32)"
 "(let-values()"
 "(let-values(((in5_0) in_20)"
 "((temp6_1)(reading-at config_38 line_9 col_8 pos_94))"
 "                               ((temp7_4) \"expected a flonum, found ~a\")"
-"((v8_0) v_31))"
+"((v8_0) v_32))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -51911,7 +51941,7 @@ static const char *startup_source =
 "                                                               \"exact-nonnegative-integer?\""
 " len_37)))"
 "(let-values(((fill_0) 0))"
-"(let-values(((v_35)(make-fxvector len_37 fill_0)))"
+"(let-values(((v_36)(make-fxvector len_37 fill_0)))"
 "(begin"
 "(if(zero? len_37)"
 "(void)"
@@ -51922,7 +51952,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_264)))"
-"((letrec-values(((for-loop_274)"
+"((letrec-values(((for-loop_273)"
 "(lambda(i_3 lst_104)"
 "(begin"
 " 'for-loop"
@@ -51945,7 +51975,7 @@ static const char *startup_source =
 "(if(fixnum?"
 " elem_0)"
 "(unsafe-fxvector-set!"
-" v_35"
+" v_36"
 " i_94"
 " elem_0)"
 "(not-an-fX.1"
@@ -51957,22 +51987,22 @@ static const char *startup_source =
 "(values"
 " i_173)))))"
 "(if(if(not"
-"((lambda x_90"
+"((lambda x_91"
 "(unsafe-fx="
 " i_172"
 " len_37))"
 " e_78))"
 "(not #f)"
 " #f)"
-"(for-loop_274"
+"(for-loop_273"
 " i_172"
 " rest_145)"
 " i_172)))"
 " i_3)))))"
-" for-loop_274)"
+" for-loop_273)"
 " 0"
 " lst_264)))))"
-" v_35))))))"
+" v_36))))))"
 "(if(equal? tmp_42 'flonum)"
 "(let-values()"
 "(let-values(((len_38)(length seq_2)))"
@@ -52031,7 +52061,7 @@ static const char *startup_source =
 "(values"
 " i_153)))))"
 "(if(if(not"
-"((lambda x_91"
+"((lambda x_92"
 "(unsafe-fx="
 " i_42"
 " len_38))"
@@ -52138,7 +52168,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-naturals start_54)))"
-"((letrec-values(((for-loop_263)"
+"((letrec-values(((for-loop_262)"
 "(lambda(lst_299 pos_117)"
 "(begin"
 " 'for-loop"
@@ -52166,12 +52196,12 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_263"
+"(for-loop_262"
 " rest_175"
 "(+ pos_117 1))"
 "(values))))"
 "(values))))))"
-" for-loop_263)"
+" for-loop_262)"
 " lst_8"
 " start_54)))"
 "(void)))"
@@ -52240,7 +52270,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-naturals start_56)))"
-"((letrec-values(((for-loop_275)"
+"((letrec-values(((for-loop_274)"
 "(lambda(lst_98 pos_118)"
 "(begin"
 " 'for-loop"
@@ -52269,14 +52299,14 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_275"
+"(for-loop_274"
 " rest_176"
 "(+"
 " pos_118"
 " 1))"
 "(values))))"
 "(values))))))"
-" for-loop_275)"
+" for-loop_274)"
 " lst_306"
 " start_56)))"
 "(void)))"
@@ -52285,7 +52315,7 @@ static const char *startup_source =
 "(wrap vec_61 in_30 config_10 opener_2))))))))))))))))"
 "(define-values"
 "(read-fixnum-or-flonum-vector)"
-"(lambda(read-one_6 dispatch-c_0 c_86 c2_4 in_32 config_41)"
+"(lambda(read-one_6 dispatch-c_0 c_85 c2_4 in_32 config_41)"
 "(begin"
 "(let-values(((vector-mode_1)(if(char=? c2_4 '#\\x) 'fixnum 'flonum)))"
 "(let-values((()(begin(consume-char in_32 c2_4)(values))))"
@@ -52359,15 +52389,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in48_0) in_32)"
 "((config49_0) config_41)"
-"                                         ((temp50_1) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_86 c2_4))))"
-"(bad-syntax-error20.1 '#\\x in48_0 config49_0 temp50_1)))))"
+"                                         ((temp50_2) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_85 c2_4))))"
+"(bad-syntax-error20.1 '#\\x in48_0 config49_0 temp50_2)))))"
 "(if(equal? tmp_46 '#\\{)"
 "(let-values()"
 "(if(check-parameter 1/read-curly-brace-as-paren config_41)"
 "(let-values()"
 "(let-values(((read-one51_0) read-one_6)"
 "((temp52_1) '#\\{)"
-"((temp53_3) '#\\{)"
+"((temp53_2) '#\\{)"
 "((temp54_0) '#\\})"
 "((in55_1) in_32)"
 "((config56_0) config_41)"
@@ -52378,21 +52408,21 @@ static const char *startup_source =
 " vector-mode57_0"
 " read-one51_0"
 " temp52_1"
-" temp53_3"
+" temp53_2"
 " temp54_0"
 " in55_1"
 " config56_0)))"
 "(let-values()"
 "(let-values(((in59_0) in_32)"
 "((config60_0) config_41)"
-"                                           ((temp61_3) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_86 c2_4))))"
-"(bad-syntax-error20.1 '#\\x in59_0 config60_0 temp61_3)))))"
+"                                           ((temp61_2) (format \"~a~a\" dispatch-c_0 (format \"~a~a\" c_85 c2_4))))"
+"(bad-syntax-error20.1 '#\\x in59_0 config60_0 temp61_2)))))"
 "(let-values()"
 "(let-values(((in62_0) in_32)"
 "((config63_0) config_41)"
 "((c464_0) c4_1)"
 "                                       ((temp65_2) \"expected `(`, `[`, or `{` after `#~a~a~a`\")"
-"((c66_0) c_86)"
+"((c66_0) c_85)"
 "((c267_0) c2_4)"
 "((len-str68_0) len-str_0))"
 "(reader-error12.1"
@@ -52593,7 +52623,7 @@ static const char *startup_source =
 "(let-values(((accum-str_3)(accum-string-init! config_44)))"
 "(let-values((()(begin(accum-string-add! accum-str_3 init-c_13)(values))))"
 "(let-values(((init-v_2)(digit->number init-c_13)))"
-"(let-values(((v_30)"
+"(let-values(((v_31)"
 "(let-values(((in1_5) in_37)"
 "((config2_4) config_44)"
 "((accum-str3_0) accum-str_3)"
@@ -52613,22 +52643,22 @@ static const char *startup_source =
 "(let-values(((accum-str8_0) accum-str_3)((config9_0) config_44))"
 "(accum-string-get!6.1 0 accum-str8_0 config9_0))"
 " c_52)))))"
-"(let-values(((c_87)"
+"(let-values(((c_86)"
 "(let-values(((in_38) in_37)((source_16)(read-config-source config_44)))"
 "(read-char-or-special in_38 special1.1 source_16))))"
-"(let-values(((ec_6)(effective-char c_87 config_44)))"
+"(let-values(((ec_6)(effective-char c_86 config_44)))"
 "(let-values(((tmp_48) ec_6))"
 "(if(equal? tmp_48 '#\\()"
 "(let-values()"
 "(begin"
 "(accum-string-abandon! accum-str_3 config_44)"
 "(let-values(((read-one10_0) read-one_3)"
-"((c11_0) c_87)"
+"((c11_0) c_86)"
 "((temp12_4) '#\\()"
 "((temp13_2) '#\\))"
 "((in14_0) in_37)"
 "((config15_0) config_44)"
-"((v16_0) v_30))"
+"((v16_0) v_31))"
 "(read-vector11.1 v16_0 'any read-one10_0 c11_0 temp12_4 temp13_2 in14_0 config15_0))))"
 "(if(equal? tmp_48 '#\\[)"
 "(let-values()"
@@ -52637,12 +52667,12 @@ static const char *startup_source =
 "(if(check-parameter 1/read-square-bracket-as-paren config_44)"
 "(let-values()"
 "(let-values(((read-one17_0) read-one_3)"
-"((c18_1) c_87)"
+"((c18_1) c_86)"
 "((temp19_3) '#\\[)"
 "((temp20_3) '#\\])"
 "((in21_0) in_37)"
 "((config22_0) config_44)"
-"((v23_0) v_30))"
+"((v23_0) v_31))"
 "(read-vector11.1"
 " v23_0"
 " 'any"
@@ -52655,7 +52685,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in24_0) in_37)"
 "((config25_0) config_44)"
-"((temp26_4)(get-accum_0(get-accum_0 c_87))))"
+"((temp26_4)(get-accum_0(get-accum_0 c_86))))"
 "(bad-syntax-error20.1 '#\\x in24_0 config25_0 temp26_4))))))"
 "(if(equal? tmp_48 '#\\{)"
 "(let-values()"
@@ -52664,12 +52694,12 @@ static const char *startup_source =
 "(if(check-parameter 1/read-curly-brace-as-paren config_44)"
 "(let-values()"
 "(let-values(((read-one27_0) read-one_3)"
-"((c28_0) c_87)"
+"((c28_0) c_86)"
 "((temp29_6) '#\\{)"
 "((temp30_6) '#\\})"
 "((in31_1) in_37)"
 "((config32_0) config_44)"
-"((v33_0) v_30))"
+"((v33_0) v_31))"
 "(read-vector11.1"
 " v33_0"
 " 'any"
@@ -52682,10 +52712,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in34_1) in_37)"
 "((config35_1) config_44)"
-"((temp36_6)(get-accum_0(get-accum_0 c_87))))"
+"((temp36_6)(get-accum_0(get-accum_0 c_86))))"
 "(bad-syntax-error20.1 '#\\x in34_1 config35_1 temp36_6))))))"
 "(let-values()"
-"(let-values(((tmp_45) c_87))"
+"(let-values(((tmp_45) c_86))"
 "(if(if(equal? tmp_45 '#\\=) #t(equal? tmp_45 '#\\#))"
 "(let-values()"
 "(begin"
@@ -52697,7 +52727,7 @@ static const char *startup_source =
 "(let-values(((in37_1) in_37)"
 "((config38_0) config_44)"
 "                                                         ((temp39_4) \"`#...~a` forms not ~a\")"
-"((c40_0) c_87)"
+"((c40_0) c_86)"
 "((temp41_3)"
 "(if(read-config-for-syntax? config_44)"
 "                                                            \"enabled\""
@@ -52723,7 +52753,7 @@ static const char *startup_source =
 "(let-values(((accum-str48_0) accum-str_3)"
 "((config49_1) config_44))"
 "(accum-string-get!6.1 0 accum-str48_0 config49_1)))"
-"((c47_0) c_87))"
+"((c47_0) c_86))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -52733,14 +52763,14 @@ static const char *startup_source =
 " config43_0"
 " temp44_2"
 "(list dispatch-c45_0 temp46_1 c47_0)))))"
-"(let-values(((tmp_49) c_87))"
+"(let-values(((tmp_49) c_86))"
 "(if(equal? tmp_49 '#\\=)"
 "(let-values()"
 "(let-values(((ph_1)(make-placeholder 'placeholder)))"
 "(let-values(((ht_145)(get-graph-hash config_44)))"
 "(let-values((()"
 "(begin"
-"(if(hash-ref ht_145 v_30 #f)"
+"(if(hash-ref ht_145 v_31 #f)"
 "(let-values()"
 "(let-values(((in50_0) in_37)"
 "((config51_0) config_44)"
@@ -52755,7 +52785,7 @@ static const char *startup_source =
 " 0"
 " accum-str56_0"
 " config57_0)))"
-"((c55_0) c_87))"
+"((c55_0) c_86))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -52767,7 +52797,7 @@ static const char *startup_source =
 "(list dispatch-c53_0 temp54_1 c55_0))))"
 "(void))"
 "(values))))"
-"(let-values((()(begin(hash-set! ht_145 v_30 ph_1)(values))))"
+"(let-values((()(begin(hash-set! ht_145 v_31 ph_1)(values))))"
 "(let-values(((result-v_0)"
 "(read-one_3 #f in_37(next-readtable config_44))))"
 "(begin"
@@ -52776,17 +52806,17 @@ static const char *startup_source =
 "(let-values(((in58_0) in_37)"
 "((config59_0) config_44)"
 "((result-v60_0) result-v_0)"
-"((temp61_4)"
+"((temp61_3)"
 "                                                                            \"expected an element for graph after `~a~a~a`, found end-of-file\")"
 "((dispatch-c62_0) dispatch-c_1)"
-"((temp63_3)"
+"((temp63_4)"
 "(let-values(((accum-str65_0) accum-str_3)"
 "((config66_0) config_44))"
 "(accum-string-get!6.1"
 " 0"
 " accum-str65_0"
 " config66_0)))"
-"((c64_0) c_87))"
+"((c64_0) c_86))"
 "(reader-error12.1"
 " unsafe-undefined"
 " result-v60_0"
@@ -52794,8 +52824,8 @@ static const char *startup_source =
 " unsafe-undefined"
 " in58_0"
 " config59_0"
-" temp61_4"
-"(list dispatch-c62_0 temp63_3 c64_0))))"
+" temp61_3"
+"(list dispatch-c62_0 temp63_4 c64_0))))"
 "(void))"
 "(accum-string-abandon! accum-str_3 config_44)"
 "(placeholder-set! ph_1 result-v_0)"
@@ -52807,19 +52837,19 @@ static const char *startup_source =
 "(let-values(((or-part_210)"
 "(read-config-state-graph(read-config-st config_44))))"
 "(if or-part_210 or-part_210 '#hash()))"
-" v_30"
+" v_31"
 "(lambda()"
 "(let-values(((in67_0) in_37)"
 "((config68_0) config_44)"
-"                                                                  ((temp69_1) \"no preceding `~a~a=` for `~a~a~a`\")"
+"                                                                  ((temp69_2) \"no preceding `~a~a=` for `~a~a~a`\")"
 "((dispatch-c70_0) dispatch-c_1)"
-"((v71_0) v_30)"
+"((v71_0) v_31)"
 "((dispatch-c72_0) dispatch-c_1)"
 "((temp73_1)"
 "(let-values(((accum-str75_0) accum-str_3)"
 "((config76_0) config_44))"
 "(accum-string-get!6.1 0 accum-str75_0 config76_0)))"
-"((c74_0) c_87))"
+"((c74_0) c_86))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -52827,16 +52857,16 @@ static const char *startup_source =
 " unsafe-undefined"
 " in67_0"
 " config68_0"
-" temp69_1"
+" temp69_2"
 "(list dispatch-c70_0 v71_0 dispatch-c72_0 temp73_1 c74_0)))))"
 "(accum-string-abandon! accum-str_3 config_44)))"
 "(let-values()(void)))))))"
 "(let-values()"
 "(let-values(((in77_0) in_37)"
 "((config78_0) config_44)"
-"((c79_0) c_87)"
+"((c79_0) c_86)"
 "                                                   ((temp80_0) \"bad syntax `~a`\")"
-"((temp81_1)(get-accum_0 c_87)))"
+"((temp81_2)(get-accum_0 c_86)))"
 "(reader-error12.1"
 " unsafe-undefined"
 " c79_0"
@@ -52845,7 +52875,7 @@ static const char *startup_source =
 " in77_0"
 " config78_0"
 " temp80_0"
-"(list temp81_1))))))))))))))))))))))"
+"(list temp81_2))))))))))))))))))))))"
 "(define-values"
 "(get-graph-hash)"
 "(lambda(config_45)"
@@ -53108,8 +53138,8 @@ static const char *startup_source =
 "(let-values(((in47_1) in_37)"
 "((config48_1) config_44)"
 "((c49_0) c_50)"
-"                                                                                         ((temp50_2) \"bad syntax `~a`\")"
-"((temp51_1)"
+"                                                                                         ((temp50_3) \"bad syntax `~a`\")"
+"((temp51_2)"
 "(let-values(((accum-str52_0)"
 " accum-str_3)"
 "((config53_0)"
@@ -53125,8 +53155,8 @@ static const char *startup_source =
 " unsafe-undefined"
 " in47_1"
 " config48_1"
-" temp50_2"
-"(list temp51_1)))))))))))))))))"
+" temp50_3"
+"(list temp51_2)))))))))))))))))"
 " loop_114)"
 " 'equal)))"
 "(let-values(((graph?_0)(if(read-config-state-graph(read-config-st config_44)) #t #f)))"
@@ -53152,9 +53182,9 @@ static const char *startup_source =
 "(lambda(read-one_8 overall-opener-c_0 overall-closer-ec_0 prefix-end-pos_0)"
 "(begin"
 "(lambda(init-c_14 in_41 config_46)"
-"(let-values(((c_88)(read-char/skip-whitespace-and-comments init-c_14 read-one_8 in_41 config_46)))"
-"(let-values(((open-line_0 open-col_0 open-pos_0)(port-next-location* in_41 c_88)))"
-"(let-values(((ec_8)(effective-char c_88 config_46)))"
+"(let-values(((c_87)(read-char/skip-whitespace-and-comments init-c_14 read-one_8 in_41 config_46)))"
+"(let-values(((open-line_0 open-col_0 open-pos_0)(port-next-location* in_41 c_87)))"
+"(let-values(((ec_8)(effective-char c_87 config_46)))"
 "(let-values(((elem-config_1)(next-readtable config_46)))"
 "(let-values(((closer_4)"
 "(let-values(((tmp_52) ec_8))"
@@ -53169,14 +53199,14 @@ static const char *startup_source =
 "(let-values() #f)))))))"
 "(if(not closer_4)"
 "(let-values()"
-"(if(eof-object? c_88)"
+"(if(eof-object? c_87)"
 "(let-values()"
 "(let-values(((in54_0) in_41)"
 "((config55_0) config_46)"
-"((c56_0) c_88)"
+"((c56_0) c_87)"
 "((prefix-end-pos57_0) prefix-end-pos_0)"
-"                                       ((temp58_2) \"expected ~a to close `~a`\")"
-"((temp59_4)(closer-name overall-closer-ec_0 config_46))"
+"                                       ((temp58_3) \"expected ~a to close `~a`\")"
+"((temp59_5)(closer-name overall-closer-ec_0 config_46))"
 "((overall-opener-c60_0) overall-opener-c_0))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -53185,25 +53215,25 @@ static const char *startup_source =
 " unsafe-undefined"
 " in54_0"
 " config55_0"
-" temp58_2"
-"(list temp59_4 overall-opener-c60_0))))"
+" temp58_3"
+"(list temp59_5 overall-opener-c60_0))))"
 "(if(char-closer? ec_8 config_46)"
 "(let-values()"
 "(let-values(((in61_0) in_41)"
-"((temp62_2)(reading-at config_46 open-line_0 open-col_0 open-pos_0))"
-"                                         ((temp63_4) \"~a\")"
-"((temp64_4)(indentation-unexpected-closer-message ec_8 c_88 config_46)))"
+"((temp62_3)(reading-at config_46 open-line_0 open-col_0 open-pos_0))"
+"                                         ((temp63_5) \"~a\")"
+"((temp64_4)(indentation-unexpected-closer-message ec_8 c_87 config_46)))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
 " #f"
 " unsafe-undefined"
 " in61_0"
-" temp62_2"
-" temp63_4"
+" temp62_3"
+" temp63_5"
 "(list temp64_4))))"
 "(let-values()"
-"(let-values(((v_244)(read-one_8 c_88 in_41(keep-comment elem-config_1))))"
+"(let-values(((v_244)(read-one_8 c_87 in_41(keep-comment elem-config_1))))"
 "(if(1/special-comment? v_244)"
 "(let-values()"
 "((make-read-one-key+value"
@@ -53217,8 +53247,8 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((in65_0) in_41)"
 "((temp66_3)(reading-at config_46 open-line_0 open-col_0 open-pos_0))"
-"                                               ((temp67_4) \"expected ~a to start a hash pair\")"
-"((temp68_4)(all-openers-str config_46)))"
+"                                               ((temp67_3) \"expected ~a to start a hash pair\")"
+"((temp68_3)(all-openers-str config_46)))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -53226,10 +53256,10 @@ static const char *startup_source =
 " unsafe-undefined"
 " in65_0"
 " temp66_3"
-" temp67_4"
-"(list temp68_4))))))))))"
+" temp67_3"
+"(list temp68_3))))))))))"
 "(let-values()"
-"(let-values(((k_41)(read-one_8 #f in_41(disable-wrapping elem-config_1))))"
+"(let-values(((k_42)(read-one_8 #f in_41(disable-wrapping elem-config_1))))"
 "(let-values(((dot-c_0)(read-char/skip-whitespace-and-comments #f read-one_8 in_41 config_46)))"
 "(let-values(((dot-line_1 dot-col_1 dot-pos_4)(port-next-location* in_41 dot-c_0)))"
 "(let-values(((dot-ec_0)(effective-char dot-c_0 config_46)))"
@@ -53240,19 +53270,19 @@ static const char *startup_source =
 "(let-values(((in_42) in_41)"
 "((skip-count_9) 0)"
 "((source_25)(read-config-source config_46)))"
-"(let-values(((c_89)"
+"(let-values(((c_88)"
 "(peek-char-or-special"
 " in_42"
 " skip-count_9"
 " 'special"
 " source_25)))"
-"(if(eq? c_89 'special)(special1.1 'special) c_89)))"
+"(if(eq? c_88 'special)(special1.1 'special) c_88)))"
 " config_46)"
 " #f)"
 "(void)"
 "(let-values()"
 "(let-values(((in69_1) in_41)"
-"((temp70_2)"
+"((temp70_3)"
 "(reading-at config_46 dot-line_1 dot-col_1 dot-pos_4))"
 "((dot-c71_0) dot-c_0)"
 "                                                               ((temp72_2) \"expected ~a and value for hash\")"
@@ -53263,7 +53293,7 @@ static const char *startup_source =
 " #f"
 " unsafe-undefined"
 " in69_1"
-" temp70_2"
+" temp70_3"
 " temp72_2"
 "(list temp73_2)))))"
 "(values))))"
@@ -53296,7 +53326,7 @@ static const char *startup_source =
 " temp75_2"
 " temp77_1"
 "(list temp78_3)))))"
-"(cons(coerce-key k_41 elem-config_1) v_245))))))))))))))))))))))"
+"(cons(coerce-key k_42 elem-config_1) v_245))))))))))))))))))))))"
 "(define-values"
 "(read-string5.1)"
 "(lambda(mode1_1 in3_0 config4_0)"
@@ -53350,18 +53380,18 @@ static const char *startup_source =
 "(lambda()"
 "(begin"
 " 'loop"
-"(let-values(((c_17)"
+"(let-values(((c_89)"
 "(let-values(((in_43) in_37)"
 "((source_27) source_26))"
 "(read-char-or-special"
 " in_43"
 " special1.1"
 " source_27))))"
-"(if(not(char? c_17))"
-"(let-values()(bad-end_0 c_17))"
-"(if(char=? '#\\\\ c_17)"
+"(if(not(char? c_89))"
+"(let-values()(bad-end_0 c_89))"
+"(if(char=? '#\\\\ c_89)"
 "(let-values()"
-"(let-values(((escaping-c_0) c_17))"
+"(let-values(((escaping-c_0) c_89))"
 "(let-values(((escaped-c_0)"
 "(let-values(((in_24) in_37)"
 "((source_28)"
@@ -53762,12 +53792,12 @@ static const char *startup_source =
 " config_44)"
 "((accum-str47_0)"
 " accum-str_4)"
-"((temp48_2)"
+"((temp48_1)"
 " 16)"
 "((temp49_2)"
 " 4))"
 "(read-digits12.1"
-" temp48_2"
+" temp48_1"
 " 0"
 " temp49_2"
 " #f"
@@ -53846,12 +53876,12 @@ static const char *startup_source =
 " config_44)"
 "((accum-str52_1)"
 " accum-str_4)"
-"((temp53_4)"
+"((temp53_3)"
 " 16)"
 "((temp54_2)"
 " 4))"
 "(read-digits12.1"
-" temp53_4"
+" temp53_3"
 " 0"
 " temp54_2"
 " #f"
@@ -53898,11 +53928,11 @@ static const char *startup_source =
 " in_37)"
 "((config56_1)"
 " config_44)"
-"((temp57_2)"
+"((temp57_1)"
 "                                                                                                                                      \"escape sequence `~au~a` is out of range in string\")"
 "((escaping-c58_0)"
 " escaping-c_0)"
-"((temp59_5)"
+"((temp59_6)"
 "(let-values(((accum-str60_0)"
 " accum-str_4)"
 "((config61_0)"
@@ -53920,10 +53950,10 @@ static const char *startup_source =
 " unsafe-undefined"
 " in55_2"
 " config56_1"
-" temp57_2"
+" temp57_1"
 "(list"
 " escaping-c58_0"
-" temp59_5))))"
+" temp59_6))))"
 "(let-values()"
 "(begin"
 "(set-accum-string-count!"
@@ -53944,7 +53974,7 @@ static const char *startup_source =
 "                                                                                                                                \"bad or incomplete surrogate-style encoding at `~au~a`\")"
 "((escaping-c67_0)"
 " escaping-c_0)"
-"((temp68_5)"
+"((temp68_4)"
 "(let-values(((accum-str69_0)"
 " accum-str_4)"
 "((config70_1)"
@@ -53965,7 +53995,7 @@ static const char *startup_source =
 " temp66_4"
 "(list"
 " escaping-c67_0"
-" temp68_5))))))))))))))"
+" temp68_4))))))))))))))"
 "(let-values()"
 "(let-values((()"
 "(begin"
@@ -54036,11 +54066,11 @@ static const char *startup_source =
 " in_37)"
 "((config78_1)"
 " config_44)"
-"((temp79_2)"
+"((temp79_1)"
 "                                                                                                                        \"escape sequence `~aU~a` is out of range in string\")"
 "((escaping-c80_0)"
 " escaping-c_0)"
-"((temp81_2)"
+"((temp81_3)"
 "(let-values(((accum-str82_0)"
 " accum-str_4)"
 "((config83_0)"
@@ -54058,25 +54088,25 @@ static const char *startup_source =
 " unsafe-undefined"
 " in77_1"
 " config78_1"
-" temp79_2"
+" temp79_1"
 "(list"
 " escaping-c80_0"
-" temp81_2)))))))))))))))))"
+" temp81_3)))))))))))))))))"
 "(loop_115)))))))"
-"                                                                  (if (char=? '#\\\" c_17)"
+"                                                                  (if (char=? '#\\\" c_89)"
 "(let-values() null)"
 "(let-values()"
 "(begin"
 "(if(eq? mode_11 '|byte string|)"
 "(let-values()"
-"(if(byte?(char->integer c_17))"
+"(if(byte?(char->integer c_89))"
 "(void)"
 "(let-values()"
 "(let-values(((in85_0) in_37)"
 "((config86_0) config_44)"
 "((temp87_1)"
 "                                                                                              \"character `~a` is out of range in byte string\")"
-"((c88_0) c_17))"
+"((c88_0) c_89))"
 "(reader-error12.1"
 " unsafe-undefined"
 " '#\\x"
@@ -54087,7 +54117,7 @@ static const char *startup_source =
 " temp87_1"
 "(list c88_0))))))"
 "(void))"
-"(accum-string-add! accum-str_4 c_17)"
+"(accum-string-add! accum-str_4 c_89)"
 "(loop_115)))))))))))"
 " loop_115))"
 "(values))))"
@@ -54220,7 +54250,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_307)))"
-"((letrec-values(((for-loop_276)"
+"((letrec-values(((for-loop_275)"
 "(lambda(lst_28)"
 "(begin"
 " 'for-loop"
@@ -54243,11 +54273,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_276"
+"(for-loop_275"
 " rest_177)"
 "(values))))"
 "(values))))))"
-" for-loop_276)"
+" for-loop_275)"
 " lst_307)))"
 "(void))))"
 "(if(char=? c_92 '#\\newline)"
@@ -54378,7 +54408,7 @@ static const char *startup_source =
 "(if or-part_80 or-part_80(char=? c_95 '#\\U)))"
 "(let-values()"
 "(let-values(((accum-str_6)(accum-string-init! config_8)))"
-"(let-values(((v_35)"
+"(let-values(((v_36)"
 "(let-values(((in16_1) in_4)"
 "((config17_1) config_8)"
 "((accum-str18_1) accum-str_6)"
@@ -54392,14 +54422,14 @@ static const char *startup_source =
 " in16_1"
 " config17_1"
 " accum-str18_1))))"
-"(if(integer? v_35)"
+"(if(integer? v_36)"
 "(let-values()"
-"(if(if(let-values(((or-part_96)(< v_35 55296)))"
-"(if or-part_96 or-part_96(> v_35 57343)))"
-"(<= v_35 1114111)"
+"(if(if(let-values(((or-part_96)(< v_36 55296)))"
+"(if or-part_96 or-part_96(> v_36 57343)))"
+"(<= v_36 1114111)"
 " #f)"
 "(let-values()"
-"(begin(accum-string-abandon! accum-str_6 config_8)(integer->char v_35)))"
+"(begin(accum-string-abandon! accum-str_6 config_8)(integer->char v_36)))"
 "(let-values()"
 "(let-values(((in21_2) in_4)"
 "((config22_2) config_8)"
@@ -54803,7 +54833,7 @@ static const char *startup_source =
 "(let-values(((in56_0) in_56)"
 "((config57_1) config_24)"
 "((mod-path-wrapped58_0) mod-path-wrapped_0)"
-"                               ((temp59_6) \"expected a datum after `~a`, found end-of-file\")"
+"                               ((temp59_7) \"expected a datum after `~a`, found end-of-file\")"
 "((extend-str60_0) extend-str_0))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -54812,10 +54842,10 @@ static const char *startup_source =
 " unsafe-undefined"
 " in56_0"
 " config57_1"
-" temp59_6"
+" temp59_7"
 "(list extend-str60_0))))"
 "(void))"
-"(let-values(((temp47_1)((read-config-coerce config_24) #f mod-path-wrapped_0 #f))"
+"(let-values(((temp47_0)((read-config-coerce config_24) #f mod-path-wrapped_0 #f))"
 "((read-recur48_0) read-recur_0)"
 "((in49_0) in_56)"
 "((config50_0) config_24)"
@@ -54825,7 +54855,7 @@ static const char *startup_source =
 " mod-path-wrapped51_0"
 " #f"
 " '|#reader|"
-" temp47_1"
+" temp47_0"
 " read-recur48_0"
 " in49_0"
 " config50_0)))))))))"
@@ -54842,16 +54872,16 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((extend-str_1)"
 "(read-extension-prefix(cons dispatch-c_3 '(#\\l)) '(#\\a #\\n #\\g) in_13 config_49)))"
-"(let-values(((c_69)"
+"(let-values(((c_68)"
 "(let-values(((in_57) in_13)((source_18)(read-config-source config_49)))"
 "(read-char-or-special in_57 special1.1 source_18))))"
 "(begin"
-"(if(char=? c_69 '#\\space)"
+"(if(char=? c_68 '#\\space)"
 "(void)"
 "(let-values()"
 "(let-values(((in67_1) in_13)"
 "((config68_1) config_49)"
-"                                         ((temp69_2) \"expected a single space after `~a`\")"
+"                                         ((temp69_3) \"expected a single space after `~a`\")"
 "((extend-str70_0) extend-str_1))"
 "(reader-error12.1"
 " unsafe-undefined"
@@ -54860,7 +54890,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " in67_1"
 " config68_1"
-" temp69_2"
+" temp69_3"
 "(list extend-str70_0)))))"
 "(let-values(((extend-str61_0) extend-str_1)"
 "((read-recur62_0) read-recur_1)"
@@ -55377,7 +55407,7 @@ static const char *startup_source =
 "(if fail-k_5(fail-k_5)(lang-error in_2 l-config_0(string c_25) c2_6))))))))))))))"
 "(define-values"
 "(lang-error)"
-"(lambda(in_51 config_54 prefix_7 c_67)"
+"(lambda(in_51 config_54 prefix_7 c_17)"
 "(begin"
 "(let-values(((add-prefix_0)"
 "(lambda(s_78)"
@@ -55386,18 +55416,18 @@ static const char *startup_source =
 "                        (if (string=? prefix_7 \"\") (format \"`~a` followed by ~a\" prefix_7 s_78) s_78)))))"
 "(let-values(((in11_1) in_51)"
 "((config12_3) config_54)"
-"((c13_2) c_67)"
+"((c13_2) c_17)"
 "((temp14_5) 'read-language)"
 "((temp15_6)"
 "(string-append"
 "                       \"expected (after whitespace and comments) `#lang ` or `#!` followed\""
 "                       \" immediately by a language name, found ~a\"))"
 "((temp16_8)"
-"(if(eof-object? c_67)"
+"(if(eof-object? c_17)"
 "                        (let-values () (add-prefix_0 \"end-of-file\"))"
-"(if(not(char? c_67))"
+"(if(not(char? c_17))"
 "                          (let-values () (add-prefix_0 \"non-character\"))"
-"                          (let-values () (format \"`~a~a`\" prefix_7 c_67))))))"
+"                          (let-values () (format \"`~a~a`\" prefix_7 c_17))))))"
 "(reader-error12.1 unsafe-undefined c13_2 #f temp14_5 in11_1 config12_3 temp15_6(list temp16_8)))))))"
 "(define-values"
 "(read30.1)"
@@ -55482,7 +55512,7 @@ static const char *startup_source =
 " readtable59_1"
 " source61_0"
 " wrap63_0)))))))"
-"(let-values(((v_34)(read-one init-c_16 in_20 config_55)))"
+"(let-values(((v_35)(read-one init-c_16 in_20 config_55)))"
 "(if(if(let-values(((or-part_9)(not recursive?_0)))"
 "(if or-part_9 or-part_9 local-graph?_1))"
 "(read-config-state-graph(read-config-st config_55))"
@@ -55491,16 +55521,16 @@ static const char *startup_source =
 "(catch-and-reraise-as-reader/proc"
 " #f"
 " config_55"
-"(lambda()(make-reader-graph v_34))))"
+"(lambda()(make-reader-graph v_35))))"
 "(if(if recursive?_0"
 "(if(not local-graph?_1)"
 "(if(not for-syntax?_9)"
-"(if(not(eof-object? v_34))(not(1/special-comment? v_34)) #f)"
+"(if(not(eof-object? v_35))(not(1/special-comment? v_35)) #f)"
 " #f)"
 " #f)"
 " #f)"
-"(let-values()(begin(get-graph-hash config_55) v_34))"
-"(let-values() v_34))))))))))))))))))))))))"
+"(let-values()(begin(get-graph-hash config_55) v_35))"
+"(let-values() v_35))))))))))))))))))))))))"
 "(define-values"
 "(read-language49.1)"
 "(lambda(coerce38_0"
@@ -55525,7 +55555,7 @@ static const char *startup_source =
 "(let-values(((coerce-key_3) coerce-key39_0))"
 "(let-values()"
 "(let-values(((config_57)"
-"(let-values(((temp70_3) #f)"
+"(let-values(((temp70_4) #f)"
 "((temp71_2) #f)"
 "((for-syntax?72_0) for-syntax?_10)"
 "((wrap73_0) wrap_8)"
@@ -55543,7 +55573,7 @@ static const char *startup_source =
 " module-declared?76_0"
 " temp71_2"
 " read-compiled74_0"
-" temp70_3"
+" temp70_4"
 " #f"
 " wrap73_0))))"
 "(let-values(((l-config_1)(override-parameter 1/read-accept-reader config_57 #f)))"
@@ -55933,10 +55963,10 @@ static const char *startup_source =
 "(list c124_0))))))))"
 "(if(unsafe-fx< index_4 10)"
 "(let-values()"
-"(if(let-values(((or-part_281)"
+"(if(let-values(((or-part_364)"
 "(check-parameter 1/read-curly-brace-as-paren config_58)))"
-"(if or-part_281"
-" or-part_281"
+"(if or-part_364"
+" or-part_364"
 "(check-parameter 1/read-curly-brace-with-tag config_58)))"
 "(let-values()"
 "(wrap"
@@ -55978,10 +56008,10 @@ static const char *startup_source =
 "(list c135_0))))))"
 "(if(unsafe-fx< index_4 11)"
 "(let-values()"
-"(if(let-values(((or-part_282)"
+"(if(let-values(((or-part_306)"
 "(check-parameter 1/read-curly-brace-as-paren config_58)))"
-"(if or-part_282"
-" or-part_282"
+"(if or-part_306"
+" or-part_306"
 "(check-parameter 1/read-curly-brace-with-tag config_58)))"
 "(let-values()"
 "(let-values(((in136_0) in_67)"
@@ -56392,8 +56422,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_364)(char=? c2_13 '#\\x)))"
-"(if or-part_364 or-part_364(char=? c2_13 '#\\l)))"
+"(if(let-values(((or-part_365)(char=? c2_13 '#\\x)))"
+"(if or-part_365 or-part_365(char=? c2_13 '#\\l)))"
 "(let-values()"
 "(read-fixnum-or-flonum-vector"
 " read-one"
@@ -56779,7 +56809,7 @@ static const char *startup_source =
 "(begin"
 " 'module->namespace17"
 "(let-values(((mod_18) mod16_0))"
-"(let-values(((ns_48)(if(eq? ns15_0 unsafe-undefined)(1/current-namespace) ns15_0)))"
+"(let-values(((ns_47)(if(eq? ns15_0 unsafe-undefined)(1/current-namespace) ns15_0)))"
 "(let-values()"
 "(let-values()"
 "(let-values()"
@@ -56795,19 +56825,19 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(1/namespace? ns_48)"
+"(if(1/namespace? ns_47)"
 "(void)"
 "(let-values()"
-"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_48)))"
+"                                                    (raise-argument-error 'module->namespace \"namespace?\" ns_47)))"
 "(values))))"
 "(let-values(((name_41)"
 "(let-values(((mod44_0) mod_18)((temp45_1) #t))"
 "(reference->resolved-module-path27.1 temp45_1 mod44_0))))"
-"(let-values(((phase_136)(namespace-phase ns_48)))"
+"(let-values(((phase_137)(namespace-phase ns_47)))"
 "(let-values(((m-ns_17)"
-"(let-values(((ns46_0) ns_48)"
+"(let-values(((ns46_0) ns_47)"
 "((name47_1) name_41)"
-"((phase48_1) phase_136))"
+"((phase48_1) phase_137))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
@@ -56820,7 +56850,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(begin"
-"(namespace->module/complain 'module->namespace ns_48 name_41)"
+"(namespace->module/complain 'module->namespace ns_47 name_41)"
 "(raise-arguments-error"
 " 'module->namespace"
 "                                                 \"module not instantiated in the current namespace\""
@@ -56848,9 +56878,9 @@ static const char *startup_source =
 " unsafe-undefined"
 " unsafe-undefined"
 " temp49_3)))))"
-"(let-values(((ns41_0) ns_48)"
+"(let-values(((ns41_0) ns_47)"
 "((temp42_3)(namespace-mpi m-ns_17))"
-"((phase43_1) phase_136))"
+"((phase43_1) phase_137))"
 "(namespace-module-make-available!112.1"
 " unsafe-undefined"
 " ns41_0"
@@ -56909,14 +56939,14 @@ static const char *startup_source =
 "(let-values(((m-ns_18)"
 "(let-values(((ns53_3) ns_117)"
 "((name54_0) name_70)"
-"((phase55_1) phase_6))"
+"((phase55_0) phase_6))"
 "(namespace->module-namespace82.1"
 " #f"
 " #f"
 " unsafe-undefined"
 " ns53_3"
 " name54_0"
-" phase55_1))))"
+" phase55_0))))"
 "(begin"
 "(if m-ns_18"
 "(void)"
@@ -57066,7 +57096,7 @@ static const char *startup_source =
 " 'read-language"
 "(let-values(((in53_0) in_80)"
 "((fail-thunk54_0) fail-thunk_0)"
-"((temp55_2) #t)"
+"((temp55_3) #t)"
 "((read-to-syntax56_0) read-to-syntax)"
 "((read-compiled-linklet57_0) 1/read-compiled-linklet)"
 "((dynamic-require-reader58_0) dynamic-require-reader)"
@@ -57077,7 +57107,7 @@ static const char *startup_source =
 " read-coerce60_0"
 " read-coerce-key61_0"
 " dynamic-require-reader58_0"
-" temp55_2"
+" temp55_3"
 " read-module-declared?59_0"
 " read-compiled-linklet57_0"
 " read-to-syntax56_0"
@@ -57165,8 +57195,8 @@ static const char *startup_source =
 "(let-values()(read-to-syntax v_254 srcloc_12 #f)))))))))"
 "(define-values"
 "(read-coerce-key)"
-"(lambda(for-syntax?_0 k_42)"
-"(begin(if for-syntax?_0(let-values()(datum-intern-literal k_42))(let-values() k_42)))))"
+"(lambda(for-syntax?_0 k_43)"
+"(begin(if for-syntax?_0(let-values()(datum-intern-literal k_43))(let-values() k_43)))))"
 "(define-values(default-read-handler) #f)"
 "(define-values"
 "(default-read-handler?)"
@@ -57251,16 +57281,16 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "                                          (raise-argument-error 'read-syntax/recursive \"input-port?\" in_83)))"
-"(if((lambda(x_92)"
-"(let-values(((or-part_298)(not x_92)))"
-"(if or-part_298 or-part_298(char? x_92))))"
+"(if((lambda(x_93)"
+"(let-values(((or-part_298)(not x_93)))"
+"(if or-part_298 or-part_298(char? x_93))))"
 " start_59)"
 "(void)"
 "(let-values()"
 "                                          (raise-argument-error 'read-syntax/recursive \"(or/c char? #f)\" start_59)))"
-"(if((lambda(x_93)"
-"(let-values(((or-part_90)(not x_93)))"
-"(if or-part_90 or-part_90(1/readtable? x_93))))"
+"(if((lambda(x_94)"
+"(let-values(((or-part_90)(not x_94)))"
+"(if or-part_90 or-part_90(1/readtable? x_94))))"
 " readtable_7)"
 "(void)"
 "(let-values()"
@@ -57313,15 +57343,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_94)"
-"(let-values(((or-part_31)(not x_94)))"
-"(if or-part_31 or-part_31(char? x_94))))"
+"(if((lambda(x_95)"
+"(let-values(((or-part_31)(not x_95)))"
+"(if or-part_31 or-part_31(char? x_95))))"
 " start_61)"
 "(void)"
 "                                      (let-values () (raise-argument-error 'read/recursive \"(or/c char? #f)\" start_61)))"
-"(if((lambda(x_95)"
-"(let-values(((or-part_159)(not x_95)))"
-"(if or-part_159 or-part_159(1/readtable? x_95))))"
+"(if((lambda(x_96)"
+"(let-values(((or-part_159)(not x_96)))"
+"(if or-part_159 or-part_159(1/readtable? x_96))))"
 " readtable_9)"
 "(void)"
 "(let-values()"
@@ -57379,19 +57409,19 @@ static const char *startup_source =
 "((temp8_4)"
 "(hasheqv"
 " 0"
-"(let-values(((lst_77)(1/instance-variable-names inst_6)))"
+"(let-values(((lst_81)(1/instance-variable-names inst_6)))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_77)))"
-"((letrec-values(((for-loop_98)"
-"(lambda(table_206 lst_78)"
+"(let-values()(check-list lst_81)))"
+"((letrec-values(((for-loop_102)"
+"(lambda(table_206 lst_82)"
 "(begin"
 " 'for-loop"
-"(if(pair? lst_78)"
-"(let-values(((sym_68)(unsafe-car lst_78))"
-"((rest_36)(unsafe-cdr lst_78)))"
-"(let-values(((table_170)"
+"(if(pair? lst_82)"
+"(let-values(((sym_68)(unsafe-car lst_82))"
+"((rest_38)(unsafe-cdr lst_82)))"
+"(let-values(((table_171)"
 "(let-values(((table_211) table_206))"
 "(let-values(((table_212)"
 "(let-values()"
@@ -57435,15 +57465,15 @@ static const char *startup_source =
 " val_80)))))"
 "(values table_212)))))"
 "(if(not #f)"
-"(for-loop_98 table_170 rest_36)"
-" table_170)))"
+"(for-loop_102 table_171 rest_38)"
+" table_171)))"
 " table_206)))))"
-" for-loop_98)"
+" for-loop_102)"
 " '#hash()"
-" lst_77)))))"
+" lst_81)))))"
 "((temp9_7)"
 "(lambda(data-box_5"
-" ns_46"
+" ns_45"
 " phase-shift_19"
 " phase-level_22"
 " self_28"
@@ -57475,7 +57505,7 @@ static const char *startup_source =
 " inst_6"
 " sym_102)))"
 "(namespace-set-variable!"
-" ns_46"
+" ns_45"
 " 0"
 " sym_102"
 " val_81)))"
@@ -57514,13 +57544,13 @@ static const char *startup_source =
 "(1/prop:exn:missing-module 1/exn:missing-module? 1/exn:missing-module-accessor)"
 "(make-struct-type-property"
 " 'missing-module"
-"(lambda(v_29 info_6)"
+"(lambda(v_30 info_6)"
 "(begin"
-"(if(if(procedure? v_29)(procedure-arity-includes? v_29 1) #f)"
+"(if(if(procedure? v_30)(procedure-arity-includes? v_30 1) #f)"
 "(void)"
 "(let-values()"
-"           (raise-argument-error 'guard-for-prop:exn:missing-module \"(procedure-arity-includes/c 1)\" v_29)))"
-" v_29))))"
+"           (raise-argument-error 'guard-for-prop:exn:missing-module \"(procedure-arity-includes/c 1)\" v_30)))"
+" v_30))))"
 "(define-values"
 "(1/struct:exn:fail:filesystem:missing-module"
 " 1/make-exn:fail:filesystem:missing-module"
@@ -57635,100 +57665,69 @@ static const char *startup_source =
 "(void))))))"
 "(define-values"
 "(1/local-expand)"
-"(let-values(((local-expand5_0)"
-"(lambda(s2_9 context3_0 stop-ids4_0 intdefs1_0)"
+"(let-values(((local-expand6_0)"
+"(lambda(s3_2 context4_0 stop-ids5_0 intdefs1_0 extend-stops?2_0)"
 "(begin"
-" 'local-expand5"
-"(let-values(((s_8) s2_9))"
-"(let-values(((context_10) context3_0))"
-"(let-values(((stop-ids_2) stop-ids4_0))"
+" 'local-expand6"
+"(let-values(((s_2) s3_2))"
+"(let-values(((context_10) context4_0))"
+"(let-values(((stop-ids_2) stop-ids5_0))"
 "(let-values(((intdefs_4) intdefs1_0))"
+"(let-values(((extend-stops?_1) extend-stops?2_0))"
 "(let-values()"
-"(let-values(((temp53_0) 'local-expand)"
-"((s54_1) s_8)"
-"((context55_0) context_10)"
-"((stop-ids56_0) stop-ids_2)"
-"((intdefs57_0) intdefs_4))"
-"(do-local-expand50.1"
+"(let-values(((temp59_8) 'local-expand)"
+"((s60_1) s_2)"
+"((context61_0) context_10)"
+"((stop-ids62_0) stop-ids_2)"
+"((intdefs63_0) intdefs_4)"
+"((extend-stops?64_0) extend-stops?_1))"
+"(do-local-expand56.1"
 " #f"
 " #f"
+" extend-stops?64_0"
 " #t"
 " unsafe-undefined"
 " #f"
 " #f"
 " #f"
-" temp53_0"
-" s54_1"
-" context55_0"
-" stop-ids56_0"
-" intdefs57_0)))))))))))"
+" temp59_8"
+" s60_1"
+" context61_0"
+" stop-ids62_0"
+" intdefs63_0))))))))))))"
 "(case-lambda"
-"((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)))))"
+"((s_170 context_11 stop-ids_3)(begin 'local-expand(local-expand6_0 s_170 context_11 stop-ids_3 '() #t)))"
+"((s_493 context_12 stop-ids_4 intdefs_5 extend-stops?2_1)"
+"(local-expand6_0 s_493 context_12 stop-ids_4 intdefs_5 extend-stops?2_1))"
+"((s_494 context_13 stop-ids_5 intdefs1_1)(local-expand6_0 s_494 context_13 stop-ids_5 intdefs1_1 #t)))))"
 "(define-values"
 "(1/local-expand/capture-lifts)"
-"(let-values(((local-expand/capture-lifts12_0)"
-"(lambda(s9_1 context10_0 stop-ids11_0 intdefs7_0 lift-key8_0)"
+"(let-values(((local-expand/capture-lifts14_0)"
+"(lambda(s11_2 context12_0 stop-ids13_0 intdefs8_0 lift-key9_0 extend-stops?10_0)"
 "(begin"
-" 'local-expand/capture-lifts12"
-"(let-values(((s_492) s9_1))"
-"(let-values(((context_13) context10_0))"
-"(let-values(((stop-ids_5) stop-ids11_0))"
-"(let-values(((intdefs_5) intdefs7_0))"
+" 'local-expand/capture-lifts14"
+"(let-values(((s_167) s11_2))"
+"(let-values(((context_14) context12_0))"
+"(let-values(((stop-ids_6) stop-ids13_0))"
+"(let-values(((intdefs_6) intdefs8_0))"
 "(let-values(((lift-key_4)"
-"(if(eq? lift-key8_0 unsafe-undefined)(generate-lift-key) lift-key8_0)))"
-"(let-values()"
-"(let-values(((temp58_3) 'local-expand)"
-"((s59_0) s_492)"
-"((context60_0) context_13)"
-"((stop-ids61_0) stop-ids_5)"
-"((intdefs62_0) intdefs_5)"
-"((temp63_5) #t)"
-"((lift-key64_0) lift-key_4))"
-"(do-local-expand50.1"
-" #f"
-" temp63_5"
-" #t"
-" lift-key64_0"
-" #f"
-" #f"
-" #f"
-" temp58_3"
-" s59_0"
-" context60_0"
-" stop-ids61_0"
-" intdefs62_0))))))))))))"
-"(case-lambda"
-"((s_41 context_14 stop-ids_6)"
-"(begin"
-" 'local-expand/capture-lifts"
-"(local-expand/capture-lifts12_0 s_41 context_14 stop-ids_6 '() unsafe-undefined)))"
-"((s_87 context_15 stop-ids_7 intdefs_6 lift-key8_1)"
-"(local-expand/capture-lifts12_0 s_87 context_15 stop-ids_7 intdefs_6 lift-key8_1))"
-"((s_431 context_16 stop-ids_8 intdefs7_1)"
-"(local-expand/capture-lifts12_0 s_431 context_16 stop-ids_8 intdefs7_1 unsafe-undefined)))))"
-"(define-values"
-"(1/local-transformer-expand)"
-"(let-values(((local-transformer-expand18_0)"
-"(lambda(s15_1 context16_0 stop-ids17_0 intdefs14_0)"
-"(begin"
-" 'local-transformer-expand18"
-"(let-values(((s_35) s15_1))"
-"(let-values(((context_17) context16_0))"
-"(let-values(((stop-ids_9) stop-ids17_0))"
-"(let-values(((intdefs_7) intdefs14_0))"
+"(if(eq? lift-key9_0 unsafe-undefined)(generate-lift-key) lift-key9_0)))"
+"(let-values(((extend-stops?_2) extend-stops?10_0))"
 "(let-values()"
 "(let-values(((temp65_4) 'local-expand)"
-"((s66_2) s_35)"
-"((context67_0) context_17)"
-"((stop-ids68_0) stop-ids_9)"
-"((intdefs69_0) intdefs_7)"
-"((temp70_4) #t))"
-"(do-local-expand50.1"
-" temp70_4"
+"((s66_2) s_167)"
+"((context67_0) context_14)"
+"((stop-ids68_0) stop-ids_6)"
+"((intdefs69_0) intdefs_6)"
+"((temp70_5) #t)"
+"((extend-stops?71_0) extend-stops?_2)"
+"((lift-key72_0) lift-key_4))"
+"(do-local-expand56.1"
 " #f"
+" temp70_5"
+" extend-stops?71_0"
 " #t"
-" unsafe-undefined"
+" lift-key72_0"
 " #f"
 " #f"
 " #f"
@@ -57736,87 +57735,139 @@ static const char *startup_source =
 " s66_2"
 " context67_0"
 " stop-ids68_0"
-" intdefs69_0)))))))))))"
+" intdefs69_0)))))))))))))"
 "(case-lambda"
-"((s_187 context_18 stop-ids_10)"
-"(begin 'local-transformer-expand(local-transformer-expand18_0 s_187 context_18 stop-ids_10 '())))"
-"((s_493 context_19 stop-ids_11 intdefs14_1)"
-"(local-transformer-expand18_0 s_493 context_19 stop-ids_11 intdefs14_1)))))"
+"((s_90 context_15 stop-ids_7)"
+"(begin"
+" 'local-expand/capture-lifts"
+"(local-expand/capture-lifts14_0 s_90 context_15 stop-ids_7 '() unsafe-undefined #t)))"
+"((s_44 context_16 stop-ids_8 intdefs_7 lift-key_5 extend-stops?10_1)"
+"(local-expand/capture-lifts14_0 s_44 context_16 stop-ids_8 intdefs_7 lift-key_5 extend-stops?10_1))"
+"((s_308 context_17 stop-ids_9 intdefs_8 lift-key9_1)"
+"(local-expand/capture-lifts14_0 s_308 context_17 stop-ids_9 intdefs_8 lift-key9_1 #t))"
+"((s_186 context_18 stop-ids_10 intdefs8_1)"
+"(local-expand/capture-lifts14_0 s_186 context_18 stop-ids_10 intdefs8_1 unsafe-undefined #t)))))"
+"(define-values"
+"(1/local-transformer-expand)"
+"(let-values(((local-transformer-expand21_0)"
+"(lambda(s18_0 context19_0 stop-ids20_0 intdefs16_0 extend-stops?17_0)"
+"(begin"
+" 'local-transformer-expand21"
+"(let-values(((s_81) s18_0))"
+"(let-values(((context_19) context19_0))"
+"(let-values(((stop-ids_11) stop-ids20_0))"
+"(let-values(((intdefs_9) intdefs16_0))"
+"(let-values(((extend-stops?_3) extend-stops?17_0))"
+"(let-values()"
+"(let-values(((temp73_3) 'local-expand)"
+"((s74_0) s_81)"
+"((context75_0) context_19)"
+"((stop-ids76_0) stop-ids_11)"
+"((intdefs77_0) intdefs_9)"
+"((temp78_4) #t)"
+"((extend-stops?79_0) extend-stops?_3))"
+"(do-local-expand56.1"
+" temp78_4"
+" #f"
+" extend-stops?79_0"
+" #t"
+" unsafe-undefined"
+" #f"
+" #f"
+" #f"
+" temp73_3"
+" s74_0"
+" context75_0"
+" stop-ids76_0"
+" intdefs77_0))))))))))))"
+"(case-lambda"
+"((s_156 context_20 stop-ids_12)"
+"(begin 'local-transformer-expand(local-transformer-expand21_0 s_156 context_20 stop-ids_12 '() #t)))"
+"((s_16 context_21 stop-ids_13 intdefs_10 extend-stops?17_1)"
+"(local-transformer-expand21_0 s_16 context_21 stop-ids_13 intdefs_10 extend-stops?17_1))"
+"((s_21 context_22 stop-ids_14 intdefs16_1)"
+"(local-transformer-expand21_0 s_21 context_22 stop-ids_14 intdefs16_1 #t)))))"
 "(define-values"
 "(1/local-transformer-expand/capture-lifts)"
-"(let-values(((local-transformer-expand/capture-lifts25_0)"
-"(lambda(s22_1 context23_0 stop-ids24_0 intdefs20_0 lift-key21_0)"
+"(let-values(((local-transformer-expand/capture-lifts29_0)"
+"(lambda(s26_1 context27_1 stop-ids28_0 intdefs23_1 lift-key24_0 extend-stops?25_0)"
 "(begin"
-" 'local-transformer-expand/capture-lifts25"
-"(let-values(((s_92) s22_1))"
-"(let-values(((context_20) context23_0))"
-"(let-values(((stop-ids_12) stop-ids24_0))"
-"(let-values(((intdefs_8) intdefs20_0))"
-"(let-values(((lift-key_5)"
-"(if(eq? lift-key21_0 unsafe-undefined)(generate-lift-key) lift-key21_0)))"
+" 'local-transformer-expand/capture-lifts29"
+"(let-values(((s_495) s26_1))"
+"(let-values(((context_23) context27_1))"
+"(let-values(((stop-ids_15) stop-ids28_0))"
+"(let-values(((intdefs_11) intdefs23_1))"
+"(let-values(((lift-key_6)"
+"(if(eq? lift-key24_0 unsafe-undefined)(generate-lift-key) lift-key24_0)))"
+"(let-values(((extend-stops?_4) extend-stops?25_0))"
 "(let-values()"
-"(let-values(((temp71_3) 'local-expand)"
-"((s72_1) s_92)"
-"((context73_0) context_20)"
-"((stop-ids74_0) stop-ids_12)"
-"((intdefs75_0) intdefs_8)"
-"((temp76_3) #t)"
-"((temp77_2) #t)"
-"((lift-key78_0) lift-key_5))"
-"(do-local-expand50.1"
-" temp76_3"
-" temp77_2"
-" #t"
-" lift-key78_0"
-" #f"
-" #f"
-" #f"
-" temp71_3"
-" s72_1"
-" context73_0"
-" stop-ids74_0"
-" intdefs75_0))))))))))))"
-"(case-lambda"
-"((s_19 context_21 stop-ids_13)"
-"(begin"
-" 'local-transformer-expand/capture-lifts"
-"(local-transformer-expand/capture-lifts25_0 s_19 context_21 stop-ids_13 '() unsafe-undefined)))"
-"((s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1)"
-"(local-transformer-expand/capture-lifts25_0 s_450 context_22 stop-ids_14 intdefs_9 lift-key21_1))"
-"((s_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"
-"(1/syntax-local-expand-expression)"
-"(let-values(((syntax-local-expand-expression29_0)"
-"(lambda(s28_1 opaque-only?27_0)"
-"(begin"
-" 'syntax-local-expand-expression29"
-"(let-values(((s_495) s28_1))"
-"(let-values(((opaque-only?_0) opaque-only?27_0))"
-"(let-values()"
-"(let-values(((exp-s_11)"
-"(let-values(((temp79_1) 'syntax-local-expand-expression)"
-"((s80_1) s_495)"
-"((temp81_3) 'expression)"
-"((null82_0) null)"
-"((temp83_2) #f)"
-"((opaque-only?84_0) opaque-only?_0)"
+"(let-values(((temp80_2) 'local-expand)"
+"((s81_0) s_495)"
+"((context82_0) context_23)"
+"((stop-ids83_0) stop-ids_15)"
+"((intdefs84_0) intdefs_11)"
 "((temp85_2) #t)"
 "((temp86_4) #t)"
-"((temp87_2) #f))"
-"(do-local-expand50.1"
-" #f"
-" #f"
-" temp87_2"
-" unsafe-undefined"
+"((extend-stops?87_0) extend-stops?_4)"
+"((lift-key88_0) lift-key_6))"
+"(do-local-expand56.1"
 " temp85_2"
-" opaque-only?84_0"
 " temp86_4"
-" temp79_1"
-" s80_1"
-" temp81_3"
-" null82_0"
-" temp83_2))))"
+" extend-stops?87_0"
+" #t"
+" lift-key88_0"
+" #f"
+" #f"
+" #f"
+" temp80_2"
+" s81_0"
+" context82_0"
+" stop-ids83_0"
+" intdefs84_0)))))))))))))"
+"(case-lambda"
+"((s_175 context_24 stop-ids_16)"
+"(begin"
+" 'local-transformer-expand/capture-lifts"
+"(local-transformer-expand/capture-lifts29_0 s_175 context_24 stop-ids_16 '() unsafe-undefined #t)))"
+"((s_46 context_25 stop-ids_17 intdefs_12 lift-key_7 extend-stops?25_1)"
+"(local-transformer-expand/capture-lifts29_0 s_46 context_25 stop-ids_17 intdefs_12 lift-key_7 extend-stops?25_1))"
+"((s_309 context_26 stop-ids_18 intdefs_13 lift-key24_1)"
+"(local-transformer-expand/capture-lifts29_0 s_309 context_26 stop-ids_18 intdefs_13 lift-key24_1 #t))"
+"((s_28 context_27 stop-ids_19 intdefs23_2)"
+"(local-transformer-expand/capture-lifts29_0 s_28 context_27 stop-ids_19 intdefs23_2 unsafe-undefined #t)))))"
+"(define-values"
+"(1/syntax-local-expand-expression)"
+"(let-values(((syntax-local-expand-expression33_0)"
+"(lambda(s32_0 opaque-only?31_0)"
+"(begin"
+" 'syntax-local-expand-expression33"
+"(let-values(((s_311) s32_0))"
+"(let-values(((opaque-only?_0) opaque-only?31_0))"
+"(let-values()"
+"(let-values(((exp-s_11)"
+"(let-values(((temp89_4) 'syntax-local-expand-expression)"
+"((s90_1) s_311)"
+"((temp91_2) 'expression)"
+"((null92_0) null)"
+"((temp93_3) #f)"
+"((opaque-only?94_0) opaque-only?_0)"
+"((temp95_2) #t)"
+"((temp96_4) #t)"
+"((temp97_3) #f))"
+"(do-local-expand56.1"
+" #f"
+" #f"
+" #t"
+" temp97_3"
+" unsafe-undefined"
+" temp95_2"
+" opaque-only?94_0"
+" temp96_4"
+" temp89_4"
+" s90_1"
+" temp91_2"
+" null92_0"
+" temp93_3))))"
 "(let-values(((ctx_74)(let-values()(get-current-expand-context16.1 #f 'unexpected))))"
 "(let-values(((ae_1)"
 "(flip-introduction-scopes"
@@ -57833,58 +57884,60 @@ static const char *startup_source =
 "(if obs_60"
 "(let-values()(let-values()(call-expand-observe obs_60 'opaque-expr ae_1)))"
 "(void)))"
-"(let-values(((obs_4)(expand-context-observer ctx_74)))"
-"(if obs_4"
-"(let-values()(let-values()(call-expand-observe obs_4 'exit-local exp-s_11)))"
+"(let-values(((obs_61)(expand-context-observer ctx_74)))"
+"(if obs_61"
+"(let-values()(let-values()(call-expand-observe obs_61 'exit-local exp-s_11)))"
 "(void)))"
 "(values(if(not opaque-only?_0) exp-s_11 #f) ae_1))))))))))))"
 "(case-lambda"
-"((s_46)(begin 'syntax-local-expand-expression(syntax-local-expand-expression29_0 s_46 #f)))"
-"((s_486 opaque-only?27_1)(syntax-local-expand-expression29_0 s_486 opaque-only?27_1)))))"
+"((s_51)(begin 'syntax-local-expand-expression(syntax-local-expand-expression33_0 s_51 #f)))"
+"((s_496 opaque-only?31_1)(syntax-local-expand-expression33_0 s_496 opaque-only?31_1)))))"
 "(define-values"
-"(do-local-expand50.1)"
-"(lambda(as-transformer?32_0"
-" capture-lifts?31_0"
-" keep-#%expression?34_0"
-" lift-key35_0"
-" skip-log-exit?37_0"
-" to-parsed-ok?33_0"
-" track-to-be-defined?36_0"
-" who46_1"
-" s-or-s-exp47_0"
-" context48_0"
-" stop-ids49_0"
-" intdefs45_0)"
+"(do-local-expand56.1)"
+"(lambda(as-transformer?36_1"
+" capture-lifts?35_0"
+" extend-stops?37_0"
+" keep-#%expression?39_0"
+" lift-key40_0"
+" skip-log-exit?42_0"
+" to-parsed-ok?38_0"
+" track-to-be-defined?41_0"
+" who52_0"
+" s-or-s-exp53_0"
+" context54_0"
+" stop-ids55_0"
+" intdefs51_0)"
 "(begin"
-" 'do-local-expand50"
-"(let-values(((who_34) who46_1))"
-"(let-values(((s-or-s-exp_0) s-or-s-exp47_0))"
-"(let-values(((context_24) context48_0))"
-"(let-values(((stop-ids_16) stop-ids49_0))"
-"(let-values(((intdefs_10) intdefs45_0))"
-"(let-values(((capture-lifts?_0) capture-lifts?31_0))"
-"(let-values(((as-transformer?_6) as-transformer?32_0))"
-"(let-values(((to-parsed-ok?_1) to-parsed-ok?33_0))"
-"(let-values(((keep-#%expression?_2) keep-#%expression?34_0))"
-"(let-values(((lift-key_6)"
-"(if(eq? lift-key35_0 unsafe-undefined)"
-"(if(let-values(((or-part_40) capture-lifts?_0))"
-"(if or-part_40 or-part_40 as-transformer?_6))"
+" 'do-local-expand56"
+"(let-values(((who_34) who52_0))"
+"(let-values(((s-or-s-exp_0) s-or-s-exp53_0))"
+"(let-values(((context_28) context54_0))"
+"(let-values(((stop-ids_20) stop-ids55_0))"
+"(let-values(((intdefs_14) intdefs51_0))"
+"(let-values(((capture-lifts?_0) capture-lifts?35_0))"
+"(let-values(((as-transformer?_6) as-transformer?36_1))"
+"(let-values(((extend-stops?_5) extend-stops?37_0))"
+"(let-values(((to-parsed-ok?_1) to-parsed-ok?38_0))"
+"(let-values(((keep-#%expression?_2) keep-#%expression?39_0))"
+"(let-values(((lift-key_8)"
+"(if(eq? lift-key40_0 unsafe-undefined)"
+"(if(let-values(((or-part_205) capture-lifts?_0))"
+"(if or-part_205 or-part_205 as-transformer?_6))"
 "(generate-lift-key)"
 " #f)"
-" lift-key35_0)))"
-"(let-values(((track-to-be-defined?_1) track-to-be-defined?36_0))"
-"(let-values(((skip-log-exit?_0) skip-log-exit?37_0))"
+" lift-key40_0)))"
+"(let-values(((track-to-be-defined?_1) track-to-be-defined?41_0))"
+"(let-values(((skip-log-exit?_0) skip-log-exit?42_0))"
 "(let-values()"
 "(let-values()"
-"(let-values(((s_496)(datum->syntax$1 #f s-or-s-exp_0)))"
+"(let-values(((s_305)(datum->syntax$1 #f s-or-s-exp_0)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_365)(list? context_24)))"
-"(if or-part_365"
-" or-part_365"
+"(if(let-values(((or-part_366)(list? context_28)))"
+"(if or-part_366"
+" or-part_366"
 "(memq"
-" context_24"
+" context_28"
 "(if as-transformer?_6"
 " '(expression top-level)"
 " '(expression top-level module module-begin)))))"
@@ -57893,113 +57946,77 @@ static const char *startup_source =
 "(raise-argument-error"
 " who_34"
 "(if as-transformer?_6"
-"                                                           \"(or/c 'expression 'top-level list?)\""
-"                                                           \"(or/c 'expression 'top-level 'module 'module-begin list?)\")"
-" context_24)))"
+"                                                             \"(or/c 'expression 'top-level list?)\""
+"                                                             \"(or/c 'expression 'top-level 'module 'module-begin list?)\")"
+" context_28)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_45)(not stop-ids_16)))"
-"(if or-part_45"
-" or-part_45"
-"(if(list? stop-ids_16)"
-"(andmap2 identifier? stop-ids_16)"
+"(if(let-values(((or-part_367)(not stop-ids_20)))"
+"(if or-part_367"
+" or-part_367"
+"(if(list? stop-ids_20)"
+"(andmap2 identifier? stop-ids_20)"
 " #f)))"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " who_34"
-"                                                           \"(or/c (listof identifier?) #f)\""
-" stop-ids_16)))"
+"                                                             \"(or/c (listof identifier?) #f)\""
+" stop-ids_20)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(intdefs-or-false? intdefs_10)"
+"(if(intdefs-or-false? intdefs_14)"
 "(void)"
 "(let-values()"
 "(raise-argument-error"
 " who_34"
 " intdefs-or-false?-string"
-" intdefs_10)))"
+" intdefs_14)))"
 "(values))))"
 "(let-values(((ctx_75)"
-"(let-values(((who88_0) who_34))"
-"(get-current-expand-context16.1 #f who88_0))))"
-"(let-values(((phase_93)"
+"(let-values(((who98_0) who_34))"
+"(get-current-expand-context16.1 #f who98_0))))"
+"(let-values(((phase_138)"
 "(if as-transformer?_6"
 "(add1(expand-context-phase ctx_75))"
 "(expand-context-phase ctx_75))))"
 "(let-values(((local-ctx_0)"
-"(let-values(((ctx89_0) ctx_75)"
-"((context90_0) context_24)"
-"((phase91_0) phase_93)"
-"((intdefs92_0) intdefs_10)"
-"((stop-ids93_0) stop-ids_16)"
-"((to-parsed-ok?94_0) to-parsed-ok?_1)"
-"((temp95_2)"
-"(let-values(((or-part_169)"
+"(let-values(((ctx99_0) ctx_75)"
+"((context100_0) context_28)"
+"((phase101_0) phase_138)"
+"((intdefs102_0) intdefs_14)"
+"((stop-ids103_0) stop-ids_20)"
+"((extend-stops?104_0) extend-stops?_5)"
+"((to-parsed-ok?105_0) to-parsed-ok?_1)"
+"((temp106_4)"
+"(let-values(((or-part_368)"
 " keep-#%expression?_2))"
-"(if or-part_169"
-" or-part_169"
+"(if or-part_368"
+" or-part_368"
 "(if(expand-context-in-local-expand?"
 " ctx_75)"
 "(expand-context-keep-#%expression?"
 " ctx_75)"
 " #f))))"
-"((track-to-be-defined?96_0)"
+"((track-to-be-defined?107_0)"
 " track-to-be-defined?_1))"
-"(make-local-expand-context42.1"
-" context90_0"
-" intdefs92_0"
-" temp95_2"
-" phase91_0"
-" stop-ids93_0"
-" to-parsed-ok?94_0"
-" track-to-be-defined?96_0"
-" ctx89_0))))"
+"(make-local-expand-context44.1"
+" context100_0"
+" extend-stops?104_0"
+" intdefs102_0"
+" temp106_4"
+" phase101_0"
+" stop-ids103_0"
+" to-parsed-ok?105_0"
+" track-to-be-defined?107_0"
+" ctx99_0))))"
 "(let-values((()"
 "(begin"
 "(namespace-visit-available-modules!"
 "(expand-context-namespace ctx_75)"
-" phase_93)"
-"(values))))"
-"(let-values((()"
-"(begin"
-"(let-values(((obs_7)"
-"(expand-context-observer local-ctx_0)))"
-"(if obs_7"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_7"
-" 'enter-local"
-" s_496)))"
-"(void)))"
-"(values))))"
-"(let-values(((input-s_1)"
-"(let-values(((temp97_3)"
-"(flip-introduction-scopes s_496 ctx_75))"
-"((intdefs98_0) intdefs_10))"
-"(add-intdef-scopes24.1"
-" unsafe-undefined"
-" #f"
-" temp97_3"
-" intdefs98_0))))"
-"(let-values((()"
-"(begin"
-"(if as-transformer?_6"
-"(let-values()"
-"(let-values(((obs_61)"
-"(expand-context-observer"
-" local-ctx_0)))"
-"(if obs_61"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_61"
-" 'phase-up)))"
-"(void))))"
-"(void))"
+" phase_138)"
 "(values))))"
 "(let-values((()"
 "(begin"
@@ -58011,13 +58028,24 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_62"
-" 'local-pre"
-" input-s_1)))"
+" 'enter-local"
+" s_305)))"
 "(void)))"
 "(values))))"
+"(let-values(((input-s_1)"
+"(let-values(((temp108_3)"
+"(flip-introduction-scopes"
+" s_305"
+" ctx_75))"
+"((intdefs109_0) intdefs_14))"
+"(add-intdef-scopes24.1"
+" unsafe-undefined"
+" #f"
+" temp108_3"
+" intdefs109_0))))"
 "(let-values((()"
 "(begin"
-"(if stop-ids_16"
+"(if as-transformer?_6"
 "(let-values()"
 "(let-values(((obs_63)"
 "(expand-context-observer"
@@ -58027,82 +58055,117 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_63"
+" 'phase-up)))"
+"(void))))"
+"(void))"
+"(values))))"
+"(let-values((()"
+"(begin"
+"(let-values(((obs_39)"
+"(expand-context-observer"
+" local-ctx_0)))"
+"(if obs_39"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_39"
+" 'local-pre"
+" input-s_1)))"
+"(void)))"
+"(values))))"
+"(let-values((()"
+"(begin"
+"(if stop-ids_20"
+"(let-values()"
+"(let-values(((obs_10)"
+"(expand-context-observer"
+" local-ctx_0)))"
+"(if obs_10"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_10"
 " 'start)))"
 "(void))))"
 "(void))"
 "(values))))"
 "(let-values(((output-s_0)"
-"(if(if as-transformer?_6 capture-lifts?_0 #f)"
+"(if(if as-transformer?_6"
+" capture-lifts?_0"
+" #f)"
 "(let-values()"
-"(let-values(((input-s99_0) input-s_1)"
-"((local-ctx100_0)"
+"(let-values(((input-s110_0) input-s_1)"
+"((local-ctx111_0)"
 " local-ctx_0)"
-"((context101_0) context_24)"
-"((temp102_1) #f)"
-"((temp103_1) #t)"
-"((lift-key104_0) lift-key_6)"
-"((temp105_4) #t)"
-"((temp106_4) #t))"
+"((context112_0) context_28)"
+"((temp113_3) #f)"
+"((temp114_5) #t)"
+"((lift-key115_0)"
+" lift-key_8)"
+"((temp116_2) #t)"
+"((temp117_2) #t))"
 "(expand-transformer92.1"
-" temp105_4"
-" temp103_1"
-" context101_0"
-" temp102_1"
-" temp106_4"
-" lift-key104_0"
-" input-s99_0"
-" local-ctx100_0)))"
+" temp116_2"
+" temp114_5"
+" context112_0"
+" temp113_3"
+" temp117_2"
+" lift-key115_0"
+" input-s110_0"
+" local-ctx111_0)))"
 "(if as-transformer?_6"
 "(let-values()"
-"(let-values(((input-s107_0) input-s_1)"
-"((local-ctx108_0)"
+"(let-values(((input-s118_0)"
+" input-s_1)"
+"((local-ctx119_0)"
 " local-ctx_0)"
-"((context109_0) context_24)"
-"((temp110_4) #f)"
-"((temp111_2)"
+"((context120_0)"
+" context_28)"
+"((temp121_1) #f)"
+"((temp122_1)"
 "(eq?"
 " 'top-level"
-" context_24))"
-"((lift-key112_0)"
-" lift-key_6)"
-"((temp113_3) #t))"
+" context_28))"
+"((lift-key123_0)"
+" lift-key_8)"
+"((temp124_3) #t))"
 "(expand-transformer92.1"
 " #f"
-" temp111_2"
-" context109_0"
-" temp110_4"
-" temp113_3"
-" lift-key112_0"
-" input-s107_0"
-" local-ctx108_0)))"
+" temp122_1"
+" context120_0"
+" temp121_1"
+" temp124_3"
+" lift-key123_0"
+" input-s118_0"
+" local-ctx119_0)))"
 "(if capture-lifts?_0"
 "(let-values()"
-"(let-values(((input-s114_0)"
+"(let-values(((input-s125_0)"
 " input-s_1)"
-"((local-ctx115_0)"
+"((local-ctx126_0)"
 " local-ctx_0)"
-"((temp116_2) #t)"
-"((lift-key117_0)"
-" lift-key_6)"
-"((temp118_1) #t))"
+"((temp127_5) #t)"
+"((lift-key128_0)"
+" lift-key_8)"
+"((temp129_2) #t))"
 "(expand/capture-lifts75.1"
-" temp118_1"
-" temp116_2"
+" temp129_2"
+" temp127_5"
 " #f"
-" lift-key117_0"
-" input-s114_0"
-" local-ctx115_0)))"
+" lift-key128_0"
+" input-s125_0"
+" local-ctx126_0)))"
 "(let-values()"
-"(let-values(((input-s119_0)"
+"(let-values(((input-s130_0)"
 " input-s_1)"
-"((local-ctx120_0)"
+"((local-ctx131_0)"
 " local-ctx_0))"
 "(expand9.1"
 " #f"
 " #f"
 " #f"
-" input-s119_0"
-" local-ctx120_0))))))))"
+" input-s130_0"
+" local-ctx131_0))))))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_64)"
@@ -58138,7 +58201,7 @@ static const char *startup_source =
 " 'exit-local"
 " result-s_8)))"
 "(void)))))"
-" result-s_8))))))))))))))))))))))))))))))))))"
+" result-s_8)))))))))))))))))))))))))))))))))))"
 "(define-values"
 "(1/syntax-tainted?)"
 "(lambda(s_0)"
@@ -58152,10 +58215,10 @@ static const char *startup_source =
 "(define-values"
 "(1/syntax-arm)"
 "(let-values(((syntax-arm4_0)"
-"(lambda(s3_2 maybe-insp1_0 use-mode?2_0)"
+"(lambda(s3_3 maybe-insp1_0 use-mode?2_0)"
 "(begin"
 " 'syntax-arm4"
-"(let-values(((s_2) s3_2))"
+"(let-values(((s_2) s3_3))"
 "(let-values(((maybe-insp_0) maybe-insp1_0))"
 "(let-values(((use-mode?_0) use-mode?2_0))"
 "(let-values()"
@@ -58183,12 +58246,12 @@ static const char *startup_source =
 "(let-values()"
 "(taint-dispatch"
 " s_2"
-"(lambda(s_440)(syntax-arm$1 s_440 insp_21))"
+"(lambda(s_441)(syntax-arm$1 s_441 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_447 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_447 maybe-insp_1 use-mode?2_1))"
+"((s_448 maybe-insp_1 use-mode?2_1)(syntax-arm4_0 s_448 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)"
@@ -58239,7 +58302,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_442 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_442 from-s_4 use-mode?6_1)))))"
+"((s_443 from-s_4 use-mode?6_1)(syntax-rearm9_0 s_443 from-s_4 use-mode?6_1)))))"
 "(define-values"
 "(1/syntax-taint)"
 "(lambda(s_5)"
@@ -58254,9 +58317,9 @@ static const char *startup_source =
 "(inspector-for-taint)"
 "(lambda(maybe-insp_3)"
 "(begin"
-"(let-values(((or-part_366) maybe-insp_3))"
-"(if or-part_366"
-" or-part_366"
+"(let-values(((or-part_369) maybe-insp_3))"
+"(if or-part_369"
+" or-part_369"
 "(let-values(((or-part_163)(current-module-code-inspector)))"
 "(if or-part_163 or-part_163(current-code-inspector))))))))"
 "(define-values"
@@ -58703,10 +58766,10 @@ static const char *startup_source =
 "(let-values(((read-ids_0) read-ids3_0))"
 "(let-values()"
 "(begin"
-"(let-values(((temp53_5) '#%kernel)"
+"(let-values(((temp53_4) '#%kernel)"
 "((temp54_4) '#%runtime)"
-"((temp55_3)(set-union primitive-ids(set-union main-ids_0 read-ids_0)))"
-"((temp56_4)"
+"((temp55_4)(set-union primitive-ids(set-union main-ids_0 read-ids_0)))"
+"((temp56_3)"
 "(hasheq"
 " 'variable-reference?"
 " 1/variable-reference?"
@@ -58715,9 +58778,9 @@ static const char *startup_source =
 " 'variable-reference-from-unsafe?"
 " 1/variable-reference-from-unsafe?))"
 "((ns57_2) ns_120))"
-"(copy-runtime-module!26.1 unsafe-undefined temp56_4 ns57_2 #t #f temp55_3 temp54_4 temp53_5))"
-"(let-values(((temp58_4) '#%kernel)((temp59_7) '(#%core #%runtime #%main #%read))((ns60_2) ns_120))"
-"(declare-reexporting-module!50.1 ns60_2 #t temp58_4 temp59_7)))))))))))"
+"(copy-runtime-module!26.1 unsafe-undefined temp56_3 ns57_2 #t #f temp55_4 temp54_4 temp53_4))"
+"(let-values(((temp58_4) '#%kernel)((temp59_9) '(#%core #%runtime #%main #%read))((ns60_2) ns_120))"
+"(declare-reexporting-module!50.1 ns60_2 #t temp58_4 temp59_9)))))))))))"
 "(define-values"
 "(copy-runtime-module!26.1)"
 "(lambda(alts14_0 extras15_0 namespace12_0 primitive?16_0 protected?17_0 skip13_0 to11_0 name25_1)"
@@ -58782,15 +58845,15 @@ static const char *startup_source =
 " ht_158"
 " i_97)))"
 "(let-values(((table_214)"
-"(let-values(((table_10)"
+"(let-values(((table_11)"
 " table_213))"
 "(if(set-member?"
 " skip-syms_0"
 " sym_93)"
-" table_10"
-"(let-values(((table_11)"
-" table_10))"
+" table_11"
 "(let-values(((table_12)"
+" table_11))"
+"(let-values(((table_13)"
 "(let-values()"
 "(let-values(((key_14"
 " val_5)"
@@ -58806,10 +58869,10 @@ static const char *startup_source =
 " or-part_167"
 " val_82))))))"
 "(hash-set"
-" table_11"
+" table_12"
 " key_14"
 " val_5)))))"
-"(values table_12)))))))"
+"(values table_13)))))))"
 "(if(not #f)"
 "(for-loop_249"
 " table_214"
@@ -58830,7 +58893,7 @@ static const char *startup_source =
 "(begin"
 " 'for-loop"
 "(if i_169"
-"(let-values(((k_43 v_48)"
+"(let-values(((k_44 v_49)"
 "(hash-iterate-key+value"
 " ht_146"
 " i_169)))"
@@ -58841,8 +58904,8 @@ static const char *startup_source =
 "(let-values()"
 "(hash-set"
 " ht_160"
-" k_43"
-" v_48))))"
+" k_44"
+" v_49))))"
 "(values ht_161)))))"
 "(if(not #f)"
 "(for-loop_253"
@@ -58881,10 +58944,10 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((mpi_5)(1/module-path-index-join(list 'quote name_75) #f)))"
 "(let-values(((ns66_0) ns_122)"
-"((temp67_5)"
-"(let-values(((temp69_3) #t)"
+"((temp67_4)"
+"(let-values(((temp69_4) #t)"
 "((primitive?70_0) primitive?_10)"
-"((temp71_4) #t)"
+"((temp71_3) #t)"
 "((temp72_3)(not protected?_11))"
 "((mpi73_1) mpi_5)"
 "((temp74_2)"
@@ -58895,7 +58958,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_277)"
+"((letrec-values(((for-loop_276)"
 "(lambda(table_215 i_176)"
 "(begin"
 " 'for-loop"
@@ -58904,8 +58967,8 @@ static const char *startup_source =
 "(hash-iterate-key"
 " ht_163"
 " i_176)))"
-"(let-values(((table_6)"
 "(let-values(((table_7)"
+"(let-values(((table_8)"
 " table_215))"
 "(let-values(((table_216)"
 "(let-values()"
@@ -58923,7 +58986,7 @@ static const char *startup_source =
 "(let-values(((binding_27)"
 "(let-values(((mpi76_0)"
 " mpi_5)"
-"((temp77_3)"
+"((temp77_2)"
 " 0)"
 "((sym78_0)"
 " sym_103))"
@@ -58938,7 +59001,7 @@ static const char *startup_source =
 " unsafe-undefined"
 " unsafe-undefined"
 " mpi76_0"
-" temp77_3"
+" temp77_2"
 " sym78_0))))"
 "(values"
 " sym_103"
@@ -58955,20 +59018,20 @@ static const char *startup_source =
 " #f)"
 " binding_27)))))))"
 "(hash-set"
-" table_7"
+" table_8"
 " key_86"
 " val_83)))))"
 "(values"
 " table_216)))))"
 "(if(not #f)"
-"(for-loop_277"
-" table_6"
+"(for-loop_276"
+" table_7"
 "(hash-iterate-next"
 " ht_163"
 " i_176))"
-" table_6)))"
+" table_7)))"
 " table_215)))))"
-" for-loop_277)"
+" for-loop_276)"
 " '#hash()"
 "(hash-iterate-first ht_163))))))"
 "((temp75_4)"
@@ -58988,7 +59051,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-in-hash ht_164)))"
-"((letrec-values(((for-loop_278)"
+"((letrec-values(((for-loop_277)"
 "(lambda(i_177)"
 "(begin"
 " 'for-loop"
@@ -59011,18 +59074,18 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_278"
+"(for-loop_277"
 "(hash-iterate-next"
 " ht_164"
 " i_177))"
 "(values))))"
 "(values))))))"
-" for-loop_278)"
+" for-loop_277)"
 "(hash-iterate-first ht_164))))"
 "(void)))"
 "(void)))))"
 "(make-module39.1"
-" temp69_3"
+" temp69_4"
 " unsafe-undefined"
 " unsafe-undefined"
 " temp75_4"
@@ -59031,7 +59094,7 @@ static const char *startup_source =
 " 0"
 " temp72_3"
 " unsafe-undefined"
-" temp71_4"
+" temp71_3"
 " unsafe-undefined"
 " primitive?70_0"
 " temp74_2"
@@ -59040,8 +59103,8 @@ static const char *startup_source =
 " #f"
 " null"
 " #f)))"
-"((temp68_6)(1/module-path-index-resolve mpi_5)))"
-"(declare-module!58.1 #t ns66_0 temp67_5 temp68_6))))))))))))))"
+"((temp68_5)(1/module-path-index-resolve mpi_5)))"
+"(declare-module!58.1 #t ns66_0 temp67_4 temp68_5))))))))))))))"
 "(define-values"
 "(declare-reexporting-module!50.1)"
 "(lambda(namespace45_0 reexport?44_0 name48_0 require-names49_0)"
@@ -59088,9 +59151,9 @@ static const char *startup_source =
 " null"
 " lst_108))))))"
 "(let-values(((ns79_1) ns_124)"
-"((temp80_2)"
+"((temp80_3)"
 "(let-values(((temp82_3) #t)"
-"((temp83_3) #t)"
+"((temp83_2) #t)"
 "((mpi84_0) mpi_52)"
 "((temp85_3)(list(cons 0 require-mpis_0)))"
 "((temp86_5)"
@@ -59102,7 +59165,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_159)))"
-"((letrec-values(((for-loop_279)"
+"((letrec-values(((for-loop_278)"
 "(lambda(table_217 lst_309)"
 "(begin"
 " 'for-loop"
@@ -59120,7 +59183,7 @@ static const char *startup_source =
 "(begin"
 " #t"
 "((letrec-values(((for-loop_187)"
-"(lambda(table_140)"
+"(lambda(table_141)"
 "(begin"
 " 'for-loop"
 "(let-values()"
@@ -59141,8 +59204,8 @@ static const char *startup_source =
 "(let-values()"
 "(check-in-hash"
 " ht_165)))"
-"((letrec-values(((for-loop_280)"
-"(lambda(table_141"
+"((letrec-values(((for-loop_279)"
+"(lambda(table_142"
 " i_178)"
 "(begin"
 " 'for-loop"
@@ -59152,9 +59215,9 @@ static const char *startup_source =
 "(hash-iterate-key+value"
 " ht_165"
 " i_178)))"
-"(let-values(((table_31)"
 "(let-values(((table_32)"
-" table_141))"
+"(let-values(((table_33)"
+" table_142))"
 "(let-values(((table_220)"
 "(let-values()"
 "(let-values(((key_87"
@@ -59164,32 +59227,32 @@ static const char *startup_source =
 " sym_105"
 " binding_28))))"
 "(hash-set"
-" table_32"
+" table_33"
 " key_87"
 " val_85)))))"
 "(values"
 " table_220)))))"
 "(if(not"
 " #f)"
-"(for-loop_280"
-" table_31"
+"(for-loop_279"
+" table_32"
 "(hash-iterate-next"
 " ht_165"
 " i_178))"
-" table_31)))"
-" table_141)))))"
-" for-loop_280)"
-" table_140"
+" table_32)))"
+" table_142)))))"
+" for-loop_279)"
+" table_141"
 "(hash-iterate-first"
 " ht_165))))))"
 " table_219))))))"
 " for-loop_187)"
 " table_217)))))"
 "(if(not #f)"
-"(for-loop_279 table_218 rest_180)"
+"(for-loop_278 table_218 rest_180)"
 " table_218)))"
 " table_217)))))"
-" for-loop_279)"
+" for-loop_278)"
 " '#hash()"
 " lst_159))))"
 " '#hasheqv()))"
@@ -59204,7 +59267,7 @@ static const char *startup_source =
 " 0"
 " #f"
 " unsafe-undefined"
-" temp83_3"
+" temp83_2"
 " unsafe-undefined"
 " #f"
 " temp86_5"
@@ -59214,7 +59277,7 @@ static const char *startup_source =
 " null"
 " #f)))"
 "((temp81_4)(1/module-path-index-resolve mpi_52)))"
-"(declare-module!58.1 #t ns79_1 temp80_2 temp81_4))))))))))))"
+"(declare-module!58.1 #t ns79_1 temp80_3 temp81_4))))))))))))"
 "(define-values"
 "(read-primitives)"
 "(hasheq"
@@ -59437,10 +59500,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_96)(TH-place-channel-ref x_96 0))))))"
+"(make-struct-type 'TH-place-channel #f 2 0 #f(list(cons prop:evt(lambda(x_97)(TH-place-channel-ref x_97 0))))))"
 "(define-values"
 "(TH-place-channel-in TH-place-channel-out)"
-"(values(lambda(x_97)(TH-place-channel-ref x_97 0))(lambda(x_83)(TH-place-channel-ref x_83 1))))"
+"(values(lambda(x_98)(TH-place-channel-ref x_98 0))(lambda(x_84)(TH-place-channel-ref x_84 1))))"
 "(define-values"
 "(place-struct-primitives)"
 "(hasheq"
@@ -59695,9 +59758,9 @@ static const char *startup_source =
 "(void))"
 "(values))))"
 "(let-values(((m-s_0)(check-module-form s_178 path_12)))"
-"(let-values(((s2_10)(1/read-syntax(object-name i_179) i_179)))"
+"(let-values(((s2_9)(1/read-syntax(object-name i_179) i_179)))"
 "(begin"
-"(if(eof-object? s2_10)"
+"(if(eof-object? s2_9)"
 "(void)"
 "(let-values()"
 "(error"
@@ -59708,7 +59771,7 @@ static const char *startup_source =
 "                                                     \"  in: ~e\\n\""
 "                                                     \"  found: ~.s\")"
 "(object-name i_179)"
-" s2_10)))"
+" s2_9)))"
 "(lambda()((1/current-eval) m-s_0))))))))))))))))))))"
 "(let-values()"
 "(let-values(((add-top-interaction_0)"
@@ -59819,7 +59882,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values()(not(eq? c_52 0))))))"
 "(values result_126)))))"
-"(if(if(not((lambda x_98 result_125) c_52))(not #f) #f)"
+"(if(if(not((lambda x_99 result_125) c_52))(not #f) #f)"
 "(for-loop_237 result_125(unsafe-fx+ 1 pos_99))"
 " result_125)))"
 " result_124)))))"
@@ -59983,8 +60046,8 @@ static const char *startup_source =
 "(lambda(a_29)"
 "(begin"
 " 'date-of-1"
-"(let-values(((v_72)(file-or-directory-modify-seconds a_29 #f(lambda() #f))))"
-"(if v_72(cons a_29 v_72) #f))))))"
+"(let-values(((v_27)(file-or-directory-modify-seconds a_29 #f(lambda() #f))))"
+"(if v_27(cons a_29 v_27) #f))))))"
 "(let-values(((date-of_0)"
 "(lambda(a_39 modes_1 roots_1)"
 "(begin"
@@ -60142,9 +60205,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_367) main-path-d_0))"
-"(if or-part_367"
-" or-part_367"
+"(let-values(((or-part_370) main-path-d_0))"
+"(if or-part_370"
+" or-part_370"
 "(not alt-path-d_0)))))"
 "(let-values(((try-alt?_0)"
 "(if alt-file_0"
@@ -60273,12 +60336,12 @@ static const char *startup_source =
 "(car zo-d_1)"
 " expect-module_0)))))))"
 " c4_3)"
-"(if(let-values(((or-part_368)"
+"(if(let-values(((or-part_371)"
 "(not"
 "(pair?"
 " expect-module_0))))"
-"(if or-part_368"
-" or-part_368"
+"(if or-part_371"
+" or-part_371"
 "(car expect-module_0)))"
 "(let-values()"
 "(let-values(((p_77)"
@@ -60467,14 +60530,14 @@ static const char *startup_source =
 "(void))))"
 "(void))))"
 "(void)))))))"
-"((s_451 relto_0 stx_19)"
+"((s_452 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_451 relto_0 stx_19 #t)))"
+"(standard-module-name-resolver_0 s_452 relto_0 stx_19 #t)))"
 "((s_500 relto_1 stx_20 load?_7)"
 "(let-values((()"
 "(begin"
@@ -60564,9 +60627,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_369)(symbol? p_79)))"
-"(if or-part_369"
-" or-part_369"
+"(let-values(((or-part_372)(symbol? p_79)))"
+"(if or-part_372"
+" or-part_372"
 "(if(pair? p_79)(symbol?(car p_79)) #f))))"
 " #f)"
 " #f)"
@@ -60631,10 +60694,10 @@ static const char *startup_source =
 " #f)))"
 "(if or-part_41"
 " or-part_41"
-"(let-values(((or-part_370)"
+"(let-values(((or-part_373)"
 "(current-load-relative-directory)))"
-"(if or-part_370"
-" or-part_370"
+"(if or-part_373"
+" or-part_373"
 "(current-directory))))))))"
 "((get-reg_0)"
 "(lambda()"
@@ -60647,15 +60710,15 @@ static const char *startup_source =
 " 'show-collection-err"
 "(let-values(((msg_2)"
 "(string-append"
-"(let-values(((or-part_365)"
+"(let-values(((or-part_374)"
 "(if stx_20"
 "(if(error-print-source-location)"
 "(format-source-location"
 " stx_20)"
 " #f)"
 " #f)))"
-"(if or-part_365"
-" or-part_365"
+"(if or-part_374"
+" or-part_374"
 "                                                                                    \"standard-module-name-resolver\"))"
 "                                                                                \": \""
 "(regexp-replace"
@@ -60676,27 +60739,27 @@ static const char *startup_source =
 "(current-continuation-marks)"
 " s_500)))))))"
 "((ss->rkt_0)"
-"(lambda(s_501)"
+"(lambda(s_496)"
 "(begin"
 " 'ss->rkt"
-"(let-values(((len_43)(string-length s_501)))"
+"(let-values(((len_43)(string-length s_496)))"
 "(if(if(>= len_43 3)"
 "(if(equal?"
 " '#\\."
-"(string-ref s_501(- len_43 3)))"
+"(string-ref s_496(- len_43 3)))"
 "(if(equal?"
 " '#\\s"
-"(string-ref s_501(- len_43 2)))"
+"(string-ref s_496(- len_43 2)))"
 "(equal?"
 " '#\\s"
-"(string-ref s_501(- len_43 1)))"
+"(string-ref s_496(- len_43 1)))"
 " #f)"
 " #f)"
 " #f)"
 "(string-append"
-"(substring s_501 0(- len_43 3))"
+"(substring s_496 0(- len_43 3))"
 "                                                                      \".rkt\")"
-" s_501)))))"
+" s_496)))))"
 "((path-ss->rkt_0)"
 "(lambda(p_82)"
 "(begin"
@@ -60706,11 +60769,11 @@ static const char *startup_source =
 "                                                                   (if (regexp-match '#rx\"[.]ss$\" (path->bytes name_78))"
 "                                                                     (path-replace-extension p_82 #\".rkt\")"
 " p_82)))))"
-"((s_502)"
+"((s_501)"
 "(if(if(pair? s_500)(eq? 'submod(car s_500)) #f)"
 "(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 (let-values (((or-part_375) (equal? v_257 \".\")))"
+"                                                                       (if or-part_375 or-part_375 (equal? v_257 \"..\")))"
 "(if relto_1"
 "(let-values(((p_7)"
 "(1/resolved-module-path-name"
@@ -60756,16 +60819,16 @@ static const char *startup_source =
 "(if(pair? p_83)(cdr p_83) #f))"
 " #f)))"
 "(let-values(((s-parsed_0)"
-"(if(symbol? s_502)"
+"(if(symbol? s_501)"
 "(let-values()"
 "(let-values(((or-part_46)"
 "(path-cache-get"
-"(cons s_502(get-reg_0)))))"
+"(cons s_501(get-reg_0)))))"
 "(if or-part_46"
 " or-part_46"
 "(let-values(((cols_0 file_3)"
 "(split-relative-string"
-"(symbol->string s_502)"
+"(symbol->string s_501)"
 " #f)))"
 "(let-values(((f-file_0)"
 "(if(null? cols_0)"
@@ -60779,17 +60842,17 @@ static const char *startup_source =
 "(if(null? cols_0) null(cdr cols_0))"
 " f-file_0"
 " #t))))))"
-"(if(string? s_502)"
+"(if(string? s_501)"
 "(let-values()"
 "(let-values(((dir_4)(get-dir_0)))"
-"(let-values(((or-part_372)"
+"(let-values(((or-part_376)"
 "(path-cache-get"
-"(cons s_502 dir_4))))"
-"(if or-part_372"
-" or-part_372"
+"(cons s_501 dir_4))))"
+"(if or-part_376"
+" or-part_376"
 "(let-values(((cols_1 file_4)"
 "(split-relative-string"
-" s_502"
+" s_501"
 " #f)))"
 "(if(null? cols_1)"
 "(build-path dir_4(ss->rkt_0 file_4))"
@@ -60806,26 +60869,26 @@ static const char *startup_source =
 "(let-values() s_56))))"
 " cols_1)"
 "(list(ss->rkt_0 file_4))))))))))"
-"(if(path? s_502)"
+"(if(path? s_501)"
 "(let-values()"
 "(path-ss->rkt_0"
 "(simplify-path"
-"(if(complete-path? s_502)"
-" s_502"
-"(path->complete-path s_502(get-dir_0))))))"
-"(if(eq?(car s_502) 'lib)"
+"(if(complete-path? s_501)"
+" s_501"
+"(path->complete-path s_501(get-dir_0))))))"
+"(if(eq?(car s_501) 'lib)"
 "(let-values()"
 "(let-values(((or-part_84)"
 "(path-cache-get"
-"(cons s_502(get-reg_0)))))"
+"(cons s_501(get-reg_0)))))"
 "(if or-part_84"
 " or-part_84"
 "(let-values(((cols_2 file_5)"
 "(split-relative-string"
-"(cadr s_502)"
+"(cadr s_501)"
 " #f)))"
 "(let-values(((old-style?_0)"
-"(if(null?(cddr s_502))"
+"(if(null?(cddr s_501))"
 "(if(null? cols_2)"
 "(regexp-match?"
 "                                                                                                  '#rx\"[.]\""
@@ -60848,7 +60911,7 @@ static const char *startup_source =
 "(if old-style?_0"
 "(append"
 "(if(null?"
-"(cddr s_502))"
+"(cddr s_501))"
 "                                                                                                      '(\"mzlib\")"
 "(apply"
 " append"
@@ -60857,7 +60920,7 @@ static const char *startup_source =
 "(split-relative-string"
 " p_3"
 " #t))"
-"(cddr s_502))))"
+"(cddr s_501))))"
 " cols_2)"
 "(if(null? cols_2)"
 "(list file_5)"
@@ -60868,17 +60931,17 @@ static const char *startup_source =
 "(cdr cols_3)"
 " f-file_1"
 " #t))))))))"
-"(if(eq?(car s_502) 'file)"
+"(if(eq?(car s_501) 'file)"
 "(let-values()"
 "(path-ss->rkt_0"
 "(simplify-path"
 "(path->complete-path"
-"(expand-user-path(cadr s_502))"
+"(expand-user-path(cadr s_501))"
 "(get-dir_0)))))"
 "(void))))))))"
 "(begin"
-"(if(let-values(((or-part_373)(path? s-parsed_0)))"
-"(if or-part_373 or-part_373(vector? s-parsed_0)))"
+"(if(let-values(((or-part_377)(path? s-parsed_0)))"
+"(if or-part_377 or-part_377(vector? s-parsed_0)))"
 "(void)"
 "(let-values()"
 "(if stx_20"
@@ -60891,7 +60954,7 @@ static const char *startup_source =
 "(raise-argument-error"
 " 'standard-module-name-resolver"
 "                                                            \"module-path?\""
-" s_502))))"
+" s_501))))"
 "(let-values(((filename_2)"
 "(if(vector? s-parsed_0)"
 "(vector-ref s-parsed_0 0)"
@@ -60916,11 +60979,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_374)"
+"(let-values(((or-part_378)"
 "(registry-table-ref"
 "(get-reg_0))))"
-"(if or-part_374"
-" or-part_374"
+"(if or-part_378"
+" or-part_378"
 "(let-values(((hts_4)"
 "(cons"
 "(make-hasheq)"
@@ -61024,12 +61087,12 @@ static const char *startup_source =
 " p_85"
 " stx_20))"
 " values)"
-"(if(symbol? s_502)"
-"(let-values() s_502)"
-"(if(if(pair? s_502)"
-"(eq?(car s_502) 'lib)"
+"(if(symbol? s_501)"
+"(let-values() s_501)"
+"(if(if(pair? s_501)"
+"(eq?(car s_501) 'lib)"
 " #f)"
-"(let-values() s_502)"
+"(let-values() s_501)"
 "(let-values()"
 "(if(1/resolved-module-path?"
 " root-modname_0)"
@@ -61062,24 +61125,24 @@ static const char *startup_source =
 "(void))"
 "(if(if(not(vector? s-parsed_0))"
 "(if load?_7"
-"(let-values(((or-part_375)"
-"(string? s_502)))"
-"(if or-part_375"
-" or-part_375"
-"(let-values(((or-part_376)"
-"(symbol? s_502)))"
-"(if or-part_376"
-" or-part_376"
-"(if(pair? s_502)"
-"(eq?(car s_502) 'lib)"
+"(let-values(((or-part_379)"
+"(string? s_501)))"
+"(if or-part_379"
+" or-part_379"
+"(let-values(((or-part_380)"
+"(symbol? s_501)))"
+"(if or-part_380"
+" or-part_380"
+"(if(pair? s_501)"
+"(eq?(car s_501) 'lib)"
 " #f)))))"
 " #f)"
 " #f)"
 "(let-values()"
 "(path-cache-set!"
-"(if(string? s_502)"
-"(cons s_502(get-dir_0))"
-"(cons s_502(get-reg_0)))"
+"(if(string? s_501)"
+"(cons s_501(get-dir_0))"
+"(cons s_501(get-reg_0)))"
 "(vector"
 " filename_2"
 " normal-filename_0"
@@ -61106,7 +61169,7 @@ static const char *startup_source =
 "(let-values()(c_112 e_88 #t))))))))))"
 "(define-values"
 "(default-compile-handler)"
-"(lambda(s_503 immediate-eval?_0)(begin(1/compile s_503(1/current-namespace)(not immediate-eval?_0)))))"
+"(lambda(s_502 immediate-eval?_0)(begin(1/compile s_502(1/current-namespace)(not immediate-eval?_0)))))"
 "(define-values"
 "(default-read-interaction)"
 "(lambda(src_10 in_89)"
@@ -61148,9 +61211,9 @@ static const char *startup_source =
 "(prepare-next-phase-namespace)"
 "(lambda(ctx_76)"
 "(begin"
-"(let-values(((phase_44)(add1(expand-context-phase ctx_76))))"
-"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_76) phase_44)))"
-"(namespace-visit-available-modules! ns_59 phase_44))))))"
+"(let-values(((phase_45)(add1(expand-context-phase ctx_76))))"
+"(let-values(((ns_59)(namespace->namespace-at-phase(expand-context-namespace ctx_76) phase_45)))"
+"(namespace-visit-available-modules! ns_59 phase_45))))))"
 "(define-values"
 "(expand-body7.1)"
 "(lambda(source1_0 stratified?2_0 bodys5_0 ctx6_0)"
@@ -61158,7 +61221,7 @@ static const char *startup_source =
 " 'expand-body7"
 "(let-values(((bodys_7) bodys5_0))"
 "(let-values(((ctx_77) ctx6_0))"
-"(let-values(((s_492) source1_0))"
+"(let-values(((s_503) source1_0))"
 "(let-values(((stratified?_0) stratified?2_0))"
 "(let-values()"
 "(let-values((()"
@@ -61216,7 +61279,7 @@ static const char *startup_source =
 "(datum->syntax$1 #f bodys_7))))"
 "(void)))"
 "(values))))"
-"(let-values(((phase_137)(expand-context-phase ctx_77)))"
+"(let-values(((phase_139)(expand-context-phase ctx_77)))"
 "(let-values(((frame-id_7)(make-reference-record)))"
 "(let-values(((def-ctx-scopes_6)(box null)))"
 "(let-values(((body-ctx_0)"
@@ -61292,15 +61355,15 @@ static const char *startup_source =
 "((temp64_5)(reverse$1 val-idss_0))"
 "((temp65_5)(reverse$1 val-keyss_0))"
 "((temp66_5)(reverse$1 val-rhss_0))"
-"((temp67_6)(reverse$1 track-stxs_0))"
-"((temp68_7)(reverse$1 stx-clauses_0))"
-"((temp69_4)(reverse$1 done-bodys_0))"
-"((s70_0) s_492)"
+"((temp67_5)(reverse$1 track-stxs_0))"
+"((temp68_6)(reverse$1 stx-clauses_0))"
+"((temp69_5)(reverse$1 done-bodys_0))"
+"((s70_0) s_503)"
 "((stratified?71_0) stratified?_0)"
 "((name72_0) name_80)"
-"((temp73_3)(reverse$1 trans-idss_1)))"
+"((temp73_4)(reverse$1 trans-idss_1)))"
 "(finish-expanding-body27.1"
-" temp73_3"
+" temp73_4"
 " name72_0"
 " s70_0"
 " stratified?71_0"
@@ -61310,9 +61373,9 @@ static const char *startup_source =
 " temp64_5"
 " temp65_5"
 " temp66_5"
-" temp67_6"
-" temp68_7"
-" temp69_4)))"
+" temp67_5"
+" temp68_6"
+" temp69_5)))"
 "(let-values()"
 "(let-values(((rest-bodys_0)(cdr bodys_8)))"
 "(let-values((()"
@@ -61391,7 +61454,7 @@ static const char *startup_source =
 "(let-values(((tmp_62)"
 "(core-form-sym"
 " disarmed-exp-body_0"
-" phase_137)))"
+" phase_139)))"
 "(if(equal? tmp_62 'begin)"
 "(let-values()"
 "(let-values((()"
@@ -61428,15 +61491,15 @@ static const char *startup_source =
 " s_505)))"
 " s_176))"
 "((e81_0)"
-"(let-values(((s_451)"
+"(let-values(((s_452)"
 "(cdr"
 " s_505)))"
 "(let-values(((s_46)"
 "(if(syntax?$1"
-" s_451)"
+" s_452)"
 "(syntax-e$1"
-" s_451)"
-" s_451)))"
+" s_452)"
+" s_452)))"
 "(let-values(((flat-s_25)"
 "(to-syntax-list.1"
 " s_46)))"
@@ -61529,10 +61592,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_51)"
 "(let-values(((define-values85_0)"
-"(let-values(((s_452)"
+"(let-values(((s_453)"
 "(car"
 " s_51)))"
-" s_452))"
+" s_453))"
 "((id86_0"
 " rhs87_0)"
 "(let-values(((s_506)"
@@ -61717,7 +61780,7 @@ static const char *startup_source =
 "(let-values(((ids92_0)"
 " ids_30)"
 "((phase93_0)"
-" phase_137)"
+" phase_139)"
 "((exp-body94_0)"
 " exp-body_0)"
 "((dups95_0)"
@@ -61742,7 +61805,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_292)))"
-"((letrec-values(((for-loop_281)"
+"((letrec-values(((for-loop_280)"
 "(lambda(fold-var_189"
 " lst_310)"
 "(begin"
@@ -61765,7 +61828,7 @@ static const char *startup_source =
 "(let-values(((id96_0)"
 " id_106)"
 "((phase97_0)"
-" phase_137)"
+" phase_139)"
 "((counter98_0)"
 " counter_5)"
 "((frame-id99_0)"
@@ -61783,12 +61846,12 @@ static const char *startup_source =
 " fold-var_288)))))"
 "(if(not"
 " #f)"
-"(for-loop_281"
+"(for-loop_280"
 " fold-var_286"
 " rest_181)"
 " fold-var_286)))"
 " fold-var_189)))))"
-" for-loop_281)"
+" for-loop_280)"
 " null"
 " lst_292))))))"
 "(let-values(((extended-env_0)"
@@ -61809,7 +61872,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_307)))"
-"((letrec-values(((for-loop_276)"
+"((letrec-values(((for-loop_275)"
 "(lambda(env_17"
 " lst_311"
 " lst_312)"
@@ -61846,13 +61909,13 @@ static const char *startup_source =
 " env_20)))))"
 "(if(not"
 " #f)"
-"(for-loop_276"
+"(for-loop_275"
 " env_18"
 " rest_182"
 " rest_183)"
 " env_18)))"
 " env_17)))))"
-" for-loop_276)"
+" for-loop_275)"
 "(expand-context-env"
 " body-ctx_2)"
 " lst_228"
@@ -61920,7 +61983,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_313)))"
-"((letrec-values(((for-loop_282)"
+"((letrec-values(((for-loop_281)"
 "(lambda(fold-var_289"
 " lst_155)"
 "(begin"
@@ -61946,12 +62009,12 @@ static const char *startup_source =
 " fold-var_292)))))"
 "(if(not"
 " #f)"
-"(for-loop_282"
+"(for-loop_281"
 " fold-var_290"
 " rest_79)"
 " fold-var_290)))"
 " fold-var_289)))))"
-" for-loop_282)"
+" for-loop_281)"
 " null"
 " lst_313))))"
 " val-idss_0))"
@@ -61968,7 +62031,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_314)))"
-"((letrec-values(((for-loop_283)"
+"((letrec-values(((for-loop_282)"
 "(lambda(fold-var_293"
 " lst_32)"
 "(begin"
@@ -61994,12 +62057,12 @@ static const char *startup_source =
 " fold-var_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_283"
+"(for-loop_282"
 " fold-var_294"
 " rest_184)"
 " fold-var_294)))"
 " fold-var_293)))))"
-" for-loop_283)"
+" for-loop_282)"
 " null"
 " lst_314))))"
 " val-keyss_0))"
@@ -62038,8 +62101,8 @@ static const char *startup_source =
 "(let-values()"
 "(no-binds"
 " done-body_2"
-" s_492"
-" phase_137))"
+" s_503"
+" phase_139))"
 " fold-var_298))))"
 "(values"
 " fold-var_145)))))"
@@ -62067,7 +62130,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_157)))"
-"((letrec-values(((for-loop_284)"
+"((letrec-values(((for-loop_283)"
 "(lambda(fold-var_299"
 " lst_316)"
 "(begin"
@@ -62093,12 +62156,12 @@ static const char *startup_source =
 " fold-var_300)))))"
 "(if(not"
 " #f)"
-"(for-loop_284"
+"(for-loop_283"
 " fold-var_41"
 " rest_186)"
 " fold-var_41)))"
 " fold-var_299)))))"
-" for-loop_284)"
+" for-loop_283)"
 " null"
 " lst_157))))"
 " track-stxs_0))"
@@ -62188,7 +62251,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_317)))"
-"((letrec-values(((for-loop_285)"
+"((letrec-values(((for-loop_284)"
 "(lambda(id_109"
 " lst_318)"
 "(begin"
@@ -62208,15 +62271,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id113_0)"
 "(let-values()"
-"(if(let-values(((or-part_377)"
+"(if(let-values(((or-part_381)"
 "(if(syntax?$1"
 " s_159)"
 "(symbol?"
 "(syntax-e$1"
 " s_159))"
 " #f)))"
-"(if or-part_377"
-" or-part_377"
+"(if or-part_381"
+" or-part_381"
 "(symbol?"
 " s_159)))"
 " s_159"
@@ -62232,12 +62295,12 @@ static const char *startup_source =
 " id_111)))))"
 "(if(not"
 " #f)"
-"(for-loop_285"
+"(for-loop_284"
 " id_65"
 " rest_187)"
 " id_65)))"
 " id_109)))))"
-" for-loop_285)"
+" for-loop_284)"
 " null"
 " lst_317)))))"
 "(reverse$1"
@@ -62328,7 +62391,7 @@ static const char *startup_source =
 "(let-values(((ids114_0)"
 " ids_31)"
 "((phase115_0)"
-" phase_137)"
+" phase_139)"
 "((exp-body116_0)"
 " exp-body_0)"
 "((dups117_0)"
@@ -62353,7 +62416,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_319)))"
-"((letrec-values(((for-loop_286)"
+"((letrec-values(((for-loop_285)"
 "(lambda(fold-var_301"
 " lst_320)"
 "(begin"
@@ -62376,7 +62439,7 @@ static const char *startup_source =
 "(let-values(((id118_0)"
 " id_112)"
 "((phase119_0)"
-" phase_137)"
+" phase_139)"
 "((counter120_0)"
 " counter_6)"
 "((frame-id121_0)"
@@ -62394,12 +62457,12 @@ static const char *startup_source =
 " fold-var_304)))))"
 "(if(not"
 " #f)"
-"(for-loop_286"
+"(for-loop_285"
 " fold-var_302"
 " rest_188)"
 " fold-var_302)))"
 " fold-var_301)))))"
-" for-loop_286)"
+" for-loop_285)"
 " null"
 " lst_319))))))"
 "(let-values((()"
@@ -62465,7 +62528,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_323)))"
-"((letrec-values(((for-loop_287)"
+"((letrec-values(((for-loop_286)"
 "(lambda(env_21"
 " lst_324"
 " lst_325"
@@ -62507,7 +62570,7 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_41"
 " id_113"
-" phase_137"
+" phase_139"
 " body-ctx_2)"
 "(env-extend"
 " env_23"
@@ -62517,14 +62580,14 @@ static const char *startup_source =
 " env_24)))))"
 "(if(not"
 " #f)"
-"(for-loop_287"
+"(for-loop_286"
 " env_22"
 " rest_189"
 " rest_190"
 " rest_191)"
 " env_22)))"
 " env_21)))))"
-" for-loop_287)"
+" for-loop_286)"
 "(expand-context-env"
 " body-ctx_2)"
 " lst_321"
@@ -62632,7 +62695,7 @@ static const char *startup_source =
 "(cons"
 "(core-id"
 " '#%stratified-body"
-" phase_137)"
+" phase_139)"
 "(cons"
 " exp-body_0"
 " rest-bodys_0)))))"
@@ -62801,7 +62864,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-naturals start_64)))"
-"((letrec-values(((for-loop_288)"
+"((letrec-values(((for-loop_287)"
 "(lambda(fold-var_305"
 " lst_5"
 " pos_125)"
@@ -62901,7 +62964,7 @@ static const char *startup_source =
 " fold-var_308)))))"
 "(if(not"
 " #f)"
-"(for-loop_288"
+"(for-loop_287"
 " fold-var_306"
 " rest_192"
 "(+"
@@ -62909,7 +62972,7 @@ static const char *startup_source =
 " 1))"
 " fold-var_306)))"
 " fold-var_305)))))"
-" for-loop_288)"
+" for-loop_287)"
 " null"
 " lst_213"
 " start_64))))))"
@@ -63023,7 +63086,7 @@ static const char *startup_source =
 "(let-values(((get-body_0) get-body35_0))"
 "(let-values(((track?_1) track?36_0))"
 "(let-values()"
-"(let-values(((phase_138)(expand-context-phase ctx_78)))"
+"(let-values(((phase_140)(expand-context-phase ctx_78)))"
 "((letrec-values(((loop_27)"
 "(lambda(idss_2"
 " keyss_1"
@@ -63068,10 +63131,10 @@ static const char *startup_source =
 "(if(null? accum-idss_0)"
 "(core-id"
 " 'let-values"
-" phase_138)"
+" phase_140)"
 "(core-id"
 " 'letrec-values"
-" phase_138))"
+" phase_140))"
 "(build-clauses"
 " accum-idss_0"
 " accum-rhss_0"
@@ -63180,7 +63243,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'let-values"
-" phase_138)"
+" phase_140)"
 "(list"
 "(build-clause"
 " ids_32"
@@ -63213,9 +63276,9 @@ static const char *startup_source =
 "(list result-s_10)"
 " result-s_10))))))"
 "(if(if(not forward-references?_0)"
-"(let-values(((or-part_378) split?_0))"
-"(if or-part_378"
-" or-part_378"
+"(let-values(((or-part_382) split?_0))"
+"(if or-part_382"
+" or-part_382"
 "(null?(cdr idss_2))))"
 " #f)"
 "(let-values()"
@@ -63260,7 +63323,7 @@ static const char *startup_source =
 "(list*"
 "(core-id"
 " 'letrec-values"
-" phase_138)"
+" phase_140)"
 "(build-clauses"
 "(cons"
 " ids_32"
@@ -63334,12 +63397,12 @@ static const char *startup_source =
 "(if track-stx_1(syntax-track-origin$1 clause_2 track-stx_1) clause_2)))))"
 "(define-values"
 "(no-binds)"
-"(lambda(expr_10 s_517 phase_139)"
+"(lambda(expr_10 s_517 phase_141)"
 "(begin"
-"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_139)))"
+"(let-values(((s-runtime-stx_0)(syntax-shift-phase-level$1 runtime-stx phase_141)))"
 "(datum->syntax$1"
-"(core-id '#%app phase_139)"
-"(list(core-id 'begin phase_139) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
+"(core-id '#%app phase_141)"
+"(list(core-id 'begin phase_141) expr_10(list(datum->syntax$1 s-runtime-stx_0 'values)))"
 " s_517)))))"
 "(define-values"
 "(log-tag?)"
@@ -63349,7 +63412,7 @@ static const char *startup_source =
 "(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(((phase_142)(expand-context-phase ctx_80)))"
 "(let-values(((clauses_0)"
 "(reverse$1"
 "(let-values(((lst_327) val-idss_2)((lst_328) val-rhss_2)((lst_329) track-stxs_4))"
@@ -63363,7 +63426,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_329)))"
-"((letrec-values(((for-loop_289)"
+"((letrec-values(((for-loop_288)"
 "(lambda(fold-var_309 lst_330 lst_331 lst_332)"
 "(begin"
 " 'for-loop"
@@ -63387,16 +63450,16 @@ static const char *startup_source =
 " fold-var_311))))"
 "(values fold-var_312)))))"
 "(if(not #f)"
-"(for-loop_289 fold-var_310 rest_193 rest_194 rest_195)"
+"(for-loop_288 fold-var_310 rest_193 rest_194 rest_195)"
 " fold-var_310)))"
 " fold-var_309)))))"
-" for-loop_289)"
+" for-loop_288)"
 " null"
 " lst_327"
 " lst_328"
 " 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-id_0)(core-id(if had-stxes?_2 'letrec-syntaxes+values 'letrec-values) phase_142)))"
 "(let-values(((lv-s_0)"
 "(datum->syntax$1"
 " #f"
@@ -63444,12 +63507,12 @@ static const char *startup_source =
 "(lambda(s_74 disarmed-s_5 formals_1 bodys_9 ctx_81 log-renames-tag_0)"
 "(begin"
 "(let-values(((sc_37)(new-scope 'local)))"
-"(let-values(((phase_84)(expand-context-phase ctx_81)))"
+"(let-values(((phase_85)(expand-context-phase ctx_81)))"
 "(let-values(((ids_34)(parse-and-flatten-formals formals_1 sc_37 disarmed-s_5)))"
 "(let-values((()"
 "(begin"
 "(let-values(((ids33_0) ids_34)"
-"((phase34_1) phase_84)"
+"((phase34_1) phase_85)"
 "((s35_1) s_74)"
 "                                         ((temp36_8) \"argument name\"))"
 "(check-no-duplicate-ids7.1 temp36_8 ids33_0 phase34_1 s35_1 unsafe-undefined))"
@@ -63478,7 +63541,7 @@ static const char *startup_source =
 "(let-values(((id37_0)"
 " id_114)"
 "((phase38_1)"
-" phase_84)"
+" phase_85)"
 "((counter39_0)"
 " counter_7)"
 "((s40_0)"
@@ -63499,21 +63562,21 @@ static const char *startup_source =
 " null"
 " lst_88))))))"
 "(let-values(((body-env_0)"
-"(let-values(((lst_80) keys_7)((lst_91) ids_34))"
+"(let-values(((lst_76) keys_7)((lst_91) ids_34))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_80)))"
+"(let-values()(check-list lst_76)))"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_91)))"
 "((letrec-values(((for-loop_49)"
-"(lambda(env_25 lst_82 lst_58)"
+"(lambda(env_25 lst_78 lst_58)"
 "(begin"
 " 'for-loop"
-"(if(if(pair? lst_82)(pair? lst_58) #f)"
-"(let-values(((key_90)(unsafe-car lst_82))"
-"((rest_196)(unsafe-cdr lst_82))"
+"(if(if(pair? lst_78)(pair? lst_58) #f)"
+"(let-values(((key_90)(unsafe-car lst_78))"
+"((rest_196)(unsafe-cdr lst_78))"
 "((id_115)(unsafe-car lst_58))"
 "((rest_197)(unsafe-cdr lst_58)))"
 "(let-values(((env_26)"
@@ -63532,7 +63595,7 @@ static const char *startup_source =
 " env_25)))))"
 " for-loop_49)"
 "(expand-context-env ctx_81)"
-" lst_80"
+" lst_76"
 " lst_91)))))"
 "(let-values(((sc-formals_0)(add-scope formals_1 sc_37)))"
 "(let-values(((sc-bodys_0)"
@@ -63614,10 +63677,10 @@ static const char *startup_source =
 "(let-values(((exp-body_2)"
 "(let-values(((sc-bodys46_0) sc-bodys_0)"
 "((body-ctx47_0) body-ctx_4)"
-"((temp48_3)"
-"(let-values(((ctx49_0) ctx_81)((s50_0) s_74)((temp51_2) #t))"
-"(keep-as-needed119.1 #f temp51_2 #f ctx49_0 s50_0))))"
-"(expand-body7.1 temp48_3 #f sc-bodys46_0 body-ctx47_0))))"
+"((temp48_2)"
+"(let-values(((ctx49_0) ctx_81)((s50_0) s_74)((temp51_3) #t))"
+"(keep-as-needed119.1 #f temp51_3 #f ctx49_0 s50_0))))"
+"(expand-body7.1 temp48_2 #f sc-bodys46_0 body-ctx47_0))))"
 "(values"
 "(if(expand-context-to-parsed? ctx_81)"
 "(unflatten-like-formals keys_7 formals_1)"
@@ -63634,10 +63697,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((disarmed-s_6)(syntax-disarm$1 s_13)))"
 "(let-values(((ok?_37 lambda52_0 formals53_0 body54_0)"
-"(let-values(((s_495) disarmed-s_6))"
-"(let-values(((orig-s_40) s_495))"
+"(let-values(((s_518) disarmed-s_6))"
+"(let-values(((orig-s_40) s_518))"
 "(let-values(((lambda52_1 formals53_1 body54_1)"
-"(let-values(((s_172)(if(syntax?$1 s_495)(syntax-e$1 s_495) s_495)))"
+"(let-values(((s_172)(if(syntax?$1 s_518)(syntax-e$1 s_518) s_518)))"
 "(if(pair? s_172)"
 "(let-values(((lambda55_0)(let-values(((s_45)(car s_172))) s_45))"
 "((formals56_0 body57_0)"
@@ -63652,13 +63715,13 @@ static const char *startup_source =
 " s_175))"
 "((body59_0)"
 "(let-values(((s_176)(cdr s_174)))"
-"(let-values(((s_451)"
+"(let-values(((s_452)"
 "(if(syntax?$1 s_176)"
 "(syntax-e$1 s_176)"
 " s_176)))"
 "(let-values(((flat-s_28)"
 "(to-syntax-list.1"
-" s_451)))"
+" s_452)))"
 "(if(not flat-s_28)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -63679,8 +63742,8 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_40)))))"
 "(values #t lambda52_1 formals53_1 body54_1))))))"
 "(let-values(((rebuild-s_4)"
-"(let-values(((ctx60_1) ctx_82)((s61_0) s_13)((temp62_3) #t))"
-"(keep-as-needed119.1 #f #f temp62_3 ctx60_1 s61_0))))"
+"(let-values(((ctx60_1) ctx_82)((s61_0) s_13)((temp62_4) #t))"
+"(keep-as-needed119.1 #f #f temp62_4 ctx60_1 s61_0))))"
 "(let-values(((formals_2 body_11)"
 "(lambda-clause-expander s_13 disarmed-s_6 formals53_0 body54_0 ctx_82 'lambda-renames)))"
 "(if(expand-context-to-parsed? ctx_82)"
@@ -63692,14 +63755,14 @@ static const char *startup_source =
 " 'λ"
 "(lambda(s_26)"
 "(let-values(((ok?_38 lam-id65_0 formals66_0 _67_0)"
-"(let-values(((s_518) s_26))"
-"(let-values(((orig-s_41) s_518))"
+"(let-values(((s_519) s_26))"
+"(let-values(((orig-s_41) s_519))"
 "(let-values(((lam-id65_1 formals66_1 _67_1)"
-"(let-values(((s_501)(if(syntax?$1 s_518)(syntax-e$1 s_518) s_518)))"
-"(if(pair? s_501)"
-"(let-values(((lam-id68_0)(let-values(((s_506)(car s_501))) s_506))"
+"(let-values(((s_496)(if(syntax?$1 s_519)(syntax-e$1 s_519) s_519)))"
+"(if(pair? s_496)"
+"(let-values(((lam-id68_0)(let-values(((s_506)(car s_496))) s_506))"
 "((formals69_0 _70_0)"
-"(let-values(((s_507)(cdr s_501)))"
+"(let-values(((s_507)(cdr s_496)))"
 "(let-values(((s_52)"
 "(if(syntax?$1 s_507)(syntax-e$1 s_507) s_507)))"
 "(if(pair? s_52)"
@@ -63732,44 +63795,44 @@ static const char *startup_source =
 "                                         (raise-syntax-error$1 #f \"bad syntax\" orig-s_41)))))"
 "(values #t lam-id65_1 formals66_1 _67_1))))))"
 "(let-values(((ids_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)))"
+"(let-values(((ctx_83)(let-values(((temp77_3) #t))(get-current-expand-context16.1 temp77_3 'unexpected))))"
+"(let-values(((phase_94)(if ctx_83(expand-context-phase ctx_83) 0)))"
 "(begin"
-"               (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))"
+"               (let-values (((ids73_0) ids_35) ((phase74_2) phase_94) ((s75_0) s_26) ((temp76_3) \"argument name\"))"
+"(check-no-duplicate-ids7.1 temp76_3 ids73_0 phase74_2 s75_0 unsafe-undefined))"
 "(datum->syntax$1"
 " s_26"
 "(cons"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_93) 'lambda lam-id65_0 lam-id65_0)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_94) 'lambda lam-id65_0 lam-id65_0)"
 "(cdr(syntax-e$1 s_26)))"
 " s_26"
 " s_26)))))))))"
 "(void"
 "(add-core-form!*"
 " 'case-lambda"
-"(lambda(s_454 ctx_83)"
+"(lambda(s_455 ctx_84)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_89)(expand-context-observer ctx_83)))"
+"(let-values(((obs_89)(expand-context-observer ctx_84)))"
 "(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_454)))"
+"(let-values(((disarmed-s_7)(syntax-disarm$1 s_455)))"
 "(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))"
+"(let-values(((s_520) disarmed-s_7))"
+"(let-values(((orig-s_42) s_520))"
 "(let-values(((case-lambda78_1 formals79_1 body80_1)"
-"(let-values(((s_415)(if(syntax?$1 s_519)(syntax-e$1 s_519) s_519)))"
+"(let-values(((s_415)(if(syntax?$1 s_520)(syntax-e$1 s_520) s_520)))"
 "(if(pair? s_415)"
-"(let-values(((case-lambda81_0)(let-values(((s_520)(car s_415))) s_520))"
+"(let-values(((case-lambda81_0)(let-values(((s_521)(car s_415))) s_521))"
 "((formals82_0 body83_0)"
 "(let-values(((s_407)(cdr s_415)))"
-"(let-values(((s_521)"
+"(let-values(((s_522)"
 "(if(syntax?$1 s_407)"
 "(syntax-e$1 s_407)"
 " s_407)))"
-"(let-values(((flat-s_30)(to-syntax-list.1 s_521)))"
+"(let-values(((flat-s_30)(to-syntax-list.1 s_522)))"
 "(if(not flat-s_30)"
 "(let-values()"
 "                                                                     (raise-syntax-error$1 #f \"bad syntax\" orig-s_42))"
@@ -63782,7 +63845,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list lst_333)))"
-"((letrec-values(((for-loop_290)"
+"((letrec-values(((for-loop_289)"
 "(lambda(formals_4"
 " body_13"
 " lst_334)"
@@ -63808,32 +63871,32 @@ static const char *startup_source =
 "(let-values(((formals90_0"
 " body91_0)"
 "(let-values()"
-"(let-values(((s_522)"
+"(let-values(((s_523)"
 "(if(syntax?$1"
 " s_209)"
 "(syntax-e$1"
 " s_209)"
 " s_209)))"
 "(if(pair?"
-" s_522)"
+" s_523)"
 "(let-values(((formals84_0)"
-"(let-values(((s_523)"
-"(car"
-" s_522)))"
-" s_523))"
-"((body85_0)"
 "(let-values(((s_524)"
-"(cdr"
-" s_522)))"
+"(car"
+" s_523)))"
+" s_524))"
+"((body85_0)"
 "(let-values(((s_525)"
+"(cdr"
+" s_523)))"
+"(let-values(((s_526)"
 "(if(syntax?$1"
-" s_524)"
+" s_525)"
 "(syntax-e$1"
-" s_524)"
-" s_524)))"
+" s_525)"
+" s_525)))"
 "(let-values(((flat-s_31)"
 "(to-syntax-list.1"
-" s_525)))"
+" s_526)))"
 "(if(not"
 " flat-s_31)"
 "(let-values()"
@@ -63869,7 +63932,7 @@ static const char *startup_source =
 " body_16)))))"
 "(if(not"
 " #f)"
-"(for-loop_290"
+"(for-loop_289"
 " formals_5"
 " body_14"
 " rest_198)"
@@ -63879,7 +63942,7 @@ static const char *startup_source =
 "(values"
 " formals_4"
 " body_13))))))"
-" for-loop_290)"
+" for-loop_289)"
 " null"
 " null"
 " lst_333)))))"
@@ -63890,20 +63953,20 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_42)))))"
 "(values #t case-lambda78_1 formals79_1 body80_1))))))"
 "(let-values(((ok?_40 case-lambda86_0 clause87_0)"
-"(let-values(((s_526) disarmed-s_7))"
-"(let-values(((orig-s_43) s_526))"
+"(let-values(((s_527) disarmed-s_7))"
+"(let-values(((orig-s_43) s_527))"
 "(let-values(((case-lambda86_1 clause87_1)"
-"(let-values(((s_458)(if(syntax?$1 s_526)(syntax-e$1 s_526) s_526)))"
-"(if(pair? s_458)"
+"(let-values(((s_459)(if(syntax?$1 s_527)(syntax-e$1 s_527) s_527)))"
+"(if(pair? s_459)"
 "(let-values(((case-lambda88_0)"
-"(let-values(((s_211)(car s_458))) s_211))"
+"(let-values(((s_211)(car s_459))) s_211))"
 "((clause89_0)"
-"(let-values(((s_527)(cdr s_458)))"
-"(let-values(((s_528)"
-"(if(syntax?$1 s_527)"
-"(syntax-e$1 s_527)"
-" s_527)))"
-"(let-values(((flat-s_32)(to-syntax-list.1 s_528)))"
+"(let-values(((s_528)(cdr s_459)))"
+"(let-values(((s_529)"
+"(if(syntax?$1 s_528)"
+"(syntax-e$1 s_528)"
+" s_528)))"
+"(let-values(((flat-s_32)(to-syntax-list.1 s_529)))"
 "(if(not flat-s_32)"
 "(let-values()"
 "                                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_43))"
@@ -63912,7 +63975,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_454)((temp94_0) #t))"
+"(let-values(((ctx92_0) ctx_84)((s93_0) s_455)((temp94_0) #t))"
 "(keep-as-needed119.1 #f #f temp94_0 ctx92_0 s93_0))))"
 "(let-values(((clauses_1)"
 "(reverse$1"
@@ -63950,7 +64013,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_90)"
 "(expand-context-observer"
-" ctx_83)))"
+" ctx_84)))"
 "(if obs_90"
 "(let-values()"
 "(let-values()"
@@ -63961,7 +64024,7 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((rebuild-clause_0)"
 "(let-values(((ctx95_0)"
-" ctx_83)"
+" ctx_84)"
 "((clause96_0)"
 " clause_3))"
 "(keep-as-needed119.1"
@@ -63973,14 +64036,14 @@ static const char *startup_source =
 "(let-values(((exp-formals_0"
 " exp-body_3)"
 "(lambda-clause-expander"
-" s_454"
+" s_455"
 " disarmed-s_7"
 " formals_8"
 " body_17"
-" ctx_83"
+" ctx_84"
 " 'lambda-renames)))"
 "(if(expand-context-to-parsed?"
-" ctx_83)"
+" ctx_84)"
 "(list"
 " exp-formals_0"
 " exp-body_3)"
@@ -64005,13 +64068,13 @@ static const char *startup_source =
 " lst_111"
 " lst_204"
 " lst_112))))))"
-"(if(expand-context-to-parsed? ctx_83)"
+"(if(expand-context-to-parsed? ctx_84)"
 "(parsed-case-lambda6.1 rebuild-s_5 clauses_1)"
 "(let-values(((rebuild-s99_0) rebuild-s_5)((temp100_2)(list* case-lambda78_0 clauses_1)))"
 "(rebuild5.1 #t rebuild-s99_0 temp100_2))))))))))))"
 "(define-values"
 "(parse-and-flatten-formals)"
-"(lambda(all-formals_0 sc_38 s_529)"
+"(lambda(all-formals_0 sc_38 s_530)"
 "(begin"
 "((letrec-values(((loop_121)"
 "(lambda(formals_9)"
@@ -64026,21 +64089,21 @@ static const char *startup_source =
 "(let-values()(loop_121 p_86))"
 "(if(null? p_86)"
 "(let-values() null)"
-"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_529 p_86))))))"
+"                                        (let-values () (raise-syntax-error$1 #f \"not an identifier\" s_530 p_86))))))"
 "(if(pair? formals_9)"
 "(let-values()"
 "(begin"
 "(if(identifier?(car formals_9))"
 "(void)"
 "(let-values()"
-"                                          (raise-syntax-error$1 #f \"not an identifier\" s_529 (car formals_9))))"
+"                                          (raise-syntax-error$1 #f \"not an identifier\" s_530 (car formals_9))))"
 "(cons"
 "(if sc_38(add-scope(car formals_9) sc_38)(car formals_9))"
 "(loop_121(cdr formals_9)))))"
 "(if(null? formals_9)"
 "(let-values() null)"
 "(let-values()"
-"                                      (raise-syntax-error$1 \"bad argument sequence\" s_529 all-formals_0))))))))))"
+"                                      (raise-syntax-error$1 \"bad argument sequence\" s_530 all-formals_0))))))))))"
 " loop_121)"
 " all-formals_0))))"
 "(define-values"
@@ -64072,10 +64135,10 @@ static const char *startup_source =
 "(let-values(((split-by-reference?_0) split-by-reference?4_0))"
 "(let-values(((renames-log-tag_0) renames-log-tag5_0))"
 "(let-values()"
-"(lambda(s_105 ctx_84)"
+"(lambda(s_105 ctx_85)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_53)(expand-context-observer ctx_84)))"
+"(let-values(((obs_53)(expand-context-observer ctx_85)))"
 "(if obs_53"
 "(let-values()(let-values()(call-expand-observe obs_53 log-tag_0)))"
 "(void)))"
@@ -64097,19 +64160,19 @@ static const char *startup_source =
 " id:val104_1"
 " val-rhs105_1"
 " body106_1)"
-"(let-values(((s_530)"
+"(let-values(((s_531)"
 "(if(syntax?$1 s_128)"
 "(syntax-e$1 s_128)"
 " s_128)))"
-"(if(pair? s_530)"
+"(if(pair? s_531)"
 "(let-values(((letrec-syntaxes+values107_0)"
-"(let-values(((s_531)(car s_530))) s_531))"
+"(let-values(((s_430)(car s_531))) s_430))"
 "((id:trans108_0"
 " trans-rhs109_0"
 " id:val110_0"
 " val-rhs111_0"
 " body112_0)"
-"(let-values(((s_230)(cdr s_530)))"
+"(let-values(((s_230)(cdr s_531)))"
 "(let-values(((s_231)"
 "(if(syntax?$1 s_230)"
 "(syntax-e$1 s_230)"
@@ -64148,7 +64211,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_338)))"
-"((letrec-values(((for-loop_291)"
+"((letrec-values(((for-loop_290)"
 "(lambda(id:trans_1"
 " trans-rhs_1"
 " lst_339)"
@@ -64213,7 +64276,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_340)))"
-"((letrec-values(((for-loop_292)"
+"((letrec-values(((for-loop_291)"
 "(lambda(id:trans_6"
 " lst_216)"
 "(begin"
@@ -64257,12 +64320,12 @@ static const char *startup_source =
 " id:trans_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_292"
+"(for-loop_291"
 " id:trans_7"
 " rest_203)"
 " id:trans_7)))"
 " id:trans_6)))))"
-" for-loop_292)"
+" for-loop_291)"
 " null"
 " lst_340)))))"
 "(reverse$1"
@@ -64326,7 +64389,7 @@ static const char *startup_source =
 " trans-rhs_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_291"
+"(for-loop_290"
 " id:trans_2"
 " trans-rhs_2"
 " rest_202)"
@@ -64336,7 +64399,7 @@ static const char *startup_source =
 "(values"
 " id:trans_1"
 " trans-rhs_1))))))"
-" for-loop_291)"
+" for-loop_290)"
 " null"
 " null"
 " lst_338)))))"
@@ -64391,7 +64454,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_341)))"
-"((letrec-values(((for-loop_293)"
+"((letrec-values(((for-loop_292)"
 "(lambda(id:val_1"
 " val-rhs_2"
 " lst_342)"
@@ -64426,15 +64489,15 @@ static const char *startup_source =
 "(if(pair?"
 " s_538)"
 "(let-values(((id:val124_0)"
-"(let-values(((s_473)"
+"(let-values(((s_474)"
 "(car"
 " s_538)))"
 "(let-values(((s_539)"
 "(if(syntax?$1"
-" s_473)"
+" s_474)"
 "(syntax-e$1"
-" s_473)"
-" s_473)))"
+" s_474)"
+" s_474)))"
 "(let-values(((flat-s_36)"
 "(to-syntax-list.1"
 " s_539)))"
@@ -64456,7 +64519,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_343)))"
-"((letrec-values(((for-loop_294)"
+"((letrec-values(((for-loop_293)"
 "(lambda(id:val_6"
 " lst_123)"
 "(begin"
@@ -64476,15 +64539,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val149_0)"
 "(let-values()"
-"(if(let-values(((or-part_379)"
+"(if(let-values(((or-part_383)"
 "(if(syntax?$1"
 " s_540)"
 "(symbol?"
 "(syntax-e$1"
 " s_540))"
 " #f)))"
-"(if or-part_379"
-" or-part_379"
+"(if or-part_383"
+" or-part_383"
 "(symbol?"
 " s_540)))"
 " s_540"
@@ -64500,12 +64563,12 @@ static const char *startup_source =
 " id:val_9)))))"
 "(if(not"
 " #f)"
-"(for-loop_294"
+"(for-loop_293"
 " id:val_7"
 " rest_62)"
 " id:val_7)))"
 " id:val_6)))))"
-" for-loop_294)"
+" for-loop_293)"
 " null"
 " lst_343)))))"
 "(reverse$1"
@@ -64569,7 +64632,7 @@ static const char *startup_source =
 " val-rhs_5)))))"
 "(if(not"
 " #f)"
-"(for-loop_293"
+"(for-loop_292"
 " id:val_2"
 " val-rhs_3"
 " rest_204)"
@@ -64579,7 +64642,7 @@ static const char *startup_source =
 "(values"
 " id:val_1"
 " val-rhs_2))))))"
-" for-loop_293)"
+" for-loop_292)"
 " null"
 " null"
 " lst_341)))))"
@@ -64705,7 +64768,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_305)))"
-"((letrec-values(((for-loop_295)"
+"((letrec-values(((for-loop_294)"
 "(lambda(id:val_11"
 " val-rhs_7"
 " lst_344)"
@@ -64770,7 +64833,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_345)))"
-"((letrec-values(((for-loop_296)"
+"((letrec-values(((for-loop_295)"
 "(lambda(id:val_16"
 " lst_346)"
 "(begin"
@@ -64790,15 +64853,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:val152_0)"
 "(let-values()"
-"(if(let-values(((or-part_380)"
+"(if(let-values(((or-part_384)"
 "(if(syntax?$1"
 " s_548)"
 "(symbol?"
 "(syntax-e$1"
 " s_548))"
 " #f)))"
-"(if or-part_380"
-" or-part_380"
+"(if or-part_384"
+" or-part_384"
 "(symbol?"
 " s_548)))"
 " s_548"
@@ -64814,12 +64877,12 @@ static const char *startup_source =
 " id:val_19)))))"
 "(if(not"
 " #f)"
-"(for-loop_296"
+"(for-loop_295"
 " id:val_17"
 " rest_206)"
 " id:val_17)))"
 " id:val_16)))))"
-" for-loop_296)"
+" for-loop_295)"
 " null"
 " lst_345)))))"
 "(reverse$1"
@@ -64883,7 +64946,7 @@ static const char *startup_source =
 " val-rhs_10)))))"
 "(if(not"
 " #f)"
-"(for-loop_295"
+"(for-loop_294"
 " id:val_12"
 " val-rhs_8"
 " rest_205)"
@@ -64893,7 +64956,7 @@ static const char *startup_source =
 "(values"
 " id:val_11"
 " val-rhs_7))))))"
-" for-loop_295)"
+" for-loop_294)"
 " null"
 " null"
 " lst_305)))))"
@@ -64948,7 +65011,7 @@ static const char *startup_source =
 "(values #t let-values127_1 id:val128_1 val-rhs129_1 body130_1)))"
 "(values #f #f #f #f #f)))))"
 "(let-values(((sc_39)(new-scope 'local)))"
-"(let-values(((phase_83)(expand-context-phase ctx_84)))"
+"(let-values(((phase_84)(expand-context-phase ctx_85)))"
 "(let-values(((frame-id_15)(if syntaxes?_0(make-reference-record) #f)))"
 "(let-values(((trans-idss_2)"
 "(reverse$1"
@@ -64957,7 +65020,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_347)))"
-"((letrec-values(((for-loop_297)"
+"((letrec-values(((for-loop_296)"
 "(lambda(fold-var_316 lst_348)"
 "(begin"
 " 'for-loop"
@@ -64983,7 +65046,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_349)))"
-"((letrec-values(((for-loop_298)"
+"((letrec-values(((for-loop_297)"
 "(lambda(fold-var_317"
 " lst_350)"
 "(begin"
@@ -65011,22 +65074,22 @@ static const char *startup_source =
 " fold-var_320)))))"
 "(if(not"
 " #f)"
-"(for-loop_298"
+"(for-loop_297"
 " fold-var_318"
 " rest_208)"
 " fold-var_318)))"
 " fold-var_317)))))"
-" for-loop_298)"
+" for-loop_297)"
 " null"
 " lst_349)))))"
 " fold-var_114))))"
 "(values"
 " fold-var_115)))))"
 "(if(not #f)"
-"(for-loop_297 fold-var_113 rest_207)"
+"(for-loop_296 fold-var_113 rest_207)"
 " fold-var_113)))"
 " fold-var_316)))))"
-" for-loop_297)"
+" for-loop_296)"
 " null"
 " lst_347))))))"
 "(let-values(((val-idss_3)"
@@ -65036,7 +65099,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_351)))"
-"((letrec-values(((for-loop_299)"
+"((letrec-values(((for-loop_298)"
 "(lambda(fold-var_321 lst_352)"
 "(begin"
 " 'for-loop"
@@ -65062,7 +65125,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_353)))"
-"((letrec-values(((for-loop_300)"
+"((letrec-values(((for-loop_299)"
 "(lambda(fold-var_325"
 " lst_354)"
 "(begin"
@@ -65090,24 +65153,24 @@ static const char *startup_source =
 " fold-var_328)))))"
 "(if(not"
 " #f)"
-"(for-loop_300"
+"(for-loop_299"
 " fold-var_326"
 " rest_210)"
 " fold-var_326)))"
 " fold-var_325)))))"
-" for-loop_300)"
+" for-loop_299)"
 " null"
 " lst_353)))))"
 " fold-var_323))))"
 "(values"
 " fold-var_324)))))"
 "(if(not #f)"
-"(for-loop_299"
+"(for-loop_298"
 " fold-var_322"
 " rest_209)"
 " fold-var_322)))"
 " fold-var_321)))))"
-" for-loop_299)"
+" for-loop_298)"
 " null"
 " lst_351))))))"
 "(let-values(((val-rhss_3)"
@@ -65119,7 +65182,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_355)))"
-"((letrec-values(((for-loop_301)"
+"((letrec-values(((for-loop_300)"
 "(lambda(fold-var_329 lst_356)"
 "(begin"
 " 'for-loop"
@@ -65142,12 +65205,12 @@ static const char *startup_source =
 "(values"
 " fold-var_332)))))"
 "(if(not #f)"
-"(for-loop_301"
+"(for-loop_300"
 " fold-var_330"
 " rest_211)"
 " fold-var_330)))"
 " fold-var_329)))))"
-" for-loop_301)"
+" for-loop_300)"
 " null"
 " lst_355))))"
 "(if syntaxes?_0 val-rhs105_0 val-rhs129_0))))"
@@ -65340,7 +65403,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((temp141_3)(list trans-idss_2 val-idss_3))"
-"((phase142_0) phase_83)"
+"((phase142_0) phase_84)"
 "((s143_0) s_105))"
 "(check-no-duplicate-ids7.1"
 " unsafe-undefined"
@@ -65349,7 +65412,7 @@ static const char *startup_source =
 " s143_0"
 " unsafe-undefined))"
 "(values))))"
-"(let-values(((counter_8)(root-expand-context-counter ctx_84)))"
+"(let-values(((counter_8)(root-expand-context-counter ctx_85)))"
 "(let-values(((trans-keyss_0)"
 "(reverse$1"
 "(let-values(((lst_357) trans-idss_2))"
@@ -65358,7 +65421,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_357)))"
-"((letrec-values(((for-loop_302)"
+"((letrec-values(((for-loop_301)"
 "(lambda(fold-var_333 lst_358)"
 "(begin"
 " 'for-loop"
@@ -65386,7 +65449,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_359)))"
-"((letrec-values(((for-loop_303)"
+"((letrec-values(((for-loop_302)"
 "(lambda(fold-var_337"
 " lst_360)"
 "(begin"
@@ -65409,7 +65472,7 @@ static const char *startup_source =
 "(let-values(((id174_0)"
 " id_118)"
 "((phase175_0)"
-" phase_83)"
+" phase_84)"
 "((counter176_0)"
 " counter_8)"
 "((frame-id177_0)"
@@ -65427,24 +65490,24 @@ static const char *startup_source =
 " fold-var_340)))))"
 "(if(not"
 " #f)"
-"(for-loop_303"
+"(for-loop_302"
 " fold-var_338"
 " rest_213)"
 " fold-var_338)))"
 " fold-var_337)))))"
-" for-loop_303)"
+" for-loop_302)"
 " null"
 " lst_359)))))"
 " fold-var_335))))"
 "(values"
 " fold-var_336)))))"
 "(if(not #f)"
-"(for-loop_302"
+"(for-loop_301"
 " fold-var_334"
 " rest_212)"
 " fold-var_334)))"
 " fold-var_333)))))"
-" for-loop_302)"
+" for-loop_301)"
 " null"
 " lst_357))))))"
 "(let-values(((val-keyss_2)"
@@ -65455,7 +65518,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_361)))"
-"((letrec-values(((for-loop_304)"
+"((letrec-values(((for-loop_303)"
 "(lambda(fold-var_341 lst_362)"
 "(begin"
 " 'for-loop"
@@ -65483,7 +65546,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_131)))"
-"((letrec-values(((for-loop_305)"
+"((letrec-values(((for-loop_304)"
 "(lambda(fold-var_344"
 " lst_363)"
 "(begin"
@@ -65506,7 +65569,7 @@ static const char *startup_source =
 "(let-values(((id179_0)"
 " id_119)"
 "((phase180_0)"
-" phase_83)"
+" phase_84)"
 "((counter181_0)"
 " counter_8)"
 "((frame-id182_0)"
@@ -65524,24 +65587,24 @@ static const char *startup_source =
 " fold-var_347)))))"
 "(if(not"
 " #f)"
-"(for-loop_305"
+"(for-loop_304"
 " fold-var_345"
 " rest_215)"
 " fold-var_345)))"
 " fold-var_344)))))"
-" for-loop_305)"
+" for-loop_304)"
 " null"
 " lst_131)))))"
 " fold-var_343))))"
 "(values"
 " fold-var_118)))))"
 "(if(not #f)"
-"(for-loop_304"
+"(for-loop_303"
 " fold-var_342"
 " rest_214)"
 " fold-var_342)))"
 " fold-var_341)))))"
-" for-loop_304)"
+" for-loop_303)"
 " null"
 " lst_361))))))"
 "(let-values(((bodys_10)"
@@ -65553,7 +65616,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_364)))"
-"((letrec-values(((for-loop_306)"
+"((letrec-values(((for-loop_305)"
 "(lambda(fold-var_348 lst_365)"
 "(begin"
 " 'for-loop"
@@ -65578,18 +65641,18 @@ static const char *startup_source =
 "(values"
 " fold-var_48)))))"
 "(if(not #f)"
-"(for-loop_306"
+"(for-loop_305"
 " fold-var_123"
 " rest_216)"
 " fold-var_123)))"
 " fold-var_348)))))"
-" for-loop_306)"
+" for-loop_305)"
 " null"
 " lst_364))))))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_91)"
-"(expand-context-observer ctx_84)))"
+"(expand-context-observer ctx_85)))"
 "(if obs_91"
 "(let-values()"
 "(log-let-renames"
@@ -65610,7 +65673,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_92)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_92"
 "(let-values()"
 "(let-values()"
@@ -65618,7 +65681,7 @@ static const char *startup_source =
 " obs_92"
 " 'prepare-env)))"
 "(void)))"
-"(prepare-next-phase-namespace ctx_84)))"
+"(prepare-next-phase-namespace ctx_85)))"
 "(void))"
 "(values))))"
 "(let-values(((trans-valss_0)"
@@ -65637,7 +65700,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_366)))"
-"((letrec-values(((for-loop_307)"
+"((letrec-values(((for-loop_306)"
 "(lambda(fold-var_350"
 " lst_367"
 " lst_368)"
@@ -65669,7 +65732,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_93)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_93"
 "(let-values()"
 "(let-values()"
@@ -65689,11 +65752,11 @@ static const char *startup_source =
 " rhs_21"
 " sc_39)"
 " ids_40"
-" ctx_84)))"
+" ctx_85)))"
 "(begin"
 "(let-values(((obs_94)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_94"
 "(let-values()"
 "(let-values()"
@@ -65706,13 +65769,13 @@ static const char *startup_source =
 "(values"
 " fold-var_353)))))"
 "(if(not #f)"
-"(for-loop_307"
+"(for-loop_306"
 " fold-var_351"
 " rest_217"
 " rest_218)"
 " fold-var_351)))"
 " fold-var_350)))))"
-" for-loop_307)"
+" for-loop_306)"
 " null"
 " lst_63"
 " lst_366))))))"
@@ -65728,7 +65791,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_135)))"
-"((letrec-values(((for-loop_308)"
+"((letrec-values(((for-loop_307)"
 "(lambda(env_29"
 " lst_370"
 " lst_371)"
@@ -65770,7 +65833,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_373)))"
-"((letrec-values(((for-loop_309)"
+"((letrec-values(((for-loop_308)"
 "(lambda(env_32"
 " lst_374"
 " lst_375)"
@@ -65807,25 +65870,25 @@ static const char *startup_source =
 " env_35)))))"
 "(if(not"
 " #f)"
-"(for-loop_309"
+"(for-loop_308"
 " env_33"
 " rest_221"
 " rest_222)"
 " env_33)))"
 " env_32)))))"
-" for-loop_309)"
+" for-loop_308)"
 " env_31"
 " lst_372"
 " lst_373))))))"
 "(if(not #f)"
-"(for-loop_308"
+"(for-loop_307"
 " env_30"
 " rest_219"
 " rest_220)"
 " env_30)))"
 " env_29)))))"
-" for-loop_308)"
-"(expand-context-env ctx_84)"
+" for-loop_307)"
+"(expand-context-env ctx_85)"
 " lst_369"
 " lst_135)))))"
 "(let-values(((rec-env_0)"
@@ -65845,7 +65908,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_378)))"
-"((letrec-values(((for-loop_310)"
+"((letrec-values(((for-loop_309)"
 "(lambda(env_36"
 " lst_379"
 " lst_380"
@@ -65908,7 +65971,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_384)))"
-"((letrec-values(((for-loop_311)"
+"((letrec-values(((for-loop_310)"
 "(lambda(env_40"
 " lst_385"
 " lst_386"
@@ -65950,8 +66013,8 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_86"
 " id_121"
-" phase_83"
-" ctx_84)"
+" phase_84"
+" ctx_85)"
 "(env-extend"
 " env_42"
 " key_92"
@@ -65960,14 +66023,14 @@ static const char *startup_source =
 " env_43)))))"
 "(if(not"
 " #f)"
-"(for-loop_311"
+"(for-loop_310"
 " env_41"
 " rest_226"
 " rest_227"
 " rest_228)"
 " env_41)))"
 " env_40)))))"
-" for-loop_311)"
+" for-loop_310)"
 " env_38"
 " lst_382"
 " lst_383"
@@ -65975,20 +66038,20 @@ static const char *startup_source =
 "(values"
 " env_39)))))"
 "(if(not #f)"
-"(for-loop_310"
+"(for-loop_309"
 " env_37"
 " rest_223"
 " rest_224"
 " rest_225)"
 " env_37)))"
 " env_36)))))"
-" for-loop_310)"
+" for-loop_309)"
 " rec-val-env_0"
 " lst_376"
 " lst_377"
 " lst_378)))))"
 "(let-values(((expr-ctx_0)"
-"(as-expression-context ctx_84)))"
+"(as-expression-context ctx_85)))"
 "(let-values(((orig-rrs_0)"
 "(expand-context-reference-records"
 " expr-ctx_0)))"
@@ -66003,7 +66066,7 @@ static const char *startup_source =
 "(cons"
 " sc_39"
 "(expand-context-scopes"
-" ctx_84)))"
+" ctx_85)))"
 "((reference-records186_0)"
 "(if split-by-reference?_0"
 "(cons"
@@ -66015,7 +66078,7 @@ static const char *startup_source =
 "(cons"
 " trans-idss_2"
 " val-idss_3)"
-" ctx_84"
+" ctx_85"
 " sc_39))"
 "((inner188_0)"
 "(root-expand-context/outer-inner"
@@ -66053,13 +66116,13 @@ static const char *startup_source =
 "(let-values(((letrec-values-id_0)"
 "(if(not"
 "(expand-context-to-parsed?"
-" ctx_84))"
+" ctx_85))"
 "(if syntaxes?_0"
-"(core-id 'letrec-values phase_83)"
+"(core-id 'letrec-values phase_84)"
 " let-values127_0)"
 " #f)))"
 "(let-values(((rebuild-s_6)"
-"(let-values(((ctx189_0) ctx_84)"
+"(let-values(((ctx189_0) ctx_85)"
 "((s190_1) s_105)"
 "((temp191_1) #t))"
 "(keep-as-needed119.1"
@@ -66070,7 +66133,7 @@ static const char *startup_source =
 " s190_1))))"
 "(let-values(((val-name-idss_0)"
 "(if(expand-context-to-parsed?"
-" ctx_84)"
+" ctx_85)"
 "(reverse$1"
 "(let-values(((lst_254)"
 " val-idss_3))"
@@ -66110,7 +66173,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_388)))"
-"((letrec-values(((for-loop_312)"
+"((letrec-values(((for-loop_311)"
 "(lambda(fold-var_358"
 " lst_389)"
 "(begin"
@@ -66141,12 +66204,12 @@ static const char *startup_source =
 " fold-var_360)))))"
 "(if(not"
 " #f)"
-"(for-loop_312"
+"(for-loop_311"
 " fold-var_359"
 " rest_229)"
 " fold-var_359)))"
 " fold-var_358)))))"
-" for-loop_312)"
+" for-loop_311)"
 " null"
 " lst_388)))))"
 " fold-var_356))))"
@@ -66169,7 +66232,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((obs_95)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_95"
 "(let-values()"
 "(log-letrec-values"
@@ -66188,7 +66251,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_96)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_96"
 "(let-values()"
 "(if(not"
@@ -66254,7 +66317,7 @@ static const char *startup_source =
 "(let-values(((body-ctx197_0)"
 " body-ctx_5)"
 "((ctx198_0)"
-" ctx_84))"
+" ctx_85))"
 "(as-tail-context22.1"
 " ctx198_0"
 " body-ctx197_0)))"
@@ -66304,7 +66367,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_391)))"
-"((letrec-values(((for-loop_313)"
+"((letrec-values(((for-loop_312)"
 "(lambda(fold-var_361"
 " lst_392"
 " lst_393"
@@ -66358,7 +66421,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_97)"
 "(expand-context-observer"
-" ctx_84)))"
+" ctx_85)))"
 "(if obs_97"
 "(let-values()"
 "(let-values()"
@@ -66385,7 +66448,7 @@ static const char *startup_source =
 " rhs199_0"
 " temp200_0))))"
 "(if(expand-context-to-parsed?"
-" ctx_84)"
+" ctx_85)"
 "(list"
 " keys_12"
 " exp-rhs_4)"
@@ -66401,7 +66464,7 @@ static const char *startup_source =
 " fold-var_363)))))"
 "(if(not"
 " #f)"
-"(for-loop_313"
+"(for-loop_312"
 " fold-var_51"
 " rest_230"
 " rest_231"
@@ -66409,7 +66472,7 @@ static const char *startup_source =
 " rest_233)"
 " fold-var_51)))"
 " fold-var_361)))))"
-" for-loop_313)"
+" for-loop_312)"
 " null"
 " lst_150"
 " lst_390"
@@ -66424,7 +66487,7 @@ static const char *startup_source =
 " frame-id_15))"
 "(void))"
 "(if(expand-context-to-parsed?"
-" ctx_84)"
+" ctx_85)"
 "(if rec?_1"
 "(parsed-letrec-values18.1"
 " rebuild-s_6"
@@ -66482,7 +66545,7 @@ static const char *startup_source =
 " val-keyss204_0"
 " val-rhss205_0"
 " val-clauses206_0))))))"
-"(if(expand-context-to-parsed? ctx_84)"
+"(if(expand-context-to-parsed? ctx_85)"
 " result-s_12"
 "(attach-disappeared-transformer-bindings"
 " result-s_12"
@@ -66502,7 +66565,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_397)))"
-"((letrec-values(((for-loop_314)"
+"((letrec-values(((for-loop_313)"
 "(lambda(fold-var_364 lst_398 lst_399)"
 "(begin"
 " 'for-loop"
@@ -66523,10 +66586,10 @@ static const char *startup_source =
 " fold-var_366))))"
 "(values fold-var_367)))))"
 "(if(not #f)"
-"(for-loop_314 fold-var_365 rest_234 rest_235)"
+"(for-loop_313 fold-var_365 rest_234 rest_235)"
 " fold-var_365)))"
 " fold-var_364)))))"
-" for-loop_314)"
+" for-loop_313)"
 " null"
 " lst_396"
 " lst_397))))"
@@ -66546,7 +66609,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_401)))"
-"((letrec-values(((for-loop_315)"
+"((letrec-values(((for-loop_314)"
 "(lambda(fold-var_368 lst_402 lst_403)"
 "(begin"
 " 'for-loop"
@@ -66568,9 +66631,9 @@ static const char *startup_source =
 "(add-scope trans-rhs_5 sc_40))))"
 " fold-var_370))))"
 "(values fold-var_371)))))"
-"(if(not #f)(for-loop_315 fold-var_369 rest_236 rest_237) fold-var_369)))"
+"(if(not #f)(for-loop_314 fold-var_369 rest_236 rest_237) fold-var_369)))"
 " fold-var_368)))))"
-" for-loop_315)"
+" for-loop_314)"
 " null"
 " lst_400"
 " lst_401))))"
@@ -66608,10 +66671,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%stratified-body"
-"(lambda(s_569 ctx_85)"
+"(lambda(s_569 ctx_86)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_100)(expand-context-observer ctx_85)))"
+"(let-values(((obs_100)(expand-context-observer ctx_86)))"
 "(if obs_100"
 "(let-values()(let-values()(call-expand-observe obs_100 'prim-#%stratified)))"
 "(void)))"
@@ -66643,29 +66706,29 @@ static const char *startup_source =
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_48)))))"
 "(values #t #%stratified-body222_1 body223_1))))))"
 "(let-values(((rebuild-s_7)"
-"(let-values(((ctx226_0) ctx_85)((s227_0) s_569)((temp228_0) #t))"
+"(let-values(((ctx226_0) ctx_86)((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)"
-"((ctx230_0) ctx_85)"
+"((ctx230_0) ctx_86)"
 "((temp231_1) #t)"
 "((rebuild-s232_0) rebuild-s_7))"
 "(expand-body7.1 rebuild-s232_0 temp231_1 temp229_3 ctx230_0))))"
-"(if(expand-context-to-parsed? ctx_85)"
+"(if(expand-context-to-parsed? ctx_86)"
 "(parsed-begin12.1 rebuild-s_7 exp-body_5)"
 "(let-values(((rebuild-s233_0) rebuild-s_7)"
 "((temp234_1)"
 "(if(null?(cdr exp-body_5))"
 "(car exp-body_5)"
-"(list*(core-id 'begin(expand-context-phase ctx_85)) exp-body_5))))"
+"(list*(core-id 'begin(expand-context-phase ctx_86)) exp-body_5))))"
 "(rebuild5.1 #t rebuild-s233_0 temp234_1)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%datum"
-"(lambda(s_575 ctx_86)"
+"(lambda(s_575 ctx_87)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_101)(expand-context-observer ctx_86)))"
+"(let-values(((obs_101)(expand-context-observer ctx_87)))"
 "(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_575)))"
@@ -66688,18 +66751,18 @@ static const char *startup_source =
 "                                 (raise-syntax-error$1 '#%datum \"keyword misused as an expression\" #f datum_2))"
 "(void))"
 "(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)"
+"(let-values(((phase_143)(expand-context-phase ctx_87)))"
+"(if(if(expand-context-to-parsed? ctx_87)(free-id-set-empty?(expand-context-stops ctx_87)) #f)"
 "(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)))"
+"(let-values(((s239_0) s_575)((temp240_0)(list(core-id 'quote phase_143) datum_2)))"
 "(rebuild5.1 #t s239_0 temp240_0))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%app"
-"(lambda(s_580 ctx_87)"
+"(lambda(s_580 ctx_88)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_102)(expand-context-observer ctx_87)))"
+"(let-values(((obs_102)(expand-context-observer ctx_88)))"
 "(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_580)))"
@@ -66727,27 +66790,27 @@ static const char *startup_source =
 "(let-values(((es_3) e242_0))"
 "(if(null? es_3)"
 "(let-values()"
-"(let-values(((phase_142)(expand-context-phase ctx_87)))"
-"(if(expand-context-to-parsed? ctx_87)"
+"(let-values(((phase_144)(expand-context-phase ctx_88)))"
+"(if(expand-context-to-parsed? ctx_88)"
 "(parsed-quote14.1(keep-properties-only~ s_580) null)"
-"(let-values(((s245_0) s_580)((temp246_1)(list(core-id 'quote phase_142) null)))"
+"(let-values(((s245_0) s_580)((temp246_1)(list(core-id 'quote phase_144) 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)"
+"(let-values(((ctx247_0) ctx_88)"
 "((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))))"
 "(let-values(((rebuild-prefixless_0)"
 "(if(syntax?$1 prefixless_0)"
-"(let-values(((ctx250_0) ctx_87)"
+"(let-values(((ctx250_0) ctx_88)"
 "((prefixless251_0) prefixless_0)"
 "((keep-for-parsed?252_0) keep-for-parsed?_1))"
 "(keep-as-needed119.1 #f #f keep-for-parsed?252_0 ctx250_0 prefixless251_0))"
 " #f)))"
-"(let-values(((expr-ctx_1)(as-expression-context ctx_87)))"
+"(let-values(((expr-ctx_1)(as-expression-context ctx_88)))"
 "(let-values((()"
 "(begin"
 "(let-values(((obs_103)(expand-context-observer expr-ctx_1)))"
@@ -66773,7 +66836,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_404)))"
-"((letrec-values(((for-loop_316)"
+"((letrec-values(((for-loop_315)"
 "(lambda(fold-var_372 lst_405)"
 "(begin"
 " 'for-loop"
@@ -66813,17 +66876,17 @@ static const char *startup_source =
 "(values"
 " fold-var_375)))))"
 "(if(not #f)"
-"(for-loop_316 fold-var_373 rest_238)"
+"(for-loop_315 fold-var_373 rest_238)"
 " fold-var_373)))"
 " fold-var_372)))))"
-" for-loop_316)"
+" for-loop_315)"
 " null"
 " lst_404))))))"
-"(if(expand-context-to-parsed? ctx_87)"
+"(if(expand-context-to-parsed? ctx_88)"
 "(let-values()"
 "(parsed-app7.1"
-"(let-values(((or-part_381) rebuild-prefixless_0))"
-"(if or-part_381 or-part_381 rebuild-s_8))"
+"(let-values(((or-part_385) rebuild-prefixless_0))"
+"(if or-part_385 or-part_385 rebuild-s_8))"
 " exp-rator_0"
 " exp-es_0))"
 "(let-values()"
@@ -66850,10 +66913,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'quote"
-"(lambda(s_586 ctx_88)"
+"(lambda(s_586 ctx_89)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_106)(expand-context-observer ctx_88)))"
+"(let-values(((obs_106)(expand-context-observer ctx_89)))"
 "(if obs_106(let-values()(let-values()(call-expand-observe obs_106 'prim-quote)))(void)))"
 "(values))))"
 "(let-values(((ok?_48 quote261_0 datum262_0)"
@@ -66889,16 +66952,16 @@ static const char *startup_source =
 "(values quote263_0 datum264_0))"
 "                                           (raise-syntax-error$1 #f \"bad syntax\" orig-s_51)))))"
 "(values #t quote261_1 datum262_1))))))"
-"(if(expand-context-to-parsed? ctx_88)"
+"(if(expand-context-to-parsed? ctx_89)"
 "(parsed-quote14.1(keep-properties-only~ s_586)(syntax->datum$1 datum262_0))"
 " s_586))))))"
 "(void"
 "(add-core-form!*"
 " 'quote-syntax"
-"(lambda(s_593 ctx_89)"
+"(lambda(s_593 ctx_90)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_107)(expand-context-observer ctx_89)))"
+"(let-values(((obs_107)(expand-context-observer ctx_90)))"
 "(if obs_107"
 "(let-values()(let-values()(call-expand-observe obs_107 'prim-quote-syntax)))"
 "(void)))"
@@ -67020,7 +67083,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(reference-records-all-used!(expand-context-reference-records ctx_89))"
+"(reference-records-all-used!(expand-context-reference-records ctx_90))"
 "(values))))"
 "(let-values(((ok?_51 _276_0 _277_0 kw278_0)"
 "(let-values(((s_616) disarmed-s_12))"
@@ -67087,27 +67150,27 @@ static const char *startup_source =
 "(values _279_0 _280_0 kw281_0))"
 "                                                       (raise-syntax-error$1 #f \"bad syntax\" orig-s_53)))))"
 "(values #t _276_1 _277_1 kw278_1))))))"
-"(if(expand-context-to-parsed? ctx_89)"
+"(if(expand-context-to-parsed? ctx_90)"
 "(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)))"
+"(let-values(((use-site-scopes_2)(root-expand-context-use-site-scopes ctx_90)))"
 "(let-values(((datum-s_0)"
 "(remove-scopes"
-"(remove-scopes datum272_0(expand-context-scopes ctx_89))"
+"(remove-scopes datum272_0(expand-context-scopes ctx_90))"
 "(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)"
+"(if(if(expand-context-to-parsed? ctx_90)(free-id-set-empty?(expand-context-stops ctx_90)) #f)"
 "(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_627 ctx_90)"
+"(lambda(s_627 ctx_91)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_108)(expand-context-observer ctx_90)))"
+"(let-values(((obs_108)(expand-context-observer ctx_91)))"
 "(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_627)))"
@@ -67261,19 +67324,19 @@ static const char *startup_source =
 "(values if302_0 tst303_0 thn304_0 els305_0))"
 "                                                 (raise-syntax-error$1 #f \"bad syntax\" orig-s_54)))))"
 "(values #t if298_1 tst299_1 thn300_1 els301_1))))))"
-"(let-values(((expr-ctx_2)(as-expression-context ctx_90)))"
+"(let-values(((expr-ctx_2)(as-expression-context ctx_91)))"
 "(let-values(((tail-ctx_0)"
-"(let-values(((expr-ctx312_0) expr-ctx_2)((ctx313_0) ctx_90))"
+"(let-values(((expr-ctx312_0) expr-ctx_2)((ctx313_0) ctx_91))"
 "(as-tail-context22.1 ctx313_0 expr-ctx312_0))))"
 "(let-values(((rebuild-s_9)"
-"(let-values(((ctx314_0) ctx_90)((s315_0) s_627))"
+"(let-values(((ctx314_0) ctx_91)((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_109)(expand-context-observer ctx_90)))"
+"(let-values(((obs_109)(expand-context-observer ctx_91)))"
 "(if obs_109"
 "(let-values()(let-values()(call-expand-observe obs_109 'next)))"
 "(void)))"
@@ -67283,7 +67346,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp318_0 tail-ctx319_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_110)(expand-context-observer ctx_90)))"
+"(let-values(((obs_110)(expand-context-observer ctx_91)))"
 "(if obs_110"
 "(let-values()(let-values()(call-expand-observe obs_110 'next)))"
 "(void)))"
@@ -67291,7 +67354,7 @@ static const char *startup_source =
 "(let-values(((exp-els_0)"
 "(let-values(((temp320_0) els301_0)((tail-ctx321_0) tail-ctx_0))"
 "(expand9.1 #f #f #f temp320_0 tail-ctx321_0))))"
-"(if(expand-context-to-parsed? ctx_90)"
+"(if(expand-context-to-parsed? ctx_91)"
 "(parsed-if8.1 rebuild-s_9 exp-tst_0 exp-thn_0 exp-els_0)"
 "(let-values(((rebuild-s322_0) rebuild-s_9)"
 "((temp323_0)(list if298_0 exp-tst_0 exp-thn_0 exp-els_0)))"
@@ -67299,10 +67362,10 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'with-continuation-mark"
-"(lambda(s_663 ctx_91)"
+"(lambda(s_663 ctx_92)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_111)(expand-context-observer ctx_91)))"
+"(let-values(((obs_111)(expand-context-observer ctx_92)))"
 "(if obs_111"
 "(let-values()(let-values()(call-expand-observe obs_111 'prim-with-continuation-mark)))"
 "(void)))"
@@ -67387,16 +67450,16 @@ static const char *startup_source =
 "(values with-continuation-mark328_0 key329_0 val330_0 body331_0))"
 "                                             (raise-syntax-error$1 #f \"bad syntax\" orig-s_55)))))"
 "(values #t with-continuation-mark324_1 key325_1 val326_1 body327_1))))))"
-"(let-values(((expr-ctx_3)(as-expression-context ctx_91)))"
+"(let-values(((expr-ctx_3)(as-expression-context ctx_92)))"
 "(let-values(((rebuild-s_10)"
-"(let-values(((ctx338_0) ctx_91)((s339_0) s_663))"
+"(let-values(((ctx338_0) ctx_92)((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_112)(expand-context-observer ctx_91)))"
+"(let-values(((obs_112)(expand-context-observer ctx_92)))"
 "(if obs_112"
 "(let-values()(let-values()(call-expand-observe obs_112 'next)))"
 "(void)))"
@@ -67406,7 +67469,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f temp342_0 expr-ctx343_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_113)(expand-context-observer ctx_91)))"
+"(let-values(((obs_113)(expand-context-observer ctx_92)))"
 "(if obs_113"
 "(let-values()(let-values()(call-expand-observe obs_113 'next)))"
 "(void)))"
@@ -67414,10 +67477,10 @@ static const char *startup_source =
 "(let-values(((exp-body_6)"
 "(let-values(((temp344_0) body327_0)"
 "((temp345_0)"
-"(let-values(((expr-ctx346_0) expr-ctx_3)((ctx347_0) ctx_91))"
+"(let-values(((expr-ctx346_0) expr-ctx_3)((ctx347_0) ctx_92))"
 "(as-tail-context22.1 ctx347_0 expr-ctx346_0))))"
 "(expand9.1 #f #f #f temp344_0 temp345_0))))"
-"(if(expand-context-to-parsed? ctx_91)"
+"(if(expand-context-to-parsed? ctx_92)"
 "(parsed-with-continuation-mark10.1 rebuild-s_10 exp-key_0 exp-val_0 exp-body_6)"
 "(let-values(((rebuild-s348_0) rebuild-s_10)"
 "((temp349_0)(list with-continuation-mark324_0 exp-key_0 exp-val_0 exp-body_6)))"
@@ -67432,10 +67495,10 @@ static const char *startup_source =
 "(let-values(((list-start-index_0) list-start-index14_0))"
 "(let-values(((last-is-tail?_0) last-is-tail?15_0))"
 "(let-values()"
-"(lambda(s_678 ctx_92)"
+"(lambda(s_678 ctx_93)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_114)(expand-context-observer ctx_92)))"
+"(let-values(((obs_114)(expand-context-observer ctx_93)))"
 "(if obs_114"
 "(let-values()(let-values()(call-expand-observe obs_114 log-tag_1)))"
 "(void)))"
@@ -67476,10 +67539,10 @@ static const char *startup_source =
 "(values #t begin350_1 e351_1))))))"
 "(let-values(((expr-ctx_4)"
 "(if last-is-tail?_0"
-"(as-begin-expression-context ctx_92)"
-"(as-expression-context ctx_92))))"
+"(as-begin-expression-context ctx_93)"
+"(as-expression-context ctx_93))))"
 "(let-values(((rebuild-s_11)"
-"(let-values(((ctx354_0) ctx_92)((s355_0) s_678))"
+"(let-values(((ctx354_0) ctx_93)((s355_0) s_678))"
 "(keep-as-needed119.1 #f #f #f ctx354_0 s355_0))))"
 "(let-values(((exp-es_2)"
 "((letrec-values(((loop_123)"
@@ -67490,7 +67553,7 @@ static const char *startup_source =
 "(if(zero? index_6)"
 "(let-values()"
 "(let-values(((obs_115)"
-"(expand-context-observer ctx_92)))"
+"(expand-context-observer ctx_93)))"
 "(if obs_115"
 "(let-values()"
 "(begin"
@@ -67511,7 +67574,7 @@ static const char *startup_source =
 "(begin"
 "(let-values(((obs_116)"
 "(expand-context-observer"
-" ctx_92)))"
+" ctx_93)))"
 "(if obs_116"
 "(let-values()"
 "(let-values()"
@@ -67526,7 +67589,7 @@ static const char *startup_source =
 "(let-values(((expr-ctx358_0)"
 " expr-ctx_4)"
 "((ctx359_0)"
-" ctx_92))"
+" ctx_93))"
 "(as-tail-context22.1"
 " ctx359_0"
 " expr-ctx358_0))"
@@ -67537,7 +67600,7 @@ static const char *startup_source =
 " e351_0"
 " list-start-index_0)))"
 "(begin"
-"(let-values(((obs_117)(expand-context-observer ctx_92)))"
+"(let-values(((obs_117)(expand-context-observer ctx_93)))"
 "(if obs_117"
 "(let-values()"
 "(let-values()"
@@ -67546,7 +67609,7 @@ static const char *startup_source =
 " 'exit-list"
 "(datum->syntax$1 #f(list-tail exp-es_2 list-start-index_0) rebuild-s_11))))"
 "(void)))"
-"(if(expand-context-to-parsed? ctx_92)"
+"(if(expand-context-to-parsed? ctx_93)"
 "(parsed-begin_0 rebuild-s_11 exp-es_2)"
 "(let-values(((rebuild-s360_0) rebuild-s_11)((temp361_0)(cons begin350_0 exp-es_2)))"
 "(rebuild5.1 #t rebuild-s360_0 temp361_0)))))))))))))))))))"
@@ -67559,10 +67622,10 @@ 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_684 ctx_93)"
-"(let-values(((context_25)(expand-context-context ctx_93)))"
-"(if(let-values(((or-part_382)(eq? context_25 'top-level)))"
-"(if or-part_382 or-part_382(eq? context_25 'module)))"
+"(lambda(s_684 ctx_94)"
+"(let-values(((context_29)(expand-context-context ctx_94)))"
+"(if(let-values(((or-part_386)(eq? context_29 'top-level)))"
+"(if or-part_386 or-part_386(eq? context_29 'module)))"
 "(let-values()"
 "(let-values(((disarmed-s_16)(syntax-disarm$1 s_684)))"
 "(let-values(((ok?_56 begin366_0)"
@@ -67590,8 +67653,8 @@ static const char *startup_source =
 "(values begin367_0)))))"
 "(values #t begin366_1)))"
 "(values #f #f)))))"
-"(if ok?_56 s_684(nonempty-begin_0 s_684 ctx_93)))))"
-"(let-values()(nonempty-begin_0 s_684 ctx_93))))))))"
+"(if ok?_56 s_684(nonempty-begin_0 s_684 ctx_94)))))"
+"(let-values()(nonempty-begin_0 s_684 ctx_94))))))))"
 "(void"
 "(add-core-form!*"
 " 'begin0"
@@ -67599,14 +67662,14 @@ static const char *startup_source =
 "(make-begin20.1 temp371_0 temp370_0 temp368_0 parsed-begin0369_0))))"
 "(define-values"
 "(register-eventual-variable!?)"
-"(lambda(id_122 ctx_94)"
+"(lambda(id_122 ctx_95)"
 "(begin"
-"(if(if(expand-context-need-eventually-defined ctx_94)(>=(expand-context-phase ctx_94) 1) #f)"
+"(if(if(expand-context-need-eventually-defined ctx_95)(>=(expand-context-phase ctx_95) 1) #f)"
 "(let-values()"
 "(begin"
 "(hash-update!"
-"(expand-context-need-eventually-defined ctx_94)"
-"(expand-context-phase ctx_94)"
+"(expand-context-need-eventually-defined ctx_95)"
+"(expand-context-phase ctx_95)"
 "(lambda(l_87)(cons id_122 l_87))"
 " null)"
 " #t))"
@@ -67619,12 +67682,12 @@ static const char *startup_source =
 "(begin"
 " 'core375"
 "(let-values(((s_694) s373_0))"
-"(let-values(((ctx_95) ctx374_0))"
+"(let-values(((ctx_96) ctx374_0))"
 "(let-values(((implicit-omitted?_0) implicit-omitted?372_0))"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_118)(expand-context-observer ctx_95)))"
+"(let-values(((obs_118)(expand-context-observer ctx_96)))"
 "(if obs_118"
 "(let-values()"
 "(let-values()(call-expand-observe obs_118 'prim-#%top)))"
@@ -67653,15 +67716,15 @@ static const char *startup_source =
 "(let-values(((s_698)"
 "(cdr"
 " s_696)))"
-"(if(let-values(((or-part_383)"
+"(if(let-values(((or-part_387)"
 "(if(syntax?$1"
 " s_698)"
 "(symbol?"
 "(syntax-e$1"
 " s_698))"
 " #f)))"
-"(if or-part_383"
-" or-part_383"
+"(if or-part_387"
+" or-part_387"
 "(symbol?"
 " s_698)))"
 " s_698"
@@ -67679,7 +67742,7 @@ static const char *startup_source =
 " id378_0)))))"
 "(let-values(((b_93)"
 "(let-values(((id381_0) id_123)"
-"((temp382_0)(expand-context-phase ctx_95))"
+"((temp382_0)(expand-context-phase ctx_96))"
 "((temp383_0) 'ambiguous))"
 "(resolve+shift28.1"
 " temp383_0"
@@ -67690,25 +67753,25 @@ static const char *startup_source =
 " id381_0"
 " temp382_0))))"
 "(if(eq? b_93 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_123 ctx_95))"
+"(let-values()(raise-ambiguous-error id_123 ctx_96))"
 "(if(if b_93"
 "(if(module-binding? b_93)"
-"(eq?(module-binding-module b_93)(root-expand-context-self-mpi ctx_95))"
+"(eq?(module-binding-module b_93)(root-expand-context-self-mpi ctx_96))"
 " #f)"
 " #f)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_95)"
+"(if(expand-context-to-parsed? ctx_96)"
 "(parsed-id2.1 id_123 b_93 #f)"
 "(if(top-level-module-path-index?(module-binding-module b_93))"
 "(let-values() s_694)"
 "(let-values() id_123))))"
-"(if(register-eventual-variable!? id_123 ctx_95)"
+"(if(register-eventual-variable!? id_123 ctx_96)"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_95)"
+"(if(expand-context-to-parsed? ctx_96)"
 "(parsed-id2.1 id_123 b_93 #f)"
 " id_123))"
 "(let-values()"
-"(if(not(expand-context-allow-unbound? ctx_95))"
+"(if(not(expand-context-allow-unbound? ctx_96))"
 "(let-values()"
 "(raise-unbound-syntax-error"
 " #f"
@@ -67716,20 +67779,20 @@ static const char *startup_source =
 " id_123"
 " #f"
 " null"
-"(syntax-debug-info-string id_123 ctx_95)))"
+"(syntax-debug-info-string id_123 ctx_96)))"
 "(let-values()"
 "(let-values(((tl-id_1)"
 "(add-scope"
 " id_123"
-"(root-expand-context-top-level-bind-scope ctx_95))))"
+"(root-expand-context-top-level-bind-scope ctx_96))))"
 "(let-values(((tl-b_1)"
 "(let-values(((tl-id384_0) tl-id_1)"
 "((temp385_0)"
-"(expand-context-phase ctx_95)))"
+"(expand-context-phase ctx_96)))"
 "(resolve40.1 #f #f null #f tl-id384_0 temp385_0))))"
 "(if tl-b_1"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_95)"
+"(if(expand-context-to-parsed? ctx_96)"
 "(parsed-top-id4.1 tl-id_1 tl-b_1 #f)"
 "(if implicit-omitted?_0"
 "(let-values() id_123)"
@@ -67754,15 +67817,15 @@ static const char *startup_source =
 "(let-values(((s_702)"
 "(cdr"
 " s_700)))"
-"(if(let-values(((or-part_384)"
+"(if(let-values(((or-part_388)"
 "(if(syntax?$1"
 " s_702)"
 "(symbol?"
 "(syntax-e$1"
 " s_702))"
 " #f)))"
-"(if or-part_384"
-" or-part_384"
+"(if or-part_388"
+" or-part_388"
 "(symbol?"
 " s_702)))"
 " s_702"
@@ -67783,19 +67846,19 @@ static const char *startup_source =
 "((temp391_0)(cons #%top386_0 id_123)))"
 "(rebuild5.1 #t s390_0 temp391_0)))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_95)"
+"(if(expand-context-to-parsed? ctx_96)"
 "(parsed-top-id4.1 id_123 b_93 #f)"
 " s_694)))))))))))))))))))))))"
 "(case-lambda"
-"((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))))))"
+"((s_703 ctx_97)(core375_0 s_703 ctx_97 #f))"
+"((s_704 ctx_98 implicit-omitted?372_1)(core375_0 s_704 ctx_98 implicit-omitted?372_1))))))"
 "(void"
 "(add-core-form!*"
 " 'set!"
-"(lambda(s_705 ctx_98)"
+"(lambda(s_705 ctx_99)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_119)(expand-context-observer ctx_98)))"
+"(let-values(((obs_119)(expand-context-observer ctx_99)))"
 "(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_705)))"
@@ -67815,14 +67878,14 @@ static const char *startup_source =
 "(if(pair? s_710)"
 "(let-values(((id398_0)"
 "(let-values(((s_711)(car s_710)))"
-"(if(let-values(((or-part_385)"
+"(if(let-values(((or-part_389)"
 "(if(syntax?$1 s_711)"
 "(symbol?"
 "(syntax-e$1"
 " s_711))"
 " #f)))"
-"(if or-part_385"
-" or-part_385"
+"(if or-part_389"
+" or-part_389"
 "(symbol? s_711)))"
 " s_711"
 "(raise-syntax-error$1"
@@ -67875,7 +67938,7 @@ static const char *startup_source =
 " 'rename-loop"
 "(let-values(((binding_29)"
 "(let-values(((id401_0) id_124)"
-"((temp402_0)(expand-context-phase ctx_98))"
+"((temp402_0)(expand-context-phase ctx_99))"
 "((temp403_0) 'ambiguous)"
 "((temp404_0) #t))"
 "(resolve+shift28.1"
@@ -67889,31 +67952,31 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(if(eq? binding_29 'ambiguous)"
-"(let-values()(raise-ambiguous-error id_124 ctx_98))"
+"(let-values()(raise-ambiguous-error id_124 ctx_99))"
 "(void))"
 "(values))))"
 "(let-values(((t_62 primitive?_11 insp_24 protected?_12)"
 "(if binding_29"
 "(let-values(((binding405_0) binding_29)"
-"((ctx406_0) ctx_98)"
+"((ctx406_0) ctx_99)"
 "((s407_0) s_705))"
 "(lookup62.1 #f #f binding405_0 ctx406_0 s407_0))"
 "(values #f #f #f #f))))"
 "(begin"
-"(let-values(((obs_120)(expand-context-observer ctx_98)))"
+"(let-values(((obs_120)(expand-context-observer ctx_99)))"
 "(if obs_120"
 "(let-values()"
 "(let-values()(call-expand-observe obs_120 'resolve id_124)))"
 "(void)))"
-"(if(let-values(((or-part_386)(variable? t_62)))"
-"(if or-part_386"
-" or-part_386"
+"(if(let-values(((or-part_390)(variable? t_62)))"
+"(if or-part_390"
+" or-part_390"
 "(if(not binding_29)"
-"(let-values(((or-part_387)"
-"(register-eventual-variable!? id_124 ctx_98)))"
-"(if or-part_387"
-" or-part_387"
-"(expand-context-allow-unbound? ctx_98)))"
+"(let-values(((or-part_391)"
+"(register-eventual-variable!? id_124 ctx_99)))"
+"(if or-part_391"
+" or-part_391"
+"(expand-context-allow-unbound? ctx_99)))"
 " #f)))"
 "(let-values()"
 "(let-values((()"
@@ -67922,7 +67985,7 @@ static const char *startup_source =
 "(not"
 "(eq?"
 "(module-binding-module binding_29)"
-"(root-expand-context-self-mpi ctx_98)))"
+"(root-expand-context-self-mpi ctx_99)))"
 " #f)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -67935,7 +67998,7 @@ static const char *startup_source =
 "(let-values((()"
 "(begin"
 "(let-values(((obs_121)"
-"(expand-context-observer ctx_98)))"
+"(expand-context-observer ctx_99)))"
 "(if obs_121"
 "(let-values()"
 "(let-values()"
@@ -67947,14 +68010,14 @@ 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_705))"
+"(let-values(((ctx408_0) ctx_99)((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)"
 "((temp411_0)"
-"(as-expression-context ctx_98)))"
+"(as-expression-context ctx_99)))"
 "(expand9.1 #f #f #f temp410_0 temp411_0))))"
-"(if(expand-context-to-parsed? ctx_98)"
+"(if(expand-context-to-parsed? ctx_99)"
 "(parsed-set!9.1"
 " rebuild-s_12"
 "(parsed-id2.1 id_124 binding_29 #f)"
@@ -67967,8 +68030,9 @@ static const char *startup_source =
 "((t415_0) t_62)"
 "((temp416_0)"
 "(free-id-set-empty-or-just-module*?"
-"(expand-context-stops"
-" ctx_98))))"
+"(expand-context-stops ctx_99)"
+"(expand-context-phase"
+" ctx_99))))"
 "(substitute-variable6.1"
 " temp416_0"
 " id414_0"
@@ -67983,10 +68047,10 @@ static const char *startup_source =
 " s_705"
 " id_124"
 " null"
-"(syntax-debug-info-string id_124 ctx_98)))"
+"(syntax-debug-info-string id_124 ctx_99)))"
 "(if(1/set!-transformer? t_62)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_62 ctx_98)"
+"(if(not-in-this-expand-context? t_62 ctx_99)"
 "(let-values()"
 "(let-values(((temp417_0)"
 "(avoid-current-expand-context"
@@ -67997,10 +68061,10 @@ static const char *startup_source =
 " rhs394_0"
 " id_124"
 " from-rename?_0"
-" ctx_98)"
+" ctx_99)"
 " t_62"
-" ctx_98))"
-"((ctx418_0) ctx_98))"
+" ctx_99))"
+"((ctx418_0) ctx_99))"
 "(expand9.1 #f #f #f temp417_0 ctx418_0)))"
 "(let-values()"
 "(let-values(((exp-s_13 re-ctx_1)"
@@ -68008,7 +68072,7 @@ static const char *startup_source =
 "((insp420_0) insp_24)"
 "((s421_0) s_705)"
 "((orig-id422_0) orig-id_1)"
-"((ctx423_0) ctx_98)"
+"((ctx423_0) ctx_99)"
 "((binding424_0) binding_29)"
 "((orig-id425_0) orig-id_1))"
 "(apply-transformer52.1"
@@ -68019,7 +68083,7 @@ static const char *startup_source =
 " orig-id422_0"
 " ctx423_0"
 " binding424_0))))"
-"(if(expand-context-just-once? ctx_98)"
+"(if(expand-context-just-once? ctx_99)"
 "(let-values() exp-s_13)"
 "(let-values()"
 "(let-values(((exp-s426_0) exp-s_13)"
@@ -68027,7 +68091,7 @@ static const char *startup_source =
 "(expand9.1 #f #f #f exp-s426_0 re-ctx427_0))))))))"
 "(if(1/rename-transformer? t_62)"
 "(let-values()"
-"(if(not-in-this-expand-context? t_62 ctx_98)"
+"(if(not-in-this-expand-context? t_62 ctx_99)"
 "(let-values()"
 "(let-values(((temp428_0)"
 "(avoid-current-expand-context"
@@ -68038,16 +68102,16 @@ static const char *startup_source =
 " rhs394_0"
 " id_124"
 " from-rename?_0"
-" ctx_98"
+" ctx_99"
 " t_62)"
 " t_62"
-" ctx_98))"
-"((ctx429_0) ctx_98))"
+" ctx_99))"
+"((ctx429_0) ctx_99))"
 "(expand9.1 #f #f #f temp428_0 ctx429_0)))"
 "(let-values()"
 "(rename-loop_0"
 "(syntax-track-origin$1"
-"(rename-transformer-target-in-context t_62 ctx_98)"
+"(rename-transformer-target-in-context t_62 ctx_99)"
 " id_124"
 " id_124)"
 " #t))))"
@@ -68072,15 +68136,15 @@ static const char *startup_source =
 "(let-values(((id_125) id27_0))"
 "(let-values(((rhs-s_0) rhs-s28_0))"
 "(let-values(((from-rename?_1) from-rename?29_0))"
-"(let-values(((ctx_99) ctx30_0))"
+"(let-values(((ctx_100) ctx30_0))"
 "(let-values(((t_63) t23_0))"
 "(let-values()"
-"(if(let-values(((or-part_388) t_63))"
-"(if or-part_388 or-part_388 from-rename?_1))"
+"(if(let-values(((or-part_392) t_63))"
+"(if or-part_392 or-part_392 from-rename?_1))"
 "(let-values()"
 "(let-values(((new-id_1)"
 "(if t_63"
-"(rename-transformer-target-in-context t_63 ctx_99)"
+"(rename-transformer-target-in-context t_63 ctx_100)"
 " id_125)))"
 "(syntax-rearm$1"
 "(datum->syntax$1"
@@ -68091,17 +68155,17 @@ static const char *startup_source =
 " s_717)))"
 "(let-values() s_717)))))))))))))))"
 "(case-lambda"
-"((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)))))"
+"((s_718 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_101)"
+"(begin(substitute-set!-rename31_0 s_718 disarmed-s_20 set!-id_1 id_126 rhs-s_1 from-rename?_2 ctx_101 #f)))"
+"((s_719 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_102 t23_1)"
+"(substitute-set!-rename31_0 s_719 disarmed-s_21 set!-id_2 id_127 rhs-s_2 from-rename?_3 ctx_102 t23_1)))))"
 "(void"
 "(add-core-form!*"
 " '#%variable-reference"
-"(lambda(s_720 ctx_102)"
+"(lambda(s_720 ctx_103)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_122)(expand-context-observer ctx_102)))"
+"(let-values(((obs_122)(expand-context-observer ctx_103)))"
 "(if obs_122"
 "(let-values()(let-values()(call-expand-observe obs_122 'prim-#%variable-reference)))"
 "(void)))"
@@ -68116,9 +68180,9 @@ static const char *startup_source =
 "(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)"
+"(let-values(((or-part_393)"
 "(if(syntax?$1 s_726)(symbol?(syntax-e$1 s_726)) #f)))"
-"(if or-part_389 or-part_389(symbol? s_726))))"
+"(if or-part_393 or-part_393(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)))"
@@ -68165,11 +68229,11 @@ static const char *startup_source =
 "(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)"
+"(let-values(((or-part_394)"
 "(if(syntax?$1 s_744)"
 "(symbol?(syntax-e$1 s_744))"
 " #f)))"
-"(if or-part_390 or-part_390(symbol? s_744))))"
+"(if or-part_394 or-part_394(symbol? s_744))))"
 " #f)"
 " #f)))"
 "(let-values(((s_745)(cdr s_740)))"
@@ -68221,7 +68285,7 @@ static const char *startup_source =
 "(values #f #f #f #f)))))"
 "(let-values(((ok?_62 #%variable-reference445_0)"
 "(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)))"
+"(if(if(not(let-values(((or-part_395) ok?_60))(if or-part_395 or-part_395 ok?_61)))"
 " #t"
 " #f)"
 "(let-values(((orig-s_60) s_757))"
@@ -68246,24 +68310,24 @@ 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_392) ok?_60))(if or-part_392 or-part_392 ok?_61))"
+"(if(let-values(((or-part_396) ok?_60))(if or-part_396 or-part_396 ok?_61))"
 "(let-values()"
 "(let-values(((var-id_0)(if ok?_60 id431_0 id437_0)))"
 "(let-values(((binding_30)"
 "(let-values(((var-id447_0) var-id_0)"
-"((temp448_0)(expand-context-phase ctx_102))"
+"((temp448_0)(expand-context-phase ctx_103))"
 "((temp449_0) 'ambiguous))"
 "(resolve+shift28.1 temp449_0 #f null unsafe-undefined #f var-id447_0 temp448_0))))"
 "(let-values((()"
 "(begin"
 "(if(eq? binding_30 'ambiguous)"
-"(let-values()(raise-ambiguous-error var-id_0 ctx_102))"
+"(let-values()(raise-ambiguous-error var-id_0 ctx_103))"
 "(void))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((or-part_393) binding_30))"
-"(if or-part_393 or-part_393(expand-context-allow-unbound? ctx_102)))"
+"(if(let-values(((or-part_397) binding_30))"
+"(if or-part_397 or-part_397(expand-context-allow-unbound? ctx_103)))"
 "(void)"
 "(let-values()"
 "(raise-unbound-syntax-error"
@@ -68272,15 +68336,15 @@ static const char *startup_source =
 " s_720"
 " var-id_0"
 " null"
-"(syntax-debug-info-string var-id_0 ctx_102))))"
+"(syntax-debug-info-string var-id_0 ctx_103))))"
 "(values))))"
 "(let-values(((t_64 primitive?_12 insp-of-t_7 protected?_13)"
 "(if binding_30"
 "(let-values(((binding450_0) binding_30)"
-"((ctx451_0) ctx_102)"
+"((ctx451_0) ctx_103)"
 "((var-id452_0) var-id_0)"
 "((s453_0) s_720)"
-"((temp454_0)(expand-context-in-local-expand? ctx_102)))"
+"((temp454_0)(expand-context-in-local-expand? ctx_103)))"
 "(lookup62.1 s453_0 temp454_0 binding450_0 ctx451_0 var-id452_0))"
 "(values #f #f #f #f))))"
 "(begin"
@@ -68288,7 +68352,7 @@ static const char *startup_source =
 "(let-values()"
 "                                   (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)"
+"(if(expand-context-to-parsed? ctx_103)"
 "(parsed-#%variable-reference11.1"
 "(keep-properties-only~ s_720)"
 "(if ok?_61"
@@ -68296,16 +68360,16 @@ static const char *startup_source =
 "(let-values()(parsed-id2.1 var-id_0 binding_30 #f))))"
 " s_720))))))))"
 "(let-values()"
-"(if(expand-context-to-parsed? ctx_102)"
+"(if(expand-context-to-parsed? ctx_103)"
 "(parsed-#%variable-reference11.1(keep-properties-only~ s_720) #f)"
 " s_720)))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%expression"
-"(lambda(s_762 ctx_103)"
+"(lambda(s_762 ctx_104)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_123)(expand-context-observer ctx_103)))"
+"(let-values(((obs_123)(expand-context-observer ctx_104)))"
 "(if obs_123"
 "(let-values()(let-values()(call-expand-observe obs_123 'prim-#%expression)))"
 "(void)))"
@@ -68347,35 +68411,35 @@ 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_762)((temp462_0) #t))"
+"(let-values(((ctx460_0) ctx_104)((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)"
 "((temp464_0)"
-"(let-values(((temp465_0)(as-expression-context ctx_103))"
-"((ctx466_0) ctx_103))"
+"(let-values(((temp465_0)(as-expression-context ctx_104))"
+"((ctx466_0) ctx_104))"
 "(as-tail-context22.1 ctx466_0 temp465_0))))"
 "(expand9.1 #f #f #f temp463_0 temp464_0))))"
-"(if(expand-context-to-parsed? ctx_103)"
+"(if(expand-context-to-parsed? ctx_104)"
 " exp-e_0"
-"(if(let-values(((or-part_394)"
-"(if(expand-context-in-local-expand? ctx_103)"
-"(expand-context-keep-#%expression? ctx_103)"
+"(if(let-values(((or-part_398)"
+"(if(expand-context-in-local-expand? ctx_104)"
+"(expand-context-keep-#%expression? ctx_104)"
 " #f)))"
-"(if or-part_394 or-part_394(eq? 'top-level(expand-context-context ctx_103))))"
+"(if or-part_398 or-part_398(eq? 'top-level(expand-context-context ctx_104))))"
 "(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_124)(expand-context-observer ctx_103)))"
+"(let-values(((obs_124)(expand-context-observer ctx_104)))"
 "(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_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))))"
+" (void (add-core-form!* 'unquote (lambda (s_771 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))"
+" (void (add-core-form!* 'unquote-splicing (lambda (s_772 ctx_106) (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)"
@@ -68404,22 +68468,22 @@ static const char *startup_source =
 "(define-values(provide-form-name) 'provide)"
 "(define-values"
 "(parse-and-expand-provides!)"
-"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_45 ctx_106)"
+"(lambda(specs_0 orig-s_62 rp_1 self_30 phase_46 ctx_107)"
 "(begin"
-"(let-values(((ns_125)(expand-context-namespace ctx_106)))"
+"(let-values(((ns_125)(expand-context-namespace ctx_107)))"
 "((letrec-values(((loop_116)"
 "(lambda(specs_1 at-phase_13 protected?_15 layer_6)"
 "(begin"
 " 'loop"
 "(let-values(((track-stxess_0 exp-specss_0)"
 "(let-values(((track-stxes_0 exp-specs_0)"
-"(let-values(((lst_77) specs_1))"
+"(let-values(((lst_81) specs_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
 "(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_77)))"
-"((letrec-values(((for-loop_98)"
+"(let-values()(check-list lst_81)))"
+"((letrec-values(((for-loop_102)"
 "(lambda(track-stxes_1"
 " exp-specs_1"
 " lst_406)"
@@ -68586,38 +68650,38 @@ static const char *startup_source =
 "(if(pair?"
 " s_773)"
 "(let-values(((for-meta6_0)"
-"(let-values(((s_488)"
+"(let-values(((s_489)"
 "(car"
 " s_773)))"
-" s_488))"
+" s_489))"
 "((phase-level7_0"
 " spec8_0)"
-"(let-values(((s_448)"
+"(let-values(((s_449)"
 "(cdr"
 " s_773)))"
-"(let-values(((s_493)"
-"(if(syntax?$1"
-" s_448)"
-"(syntax-e$1"
-" s_448)"
-" s_448)))"
-"(if(pair?"
-" s_493)"
-"(let-values(((phase-level9_0)"
 "(let-values(((s_774)"
-"(car"
-" s_493)))"
-" s_774))"
-"((spec10_0)"
+"(if(syntax?$1"
+" s_449)"
+"(syntax-e$1"
+" s_449)"
+" s_449)))"
+"(if(pair?"
+" s_774)"
+"(let-values(((phase-level9_0)"
 "(let-values(((s_775)"
+"(car"
+" s_774)))"
+" s_775))"
+"((spec10_0)"
+"(let-values(((s_776)"
 "(cdr"
-" s_493)))"
+" s_774)))"
 "(let-values(((s_81)"
 "(if(syntax?$1"
-" s_775)"
+" s_776)"
 "(syntax-e$1"
-" s_775)"
-" s_775)))"
+" s_776)"
+" s_776)))"
 "(let-values(((flat-s_46)"
 "(to-syntax-list.1"
 " s_81)))"
@@ -68702,18 +68766,18 @@ static const char *startup_source =
 "(let-values(((ok?_65"
 " for-syntax13_0"
 " spec14_0)"
-"(let-values(((s_450)"
+"(let-values(((s_451)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_64)"
-" s_450))"
+" s_451))"
 "(let-values(((for-syntax13_1"
 " spec14_1)"
 "(let-values(((s_24)"
 "(if(syntax?$1"
-" s_450)"
+" s_451)"
 "(syntax-e$1"
-" s_450)"
-" s_450)))"
+" s_451)"
+" s_451)))"
 "(if(pair?"
 " s_24)"
 "(let-values(((for-syntax15_0)"
@@ -68725,7 +68789,7 @@ static const char *startup_source =
 "(let-values(((s_157)"
 "(cdr"
 " s_24)))"
-"(let-values(((s_776)"
+"(let-values(((s_777)"
 "(if(syntax?$1"
 " s_157)"
 "(syntax-e$1"
@@ -68733,7 +68797,7 @@ static const char *startup_source =
 " s_157)))"
 "(let-values(((flat-s_47)"
 "(to-syntax-list.1"
-" s_776)))"
+" s_777)))"
 "(if(not"
 " flat-s_47)"
 "(let-values()"
@@ -68805,10 +68869,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_309)"
 "(let-values(((for-label21_0)"
-"(let-values(((s_443)"
+"(let-values(((s_444)"
 "(car"
 " s_309)))"
-" s_443))"
+" s_444))"
 "((spec22_0)"
 "(let-values(((s_27)"
 "(cdr"
@@ -68893,23 +68957,23 @@ static const char *startup_source =
 " s_49))"
 "(let-values(((protect25_1"
 " p-spec26_1)"
-"(let-values(((s_777)"
+"(let-values(((s_778)"
 "(if(syntax?$1"
 " s_49)"
 "(syntax-e$1"
 " s_49)"
 " s_49)))"
 "(if(pair?"
-" s_777)"
+" s_778)"
 "(let-values(((protect27_0)"
 "(let-values(((s_506)"
 "(car"
-" s_777)))"
+" s_778)))"
 " s_506))"
 "((p-spec28_0)"
 "(let-values(((s_507)"
 "(cdr"
-" s_777)))"
+" s_778)))"
 "(let-values(((s_52)"
 "(if(syntax?$1"
 " s_507)"
@@ -68978,24 +69042,24 @@ static const char *startup_source =
 "(let-values(((rename31_1"
 " id:from32_1"
 " id:to33_1)"
-"(let-values(((s_778)"
+"(let-values(((s_779)"
 "(if(syntax?$1"
 " s_315)"
 "(syntax-e$1"
 " s_315)"
 " s_315)))"
 "(if(pair?"
-" s_778)"
+" s_779)"
 "(let-values(((rename34_0)"
 "(let-values(((s_200)"
 "(car"
-" s_778)))"
+" s_779)))"
 " s_200))"
 "((id:from35_0"
 " id:to36_0)"
 "(let-values(((s_59)"
 "(cdr"
-" s_778)))"
+" s_779)))"
 "(let-values(((s_404)"
 "(if(syntax?$1"
 " s_59)"
@@ -69041,15 +69105,15 @@ static const char *startup_source =
 "(let-values(((s_203)"
 "(car"
 " s_61)))"
-"(if(let-values(((or-part_395)"
+"(if(let-values(((or-part_399)"
 "(if(syntax?$1"
 " s_203)"
 "(symbol?"
 "(syntax-e$1"
 " s_203))"
 " #f)))"
-"(if or-part_395"
-" or-part_395"
+"(if or-part_399"
+" or-part_399"
 "(symbol?"
 " s_203)))"
 " s_203"
@@ -69131,19 +69195,19 @@ static const char *startup_source =
 " struct40_0"
 " id:struct41_0"
 " id:field42_0)"
-"(let-values(((s_521)"
+"(let-values(((s_522)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_68)"
-" s_521))"
+" s_522))"
 "(let-values(((struct40_1"
 " id:struct41_1"
 " id:field42_1)"
 "(let-values(((s_207)"
 "(if(syntax?$1"
-" s_521)"
+" s_522)"
 "(syntax-e$1"
-" s_521)"
-" s_521)))"
+" s_522)"
+" s_522)))"
 "(if(pair?"
 " s_207)"
 "(let-values(((struct43_0)"
@@ -69165,51 +69229,51 @@ static const char *startup_source =
 "(if(pair?"
 " s_319)"
 "(let-values(((id:struct46_0)"
-"(let-values(((s_779)"
+"(let-values(((s_780)"
 "(car"
 " s_319)))"
-"(if(let-values(((or-part_396)"
+"(if(let-values(((or-part_400)"
 "(if(syntax?$1"
-" s_779)"
+" s_780)"
 "(symbol?"
 "(syntax-e$1"
-" s_779))"
+" s_780))"
 " #f)))"
-"(if or-part_396"
-" or-part_396"
+"(if or-part_400"
+" or-part_400"
 "(symbol?"
-" s_779)))"
-" s_779"
+" s_780)))"
+" s_780"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                       \"not an identifier\""
 " orig-s_68"
-" s_779))))"
+" s_780))))"
 "((id:field47_0)"
-"(let-values(((s_780)"
+"(let-values(((s_781)"
 "(cdr"
 " s_319)))"
-"(let-values(((s_432)"
+"(let-values(((s_433)"
 "(if(syntax?$1"
-" s_780)"
+" s_781)"
 "(syntax-e$1"
-" s_780)"
-" s_780)))"
+" s_781)"
+" s_781)))"
 "(if(pair?"
-" s_432)"
+" s_433)"
 "(let-values(((id:field48_0)"
-"(let-values(((s_522)"
+"(let-values(((s_523)"
 "(car"
-" s_432)))"
-"(let-values(((s_781)"
+" s_433)))"
+"(let-values(((s_782)"
 "(if(syntax?$1"
-" s_522)"
+" s_523)"
 "(syntax-e$1"
-" s_522)"
-" s_522)))"
+" s_523)"
+" s_523)))"
 "(let-values(((flat-s_50)"
 "(to-syntax-list.1"
-" s_781)))"
+" s_782)))"
 "(if(not"
 " flat-s_50)"
 "(let-values()"
@@ -69228,14 +69292,14 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_53)))"
-"((letrec-values(((for-loop_317)"
+"((letrec-values(((for-loop_316)"
 "(lambda(id:field_1"
 " lst_272)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_272)"
-"(let-values(((s_782)"
+"(let-values(((s_783)"
 "(unsafe-car"
 " lst_272))"
 "((rest_240)"
@@ -69248,23 +69312,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id:field49_0)"
 "(let-values()"
-"(if(let-values(((or-part_397)"
+"(if(let-values(((or-part_401)"
 "(if(syntax?$1"
-" s_782)"
+" s_783)"
 "(symbol?"
 "(syntax-e$1"
-" s_782))"
+" s_783))"
 " #f)))"
-"(if or-part_397"
-" or-part_397"
+"(if or-part_401"
+" or-part_401"
 "(symbol?"
-" s_782)))"
-" s_782"
+" s_783)))"
+" s_783"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_68"
-" s_782)))))"
+" s_783)))))"
 "(cons"
 " id:field49_0"
 " id:field_3)))))"
@@ -69272,28 +69336,28 @@ static const char *startup_source =
 " id:field_4)))))"
 "(if(not"
 " #f)"
-"(for-loop_317"
+"(for-loop_316"
 " id:field_2"
 " rest_240)"
 " id:field_2)))"
 " id:field_1)))))"
-" for-loop_317)"
+" for-loop_316)"
 " null"
 " lst_53)))))"
 "(reverse$1"
 " id:field_0))))))))"
 "(()"
-"(let-values(((s_527)"
-"(cdr"
-" s_432)))"
 "(let-values(((s_528)"
+"(cdr"
+" s_433)))"
+"(let-values(((s_529)"
 "(if(syntax?$1"
-" s_527)"
-"(syntax-e$1"
-" s_527)"
-" s_527)))"
-"(if(null?"
 " s_528)"
+"(syntax-e$1"
+" s_528)"
+" s_528)))"
+"(if(null?"
+" s_529)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69365,10 +69429,10 @@ static const char *startup_source =
 "(if(pair?"
 " s_323)"
 "(let-values(((all-from52_0)"
-"(let-values(((s_783)"
+"(let-values(((s_784)"
 "(car"
 " s_323)))"
-" s_783))"
+" s_784))"
 "((mod-path53_0)"
 "(let-values(((s_427)"
 "(cdr"
@@ -69430,7 +69494,7 @@ static const char *startup_source =
 " ns_125"
 " rp_1"
 " protected?_15"
-" ctx_106)"
+" ctx_107)"
 "(values"
 " null"
 "(list"
@@ -69467,26 +69531,26 @@ static const char *startup_source =
 " s_218))"
 "((mod-path59_0"
 " id60_1)"
-"(let-values(((s_784)"
+"(let-values(((s_785)"
 "(cdr"
 " s_105)))"
-"(let-values(((s_785)"
+"(let-values(((s_786)"
 "(if(syntax?$1"
-" s_784)"
-"(syntax-e$1"
-" s_784)"
-" s_784)))"
-"(if(pair?"
 " s_785)"
+"(syntax-e$1"
+" s_785)"
+" s_785)))"
+"(if(pair?"
+" s_786)"
 "(let-values(((mod-path61_0)"
 "(let-values(((s_220)"
 "(car"
-" s_785)))"
+" s_786)))"
 " s_220))"
 "((id62_0)"
 "(let-values(((s_221)"
 "(cdr"
-" s_785)))"
+" s_786)))"
 "(let-values(((s_326)"
 "(if(syntax?$1"
 " s_221)"
@@ -69514,14 +69578,14 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_407)))"
-"((letrec-values(((for-loop_318)"
+"((letrec-values(((for-loop_317)"
 "(lambda(id_130"
 " lst_408)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_408)"
-"(let-values(((s_786)"
+"(let-values(((s_787)"
 "(unsafe-car"
 " lst_408))"
 "((rest_241)"
@@ -69534,23 +69598,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id63_0)"
 "(let-values()"
-"(if(let-values(((or-part_398)"
+"(if(let-values(((or-part_402)"
 "(if(syntax?$1"
-" s_786)"
+" s_787)"
 "(symbol?"
 "(syntax-e$1"
-" s_786))"
+" s_787))"
 " #f)))"
-"(if or-part_398"
-" or-part_398"
+"(if or-part_402"
+" or-part_402"
 "(symbol?"
-" s_786)))"
-" s_786"
+" s_787)))"
+" s_787"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                             \"not an identifier\""
 " orig-s_70"
-" s_786)))))"
+" s_787)))))"
 "(cons"
 " id63_0"
 " id_132)))))"
@@ -69558,12 +69622,12 @@ static const char *startup_source =
 " id_133)))))"
 "(if(not"
 " #f)"
-"(for-loop_318"
+"(for-loop_317"
 " id_131"
 " rest_241)"
 " id_131)))"
 " id_130)))))"
-" for-loop_318)"
+" for-loop_317)"
 " null"
 " lst_407)))))"
 "(reverse$1"
@@ -69598,7 +69662,7 @@ static const char *startup_source =
 " ns_125"
 " rp_1"
 " protected?_15"
-" ctx_106)"
+" ctx_107)"
 "(values"
 " null"
 "(list"
@@ -69622,31 +69686,31 @@ static const char *startup_source =
 "(let-values(((orig-s_71)"
 " s_114))"
 "(let-values(((all-defined64_1)"
-"(let-values(((s_787)"
+"(let-values(((s_788)"
 "(if(syntax?$1"
 " s_114)"
 "(syntax-e$1"
 " s_114)"
 " s_114)))"
 "(if(pair?"
-" s_787)"
+" s_788)"
 "(let-values(((all-defined65_0)"
-"(let-values(((s_438)"
+"(let-values(((s_439)"
 "(car"
-" s_787)))"
-" s_438))"
+" s_788)))"
+" s_439))"
 "(()"
 "(let-values(((s_224)"
 "(cdr"
-" s_787)))"
-"(let-values(((s_788)"
+" s_788)))"
+"(let-values(((s_789)"
 "(if(syntax?$1"
 " s_224)"
 "(syntax-e$1"
 " s_224)"
 " s_224)))"
 "(if(null?"
-" s_788)"
+" s_789)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -69691,32 +69755,32 @@ static const char *startup_source =
 " s_228))"
 "(let-values(((all-defined-except66_1"
 " id67_1)"
-"(let-values(((s_789)"
+"(let-values(((s_790)"
 "(if(syntax?$1"
 " s_228)"
 "(syntax-e$1"
 " s_228)"
 " s_228)))"
 "(if(pair?"
-" s_789)"
+" s_790)"
 "(let-values(((all-defined-except68_0)"
-"(let-values(((s_790)"
-"(car"
-" s_789)))"
-" s_790))"
-"((id69_0)"
 "(let-values(((s_791)"
+"(car"
+" s_790)))"
+" s_791))"
+"((id69_0)"
+"(let-values(((s_792)"
 "(cdr"
-" s_789)))"
-"(let-values(((s_463)"
+" s_790)))"
+"(let-values(((s_464)"
 "(if(syntax?$1"
-" s_791)"
+" s_792)"
 "(syntax-e$1"
-" s_791)"
-" s_791)))"
+" s_792)"
+" s_792)))"
 "(let-values(((flat-s_52)"
 "(to-syntax-list.1"
-" s_463)))"
+" s_464)))"
 "(if(not"
 " flat-s_52)"
 "(let-values()"
@@ -69742,7 +69806,7 @@ static const char *startup_source =
 " 'for-loop"
 "(if(pair?"
 " lst_409)"
-"(let-values(((s_464)"
+"(let-values(((s_465)"
 "(unsafe-car"
 " lst_409))"
 "((rest_242)"
@@ -69757,21 +69821,21 @@ static const char *startup_source =
 "(let-values()"
 "(if(let-values(((or-part_289)"
 "(if(syntax?$1"
-" s_464)"
+" s_465)"
 "(symbol?"
 "(syntax-e$1"
-" s_464))"
+" s_465))"
 " #f)))"
 "(if or-part_289"
 " or-part_289"
 "(symbol?"
-" s_464)))"
-" s_464"
+" s_465)))"
+" s_465"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                         \"not an identifier\""
 " orig-s_72"
-" s_464)))))"
+" s_465)))))"
 "(cons"
 " id70_0"
 " id_137)))))"
@@ -69942,37 +70006,37 @@ static const char *startup_source =
 " prefix-all-defined-except76_0"
 " id:prefix77_0"
 " id78_0)"
-"(let-values(((s_792)"
+"(let-values(((s_793)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_74)"
-" s_792))"
+" s_793))"
 "(let-values(((prefix-all-defined-except76_1"
 " id:prefix77_1"
 " id78_1)"
-"(let-values(((s_793)"
+"(let-values(((s_794)"
 "(if(syntax?$1"
-" s_792)"
-"(syntax-e$1"
-" s_792)"
-" s_792)))"
-"(if(pair?"
 " s_793)"
+"(syntax-e$1"
+" s_793)"
+" s_793)))"
+"(if(pair?"
+" s_794)"
 "(let-values(((prefix-all-defined-except79_0)"
 "(let-values(((s_534)"
 "(car"
-" s_793)))"
+" s_794)))"
 " s_534))"
 "((id:prefix80_0"
 " id81_0)"
-"(let-values(((s_794)"
+"(let-values(((s_795)"
 "(cdr"
-" s_793)))"
+" s_794)))"
 "(let-values(((s_243)"
 "(if(syntax?$1"
-" s_794)"
+" s_795)"
 "(syntax-e$1"
-" s_794)"
-" s_794)))"
+" s_795)"
+" s_795)))"
 "(if(pair?"
 " s_243)"
 "(let-values(((id:prefix82_0)"
@@ -70000,7 +70064,7 @@ static const char *startup_source =
 "(let-values(((s_348)"
 "(cdr"
 " s_243)))"
-"(let-values(((s_795)"
+"(let-values(((s_796)"
 "(if(syntax?$1"
 " s_348)"
 "(syntax-e$1"
@@ -70008,7 +70072,7 @@ static const char *startup_source =
 " s_348)))"
 "(let-values(((flat-s_53)"
 "(to-syntax-list.1"
-" s_795)))"
+" s_796)))"
 "(if(not"
 " flat-s_53)"
 "(let-values()"
@@ -70027,14 +70091,14 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_410)))"
-"((letrec-values(((for-loop_319)"
+"((letrec-values(((for-loop_318)"
 "(lambda(id_37"
 " lst_411)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
 " lst_411)"
-"(let-values(((s_796)"
+"(let-values(((s_797)"
 "(unsafe-car"
 " lst_411))"
 "((rest_243)"
@@ -70047,23 +70111,23 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id84_1)"
 "(let-values()"
-"(if(let-values(((or-part_399)"
+"(if(let-values(((or-part_403)"
 "(if(syntax?$1"
-" s_796)"
+" s_797)"
 "(symbol?"
 "(syntax-e$1"
-" s_796))"
+" s_797))"
 " #f)))"
-"(if or-part_399"
-" or-part_399"
+"(if or-part_403"
+" or-part_403"
 "(symbol?"
-" s_796)))"
-" s_796"
+" s_797)))"
+" s_797"
 "(raise-syntax-error$1"
 " #f"
 "                                                                                                                                                                                                                                                                                                                                               \"not an identifier\""
 " orig-s_74"
-" s_796)))))"
+" s_797)))))"
 "(cons"
 " id84_1"
 " id_140)))))"
@@ -70071,12 +70135,12 @@ static const char *startup_source =
 " id_141)))))"
 "(if(not"
 " #f)"
-"(for-loop_319"
+"(for-loop_318"
 " id_139"
 " rest_243)"
 " id_139)))"
 " id_37)))))"
-" for-loop_319)"
+" for-loop_318)"
 " null"
 " lst_410)))))"
 "(reverse$1"
@@ -70122,44 +70186,44 @@ static const char *startup_source =
 " expand85_0"
 " id86_1"
 " datum87_0)"
-"(let-values(((s_797)"
+"(let-values(((s_798)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_75)"
-" s_797))"
+" s_798))"
 "(let-values(((expand85_1"
 " id86_2"
 " datum87_1)"
-"(let-values(((s_798)"
+"(let-values(((s_799)"
 "(if(syntax?$1"
-" s_797)"
-"(syntax-e$1"
-" s_797)"
-" s_797)))"
-"(if(pair?"
 " s_798)"
+"(syntax-e$1"
+" s_798)"
+" s_798)))"
+"(if(pair?"
+" s_799)"
 "(let-values(((expand88_0)"
 "(let-values(((s_367)"
 "(car"
-" s_798)))"
+" s_799)))"
 " s_367))"
 "((id89_1"
 " datum90_0)"
 "(let-values(((s_368)"
 "(cdr"
-" s_798)))"
-"(let-values(((s_799)"
+" s_799)))"
+"(let-values(((s_800)"
 "(if(syntax?$1"
 " s_368)"
 "(syntax-e$1"
 " s_368)"
 " s_368)))"
 "(if(pair?"
-" s_799)"
+" s_800)"
 "(let-values(((id91_1"
 " datum92_0)"
 "(let-values(((s_370)"
 "(car"
-" s_799)))"
+" s_800)))"
 "(let-values(((s_371)"
 "(if(syntax?$1"
 " s_370)"
@@ -70172,15 +70236,15 @@ static const char *startup_source =
 "(let-values(((s_373)"
 "(car"
 " s_371)))"
-"(if(let-values(((or-part_400)"
+"(if(let-values(((or-part_404)"
 "(if(syntax?$1"
 " s_373)"
 "(symbol?"
 "(syntax-e$1"
 " s_373))"
 " #f)))"
-"(if or-part_400"
-" or-part_400"
+"(if or-part_404"
+" or-part_404"
 "(symbol?"
 " s_373)))"
 " s_373"
@@ -70204,15 +70268,15 @@ static const char *startup_source =
 "(()"
 "(let-values(((s_547)"
 "(cdr"
-" s_799)))"
-"(let-values(((s_800)"
+" s_800)))"
+"(let-values(((s_801)"
 "(if(syntax?$1"
 " s_547)"
 "(syntax-e$1"
 " s_547)"
 " s_547)))"
 "(if(null?"
-" s_800)"
+" s_801)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -70241,18 +70305,18 @@ static const char *startup_source =
 "(let-values(((ok?_76"
 " expand95_0"
 " form96_0)"
-"(let-values(((s_801)"
+"(let-values(((s_802)"
 " disarmed-spec_0))"
 "(let-values(((orig-s_76)"
-" s_801))"
+" s_802))"
 "(let-values(((expand95_1"
 " form96_1)"
 "(let-values(((s_376)"
 "(if(syntax?$1"
-" s_801)"
+" s_802)"
 "(syntax-e$1"
-" s_801)"
-" s_801)))"
+" s_802)"
+" s_802)))"
 "(if(pair?"
 " s_376)"
 "(let-values(((expand97_0)"
@@ -70314,9 +70378,9 @@ static const char *startup_source =
 "(let-values(((exp-spec_0)"
 "(let-values(((temp104_3)"
 " form96_0)"
-"((temp105_5)"
+"((temp105_4)"
 "(let-values(((v_266)"
-" ctx_106))"
+" ctx_107))"
 "(let-values(((the-struct_99)"
 " v_266))"
 "(if(expand-context/outer?"
@@ -70430,7 +70494,7 @@ static const char *startup_source =
 " #f"
 " #f"
 " temp104_3"
-" temp105_5))))"
+" temp105_4))))"
 "(let-values((()"
 "(begin"
 "(if(if(pair?"
@@ -70458,18 +70522,18 @@ static const char *startup_source =
 "(let-values(((ok?_77"
 " begin100_0"
 " spec101_0)"
-"(let-values(((s_802)"
+"(let-values(((s_803)"
 " exp-spec_0))"
 "(let-values(((orig-s_77)"
-" s_802))"
+" s_803))"
 "(let-values(((begin100_1"
 " spec101_1)"
 "(let-values(((s_266)"
 "(if(syntax?$1"
-" s_802)"
+" s_803)"
 "(syntax-e$1"
-" s_802)"
-" s_802)))"
+" s_803)"
+" s_803)))"
 "(if(pair?"
 " s_266)"
 "(let-values(((begin102_0)"
@@ -70478,15 +70542,15 @@ static const char *startup_source =
 " s_266)))"
 " s_267))"
 "((spec103_0)"
-"(let-values(((s_803)"
+"(let-values(((s_804)"
 "(cdr"
 " s_266)))"
 "(let-values(((s_268)"
 "(if(syntax?$1"
-" s_803)"
+" s_804)"
 "(syntax-e$1"
-" s_803)"
-" s_803)))"
+" s_804)"
+" s_804)))"
 "(let-values(((flat-s_54)"
 "(to-syntax-list.1"
 " s_268)))"
@@ -70534,7 +70598,7 @@ static const char *startup_source =
 " track-stxes_4"
 " exp-specs_4)))))"
 "(if(not #f)"
-"(for-loop_98"
+"(for-loop_102"
 " track-stxes_2"
 " exp-specs_2"
 " rest_239)"
@@ -70544,15 +70608,15 @@ static const char *startup_source =
 "(values"
 " track-stxes_1"
 " exp-specs_1))))))"
-" for-loop_98)"
+" for-loop_102)"
 " null"
 " null"
-" lst_77)))))"
+" lst_81)))))"
 "(values(reverse$1 track-stxes_0)(reverse$1 exp-specs_0)))))"
 "(values(apply append track-stxess_0)(apply append exp-specss_0)))))))"
 " loop_116)"
 " specs_0"
-" phase_45"
+" phase_46"
 " #f"
 " 'raw)))))"
 "(define-values"
@@ -70618,7 +70682,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_412)))"
-"((letrec-values(((for-loop_320)"
+"((letrec-values(((for-loop_319)"
 "(lambda(lst_413)"
 "(begin"
 " 'for-loop"
@@ -70641,9 +70705,9 @@ static const char *startup_source =
 " protected?_17)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_320 rest_244)(values))))"
+"(if(not #f)(for-loop_319 rest_244)(values))))"
 "(values))))))"
-" for-loop_320)"
+" for-loop_319)"
 " lst_412)))"
 "(void)"
 "(let-values(((lst_414) fields_0))"
@@ -70651,7 +70715,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_414)))"
-"((letrec-values(((for-loop_321)"
+"((letrec-values(((for-loop_320)"
 "(lambda(lst_415)"
 "(begin"
 " 'for-loop"
@@ -70688,14 +70752,14 @@ static const char *startup_source =
 " protected?_17)))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_321 rest_245)(values))))"
+"(if(not #f)(for-loop_320 rest_245)(values))))"
 "(values))))))"
-" for-loop_321)"
+" for-loop_320)"
 " lst_414)))"
 "(void)))))))"
 "(define-values"
 "(parse-all-from)"
-"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_107)"
+"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_108)"
 "(begin"
 "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))"
 "(let-values((()"
@@ -70705,7 +70769,7 @@ static const char *startup_source =
 "(let-values()"
 "                            (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_80 mod-path-stx_0)))"
 "(values))))"
-"(let-values(((mpi_53)(module-path->mpi/context mod-path_33 ctx_107)))"
+"(let-values(((mpi_53)(module-path->mpi/context mod-path_33 ctx_108)))"
 "(parse-all-from-module mpi_53 #f orig-s_80 except-ids_0 #f at-phase_16 ns_128 rp_4 protected?_18)))))))"
 "(define-values"
 "(parse-all-from-module)"
@@ -70744,7 +70808,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_416)))"
-"((letrec-values(((for-loop_322)"
+"((letrec-values(((for-loop_321)"
 "(lambda(lst_417)"
 "(begin"
 " 'for-loop"
@@ -70759,14 +70823,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id_143)"
 "(required-id i_184)))"
-"(let-values(((phase_143)"
+"(let-values(((phase_145)"
 "(required-phase"
 " i_184)))"
-"(if(let-values(((or-part_401)"
+"(if(let-values(((or-part_405)"
 "(if matching-stx_0"
 "(not"
 "(if(eqv?"
-" phase_143"
+" phase_145"
 " at-phase_17)"
 "(free-identifier=?$1"
 " id_143"
@@ -70774,12 +70838,12 @@ static const char *startup_source =
 " matching-stx_0"
 "(syntax-e$1"
 " id_143))"
-" phase_143"
-" phase_143)"
+" phase_145"
+" phase_145)"
 " #f))"
 " #f)))"
-"(if or-part_401"
-" or-part_401"
+"(if or-part_405"
+" or-part_405"
 "(let-values(((lst_418)"
 " except-ids_1))"
 "(begin"
@@ -70789,7 +70853,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_418)))"
-"((letrec-values(((for-loop_323)"
+"((letrec-values(((for-loop_322)"
 "(lambda(result_127"
 " lst_419)"
 "(begin"
@@ -70810,8 +70874,8 @@ static const char *startup_source =
 "(if(free-identifier=?$1"
 " id_143"
 " except-id_0"
-" phase_143"
-" phase_143)"
+" phase_145"
+" phase_145)"
 "(hash-set!"
 " found_0"
 " except-id_0"
@@ -70820,18 +70884,18 @@ static const char *startup_source =
 "(values"
 " result_129)))))"
 "(if(if(not"
-"((lambda x_99"
+"((lambda x_100"
 " result_128)"
 " except-id_0))"
 "(not"
 " #f)"
 " #f)"
-"(for-loop_323"
+"(for-loop_322"
 " result_128"
 " rest_247)"
 " result_128)))"
 " result_127)))))"
-" for-loop_323)"
+" for-loop_322)"
 " #f"
 " lst_418)))))"
 "(void)"
@@ -70839,13 +70903,13 @@ static const char *startup_source =
 "(let-values(((b_95)"
 "(resolve+shift/extra-inspector"
 " id_143"
-" phase_143"
+" phase_145"
 " ns_129)))"
 "(let-values(((immed-b_1)"
 "(let-values(((id130_0)"
 " id_143)"
 "((phase131_0)"
-" phase_143)"
+" phase_145)"
 "((temp132_2)"
 " #t))"
 "(resolve+shift28.1"
@@ -70858,12 +70922,12 @@ static const char *startup_source =
 " phase131_0))))"
 "(let-values(((rp121_0)"
 " rp_5)"
-"((temp122_1)"
+"((temp122_2)"
 "(add-prefix_1"
 "(syntax-e$1"
 " id_143)))"
 "((phase123_0)"
-" phase_143)"
+" phase_145)"
 "((b124_0)"
 " b_95)"
 "((immed-b125_0)"
@@ -70874,14 +70938,14 @@ static const char *startup_source =
 " orig-s_81)"
 "((protected?128_0)"
 " protected?_19)"
-"((temp129_2)"
+"((temp129_3)"
 "(required-as-transformer?"
 " i_184)))"
 "(add-provide!117.1"
 " protected?128_0"
-" temp129_2"
+" temp129_3"
 " rp121_0"
-" temp122_1"
+" temp122_2"
 " phase123_0"
 " b124_0"
 " immed-b125_0"
@@ -70889,9 +70953,9 @@ static const char *startup_source =
 " orig-s127_0)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_322 rest_246)(values))))"
+"(if(not #f)(for-loop_321 rest_246)(values))))"
 "(values))))))"
-" for-loop_322)"
+" for-loop_321)"
 " lst_416)))"
 "(void)"
 "(if(=(hash-count found_0)(length except-ids_1))"
@@ -70903,7 +70967,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_420)))"
-"((letrec-values(((for-loop_324)"
+"((letrec-values(((for-loop_323)"
 "(lambda(lst_421)"
 "(begin"
 " 'for-loop"
@@ -70916,13 +70980,13 @@ static const char *startup_source =
 "(let-values()"
 "(begin"
 "(let-values()"
-"(if(let-values(((or-part_402)"
+"(if(let-values(((or-part_406)"
 "(hash-ref"
 " found_0"
 " except-id_1"
 " #f)))"
-"(if or-part_402"
-" or-part_402"
+"(if or-part_406"
+" or-part_406"
 "(let-values(((lst_422)"
 " requireds_2))"
 "(begin"
@@ -70932,7 +70996,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_422)))"
-"((letrec-values(((for-loop_325)"
+"((letrec-values(((for-loop_324)"
 "(lambda(result_130"
 " lst_423)"
 "(begin"
@@ -70953,29 +71017,29 @@ static const char *startup_source =
 "(let-values(((id_144)"
 "(required-id"
 " i_185)))"
-"(let-values(((phase_144)"
+"(let-values(((phase_146)"
 "(required-phase"
 " i_185)))"
 "(free-identifier=?$1"
 " id_144"
 " except-id_1"
-" phase_144"
-" phase_144)))))))"
+" phase_146"
+" phase_146)))))))"
 "(values"
 " result_132)))))"
 "(if(if(not"
-"((lambda x_100"
+"((lambda x_101"
 " result_131)"
 " i_185))"
 "(not"
 " #f)"
 " #f)"
-"(for-loop_325"
+"(for-loop_324"
 " result_131"
 " rest_249)"
 " result_131)))"
 " result_130)))))"
-" for-loop_325)"
+" for-loop_324)"
 " #f"
 " lst_422)))))"
 "(void)"
@@ -70991,9 +71055,9 @@ static const char *startup_source =
 " except-id_1))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_324 rest_248)(values))))"
+"(if(not #f)(for-loop_323 rest_248)(values))))"
 "(values))))))"
-" for-loop_324)"
+" for-loop_323)"
 " lst_420)))"
 "(void)))))))))))))"
 "(define-values"
@@ -71010,7 +71074,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_424)))"
-"((letrec-values(((for-loop_326)"
+"((letrec-values(((for-loop_325)"
 "(lambda(lst_85)"
 "(begin"
 " 'for-loop"
@@ -71058,9 +71122,9 @@ static const char *startup_source =
 " p_46))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_326 rest_40)(values))))"
+"(if(not #f)(for-loop_325 rest_40)(values))))"
 "(values))))))"
-" for-loop_326)"
+" for-loop_325)"
 " lst_424)))"
 "(void)))))"
 "((check-expr_0)"
@@ -71082,12 +71146,12 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((rands_1)(parsed-app-rands e_91)))"
 "(begin"
-"(let-values(((lst_78) rands_1))"
+"(let-values(((lst_82) rands_1))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_78)))"
-"((letrec-values(((for-loop_327)"
+"(let-values()(check-list lst_82)))"
+"((letrec-values(((for-loop_326)"
 "(lambda(lst_86)"
 "(begin"
 " 'for-loop"
@@ -71107,11 +71171,11 @@ static const char *startup_source =
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_327 rest_250)"
+"(for-loop_326 rest_250)"
 "(values))))"
 "(values))))))"
-" for-loop_327)"
-" lst_78)))"
+" for-loop_326)"
+" lst_82)))"
 "(void)"
 "(let-values(((tmp_63)(cross-phase-primitive-name(parsed-app-rator e_91))))"
 "(if(if(equal? tmp_63 'cons) #t(equal? tmp_63 'list))"
@@ -71282,12 +71346,12 @@ static const char *startup_source =
 "(begin"
 " 'check-body-no-disallowed-expr"
 "(begin"
-"(let-values(((lst_81) l_48))"
+"(let-values(((lst_77) l_48))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
-"(let-values()(check-list lst_81)))"
-"((letrec-values(((for-loop_328)"
+"(let-values()(check-list lst_77)))"
+"((letrec-values(((for-loop_327)"
 "(lambda(lst_58)"
 "(begin"
 " 'for-loop"
@@ -71304,10 +71368,10 @@ static const char *startup_source =
 " e_82))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_328 rest_196)(values))))"
+"(if(not #f)(for-loop_327 rest_196)(values))))"
 "(values))))))"
-" for-loop_328)"
-" lst_81)))"
+" for-loop_327)"
+" lst_77)))"
 "(void))))))"
 "(check-body_0 bodys_13)))))"
 "(define-values"
@@ -71360,42 +71424,42 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'module"
-"(lambda(s_43 ctx_108)"
+"(lambda(s_43 ctx_109)"
 "(begin"
-"(if(eq?(expand-context-context ctx_108) 'top-level)"
+"(if(eq?(expand-context-context ctx_109) 'top-level)"
 "(void)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_125)(expand-context-observer ctx_108)))"
+"(let-values(((obs_125)(expand-context-observer ctx_109)))"
 "(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))"
+"(let-values(((s223_1) s_43)((ctx224_0) ctx_109)((temp225_2) #f))"
 "(expand-module18.1 #f #f #f #f #f unsafe-undefined #f s223_1 ctx224_0 temp225_2)))))))"
 "(void"
 "(add-core-form!*"
 " 'module*"
-"(lambda(s_307 ctx_109)"
+"(lambda(s_307 ctx_110)"
 "(begin"
-"(let-values(((obs_126)(expand-context-observer ctx_109)))"
+"(let-values(((obs_126)(expand-context-observer ctx_110)))"
 "(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)"
+"(lambda(s_91 ctx_111)"
 "(begin"
-"(let-values(((obs_127)(expand-context-observer ctx_110)))"
+"(let-values(((obs_127)(expand-context-observer ctx_111)))"
 "(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)"
+"(if(eq?(expand-context-context ctx_111) 'module-begin)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not in a module-definition context\" s_91)))"
-"(if(expand-context-module-begin-k ctx_110)"
+"(if(expand-context-module-begin-k ctx_111)"
 "(void)"
 "         (let-values () (raise-syntax-error$1 #f \"not currently transforming a module\" s_91)))"
-"((expand-context-module-begin-k ctx_110)"
+"((expand-context-module-begin-k ctx_111)"
 " s_91"
-"(let-values(((v_267) ctx_110))"
+"(let-values(((v_267) ctx_111))"
 "(let-values(((the-struct_101) v_267))"
 "(if(expand-context/outer? the-struct_101)"
 "(let-values(((inner226_0)"
@@ -71450,11 +71514,11 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " '#%declare"
-"(lambda(s_804 ctx_111)"
+"(lambda(s_805 ctx_112)"
 "(begin"
-"(let-values(((obs_128)(expand-context-observer ctx_111)))"
+"(let-values(((obs_128)(expand-context-observer ctx_112)))"
 "(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)))))"
+"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_805)))))"
 "(define-values"
 "(expand-module18.1)"
 "(lambda(always-produce-compiled?1_0"
@@ -71469,7 +71533,7 @@ static const char *startup_source =
 " enclosing-self17_0)"
 "(begin"
 " 'expand-module18"
-"(let-values(((s_805) s15_2))"
+"(let-values(((s_806) s15_2))"
 "(let-values(((init-ctx_0) init-ctx16_0))"
 "(let-values(((enclosing-self_1) enclosing-self17_0))"
 "(let-values(((always-produce-compiled?_0) always-produce-compiled?1_0))"
@@ -71485,13 +71549,13 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_129)(expand-context-observer init-ctx_0)))"
-"(if obs_129"
+"(let-values(((obs_61)(expand-context-observer init-ctx_0)))"
+"(if obs_61"
 "(let-values()"
-"(let-values()(call-expand-observe obs_129 'prim-module)))"
+"(let-values()(call-expand-observe obs_61 'prim-module)))"
 "(void)))"
 "(values))))"
-"(let-values(((disarmed-s_24)(syntax-disarm$1 s_805)))"
+"(let-values(((disarmed-s_24)(syntax-disarm$1 s_806)))"
 "(let-values(((ok?_78 module228_0 id:module-name229_0 initial-require230_0 body231_0)"
 "(let-values(((s_51) disarmed-s_24))"
 "(let-values(((orig-s_82) s_51))"
@@ -71542,23 +71606,23 @@ static const char *startup_source =
 "(let-values(((s_55)"
 "(cdr"
 " s_93)))"
-"(let-values(((s_453)"
+"(let-values(((s_454)"
 "(if(syntax?$1"
 " s_55)"
 "(syntax-e$1"
 " s_55)"
 " s_55)))"
 "(if(pair?"
-" s_453)"
+" s_454)"
 "(let-values(((initial-require239_0)"
 "(let-values(((s_56)"
 "(car"
-" s_453)))"
+" s_454)))"
 " s_56))"
 "((body240_0)"
 "(let-values(((s_33)"
 "(cdr"
-" s_453)))"
+" s_454)))"
 "(let-values(((s_509)"
 "(if(syntax?$1"
 " s_33)"
@@ -71606,7 +71670,7 @@ static const char *startup_source =
 " body231_1))))))"
 "(let-values(((rebuild-s_14)"
 "(let-values(((init-ctx253_0) init-ctx_0)"
-"((s254_0) s_805)"
+"((s254_0) s_806)"
 "((temp255_0) #t)"
 "((temp256_0) #t))"
 "(keep-as-needed119.1 #f temp256_0 temp255_0 init-ctx253_0 s254_0))))"
@@ -71622,10 +71686,10 @@ static const char *startup_source =
 "(raise-syntax-error$1"
 " #f"
 "                                                           \"not a module path\""
-" s_805"
+" s_806"
 " initial-require230_0)))"
 "(values))))"
-"(let-values(((phase_145) 0))"
+"(let-values(((phase_147) 0))"
 "(let-values(((module-name-sym_0)(syntax-e$1 id:module-name229_0)))"
 "(let-values(((outside-scope_1)(new-scope 'module)))"
 "(let-values(((inside-scope_0)(new-multi-scope module-name-sym_0)))"
@@ -71732,7 +71796,7 @@ static const char *startup_source =
 "(make-m-ns244_0"
 " unsafe-undefined"
 " temp266_0))))"
-"(let-values(((ctx_112)"
+"(let-values(((ctx_113)"
 "(let-values(((v_260)"
 "(copy-root-expand-context"
 " init-ctx_0"
@@ -71759,7 +71823,7 @@ static const char *startup_source =
 "((namespace270_0)"
 " m-ns_19)"
 "((phase271_0)"
-" phase_145)"
+" phase_147)"
 "((just-once?272_0)"
 " #f))"
 "(expand-context/inner2.1"
@@ -71857,33 +71921,33 @@ static const char *startup_source =
 " _274_0"
 " _275_0"
 " body276_0)"
-"(let-values(((s_525)"
+"(let-values(((s_526)"
 " scoped-s_0))"
 "(let-values(((orig-s_83)"
-" s_525))"
+" s_526))"
 "(let-values(((_273_1"
 " _274_1"
 " _275_1"
 " body276_1)"
-"(let-values(((s_458)"
+"(let-values(((s_459)"
 "(if(syntax?$1"
-" s_525)"
+" s_526)"
 "(syntax-e$1"
-" s_525)"
-" s_525)))"
+" s_526)"
+" s_526)))"
 "(if(pair?"
-" s_458)"
+" s_459)"
 "(let-values(((_277_2)"
-"(let-values(((s_528)"
+"(let-values(((s_529)"
 "(car"
-" s_458)))"
-" s_528))"
+" s_459)))"
+" s_529))"
 "((_278_0"
 " _279_1"
 " body280_0)"
 "(let-values(((s_97)"
 "(cdr"
-" s_458)))"
+" s_459)))"
 "(let-values(((s_212)"
 "(if(syntax?$1"
 " s_97)"
@@ -71893,32 +71957,32 @@ static const char *startup_source =
 "(if(pair?"
 " s_212)"
 "(let-values(((_281_0)"
-"(let-values(((s_806)"
+"(let-values(((s_807)"
 "(car"
 " s_212)))"
-" s_806))"
+" s_807))"
 "((_282_1"
 " body283_0)"
-"(let-values(((s_807)"
+"(let-values(((s_808)"
 "(cdr"
 " s_212)))"
-"(let-values(((s_808)"
+"(let-values(((s_809)"
 "(if(syntax?$1"
-" s_807)"
-"(syntax-e$1"
-" s_807)"
-" s_807)))"
-"(if(pair?"
 " s_808)"
+"(syntax-e$1"
+" s_808)"
+" s_808)))"
+"(if(pair?"
+" s_809)"
 "(let-values(((_284_0)"
 "(let-values(((s_39)"
 "(car"
-" s_808)))"
+" s_809)))"
 " s_39))"
 "((body285_0)"
 "(let-values(((s_98)"
 "(cdr"
-" s_808)))"
+" s_809)))"
 "(let-values(((s_320)"
 "(if(syntax?$1"
 " s_98)"
@@ -72050,14 +72114,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_130)"
+"(let-values(((obs_129)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_130"
+"(if obs_129"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_130"
+" obs_129"
 " 'prepare-env)))"
 "(void)))"
 "(values))))"
@@ -72119,8 +72183,8 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_18)"
 "(let-values(((module-begin-k308_0)"
-"(lambda(s_809"
-" ctx_113)"
+"(lambda(s_810"
+" ctx_114)"
 "(begin"
 " 'module-begin-k308"
 "(let-values(((new-requires+provides_0)"
@@ -72161,8 +72225,8 @@ static const char *startup_source =
 " defined-syms316_0)))"
 "(lambda()"
 "(module-begin-k_1"
-" s_809"
-" ctx_113))"
+" s_810"
+" ctx_114))"
 "(lambda()"
 "(begin"
 "(set! requires+provides_6"
@@ -72268,14 +72332,14 @@ static const char *startup_source =
 " inside-scope_0)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_131)"
+"(let-values(((obs_130)"
 "(expand-context-observer"
 " ctx_23)))"
-"(if obs_131"
+"(if obs_130"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_131"
+" obs_130"
 " 'rename-one"
 " added-s_2)))"
 "(void)))"
@@ -72292,23 +72356,23 @@ static const char *startup_source =
 " s_118))"
 "(let-values(((#%module-begin301_1"
 " body302_1)"
-"(let-values(((s_810)"
+"(let-values(((s_429)"
 "(if(syntax?$1"
 " s_118)"
 "(syntax-e$1"
 " s_118)"
 " s_118)))"
 "(if(pair?"
-" s_810)"
+" s_429)"
 "(let-values(((#%module-begin303_0)"
 "(let-values(((s_227)"
 "(car"
-" s_810)))"
+" s_429)))"
 " s_227))"
 "((body304_0)"
 "(let-values(((s_163)"
 "(cdr"
-" s_810)))"
+" s_429)))"
 "(let-values(((s_164)"
 "(if(syntax?$1"
 " s_163)"
@@ -72362,15 +72426,13 @@ static const char *startup_source =
 "(let-values(((expression-expanded-bodys_0)"
 "((letrec-values(((pass-1-and-2-loop_0)"
 "(lambda(bodys_17"
-" phase_146)"
+" phase_148"
+" keep-stops?_2)"
 "(begin"
 " 'pass-1-and-2-loop"
 "(let-values(((def-ctx-scopes_8)"
 "(box"
 " null)))"
-"(let-values(((to-parsed?_5)"
-"(expand-context-to-parsed?"
-" ctx_23)))"
 "(let-values(((partial-body-ctx_0)"
 "(let-values(((v_269)"
 " ctx_23))"
@@ -72391,16 +72453,16 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_106)"
 "(let-values(((phase333_0)"
-" phase_146)"
+" phase_148)"
 "((namespace334_0)"
 "(namespace->namespace-at-phase"
 " m-ns_19"
-" phase_146))"
+" phase_148))"
 "((stops335_0)"
 "(free-id-set"
-" phase_146"
+" phase_148"
 "(module-expand-stop-ids"
-" phase_146)))"
+" phase_148)))"
 "((declared-submodule-names336_0)"
 " declared-submodule-names_3)"
 "((lift-key337_0)"
@@ -72419,11 +72481,11 @@ static const char *startup_source =
 " temp342_1)))"
 "((module-lifts339_0)"
 "(make-module-lift-context"
-" phase_146"
+" phase_148"
 " #t))"
 "((require-lifts340_0)"
 "(make-require-lift-context"
-" phase_146"
+" phase_148"
 "(let-values(((m-ns343_0)"
 " m-ns_19)"
 "((self344_0)"
@@ -72439,7 +72501,7 @@ static const char *startup_source =
 " requires+provides345_0))))"
 "((to-module-lifts341_0)"
 "(let-values(((phase347_0)"
-" phase_146)"
+" phase_148)"
 "((module-ends348_0)"
 " module-ends_0)"
 "((temp349_1)"
@@ -72494,7 +72556,7 @@ static const char *startup_source =
 " the-struct_106)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                                                                                                                                  \"expand-context/inner?\""
+"                                                                                                                                                                                                                                \"expand-context/inner?\""
 " the-struct_106)))))"
 "(expand-context/outer1.1"
 " inner332_0"
@@ -72525,13 +72587,13 @@ static const char *startup_source =
 " the-struct_105)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                                                                                                                \"expand-context/outer?\""
+"                                                                                                                                                                                                              \"expand-context/outer?\""
 " the-struct_105))))))"
 "(let-values(((partially-expanded-bodys_0)"
 "(let-values(((bodys350_0)"
 " bodys_17)"
 "((phase351_0)"
-" phase_146)"
+" phase_148)"
 "((partial-body-ctx352_0)"
 " partial-body-ctx_0)"
 "((m-ns353_0)"
@@ -72579,14 +72641,14 @@ static const char *startup_source =
 " bodys350_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_132)"
+"(let-values(((obs_131)"
 "(expand-context-observer"
 " partial-body-ctx_0)))"
-"(if obs_132"
+"(if obs_131"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_132"
+" obs_131"
 " 'next-group)))"
 "(void)))"
 "(values))))"
@@ -72610,10 +72672,13 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_108)"
 "(let-values(((stops369_0)"
-" empty-free-id-set)"
+"(if keep-stops?_2"
+"(expand-context-stops"
+" ctx_23)"
+" empty-free-id-set))"
 "((to-module-lifts370_0)"
 "(let-values(((phase371_0)"
-" phase_146)"
+" phase_148)"
 "((module-ends372_0)"
 " module-ends_0)"
 "((temp373_0)"
@@ -72675,7 +72740,7 @@ static const char *startup_source =
 " the-struct_108)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                                                                                                                                        \"expand-context/inner?\""
+"                                                                                                                                                                                                                                      \"expand-context/inner?\""
 " the-struct_108)))))"
 "(expand-context/outer1.1"
 " inner368_0"
@@ -72707,12 +72772,12 @@ static const char *startup_source =
 " the-struct_107)))"
 "(raise-argument-error"
 " 'struct-copy"
-"                                                                                                                                                                                                                      \"expand-context/outer?\""
+"                                                                                                                                                                                                                    \"expand-context/outer?\""
 " the-struct_107))))))"
 "(let-values(((partially-expanded-bodys321_0)"
 " partially-expanded-bodys_0)"
 "((phase322_0)"
-" phase_146)"
+" phase_148)"
 "((body-ctx323_0)"
 " body-ctx_6)"
 "((self324_0)"
@@ -72733,10 +72798,12 @@ static const char *startup_source =
 " mpis-to-reset328_0"
 " phase322_0"
 " self324_0"
-" partially-expanded-bodys321_0))))))))))))"
+" partially-expanded-bodys321_0)))))))))))"
 " pass-1-and-2-loop_0)"
 " bodys_16"
-" phase_145)))"
+" phase_147"
+"(stop-at-module*?"
+" ctx_23))))"
 "(let-values((()"
 "(begin"
 "(check-defined-by-now"
@@ -72768,7 +72835,7 @@ static const char *startup_source =
 "((m-ns377_0)"
 " m-ns_19)"
 "((phase378_0)"
-" phase_145)"
+" phase_147)"
 "((self379_0)"
 " self_32)"
 "((ctx380_0)"
@@ -72985,7 +73052,7 @@ static const char *startup_source =
 "((declare-enclosing-module399_0)"
 " declare-enclosing-module_0)"
 "((phase400_0)"
-" phase_145)"
+" phase_147)"
 "((self401_0)"
 " self_32)"
 "((requires+provides402_0)"
@@ -73051,7 +73118,7 @@ static const char *startup_source =
 " mb-result-s_0)))))))))))))))))))))))))))))))))"
 "(let-values(((mb-ctx_0)"
 "(let-values(((v_271)"
-" ctx_112))"
+" ctx_113))"
 "(let-values(((the-struct_110)"
 " v_271))"
 "(if(expand-context/outer?"
@@ -73182,9 +73249,9 @@ static const char *startup_source =
 "((mb-def-ctx-scopes425_0)"
 " mb-def-ctx-scopes_0)"
 "((phase426_0)"
-" phase_145)"
+" phase_147)"
 "((s427_0)"
-" s_805))"
+" s_806))"
 "(ensure-module-begin36.1"
 " mb-ctx424_0"
 " mb-def-ctx-scopes425_0"
@@ -73258,11 +73325,11 @@ static const char *startup_source =
 " self_32"
 " self_32)))"
 "(let-values(((result-form_0)"
-"(if(let-values(((or-part_403)"
+"(if(let-values(((or-part_407)"
 "(expand-context-to-parsed?"
 " init-ctx_0)))"
-"(if or-part_403"
-" or-part_403"
+"(if or-part_407"
+" or-part_407"
 " always-produce-compiled?_0))"
 "(parsed-module25.1"
 " rebuild-s_14"
@@ -73308,7 +73375,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_426)))"
-"((letrec-values(((for-loop_329)"
+"((letrec-values(((for-loop_328)"
 "(lambda(lst_302)"
 "(begin"
 " 'for-loop"
@@ -73332,11 +73399,11 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_329"
+"(for-loop_328"
 " rest_252)"
 "(values))))"
 "(values))))))"
-" for-loop_329)"
+" for-loop_328)"
 " lst_426)))"
 "(void)"
 "(let-values(((result-s_15)"
@@ -73381,14 +73448,14 @@ static const char *startup_source =
 " #t)"
 " result-s_17)))"
 "(begin"
-"(let-values(((obs_133)"
+"(let-values(((obs_132)"
 "(expand-context-observer"
 " init-ctx_0)))"
-"(if obs_133"
+"(if obs_132"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_133"
+" obs_132"
 " 'rename-one"
 " result-s_18)))"
 "(void)))"
@@ -73414,16 +73481,16 @@ static const char *startup_source =
 "(let-values(((module-name-sym_1) module-name-sym21_0))"
 "(let-values(((scopes-s_0) scopes-s22_0))"
 "(let-values()"
-"(let-values(((ctx_114) ctx24_0))"
+"(let-values(((ctx_115) ctx24_0))"
 "(let-values(((def-ctx-scopes_9) def-ctx-scopes25_0))"
-"(let-values(((phase_147) phase26_3))"
+"(let-values(((phase_149) phase26_3))"
 "(let-values(((s_385) s27_2))"
 "(let-values()"
 "(let-values(((make-mb-ctx_0)"
 "(lambda()"
 "(begin"
 " 'make-mb-ctx"
-"(let-values(((v_273) ctx_114))"
+"(let-values(((v_273) ctx_115))"
 "(let-values(((the-struct_113) v_273))"
 "(if(expand-context/outer? the-struct_113)"
 "(let-values(((context437_0) 'module-begin)"
@@ -73454,15 +73521,15 @@ static const char *startup_source =
 "(if(= 1(length bodys_18))"
 "(let-values()"
 "(begin"
-"(let-values(((obs_134)(expand-context-observer ctx_114)))"
-"(if obs_134"
+"(let-values(((obs_133)(expand-context-observer ctx_115)))"
+"(if obs_133"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_134 'rename-one(car bodys_18))))"
+"(call-expand-observe obs_133 'rename-one(car bodys_18))))"
 "(void)))"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_147))"
+"(core-form-sym(syntax-disarm$1(car bodys_18)) phase_149))"
 "(let-values()(car bodys_18))"
 "(let-values()"
 "(let-values(((partly-expanded-body_0)"
@@ -73477,13 +73544,13 @@ static const char *startup_source =
 " '#%module-begin"
 "(core-form-sym"
 "(syntax-disarm$1 partly-expanded-body_0)"
-" phase_147))"
+" phase_149))"
 "(let-values() partly-expanded-body_0)"
 "(let-values()"
 "(let-values(((temp443_0)(list partly-expanded-body_0))"
 "((s444_0) s_385)"
 "((scopes-s445_0) scopes-s_0)"
-"((phase446_0) phase_147)"
+"((phase446_0) phase_149)"
 "((module-name-sym447_0) module-name-sym_1)"
 "((temp448_1)(make-mb-ctx_0))"
 "((temp449_1) #f))"
@@ -73499,7 +73566,7 @@ static const char *startup_source =
 "(let-values(((bodys450_0) bodys_18)"
 "((s451_0) s_385)"
 "((scopes-s452_0) scopes-s_0)"
-"((phase453_0) phase_147)"
+"((phase453_0) phase_149)"
 "((module-name-sym454_0) module-name-sym_1)"
 "((temp455_0)(make-mb-ctx_0)))"
 "(add-module-begin47.1"
@@ -73519,7 +73586,7 @@ static const char *startup_source =
 "(let-values(((bodys_19) bodys41_0))"
 "(let-values(((s_193) s42_0))"
 "(let-values(((scopes-s_1) scopes-s43_0))"
-"(let-values(((phase_148) phase44_0))"
+"(let-values(((phase_150) phase44_0))"
 "(let-values(((module-name-sym_2) module-name-sym45_0))"
 "(let-values(((mb-ctx_1) mb-ctx46_0))"
 "(let-values(((log-rename-one?_0) log-rename-one?39_0))"
@@ -73528,7 +73595,7 @@ static const char *startup_source =
 "(let-values(((mb-id_0)(datum->syntax$1 disarmed-scopes-s_0 '#%module-begin)))"
 "(let-values((()"
 "(begin"
-"(if(let-values(((mb-id456_0) mb-id_0)((phase457_0) phase_148))"
+"(if(let-values(((mb-id456_0) mb-id_0)((phase457_0) phase_150))"
 "(resolve40.1 #f #f null #f mb-id456_0 phase457_0))"
 "(void)"
 "(let-values()"
@@ -73541,21 +73608,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_135)(expand-context-observer mb-ctx_1)))"
-"(if obs_135"
+"(let-values(((obs_134)(expand-context-observer mb-ctx_1)))"
+"(if obs_134"
 "(let-values()"
-"(let-values()(call-expand-observe obs_135 'tag mb_2)))"
+"(let-values()(call-expand-observe obs_134 'tag mb_2)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
 "(if log-rename-one?_0"
 "(let-values()"
-"(let-values(((obs_136)(expand-context-observer mb-ctx_1)))"
-"(if obs_136"
+"(let-values(((obs_135)(expand-context-observer mb-ctx_1)))"
+"(if obs_135"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_136 'rename-one mb_2)))"
+"(call-expand-observe obs_135 'rename-one mb_2)))"
 "(void))))"
 "(void))"
 "(values))))"
@@ -73568,7 +73635,7 @@ static const char *startup_source =
 "(begin"
 "(if(eq?"
 " '#%module-begin"
-"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_148))"
+"(core-form-sym(syntax-disarm$1 partly-expanded-mb_0) phase_150))"
 "(void)"
 "(let-values()"
 "(raise-syntax-error$1"
@@ -73644,7 +73711,7 @@ static const char *startup_source =
 "(begin"
 " 'partially-expand-bodys81"
 "(let-values(((bodys_20) bodys80_0))"
-"(let-values(((phase_107) phase50_0))"
+"(let-values(((phase_108) phase50_0))"
 "(let-values(((partial-body-ctx_1) ctx51_0))"
 "(let-values(((m-ns_20) namespace52_0))"
 "(let-values(((self_34) self53_0))"
@@ -73661,14 +73728,14 @@ static const char *startup_source =
 "(let-values(((pass-1-and-2-loop_1) loop64_0))"
 "(let-values()"
 "(begin"
-"(namespace-visit-available-modules! m-ns_20 phase_107)"
+"(namespace-visit-available-modules! m-ns_20 phase_108)"
 "((letrec-values(((loop_124)"
 "(lambda(tail?_53 bodys_21)"
 "(begin"
 " 'loop"
 "(if(null? bodys_21)"
 "(let-values()"
-"(if(if tail?_53(not(zero? phase_107)) #f)"
+"(if(if tail?_53(not(zero? phase_108)) #f)"
 "(let-values()"
 "(begin"
 "(let-values(((obs_93)"
@@ -73694,14 +73761,14 @@ static const char *startup_source =
 "(expand-context-to-module-lifts"
 " partial-body-ctx_1)))))"
 "(begin"
-"(let-values(((obs_137)"
+"(let-values(((obs_136)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_137"
+"(if obs_136"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_137"
+" obs_136"
 " 'module-lift-end-loop"
 " bodys_22)))"
 "(void)))"
@@ -73718,14 +73785,14 @@ static const char *startup_source =
 "(let-values(((rest-bodys_1)(cdr bodys_21)))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_138)"
+"(let-values(((obs_137)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_138"
+"(if obs_137"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_138"
+" obs_137"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -73756,14 +73823,14 @@ static const char *startup_source =
 " exp-body_7"
 " rest-bodys_1))"
 "(void))"
-"(let-values(((obs_139)"
+"(let-values(((obs_138)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_139"
+"(if obs_138"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_139"
+" obs_138"
 " 'rename-one"
 " exp-body_7)))"
 "(void)))"
@@ -73774,7 +73841,7 @@ static const char *startup_source =
 "(let-values(((tmp_23)"
 "(core-form-sym"
 " disarmed-exp-body_1"
-" phase_107)))"
+" phase_108)))"
 "(if(equal?"
 " tmp_23"
 " 'begin)"
@@ -73848,14 +73915,14 @@ static const char *startup_source =
 " e470_0)"
 " rest-bodys_1)))"
 "(begin"
-"(let-values(((obs_140)"
+"(let-values(((obs_139)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_140"
+"(if obs_139"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_140"
+" obs_139"
 " 'splice"
 " spliced-bodys_0)))"
 "(void)))"
@@ -73868,22 +73935,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_141)"
+"(let-values(((obs_140)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_141"
+"(if obs_140"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_141"
+" obs_140"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_141"
+" obs_140"
 " 'prim-begin-for-syntax)"
 "(call-expand-observe"
-" obs_141"
+" obs_140"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -73891,7 +73958,7 @@ static const char *startup_source =
 "(namespace->namespace-at-phase"
 " m-ns_20"
 "(add1"
-" phase_107))))"
+" phase_108))))"
 "(let-values((()"
 "(begin"
 "(prepare-next-phase-namespace"
@@ -73899,14 +73966,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_142)"
+"(let-values(((obs_141)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_142"
+"(if obs_141"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_142"
+" obs_141"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -73969,8 +74036,33 @@ static const char *startup_source =
 "(pass-1-and-2-loop_1"
 " e474_0"
 "(add1"
-" phase_107))))"
+" phase_108)"
+" #f)))"
 "(begin"
+"(let-values(((obs_142)"
+"(expand-context-observer"
+" partial-body-ctx_1)))"
+"(if obs_142"
+"(let-values()"
+"(let-values()"
+"(call-expand-observe"
+" obs_142"
+" 'next-group)))"
+"(void)))"
+"(namespace-run-available-modules!"
+" m-ns_20"
+"(add1"
+" phase_108))"
+"(eval-nested-bodys"
+" nested-bodys_1"
+"(add1"
+" phase_108)"
+" ct-m-ns_0"
+" self_34"
+" partial-body-ctx_1)"
+"(namespace-visit-available-modules!"
+" m-ns_20"
+" phase_108)"
 "(let-values(((obs_143)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
@@ -73979,30 +74071,6 @@ static const char *startup_source =
 "(let-values()"
 "(call-expand-observe"
 " obs_143"
-" 'next-group)))"
-"(void)))"
-"(namespace-run-available-modules!"
-" m-ns_20"
-"(add1"
-" phase_107))"
-"(eval-nested-bodys"
-" nested-bodys_1"
-"(add1"
-" phase_107)"
-" ct-m-ns_0"
-" self_34"
-" partial-body-ctx_1)"
-"(namespace-visit-available-modules!"
-" m-ns_20"
-" phase_107)"
-"(let-values(((obs_144)"
-"(expand-context-observer"
-" partial-body-ctx_1)))"
-"(if obs_144"
-"(let-values()"
-"(let-values()"
-"(call-expand-observe"
-" obs_144"
 " 'exit-prim"
 "(let-values(((s-nested-bodys_0)"
 "(reverse$1"
@@ -74015,7 +74083,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_427)))"
-"((letrec-values(((for-loop_330)"
+"((letrec-values(((for-loop_329)"
 "(lambda(fold-var_357"
 " lst_388)"
 "(begin"
@@ -74042,12 +74110,12 @@ static const char *startup_source =
 " fold-var_378)))))"
 "(if(not"
 " #f)"
-"(for-loop_330"
+"(for-loop_329"
 " fold-var_376"
 " rest_253)"
 " fold-var_376)))"
 " fold-var_357)))))"
-" for-loop_330)"
+" for-loop_329)"
 " null"
 " lst_427))))))"
 "(datum->syntax$1"
@@ -74070,19 +74138,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_145)"
+"(let-values(((obs_144)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_145"
+"(if obs_144"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_145"
+" obs_144"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_145"
+" obs_144"
 " 'prim-define-values))))"
 "(void)))"
 "(values))))"
@@ -74154,7 +74222,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_428)))"
-"((letrec-values(((for-loop_331)"
+"((letrec-values(((for-loop_330)"
 "(lambda(id_147"
 " lst_71)"
 "(begin"
@@ -74174,15 +74242,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id496_0)"
 "(let-values()"
-"(if(let-values(((or-part_404)"
+"(if(let-values(((or-part_408)"
 "(if(syntax?$1"
 " s_829)"
 "(symbol?"
 "(syntax-e$1"
 " s_829))"
 " #f)))"
-"(if or-part_404"
-" or-part_404"
+"(if or-part_408"
+" or-part_408"
 "(symbol?"
 " s_829)))"
 " s_829"
@@ -74198,12 +74266,12 @@ static const char *startup_source =
 " id_150)))))"
 "(if(not"
 " #f)"
-"(for-loop_331"
+"(for-loop_330"
 " id_148"
 " rest_254)"
 " id_148)))"
 " id_147)))))"
-" for-loop_331)"
+" for-loop_330)"
 " null"
 " lst_428)))))"
 "(reverse$1"
@@ -74277,7 +74345,7 @@ static const char *startup_source =
 "(let-values(((ids486_0)"
 " ids_44)"
 "((phase487_0)"
-" phase_107)"
+" phase_108)"
 "((exp-body488_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids7.1"
@@ -74292,7 +74360,7 @@ static const char *startup_source =
 "(let-values(((ids489_0)"
 " ids_44)"
 "((phase490_0)"
-" phase_107)"
+" phase_108)"
 "((requires+provides491_0)"
 " requires+provides_7)"
 "((exp-body492_0)"
@@ -74311,7 +74379,7 @@ static const char *startup_source =
 "((self499_0)"
 " self_34)"
 "((phase500_0)"
-" phase_107)"
+" phase_108)"
 "((all-scopes-stx501_0)"
 " all-scopes-stx_5)"
 "((frame-id502_0)"
@@ -74341,7 +74409,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_429)))"
-"((letrec-values(((for-loop_332)"
+"((letrec-values(((for-loop_331)"
 "(lambda(lst_430)"
 "(begin"
 " 'for-loop"
@@ -74361,17 +74429,17 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-unset-transformer!"
 " m-ns_20"
-" phase_107"
+" phase_108"
 " sym_110))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_332"
+"(for-loop_331"
 " rest_255)"
 "(values))))"
 "(values))))))"
-" for-loop_332)"
+" for-loop_331)"
 " lst_429)))"
 "(void)"
 "(let-values(((requires+provides493_0)"
@@ -74379,20 +74447,20 @@ static const char *startup_source =
 "((syms494_0)"
 " syms_23)"
 "((phase495_0)"
-" phase_107))"
+" phase_108))"
 "(add-defined-syms!103.1"
 " #f"
 " requires+provides493_0"
 " syms494_0"
 " phase495_0))"
-"(let-values(((obs_146)"
+"(let-values(((obs_145)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_146"
+"(if obs_145"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_146"
+" obs_145"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
@@ -74417,22 +74485,22 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_147)"
+"(let-values(((obs_146)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_147"
+"(if obs_146"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_147"
+" obs_146"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_147"
+" obs_146"
 " 'prim-define-syntaxes)"
 "(call-expand-observe"
-" obs_147"
+" obs_146"
 " 'prepare-env))))"
 "(void)))"
 "(values))))"
@@ -74443,14 +74511,14 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_148)"
+"(let-values(((obs_147)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_148"
+"(if obs_147"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_148"
+" obs_147"
 " 'phase-up)))"
 "(void)))"
 "(values))))"
@@ -74522,7 +74590,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_431)))"
-"((letrec-values(((for-loop_333)"
+"((letrec-values(((for-loop_332)"
 "(lambda(id_152"
 " lst_432)"
 "(begin"
@@ -74542,15 +74610,15 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((id525_0)"
 "(let-values()"
-"(if(let-values(((or-part_405)"
+"(if(let-values(((or-part_409)"
 "(if(syntax?$1"
 " s_842)"
 "(symbol?"
 "(syntax-e$1"
 " s_842))"
 " #f)))"
-"(if or-part_405"
-" or-part_405"
+"(if or-part_409"
+" or-part_409"
 "(symbol?"
 " s_842)))"
 " s_842"
@@ -74566,12 +74634,12 @@ static const char *startup_source =
 " id_155)))))"
 "(if(not"
 " #f)"
-"(for-loop_333"
+"(for-loop_332"
 " id_153"
 " rest_256)"
 " id_153)))"
 " id_152)))))"
-" for-loop_333)"
+" for-loop_332)"
 " null"
 " lst_431)))))"
 "(reverse$1"
@@ -74645,7 +74713,7 @@ static const char *startup_source =
 "(let-values(((ids514_0)"
 " ids_45)"
 "((phase515_0)"
-" phase_107)"
+" phase_108)"
 "((exp-body516_0)"
 " exp-body_7))"
 "(check-no-duplicate-ids7.1"
@@ -74660,7 +74728,7 @@ static const char *startup_source =
 "(let-values(((ids517_0)"
 " ids_45)"
 "((phase518_0)"
-" phase_107)"
+" phase_108)"
 "((requires+provides519_0)"
 " requires+provides_7)"
 "((exp-body520_0)"
@@ -74679,7 +74747,7 @@ static const char *startup_source =
 "((self528_0)"
 " self_34)"
 "((phase529_0)"
-" phase_107)"
+" phase_108)"
 "((all-scopes-stx530_0)"
 " all-scopes-stx_5)"
 "((frame-id531_0)"
@@ -74708,7 +74776,7 @@ static const char *startup_source =
 "((syms522_0)"
 " syms_24)"
 "((phase523_0)"
-" phase_107)"
+" phase_108)"
 "((temp524_0)"
 " #t))"
 "(add-defined-syms!103.1"
@@ -74869,7 +74937,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_435)))"
-"((letrec-values(((for-loop_334)"
+"((letrec-values(((for-loop_333)"
 "(lambda(lst_436"
 " lst_437"
 " lst_438)"
@@ -74911,24 +74979,24 @@ static const char *startup_source =
 "(maybe-install-free=id-in-context!"
 " val_87"
 " id_156"
-" phase_107"
+" phase_108"
 " partial-body-ctx_1)"
 "(namespace-set-transformer!"
 " m-ns_20"
-" phase_107"
+" phase_108"
 " sym_111"
 " val_87)))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_334"
+"(for-loop_333"
 " rest_257"
 " rest_258"
 " rest_259)"
 "(values))))"
 "(values))))))"
-" for-loop_334)"
+" for-loop_333)"
 " lst_433"
 " lst_434"
 " lst_435)))"
@@ -74936,14 +75004,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_149)"
+"(let-values(((obs_148)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_149"
+"(if obs_148"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_149"
+" obs_148"
 " 'exit-prim"
 "(datum->syntax$1"
 " #f"
@@ -74986,19 +75054,19 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_150)"
+"(let-values(((obs_149)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_150"
+"(if obs_149"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_150"
+" obs_149"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_150"
+" obs_149"
 " 'prim-require))))"
 "(void)))"
 "(values))))"
@@ -75071,9 +75139,9 @@ static const char *startup_source =
 "((m-ns554_0)"
 " m-ns_20)"
 "((phase555_0)"
-" phase_107)"
+" phase_108)"
 "((phase556_0)"
-" phase_107)"
+" phase_108)"
 "((requires+provides557_0)"
 " requires+provides_7)"
 "((declared-submodule-names558_0)"
@@ -75096,14 +75164,14 @@ static const char *startup_source =
 " m-ns554_0"
 " phase555_0"
 " requires+provides557_0))"
-"(let-values(((obs_151)"
+"(let-values(((obs_150)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_151"
+"(if obs_150"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_151"
+" obs_150"
 " 'exit-prim"
 " ready-body_0)))"
 "(void)))"
@@ -75169,22 +75237,22 @@ static const char *startup_source =
 " 'module*)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_152)"
+"(let-values(((obs_151)"
 "(expand-context-observer"
 " partial-body-ctx_1)))"
-"(if obs_152"
+"(if obs_151"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_152"
+" obs_151"
 " 'enter-prim"
 " exp-body_7)"
 "(call-expand-observe"
-" obs_152"
+" obs_151"
 " 'prim-submodule*)"
 "(call-expand-observe"
-" obs_152"
+" obs_151"
 " 'exit-prim"
 " exp-body_7))))"
 "(void)))"
@@ -75263,7 +75331,7 @@ static const char *startup_source =
 "(let-values()"
 "(check-list"
 " lst_439)))"
-"((letrec-values(((for-loop_335)"
+"((letrec-values(((for-loop_334)"
 "(lambda(lst_440)"
 "(begin"
 " 'for-loop"
@@ -75325,11 +75393,11 @@ static const char *startup_source =
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_335"
+"(for-loop_334"
 " rest_260)"
 "(values))))"
 "(values))))))"
-" for-loop_335)"
+" for-loop_334)"
 " lst_439)))"
 "(values))))"
 "(let-values()"
@@ -75377,7 +75445,7 @@ static const char *startup_source =
 "(make-wrap-as-definition)"
 "(lambda(self_35 frame-id_18 inside-scope_2 all-scopes-stx_6 defined-syms_13 requires+provides_8)"
 "(begin"
-"(lambda(ids_46 rhs_23 phase_149)"
+"(lambda(ids_46 rhs_23 phase_151)"
 "(let-values(((scoped-ids_0)"
 "(reverse$1"
 "(let-values(((lst_441) ids_46))"
@@ -75385,7 +75453,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_441)))"
-"((letrec-values(((for-loop_336)"
+"((letrec-values(((for-loop_335)"
 "(lambda(fold-var_379 lst_442)"
 "(begin"
 " 'for-loop"
@@ -75403,16 +75471,16 @@ static const char *startup_source =
 " inside-scope_2))"
 " fold-var_381))))"
 "(values fold-var_382)))))"
-"(if(not #f)(for-loop_336 fold-var_380 rest_261) fold-var_380)))"
+"(if(not #f)(for-loop_335 fold-var_380 rest_261) fold-var_380)))"
 " fold-var_379)))))"
-" for-loop_336)"
+" for-loop_335)"
 " null"
 " lst_441))))))"
 "(let-values(((syms_25)"
 "(let-values(((scoped-ids572_0) scoped-ids_0)"
 "((defined-syms573_0) defined-syms_13)"
 "((self574_0) self_35)"
-"((phase575_0) phase_149)"
+"((phase575_0) phase_151)"
 "((all-scopes-stx576_0) all-scopes-stx_6)"
 "((frame-id577_0) frame-id_18)"
 "((requires+provides578_0) requires+provides_8))"
@@ -75432,22 +75500,22 @@ static const char *startup_source =
 "(datum->syntax$1"
 " #f"
 "(list"
-"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_149) 'define-values)"
+"(datum->syntax$1(syntax-shift-phase-level$1 core-stx phase_151) 'define-values)"
 " scoped-ids_0"
 " rhs_23))"
 " inside-scope_2)))"
 "(values scoped-ids_0(semi-parsed-define-values2.1 s_855 syms_25 scoped-ids_0 rhs_23)))))))))"
 "(define-values"
 "(add-post-expansion-scope)"
-"(lambda(bodys_23 ctx_115)"
+"(lambda(bodys_23 ctx_116)"
 "(begin"
-"(let-values(((pe_3)(root-expand-context-post-expansion ctx_115)))"
+"(let-values(((pe_3)(root-expand-context-post-expansion ctx_116)))"
 "(if pe_3"
 "(reverse$1"
 "(let-values(((lst_443) bodys_23))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_443)))"
-"((letrec-values(((for-loop_337)"
+"((letrec-values(((for-loop_336)"
 "(lambda(fold-var_383 lst_444)"
 "(begin"
 " 'for-loop"
@@ -75462,9 +75530,9 @@ static const char *startup_source =
 "(apply-post-expansion pe_3 body_21))"
 " fold-var_385))))"
 "(values fold-var_386)))))"
-"(if(not #f)(for-loop_337 fold-var_384 rest_262) fold-var_384)))"
+"(if(not #f)(for-loop_336 fold-var_384 rest_262) fold-var_384)))"
 " fold-var_383)))))"
-" for-loop_337)"
+" for-loop_336)"
 " null"
 " lst_443))))"
 " bodys_23)))))"
@@ -75481,7 +75549,7 @@ static const char *startup_source =
 "(begin"
 " 'finish-expanding-body-expressons99"
 "(let-values(((partially-expanded-bodys_1) partially-expanded-bodys98_0))"
-"(let-values(((phase_150) phase84_0))"
+"(let-values(((phase_152) phase84_0))"
 "(let-values(((body-ctx_7) ctx85_0))"
 "(let-values(((self_36) self86_0))"
 "(let-values(((declared-submodule-names_5) declared-submodule-names87_0))"
@@ -75495,15 +75563,15 @@ static const char *startup_source =
 " 'loop"
 "(if(null? bodys_24)"
 "(let-values()"
-"(if(if tail?_54(not(zero? phase_150)) #f)"
+"(if(if tail?_54(not(zero? phase_152)) #f)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_153)(expand-context-observer body-ctx_7)))"
-"(if obs_153"
+"(let-values(((obs_152)(expand-context-observer body-ctx_7)))"
+"(if obs_152"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_153"
+" obs_152"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75519,13 +75587,13 @@ static const char *startup_source =
 "(if(null? bodys_25)"
 "(let-values()"
 "(begin"
-"(let-values(((obs_154)"
+"(let-values(((obs_153)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_154"
+"(if obs_153"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_154"
+" obs_153"
 " 'module-lift-end-loop"
 " '())))"
 "(void)))"
@@ -75538,25 +75606,25 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_155)"
+"(let-values(((obs_154)"
 "(expand-context-observer body-ctx_7)))"
-"(if obs_155"
+"(if obs_154"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_155 'next)))"
+"(call-expand-observe obs_154 '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_406)"
+"(if(let-values(((or-part_410)"
 "(parsed? body_22)))"
-"(if or-part_406"
-" or-part_406"
-"(let-values(((or-part_407)"
+"(if or-part_410"
+" or-part_410"
+"(let-values(((or-part_411)"
 "(expanded+parsed? body_22)))"
-"(if or-part_407"
-" or-part_407"
+"(if or-part_411"
+" or-part_411"
 "(semi-parsed-begin-for-syntax?"
 " body_22)))))"
 "(let-values() body_22)"
@@ -75769,7 +75837,7 @@ static const char *startup_source =
 "(let-values(((tmp_64)"
 "(core-form-sym"
 " disarmed-body_0"
-" phase_150)))"
+" phase_152)))"
 "(if(if(equal? tmp_64 '#%require)"
 " #t"
 "(if(equal? tmp_64 '#%provide)"
@@ -75826,14 +75894,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_156)"
+"(let-values(((obs_155)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_156"
+"(if obs_155"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_156"
+" obs_155"
 " 'module-lift-loop"
 "(append"
 " lifted-requires_0"
@@ -75847,7 +75915,7 @@ static const char *startup_source =
 "(let-values(((exp-lifted-modules_0)"
 "(let-values(((lifted-modules601_0)"
 " lifted-modules_0)"
-"((phase602_0) phase_150)"
+"((phase602_0) phase_152)"
 "((self603_0) self_36)"
 "((body-ctx604_0)"
 " body-ctx_7)"
@@ -75874,14 +75942,14 @@ static const char *startup_source =
 "(if no-lifts?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_157)"
+"(let-values(((obs_156)"
 "(expand-context-observer"
 " body-ctx_7)))"
-"(if obs_157"
+"(if obs_156"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_157"
+" obs_156"
 " 'next)))"
 "(void)))))"
 "(append"
@@ -75898,18 +75966,18 @@ static const char *startup_source =
 " partially-expanded-bodys_1)))))))))))))"
 "(define-values"
 "(check-defined-by-now)"
-"(lambda(need-eventually-defined_3 self_37 ctx_116 requires+provides_9)"
+"(lambda(need-eventually-defined_3 self_37 ctx_117 requires+provides_9)"
 "(begin"
 "(begin"
 "(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_338)"
+"((letrec-values(((for-loop_337)"
 "(lambda(i_186)"
 "(begin"
 " 'for-loop"
 "(if i_186"
-"(let-values(((phase_151 l_89)(hash-iterate-key+value ht_166 i_186)))"
+"(let-values(((phase_153 l_89)(hash-iterate-key+value ht_166 i_186)))"
 "(let-values((()"
 "(let-values()"
 "(let-values((()"
@@ -75923,7 +75991,7 @@ static const char *startup_source =
 "(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_445)))"
-"((letrec-values(((for-loop_339)"
+"((letrec-values(((for-loop_338)"
 "(lambda(lst_446)"
 "(begin"
 " 'for-loop"
@@ -75945,7 +76013,7 @@ static const char *startup_source =
 "(let-values(((id609_0)"
 " id_158)"
 "((phase610_0)"
-" phase_151))"
+" phase_153))"
 "(resolve+shift28.1"
 " #f"
 " #f"
@@ -75976,7 +76044,7 @@ static const char *startup_source =
 " requires+provides_9"
 "(module-binding-sym"
 " b_96)"
-" phase_151)"
+" phase_153)"
 " #f)))"
 "(if(eq?"
 " bound-kind_0"
@@ -76000,35 +76068,35 @@ static const char *startup_source =
 "(format"
 "                                                                                                                                                           \"\\n  at phase: ~a\""
 "(let-values(((tmp_65)"
-" phase_151))"
+" phase_153))"
 "(if(equal?"
 " tmp_65"
 " 1)"
 "(let-values()"
 "                                                                                                                                                                 \"1; the transformer environment\")"
 "(let-values()"
-" phase_151)))))"
+" phase_153)))))"
 " id_158"
 " #f"
 " null"
 "(syntax-debug-info-string"
 " id_158"
-" ctx_116))))))))"
+" ctx_117))))))))"
 "(values)))))"
 "(values)))))"
 "(if(not #f)"
-"(for-loop_339"
+"(for-loop_338"
 " rest_263)"
 "(values))))"
 "(values))))))"
-" for-loop_339)"
+" for-loop_338)"
 " lst_445)))"
 "(void)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_338(hash-iterate-next ht_166 i_186))(values))))"
+"(if(not #f)(for-loop_337(hash-iterate-next ht_166 i_186))(values))))"
 "(values))))))"
-" for-loop_338)"
+" for-loop_337)"
 "(hash-iterate-first ht_166))))"
 "(void)))))"
 "(define-values"
@@ -76046,27 +76114,27 @@ static const char *startup_source =
 "(let-values(((requires+provides_10) requires-and-provides102_0))"
 "(let-values(((declared-submodule-names_6) declared-submodule-names103_0))"
 "(let-values(((m-ns_21) namespace104_0))"
-"(let-values(((phase_152) phase105_0))"
+"(let-values(((phase_154) phase105_0))"
 "(let-values(((self_38) self106_0))"
-"(let-values(((ctx_117) ctx107_1))"
+"(let-values(((ctx_118) ctx107_1))"
 "(let-values()"
 "(let-values()"
 "((letrec-values(((loop_126)"
-"(lambda(bodys_26 phase_153)"
+"(lambda(bodys_26 phase_155)"
 "(begin"
 " 'loop"
 "(if(null? bodys_26)"
 "(let-values() null)"
-"(if(let-values(((or-part_408)(parsed?(car bodys_26))))"
-"(if or-part_408 or-part_408(expanded+parsed?(car bodys_26))))"
+"(if(let-values(((or-part_412)(parsed?(car bodys_26))))"
+"(if or-part_412 or-part_412(expanded+parsed?(car bodys_26))))"
 "(let-values()"
-"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_153)))"
+"(cons(car bodys_26)(loop_126(cdr bodys_26) phase_155)))"
 "(if(semi-parsed-begin-for-syntax?(car bodys_26))"
 "(let-values()"
 "(let-values(((nested-bodys_2)"
 "(loop_126"
 "(semi-parsed-begin-for-syntax-body(car bodys_26))"
-"(add1 phase_153))))"
+"(add1 phase_155))))"
 "(cons"
 "(let-values(((the-struct_116)(car bodys_26)))"
 "(if(semi-parsed-begin-for-syntax? the-struct_116)"
@@ -76078,28 +76146,28 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                              \"semi-parsed-begin-for-syntax?\""
 " the-struct_116)))"
-"(loop_126(cdr bodys_26) phase_153))))"
+"(loop_126(cdr bodys_26) phase_155))))"
 "(let-values()"
 "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_26))))"
 "(let-values(((tmp_66)"
-"(core-form-sym disarmed-body_1 phase_153)))"
+"(core-form-sym disarmed-body_1 phase_155)))"
 "(if(equal? tmp_66 '#%provide)"
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_158)"
+"(let-values(((obs_157)"
 "(expand-context-observer"
-" ctx_117)))"
-"(if obs_158"
+" ctx_118)))"
+"(if obs_157"
 "(let-values()"
 "(let-values()"
 "(begin"
 "(call-expand-observe"
-" obs_158"
+" obs_157"
 " 'enter-prim"
 "(car bodys_26))"
 "(call-expand-observe"
-" obs_158"
+" obs_157"
 " 'prim-provide))))"
 "(void)))"
 "(values))))"
@@ -76159,8 +76227,8 @@ static const char *startup_source =
 "(car bodys_26)"
 " requires+provides_10"
 " self_38"
-" phase_153"
-"(let-values(((v_275) ctx_117))"
+" phase_155"
+"(let-values(((v_275) ctx_118))"
 "(let-values(((the-struct_117)"
 " v_275))"
 "(if(expand-context/outer?"
@@ -76174,11 +76242,11 @@ static const char *startup_source =
 "(if(expand-context/inner?"
 " the-struct_118)"
 "(let-values(((phase618_0)"
-" phase_153)"
+" phase_155)"
 "((namespace619_0)"
 "(namespace->namespace-at-phase"
 " m-ns_21"
-" phase_153))"
+" phase_155))"
 "((requires+provides620_0)"
 " requires+provides_10)"
 "((declared-submodule-names621_0)"
@@ -76269,9 +76337,9 @@ static const char *startup_source =
 " 'struct-copy"
 "                                                                                        \"expand-context/outer?\""
 " the-struct_117)))))))"
-"(if(expand-context-to-parsed? ctx_117)"
+"(if(expand-context-to-parsed? ctx_118)"
 "(let-values()"
-"(loop_126(cdr bodys_26) phase_153))"
+"(loop_126(cdr bodys_26) phase_155))"
 "(let-values()"
 "(let-values(((new-s_10)"
 "(syntax-track-origin*"
@@ -76287,14 +76355,14 @@ static const char *startup_source =
 " temp622_0"
 " temp623_0)))))"
 "(begin"
-"(let-values(((obs_159)"
+"(let-values(((obs_158)"
 "(expand-context-observer"
-" ctx_117)))"
-"(if obs_159"
+" ctx_118)))"
+"(if obs_158"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_159"
+" obs_158"
 " 'exit-prim"
 " new-s_10)))"
 "(void)))"
@@ -76302,14 +76370,14 @@ static const char *startup_source =
 " new-s_10"
 "(loop_126"
 "(cdr bodys_26)"
-" phase_153))))))))))"
+" phase_155))))))))))"
 "(let-values()"
 "(cons"
 "(car bodys_26)"
-"(loop_126(cdr bodys_26) phase_153))))))))))))))"
+"(loop_126(cdr bodys_26) phase_155))))))))))))))"
 " loop_126)"
 " expression-expanded-bodys_1"
-" phase_152)))))))))))))"
+" phase_154)))))))))))))"
 "(define-values"
 "(declare-module-for-expansion139.1)"
 "(lambda(ctx125_0"
@@ -76333,7 +76401,7 @@ static const char *startup_source =
 "(let-values(((self_39) self122_0))"
 "(let-values(((enclosing-self_3) enclosing123_0))"
 "(let-values(((root-ctx_7) root-ctx124_0))"
-"(let-values(((ctx_118) ctx125_0))"
+"(let-values(((ctx_119) ctx125_0))"
 "(let-values(((modules-being-compiled_6) modules-being-compiled126_0))"
 "(let-values(((compiled-module-box_1) fill127_0))"
 "(let-values()"
@@ -76354,8 +76422,8 @@ static const char *startup_source =
 "(hasheq))))"
 "(let-values(((module-name_2)"
 "(1/module-path-index-resolve"
-"(let-values(((or-part_409) enclosing-self_3))"
-"(if or-part_409 or-part_409 self_39)))))"
+"(let-values(((or-part_413) enclosing-self_3))"
+"(if or-part_413 or-part_413 self_39)))))"
 "(let-values(((compiled-module_0)"
 "(let-values(((parsed-mod624_0) parsed-mod_0)"
 "((temp625_0)"
@@ -76373,7 +76441,7 @@ static const char *startup_source =
 " m-ns629_0"
 " unsafe-undefined"
 " unsafe-undefined)))"
-"((temp626_0)(expand-context-for-serializable? ctx_118))"
+"((temp626_0)(expand-context-for-serializable? ctx_119))"
 "((modules-being-compiled627_0) modules-being-compiled_6)"
 "((temp628_0) #f))"
 "(compile-module13.1"
@@ -76435,7 +76503,7 @@ static const char *startup_source =
 " 'expand-post-submodules165"
 "(let-values(((fully-expanded-bodys-except-post-submodules_2) fully-expanded-bodys-except-post-submodules164_0))"
 "(let-values(((declare-enclosing-module_1) declare-enclosing142_0))"
-"(let-values(((phase_154) phase143_0))"
+"(let-values(((phase_156) phase143_0))"
 "(let-values(((self_40) self144_0))"
 "(let-values(((requires+provides_12) requires-and-provides145_0))"
 "(let-values(((enclosing-is-cross-phase-persistent?_1) enclosing-is-cross-phase-persistent?146_0))"
@@ -76447,7 +76515,7 @@ static const char *startup_source =
 "(let-values(((submod-ctx_1) ctx152_0))"
 "(let-values()"
 "((letrec-values(((loop_127)"
-"(lambda(bodys_27 phase_155)"
+"(lambda(bodys_27 phase_157)"
 "(begin"
 " 'loop"
 "(if(null? bodys_27)"
@@ -76527,7 +76595,7 @@ static const char *startup_source =
 "(loop_127"
 "(semi-parsed-begin-for-syntax-body"
 " body_23)"
-"(add1 phase_155))))"
+"(add1 phase_157))))"
 "(let-values(((parsed-bfs_0)"
 "(parsed-begin-for-syntax21.1"
 " rebuild-body-s_0"
@@ -76549,20 +76617,20 @@ static const char *startup_source =
 " rebuild-body-s640_0"
 " temp641_0))"
 " parsed-bfs_0))"
-"(loop_127 rest-bodys_3 phase_155))))))))"
-"(if(let-values(((or-part_410)(parsed? body_23)))"
-"(if or-part_410"
-" or-part_410"
+"(loop_127 rest-bodys_3 phase_157))))))))"
+"(if(let-values(((or-part_414)(parsed? body_23)))"
+"(if or-part_414"
+" or-part_414"
 "(expanded+parsed? body_23)))"
 "(let-values()"
-"(cons body_23(loop_127 rest-bodys_3 phase_155)))"
+"(cons body_23(loop_127 rest-bodys_3 phase_157)))"
 "(let-values()"
 "(let-values(((disarmed-body_2)"
 "(syntax-disarm$1 body_23)))"
 "(let-values(((tmp_67)"
 "(core-form-sym"
 " disarmed-body_2"
-" phase_155)))"
+" phase_157)))"
 "(if(equal? tmp_67 'module*)"
 "(let-values()"
 "(let-values((()"
@@ -76721,7 +76789,7 @@ static const char *startup_source =
 "(let-values(((neg-phase_0)"
 "(phase-"
 " 0"
-" phase_155)))"
+" phase_157)))"
 "(let-values(((shifted-s_0)"
 "(syntax-shift-phase-level$1"
 " ready-body_2"
@@ -76779,7 +76847,7 @@ static const char *startup_source =
 "(syntax-shift-phase-level$1"
 "(expanded+parsed-s"
 " submod_4)"
-" phase_155)))"
+" phase_157)))"
 "(expanded+parsed1.1"
 " s663_0"
 "(expanded+parsed-parsed"
@@ -76791,7 +76859,7 @@ static const char *startup_source =
 "(let-values()"
 "(syntax-shift-phase-level$1"
 " submod_4"
-" phase_155))))))))"
+" phase_157))))))))"
 "(let-values()"
 "(let-values(((ready-body664_0)"
 " ready-body_2)"
@@ -76826,31 +76894,31 @@ static const char *startup_source =
 " submod_3"
 "(loop_127"
 " rest-bodys_3"
-" phase_155)))))))"
+" phase_157)))))))"
 "(let-values()"
 "(cons"
 " body_23"
 "(loop_127"
 " rest-bodys_3"
-" phase_155)))))))))))))))))"
+" phase_157)))))))))))))))))"
 " loop_127)"
 " fully-expanded-bodys-except-post-submodules_2"
-" phase_154)))))))))))))))))"
+" phase_156)))))))))))))))))"
 "(define-values"
 "(stop-at-module*?)"
-"(lambda(ctx_119)"
+"(lambda(ctx_120)"
 "(begin"
 "(free-id-set-member?"
-"(expand-context-stops ctx_119)"
-"(expand-context-phase ctx_119)"
-"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_119))))))"
+"(expand-context-stops ctx_120)"
+"(expand-context-phase ctx_120)"
+"(syntax-shift-phase-level$1(datum->syntax$1 core-stx 'module*)(expand-context-phase ctx_120))))))"
 "(define-values"
 "(check-ids-unbound173.1)"
 "(lambda(in168_0 ids170_0 phase171_0 requires+provides172_0)"
 "(begin"
 " 'check-ids-unbound173"
 "(let-values(((ids_48) ids170_0))"
-"(let-values(((phase_156) phase171_0))"
+"(let-values(((phase_158) phase171_0))"
 "(let-values(((requires+provides_13) requires+provides172_0))"
 "(let-values(((s_893) in168_0))"
 "(let-values()"
@@ -76860,7 +76928,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_447)))"
-"((letrec-values(((for-loop_340)"
+"((letrec-values(((for-loop_339)"
 "(lambda(lst_448)"
 "(begin"
 " 'for-loop"
@@ -76877,7 +76945,7 @@ static const char *startup_source =
 " requires+provides_13)"
 "((id673_0) id_159)"
 "((phase674_0)"
-" phase_156)"
+" phase_158)"
 "((s675_0) s_893)"
 "((temp676_0) 'module))"
 "(check-not-defined95.1"
@@ -76893,20 +76961,20 @@ static const char *startup_source =
 " phase674_0)))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_340 rest_264)(values))))"
+"(if(not #f)(for-loop_339 rest_264)(values))))"
 "(values))))))"
-" for-loop_340)"
+" for-loop_339)"
 " lst_447)))"
 "(void))))))))))"
 "(define-values"
 "(eval-nested-bodys)"
-"(lambda(bodys_28 phase_157 m-ns_23 self_41 ctx_120)"
+"(lambda(bodys_28 phase_159 m-ns_23 self_41 ctx_121)"
 "(begin"
 "(begin"
 "(let-values(((lst_449) bodys_28))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_449)))"
-"((letrec-values(((for-loop_341)"
+"((letrec-values(((for-loop_340)"
 "(lambda(lst_450)"
 "(begin"
 " 'for-loop"
@@ -76934,9 +77002,9 @@ static const char *startup_source =
 " ids_49"
 "(parsed-define-values-rhs"
 " p_88)"
-" phase_157"
+" phase_159"
 " m-ns_23"
-" ctx_120)))"
+" ctx_121)))"
 "(begin"
 "(let-values(((lst_451) ids_49)"
 "((lst_452)"
@@ -76959,7 +77027,7 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list lst_453)))"
-"((letrec-values(((for-loop_342)"
+"((letrec-values(((for-loop_341)"
 "(lambda(lst_454"
 " lst_455"
 " lst_456)"
@@ -76999,37 +77067,37 @@ static const char *startup_source =
 "(let-values()"
 "(namespace-set-variable!"
 " m-ns_23"
-" phase_157"
+" phase_159"
 " sym_112"
 " val_88))"
 "(values)))))"
 "(values)))))"
 "(if(not"
 " #f)"
-"(for-loop_342"
+"(for-loop_341"
 " rest_266"
 " rest_267"
 " rest_268)"
 "(values))))"
 "(values))))))"
-" for-loop_342)"
+" for-loop_341)"
 " lst_451"
 " lst_452"
 " lst_453)))"
 "(void)))))"
-"(if(let-values(((or-part_411)"
+"(if(let-values(((or-part_415)"
 "(parsed-define-syntaxes?"
 " p_88)))"
-"(if or-part_411"
-" or-part_411"
+"(if or-part_415"
+" or-part_415"
 "(semi-parsed-begin-for-syntax?"
 " p_88)))"
 "(let-values()(void))"
-"(if(let-values(((or-part_412)"
+"(if(let-values(((or-part_416)"
 "(parsed-#%declare?"
 " p_88)))"
-"(if or-part_412"
-" or-part_412"
+"(if or-part_416"
+" or-part_416"
 "(syntax?$1 p_88)))"
 "(let-values()(void))"
 "(let-values()"
@@ -77040,7 +77108,7 @@ static const char *startup_source =
 " #f"
 " parameterization-key)"
 " current-expand-context"
-" ctx_120"
+" ctx_121"
 " 1/current-namespace"
 " m-ns_23)"
 "(let-values()"
@@ -77050,7 +77118,7 @@ static const char *startup_source =
 "(let-values(((m-ns677_0)"
 " m-ns_23)"
 "((phase678_0)"
-" phase_157))"
+" phase_159))"
 "(make-compile-context14.1"
 " #f"
 " unsafe-undefined"
@@ -77061,9 +77129,9 @@ static const char *startup_source =
 " m-ns_23)))))))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_341 rest_265)(values))))"
+"(if(not #f)(for-loop_340 rest_265)(values))))"
 "(values))))))"
-" for-loop_341)"
+" for-loop_340)"
 " lst_449)))"
 "(void)))))"
 "(define-values"
@@ -77084,7 +77152,7 @@ static const char *startup_source =
 " 'expand-submodule197"
 "(let-values(((s_738) s194_0))"
 "(let-values(((self_42) self195_0))"
-"(let-values(((ctx_121) ctx196_0))"
+"(let-values(((ctx_122) ctx196_0))"
 "(let-values(((is-star?_0) is-star?176_0))"
 "(let-values(((keep-enclosing-scope-at-phase_2) keep-enclosing-scope-at-phase177_0))"
 "(let-values(((enclosing-r+p_2) enclosing-requires+provides178_0))"
@@ -77100,14 +77168,14 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_160)(expand-context-observer ctx_121)))"
-"(if obs_160"
+"(let-values(((obs_159)(expand-context-observer ctx_122)))"
+"(if obs_159"
 "(let-values()"
 "(let-values()"
 "(begin"
-"(call-expand-observe obs_160 'enter-prim s_738)"
+"(call-expand-observe obs_159 'enter-prim s_738)"
 "(call-expand-observe"
-" obs_160"
+" obs_159"
 "(if is-star?_0 'prim-submodule* 'prim-submodule)))))"
 "(void)))))"
 "(values))))"
@@ -77173,17 +77241,17 @@ static const char *startup_source =
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_161)(expand-context-observer ctx_121)))"
-"(if obs_161"
+"(let-values(((obs_160)(expand-context-observer ctx_122)))"
+"(if obs_160"
 "(let-values()"
 "(let-values()"
-"(call-expand-observe obs_161 'enter-prim s_738)))"
+"(call-expand-observe obs_160 'enter-prim s_738)))"
 "(void)))"
 "(values))))"
 "(let-values(((submod_5)"
 "(let-values(((s687_0) s_738)"
 "((temp688_0)"
-"(let-values(((v_276) ctx_121))"
+"(let-values(((v_276) ctx_122))"
 "(let-values(((the-struct_120) v_276))"
 "(if(expand-context/outer? the-struct_120)"
 "(let-values(((context697_0) 'module)"
@@ -77309,18 +77377,18 @@ static const char *startup_source =
 " self689_0))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_162)"
-"(expand-context-observer ctx_121)))"
-"(if obs_162"
+"(let-values(((obs_161)"
+"(expand-context-observer ctx_122)))"
+"(if obs_161"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_162"
+" obs_161"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))"
 "(values))))"
-"(let-values(((ns_131)(expand-context-namespace ctx_121)))"
+"(let-values(((ns_131)(expand-context-namespace ctx_122)))"
 "(let-values(((module-name_3)(1/module-path-index-resolve self_42)))"
 "(let-values(((root-module-name_1)"
 "(resolved-module-path-root-name module-name_3)))"
@@ -77345,7 +77413,7 @@ static const char *startup_source =
 "((temp703_0) #t)"
 "((temp704_0)"
 "(expand-context-for-serializable?"
-" ctx_121))"
+" ctx_122))"
 "((modules-being-compiled705_0)"
 " modules-being-compiled_8)"
 "((temp706_0) #f))"
@@ -77382,13 +77450,13 @@ static const char *startup_source =
 "(if is-star?_0"
 "(void)"
 "(let-values()"
-"(let-values(((obs_163)"
-"(expand-context-observer ctx_121)))"
-"(if obs_163"
+"(let-values(((obs_162)"
+"(expand-context-observer ctx_122)))"
+"(if obs_162"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_163"
+" obs_162"
 " 'exit-prim"
 "(extract-syntax submod_5))))"
 "(void)))))"
@@ -77470,9 +77538,9 @@ static const char *startup_source =
 "(begin"
 " 'expand-non-module*-submodules212"
 "(let-values(((bodys_29) bodys208_0))"
-"(let-values(((phase_158) phase209_0))"
+"(let-values(((phase_160) phase209_0))"
 "(let-values(((self_43) self210_0))"
-"(let-values(((ctx_122) ctx211_0))"
+"(let-values(((ctx_123) ctx211_0))"
 "(let-values(((mpis-to-reset_5) mpis-to-reset200_0))"
 "(let-values(((declared-submodule-names_9) declared-submodule-names201_0))"
 "(let-values(((compiled-submodules_6) compiled-submodules202_0))"
@@ -77484,7 +77552,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_457)))"
-"((letrec-values(((for-loop_343)"
+"((letrec-values(((for-loop_342)"
 "(lambda(fold-var_387 lst_458)"
 "(begin"
 " 'for-loop"
@@ -77501,7 +77569,7 @@ static const char *startup_source =
 "(core-form-sym"
 "(syntax-disarm$1"
 " body_25)"
-" phase_158)))"
+" phase_160)))"
 "(if(equal? tmp_68 'module)"
 "(let-values()"
 "(let-values(((body715_0)"
@@ -77509,7 +77577,7 @@ static const char *startup_source =
 "((self716_0)"
 " self_43)"
 "((ctx717_0)"
-" ctx_122)"
+" ctx_123)"
 "((temp718_0)"
 " #f)"
 "((mpis-to-reset719_0)"
@@ -77537,10 +77605,10 @@ static const char *startup_source =
 " fold-var_389))))"
 "(values fold-var_390)))))"
 "(if(not #f)"
-"(for-loop_343 fold-var_388 rest_269)"
+"(for-loop_342 fold-var_388 rest_269)"
 " fold-var_388)))"
 " fold-var_387)))))"
-" for-loop_343)"
+" for-loop_342)"
 " null"
 " lst_457))))))))))))))))"
 "(define-values"
@@ -77553,7 +77621,7 @@ static const char *startup_source =
 "(let-values(((requires+provides_14) requires+provides219_0))"
 "(let-values(((declared-submodule-names_10) declared-submodule-names215_0))"
 "(let-values()"
-"(lambda(s_900 phase_159)"
+"(lambda(s_900 phase_161)"
 "(let-values(((ok?_92 #%require723_0 req724_0)"
 "(let-values(((s_901)(syntax-disarm$1 s_900)))"
 "(let-values(((orig-s_95) s_901))"
@@ -77601,8 +77669,8 @@ static const char *startup_source =
 "((s729_0) s_900)"
 "((self730_0) self_44)"
 "((m-ns731_0) m-ns_24)"
-"((phase732_0) phase_159)"
-"((phase733_0) phase_159)"
+"((phase732_0) phase_161)"
+"((phase733_0) phase_161)"
 "((requires+provides734_0) requires+provides_14)"
 "((declared-submodule-names735_0) declared-submodule-names_10)"
 "((temp736_0) 'require))"
@@ -77638,7 +77706,7 @@ static const char *startup_source =
 "(let-values(((lst_459) lifted-defns_2))"
 "(begin"
 "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_459)))"
-"((letrec-values(((for-loop_344)"
+"((letrec-values(((for-loop_343)"
 "(lambda(fold-var_391 lst_460)"
 "(begin"
 " 'for-loop"
@@ -77654,24 +77722,24 @@ static const char *startup_source =
 "(defn-extract-syntax lifted-defn_0))"
 " fold-var_393))))"
 "(values fold-var_394)))))"
-"(if(not #f)(for-loop_344 fold-var_392 rest_270) fold-var_392)))"
+"(if(not #f)(for-loop_343 fold-var_392 rest_270) fold-var_392)))"
 " fold-var_391)))))"
-" for-loop_344)"
+" for-loop_343)"
 " null"
 " 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_164)(expand-context-observer partial-body-ctx_2)))"
-"(if obs_164"
+"(let-values(((obs_163)(expand-context-observer partial-body-ctx_2)))"
+"(if obs_163"
 "(let-values()"
 "(let-values(((s-lifted-defns_0)(lifted-defns-extract-syntax lifted-defns_3)))"
 "(let-values((()"
 "(begin"
-"(call-expand-observe obs_164 'rename-list(cons exp-body_10 rest-bodys_4))"
+"(call-expand-observe obs_163 'rename-list(cons exp-body_10 rest-bodys_4))"
 "(values))))"
-"(let-values((()(begin(call-expand-observe obs_164 'module-lift-loop s-lifted-defns_0)(values))))"
+"(let-values((()(begin(call-expand-observe obs_163 'module-lift-loop s-lifted-defns_0)(values))))"
 "(let-values((()"
 "(begin"
 "(let-values(((lst_461) s-lifted-defns_0))"
@@ -77679,7 +77747,7 @@ static const char *startup_source =
 "(if(variable-reference-from-unsafe?(#%variable-reference))"
 "(void)"
 "(let-values()(check-list lst_461)))"
-"((letrec-values(((for-loop_345)"
+"((letrec-values(((for-loop_344)"
 "(lambda(lst_462)"
 "(begin"
 " 'for-loop"
@@ -77749,51 +77817,51 @@ static const char *startup_source =
 " _742_1))))))"
 "(begin"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'next)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'visit"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'resolve"
 " define-values741_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'prim-stop)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'exit-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'return"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'rename-one"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'enter-prim"
 " s-lifted-defn_0)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'prim-define-values)"
 "(call-expand-observe"
-" obs_164"
+" obs_163"
 " 'exit-prim"
 " s-lifted-defn_0))))"
 "(values)))))"
 "(values)))))"
-"(if(not #f)(for-loop_345 rest_271)(values))))"
+"(if(not #f)(for-loop_344 rest_271)(values))))"
 "(values))))))"
-" for-loop_345)"
+" for-loop_344)"
 " lst_461)))"
 "(values))))"
 "(let-values()"
@@ -77812,20 +77880,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_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)))))))))"
+"(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)))))))))"
 "(void))))))"
 "(define-values"
 "(log-defn-enter)"
-"(lambda(ctx_123 defn_1)"
+"(lambda(ctx_124 defn_1)"
 "(begin"
-"(let-values(((obs_165)(expand-context-observer ctx_123)))"
-"(if obs_165"
+"(let-values(((obs_164)(expand-context-observer ctx_124)))"
+"(if obs_164"
 "(let-values()"
 "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))"
 "(let-values(((ok?_95 define-values745_0 _746_0)"
@@ -77854,30 +77922,30 @@ 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_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)))))"
+"(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)))))"
 "(void))))))"
 "(define-values"
 "(log-defn-exit)"
-"(lambda(ctx_124 defn_2 exp-rhs_8)"
+"(lambda(ctx_125 defn_2 exp-rhs_8)"
 "(begin"
-"(let-values(((obs_166)(expand-context-observer ctx_124)))"
-"(if obs_166"
+"(let-values(((obs_165)(expand-context-observer ctx_125)))"
+"(if obs_165"
 "(let-values()"
 "(let-values(((s-defn_1)"
 "(datum->syntax$1"
 " #f"
 "(list 'define-values(semi-parsed-define-values-ids defn_2) exp-rhs_8)"
 "(semi-parsed-define-values-s defn_2))))"
-"(begin(call-expand-observe obs_166 'exit-prim s-defn_1)(call-expand-observe obs_166 'return s-defn_1))))"
+"(begin(call-expand-observe obs_165 'exit-prim s-defn_1)(call-expand-observe obs_165 'return s-defn_1))))"
 "(void))))))"
 "(define-values"
 "(as-expand-time-top-level-bindings)"
-"(lambda(ids_50 s_72 ctx_125)"
+"(lambda(ids_50 s_72 ctx_126)"
 "(begin"
-"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_125)))"
+"(let-values(((top-level-bind-scope_6)(root-expand-context-top-level-bind-scope ctx_126)))"
 "(let-values(((tl-ids_2)"
 "(reverse$1"
 "(let-values(((lst_84) ids_50))"
@@ -77900,7 +77968,7 @@ static const char *startup_source =
 "(let-values()"
 "(remove-use-site-scopes"
 " id_51"
-" ctx_125))"
+" ctx_126))"
 " fold-var_62))))"
 "(values fold-var_396)))))"
 "(if(not #f)(for-loop_107 fold-var_61 rest_40) fold-var_61)))"
@@ -77910,8 +77978,8 @@ static const char *startup_source =
 " lst_84))))))"
 "(let-values((()"
 "(begin"
-"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_125))((s3_3) s_72))"
-"(check-no-duplicate-ids7.1 unsafe-undefined tl-ids1_0 temp2_9 s3_3 unsafe-undefined))"
+"(let-values(((tl-ids1_0) tl-ids_2)((temp2_9)(expand-context-phase ctx_126))((s3_4) s_72))"
+"(check-no-duplicate-ids7.1 unsafe-undefined tl-ids1_0 temp2_9 s3_4 unsafe-undefined))"
 "(values))))"
 "(let-values(((tmp-bind-ids_0)"
 "(reverse$1"
@@ -77945,16 +78013,16 @@ static const char *startup_source =
 " for-loop_83)"
 " null"
 " lst_463))))))"
-"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_125)))))))))"
+"(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_126)))))))))"
 "(void"
 "(add-core-form!*"
 " 'define-values"
 "(lambda(s_0 ctx_7)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_167)(expand-context-observer ctx_7)))"
-"(if obs_167"
-"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-values)))"
+"(let-values(((obs_166)(expand-context-observer ctx_7)))"
+"(if obs_166"
+"(let-values()(let-values()(call-expand-observe obs_166 'prim-define-values)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
@@ -77965,10 +78033,10 @@ static const char *startup_source =
 "(values))))"
 "(let-values(((disarmed-s_25)(syntax-disarm$1 s_0)))"
 "(let-values(((ok?_26 define-values1_0 id2_1 rhs3_0)"
-"(let-values(((s_492) s_0))"
-"(let-values(((orig-s_99) s_492))"
+"(let-values(((s_503) s_0))"
+"(let-values(((orig-s_99) s_503))"
 "(let-values(((define-values1_1 id2_2 rhs3_1)"
-"(let-values(((s_76)(if(syntax?$1 s_492)(syntax-e$1 s_492) s_492)))"
+"(let-values(((s_76)(if(syntax?$1 s_503)(syntax-e$1 s_503) s_503)))"
 "(if(pair? s_76)"
 "(let-values(((define-values4_0)"
 "(let-values(((s_188)(car s_76))) s_188))"
@@ -77996,7 +78064,7 @@ static const char *startup_source =
 " orig-s_99))"
 "(let-values()"
 "(let-values(((id_54)"
-"(let-values(((lst_80)"
+"(let-values(((lst_76)"
 " flat-s_68))"
 "(begin"
 "(if(variable-reference-from-unsafe?"
@@ -78004,20 +78072,20 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "(check-list"
-" lst_80)))"
-"((letrec-values(((for-loop_99)"
+" lst_76)))"
+"((letrec-values(((for-loop_97)"
 "(lambda(id_162"
-" lst_81)"
+" lst_77)"
 "(begin"
 " 'for-loop"
 "(if(pair?"
-" lst_81)"
+" lst_77)"
 "(let-values(((s_89)"
 "(unsafe-car"
-" lst_81))"
+" lst_77))"
 "((rest_121)"
 "(unsafe-cdr"
-" lst_81)))"
+" lst_77)))"
 "(let-values(((id_163)"
 "(let-values(((id_164)"
 " id_162))"
@@ -78049,14 +78117,14 @@ static const char *startup_source =
 " id_115)))))"
 "(if(not"
 " #f)"
-"(for-loop_99"
+"(for-loop_97"
 " id_163"
 " rest_121)"
 " id_163)))"
 " id_162)))))"
-" for-loop_99)"
+" for-loop_97)"
 " null"
-" lst_80)))))"
+" lst_76)))))"
 "(reverse$1 id_54))))))))"
 "((rhs8_0)"
 "(let-values(((s_307)(cdr s_5)))"
@@ -78109,22 +78177,22 @@ static const char *startup_source =
 "(void"
 "(add-core-form!*"
 " 'define-syntaxes"
-"(lambda(s_186 ctx_126)"
+"(lambda(s_186 ctx_127)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_168)(expand-context-observer ctx_126)))"
-"(if obs_168"
-"(let-values()(let-values()(call-expand-observe obs_168 'prim-define-syntaxes)))"
+"(let-values(((obs_167)(expand-context-observer ctx_127)))"
+"(if obs_167"
+"(let-values()(let-values()(call-expand-observe obs_167 'prim-define-syntaxes)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_169)(expand-context-observer ctx_126)))"
-"(if obs_169(let-values()(let-values()(call-expand-observe obs_169 'prepare-env)))(void)))"
+"(let-values(((obs_168)(expand-context-observer ctx_127)))"
+"(if obs_168(let-values()(let-values()(call-expand-observe obs_168 'prepare-env)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_126) 'top-level)"
+"(if(eq?(expand-context-context ctx_127) 'top-level)"
 "(void)"
 "                           (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_186)))"
 "(values))))"
@@ -78136,7 +78204,7 @@ static const char *startup_source =
 "(let-values(((s_22)(if(syntax?$1 s_18)(syntax-e$1 s_18) s_18)))"
 "(if(pair? s_22)"
 "(let-values(((define-syntaxes18_0)"
-"(let-values(((s_494)(car s_22))) s_494))"
+"(let-values(((s_923)(car s_22))) s_923))"
 "((id19_1 rhs20_0)"
 "(let-values(((s_25)(cdr s_22)))"
 "(let-values(((s_306)"
@@ -78145,11 +78213,11 @@ static const char *startup_source =
 " s_25)))"
 "(if(pair? s_306)"
 "(let-values(((id21_1)"
-"(let-values(((s_923)(car s_306)))"
+"(let-values(((s_495)(car s_306)))"
 "(let-values(((s_924)"
-"(if(syntax?$1 s_923)"
-"(syntax-e$1 s_923)"
-" s_923)))"
+"(if(syntax?$1 s_495)"
+"(syntax-e$1 s_495)"
+" s_495)))"
 "(let-values(((flat-s_69)"
 "(to-syntax-list.1"
 " s_924)))"
@@ -78231,22 +78299,22 @@ static const char *startup_source =
 " s_926)))"
 "(if(pair? s_175)"
 "(let-values(((rhs23_2)"
-"(let-values(((s_451)"
+"(let-values(((s_452)"
 "(car"
 " s_175)))"
-" s_451))"
+" s_452))"
 "(()"
 "(let-values(((s_46)"
 "(cdr"
 " s_175)))"
-"(let-values(((s_486)"
+"(let-values(((s_487)"
 "(if(syntax?$1"
 " s_46)"
 "(syntax-e$1"
 " s_46)"
 " s_46)))"
 "(if(null?"
-" s_486)"
+" s_487)"
 "(values)"
 "(raise-syntax-error$1"
 " #f"
@@ -78265,38 +78333,38 @@ 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_52 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_127)))"
 "(let-values(((exp-rhs_10)"
-"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_126 ids_52)))"
+"(let-values(((temp25_8) rhs17_0)((temp26_6)(as-named-context ctx_127 ids_52)))"
 "(expand-transformer92.1 #f #f 'expression #t #f unsafe-undefined temp25_8 temp26_6))))"
-"(if(expand-context-to-parsed? ctx_126)"
+"(if(expand-context-to-parsed? ctx_127)"
 "(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!*"
 " 'begin-for-syntax"
-"(lambda(s_309 ctx_112)"
+"(lambda(s_309 ctx_113)"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_112) 'top-level)"
+"(if(eq?(expand-context-context ctx_113) 'top-level)"
 "(void)"
 "                       (let-values () (raise-syntax-error$1 #f \"not in a definition context\" s_309)))"
 "(values))))"
 "(let-values(((ok?_38 begin-for-syntax29_0 form30_0)"
-"(let-values(((s_496) s_309))"
-"(let-values(((orig-s_101) s_496))"
+"(let-values(((s_927) s_309))"
+"(let-values(((orig-s_101) s_927))"
 "(let-values(((begin-for-syntax29_1 form30_1)"
-"(let-values(((s_48)(if(syntax?$1 s_496)(syntax-e$1 s_496) s_496)))"
+"(let-values(((s_48)(if(syntax?$1 s_927)(syntax-e$1 s_927) s_927)))"
 "(if(pair? s_48)"
 "(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_777)"
-"(if(syntax?$1 s_501)"
-"(syntax-e$1 s_501)"
-" s_501)))"
-"(let-values(((flat-s_70)(to-syntax-list.1 s_777)))"
+"(let-values(((s_496)(cdr s_48)))"
+"(let-values(((s_778)"
+"(if(syntax?$1 s_496)"
+"(syntax-e$1 s_496)"
+" s_496)))"
+"(let-values(((flat-s_70)(to-syntax-list.1 s_778)))"
 "(if(not flat-s_70)"
 "(let-values()"
 "                                                                   (raise-syntax-error$1 #f \"bad syntax\" orig-s_101))"
@@ -78306,20 +78374,20 @@ static const char *startup_source =
 "(values #t begin-for-syntax29_1 form30_1))))))"
 "(let-values((()"
 "(begin"
-"(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)))"
+"(let-values(((obs_169)(expand-context-observer ctx_113)))"
+"(if obs_169"
+"(let-values()(let-values()(call-expand-observe obs_169 'prim-begin-for-syntax)))"
 "(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_171)(expand-context-observer ctx_112)))"
-"(if obs_171"
-"(let-values()(let-values()(call-expand-observe obs_171 'prepare-env)))"
+"(let-values(((obs_170)(expand-context-observer ctx_113)))"
+"(if obs_170"
+"(let-values()(let-values()(call-expand-observe obs_170 'prepare-env)))"
 "(void)))"
 "(values))))"
 "(let-values(((trans-ctx_1)"
-"(let-values(((ctx33_0) ctx_112)((temp34_7) 'top-level)((temp35_7) #t))"
+"(let-values(((ctx33_0) ctx_113)((temp34_7) 'top-level)((temp35_7) #t))"
 "(context->transformer-context99.1 temp35_7 ctx33_0 temp34_7))))"
 "(let-values(((lift-ctx_7)"
 "(let-values(((temp36_9)(make-top-level-lift trans-ctx_1)))"
@@ -78391,13 +78459,13 @@ static const char *startup_source =
 " 'loop"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_172)"
-"(expand-context-observer ctx_112)))"
-"(if obs_172"
+"(let-values(((obs_171)"
+"(expand-context-observer ctx_113)))"
+"(if obs_171"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_172"
+" obs_171"
 " 'enter-list"
 "(datum->syntax$1 #f form30_0 s_309))))"
 "(void)))"
@@ -78413,14 +78481,14 @@ static const char *startup_source =
 "(reverse$1"
 " accum_1)))"
 "(begin"
-"(let-values(((obs_173)"
+"(let-values(((obs_172)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_173"
+" ctx_113)))"
+"(if obs_172"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_173"
+" obs_172"
 " 'exit-list"
 "(datum->syntax$1"
 " #f"
@@ -78431,14 +78499,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_174)"
+"(let-values(((obs_173)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_174"
+" ctx_113)))"
+"(if obs_173"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_174"
+" obs_173"
 " 'next)))"
 "(void)))"
 "(values))))"
@@ -78468,14 +78536,14 @@ static const char *startup_source =
 "(let-values()"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_175)"
+"(let-values(((obs_174)"
 "(expand-context-observer"
-" ctx_112)))"
-"(if obs_175"
+" ctx_113)))"
+"(if obs_174"
 "(let-values()"
 "(let-values()"
 "(call-expand-observe"
-" obs_175"
+" obs_174"
 " 'module-lift-loop"
 " lifts_15)))"
 "(void)))"
@@ -78502,26 +78570,26 @@ static const char *startup_source =
 " exp-forms_0)))))))))))))"
 " loop_67)"
 " form30_0)))"
-"(if(expand-context-to-parsed? ctx_112)"
+"(if(expand-context-to-parsed? ctx_113)"
 "(parsed-begin-for-syntax21.1 s_309 all-exp-forms_0)"
 "(let-values(((s45_0) s_309)((temp46_2)(cons begin-for-syntax29_0 all-exp-forms_0)))"
 "(rebuild5.1 #t s45_0 temp46_2))))))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%require"
-"(lambda(s_927 ctx_127)"
+"(lambda(s_928 ctx_128)"
 "(let-values((()"
 "(begin"
-"(let-values(((obs_176)(expand-context-observer ctx_127)))"
-"(if obs_176(let-values()(let-values()(call-expand-observe obs_176 'prim-require)))(void)))"
+"(let-values(((obs_175)(expand-context-observer ctx_128)))"
+"(if obs_175(let-values()(let-values()(call-expand-observe obs_175 'prim-require)))(void)))"
 "(values))))"
 "(let-values((()"
 "(begin"
-"(if(eq?(expand-context-context ctx_127) 'top-level)"
+"(if(eq?(expand-context-context ctx_128) 'top-level)"
 "(void)"
-"                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_927)))"
+"                         (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_928)))"
 "(values))))"
-"(let-values(((disarmed-s_27)(syntax-disarm$1 s_927)))"
+"(let-values(((disarmed-s_27)(syntax-disarm$1 s_928)))"
 "(let-values(((ok?_97 #%require47_0 req48_0)"
 "(let-values(((s_63) disarmed-s_27))"
 "(let-values(((orig-s_102) s_63))"
@@ -78548,7 +78616,7 @@ static const char *startup_source =
 "(values #t #%require47_1 req48_1))))))"
 "(let-values(((sc_41)(new-scope 'macro)))"
 "(begin"
-"(let-values(((temp51_3)"
+"(let-values(((temp51_4)"
 "(reverse$1"
 "(let-values(((lst_32) req48_0))"
 "(begin"
@@ -78580,12 +78648,12 @@ static const char *startup_source =
 " for-loop_25)"
 " null"
 " lst_32)))))"
-"((s52_0) s_927)"
-"((temp53_6) #f)"
-"((temp54_5)(expand-context-namespace ctx_127))"
-"((temp55_4)(expand-context-phase ctx_127))"
-"((temp56_5)(let-values(((temp59_8) #f))(make-requires+provides8.1 #f temp59_8)))"
-"((temp57_3) 'require)"
+"((s52_0) s_928)"
+"((temp53_5) #f)"
+"((temp54_5)(expand-context-namespace ctx_128))"
+"((temp55_5)(expand-context-phase ctx_128))"
+"((temp56_4)(let-values(((temp59_10) #f))(make-requires+provides8.1 #f temp59_10)))"
+"((temp57_2) 'require)"
 "((temp58_5) #t))"
 "(parse-and-perform-requires!30.1"
 " #f"
@@ -78596,22 +78664,22 @@ static const char *startup_source =
 " #f"
 " #f"
 " #f"
-" temp53_6"
-" temp57_3"
-" temp51_3"
+" temp53_5"
+" temp57_2"
+" temp51_4"
 " s52_0"
 " temp54_5"
-" temp55_4"
-" temp56_5))"
-"(if(expand-context-to-parsed? ctx_127)(parsed-require23.1 s_927) s_927))))))))))"
+" temp55_5"
+" temp56_4))"
+"(if(expand-context-to-parsed? ctx_128)(parsed-require23.1 s_928) s_928))))))))))"
 "(void"
 "(add-core-form!*"
 " '#%provide"
-"(lambda(s_780 ctx_128)"
+"(lambda(s_781 ctx_129)"
 "(begin"
-"(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)))))"
+"(let-values(((obs_176)(expand-context-observer ctx_129)))"
+"(if obs_176(let-values()(let-values()(call-expand-observe obs_176 'prim-provide)))(void)))"
+"       (raise-syntax-error$1 #f \"not allowed outside of a module body\" s_781)))))"
 "(define-values(ns)(make-namespace))"
 "(void"
 "(begin"
@@ -78655,7 +78723,7 @@ static const char *startup_source =
 "(let-values(((name_83)(hash-iterate-key ht_167 i_3)))"
 "(let-values(((table_210)"
 "(let-values(((table_222) table_221))"
-"(let-values(((table_181)"
+"(let-values(((table_182)"
 "(let-values()"
 "(let-values(((key_93 val_89)"
 "(let-values()"
@@ -78663,7 +78731,7 @@ static const char *startup_source =
 "(let-values() name_83)"
 " #t))))"
 "(hash-set table_222 key_93 val_89)))))"
-"(values table_181)))))"
+"(values table_182)))))"
 "(if(not #f)"
 "(for-loop_20 table_210(hash-iterate-next ht_167 i_3))"
 " table_210)))"
@@ -78677,28 +78745,28 @@ 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_328)"
+"((letrec-values(((for-loop_327)"
 "(lambda(table_223 i_182)"
 "(begin"
 " 'for-loop"
 "(if i_182"
 "(let-values(((name_84)(hash-iterate-key ht_127 i_182)))"
-"(let-values(((table_119)"
-"(let-values(((table_112) table_223))"
-"(let-values(((table_113)"
+"(let-values(((table_120)"
+"(let-values(((table_113) table_223))"
+"(let-values(((table_114)"
 "(let-values()"
 "(let-values(((key_94 val_90)"
 "(let-values()"
 "(values"
 "(let-values() name_84)"
 " #t))))"
-"(hash-set table_112 key_94 val_90)))))"
-"(values table_113)))))"
+"(hash-set table_113 key_94 val_90)))))"
+"(values table_114)))))"
 "(if(not #f)"
-"(for-loop_328 table_119(hash-iterate-next ht_127 i_182))"
-" table_119)))"
+"(for-loop_327 table_120(hash-iterate-next ht_127 i_182))"
+" table_120)))"
 " table_223)))))"
-" for-loop_328)"
+" for-loop_327)"
 " '#hash()"
 "(hash-iterate-first ht_127))))))"
 "(declare-kernel-module!8.1 eval27_0 temp28_5 temp29_7 ns26_1))"
@@ -78762,5 +78830,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_774)(begin(1/datum->syntax core-stx s_774)))))"
+"(define-values(datum->kernel-syntax)(lambda(s_775)(begin(1/datum->syntax core-stx s_775)))))"
 ;